diff -Nru saga-2.1.0+dfsg/aclocal.m4 saga-2.1.4+dfsg/aclocal.m4 --- saga-2.1.0+dfsg/aclocal.m4 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/aclocal.m4 2014-11-13 08:33:24.000000000 +0000 @@ -1,7 +1,7 @@ -# generated automatically by aclocal 1.11.1 -*- Autoconf -*- +# generated automatically by aclocal 1.14.1 -*- Autoconf -*- + +# Copyright (C) 1996-2013 Free Software Foundation, Inc. -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,15 +11,16 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. +m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],, -[m4_warning([this file was generated for autoconf 2.63. +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],, +[m4_warning([this file was generated for autoconf 2.69. You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. -To do so, use the procedure documented by the package, typically `autoreconf'.])]) +To do so, use the procedure documented by the package, typically 'autoreconf'.])]) -# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# Copyright (C) 2002-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -31,10 +32,10 @@ # generated from the m4 files accompanying Automake X.Y. # (This private macro should not be called outside this file.) AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.11' +[am__api_version='1.14' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.11.1], [], +m4_if([$1], [1.14.1], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -50,22 +51,22 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.11.1])dnl +[AM_AUTOMAKE_VERSION([1.14.1])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets -# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to -# `$srcdir', `$srcdir/..', or `$srcdir/../..'. +# $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to +# '$srcdir', '$srcdir/..', or '$srcdir/../..'. # # Of course, Automake must honor this variable whenever it calls a # tool from the auxiliary directory. The problem is that $srcdir (and @@ -84,7 +85,7 @@ # # The reason of the latter failure is that $top_srcdir and $ac_aux_dir # are both prefixed by $srcdir. In an in-source build this is usually -# harmless because $srcdir is `.', but things will broke when you +# harmless because $srcdir is '.', but things will broke when you # start a VPATH build or use an absolute $srcdir. # # So we could use something similar to $top_srcdir/$ac_aux_dir/missing, @@ -110,22 +111,19 @@ # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1997-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 9 - # AM_CONDITIONAL(NAME, SHELL-CONDITION) # ------------------------------------- # Define a conditional. AC_DEFUN([AM_CONDITIONAL], -[AC_PREREQ(2.52)dnl - ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], - [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl +[AC_PREREQ([2.52])dnl + m4_if([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], + [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl AC_SUBST([$1_TRUE])dnl AC_SUBST([$1_FALSE])dnl _AM_SUBST_NOTMAKE([$1_TRUE])dnl @@ -144,16 +142,14 @@ Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009 -# Free Software Foundation, Inc. +# Copyright (C) 1999-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 10 -# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be +# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be # written in clear, in which case automake, when reading aclocal.m4, # will think it sees a *use*, and therefore will trigger all it's # C support machinery. Also note that it means that autoscan, seeing @@ -163,7 +159,7 @@ # _AM_DEPENDENCIES(NAME) # ---------------------- # See how the compiler implements dependency checking. -# NAME is "CC", "CXX", "GCJ", or "OBJC". +# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC". # We try a few techniques and use that to set a single cache variable. # # We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was @@ -176,12 +172,13 @@ AC_REQUIRE([AM_MAKE_INCLUDE])dnl AC_REQUIRE([AM_DEP_TRACK])dnl -ifelse([$1], CC, [depcc="$CC" am_compiler_list=], - [$1], CXX, [depcc="$CXX" am_compiler_list=], - [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], - [$1], UPC, [depcc="$UPC" am_compiler_list=], - [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], - [depcc="$$1" am_compiler_list=]) +m4_if([$1], [CC], [depcc="$CC" am_compiler_list=], + [$1], [CXX], [depcc="$CXX" am_compiler_list=], + [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'], + [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'], + [$1], [UPC], [depcc="$UPC" am_compiler_list=], + [$1], [GCJ], [depcc="$GCJ" am_compiler_list='gcc3 gcc'], + [depcc="$$1" am_compiler_list=]) AC_CACHE_CHECK([dependency style of $depcc], [am_cv_$1_dependencies_compiler_type], @@ -189,8 +186,9 @@ # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". + rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. @@ -229,16 +227,16 @@ : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - # We check with `-c' and `-o' for the sake of the "dashmstdout" + # We check with '-c' and '-o' for the sake of the "dashmstdout" # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. am__obj=sub/conftest.${OBJEXT-o} am__minus_obj="-o $am__obj" case $depmode in @@ -247,16 +245,16 @@ test "$am__universal" = false || continue ;; nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. if test "x$enable_dependency_tracking" = xyes; then continue else break fi ;; - msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has + msvc7 | msvc7msys | msvisualcpp | msvcmsys) + # This compiler won't grok '-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. am__obj=conftest.${OBJEXT-o} @@ -304,7 +302,7 @@ # AM_SET_DEPDIR # ------------- # Choose a directory name for dependency files. -# This macro is AC_REQUIREd in _AM_DEPENDENCIES +# This macro is AC_REQUIREd in _AM_DEPENDENCIES. AC_DEFUN([AM_SET_DEPDIR], [AC_REQUIRE([AM_SET_LEADING_DOT])dnl AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl @@ -314,34 +312,39 @@ # AM_DEP_TRACK # ------------ AC_DEFUN([AM_DEP_TRACK], -[AC_ARG_ENABLE(dependency-tracking, -[ --disable-dependency-tracking speeds up one-time build - --enable-dependency-tracking do not reject slow dependency extractors]) +[AC_ARG_ENABLE([dependency-tracking], [dnl +AS_HELP_STRING( + [--enable-dependency-tracking], + [do not reject slow dependency extractors]) +AS_HELP_STRING( + [--disable-dependency-tracking], + [speeds up one-time build])]) if test "x$enable_dependency_tracking" != xno; then am_depcomp="$ac_aux_dir/depcomp" AMDEPBACKSLASH='\' + am__nodep='_no' fi AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) AC_SUBST([AMDEPBACKSLASH])dnl _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl +AC_SUBST([am__nodep])dnl +_AM_SUBST_NOTMAKE([am__nodep])dnl ]) # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1999-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -#serial 5 # _AM_OUTPUT_DEPENDENCY_COMMANDS # ------------------------------ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], [{ - # Autoconf 2.62 quotes --file arguments for eval, but not when files + # Older Autoconf quotes --file arguments for eval, but not when files # are listed without --file. Let's play safe and only enable the eval # if we detect the quoting. case $CONFIG_FILES in @@ -354,7 +357,7 @@ # Strip MF so we end up with the name of the file. mf=`echo "$mf" | sed -e 's/:.*$//'` # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named `Makefile.in', but + # We used to match only the files named 'Makefile.in', but # some people rename them; so instead we look at the file content. # Grep'ing the first line is not enough: some people post-process # each Makefile.in and add a new line on top of each file to say so. @@ -366,21 +369,19 @@ continue fi # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running `make'. + # from the Makefile without running 'make'. DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` test -z "$DEPDIR" && continue am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "am__include" && continue + test -z "$am__include" && continue am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //p' < "$mf"` # Find all dependency output files, they are included files with # $(DEPDIR) in their names. We invoke sed twice because it is the # simplest approach to changing $(DEPDIR) to its actual value in the # expansion. for file in `sed -n " s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue fdir=`AS_DIRNAME(["$file"])` @@ -398,7 +399,7 @@ # This macro should only be invoked once -- use via AC_REQUIRE. # # This code is only required when automatic dependency tracking -# is enabled. FIXME. This creates each `.P' file that we will +# is enabled. FIXME. This creates each '.P' file that we will # need in order to bootstrap the dependency handling code. AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], [AC_CONFIG_COMMANDS([depfiles], @@ -408,18 +409,21 @@ # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2008, 2009 Free Software Foundation, Inc. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 16 - # This macro actually does too much. Some checks are only needed if # your package does certain things. But this isn't really a big deal. +dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O. +m4_define([AC_PROG_CC], +m4_defn([AC_PROG_CC]) +[_AM_PROG_CC_C_O +]) + # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) # AM_INIT_AUTOMAKE([OPTIONS]) # ----------------------------------------------- @@ -432,7 +436,7 @@ # arguments mandatory, and then we can depend on a new Autoconf # release and drop the old call support. AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_PREREQ([2.62])dnl +[AC_PREREQ([2.65])dnl dnl Autoconf wants to disallow AM_ names. We explicitly allow dnl the ones we care about. m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl @@ -461,31 +465,40 @@ # Define the identity of the package. dnl Distinguish between old-style and new-style calls. m4_ifval([$2], -[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl +[AC_DIAGNOSE([obsolete], + [$0: two- and three-arguments forms are deprecated.]) +m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl AC_SUBST([PACKAGE], [$1])dnl AC_SUBST([VERSION], [$2])], [_AM_SET_OPTIONS([$1])dnl dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. -m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, +m4_if( + m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]), + [ok:ok],, [m4_fatal([AC_INIT should be called with package and version arguments])])dnl AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl _AM_IF_OPTION([no-define],, -[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) - AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl +[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package]) + AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl # Some tools Automake needs. AC_REQUIRE([AM_SANITY_CHECK])dnl AC_REQUIRE([AC_ARG_PROGRAM])dnl -AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) -AM_MISSING_PROG(AUTOCONF, autoconf) -AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) -AM_MISSING_PROG(AUTOHEADER, autoheader) -AM_MISSING_PROG(MAKEINFO, makeinfo) +AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}]) +AM_MISSING_PROG([AUTOCONF], [autoconf]) +AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}]) +AM_MISSING_PROG([AUTOHEADER], [autoheader]) +AM_MISSING_PROG([MAKEINFO], [makeinfo]) AC_REQUIRE([AM_PROG_INSTALL_SH])dnl AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl -AC_REQUIRE([AM_PROG_MKDIR_P])dnl +AC_REQUIRE([AC_PROG_MKDIR_P])dnl +# For better backward compatibility. To be removed once Automake 1.9.x +# dies out for good. For more background, see: +# +# +AC_SUBST([mkdir_p], ['$(MKDIR_P)']) # We need awk for the "check" target. The system "awk" is bad on # some platforms. AC_REQUIRE([AC_PROG_AWK])dnl @@ -496,34 +509,78 @@ [_AM_PROG_TAR([v7])])]) _AM_IF_OPTION([no-dependencies],, [AC_PROVIDE_IFELSE([AC_PROG_CC], - [_AM_DEPENDENCIES(CC)], - [define([AC_PROG_CC], - defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl + [_AM_DEPENDENCIES([CC])], + [m4_define([AC_PROG_CC], + m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl AC_PROVIDE_IFELSE([AC_PROG_CXX], - [_AM_DEPENDENCIES(CXX)], - [define([AC_PROG_CXX], - defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl + [_AM_DEPENDENCIES([CXX])], + [m4_define([AC_PROG_CXX], + m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl AC_PROVIDE_IFELSE([AC_PROG_OBJC], - [_AM_DEPENDENCIES(OBJC)], - [define([AC_PROG_OBJC], - defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl + [_AM_DEPENDENCIES([OBJC])], + [m4_define([AC_PROG_OBJC], + m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl +AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], + [_AM_DEPENDENCIES([OBJCXX])], + [m4_define([AC_PROG_OBJCXX], + m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl ]) -_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl -dnl The `parallel-tests' driver may need to know about EXEEXT, so add the -dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro -dnl is hooked onto _AC_COMPILER_EXEEXT early, see below. +AC_REQUIRE([AM_SILENT_RULES])dnl +dnl The testsuite driver may need to know about EXEEXT, so add the +dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This +dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below. AC_CONFIG_COMMANDS_PRE(dnl [m4_provide_if([_AM_COMPILER_EXEEXT], [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl -]) -dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! + +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: + +Please tell bug-automake@gnu.org about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. + +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. + +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: . + +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. + +END + AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) + fi +fi]) + +dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further dnl mangled by Autoconf and run in a shell conditional statement. m4_define([_AC_COMPILER_EXEEXT], m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) - # When config.status generates a header, we must update the stamp-h file. # This file resides in the same directory as the config header # that is generated. The stamp files are numbered to have different names. @@ -545,7 +602,7 @@ done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -564,16 +621,14 @@ install_sh="\${SHELL} $am_aux_dir/install-sh" esac fi -AC_SUBST(install_sh)]) +AC_SUBST([install_sh])]) -# Copyright (C) 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2003-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 2 - # Check whether the underlying file-system supports filenames # with a leading dot. For instance MS-DOS doesn't. AC_DEFUN([AM_SET_LEADING_DOT], @@ -589,14 +644,12 @@ # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 4 - # AM_MAKE_INCLUDE() # ----------------- # Check to see how make treats includes. @@ -614,7 +667,7 @@ _am_result=none # First try GNU make style include. echo "include confinc" > confmf -# Ignore all kinds of additional output from `make'. +# Ignore all kinds of additional output from 'make'. case `$am_make -s -f confmf 2> /dev/null` in #( *the\ am__doit\ target*) am__include=include @@ -641,15 +694,12 @@ # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1997-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 6 - # AM_MISSING_PROG(NAME, PROGRAM) # ------------------------------ AC_DEFUN([AM_MISSING_PROG], @@ -657,11 +707,10 @@ $1=${$1-"${am_missing_run}$2"} AC_SUBST($1)]) - # AM_MISSING_HAS_RUN # ------------------ -# Define MISSING if not defined so far and test if it supports --run. -# If it does, set am_missing_run to use it, otherwise, to nothing. +# Define MISSING if not defined so far and test if it is modern enough. +# If it is, set am_missing_run to use it, otherwise, to nothing. AC_DEFUN([AM_MISSING_HAS_RUN], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl AC_REQUIRE_AUX_FILE([missing])dnl @@ -674,63 +723,35 @@ esac fi # Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " +if eval "$MISSING --is-lightweight"; then + am_missing_run="$MISSING " else am_missing_run= - AC_MSG_WARN([`missing' script is too old or missing]) + AC_MSG_WARN(['missing' script is too old or missing]) fi ]) -# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# AM_PROG_MKDIR_P -# --------------- -# Check for `mkdir -p'. -AC_DEFUN([AM_PROG_MKDIR_P], -[AC_PREREQ([2.60])dnl -AC_REQUIRE([AC_PROG_MKDIR_P])dnl -dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, -dnl while keeping a definition of mkdir_p for backward compatibility. -dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. -dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of -dnl Makefile.ins that do not define MKDIR_P, so we do our own -dnl adjustment using top_builddir (which is defined more often than -dnl MKDIR_P). -AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl -case $mkdir_p in - [[\\/$]]* | ?:[[\\/]]*) ;; - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; -esac -]) - # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 4 - # _AM_MANGLE_OPTION(NAME) # ----------------------- AC_DEFUN([_AM_MANGLE_OPTION], [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) # _AM_SET_OPTION(NAME) -# ------------------------------ +# -------------------- # Set option NAME. Presently that only means defining a flag for this option. AC_DEFUN([_AM_SET_OPTION], -[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) +[m4_define(_AM_MANGLE_OPTION([$1]), [1])]) # _AM_SET_OPTIONS(OPTIONS) -# ---------------------------------- +# ------------------------ # OPTIONS is a space-separated list of Automake options. AC_DEFUN([_AM_SET_OPTIONS], [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) @@ -741,13 +762,60 @@ AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008, 2009 -# Free Software Foundation, Inc. +# Copyright (C) 1999-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. +# _AM_PROG_CC_C_O +# --------------- +# Like AC_PROG_CC_C_O, but changed for automake. We rewrite AC_PROG_CC +# to automatically call this. +AC_DEFUN([_AM_PROG_CC_C_O], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +AC_REQUIRE_AUX_FILE([compile])dnl +AC_LANG_PUSH([C])dnl +AC_CACHE_CHECK( + [whether $CC understands -c and -o together], + [am_cv_prog_cc_c_o], + [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])]) + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i]) +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +AC_LANG_POP([C])]) + +# For backward compatibility. +AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) + +# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + + # AM_PATH_PYTHON([MINIMUM-VERSION], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) # --------------------------------------------------------------------------- # Adds support for distributing Python modules and packages. To @@ -775,8 +843,10 @@ dnl Find a Python interpreter. Python versions prior to 2.0 are not dnl supported. (2.0 was released on October 16, 2000). m4_define_default([_AM_PYTHON_INTERPRETER_LIST], - [python python2 python3 python3.0 python2.5 python2.4 python2.3 python2.2 dnl -python2.1 python2.0]) +[python python2 python3 python3.3 python3.2 python3.1 python3.0 python2.7 dnl + python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0]) + + AC_ARG_VAR([PYTHON], [the Python interpreter]) m4_if([$1],[],[ dnl No version check is needed. @@ -789,10 +859,11 @@ dnl A version check is needed. if test -n "$PYTHON"; then # If the user set $PYTHON, use it and don't search something else. - AC_MSG_CHECKING([whether $PYTHON version >= $1]) + AC_MSG_CHECKING([whether $PYTHON version is >= $1]) AM_PYTHON_CHECK_VERSION([$PYTHON], [$1], - [AC_MSG_RESULT(yes)], - [AC_MSG_ERROR(too old)]) + [AC_MSG_RESULT([yes])], + [AC_MSG_RESULT([no]) + AC_MSG_ERROR([Python interpreter is too old])]) am_display_PYTHON=$PYTHON else # Otherwise, try each interpreter until we find one that satisfies @@ -841,6 +912,25 @@ [am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"`]) AC_SUBST([PYTHON_PLATFORM], [$am_cv_python_platform]) + # Just factor out some code duplication. + am_python_setup_sysconfig="\ +import sys +# Prefer sysconfig over distutils.sysconfig, for better compatibility +# with python 3.x. See automake bug#10227. +try: + import sysconfig +except ImportError: + can_use_sysconfig = 0 +else: + can_use_sysconfig = 1 +# Can't use sysconfig in CPython 2.7, since it's broken in virtualenvs: +# +try: + from platform import python_implementation + if python_implementation() == 'CPython' and sys.version[[:3]] == '2.7': + can_use_sysconfig = 0 +except ImportError: + pass" dnl Set up 4 directories: @@ -848,9 +938,7 @@ dnl site-packages directory, not the python standard library dnl directory like in previous automake betas. This behavior dnl is more consistent with lispdir.m4 for example. - dnl Query distutils for this directory. distutils does not exist in - dnl Python 1.5, so we fall back to the hardcoded directory if it - dnl doesn't work. + dnl Query distutils for this directory. AC_CACHE_CHECK([for $am_display_PYTHON script directory], [am_cv_python_pythondir], [if test "x$prefix" = xNONE @@ -859,8 +947,14 @@ else am_py_prefix=$prefix fi - am_cv_python_pythondir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(0,0,prefix='$am_py_prefix'))" 2>/dev/null || - echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"` + am_cv_python_pythondir=`$PYTHON -c " +$am_python_setup_sysconfig +if can_use_sysconfig: + sitedir = sysconfig.get_path('purelib', vars={'base':'$am_py_prefix'}) +else: + from distutils import sysconfig + sitedir = sysconfig.get_python_lib(0, 0, prefix='$am_py_prefix') +sys.stdout.write(sitedir)"` case $am_cv_python_pythondir in $am_py_prefix*) am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'` @@ -886,9 +980,7 @@ dnl pyexecdir -- directory for installing python extension modules dnl (shared libraries) - dnl Query distutils for this directory. distutils does not exist in - dnl Python 1.5, so we fall back to the hardcoded directory if it - dnl doesn't work. + dnl Query distutils for this directory. AC_CACHE_CHECK([for $am_display_PYTHON extension module directory], [am_cv_python_pyexecdir], [if test "x$exec_prefix" = xNONE @@ -897,8 +989,14 @@ else am_py_exec_prefix=$exec_prefix fi - am_cv_python_pyexecdir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(1,0,prefix='$am_py_exec_prefix'))" 2>/dev/null || - echo "$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages"` + am_cv_python_pyexecdir=`$PYTHON -c " +$am_python_setup_sysconfig +if can_use_sysconfig: + sitedir = sysconfig.get_path('platlib', vars={'platbase':'$am_py_prefix'}) +else: + from distutils import sysconfig + sitedir = sysconfig.get_python_lib(1, 0, prefix='$am_py_prefix') +sys.stdout.write(sitedir)"` case $am_cv_python_pyexecdir in $am_py_exec_prefix*) am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'` @@ -946,7 +1044,7 @@ sys.exit(sys.hexversion < minverhex)" AS_IF([AM_RUN_LOG([$1 -c "$prog"])], [$3], [$4])]) -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -965,22 +1063,16 @@ # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 5 - # AM_SANITY_CHECK # --------------- AC_DEFUN([AM_SANITY_CHECK], [AC_MSG_CHECKING([whether build environment is sane]) -# Just in case -sleep 1 -echo timestamp > conftest.file # Reject unsafe characters in $srcdir or the absolute working directory # name. Accept space and tab only in the latter. am_lf=' @@ -991,32 +1083,40 @@ esac case $srcdir in *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) - AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);; + AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);; esac -# Do `set' in a subshell so we don't clobber the current shell's +# Do 'set' in a subshell so we don't clobber the current shell's # arguments. Must try -L first in case configure is actually a # symlink; some systems play weird games with the mod time of symlinks # (eg FreeBSD returns the mod time of the symlink's containing # directory). if ( - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` - if test "$[*]" = "X"; then - # -L didn't work. - set X `ls -t "$srcdir/configure" conftest.file` - fi - rm -f conftest.file - if test "$[*]" != "X $srcdir/configure conftest.file" \ - && test "$[*]" != "X conftest.file $srcdir/configure"; then - - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken -alias in your environment]) - fi + am_has_slept=no + for am_try in 1 2; do + echo "timestamp, slept: $am_has_slept" > conftest.file + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` + if test "$[*]" = "X"; then + # -L didn't work. + set X `ls -t "$srcdir/configure" conftest.file` + fi + if test "$[*]" != "X $srcdir/configure conftest.file" \ + && test "$[*]" != "X conftest.file $srcdir/configure"; then + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken + alias in your environment]) + fi + if test "$[2]" = conftest.file || test $am_try -eq 2; then + break + fi + # Just in case. + sleep 1 + am_has_slept=yes + done test "$[2]" = conftest.file ) then @@ -1026,9 +1126,85 @@ AC_MSG_ERROR([newly created file is older than distributed files! Check your system clock]) fi -AC_MSG_RESULT(yes)]) +AC_MSG_RESULT([yes]) +# If we didn't sleep, we still need to ensure time stamps of config.status and +# generated files are strictly newer. +am_sleep_pid= +if grep 'slept: no' conftest.file >/dev/null 2>&1; then + ( sleep 1 ) & + am_sleep_pid=$! +fi +AC_CONFIG_COMMANDS_PRE( + [AC_MSG_CHECKING([that generated files are newer than configure]) + if test -n "$am_sleep_pid"; then + # Hide warnings about reused PIDs. + wait $am_sleep_pid 2>/dev/null + fi + AC_MSG_RESULT([done])]) +rm -f conftest.file +]) -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2009-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_SILENT_RULES([DEFAULT]) +# -------------------------- +# Enable less verbose build rules; with the default set to DEFAULT +# ("yes" being less verbose, "no" or empty being verbose). +AC_DEFUN([AM_SILENT_RULES], +[AC_ARG_ENABLE([silent-rules], [dnl +AS_HELP_STRING( + [--enable-silent-rules], + [less verbose build output (undo: "make V=1")]) +AS_HELP_STRING( + [--disable-silent-rules], + [verbose build output (undo: "make V=0")])dnl +]) +case $enable_silent_rules in @%:@ ((( + yes) AM_DEFAULT_VERBOSITY=0;; + no) AM_DEFAULT_VERBOSITY=1;; + *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; +esac +dnl +dnl A few 'make' implementations (e.g., NonStop OS and NextStep) +dnl do not support nested variable expansions. +dnl See automake bug#9928 and bug#10237. +am_make=${MAKE-make} +AC_CACHE_CHECK([whether $am_make supports nested variables], + [am_cv_make_support_nested_variables], + [if AS_ECHO([['TRUE=$(BAR$(V)) +BAR0=false +BAR1=true +V=1 +am__doit: + @$(TRUE) +.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then + am_cv_make_support_nested_variables=yes +else + am_cv_make_support_nested_variables=no +fi]) +if test $am_cv_make_support_nested_variables = yes; then + dnl Using '$V' instead of '$(V)' breaks IRIX make. + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +else + AM_V=$AM_DEFAULT_VERBOSITY + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +fi +AC_SUBST([AM_V])dnl +AM_SUBST_NOTMAKE([AM_V])dnl +AC_SUBST([AM_DEFAULT_V])dnl +AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl +AC_SUBST([AM_DEFAULT_VERBOSITY])dnl +AM_BACKSLASH='\' +AC_SUBST([AM_BACKSLASH])dnl +_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl +]) + +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1036,34 +1212,32 @@ # AM_PROG_INSTALL_STRIP # --------------------- -# One issue with vendor `install' (even GNU) is that you can't +# One issue with vendor 'install' (even GNU) is that you can't # specify the program used to strip binaries. This is especially # annoying in cross-compiling environments, where the build's strip # is unlikely to handle the host's binaries. # Fortunately install-sh will honor a STRIPPROG variable, so we -# always use install-sh in `make install-strip', and initialize +# always use install-sh in "make install-strip", and initialize # STRIPPROG with the value of the STRIP variable (set by the user). AC_DEFUN([AM_PROG_INSTALL_STRIP], [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right +# Installed binaries are usually stripped using 'strip' when the user +# run "make install-strip". However 'strip' might not be the right # tool to use in cross-compilation environments, therefore Automake -# will honor the `STRIP' environment variable to overrule this program. -dnl Don't test for $cross_compiling = yes, because it might be `maybe'. +# will honor the 'STRIP' environment variable to overrule this program. +dnl Don't test for $cross_compiling = yes, because it might be 'maybe'. if test "$cross_compiling" != no; then AC_CHECK_TOOL([STRIP], [strip], :) fi INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006, 2008 Free Software Foundation, Inc. +# Copyright (C) 2006-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 2 - # _AM_SUBST_NOTMAKE(VARIABLE) # --------------------------- # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. @@ -1071,24 +1245,22 @@ AC_DEFUN([_AM_SUBST_NOTMAKE]) # AM_SUBST_NOTMAKE(VARIABLE) -# --------------------------- +# -------------------------- # Public sister of _AM_SUBST_NOTMAKE. AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004, 2005 Free Software Foundation, Inc. +# Copyright (C) 2004-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 2 - # _AM_PROG_TAR(FORMAT) # -------------------- # Check how to create a tarball in format FORMAT. -# FORMAT should be one of `v7', `ustar', or `pax'. +# FORMAT should be one of 'v7', 'ustar', or 'pax'. # # Substitute a variable $(am__tar) that is a command # writing to stdout a FORMAT-tarball containing the directory @@ -1098,79 +1270,119 @@ # Substitute a variable $(am__untar) that extract such # a tarball read from stdin. # $(am__untar) < result.tar +# AC_DEFUN([_AM_PROG_TAR], -[# Always define AMTAR for backward compatibility. -AM_MISSING_PROG([AMTAR], [tar]) -m4_if([$1], [v7], - [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], - [m4_case([$1], [ustar],, [pax],, - [m4_fatal([Unknown tar format])]) -AC_MSG_CHECKING([how to create a $1 tar archive]) -# Loop over all known methods to create a tar archive until one works. +[# Always define AMTAR for backward compatibility. Yes, it's still used +# in the wild :-( We should find a proper way to deprecate it ... +AC_SUBST([AMTAR], ['$${TAR-tar}']) + +# We'll loop over all known methods to create a tar archive until one works. _am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' -_am_tools=${am_cv_prog_tar_$1-$_am_tools} -# Do not fold the above two line into one, because Tru64 sh and -# Solaris sh will not grok spaces in the rhs of `-'. -for _am_tool in $_am_tools -do - case $_am_tool in - gnutar) - for _am_tar in tar gnutar gtar; - do - AM_RUN_LOG([$_am_tar --version]) && break - done - am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' - am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' - am__untar="$_am_tar -xf -" - ;; - plaintar) - # Must skip GNU tar: if it does not support --format= it doesn't create - # ustar tarball either. - (tar --version) >/dev/null 2>&1 && continue - am__tar='tar chf - "$$tardir"' - am__tar_='tar chf - "$tardir"' - am__untar='tar xf -' - ;; - pax) - am__tar='pax -L -x $1 -w "$$tardir"' - am__tar_='pax -L -x $1 -w "$tardir"' - am__untar='pax -r' - ;; - cpio) - am__tar='find "$$tardir" -print | cpio -o -H $1 -L' - am__tar_='find "$tardir" -print | cpio -o -H $1 -L' - am__untar='cpio -i -H $1 -d' - ;; - none) - am__tar=false - am__tar_=false - am__untar=false - ;; - esac - # If the value was cached, stop now. We just wanted to have am__tar - # and am__untar set. - test -n "${am_cv_prog_tar_$1}" && break +m4_if([$1], [v7], + [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], - # tar/untar a dummy directory, and stop if the command works - rm -rf conftest.dir - mkdir conftest.dir - echo GrepMe > conftest.dir/file - AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + [m4_case([$1], + [ustar], + [# The POSIX 1988 'ustar' format is defined with fixed-size fields. + # There is notably a 21 bits limit for the UID and the GID. In fact, + # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343 + # and bug#13588). + am_max_uid=2097151 # 2^21 - 1 + am_max_gid=$am_max_uid + # The $UID and $GID variables are not portable, so we need to resort + # to the POSIX-mandated id(1) utility. Errors in the 'id' calls + # below are definitely unexpected, so allow the users to see them + # (that is, avoid stderr redirection). + am_uid=`id -u || echo unknown` + am_gid=`id -g || echo unknown` + AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format]) + if test $am_uid -le $am_max_uid; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + _am_tools=none + fi + AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format]) + if test $am_gid -le $am_max_gid; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + _am_tools=none + fi], + + [pax], + [], + + [m4_fatal([Unknown tar format])]) + + AC_MSG_CHECKING([how to create a $1 tar archive]) + + # Go ahead even if we have the value already cached. We do so because we + # need to set the values for the 'am__tar' and 'am__untar' variables. + _am_tools=${am_cv_prog_tar_$1-$_am_tools} + + for _am_tool in $_am_tools; do + case $_am_tool in + gnutar) + for _am_tar in tar gnutar gtar; do + AM_RUN_LOG([$_am_tar --version]) && break + done + am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' + am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' + am__untar="$_am_tar -xf -" + ;; + plaintar) + # Must skip GNU tar: if it does not support --format= it doesn't create + # ustar tarball either. + (tar --version) >/dev/null 2>&1 && continue + am__tar='tar chf - "$$tardir"' + am__tar_='tar chf - "$tardir"' + am__untar='tar xf -' + ;; + pax) + am__tar='pax -L -x $1 -w "$$tardir"' + am__tar_='pax -L -x $1 -w "$tardir"' + am__untar='pax -r' + ;; + cpio) + am__tar='find "$$tardir" -print | cpio -o -H $1 -L' + am__tar_='find "$tardir" -print | cpio -o -H $1 -L' + am__untar='cpio -i -H $1 -d' + ;; + none) + am__tar=false + am__tar_=false + am__untar=false + ;; + esac + + # If the value was cached, stop now. We just wanted to have am__tar + # and am__untar set. + test -n "${am_cv_prog_tar_$1}" && break + + # tar/untar a dummy directory, and stop if the command works. + rm -rf conftest.dir + mkdir conftest.dir + echo GrepMe > conftest.dir/file + AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + rm -rf conftest.dir + if test -s conftest.tar; then + AM_RUN_LOG([$am__untar /dev/null 2>&1 && break + fi + done rm -rf conftest.dir - if test -s conftest.tar; then - AM_RUN_LOG([$am__untar /dev/null 2>&1 && break - fi -done -rm -rf conftest.dir -AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) -AC_MSG_RESULT([$am_cv_prog_tar_$1])]) + AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) + AC_MSG_RESULT([$am_cv_prog_tar_$1])]) + AC_SUBST([am__tar]) AC_SUBST([am__untar]) ]) # _AM_PROG_TAR +m4_include([m4/ax_lib_postgresql.m4]) m4_include([m4/ax_pkg_swig.m4]) m4_include([m4/ax_python_devel.m4]) m4_include([m4/ax_swig_enable_cxx.m4]) diff -Nru saga-2.1.0+dfsg/AUTHORS saga-2.1.4+dfsg/AUTHORS --- saga-2.1.0+dfsg/AUTHORS 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/AUTHORS 2014-11-13 08:32:09.000000000 +0000 @@ -1,21 +1,44 @@ _______________________________________________________________________________ - SAGA 2.0 - System for Automated Geoscientific Analyses + SAGA 2.1.2 - System for Automated Geoscientific Analyses + http://www.saga-gis.org _______________________________________________________________________________ AUTHORS _______________________________________________________________________________ -Date: May, 15th 2007 +Date: January, 10th 2014 -A. System Development -- Olaf Conrad -- Thomas Schorr -- Stefan Liersch -- Victor Olaya -- Andre Ringeler +A. SAGA GUI - SAGA Graphical User Interface +------------------------------------------- -B. Modules +Copyrights (c) 2005-2014 by Olaf Conrad +Portions (c) 2008-2014 by Volker Wichmann + +GNU General Public License (GPL) + + +B. SAGA CMD - SAGA Command Line Processor +----------------------------------------- + +Copyrights (c) 2005-2014 by Olaf Conrad + +GNU General Public License (GPL) + + +C. SAGA API - SAGA Application Programming Interface +---------------------------------------------------- + +Copyrights (c) 2002-2014 by Olaf Conrad +Portions (c) 2008-2014 by Volker Wichmann +Portions (c) 2005-2006 by Victor Olaya +Portions (c) 2002 by Andre Ringeler + +GNU Lesser General Public License (LGPL) + + +D. SAGA Modules +--------------- Please have a look at the module descriptions supplied with each module on information about the responsible authors. diff -Nru saga-2.1.0+dfsg/compile saga-2.1.4+dfsg/compile --- saga-2.1.0+dfsg/compile 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/compile 2014-11-13 08:33:28.000000000 +0000 @@ -0,0 +1,347 @@ +#! /bin/sh +# Wrapper for compilers which do not understand '-c -o'. + +scriptversion=2012-10-14.11; # UTC + +# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Written by Tom Tromey . +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# This file is maintained in Automake, please report +# bugs to or send patches to +# . + +nl=' +' + +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent tools from complaining about whitespace usage. +IFS=" "" $nl" + +file_conv= + +# func_file_conv build_file lazy +# Convert a $build file to $host form and store it in $file +# Currently only supports Windows hosts. If the determined conversion +# type is listed in (the comma separated) LAZY, no conversion will +# take place. +func_file_conv () +{ + file=$1 + case $file in + / | /[!/]*) # absolute file, and not a UNC file + if test -z "$file_conv"; then + # lazily determine how to convert abs files + case `uname -s` in + MINGW*) + file_conv=mingw + ;; + CYGWIN*) + file_conv=cygwin + ;; + *) + file_conv=wine + ;; + esac + fi + case $file_conv/,$2, in + *,$file_conv,*) + ;; + mingw/*) + file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` + ;; + cygwin/*) + file=`cygpath -m "$file" || echo "$file"` + ;; + wine/*) + file=`winepath -w "$file" || echo "$file"` + ;; + esac + ;; + esac +} + +# func_cl_dashL linkdir +# Make cl look for libraries in LINKDIR +func_cl_dashL () +{ + func_file_conv "$1" + if test -z "$lib_path"; then + lib_path=$file + else + lib_path="$lib_path;$file" + fi + linker_opts="$linker_opts -LIBPATH:$file" +} + +# func_cl_dashl library +# Do a library search-path lookup for cl +func_cl_dashl () +{ + lib=$1 + found=no + save_IFS=$IFS + IFS=';' + for dir in $lib_path $LIB + do + IFS=$save_IFS + if $shared && test -f "$dir/$lib.dll.lib"; then + found=yes + lib=$dir/$lib.dll.lib + break + fi + if test -f "$dir/$lib.lib"; then + found=yes + lib=$dir/$lib.lib + break + fi + if test -f "$dir/lib$lib.a"; then + found=yes + lib=$dir/lib$lib.a + break + fi + done + IFS=$save_IFS + + if test "$found" != yes; then + lib=$lib.lib + fi +} + +# func_cl_wrapper cl arg... +# Adjust compile command to suit cl +func_cl_wrapper () +{ + # Assume a capable shell + lib_path= + shared=: + linker_opts= + for arg + do + if test -n "$eat"; then + eat= + else + case $1 in + -o) + # configure might choose to run compile as 'compile cc -o foo foo.c'. + eat=1 + case $2 in + *.o | *.[oO][bB][jJ]) + func_file_conv "$2" + set x "$@" -Fo"$file" + shift + ;; + *) + func_file_conv "$2" + set x "$@" -Fe"$file" + shift + ;; + esac + ;; + -I) + eat=1 + func_file_conv "$2" mingw + set x "$@" -I"$file" + shift + ;; + -I*) + func_file_conv "${1#-I}" mingw + set x "$@" -I"$file" + shift + ;; + -l) + eat=1 + func_cl_dashl "$2" + set x "$@" "$lib" + shift + ;; + -l*) + func_cl_dashl "${1#-l}" + set x "$@" "$lib" + shift + ;; + -L) + eat=1 + func_cl_dashL "$2" + ;; + -L*) + func_cl_dashL "${1#-L}" + ;; + -static) + shared=false + ;; + -Wl,*) + arg=${1#-Wl,} + save_ifs="$IFS"; IFS=',' + for flag in $arg; do + IFS="$save_ifs" + linker_opts="$linker_opts $flag" + done + IFS="$save_ifs" + ;; + -Xlinker) + eat=1 + linker_opts="$linker_opts $2" + ;; + -*) + set x "$@" "$1" + shift + ;; + *.cc | *.CC | *.cxx | *.CXX | *.[cC]++) + func_file_conv "$1" + set x "$@" -Tp"$file" + shift + ;; + *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO]) + func_file_conv "$1" mingw + set x "$@" "$file" + shift + ;; + *) + set x "$@" "$1" + shift + ;; + esac + fi + shift + done + if test -n "$linker_opts"; then + linker_opts="-link$linker_opts" + fi + exec "$@" $linker_opts + exit 1 +} + +eat= + +case $1 in + '') + echo "$0: No command. Try '$0 --help' for more information." 1>&2 + exit 1; + ;; + -h | --h*) + cat <<\EOF +Usage: compile [--help] [--version] PROGRAM [ARGS] + +Wrapper for compilers which do not understand '-c -o'. +Remove '-o dest.o' from ARGS, run PROGRAM with the remaining +arguments, and rename the output as expected. + +If you are trying to build a whole package this is not the +right script to run: please start by reading the file 'INSTALL'. + +Report bugs to . +EOF + exit $? + ;; + -v | --v*) + echo "compile $scriptversion" + exit $? + ;; + cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) + func_cl_wrapper "$@" # Doesn't return... + ;; +esac + +ofile= +cfile= + +for arg +do + if test -n "$eat"; then + eat= + else + case $1 in + -o) + # configure might choose to run compile as 'compile cc -o foo foo.c'. + # So we strip '-o arg' only if arg is an object. + eat=1 + case $2 in + *.o | *.obj) + ofile=$2 + ;; + *) + set x "$@" -o "$2" + shift + ;; + esac + ;; + *.c) + cfile=$1 + set x "$@" "$1" + shift + ;; + *) + set x "$@" "$1" + shift + ;; + esac + fi + shift +done + +if test -z "$ofile" || test -z "$cfile"; then + # If no '-o' option was seen then we might have been invoked from a + # pattern rule where we don't need one. That is ok -- this is a + # normal compilation that the losing compiler can handle. If no + # '.c' file was seen then we are probably linking. That is also + # ok. + exec "$@" +fi + +# Name of file we expect compiler to create. +cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'` + +# Create the lock directory. +# Note: use '[/\\:.-]' here to ensure that we don't use the same name +# that we are using for the .o file. Also, base the name on the expected +# object file name, since that is what matters with a parallel build. +lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d +while true; do + if mkdir "$lockdir" >/dev/null 2>&1; then + break + fi + sleep 1 +done +# FIXME: race condition here if user kills between mkdir and trap. +trap "rmdir '$lockdir'; exit 1" 1 2 15 + +# Run the compile. +"$@" +ret=$? + +if test -f "$cofile"; then + test "$cofile" = "$ofile" || mv "$cofile" "$ofile" +elif test -f "${cofile}bj"; then + test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile" +fi + +rmdir "$lockdir" +exit $ret + +# Local Variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: diff -Nru saga-2.1.0+dfsg/config.guess saga-2.1.4+dfsg/config.guess --- saga-2.1.0+dfsg/config.guess 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/config.guess 2014-11-13 08:33:28.000000000 +0000 @@ -1,14 +1,12 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 -# Free Software Foundation, Inc. +# Copyright 1992-2013 Free Software Foundation, Inc. -timestamp='2009-11-20' +timestamp='2013-06-10' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, but @@ -17,26 +15,22 @@ # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program; if not, see . # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - - -# Originally written by Per Bothner. Please send patches (context -# diff format) to and include a ChangeLog -# entry. +# the same distribution terms that you use for the rest of that +# program. This Exception is an additional permission under section 7 +# of the GNU General Public License, version 3 ("GPLv3"). # -# This script attempts to guess a canonical system name similar to -# config.sub. If it succeeds, it prints the system name on stdout, and -# exits with 0. Otherwise, it exits with 1. +# Originally written by Per Bothner. # # You can get the latest version of this script from: # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD +# +# Please send patches with a ChangeLog entry to config-patches@gnu.org. + me=`echo "$0" | sed -e 's,.*/,,'` @@ -56,8 +50,7 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +Copyright 1992-2013 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -139,12 +132,33 @@ UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown +case "${UNAME_SYSTEM}" in +Linux|GNU|GNU/*) + # If the system lacks a compiler, then just pick glibc. + # We could probably try harder. + LIBC=gnu + + eval $set_cc_for_build + cat <<-EOF > $dummy.c + #include + #if defined(__UCLIBC__) + LIBC=uclibc + #elif defined(__dietlibc__) + LIBC=dietlibc + #else + LIBC=gnu + #endif + EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` + ;; +esac + # Note: order is significant - the case branches are not exclusive. case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in *:NetBSD:*:*) # NetBSD (nbsd) targets should (where applicable) match one or - # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, + # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently # switched to ELF, *-*-netbsd* would select the old # object file format. This provides both forward @@ -180,7 +194,7 @@ fi ;; *) - os=netbsd + os=netbsd ;; esac # The OS release @@ -201,6 +215,10 @@ # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. echo "${machine}-${os}${release}" exit ;; + *:Bitrig:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} + exit ;; *:OpenBSD:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} @@ -223,7 +241,7 @@ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` ;; *5.*) - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` ;; esac # According to Compaq, /usr/sbin/psrinfo has been available on @@ -269,7 +287,10 @@ # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - exit ;; + # Reset EXIT trap before exiting to avoid spurious non-zero exit code. + exitcode=$? + trap '' 0 + exit $exitcode ;; Alpha\ *:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # Should we change UNAME_MACHINE based on the output of uname instead @@ -295,12 +316,12 @@ echo s390-ibm-zvmoe exit ;; *:OS400:*:*) - echo powerpc-ibm-os400 + echo powerpc-ibm-os400 exit ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} exit ;; - arm:riscos:*:*|arm:RISCOS:*:*) + arm*:riscos:*:*|arm*:RISCOS:*:*) echo arm-unknown-riscos exit ;; SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) @@ -394,23 +415,23 @@ # MiNT. But MiNT is downward compatible to TOS, so this should # be no problem. atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} + echo m68k-atari-mint${UNAME_RELEASE} exit ;; atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) echo m68k-atari-mint${UNAME_RELEASE} - exit ;; + exit ;; *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} + echo m68k-atari-mint${UNAME_RELEASE} exit ;; milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) - echo m68k-milan-mint${UNAME_RELEASE} - exit ;; + echo m68k-milan-mint${UNAME_RELEASE} + exit ;; hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) - echo m68k-hades-mint${UNAME_RELEASE} - exit ;; + echo m68k-hades-mint${UNAME_RELEASE} + exit ;; *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) - echo m68k-unknown-mint${UNAME_RELEASE} - exit ;; + echo m68k-unknown-mint${UNAME_RELEASE} + exit ;; m68k:machten:*:*) echo m68k-apple-machten${UNAME_RELEASE} exit ;; @@ -480,8 +501,8 @@ echo m88k-motorola-sysv3 exit ;; AViiON:dgux:*:*) - # DG/UX returns AViiON for all architectures - UNAME_PROCESSOR=`/usr/bin/uname -p` + # DG/UX returns AViiON for all architectures + UNAME_PROCESSOR=`/usr/bin/uname -p` if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] then if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ @@ -494,7 +515,7 @@ else echo i586-dg-dgux${UNAME_RELEASE} fi - exit ;; + exit ;; M88*:DolphinOS:*:*) # DolphinOS (SVR3) echo m88k-dolphin-sysv3 exit ;; @@ -551,7 +572,7 @@ echo rs6000-ibm-aix3.2 fi exit ;; - *:AIX:*:[456]) + *:AIX:*:[4567]) IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000 @@ -594,52 +615,52 @@ 9000/[678][0-9][0-9]) if [ -x /usr/bin/getconf ]; then sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` - sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` - case "${sc_cpu_version}" in - 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 - 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 - 532) # CPU_PA_RISC2_0 - case "${sc_kernel_bits}" in - 32) HP_ARCH="hppa2.0n" ;; - 64) HP_ARCH="hppa2.0w" ;; + sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` + case "${sc_cpu_version}" in + 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 + 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 + 532) # CPU_PA_RISC2_0 + case "${sc_kernel_bits}" in + 32) HP_ARCH="hppa2.0n" ;; + 64) HP_ARCH="hppa2.0w" ;; '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 - esac ;; - esac + esac ;; + esac fi if [ "${HP_ARCH}" = "" ]; then eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + sed 's/^ //' << EOF >$dummy.c + + #define _HPUX_SOURCE + #include + #include - #define _HPUX_SOURCE - #include - #include - - int main () - { - #if defined(_SC_KERNEL_BITS) - long bits = sysconf(_SC_KERNEL_BITS); - #endif - long cpu = sysconf (_SC_CPU_VERSION); - - switch (cpu) - { - case CPU_PA_RISC1_0: puts ("hppa1.0"); break; - case CPU_PA_RISC1_1: puts ("hppa1.1"); break; - case CPU_PA_RISC2_0: - #if defined(_SC_KERNEL_BITS) - switch (bits) - { - case 64: puts ("hppa2.0w"); break; - case 32: puts ("hppa2.0n"); break; - default: puts ("hppa2.0"); break; - } break; - #else /* !defined(_SC_KERNEL_BITS) */ - puts ("hppa2.0"); break; - #endif - default: puts ("hppa1.0"); break; - } - exit (0); - } + int main () + { + #if defined(_SC_KERNEL_BITS) + long bits = sysconf(_SC_KERNEL_BITS); + #endif + long cpu = sysconf (_SC_CPU_VERSION); + + switch (cpu) + { + case CPU_PA_RISC1_0: puts ("hppa1.0"); break; + case CPU_PA_RISC1_1: puts ("hppa1.1"); break; + case CPU_PA_RISC2_0: + #if defined(_SC_KERNEL_BITS) + switch (bits) + { + case 64: puts ("hppa2.0w"); break; + case 32: puts ("hppa2.0n"); break; + default: puts ("hppa2.0"); break; + } break; + #else /* !defined(_SC_KERNEL_BITS) */ + puts ("hppa2.0"); break; + #endif + default: puts ("hppa1.0"); break; + } + exit (0); + } EOF (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` test -z "$HP_ARCH" && HP_ARCH=hppa @@ -730,22 +751,22 @@ exit ;; C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) echo c1-convex-bsd - exit ;; + exit ;; C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) if getsysinfo -f scalar_acc then echo c32-convex-bsd else echo c2-convex-bsd fi - exit ;; + exit ;; C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) echo c34-convex-bsd - exit ;; + exit ;; C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) echo c38-convex-bsd - exit ;; + exit ;; C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) echo c4-convex-bsd - exit ;; + exit ;; CRAY*Y-MP:*:*:*) echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit ;; @@ -769,14 +790,14 @@ exit ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` - echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit ;; + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` + echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit ;; 5000:UNIX_System_V:4.*:*) - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` - echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` + echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} @@ -788,30 +809,35 @@ echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} exit ;; *:FreeBSD:*:*) - case ${UNAME_MACHINE} in - pc98) - echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + UNAME_PROCESSOR=`/usr/bin/uname -p` + case ${UNAME_PROCESSOR} in amd64) echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; *) - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; esac exit ;; i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin exit ;; + *:MINGW64*:*) + echo ${UNAME_MACHINE}-pc-mingw64 + exit ;; *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; + i*:MSYS*:*) + echo ${UNAME_MACHINE}-pc-msys + exit ;; i*:windows32*:*) - # uname -m includes "-pc" on this system. - echo ${UNAME_MACHINE}-mingw32 + # uname -m includes "-pc" on this system. + echo ${UNAME_MACHINE}-mingw32 exit ;; i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit ;; *:Interix*:*) - case ${UNAME_MACHINE} in + case ${UNAME_MACHINE} in x86) echo i586-pc-interix${UNAME_RELEASE} exit ;; @@ -848,15 +874,22 @@ exit ;; *:GNU:*:*) # the GNU system - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` + echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` exit ;; *:GNU/*:*:*) # other systems with GNU libc and userland - echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} exit ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix exit ;; + aarch64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + aarch64_be:Linux:*:*) + UNAME_MACHINE=aarch64_be + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in EV5) UNAME_MACHINE=alphaev5 ;; @@ -866,52 +899,56 @@ EV6) UNAME_MACHINE=alphaev6 ;; EV67) UNAME_MACHINE=alphaev67 ;; EV68*) UNAME_MACHINE=alphaev68 ;; - esac + esac objdump --private-headers /bin/sh | grep -q ld.so.1 - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} + if test "$?" = 0 ; then LIBC="gnulibc1" ; fi + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + arc:Linux:*:* | arceb:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; arm*:Linux:*:*) eval $set_cc_for_build if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_EABI__ then - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} else - echo ${UNAME_MACHINE}-unknown-linux-gnueabi + if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_PCS_VFP + then + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi + else + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf + fi fi exit ;; avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; cris:Linux:*:*) - echo cris-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-${LIBC} exit ;; crisv32:Linux:*:*) - echo crisv32-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-${LIBC} exit ;; frv:Linux:*:*) - echo frv-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + hexagon:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; i*86:Linux:*:*) - LIBC=gnu - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #ifdef __dietlibc__ - LIBC=dietlibc - #endif -EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` - echo "${UNAME_MACHINE}-pc-linux-${LIBC}" + echo ${UNAME_MACHINE}-pc-linux-${LIBC} exit ;; ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; m32r*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; mips:Linux:*:* | mips64:Linux:*:*) eval $set_cc_for_build @@ -930,51 +967,63 @@ #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } ;; + or1k:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; or32:Linux:*:*) - echo or32-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; padre:Linux:*:*) - echo sparc-unknown-linux-gnu + echo sparc-unknown-linux-${LIBC} exit ;; parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-gnu + echo hppa64-unknown-linux-${LIBC} exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in - PA7*) echo hppa1.1-unknown-linux-gnu ;; - PA8*) echo hppa2.0-unknown-linux-gnu ;; - *) echo hppa-unknown-linux-gnu ;; + PA7*) echo hppa1.1-unknown-linux-${LIBC} ;; + PA8*) echo hppa2.0-unknown-linux-${LIBC} ;; + *) echo hppa-unknown-linux-${LIBC} ;; esac exit ;; ppc64:Linux:*:*) - echo powerpc64-unknown-linux-gnu + echo powerpc64-unknown-linux-${LIBC} exit ;; ppc:Linux:*:*) - echo powerpc-unknown-linux-gnu + echo powerpc-unknown-linux-${LIBC} + exit ;; + ppc64le:Linux:*:*) + echo powerpc64le-unknown-linux-${LIBC} + exit ;; + ppcle:Linux:*:*) + echo powerpcle-unknown-linux-${LIBC} exit ;; s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux + echo ${UNAME_MACHINE}-ibm-linux-${LIBC} exit ;; sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + tile*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; vax:Linux:*:*) - echo ${UNAME_MACHINE}-dec-linux-gnu + echo ${UNAME_MACHINE}-dec-linux-${LIBC} exit ;; x86_64:Linux:*:*) - echo x86_64-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; xtensa*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. @@ -983,11 +1032,11 @@ echo i386-sequent-sysv4 exit ;; i*86:UNIX_SV:4.2MP:2.*) - # Unixware is an offshoot of SVR4, but it has its own version - # number series starting with 2... - # I am not positive that other SVR4 systems won't match this, + # Unixware is an offshoot of SVR4, but it has its own version + # number series starting with 2... + # I am not positive that other SVR4 systems won't match this, # I just have to hope. -- rms. - # Use sysv4.2uw... so that sysv4* matches it. + # Use sysv4.2uw... so that sysv4* matches it. echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} exit ;; i*86:OS/2:*:*) @@ -1019,7 +1068,7 @@ fi exit ;; i*86:*:5:[678]*) - # UnixWare 7.x, OpenUNIX and OpenServer 6. + # UnixWare 7.x, OpenUNIX and OpenServer 6. case `/bin/uname -X | grep "^Machine"` in *486*) UNAME_MACHINE=i486 ;; *Pentium) UNAME_MACHINE=i586 ;; @@ -1047,13 +1096,13 @@ exit ;; pc:*:*:*) # Left here for compatibility: - # uname -m prints for DJGPP always 'pc', but it prints nothing about - # the processor, so we play safe by assuming i586. + # uname -m prints for DJGPP always 'pc', but it prints nothing about + # the processor, so we play safe by assuming i586. # Note: whatever this is, it MUST be the same as what config.sub # prints for the "djgpp" host, or else GDB configury will decide that # this is a cross-build. echo i586-pc-msdosdjgpp - exit ;; + exit ;; Intel:Mach:3*:*) echo i386-pc-mach3 exit ;; @@ -1088,8 +1137,8 @@ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4; exit; } ;; + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && { echo i486-ncr-sysv4; exit; } ;; NCR*:*:4.2:* | MPRAS*:*:4.2:*) OS_REL='.3' test -r /etc/.relid \ @@ -1132,10 +1181,10 @@ echo ns32k-sni-sysv fi exit ;; - PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort - # says - echo i586-unisys-sysv4 - exit ;; + PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort + # says + echo i586-unisys-sysv4 + exit ;; *:UNIX_System_V:4*:FTX*) # From Gerald Hewes . # How about differentiating between stratus architectures? -djm @@ -1161,11 +1210,11 @@ exit ;; R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) if [ -d /usr/nec ]; then - echo mips-nec-sysv${UNAME_RELEASE} + echo mips-nec-sysv${UNAME_RELEASE} else - echo mips-unknown-sysv${UNAME_RELEASE} + echo mips-unknown-sysv${UNAME_RELEASE} fi - exit ;; + exit ;; BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. echo powerpc-be-beos exit ;; @@ -1178,6 +1227,9 @@ BePC:Haiku:*:*) # Haiku running on Intel PC compatible. echo i586-pc-haiku exit ;; + x86_64:Haiku:*:*) + echo x86_64-unknown-haiku + exit ;; SX-4:SUPER-UX:*:*) echo sx4-nec-superux${UNAME_RELEASE} exit ;; @@ -1204,19 +1256,21 @@ exit ;; *:Darwin:*:*) UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown - case $UNAME_PROCESSOR in - i386) - eval $set_cc_for_build - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then - if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null - then - UNAME_PROCESSOR="x86_64" - fi - fi ;; - unknown) UNAME_PROCESSOR=powerpc ;; - esac + eval $set_cc_for_build + if test "$UNAME_PROCESSOR" = unknown ; then + UNAME_PROCESSOR=powerpc + fi + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + case $UNAME_PROCESSOR in + i386) UNAME_PROCESSOR=x86_64 ;; + powerpc) UNAME_PROCESSOR=powerpc64 ;; + esac + fi + fi echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} exit ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) @@ -1230,7 +1284,10 @@ *:QNX:*:4*) echo i386-pc-qnx exit ;; - NSE-?:NONSTOP_KERNEL:*:*) + NEO-?:NONSTOP_KERNEL:*:*) + echo neo-tandem-nsk${UNAME_RELEASE} + exit ;; + NSE-*:NONSTOP_KERNEL:*:*) echo nse-tandem-nsk${UNAME_RELEASE} exit ;; NSR-?:NONSTOP_KERNEL:*:*) @@ -1275,13 +1332,13 @@ echo pdp10-unknown-its exit ;; SEI:*:*:SEIUX) - echo mips-sei-seiux${UNAME_RELEASE} + echo mips-sei-seiux${UNAME_RELEASE} exit ;; *:DragonFly:*:*) echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` exit ;; *:*VMS:*:*) - UNAME_MACHINE=`(uname -p) 2>/dev/null` + UNAME_MACHINE=`(uname -p) 2>/dev/null` case "${UNAME_MACHINE}" in A*) echo alpha-dec-vms ; exit ;; I*) echo ia64-dec-vms ; exit ;; @@ -1299,11 +1356,11 @@ i*86:AROS:*:*) echo ${UNAME_MACHINE}-pc-aros exit ;; + x86_64:VMkernel:*:*) + echo ${UNAME_MACHINE}-unknown-esx + exit ;; esac -#echo '(No uname command or uname output not recognized.)' 1>&2 -#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 - eval $set_cc_for_build cat >$dummy.c < printf ("m68k-sony-newsos%s\n", #ifdef NEWSOS4 - "4" + "4" #else - "" + "" #endif - ); exit (0); + ); exit (0); #endif #endif diff -Nru saga-2.1.0+dfsg/config.h.in saga-2.1.4+dfsg/config.h.in --- saga-2.1.0+dfsg/config.h.in 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/config.h.in 2014-11-13 08:33:26.000000000 +0000 @@ -1,4 +1,4 @@ -/* config.h.in. Generated from configure.in by autoheader. */ +/* config.h.in. Generated from configure.ac by autoheader. */ /* Define if building universal (internal helper macro) */ #undef AC_APPLE_UNIVERSAL_BUILD @@ -40,6 +40,9 @@ /* Define to 1 if you have the `modf' function. */ #undef HAVE_MODF +/* Define to 1 if PostgreSQL libraries are available */ +#undef HAVE_POSTGRESQL + /* Define to 1 if you have the `pow' function. */ #undef HAVE_POW @@ -131,6 +134,9 @@ /* Define to the one symbol short name of this package. */ #undef PACKAGE_TARNAME +/* Define to the home page for this package. */ +#undef PACKAGE_URL + /* Define to the version of this package. */ #undef PACKAGE_VERSION diff -Nru saga-2.1.0+dfsg/config.sub saga-2.1.4+dfsg/config.sub --- saga-2.1.0+dfsg/config.sub 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/config.sub 2014-11-13 08:33:28.000000000 +0000 @@ -1,38 +1,31 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 -# Free Software Foundation, Inc. - -timestamp='2009-11-20' - -# This file is (in principle) common to ALL GNU software. -# The presence of a machine in this file suggests that SOME GNU software -# can handle that machine. It does not imply ALL GNU software can. -# -# This file is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# Copyright 1992-2013 Free Software Foundation, Inc. + +timestamp='2013-08-10' + +# This file is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program; if not, see . # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. +# the same distribution terms that you use for the rest of that +# program. This Exception is an additional permission under section 7 +# of the GNU General Public License, version 3 ("GPLv3"). -# Please send patches to . Submit a context -# diff and a properly formatted GNU ChangeLog entry. +# Please send patches with a ChangeLog entry to config-patches@gnu.org. # # Configuration subroutine to validate and canonicalize a configuration type. # Supply the specified configuration type as an argument. @@ -75,8 +68,7 @@ version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +Copyright 1992-2013 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -123,13 +115,18 @@ # Here we must recognize all the valid KERNEL-OS combinations. maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in - nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ - uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ + nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ + linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ + knetbsd*-gnu* | netbsd*-gnu* | \ kopensolaris*-gnu* | \ storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ;; + android-linux) + os=-linux-android + basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown + ;; *) basic_machine=`echo $1 | sed 's/-[^-]*$//'` if [ $basic_machine != $1 ] @@ -152,12 +149,12 @@ -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ - -apple | -axis | -knuth | -cray | -microblaze) + -apple | -axis | -knuth | -cray | -microblaze*) os= basic_machine=$1 ;; - -bluegene*) - os=-cnk + -bluegene*) + os=-cnk ;; -sim | -cisco | -oki | -wec | -winbond) os= @@ -173,10 +170,10 @@ os=-chorusos basic_machine=$1 ;; - -chorusrdb) - os=-chorusrdb + -chorusrdb) + os=-chorusrdb basic_machine=$1 - ;; + ;; -hiux*) os=-hiuxwe2 ;; @@ -221,6 +218,12 @@ -isc*) basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; + -lynx*178) + os=-lynxos178 + ;; + -lynx*5) + os=-lynxos5 + ;; -lynx*) os=-lynxos ;; @@ -245,20 +248,27 @@ # Some are omitted here because they have special meanings below. 1750a | 580 \ | a29k \ + | aarch64 | aarch64_be \ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ + | arc | arceb \ + | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ + | avr | avr32 \ + | be32 | be64 \ | bfin \ - | c4x | clipper \ + | c4x | c8051 | clipper \ | d10v | d30v | dlx | dsp16xx \ + | epiphany \ | fido | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ + | hexagon \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ + | le32 | le64 \ | lm32 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ - | maxq | mb | microblaze | mcore | mep | metag \ + | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ @@ -276,34 +286,45 @@ | mipsisa64r2 | mipsisa64r2el \ | mipsisa64sb1 | mipsisa64sb1el \ | mipsisa64sr71k | mipsisa64sr71kel \ + | mipsr5900 | mipsr5900el \ | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ | moxie \ | mt \ | msp430 \ - | nios | nios2 \ + | nds32 | nds32le | nds32be \ + | nios | nios2 | nios2eb | nios2el \ | ns16k | ns32k \ - | or32 \ + | open8 \ + | or1k | or32 \ | pdp10 | pdp11 | pj | pjl \ - | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ + | powerpc | powerpc64 | powerpc64le | powerpcle \ | pyramid \ - | rx \ + | rl78 | rx \ | score \ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ - | spu | strongarm \ - | tahoe | thumb | tic4x | tic80 | tron \ + | spu \ + | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ | ubicom32 \ - | v850 | v850e \ + | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ | we32k \ - | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ + | x86 | xc16x | xstormy16 | xtensa \ | z8k | z80) basic_machine=$basic_machine-unknown ;; - m6811 | m68hc11 | m6812 | m68hc12 | picochip) - # Motorola 68HC11/12. + c54x) + basic_machine=tic54x-unknown + ;; + c55x) + basic_machine=tic55x-unknown + ;; + c6x) + basic_machine=tic6x-unknown + ;; + m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) basic_machine=$basic_machine-unknown os=-none ;; @@ -313,6 +334,21 @@ basic_machine=mt-unknown ;; + strongarm | thumb | xscale) + basic_machine=arm-unknown + ;; + xgate) + basic_machine=$basic_machine-unknown + os=-none + ;; + xscaleeb) + basic_machine=armeb-unknown + ;; + + xscaleel) + basic_machine=armel-unknown + ;; + # We use `pc' rather than `unknown' # because (1) that's what they normally are, and # (2) the word "unknown" tends to confuse beginning users. @@ -327,25 +363,30 @@ # Recognize the basic CPU types with company name. 580-* \ | a29k-* \ + | aarch64-* | aarch64_be-* \ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* | avr32-* \ + | be32-* | be64-* \ | bfin-* | bs2000-* \ - | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ - | clipper-* | craynv-* | cydra-* \ + | c[123]* | c30-* | [cjt]90-* | c4x-* \ + | c8051-* | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ + | hexagon-* \ | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ + | le32-* | le64-* \ | lm32-* \ | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \ + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ + | microblaze-* | microblazeel-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ | mips64-* | mips64el-* \ @@ -363,29 +404,34 @@ | mipsisa64r2-* | mipsisa64r2el-* \ | mipsisa64sb1-* | mipsisa64sb1el-* \ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ + | mipsr5900-* | mipsr5900el-* \ | mipstx39-* | mipstx39el-* \ | mmix-* \ | mt-* \ | msp430-* \ - | nios-* | nios2-* \ + | nds32-* | nds32le-* | nds32be-* \ + | nios-* | nios2-* | nios2eb-* | nios2el-* \ | none-* | np1-* | ns16k-* | ns32k-* \ + | open8-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ + | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ | pyramid-* \ - | romp-* | rs6000-* | rx-* \ + | rl78-* | romp-* | rs6000-* | rx-* \ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ | sparclite-* \ - | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ - | tahoe-* | thumb-* \ - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ + | tahoe-* \ + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ + | tile*-* \ | tron-* \ | ubicom32-* \ - | v850-* | v850e-* | vax-* \ + | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ + | vax-* \ | we32k-* \ - | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ + | x86-* | x86_64-* | xc16x-* | xps100-* \ | xstormy16-* | xtensa*-* \ | ymp-* \ | z8k-* | z80-*) @@ -410,7 +456,7 @@ basic_machine=a29k-amd os=-udi ;; - abacus) + abacus) basic_machine=abacus-unknown ;; adobe68k) @@ -480,11 +526,20 @@ basic_machine=powerpc-ibm os=-cnk ;; + c54x-*) + basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + c55x-*) + basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + c6x-*) + basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; c90) basic_machine=c90-cray os=-unicos ;; - cegcc) + cegcc) basic_machine=arm-unknown os=-cegcc ;; @@ -516,7 +571,7 @@ basic_machine=craynv-cray os=-unicosmp ;; - cr16) + cr16 | cr16-*) basic_machine=cr16-unknown os=-elf ;; @@ -674,7 +729,6 @@ i370-ibm* | ibm*) basic_machine=i370-ibm ;; -# I'm not sure what "Sysv32" means. Should this be sysv3.2? i*86v32) basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` os=-sysv32 @@ -732,11 +786,15 @@ basic_machine=ns32k-utek os=-sysv ;; - microblaze) + microblaze*) basic_machine=microblaze-xilinx ;; + mingw64) + basic_machine=x86_64-pc + os=-mingw64 + ;; mingw32) - basic_machine=i386-pc + basic_machine=i686-pc os=-mingw32 ;; mingw32ce) @@ -771,10 +829,18 @@ ms1-*) basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` ;; + msys) + basic_machine=i686-pc + os=-msys + ;; mvs) basic_machine=i370-ibm os=-mvs ;; + nacl) + basic_machine=le32-unknown + os=-nacl + ;; ncr3000) basic_machine=i486-ncr os=-sysv4 @@ -839,6 +905,12 @@ np1) basic_machine=np1-gould ;; + neo-tandem) + basic_machine=neo-tandem + ;; + nse-tandem) + basic_machine=nse-tandem + ;; nsr-tandem) basic_machine=nsr-tandem ;; @@ -921,9 +993,10 @@ ;; power) basic_machine=power-ibm ;; - ppc) basic_machine=powerpc-unknown + ppc | ppcbe) basic_machine=powerpc-unknown ;; - ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` + ppc-* | ppcbe-*) + basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ppcle | powerpclittle | ppc-le | powerpc-little) basic_machine=powerpcle-unknown @@ -948,7 +1021,11 @@ basic_machine=i586-unknown os=-pw32 ;; - rdos) + rdos | rdos64) + basic_machine=x86_64-pc + os=-rdos + ;; + rdos32) basic_machine=i386-pc os=-rdos ;; @@ -1017,6 +1094,9 @@ basic_machine=i860-stratus os=-sysv4 ;; + strongarm-* | thumb-*) + basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; sun2) basic_machine=m68000-sun ;; @@ -1073,20 +1153,8 @@ basic_machine=t90-cray os=-unicos ;; - tic54x | c54x*) - basic_machine=tic54x-unknown - os=-coff - ;; - tic55x | c55x*) - basic_machine=tic55x-unknown - os=-coff - ;; - tic6x | c6x*) - basic_machine=tic6x-unknown - os=-coff - ;; tile*) - basic_machine=tile-unknown + basic_machine=$basic_machine-unknown os=-linux-gnu ;; tx39) @@ -1156,6 +1224,9 @@ xps | xps100) basic_machine=xps100-honeywell ;; + xscale-* | xscalee[bl]-*) + basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` + ;; ymp) basic_machine=ymp-cray os=-unicos @@ -1253,11 +1324,11 @@ if [ x"$os" != x"" ] then case $os in - # First match some system type aliases - # that might get confused with valid system types. + # First match some system type aliases + # that might get confused with valid system types. # -solaris* is a basic system type, with this one exception. - -auroraux) - os=-auroraux + -auroraux) + os=-auroraux ;; -solaris1 | -solaris1.*) os=`echo $os | sed -e 's|solaris1|sunos4|'` @@ -1281,20 +1352,21 @@ -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ - | -sym* | -kopensolaris* \ + | -sym* | -kopensolaris* | -plan9* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ | -aos* | -aros* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ - | -openbsd* | -solidbsd* \ + | -bitrig* | -openbsd* | -solidbsd* \ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* | -cegcc* \ - | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ + | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ + | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ + | -linux-newlib* | -linux-musl* | -linux-uclibc* \ | -uxpv* | -beos* | -mpeix* | -udk* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ @@ -1341,7 +1413,7 @@ -opened*) os=-openedition ;; - -os400*) + -os400*) os=-os400 ;; -wince*) @@ -1390,7 +1462,7 @@ -sinix*) os=-sysv4 ;; - -tpf*) + -tpf*) os=-tpf ;; -triton*) @@ -1426,15 +1498,14 @@ -aros*) os=-aros ;; - -kaos*) - os=-kaos - ;; -zvmoe) os=-zvmoe ;; -dicos*) os=-dicos ;; + -nacl*) + ;; -none) ;; *) @@ -1457,10 +1528,10 @@ # system, and we'll never get to this point. case $basic_machine in - score-*) + score-*) os=-elf ;; - spu-*) + spu-*) os=-elf ;; *-acorn) @@ -1472,8 +1543,23 @@ arm*-semi) os=-aout ;; - c4x-* | tic4x-*) - os=-coff + c4x-* | tic4x-*) + os=-coff + ;; + c8051-*) + os=-elf + ;; + hexagon-*) + os=-elf + ;; + tic54x-*) + os=-coff + ;; + tic55x-*) + os=-coff + ;; + tic6x-*) + os=-coff ;; # This must come before the *-dec entry. pdp10-*) @@ -1493,14 +1579,11 @@ ;; m68000-sun) os=-sunos3 - # This also exists in the configure program, but was not the - # default. - # os=-sunos4 ;; m68*-cisco) os=-aout ;; - mep-*) + mep-*) os=-elf ;; mips*-cisco) @@ -1509,6 +1592,9 @@ mips*-*) os=-elf ;; + or1k-*) + os=-elf + ;; or32-*) os=-coff ;; @@ -1527,7 +1613,7 @@ *-ibm) os=-aix ;; - *-knuth) + *-knuth) os=-mmixware ;; *-wec) diff -Nru saga-2.1.0+dfsg/configure saga-2.1.4+dfsg/configure --- saga-2.1.0+dfsg/configure 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/configure 2014-11-13 08:33:26.000000000 +0000 @@ -1,20 +1,22 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for saga 2.1.0. +# Generated by GNU Autoconf 2.69 for saga 2.1.4. # # Report bugs to . # -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# +# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. +# +# # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. -## --------------------- ## -## M4sh Initialization. ## -## --------------------- ## +## -------------------- ## +## M4sh Initialization. ## +## -------------------- ## # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : emulate sh NULLCMD=: # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which @@ -22,23 +24,15 @@ alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; + case `(set -o) 2>/dev/null` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; esac - fi - - -# PATH needs CR -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits - as_nl=' ' export as_nl @@ -46,7 +40,13 @@ as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo -if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then +# Prefer a ksh shell builtin over an external printf program on Solaris, +# but without wasting forks for bash or zsh. +if test -z "$BASH_VERSION$ZSH_VERSION" \ + && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='print -r --' + as_echo_n='print -rn --' +elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then as_echo='printf %s\n' as_echo_n='printf %s' else @@ -57,7 +57,7 @@ as_echo_body='eval expr "X$1" : "X\\(.*\\)"' as_echo_n_body='eval arg=$1; - case $arg in + case $arg in #( *"$as_nl"*) expr "X$arg" : "X\\(.*\\)$as_nl"; arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; @@ -80,13 +80,6 @@ } fi -# Support unset when possible. -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then - as_unset=unset -else - as_unset=false -fi - # IFS # We need space, tab and new line, in precisely that order. Quoting is @@ -96,15 +89,16 @@ IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. -case $0 in +as_myself= +case $0 in #(( *[\\/]* ) as_myself=$0 ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -done + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break + done IFS=$as_save_IFS ;; @@ -116,12 +110,16 @@ fi if test ! -f "$as_myself"; then $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 - { (exit 1); exit 1; } + exit 1 fi -# Work around bugs in pre-3.0 UWIN ksh. -for as_var in ENV MAIL MAILPATH -do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var +# Unset variables that we do not need and which cause bugs (e.g. in +# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" +# suppresses any "Segmentation fault" message there. '((' could +# trigger a bug in pdksh 5.2.14. +for as_var in BASH_ENV ENV MAIL MAILPATH +do eval test x\${$as_var+set} = xset \ + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : done PS1='$ ' PS2='> ' @@ -133,330 +131,353 @@ LANGUAGE=C export LANGUAGE -# Required to use basename. -if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr -else - as_expr=false -fi - -if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then - as_basename=basename -else - as_basename=false -fi - - -# Name of the executable. -as_me=`$as_basename -- "$0" || -$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X/"$0" | - sed '/^.*\/\([^/][^/]*\)\/*$/{ - s//\1/ - q - } - /^X\/\(\/\/\)$/{ - s//\1/ - q - } - /^X\/\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - # CDPATH. -$as_unset CDPATH - +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH +# Use a proper internal environment variable to ensure we don't fall + # into an infinite loop, continuously re-executing ourselves. + if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then + _as_can_reexec=no; export _as_can_reexec; + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +as_fn_exit 255 + fi + # We don't want this to propagate to other subprocesses. + { _as_can_reexec=; unset _as_can_reexec;} if test "x$CONFIG_SHELL" = x; then - if (eval ":") 2>/dev/null; then - as_have_required=yes + as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : + emulate sh + NULLCMD=: + # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which + # is contrary to our usage. Disable this feature. + alias -g '\${1+\"\$@\"}'='\"\$@\"' + setopt NO_GLOB_SUBST else - as_have_required=no + case \`(set -o) 2>/dev/null\` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; +esac fi - - if test $as_have_required = yes && (eval ": -(as_func_return () { - (exit \$1) -} -as_func_success () { - as_func_return 0 -} -as_func_failure () { - as_func_return 1 -} -as_func_ret_success () { - return 0 -} -as_func_ret_failure () { - return 1 -} +" + as_required="as_fn_return () { (exit \$1); } +as_fn_success () { as_fn_return 0; } +as_fn_failure () { as_fn_return 1; } +as_fn_ret_success () { return 0; } +as_fn_ret_failure () { return 1; } exitcode=0 -if as_func_success; then - : -else - exitcode=1 - echo as_func_success failed. -fi - -if as_func_failure; then - exitcode=1 - echo as_func_failure succeeded. -fi - -if as_func_ret_success; then - : -else - exitcode=1 - echo as_func_ret_success failed. -fi - -if as_func_ret_failure; then - exitcode=1 - echo as_func_ret_failure succeeded. -fi - -if ( set x; as_func_ret_success y && test x = \"\$1\" ); then - : +as_fn_success || { exitcode=1; echo as_fn_success failed.; } +as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; } +as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; } +as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } +if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : + +else + exitcode=1; echo positional parameters were not saved. +fi +test x\$exitcode = x0 || exit 1 +test -x / || exit 1" + as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO + as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO + eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && + test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1 + + test -n \"\${ZSH_VERSION+set}\${BASH_VERSION+set}\" || ( + ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' + ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO + ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO + PATH=/empty FPATH=/empty; export PATH FPATH + test \"X\`printf %s \$ECHO\`\" = \"X\$ECHO\" \\ + || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1 +test \$(( 1 + 1 )) = 2 || exit 1" + if (eval "$as_required") 2>/dev/null; then : + as_have_required=yes else - exitcode=1 - echo positional parameters were not saved. + as_have_required=no fi + if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then : -test \$exitcode = 0) || { (exit 1); exit 1; } - -( - as_lineno_1=\$LINENO - as_lineno_2=\$LINENO - test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" && - test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; } -") 2> /dev/null; then - : else - as_candidate_shells= - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +as_found=false for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - case $as_dir in + as_found=: + case $as_dir in #( /*) for as_base in sh bash ksh sh5; do - as_candidate_shells="$as_candidate_shells $as_dir/$as_base" + # Try only shells that exist, to save several forks. + as_shell=$as_dir/$as_base + if { test -f "$as_shell" || test -f "$as_shell.exe"; } && + { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then : + CONFIG_SHELL=$as_shell as_have_required=yes + if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then : + break 2 +fi +fi done;; esac + as_found=false done +$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } && + { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then : + CONFIG_SHELL=$SHELL as_have_required=yes +fi; } IFS=$as_save_IFS - for as_shell in $as_candidate_shells $SHELL; do - # Try only shells that exist, to save several forks. - if { test -f "$as_shell" || test -f "$as_shell.exe"; } && - { ("$as_shell") 2> /dev/null <<\_ASEOF -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; -esac - + if test "x$CONFIG_SHELL" != x; then : + export CONFIG_SHELL + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +exit 255 +fi + + if test x$as_have_required = xno; then : + $as_echo "$0: This script requires a shell more modern than all" + $as_echo "$0: the shells that I found on your system." + if test x${ZSH_VERSION+set} = xset ; then + $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" + $as_echo "$0: be upgraded to zsh 4.3.4 or later." + else + $as_echo "$0: Please tell bug-autoconf@gnu.org and BUG-REPORT-ADDRESS +$0: about your system, including any error possibly output +$0: before this message. Then install a modern shell, or +$0: manually run the script under such a shell if you do +$0: have one." + fi + exit 1 +fi fi - - -: -_ASEOF -}; then - CONFIG_SHELL=$as_shell - as_have_required=yes - if { "$as_shell" 2> /dev/null <<\_ASEOF -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; -esac - fi +SHELL=${CONFIG_SHELL-/bin/sh} +export SHELL +# Unset more variables known to interfere with behavior of common tools. +CLICOLOR_FORCE= GREP_OPTIONS= +unset CLICOLOR_FORCE GREP_OPTIONS +## --------------------- ## +## M4sh Shell Functions. ## +## --------------------- ## +# as_fn_unset VAR +# --------------- +# Portably unset VAR. +as_fn_unset () +{ + { eval $1=; unset $1;} +} +as_unset=as_fn_unset + +# as_fn_set_status STATUS +# ----------------------- +# Set $? to STATUS, without forking. +as_fn_set_status () +{ + return $1 +} # as_fn_set_status + +# as_fn_exit STATUS +# ----------------- +# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. +as_fn_exit () +{ + set +e + as_fn_set_status $1 + exit $1 +} # as_fn_exit + +# as_fn_mkdir_p +# ------------- +# Create "$as_dir" as a directory, including parents if necessary. +as_fn_mkdir_p () +{ -: -(as_func_return () { - (exit $1) -} -as_func_success () { - as_func_return 0 -} -as_func_failure () { - as_func_return 1 -} -as_func_ret_success () { - return 0 -} -as_func_ret_failure () { - return 1 -} + case $as_dir in #( + -*) as_dir=./$as_dir;; + esac + test -d "$as_dir" || eval $as_mkdir_p || { + as_dirs= + while :; do + case $as_dir in #( + *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *) as_qdir=$as_dir;; + esac + as_dirs="'$as_qdir' $as_dirs" + as_dir=`$as_dirname -- "$as_dir" || +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$as_dir" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + test -d "$as_dir" && break + done + test -z "$as_dirs" || eval "mkdir $as_dirs" + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" -exitcode=0 -if as_func_success; then - : -else - exitcode=1 - echo as_func_success failed. -fi -if as_func_failure; then - exitcode=1 - echo as_func_failure succeeded. -fi +} # as_fn_mkdir_p -if as_func_ret_success; then - : +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p +# as_fn_append VAR VALUE +# ---------------------- +# Append the text in VALUE to the end of the definition contained in VAR. Take +# advantage of any shell optimizations that allow amortized linear growth over +# repeated appends, instead of the typical quadratic growth present in naive +# implementations. +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : + eval 'as_fn_append () + { + eval $1+=\$2 + }' else - exitcode=1 - echo as_func_ret_success failed. -fi - -if as_func_ret_failure; then - exitcode=1 - echo as_func_ret_failure succeeded. -fi + as_fn_append () + { + eval $1=\$$1\$2 + } +fi # as_fn_append -if ( set x; as_func_ret_success y && test x = "$1" ); then - : +# as_fn_arith ARG... +# ------------------ +# Perform arithmetic evaluation on the ARGs, and store the result in the +# global $as_val. Take advantage of shells that can avoid forks. The arguments +# must be portable across $(()) and expr. +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : + eval 'as_fn_arith () + { + as_val=$(( $* )) + }' else - exitcode=1 - echo positional parameters were not saved. -fi - -test $exitcode = 0) || { (exit 1); exit 1; } - -( - as_lineno_1=$LINENO - as_lineno_2=$LINENO - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; } - -_ASEOF -}; then - break -fi - -fi - - done - - if test "x$CONFIG_SHELL" != x; then - for as_var in BASH_ENV ENV - do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var - done - export CONFIG_SHELL - exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} -fi - - - if test $as_have_required = no; then - echo This script requires a shell more modern than all the - echo shells that I found on your system. Please install a - echo modern shell, or manually run the script under such a - echo shell if you do have one. - { (exit 1); exit 1; } -fi - - -fi - -fi - + as_fn_arith () + { + as_val=`expr "$@" || test $? -eq 1` + } +fi # as_fn_arith -(eval "as_func_return () { - (exit \$1) -} -as_func_success () { - as_func_return 0 -} -as_func_failure () { - as_func_return 1 -} -as_func_ret_success () { - return 0 -} -as_func_ret_failure () { - return 1 -} +# as_fn_error STATUS ERROR [LINENO LOG_FD] +# ---------------------------------------- +# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are +# provided, also output the error to LOG_FD, referencing LINENO. Then exit the +# script with STATUS, using 1 if that was 0. +as_fn_error () +{ + as_status=$1; test $as_status -eq 0 && as_status=1 + if test "$4"; then + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + fi + $as_echo "$as_me: error: $2" >&2 + as_fn_exit $as_status +} # as_fn_error -exitcode=0 -if as_func_success; then - : +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then + as_expr=expr else - exitcode=1 - echo as_func_success failed. -fi - -if as_func_failure; then - exitcode=1 - echo as_func_failure succeeded. + as_expr=false fi -if as_func_ret_success; then - : +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then + as_basename=basename else - exitcode=1 - echo as_func_ret_success failed. -fi - -if as_func_ret_failure; then - exitcode=1 - echo as_func_ret_failure succeeded. + as_basename=false fi -if ( set x; as_func_ret_success y && test x = \"\$1\" ); then - : +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then + as_dirname=dirname else - exitcode=1 - echo positional parameters were not saved. + as_dirname=false fi -test \$exitcode = 0") || { - echo No shell found that supports shell functions. - echo Please tell bug-autoconf@gnu.org about your system, - echo including any error possibly output before this message. - echo This can help us improve future autoconf versions. - echo Configuration will now proceed without shell functions. -} +as_me=`$as_basename -- "$0" || +$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X/"$0" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ + s//\1/ + q + } + /^X\/\(\/\/\)$/{ + s//\1/ + q + } + /^X\/\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits - as_lineno_1=$LINENO - as_lineno_2=$LINENO - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { - - # Create $as_me.lineno as a copy of $as_myself, but with $LINENO - # uniformly replaced by the line number. The first 'sed' inserts a - # line-number line after each line using $LINENO; the second 'sed' - # does the real work. The second script uses 'N' to pair each - # line-number line with the line containing $LINENO, and appends - # trailing '-' during substitution so that $LINENO is not a special - # case at line end. - # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the - # scripts with optimization help from Paolo Bonzini. Blame Lee - # E. McMahon (1931-1989) for sed's syntax. :-) + as_lineno_1=$LINENO as_lineno_1a=$LINENO + as_lineno_2=$LINENO as_lineno_2a=$LINENO + eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" && + test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || { + # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-) sed -n ' p /[$]LINENO/= @@ -473,9 +494,12 @@ s/-\n.*// ' >$as_me.lineno && chmod +x "$as_me.lineno" || - { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 - { (exit 1); exit 1; }; } + { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + # If we had to re-execute with $CONFIG_SHELL, we're ensured to have + # already done that, so ensure we don't try to do so again and fall + # in an infinite loop. This has already happened in practice. + _as_can_reexec=no; export _as_can_reexec # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the # original and so on. Autoconf is especially sensitive to this). @@ -484,29 +508,18 @@ exit } - -if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then - as_dirname=dirname -else - as_dirname=false -fi - ECHO_C= ECHO_N= ECHO_T= -case `echo -n x` in +case `echo -n x` in #((((( -n*) - case `echo 'x\c'` in + case `echo 'xy\c'` in *c*) ECHO_T=' ';; # ECHO_T is single tab character. - *) ECHO_C='\c';; + xy) ECHO_C='\c';; + *) echo `echo ksh88 bug on AIX 6.1` > /dev/null + ECHO_T=' ';; esac;; *) ECHO_N='-n';; esac -if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr -else - as_expr=false -fi rm -f conf$$ conf$$.exe conf$$.file if test -d conf$$.dir; then @@ -521,49 +534,29 @@ # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null if mkdir -p . 2>/dev/null; then - as_mkdir_p=: + as_mkdir_p='mkdir -p "$as_dir"' else test -d ./-p && rmdir ./-p as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -571,161 +564,14 @@ # Sed expression to map a string onto a valid variable name. as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" - - - -# Check that we are running under the correct shell. SHELL=${CONFIG_SHELL-/bin/sh} -case X$lt_ECHO in -X*--fallback-echo) - # Remove one level of quotation (which was required for Make). - ECHO=`echo "$lt_ECHO" | sed 's,\\\\\$\\$0,'$0','` - ;; -esac - -ECHO=${lt_ECHO-echo} -if test "X$1" = X--no-reexec; then - # Discard the --no-reexec flag, and continue. - shift -elif test "X$1" = X--fallback-echo; then - # Avoid inline document here, it may be left over - : -elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then - # Yippee, $ECHO works! - : -else - # Restart under the correct shell. - exec $SHELL "$0" --no-reexec ${1+"$@"} -fi - -if test "X$1" = X--fallback-echo; then - # used as fallback echo - shift - cat <<_LT_EOF -$* -_LT_EOF - exit 0 -fi - -# The HP-UX ksh and POSIX shell print the target directory to stdout -# if CDPATH is set. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH - -if test -z "$lt_ECHO"; then - if test "X${echo_test_string+set}" != Xset; then - # find a string as large as possible, as long as the shell can cope with it - for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do - # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... - if { echo_test_string=`eval $cmd`; } 2>/dev/null && - { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null - then - break - fi - done - fi - - if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && - echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - : - else - # The Solaris, AIX, and Digital Unix default echo programs unquote - # backslashes. This makes it impossible to quote backslashes using - # echo "$something" | sed 's/\\/\\\\/g' - # - # So, first we look for a working echo in the user's PATH. - - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for dir in $PATH /usr/ucb; do - IFS="$lt_save_ifs" - if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && - test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && - echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - ECHO="$dir/echo" - break - fi - done - IFS="$lt_save_ifs" - - if test "X$ECHO" = Xecho; then - # We didn't find a better echo, so look for alternatives. - if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' && - echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - # This shell has a builtin print -r that does the trick. - ECHO='print -r' - elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } && - test "X$CONFIG_SHELL" != X/bin/ksh; then - # If we have ksh, try running configure again with it. - ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} - export ORIGINAL_CONFIG_SHELL - CONFIG_SHELL=/bin/ksh - export CONFIG_SHELL - exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"} - else - # Try using printf. - ECHO='printf %s\n' - if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && - echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - # Cool, printf works - : - elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` && - test "X$echo_testing_string" = 'X\t' && - echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL - export CONFIG_SHELL - SHELL="$CONFIG_SHELL" - export SHELL - ECHO="$CONFIG_SHELL $0 --fallback-echo" - elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` && - test "X$echo_testing_string" = 'X\t' && - echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - ECHO="$CONFIG_SHELL $0 --fallback-echo" - else - # maybe with a smaller string... - prev=: - - for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do - if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null - then - break - fi - prev="$cmd" - done - - if test "$prev" != 'sed 50q "$0"'; then - echo_test_string=`eval $prev` - export echo_test_string - exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"} - else - # Oops. We lost completely, so just stick with echo. - ECHO=echo - fi - fi - fi - fi - fi -fi - -# Copy echo and quote the copy suitably for passing to libtool from -# the Makefile, instead of quoting the original, which is used later. -lt_ECHO=$ECHO -if test "X$lt_ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then - lt_ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo" -fi - - - -exec 7<&0 &1 +test -n "$DJDIR" || exec 7<&0 &1 # Name of the host. -# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, +# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status, # so uname gets run too. ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` @@ -740,14 +586,14 @@ subdirs= MFLAGS= MAKEFLAGS= -SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='saga' PACKAGE_TARNAME='saga' -PACKAGE_VERSION='2.1.0' -PACKAGE_STRING='saga 2.1.0' +PACKAGE_VERSION='2.1.4' +PACKAGE_STRING='saga 2.1.4' PACKAGE_BUGREPORT='BUG-REPORT-ADDRESS' +PACKAGE_URL='' ac_unique_file="src/saga_core/saga_gui/wksp_data_menu_files.cpp" # Factoring default headers for most tests. @@ -828,6 +674,12 @@ WITH_GUI_TRUE DEBUG_FALSE DEBUG_TRUE +HAVE_POSTGRESQL_FALSE +HAVE_POSTGRESQL_TRUE +POSTGRESQL_LDFLAGS +POSTGRESQL_CFLAGS +POSTGRESQL_VERSION +PG_CONFIG SAGA_UNICODE_FALSE SAGA_UNICODE_TRUE LOCAL_INCS @@ -841,9 +693,11 @@ LIPO NMEDIT DSYMUTIL -lt_ECHO +MANIFEST_TOOL RANLIB +ac_ct_AR AR +DLLTOOL OBJDUMP LN_S NM @@ -872,6 +726,7 @@ am__fastdepCXX_FALSE am__fastdepCXX_TRUE CXXDEPMODE +am__nodep AMDEPBACKSLASH AMDEP_FALSE AMDEP_TRUE @@ -885,6 +740,10 @@ LDFLAGS CXXFLAGS CXX +AM_BACKSLASH +AM_DEFAULT_VERBOSITY +AM_DEFAULT_V +AM_V am__untar am__tar AMTAR @@ -938,6 +797,7 @@ program_transform_name prefix exec_prefix +PACKAGE_URL PACKAGE_BUGREPORT PACKAGE_STRING PACKAGE_VERSION @@ -948,14 +808,17 @@ ac_subst_files='' ac_user_opts=' enable_option_checking +enable_silent_rules enable_dependency_tracking enable_shared enable_static with_pic enable_fast_install with_gnu_ld +with_sysroot enable_libtool_lock with_local +with_postgresql enable_debug enable_gui enable_odbc @@ -975,6 +838,7 @@ CFLAGS CPP CXXCPP +PYTHON PYTHON_VERSION' @@ -1038,8 +902,9 @@ fi case $ac_option in - *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; - *) ac_optarg=yes ;; + *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; + *=) ac_optarg= ;; + *) ac_optarg=yes ;; esac # Accept the important Cygnus configure options, so we can diagnose typos. @@ -1084,8 +949,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2 - { (exit 1); exit 1; }; } + as_fn_error $? "invalid feature name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1111,8 +975,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2 - { (exit 1); exit 1; }; } + as_fn_error $? "invalid feature name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1316,8 +1179,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2 - { (exit 1); exit 1; }; } + as_fn_error $? "invalid package name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1333,8 +1195,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2 - { (exit 1); exit 1; }; } + as_fn_error $? "invalid package name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1364,17 +1225,17 @@ | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) x_libraries=$ac_optarg ;; - -*) { $as_echo "$as_me: error: unrecognized option: $ac_option -Try \`$0 --help' for more information." >&2 - { (exit 1); exit 1; }; } + -*) as_fn_error $? "unrecognized option: \`$ac_option' +Try \`$0 --help' for more information" ;; *=*) ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` # Reject names that are not valid shell variable names. - expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && - { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2 - { (exit 1); exit 1; }; } + case $ac_envvar in #( + '' | [0-9]* | *[!_$as_cr_alnum]* ) + as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; + esac eval $ac_envvar=\$ac_optarg export $ac_envvar ;; @@ -1383,7 +1244,7 @@ $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 - : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} + : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" ;; esac @@ -1391,15 +1252,13 @@ if test -n "$ac_prev"; then ac_option=--`echo $ac_prev | sed 's/_/-/g'` - { $as_echo "$as_me: error: missing argument to $ac_option" >&2 - { (exit 1); exit 1; }; } + as_fn_error $? "missing argument to $ac_option" fi if test -n "$ac_unrecognized_opts"; then case $enable_option_checking in no) ;; - fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2 - { (exit 1); exit 1; }; } ;; + fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; esac fi @@ -1422,8 +1281,7 @@ [\\/$]* | ?:[\\/]* ) continue;; NONE | '' ) case $ac_var in *prefix ) continue;; esac;; esac - { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 - { (exit 1); exit 1; }; } + as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" done # There might be people who depend on the old broken behavior: `$host' @@ -1437,8 +1295,6 @@ if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used." >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes fi @@ -1453,11 +1309,9 @@ ac_pwd=`pwd` && test -n "$ac_pwd" && ac_ls_di=`ls -di .` && ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || - { $as_echo "$as_me: error: working directory cannot be determined" >&2 - { (exit 1); exit 1; }; } + as_fn_error $? "working directory cannot be determined" test "X$ac_ls_di" = "X$ac_pwd_ls_di" || - { $as_echo "$as_me: error: pwd does not report name of working directory" >&2 - { (exit 1); exit 1; }; } + as_fn_error $? "pwd does not report name of working directory" # Find the source files, if location was not specified. @@ -1496,13 +1350,11 @@ fi if test ! -r "$srcdir/$ac_unique_file"; then test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." - { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 - { (exit 1); exit 1; }; } + as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" fi ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" ac_abs_confdir=`( - cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2 - { (exit 1); exit 1; }; } + cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" pwd)` # When building in place, set srcdir=. if test "$ac_abs_confdir" = "$ac_pwd"; then @@ -1528,7 +1380,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures saga 2.1.0 to adapt to many kinds of systems. +\`configure' configures saga 2.1.4 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1542,7 +1394,7 @@ --help=short display options specific to this package --help=recursive display the short help of all the included packages -V, --version display version information and exit - -q, --quiet, --silent do not print \`checking...' messages + -q, --quiet, --silent do not print \`checking ...' messages --cache-file=FILE cache test results in FILE [disabled] -C, --config-cache alias for \`--cache-file=config.cache' -n, --no-create do not create output files @@ -1598,7 +1450,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of saga 2.1.0:";; + short | recursive ) echo "Configuration of saga 2.1.4:";; esac cat <<\_ACEOF @@ -1606,8 +1458,12 @@ --disable-option-checking ignore unrecognized --enable/--with options --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --disable-dependency-tracking speeds up one-time build - --enable-dependency-tracking do not reject slow dependency extractors + --enable-silent-rules less verbose build output (undo: "make V=1") + --disable-silent-rules verbose build output (undo: "make V=0") + --enable-dependency-tracking + do not reject slow dependency extractors + --disable-dependency-tracking + speeds up one-time build --enable-shared[=PKGS] build shared libraries [default=yes] --enable-static[=PKGS] build static libraries [default=yes] --enable-fast-install[=PKGS] @@ -1622,10 +1478,14 @@ Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --with-pic try to use only PIC/non-PIC objects [default=use + --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] + --with-sysroot=DIR Search for dependent libraries within DIR + (or the compiler's sysroot if not specified). --with-local=dir search /usr/local or other directory for includes and libs + --with-postgresql=[ARG] use PostgreSQL library [default=yes], optionally + specify path to pg_config Some influential environment variables: CXX C++ compiler command @@ -1633,12 +1493,13 @@ LDFLAGS linker flags, e.g. -L if you have libraries in a nonstandard directory LIBS libraries to pass to the linker, e.g. -l - CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I if + CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if you have headers in a nonstandard directory CC C compiler command CFLAGS C compiler flags CPP C preprocessor CXXCPP C++ preprocessor + PYTHON the Python interpreter PYTHON_VERSION The installed Python version to use, for example '2.3'. This string will be appended to the Python interpreter canonical @@ -1710,467 +1571,976 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -saga configure 2.1.0 -generated by GNU Autoconf 2.63 +saga configure 2.1.4 +generated by GNU Autoconf 2.69 -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF exit fi -cat >config.log <<_ACEOF -This file contains any messages produced by compilers while -running configure, to aid debugging if configure makes a mistake. -It was created by saga $as_me 2.1.0, which was -generated by GNU Autoconf 2.63. Invocation command line was +## ------------------------ ## +## Autoconf initialization. ## +## ------------------------ ## + +# ac_fn_cxx_try_compile LINENO +# ---------------------------- +# Try to compile conftest.$ac_ext, and return whether this succeeded. +ac_fn_cxx_try_compile () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + rm -f conftest.$ac_objext + if { { ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compile") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval - $ $0 $@ +} # ac_fn_cxx_try_compile -_ACEOF -exec 5>>config.log +# ac_fn_c_try_compile LINENO +# -------------------------- +# Try to compile conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_compile () { -cat <<_ASUNAME -## --------- ## -## Platform. ## -## --------- ## + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + rm -f conftest.$ac_objext + if { { ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compile") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` -uname -m = `(uname -m) 2>/dev/null || echo unknown` -uname -r = `(uname -r) 2>/dev/null || echo unknown` -uname -s = `(uname -s) 2>/dev/null || echo unknown` -uname -v = `(uname -v) 2>/dev/null || echo unknown` + ac_retval=1 +fi + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval -/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` -/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` +} # ac_fn_c_try_compile -/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` -/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` -/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` -/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown` -/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` -/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` -/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` +# ac_fn_c_try_link LINENO +# ----------------------- +# Try to link conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_link () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + rm -f conftest.$ac_objext conftest$ac_exeext + if { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + test -x conftest$ac_exeext + }; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -_ASUNAME + ac_retval=1 +fi + # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information + # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would + # interfere with the next link command; also delete a directory that is + # left behind by Apple's compiler. We do this before executing the actions. + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - $as_echo "PATH: $as_dir" -done -IFS=$as_save_IFS +} # ac_fn_c_try_link -} >&5 +# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES +# ------------------------------------------------------- +# Tests whether HEADER exists and can be compiled using the include files in +# INCLUDES, setting the cache variable VAR accordingly. +ac_fn_c_check_header_compile () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +#include <$2> +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + eval "$3=yes" +else + eval "$3=no" +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno -cat >&5 <<_ACEOF +} # ac_fn_c_check_header_compile +# ac_fn_c_try_cpp LINENO +# ---------------------- +# Try to preprocess conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_cpp () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if { { ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } > conftest.i && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -## ----------- ## -## Core tests. ## -## ----------- ## + ac_retval=1 +fi + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval -_ACEOF +} # ac_fn_c_try_cpp +# ac_fn_c_try_run LINENO +# ---------------------- +# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes +# that executables *can* be run. +ac_fn_c_try_run () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { ac_try='./conftest$ac_exeext' + { { case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then : + ac_retval=0 +else + $as_echo "$as_me: program exited with status $ac_status" >&5 + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -# Keep a trace of the command line. -# Strip out --no-create and --no-recursion so they do not pile up. -# Strip out --silent because we don't want to record it for future runs. -# Also quote any args containing shell meta-characters. -# Make two passes to allow for proper duplicate-argument suppression. -ac_configure_args= -ac_configure_args0= -ac_configure_args1= -ac_must_keep_next=false -for ac_pass in 1 2 -do - for ac_arg - do - case $ac_arg in - -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;; - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil) - continue ;; - *\'*) - ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; - esac - case $ac_pass in - 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; - 2) - ac_configure_args1="$ac_configure_args1 '$ac_arg'" - if test $ac_must_keep_next = true; then - ac_must_keep_next=false # Got value, back to normal. - else - case $ac_arg in - *=* | --config-cache | -C | -disable-* | --disable-* \ - | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ - | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ - | -with-* | --with-* | -without-* | --without-* | --x) - case "$ac_configure_args0 " in - "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; - esac - ;; - -* ) ac_must_keep_next=true ;; - esac - fi - ac_configure_args="$ac_configure_args '$ac_arg'" - ;; - esac - done -done -$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; } -$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; } + ac_retval=$ac_status +fi + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval -# When interrupted or exit'd, cleanup temporary files, and complete -# config.log. We remove comments because anyway the quotes in there -# would cause problems or look ugly. -# WARNING: Use '\'' to represent an apostrophe within the trap. -# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. -trap 'exit_status=$? - # Save into config.log some information that might help in debugging. - { - echo +} # ac_fn_c_try_run - cat <<\_ASBOX -## ---------------- ## -## Cache variables. ## -## ---------------- ## -_ASBOX - echo - # The following way of writing the cache mishandles newlines in values, -( - for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do - eval ac_val=\$$ac_var - case $ac_val in #( - *${as_nl}*) - case $ac_var in #( - *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5 -$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; - esac - case $ac_var in #( - _ | IFS | as_nl) ;; #( - BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( - *) $as_unset $ac_var ;; - esac ;; - esac - done - (set) 2>&1 | - case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #( - *${as_nl}ac_space=\ *) - sed -n \ - "s/'\''/'\''\\\\'\'''\''/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p" - ;; #( - *) - sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" - ;; - esac | - sort -) - echo - - cat <<\_ASBOX -## ----------------- ## -## Output variables. ## -## ----------------- ## -_ASBOX - echo - for ac_var in $ac_subst_vars - do - eval ac_val=\$$ac_var - case $ac_val in - *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; - esac - $as_echo "$ac_var='\''$ac_val'\''" - done | sort - echo +# ac_fn_c_check_func LINENO FUNC VAR +# ---------------------------------- +# Tests whether FUNC exists, setting the cache variable VAR accordingly +ac_fn_c_check_func () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +/* Define $2 to an innocuous variant, in case declares $2. + For example, HP-UX 11i declares gettimeofday. */ +#define $2 innocuous_$2 - if test -n "$ac_subst_files"; then - cat <<\_ASBOX -## ------------------- ## -## File substitutions. ## -## ------------------- ## -_ASBOX - echo - for ac_var in $ac_subst_files - do - eval ac_val=\$$ac_var - case $ac_val in - *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; - esac - $as_echo "$ac_var='\''$ac_val'\''" - done | sort - echo - fi +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $2 (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ - if test -s confdefs.h; then - cat <<\_ASBOX -## ----------- ## -## confdefs.h. ## -## ----------- ## -_ASBOX - echo - cat confdefs.h - echo - fi - test "$ac_signal" != 0 && - $as_echo "$as_me: caught signal $ac_signal" - $as_echo "$as_me: exit $exit_status" - } >&5 - rm -f core *.core core.conftest.* && - rm -f -r conftest* confdefs* conf$$* $ac_clean_files && - exit $exit_status -' 0 -for ac_signal in 1 2 13 15; do - trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal -done -ac_signal=0 +#ifdef __STDC__ +# include +#else +# include +#endif -# confdefs.h avoids OS command line length limits that DEFS can exceed. -rm -f -r conftest* confdefs.h +#undef $2 -# Predefined preprocessor variables. +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char $2 (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_$2 || defined __stub___$2 +choke me +#endif -cat >>confdefs.h <<_ACEOF -#define PACKAGE_NAME "$PACKAGE_NAME" +int +main () +{ +return $2 (); + ; + return 0; +} _ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval "$3=yes" +else + eval "$3=no" +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno +} # ac_fn_c_check_func -cat >>confdefs.h <<_ACEOF -#define PACKAGE_TARNAME "$PACKAGE_TARNAME" -_ACEOF +# ac_fn_cxx_try_cpp LINENO +# ------------------------ +# Try to preprocess conftest.$ac_ext, and return whether this succeeded. +ac_fn_cxx_try_cpp () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if { { ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } > conftest.i && { + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || + test ! -s conftest.err + }; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_retval=1 +fi + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval -cat >>confdefs.h <<_ACEOF -#define PACKAGE_VERSION "$PACKAGE_VERSION" -_ACEOF +} # ac_fn_cxx_try_cpp +# ac_fn_cxx_try_link LINENO +# ------------------------- +# Try to link conftest.$ac_ext, and return whether this succeeded. +ac_fn_cxx_try_link () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + rm -f conftest.$ac_objext conftest$ac_exeext + if { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + test -x conftest$ac_exeext + }; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -cat >>confdefs.h <<_ACEOF -#define PACKAGE_STRING "$PACKAGE_STRING" -_ACEOF + ac_retval=1 +fi + # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information + # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would + # interfere with the next link command; also delete a directory that is + # left behind by Apple's compiler. We do this before executing the actions. + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval +} # ac_fn_cxx_try_link -cat >>confdefs.h <<_ACEOF -#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" +# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES +# ------------------------------------------------------- +# Tests whether HEADER exists, giving a warning if it cannot be compiled using +# the include files in INCLUDES and setting the cache variable VAR +# accordingly. +ac_fn_c_check_header_mongrel () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if eval \${$3+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +else + # Is the header compilable? +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5 +$as_echo_n "checking $2 usability... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +#include <$2> _ACEOF - - -# Let the site file select an alternate cache file if it wants to. -# Prefer an explicitly selected file to automatically selected ones. -ac_site_file1=NONE -ac_site_file2=NONE -if test -n "$CONFIG_SITE"; then - ac_site_file1=$CONFIG_SITE -elif test "x$prefix" != xNONE; then - ac_site_file1=$prefix/share/config.site - ac_site_file2=$prefix/etc/config.site +if ac_fn_c_try_compile "$LINENO"; then : + ac_header_compiler=yes else - ac_site_file1=$ac_default_prefix/share/config.site - ac_site_file2=$ac_default_prefix/etc/config.site + ac_header_compiler=no fi -for ac_site_file in "$ac_site_file1" "$ac_site_file2" -do - test "x$ac_site_file" = xNONE && continue - if test -r "$ac_site_file"; then - { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 -$as_echo "$as_me: loading site script $ac_site_file" >&6;} - sed 's/^/| /' "$ac_site_file" >&5 - . "$ac_site_file" - fi -done +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } -if test -r "$cache_file"; then - # Some versions of bash will fail to source /dev/null (special - # files actually), so we avoid doing that. - if test -f "$cache_file"; then - { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5 -$as_echo "$as_me: loading cache $cache_file" >&6;} - case $cache_file in - [\\/]* | ?:[\\/]* ) . "$cache_file";; - *) . "./$cache_file";; - esac - fi +# Is the header present? +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5 +$as_echo_n "checking $2 presence... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <$2> +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + ac_header_preproc=yes else - { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5 -$as_echo "$as_me: creating cache $cache_file" >&6;} - >$cache_file + ac_header_preproc=no fi +rm -f conftest.err conftest.i conftest.$ac_ext +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } -# Check that the precious variables saved in the cache have kept the same -# value. -ac_cache_corrupted=false -for ac_var in $ac_precious_vars; do - eval ac_old_set=\$ac_cv_env_${ac_var}_set - eval ac_new_set=\$ac_env_${ac_var}_set - eval ac_old_val=\$ac_cv_env_${ac_var}_value - eval ac_new_val=\$ac_env_${ac_var}_value - case $ac_old_set,$ac_new_set in - set,) - { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 -$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} - ac_cache_corrupted=: ;; - ,set) - { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 -$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} - ac_cache_corrupted=: ;; - ,);; - *) - if test "x$ac_old_val" != "x$ac_new_val"; then - # differences in whitespace do not lead to failure. - ac_old_val_w=`echo x $ac_old_val` - ac_new_val_w=`echo x $ac_new_val` - if test "$ac_old_val_w" != "$ac_new_val_w"; then - { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 -$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} - ac_cache_corrupted=: - else - { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 -$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} - eval $ac_var=\$ac_old_val - fi - { $as_echo "$as_me:$LINENO: former value: \`$ac_old_val'" >&5 -$as_echo "$as_me: former value: \`$ac_old_val'" >&2;} - { $as_echo "$as_me:$LINENO: current value: \`$ac_new_val'" >&5 -$as_echo "$as_me: current value: \`$ac_new_val'" >&2;} - fi;; - esac - # Pass precious variables to config.status. - if test "$ac_new_set" = set; then - case $ac_new_val in - *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; - *) ac_arg=$ac_var=$ac_new_val ;; - esac - case " $ac_configure_args " in - *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. - *) ac_configure_args="$ac_configure_args '$ac_arg'" ;; - esac - fi -done -if $ac_cache_corrupted; then - { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} - { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 -$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} - { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 -$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} - { (exit 1); exit 1; }; } +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #(( + yes:no: ) + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} + ;; + no:yes:* ) + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} +( $as_echo "## --------------------------------- ## +## Report this to BUG-REPORT-ADDRESS ## +## --------------------------------- ##" + ) | sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 +else + eval "$3=\$ac_header_compiler" fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +fi + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno +} # ac_fn_c_check_header_mongrel +# ac_fn_c_check_type LINENO TYPE VAR INCLUDES +# ------------------------------------------- +# Tests whether TYPE exists after having included INCLUDES, setting cache +# variable VAR accordingly. +ac_fn_c_check_type () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 +else + eval "$3=no" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +int +main () +{ +if (sizeof ($2)) + return 0; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +int +main () +{ +if (sizeof (($2))) + return 0; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : +else + eval "$3=yes" +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno +} # ac_fn_c_check_type +cat >config.log <<_ACEOF +This file contains any messages produced by compilers while +running configure, to aid debugging if configure makes a mistake. +It was created by saga $as_me 2.1.4, which was +generated by GNU Autoconf 2.69. Invocation command line was + $ $0 $@ +_ACEOF +exec 5>>config.log +{ +cat <<_ASUNAME +## --------- ## +## Platform. ## +## --------- ## +hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` +uname -m = `(uname -m) 2>/dev/null || echo unknown` +uname -r = `(uname -r) 2>/dev/null || echo unknown` +uname -s = `(uname -s) 2>/dev/null || echo unknown` +uname -v = `(uname -v) 2>/dev/null || echo unknown` +/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` +/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` +/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` +/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` +/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` +/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown` +/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` +/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` +/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` +_ASUNAME +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + $as_echo "PATH: $as_dir" + done +IFS=$as_save_IFS +} >&5 +cat >&5 <<_ACEOF +## ----------- ## +## Core tests. ## +## ----------- ## +_ACEOF +# Keep a trace of the command line. +# Strip out --no-create and --no-recursion so they do not pile up. +# Strip out --silent because we don't want to record it for future runs. +# Also quote any args containing shell meta-characters. +# Make two passes to allow for proper duplicate-argument suppression. +ac_configure_args= +ac_configure_args0= +ac_configure_args1= +ac_must_keep_next=false +for ac_pass in 1 2 +do + for ac_arg + do + case $ac_arg in + -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;; + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil) + continue ;; + *\'*) + ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + case $ac_pass in + 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;; + 2) + as_fn_append ac_configure_args1 " '$ac_arg'" + if test $ac_must_keep_next = true; then + ac_must_keep_next=false # Got value, back to normal. + else + case $ac_arg in + *=* | --config-cache | -C | -disable-* | --disable-* \ + | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ + | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ + | -with-* | --with-* | -without-* | --without-* | --x) + case "$ac_configure_args0 " in + "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; + esac + ;; + -* ) ac_must_keep_next=true ;; + esac + fi + as_fn_append ac_configure_args " '$ac_arg'" + ;; + esac + done +done +{ ac_configure_args0=; unset ac_configure_args0;} +{ ac_configure_args1=; unset ac_configure_args1;} +# When interrupted or exit'd, cleanup temporary files, and complete +# config.log. We remove comments because anyway the quotes in there +# would cause problems or look ugly. +# WARNING: Use '\'' to represent an apostrophe within the trap. +# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. +trap 'exit_status=$? + # Save into config.log some information that might help in debugging. + { + echo + $as_echo "## ---------------- ## +## Cache variables. ## +## ---------------- ##" + echo + # The following way of writing the cache mishandles newlines in values, +( + for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do + eval ac_val=\$$ac_var + case $ac_val in #( + *${as_nl}*) + case $ac_var in #( + *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 +$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; + esac + case $ac_var in #( + _ | IFS | as_nl) ;; #( + BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( + *) { eval $ac_var=; unset $ac_var;} ;; + esac ;; + esac + done + (set) 2>&1 | + case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #( + *${as_nl}ac_space=\ *) + sed -n \ + "s/'\''/'\''\\\\'\'''\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p" + ;; #( + *) + sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" + ;; + esac | + sort +) + echo + $as_echo "## ----------------- ## +## Output variables. ## +## ----------------- ##" + echo + for ac_var in $ac_subst_vars + do + eval ac_val=\$$ac_var + case $ac_val in + *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + esac + $as_echo "$ac_var='\''$ac_val'\''" + done | sort + echo - - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - - -ac_config_headers="$ac_config_headers config.h" - -am__api_version='1.11' - -ac_aux_dir= -for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do - if test -f "$ac_dir/install-sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install-sh -c" - break - elif test -f "$ac_dir/install.sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install.sh -c" - break - elif test -f "$ac_dir/shtool"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/shtool install -c" - break - fi + if test -n "$ac_subst_files"; then + $as_echo "## ------------------- ## +## File substitutions. ## +## ------------------- ##" + echo + for ac_var in $ac_subst_files + do + eval ac_val=\$$ac_var + case $ac_val in + *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + esac + $as_echo "$ac_var='\''$ac_val'\''" + done | sort + echo + fi + + if test -s confdefs.h; then + $as_echo "## ----------- ## +## confdefs.h. ## +## ----------- ##" + echo + cat confdefs.h + echo + fi + test "$ac_signal" != 0 && + $as_echo "$as_me: caught signal $ac_signal" + $as_echo "$as_me: exit $exit_status" + } >&5 + rm -f core *.core core.conftest.* && + rm -f -r conftest* confdefs* conf$$* $ac_clean_files && + exit $exit_status +' 0 +for ac_signal in 1 2 13 15; do + trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal done -if test -z "$ac_aux_dir"; then - { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5 -$as_echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;} - { (exit 1); exit 1; }; } -fi +ac_signal=0 -# These three variables are undocumented and unsupported, -# and are intended to be withdrawn in a future Autoconf release. -# They can cause serious problems if a builder's source tree is in a directory -# whose full name contains unusual characters. -ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. -ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. -ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. +# confdefs.h avoids OS command line length limits that DEFS can exceed. +rm -f -r conftest* confdefs.h +$as_echo "/* confdefs.h */" > confdefs.h -# Find a good install program. We prefer a C program (faster), -# so one script is as good as another. But avoid the broken or -# incompatible versions: -# SysV /etc/install, /usr/sbin/install -# SunOS /usr/etc/install -# IRIX /sbin/install -# AIX /bin/install -# AmigaOS /C/install, which installs bootblocks on floppy discs -# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag -# AFS /usr/afsws/bin/install, which mishandles nonexistent args -# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" -# OS/2's system install, which has a completely different semantic -# ./install, which can be erroneously created by make from ./install.sh. -# Reject install programs that cannot install multiple files. -{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 -$as_echo_n "checking for a BSD-compatible install... " >&6; } -if test -z "$INSTALL"; then -if test "${ac_cv_path_install+set}" = set; then - $as_echo_n "(cached) " >&6 -else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - # Account for people who put trailing slashes in PATH elements. -case $as_dir/ in - ./ | .// | /cC/* | \ - /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ - ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \ - /usr/ucb/* ) ;; - *) - # OSF1 and SCO ODT 3.0 have their own names for install. - # Don't use installbsd from OSF since it installs stuff as root - # by default. - for ac_prog in ginstall scoinst install; do - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then - if test $ac_prog = install && - grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # AIX install. It has an incompatible calling convention. - : - elif test $ac_prog = install && +# Predefined preprocessor variables. + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_NAME "$PACKAGE_NAME" +_ACEOF + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_TARNAME "$PACKAGE_TARNAME" +_ACEOF + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_VERSION "$PACKAGE_VERSION" +_ACEOF + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_STRING "$PACKAGE_STRING" +_ACEOF + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" +_ACEOF + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_URL "$PACKAGE_URL" +_ACEOF + + +# Let the site file select an alternate cache file if it wants to. +# Prefer an explicitly selected file to automatically selected ones. +ac_site_file1=NONE +ac_site_file2=NONE +if test -n "$CONFIG_SITE"; then + # We do not want a PATH search for config.site. + case $CONFIG_SITE in #(( + -*) ac_site_file1=./$CONFIG_SITE;; + */*) ac_site_file1=$CONFIG_SITE;; + *) ac_site_file1=./$CONFIG_SITE;; + esac +elif test "x$prefix" != xNONE; then + ac_site_file1=$prefix/share/config.site + ac_site_file2=$prefix/etc/config.site +else + ac_site_file1=$ac_default_prefix/share/config.site + ac_site_file2=$ac_default_prefix/etc/config.site +fi +for ac_site_file in "$ac_site_file1" "$ac_site_file2" +do + test "x$ac_site_file" = xNONE && continue + if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 +$as_echo "$as_me: loading site script $ac_site_file" >&6;} + sed 's/^/| /' "$ac_site_file" >&5 + . "$ac_site_file" \ + || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "failed to load site script $ac_site_file +See \`config.log' for more details" "$LINENO" 5; } + fi +done + +if test -r "$cache_file"; then + # Some versions of bash will fail to source /dev/null (special files + # actually), so we avoid doing that. DJGPP emulates it as a regular file. + if test /dev/null != "$cache_file" && test -f "$cache_file"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 +$as_echo "$as_me: loading cache $cache_file" >&6;} + case $cache_file in + [\\/]* | ?:[\\/]* ) . "$cache_file";; + *) . "./$cache_file";; + esac + fi +else + { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 +$as_echo "$as_me: creating cache $cache_file" >&6;} + >$cache_file +fi + +# Check that the precious variables saved in the cache have kept the same +# value. +ac_cache_corrupted=false +for ac_var in $ac_precious_vars; do + eval ac_old_set=\$ac_cv_env_${ac_var}_set + eval ac_new_set=\$ac_env_${ac_var}_set + eval ac_old_val=\$ac_cv_env_${ac_var}_value + eval ac_new_val=\$ac_env_${ac_var}_value + case $ac_old_set,$ac_new_set in + set,) + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 +$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} + ac_cache_corrupted=: ;; + ,set) + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 +$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} + ac_cache_corrupted=: ;; + ,);; + *) + if test "x$ac_old_val" != "x$ac_new_val"; then + # differences in whitespace do not lead to failure. + ac_old_val_w=`echo x $ac_old_val` + ac_new_val_w=`echo x $ac_new_val` + if test "$ac_old_val_w" != "$ac_new_val_w"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 +$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} + ac_cache_corrupted=: + else + { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 +$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} + eval $ac_var=\$ac_old_val + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 +$as_echo "$as_me: former value: \`$ac_old_val'" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 +$as_echo "$as_me: current value: \`$ac_new_val'" >&2;} + fi;; + esac + # Pass precious variables to config.status. + if test "$ac_new_set" = set; then + case $ac_new_val in + *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; + *) ac_arg=$ac_var=$ac_new_val ;; + esac + case " $ac_configure_args " in + *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. + *) as_fn_append ac_configure_args " '$ac_arg'" ;; + esac + fi +done +if $ac_cache_corrupted; then + { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 +$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} + as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 +fi +## -------------------- ## +## Main body of script. ## +## -------------------- ## + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + +ac_config_headers="$ac_config_headers config.h" + + +am__api_version='1.14' + +ac_aux_dir= +for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do + if test -f "$ac_dir/install-sh"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install-sh -c" + break + elif test -f "$ac_dir/install.sh"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install.sh -c" + break + elif test -f "$ac_dir/shtool"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/shtool install -c" + break + fi +done +if test -z "$ac_aux_dir"; then + as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 +fi + +# These three variables are undocumented and unsupported, +# and are intended to be withdrawn in a future Autoconf release. +# They can cause serious problems if a builder's source tree is in a directory +# whose full name contains unusual characters. +ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. +ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. +ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. + + +# Find a good install program. We prefer a C program (faster), +# so one script is as good as another. But avoid the broken or +# incompatible versions: +# SysV /etc/install, /usr/sbin/install +# SunOS /usr/etc/install +# IRIX /sbin/install +# AIX /bin/install +# AmigaOS /C/install, which installs bootblocks on floppy discs +# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag +# AFS /usr/afsws/bin/install, which mishandles nonexistent args +# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" +# OS/2's system install, which has a completely different semantic +# ./install, which can be erroneously created by make from ./install.sh. +# Reject install programs that cannot install multiple files. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 +$as_echo_n "checking for a BSD-compatible install... " >&6; } +if test -z "$INSTALL"; then +if ${ac_cv_path_install+:} false; then : + $as_echo_n "(cached) " >&6 +else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + # Account for people who put trailing slashes in PATH elements. +case $as_dir/ in #(( + ./ | .// | /[cC]/* | \ + /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ + ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \ + /usr/ucb/* ) ;; + *) + # OSF1 and SCO ODT 3.0 have their own names for install. + # Don't use installbsd from OSF since it installs stuff as root + # by default. + for ac_prog in ginstall scoinst install; do + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then + if test $ac_prog = install && + grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + # AIX install. It has an incompatible calling convention. + : + elif test $ac_prog = install && grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # program-specific install script used by HP pwplus--don't use. : @@ -2194,7 +2564,7 @@ ;; esac -done + done IFS=$as_save_IFS rm -rf conftest.one conftest.two conftest.dir @@ -2210,7 +2580,7 @@ INSTALL=$ac_install_sh fi fi -{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 $as_echo "$INSTALL" >&6; } # Use test -z because SunOS4 sh mishandles braces in ${var-val}. @@ -2221,68 +2591,73 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -{ $as_echo "$as_me:$LINENO: checking whether build environment is sane" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 $as_echo_n "checking whether build environment is sane... " >&6; } -# Just in case -sleep 1 -echo timestamp > conftest.file # Reject unsafe characters in $srcdir or the absolute working directory # name. Accept space and tab only in the latter. am_lf=' ' case `pwd` in *[\\\"\#\$\&\'\`$am_lf]*) - { { $as_echo "$as_me:$LINENO: error: unsafe absolute working directory name" >&5 -$as_echo "$as_me: error: unsafe absolute working directory name" >&2;} - { (exit 1); exit 1; }; };; + as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;; esac case $srcdir in *[\\\"\#\$\&\'\`$am_lf\ \ ]*) - { { $as_echo "$as_me:$LINENO: error: unsafe srcdir value: \`$srcdir'" >&5 -$as_echo "$as_me: error: unsafe srcdir value: \`$srcdir'" >&2;} - { (exit 1); exit 1; }; };; + as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;; esac -# Do `set' in a subshell so we don't clobber the current shell's +# Do 'set' in a subshell so we don't clobber the current shell's # arguments. Must try -L first in case configure is actually a # symlink; some systems play weird games with the mod time of symlinks # (eg FreeBSD returns the mod time of the symlink's containing # directory). if ( - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` - if test "$*" = "X"; then - # -L didn't work. - set X `ls -t "$srcdir/configure" conftest.file` - fi - rm -f conftest.file - if test "$*" != "X $srcdir/configure conftest.file" \ - && test "$*" != "X conftest.file $srcdir/configure"; then - - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - { { $as_echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken -alias in your environment" >&5 -$as_echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken -alias in your environment" >&2;} - { (exit 1); exit 1; }; } - fi + am_has_slept=no + for am_try in 1 2; do + echo "timestamp, slept: $am_has_slept" > conftest.file + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` + if test "$*" = "X"; then + # -L didn't work. + set X `ls -t "$srcdir/configure" conftest.file` + fi + if test "$*" != "X $srcdir/configure conftest.file" \ + && test "$*" != "X conftest.file $srcdir/configure"; then + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + as_fn_error $? "ls -t appears to fail. Make sure there is not a broken + alias in your environment" "$LINENO" 5 + fi + if test "$2" = conftest.file || test $am_try -eq 2; then + break + fi + # Just in case. + sleep 1 + am_has_slept=yes + done test "$2" = conftest.file ) then # Ok. : else - { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files! -Check your system clock" >&5 -$as_echo "$as_me: error: newly created file is older than distributed files! -Check your system clock" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "newly created file is older than distributed files! +Check your system clock" "$LINENO" 5 fi -{ $as_echo "$as_me:$LINENO: result: yes" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } +# If we didn't sleep, we still need to ensure time stamps of config.status and +# generated files are strictly newer. +am_sleep_pid= +if grep 'slept: no' conftest.file >/dev/null 2>&1; then + ( sleep 1 ) & + am_sleep_pid=$! +fi + +rm -f conftest.file + test "$program_prefix" != NONE && program_transform_name="s&^&$program_prefix&;$program_transform_name" # Use a double $ so make ignores it. @@ -2305,12 +2680,12 @@ esac fi # Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " +if eval "$MISSING --is-lightweight"; then + am_missing_run="$MISSING " else am_missing_run= - { $as_echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5 -$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5 +$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;} fi if test x"${install_sh}" != xset; then @@ -2322,17 +2697,17 @@ esac fi -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right +# Installed binaries are usually stripped using 'strip' when the user +# run "make install-strip". However 'strip' might not be the right # tool to use in cross-compilation environments, therefore Automake -# will honor the `STRIP' environment variable to overrule this program. +# will honor the 'STRIP' environment variable to overrule this program. if test "$cross_compiling" != no; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_STRIP+set}" = set; then +if ${ac_cv_prog_STRIP+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$STRIP"; then @@ -2343,24 +2718,24 @@ 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 + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi STRIP=$ac_cv_prog_STRIP if test -n "$STRIP"; then - { $as_echo "$as_me:$LINENO: result: $STRIP" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 $as_echo "$STRIP" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -2370,9 +2745,9 @@ ac_ct_STRIP=$STRIP # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then +if ${ac_cv_prog_ac_ct_STRIP+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_STRIP"; then @@ -2383,24 +2758,24 @@ 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 + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_STRIP="strip" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP if test -n "$ac_ct_STRIP"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 $as_echo "$ac_ct_STRIP" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -2409,7 +2784,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -2422,10 +2797,10 @@ fi INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" -{ $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5 $as_echo_n "checking for a thread-safe mkdir -p... " >&6; } if test -z "$MKDIR_P"; then - if test "${ac_cv_path_mkdir+set}" = set; then + if ${ac_cv_path_mkdir+:} false; then : $as_echo_n "(cached) " >&6 else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2433,9 +2808,9 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_prog in mkdir gmkdir; do + for ac_prog in mkdir gmkdir; do for ac_exec_ext in '' $ac_executable_extensions; do - { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue + as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( 'mkdir (GNU coreutils) '* | \ 'mkdir (coreutils) '* | \ @@ -2445,11 +2820,12 @@ esac done done -done + done IFS=$as_save_IFS fi + test -d ./--version && rmdir ./--version if test "${ac_cv_path_mkdir+set}" = set; then MKDIR_P="$ac_cv_path_mkdir -p" else @@ -2457,26 +2833,19 @@ # value for MKDIR_P within a source directory, because that will # break other packages using the cache if that directory is # removed, or if the value is a relative name. - test -d ./--version && rmdir ./--version MKDIR_P="$ac_install_sh -d" fi fi -{ $as_echo "$as_me:$LINENO: result: $MKDIR_P" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 $as_echo "$MKDIR_P" >&6; } -mkdir_p="$MKDIR_P" -case $mkdir_p in - [\\/$]* | ?:[\\/]*) ;; - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; -esac - for ac_prog in gawk mawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_AWK+set}" = set; then +if ${ac_cv_prog_AWK+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$AWK"; then @@ -2487,24 +2856,24 @@ 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 + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_AWK="$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi AWK=$ac_cv_prog_AWK if test -n "$AWK"; then - { $as_echo "$as_me:$LINENO: result: $AWK" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 $as_echo "$AWK" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -2512,11 +2881,11 @@ test -n "$AWK" && break done -{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } set x ${MAKE-make} ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then +if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then : $as_echo_n "(cached) " >&6 else cat >conftest.make <<\_ACEOF @@ -2524,7 +2893,7 @@ all: @echo '@@@%%%=$(MAKE)=@@@%%%' _ACEOF -# GNU make sometimes prints "make[1]: Entering...", which would confuse us. +# GNU make sometimes prints "make[1]: Entering ...", which would confuse us. case `${MAKE-make} -f conftest.make 2>/dev/null` in *@@@%%%=?*=@@@%%%*) eval ac_cv_prog_make_${ac_make}_set=yes;; @@ -2534,11 +2903,11 @@ rm -f conftest.make fi if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } SET_MAKE= else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } SET_MAKE="MAKE=${MAKE-make}" fi @@ -2552,15 +2921,52 @@ fi rmdir .tst 2>/dev/null +# Check whether --enable-silent-rules was given. +if test "${enable_silent_rules+set}" = set; then : + enableval=$enable_silent_rules; +fi + +case $enable_silent_rules in # ((( + yes) AM_DEFAULT_VERBOSITY=0;; + no) AM_DEFAULT_VERBOSITY=1;; + *) AM_DEFAULT_VERBOSITY=1;; +esac +am_make=${MAKE-make} +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 +$as_echo_n "checking whether $am_make supports nested variables... " >&6; } +if ${am_cv_make_support_nested_variables+:} false; then : + $as_echo_n "(cached) " >&6 +else + if $as_echo 'TRUE=$(BAR$(V)) +BAR0=false +BAR1=true +V=1 +am__doit: + @$(TRUE) +.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then + am_cv_make_support_nested_variables=yes +else + am_cv_make_support_nested_variables=no +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 +$as_echo "$am_cv_make_support_nested_variables" >&6; } +if test $am_cv_make_support_nested_variables = yes; then + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +else + AM_V=$AM_DEFAULT_VERBOSITY + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +fi +AM_BACKSLASH='\' + if test "`cd $srcdir && pwd`" != "`pwd`"; then # Use -I$(srcdir) only when $(srcdir) != ., so that make's output # is not polluted with repeated "-I." am__isrc=' -I$(srcdir)' # test to see if srcdir already configured if test -f $srcdir/config.status; then - { { $as_echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 -$as_echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 fi fi @@ -2575,8 +2981,8 @@ # Define the identity of the package. - PACKAGE=saga - VERSION=2.1.0beta + PACKAGE='saga' + VERSION='2.1.4' cat >>confdefs.h <<_ACEOF @@ -2604,163 +3010,187 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} +# For better backward compatibility. To be removed once Automake 1.9.x +# dies out for good. For more background, see: +# +# +mkdir_p='$(MKDIR_P)' + # We need awk for the "check" target. The system "awk" is bad on # some platforms. -# Always define AMTAR for backward compatibility. +# Always define AMTAR for backward compatibility. Yes, it's still used +# in the wild :-( We should find a proper way to deprecate it ... +AMTAR='$${TAR-tar}' -AMTAR=${AMTAR-"${am_missing_run}tar"} -am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' +# We'll loop over all known methods to create a tar archive until one works. +_am_tools='gnutar plaintar pax cpio none' +# The POSIX 1988 'ustar' format is defined with fixed-size fields. + # There is notably a 21 bits limit for the UID and the GID. In fact, + # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343 + # and bug#13588). + am_max_uid=2097151 # 2^21 - 1 + am_max_gid=$am_max_uid + # The $UID and $GID variables are not portable, so we need to resort + # to the POSIX-mandated id(1) utility. Errors in the 'id' calls + # below are definitely unexpected, so allow the users to see them + # (that is, avoid stderr redirection). + am_uid=`id -u || echo unknown` + am_gid=`id -g || echo unknown` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether UID '$am_uid' is supported by ustar format" >&5 +$as_echo_n "checking whether UID '$am_uid' is supported by ustar format... " >&6; } + if test $am_uid -le $am_max_uid; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + _am_tools=none + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether GID '$am_gid' is supported by ustar format" >&5 +$as_echo_n "checking whether GID '$am_gid' is supported by ustar format... " >&6; } + if test $am_gid -le $am_max_gid; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + _am_tools=none + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to create a ustar tar archive" >&5 +$as_echo_n "checking how to create a ustar tar archive... " >&6; } + # Go ahead even if we have the value already cached. We do so because we + # need to set the values for the 'am__tar' and 'am__untar' variables. + _am_tools=${am_cv_prog_tar_ustar-$_am_tools} + + for _am_tool in $_am_tools; do + case $_am_tool in + gnutar) + for _am_tar in tar gnutar gtar; do + { echo "$as_me:$LINENO: $_am_tar --version" >&5 + ($_am_tar --version) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && break + done + am__tar="$_am_tar --format=ustar -chf - "'"$$tardir"' + am__tar_="$_am_tar --format=ustar -chf - "'"$tardir"' + am__untar="$_am_tar -xf -" + ;; + plaintar) + # Must skip GNU tar: if it does not support --format= it doesn't create + # ustar tarball either. + (tar --version) >/dev/null 2>&1 && continue + am__tar='tar chf - "$$tardir"' + am__tar_='tar chf - "$tardir"' + am__untar='tar xf -' + ;; + pax) + am__tar='pax -L -x ustar -w "$$tardir"' + am__tar_='pax -L -x ustar -w "$tardir"' + am__untar='pax -r' + ;; + cpio) + am__tar='find "$$tardir" -print | cpio -o -H ustar -L' + am__tar_='find "$tardir" -print | cpio -o -H ustar -L' + am__untar='cpio -i -H ustar -d' + ;; + none) + am__tar=false + am__tar_=false + am__untar=false + ;; + esac + # If the value was cached, stop now. We just wanted to have am__tar + # and am__untar set. + test -n "${am_cv_prog_tar_ustar}" && break + + # tar/untar a dummy directory, and stop if the command works. + rm -rf conftest.dir + mkdir conftest.dir + echo GrepMe > conftest.dir/file + { echo "$as_me:$LINENO: tardir=conftest.dir && eval $am__tar_ >conftest.tar" >&5 + (tardir=conftest.dir && eval $am__tar_ >conftest.tar) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + rm -rf conftest.dir + if test -s conftest.tar; then + { echo "$as_me:$LINENO: $am__untar &5 + ($am__untar &5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + { echo "$as_me:$LINENO: cat conftest.dir/file" >&5 + (cat conftest.dir/file) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + grep GrepMe conftest.dir/file >/dev/null 2>&1 && break + fi + done + rm -rf conftest.dir -if test "`cd $srcdir && pwd`" != "`pwd`"; then - # Use -I$(srcdir) only when $(srcdir) != ., so that make's output - # is not polluted with repeated "-I." - am__isrc=' -I$(srcdir)' - # test to see if srcdir already configured - if test -f $srcdir/config.status; then - { { $as_echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 -$as_echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} - { (exit 1); exit 1; }; } - fi -fi - -# test whether we have cygpath -if test -z "$CYGPATH_W"; then - if (cygpath --version) >/dev/null 2>/dev/null; then - CYGPATH_W='cygpath -w' - else - CYGPATH_W=echo - fi + if ${am_cv_prog_tar_ustar+:} false; then : + $as_echo_n "(cached) " >&6 +else + am_cv_prog_tar_ustar=$_am_tool fi - -# Define the identity of the package. - PACKAGE='saga' - VERSION='2.1.0' - - -cat >>confdefs.h <<_ACEOF -#define PACKAGE "$PACKAGE" -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define VERSION "$VERSION" -_ACEOF - -# Some tools Automake needs. - -ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"} - - -AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"} - - -AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_tar_ustar" >&5 +$as_echo "$am_cv_prog_tar_ustar" >&6; } -AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"} -MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} -# We need awk for the "check" target. The system "awk" is bad on -# some platforms. -# Always define AMTAR for backward compatibility. -AMTAR=${AMTAR-"${am_missing_run}tar"} +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! + +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: + +Please tell bug-automake@gnu.org about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. -{ $as_echo "$as_me:$LINENO: checking how to create a ustar tar archive" >&5 -$as_echo_n "checking how to create a ustar tar archive... " >&6; } -# Loop over all known methods to create a tar archive until one works. -_am_tools='gnutar plaintar pax cpio none' -_am_tools=${am_cv_prog_tar_ustar-$_am_tools} -# Do not fold the above two line into one, because Tru64 sh and -# Solaris sh will not grok spaces in the rhs of `-'. -for _am_tool in $_am_tools -do - case $_am_tool in - gnutar) - for _am_tar in tar gnutar gtar; - do - { echo "$as_me:$LINENO: $_am_tar --version" >&5 - ($_am_tar --version) >&5 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && break - done - am__tar="$_am_tar --format=ustar -chf - "'"$$tardir"' - am__tar_="$_am_tar --format=ustar -chf - "'"$tardir"' - am__untar="$_am_tar -xf -" - ;; - plaintar) - # Must skip GNU tar: if it does not support --format= it doesn't create - # ustar tarball either. - (tar --version) >/dev/null 2>&1 && continue - am__tar='tar chf - "$$tardir"' - am__tar_='tar chf - "$tardir"' - am__untar='tar xf -' - ;; - pax) - am__tar='pax -L -x ustar -w "$$tardir"' - am__tar_='pax -L -x ustar -w "$tardir"' - am__untar='pax -r' - ;; - cpio) - am__tar='find "$$tardir" -print | cpio -o -H ustar -L' - am__tar_='find "$tardir" -print | cpio -o -H ustar -L' - am__untar='cpio -i -H ustar -d' - ;; - none) - am__tar=false - am__tar_=false - am__untar=false - ;; - esac +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: . - # If the value was cached, stop now. We just wanted to have am__tar - # and am__untar set. - test -n "${am_cv_prog_tar_ustar}" && break +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. - # tar/untar a dummy directory, and stop if the command works - rm -rf conftest.dir - mkdir conftest.dir - echo GrepMe > conftest.dir/file - { echo "$as_me:$LINENO: tardir=conftest.dir && eval $am__tar_ >conftest.tar" >&5 - (tardir=conftest.dir && eval $am__tar_ >conftest.tar) >&5 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } - rm -rf conftest.dir - if test -s conftest.tar; then - { echo "$as_me:$LINENO: $am__untar &5 - ($am__untar &5 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } - grep GrepMe conftest.dir/file >/dev/null 2>&1 && break +END + as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5 fi -done -rm -rf conftest.dir - -if test "${am_cv_prog_tar_ustar+set}" = set; then - $as_echo_n "(cached) " >&6 -else - am_cv_prog_tar_ustar=$_am_tool fi -{ $as_echo "$as_me:$LINENO: result: $am_cv_prog_tar_ustar" >&5 -$as_echo "$am_cv_prog_tar_ustar" >&6; } - - - - - # Checks for programs. ac_ext=cpp @@ -2777,9 +3207,9 @@ do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CXX+set}" = set; then +if ${ac_cv_prog_CXX+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CXX"; then @@ -2790,24 +3220,24 @@ 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 + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi CXX=$ac_cv_prog_CXX if test -n "$CXX"; then - { $as_echo "$as_me:$LINENO: result: $CXX" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5 $as_echo "$CXX" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -2821,9 +3251,9 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then +if ${ac_cv_prog_ac_ct_CXX+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CXX"; then @@ -2834,24 +3264,24 @@ 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 + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CXX="$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_CXX=$ac_cv_prog_ac_ct_CXX if test -n "$ac_ct_CXX"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5 $as_echo "$ac_ct_CXX" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -2864,7 +3294,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -2875,48 +3305,31 @@ fi fi # Provide some information about the compiler. -$as_echo "$as_me:$LINENO: checking for C++ compiler version" >&5 +$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5 set X $ac_compile ac_compiler=$2 -{ (ac_try="$ac_compiler --version >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler --version >&5") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -v >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler -v >&5") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -V >&5" +for ac_option in --version -v -V -qversion; do + { { ac_try="$ac_compiler $ac_option >&5" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler -V >&5") 2>&5 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compiler $ac_option >&5") 2>conftest.err ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } + if test -s conftest.err; then + sed '10a\ +... rest of stderr output deleted ... + 10q' conftest.err >conftest.er1 + cat conftest.er1 >&5 + fi + rm -f conftest.er1 conftest.err + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +done -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -2932,8 +3345,8 @@ # Try to create an executable without -o first, disregard a.out. # It will help us diagnose broken compilers, and finding out an intuition # of exeext. -{ $as_echo "$as_me:$LINENO: checking for C++ compiler default output file name" >&5 -$as_echo_n "checking for C++ compiler default output file name... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C++ compiler works" >&5 +$as_echo_n "checking whether the C++ compiler works... " >&6; } ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` # The possible output files: @@ -2949,17 +3362,17 @@ done rm -f $ac_rmfiles -if { (ac_try="$ac_link_default" +if { { ac_try="$ac_link_default" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_link_default") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then : # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. # So ignore a value of `no', otherwise this would lead to `EXEEXT = no' # in a Makefile. We should not override ac_cv_exeext if it was cached, @@ -2976,7 +3389,7 @@ # certainly right. break;; *.* ) - if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; + if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; then :; else ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` fi @@ -2995,84 +3408,41 @@ else ac_file='' fi - -{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5 -$as_echo "$ac_file" >&6; } -if test -z "$ac_file"; then - $as_echo "$as_me: failed program was:" >&5 +if test -z "$ac_file"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +$as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: C++ compiler cannot create executables -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: C++ compiler cannot create executables -See \`config.log' for more details." >&2;} - { (exit 77); exit 77; }; }; } +as_fn_error 77 "C++ compiler cannot create executables +See \`config.log' for more details" "$LINENO" 5; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } fi - +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler default output file name" >&5 +$as_echo_n "checking for C++ compiler default output file name... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 +$as_echo "$ac_file" >&6; } ac_exeext=$ac_cv_exeext -# Check that the compiler produces executables we can run. If not, either -# the compiler is broken, or we cross compile. -{ $as_echo "$as_me:$LINENO: checking whether the C++ compiler works" >&5 -$as_echo_n "checking whether the C++ compiler works... " >&6; } -# FIXME: These cross compiler hacks should be removed for Autoconf 3.0 -# If not cross compiling, check that we can run a simple program. -if test "$cross_compiling" != yes; then - if { ac_try='./$ac_file' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cross_compiling=no - else - if test "$cross_compiling" = maybe; then - cross_compiling=yes - else - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: cannot run C++ compiled programs. -If you meant to cross compile, use \`--host'. -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: cannot run C++ compiled programs. -If you meant to cross compile, use \`--host'. -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } - fi - fi -fi -{ $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } - rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out ac_clean_files=$ac_clean_files_save -# Check that the compiler produces executables we can run. If not, either -# the compiler is broken, or we cross compile. -{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 -$as_echo_n "checking whether we are cross compiling... " >&6; } -{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5 -$as_echo "$cross_compiling" >&6; } - -{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 $as_echo_n "checking for suffix of executables... " >&6; } -if { (ac_try="$ac_link" +if { { ac_try="$ac_link" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_link") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then : # If both `conftest.exe' and `conftest' are `present' (well, observable) # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will # work properly (i.e., refer to `conftest.exe'), while it won't with @@ -3087,32 +3457,83 @@ esac done else - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } +as_fn_error $? "cannot compute suffix of executables: cannot compile and link +See \`config.log' for more details" "$LINENO" 5; } fi - -rm -f conftest$ac_cv_exeext -{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 +rm -f conftest conftest$ac_cv_exeext +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 $as_echo "$ac_cv_exeext" >&6; } rm -f conftest.$ac_ext EXEEXT=$ac_cv_exeext ac_exeext=$EXEEXT -{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +FILE *f = fopen ("conftest.out", "w"); + return ferror (f) || fclose (f) != 0; + + ; + return 0; +} +_ACEOF +ac_clean_files="$ac_clean_files conftest.out" +# Check that the compiler produces executables we can run. If not, either +# the compiler is broken, or we cross compile. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 +$as_echo_n "checking whether we are cross compiling... " >&6; } +if test "$cross_compiling" != yes; then + { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + if { ac_try='./conftest$ac_cv_exeext' + { { case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then + cross_compiling=no + else + if test "$cross_compiling" = maybe; then + cross_compiling=yes + else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "cannot run C++ compiled programs. +If you meant to cross compile, use \`--host'. +See \`config.log' for more details" "$LINENO" 5; } + fi + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 +$as_echo "$cross_compiling" >&6; } + +rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out +ac_clean_files=$ac_clean_files_save +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 $as_echo_n "checking for suffix of object files... " >&6; } -if test "${ac_cv_objext+set}" = set; then +if ${ac_cv_objext+:} false; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -3124,17 +3545,17 @@ } _ACEOF rm -f conftest.o conftest.obj -if { (ac_try="$ac_compile" +if { { ac_try="$ac_compile" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_compile") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then : for ac_file in conftest.o conftest.obj conftest.*; do test -f "$ac_file" || continue; case $ac_file in @@ -3147,31 +3568,23 @@ $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } +as_fn_error $? "cannot compute suffix of object files: cannot compile +See \`config.log' for more details" "$LINENO" 5; } fi - rm -f conftest.$ac_cv_objext conftest.$ac_ext fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 $as_echo "$ac_cv_objext" >&6; } OBJEXT=$ac_cv_objext ac_objext=$OBJEXT -{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5 $as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; } -if test "${ac_cv_cxx_compiler_gnu+set}" = set; then +if ${ac_cv_cxx_compiler_gnu+:} false; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -3185,37 +3598,16 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_cxx_try_compile "$LINENO"; then : ac_compiler_gnu=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_compiler_gnu=no + ac_compiler_gnu=no fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_cxx_compiler_gnu=$ac_compiler_gnu fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5 $as_echo "$ac_cv_cxx_compiler_gnu" >&6; } if test $ac_compiler_gnu = yes; then GXX=yes @@ -3224,20 +3616,16 @@ fi ac_test_CXXFLAGS=${CXXFLAGS+set} ac_save_CXXFLAGS=$CXXFLAGS -{ $as_echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5 $as_echo_n "checking whether $CXX accepts -g... " >&6; } -if test "${ac_cv_prog_cxx_g+set}" = set; then +if ${ac_cv_prog_cxx_g+:} false; then : $as_echo_n "(cached) " >&6 else ac_save_cxx_werror_flag=$ac_cxx_werror_flag ac_cxx_werror_flag=yes ac_cv_prog_cxx_g=no CXXFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -3248,35 +3636,11 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_cxx_try_compile "$LINENO"; then : ac_cv_prog_cxx_g=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - CXXFLAGS="" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + CXXFLAGS="" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -3287,36 +3651,12 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - : -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_cxx_try_compile "$LINENO"; then : - ac_cxx_werror_flag=$ac_save_cxx_werror_flag +else + ac_cxx_werror_flag=$ac_save_cxx_werror_flag CXXFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -3327,42 +3667,17 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_cxx_try_compile "$LINENO"; then : ac_cv_prog_cxx_g=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_cxx_werror_flag=$ac_save_cxx_werror_flag fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5 $as_echo "$ac_cv_prog_cxx_g" >&6; } if test "$ac_test_CXXFLAGS" = set; then CXXFLAGS=$ac_save_CXXFLAGS @@ -3396,14 +3711,14 @@ .PHONY: am__doit END # If we don't find an include directive, just comment out the code. -{ $as_echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5 $as_echo_n "checking for style of include used by $am_make... " >&6; } am__include="#" am__quote= _am_result=none # First try GNU make style include. echo "include confinc" > confmf -# Ignore all kinds of additional output from `make'. +# Ignore all kinds of additional output from 'make'. case `$am_make -s -f confmf 2> /dev/null` in #( *the\ am__doit\ target*) am__include=include @@ -3424,18 +3739,19 @@ fi -{ $as_echo "$as_me:$LINENO: result: $_am_result" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5 $as_echo "$_am_result" >&6; } rm -f confinc confmf # Check whether --enable-dependency-tracking was given. -if test "${enable_dependency_tracking+set}" = set; then +if test "${enable_dependency_tracking+set}" = set; then : enableval=$enable_dependency_tracking; fi if test "x$enable_dependency_tracking" != xno; then am_depcomp="$ac_aux_dir/depcomp" AMDEPBACKSLASH='\' + am__nodep='_no' fi if test "x$enable_dependency_tracking" != xno; then AMDEP_TRUE= @@ -3449,17 +3765,18 @@ depcc="$CXX" am_compiler_list= -{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 $as_echo_n "checking dependency style of $depcc... " >&6; } -if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then +if ${am_cv_CXX_dependencies_compiler_type+:} false; then : $as_echo_n "(cached) " >&6 else if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". + rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. @@ -3493,16 +3810,16 @@ : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - # We check with `-c' and `-o' for the sake of the "dashmstdout" + # We check with '-c' and '-o' for the sake of the "dashmstdout" # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. am__obj=sub/conftest.${OBJEXT-o} am__minus_obj="-o $am__obj" case $depmode in @@ -3511,16 +3828,16 @@ test "$am__universal" = false || continue ;; nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. if test "x$enable_dependency_tracking" = xyes; then continue else break fi ;; - msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has + msvc7 | msvc7msys | msvisualcpp | msvcmsys) + # This compiler won't grok '-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. am__obj=conftest.${OBJEXT-o} @@ -3559,7 +3876,7 @@ fi fi -{ $as_echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5 $as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; } CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type @@ -3574,144 +3891,17 @@ fi -depcc="$CXX" am_compiler_list= - -{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 -$as_echo_n "checking dependency style of $depcc... " >&6; } -if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then - # We make a subdir and do the tests there. Otherwise we can end up - # making bogus files that we don't know about and never remove. For - # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. - mkdir conftest.dir - # Copy depcomp to subdir because otherwise we won't find it if we're - # using a relative directory. - cp "$am_depcomp" conftest.dir - cd conftest.dir - # We will build objects and dependencies in a subdirectory because - # it helps to detect inapplicable dependency modes. For instance - # both Tru64's cc and ICC support -MD to output dependencies as a - # side effect of compilation, but ICC will put the dependencies in - # the current directory while Tru64 will put them in the object - # directory. - mkdir sub - - am_cv_CXX_dependencies_compiler_type=none - if test "$am_compiler_list" = ""; then - am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` - fi - am__universal=false - case " $depcc " in #( - *\ -arch\ *\ -arch\ *) am__universal=true ;; - esac - - for depmode in $am_compiler_list; do - # Setup a source with many dependencies, because some compilers - # like to wrap large dependency lists on column 80 (with \), and - # we should not choose a depcomp mode which is confused by this. - # - # We need to recreate these files for each test, as the compiler may - # overwrite some of them when testing with obscure command lines. - # This happens at least with the AIX C compiler. - : > sub/conftest.c - for i in 1 2 3 4 5 6; do - echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h - done - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - - # We check with `-c' and `-o' for the sake of the "dashmstdout" - # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs - am__obj=sub/conftest.${OBJEXT-o} - am__minus_obj="-o $am__obj" - case $depmode in - gcc) - # This depmode causes a compiler race in universal mode. - test "$am__universal" = false || continue - ;; - nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested - if test "x$enable_dependency_tracking" = xyes; then - continue - else - break - fi - ;; - msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has - # not run yet. These depmodes are late enough in the game, and - # so weak that their functioning should not be impacted. - am__obj=conftest.${OBJEXT-o} - am__minus_obj= - ;; - none) break ;; - esac - if depmode=$depmode \ - source=sub/conftest.c object=$am__obj \ - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ - >/dev/null 2>conftest.err && - grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep $am__obj sub/conftest.Po > /dev/null 2>&1 && - ${MAKE-make} -s -f confmf > /dev/null 2>&1; then - # icc doesn't choke on unknown options, it will just issue warnings - # or remarks (even with -Werror). So we grep stderr for any message - # that says an option was ignored or not supported. - # When given -MP, icc 7.0 and 7.1 complain thusly: - # icc: Command line warning: ignoring option '-M'; no argument required - # The diagnosis changed in icc 8.0: - # icc: Command line remark: option '-MP' not supported - if (grep 'ignoring option' conftest.err || - grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else - am_cv_CXX_dependencies_compiler_type=$depmode - break - fi - fi - done - - cd .. - rm -rf conftest.dir -else - am_cv_CXX_dependencies_compiler_type=none -fi - -fi -{ $as_echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5 -$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; } -CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type - - if - test "x$enable_dependency_tracking" != xno \ - && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then - am__fastdepCXX_TRUE= - am__fastdepCXX_FALSE='#' -else - am__fastdepCXX_TRUE='#' - am__fastdepCXX_FALSE= -fi - - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. -set dummy ${ac_tool_prefix}gcc; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. +set dummy ${ac_tool_prefix}gcc; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -3722,24 +3912,24 @@ 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 + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}gcc" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:$LINENO: result: $CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 $as_echo "$CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -3749,9 +3939,9 @@ ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then +if ${ac_cv_prog_ac_ct_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -3762,24 +3952,24 @@ 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 + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="gcc" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 $as_echo "$ac_ct_CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -3788,7 +3978,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -3802,9 +3992,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. set dummy ${ac_tool_prefix}cc; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -3815,24 +4005,24 @@ 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 + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}cc" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:$LINENO: result: $CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 $as_echo "$CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -3842,9 +4032,9 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -3856,18 +4046,18 @@ 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 + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue fi ac_cv_prog_CC="cc" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS if test $ac_prog_rejected = yes; then @@ -3886,10 +4076,10 @@ fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:$LINENO: result: $CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 $as_echo "$CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -3901,9 +4091,9 @@ do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -3914,24 +4104,24 @@ 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 + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:$LINENO: result: $CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 $as_echo "$CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -3945,9 +4135,9 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then +if ${ac_cv_prog_ac_ct_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -3958,24 +4148,24 @@ 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 + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 $as_echo "$ac_ct_CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -3988,7 +4178,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -3999,62 +4189,42 @@ fi -test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: no acceptable C compiler found in \$PATH -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } +as_fn_error $? "no acceptable C compiler found in \$PATH +See \`config.log' for more details" "$LINENO" 5; } # Provide some information about the compiler. -$as_echo "$as_me:$LINENO: checking for C compiler version" >&5 +$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 set X $ac_compile ac_compiler=$2 -{ (ac_try="$ac_compiler --version >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler --version >&5") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -v >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler -v >&5") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -V >&5" +for ac_option in --version -v -V -qversion; do + { { ac_try="$ac_compiler $ac_option >&5" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler -V >&5") 2>&5 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compiler $ac_option >&5") 2>conftest.err ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } + if test -s conftest.err; then + sed '10a\ +... rest of stderr output deleted ... + 10q' conftest.err >conftest.er1 + cat conftest.er1 >&5 + fi + rm -f conftest.er1 conftest.err + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +done -{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; } -if test "${ac_cv_c_compiler_gnu+set}" = set; then +if ${ac_cv_c_compiler_gnu+:} false; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -4068,37 +4238,16 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_compiler_gnu=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_compiler_gnu=no + ac_compiler_gnu=no fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 $as_echo "$ac_cv_c_compiler_gnu" >&6; } if test $ac_compiler_gnu = yes; then GCC=yes @@ -4107,20 +4256,16 @@ fi ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS -{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 $as_echo_n "checking whether $CC accepts -g... " >&6; } -if test "${ac_cv_prog_cc_g+set}" = set; then +if ${ac_cv_prog_cc_g+:} false; then : $as_echo_n "(cached) " >&6 else ac_save_c_werror_flag=$ac_c_werror_flag ac_c_werror_flag=yes ac_cv_prog_cc_g=no CFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -4131,35 +4276,11 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_prog_cc_g=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - CFLAGS="" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + CFLAGS="" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -4170,36 +4291,12 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - : -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_c_try_compile "$LINENO"; then : - ac_c_werror_flag=$ac_save_c_werror_flag +else + ac_c_werror_flag=$ac_save_c_werror_flag CFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -4210,42 +4307,17 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_prog_cc_g=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_c_werror_flag=$ac_save_c_werror_flag fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 $as_echo "$ac_cv_prog_cc_g" >&6; } if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS @@ -4262,23 +4334,18 @@ CFLAGS= fi fi -{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; } -if test "${ac_cv_prog_cc_c89+set}" = set; then +if ${ac_cv_prog_cc_c89+:} false; then : $as_echo_n "(cached) " >&6 else ac_cv_prog_cc_c89=no ac_save_CC=$CC -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include -#include -#include +struct stat; /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ struct buf { int x; }; FILE * (*rcsopen) (struct buf *, struct stat *, int); @@ -4330,32 +4397,9 @@ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" do CC="$ac_save_CC $ac_arg" - rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + if ac_fn_c_try_compile "$LINENO"; then : ac_cv_prog_cc_c89=$ac_arg -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - rm -f core conftest.err conftest.$ac_objext test "x$ac_cv_prog_cc_c89" != "xno" && break done @@ -4366,37 +4410,99 @@ # AC_CACHE_VAL case "x$ac_cv_prog_cc_c89" in x) - { $as_echo "$as_me:$LINENO: result: none needed" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 $as_echo "none needed" >&6; } ;; xno) - { $as_echo "$as_me:$LINENO: result: unsupported" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 $as_echo "unsupported" >&6; } ;; *) CC="$CC $ac_cv_prog_cc_c89" - { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 $as_echo "$ac_cv_prog_cc_c89" >&6; } ;; esac +if test "x$ac_cv_prog_cc_c89" != xno; then : + +fi + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 +$as_echo_n "checking whether $CC understands -c and -o together... " >&6; } +if ${am_cv_prog_cc_c_o+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int +main () +{ + ; + return 0; +} +_ACEOF + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5 + ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 +$as_echo "$am_cv_prog_cc_c_o" >&6; } +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu + depcc="$CC" am_compiler_list= -{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 $as_echo_n "checking dependency style of $depcc... " >&6; } -if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then +if ${am_cv_CC_dependencies_compiler_type+:} false; then : $as_echo_n "(cached) " >&6 else if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". + rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. @@ -4430,16 +4536,16 @@ : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - # We check with `-c' and `-o' for the sake of the "dashmstdout" + # We check with '-c' and '-o' for the sake of the "dashmstdout" # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. am__obj=sub/conftest.${OBJEXT-o} am__minus_obj="-o $am__obj" case $depmode in @@ -4448,16 +4554,16 @@ test "$am__universal" = false || continue ;; nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. if test "x$enable_dependency_tracking" = xyes; then continue else break fi ;; - msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has + msvc7 | msvc7msys | msvisualcpp | msvcmsys) + # This compiler won't grok '-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. am__obj=conftest.${OBJEXT-o} @@ -4496,7 +4602,7 @@ fi fi -{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 $as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type @@ -4511,236 +4617,17 @@ fi -depcc="$CC" am_compiler_list= - -{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 -$as_echo_n "checking dependency style of $depcc... " >&6; } -if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then - # We make a subdir and do the tests there. Otherwise we can end up - # making bogus files that we don't know about and never remove. For - # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. - mkdir conftest.dir - # Copy depcomp to subdir because otherwise we won't find it if we're - # using a relative directory. - cp "$am_depcomp" conftest.dir - cd conftest.dir - # We will build objects and dependencies in a subdirectory because - # it helps to detect inapplicable dependency modes. For instance - # both Tru64's cc and ICC support -MD to output dependencies as a - # side effect of compilation, but ICC will put the dependencies in - # the current directory while Tru64 will put them in the object - # directory. - mkdir sub - - am_cv_CC_dependencies_compiler_type=none - if test "$am_compiler_list" = ""; then - am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` - fi - am__universal=false - case " $depcc " in #( - *\ -arch\ *\ -arch\ *) am__universal=true ;; - esac - - for depmode in $am_compiler_list; do - # Setup a source with many dependencies, because some compilers - # like to wrap large dependency lists on column 80 (with \), and - # we should not choose a depcomp mode which is confused by this. - # - # We need to recreate these files for each test, as the compiler may - # overwrite some of them when testing with obscure command lines. - # This happens at least with the AIX C compiler. - : > sub/conftest.c - for i in 1 2 3 4 5 6; do - echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h - done - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - - # We check with `-c' and `-o' for the sake of the "dashmstdout" - # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs - am__obj=sub/conftest.${OBJEXT-o} - am__minus_obj="-o $am__obj" - case $depmode in - gcc) - # This depmode causes a compiler race in universal mode. - test "$am__universal" = false || continue - ;; - nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested - if test "x$enable_dependency_tracking" = xyes; then - continue - else - break - fi - ;; - msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has - # not run yet. These depmodes are late enough in the game, and - # so weak that their functioning should not be impacted. - am__obj=conftest.${OBJEXT-o} - am__minus_obj= - ;; - none) break ;; - esac - if depmode=$depmode \ - source=sub/conftest.c object=$am__obj \ - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ - >/dev/null 2>conftest.err && - grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep $am__obj sub/conftest.Po > /dev/null 2>&1 && - ${MAKE-make} -s -f confmf > /dev/null 2>&1; then - # icc doesn't choke on unknown options, it will just issue warnings - # or remarks (even with -Werror). So we grep stderr for any message - # that says an option was ignored or not supported. - # When given -MP, icc 7.0 and 7.1 complain thusly: - # icc: Command line warning: ignoring option '-M'; no argument required - # The diagnosis changed in icc 8.0: - # icc: Command line remark: option '-MP' not supported - if (grep 'ignoring option' conftest.err || - grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else - am_cv_CC_dependencies_compiler_type=$depmode - break - fi - fi - done - - cd .. - rm -rf conftest.dir -else - am_cv_CC_dependencies_compiler_type=none -fi - -fi -{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 -$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } -CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type - - if - test "x$enable_dependency_tracking" != xno \ - && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then - am__fastdepCC_TRUE= - am__fastdepCC_FALSE='#' -else - am__fastdepCC_TRUE='#' - am__fastdepCC_FALSE= -fi - - -# Find a good install program. We prefer a C program (faster), -# so one script is as good as another. But avoid the broken or -# incompatible versions: -# SysV /etc/install, /usr/sbin/install -# SunOS /usr/etc/install -# IRIX /sbin/install -# AIX /bin/install -# AmigaOS /C/install, which installs bootblocks on floppy discs -# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag -# AFS /usr/afsws/bin/install, which mishandles nonexistent args -# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" -# OS/2's system install, which has a completely different semantic -# ./install, which can be erroneously created by make from ./install.sh. -# Reject install programs that cannot install multiple files. -{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 -$as_echo_n "checking for a BSD-compatible install... " >&6; } -if test -z "$INSTALL"; then -if test "${ac_cv_path_install+set}" = set; then - $as_echo_n "(cached) " >&6 -else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - # Account for people who put trailing slashes in PATH elements. -case $as_dir/ in - ./ | .// | /cC/* | \ - /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ - ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \ - /usr/ucb/* ) ;; - *) - # OSF1 and SCO ODT 3.0 have their own names for install. - # Don't use installbsd from OSF since it installs stuff as root - # by default. - for ac_prog in ginstall scoinst install; do - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then - if test $ac_prog = install && - grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # AIX install. It has an incompatible calling convention. - : - elif test $ac_prog = install && - grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # program-specific install script used by HP pwplus--don't use. - : - else - rm -rf conftest.one conftest.two conftest.dir - echo one > conftest.one - echo two > conftest.two - mkdir conftest.dir - if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && - test -s conftest.one && test -s conftest.two && - test -s conftest.dir/conftest.one && - test -s conftest.dir/conftest.two - then - ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" - break 3 - fi - fi - fi - done - done - ;; -esac - -done -IFS=$as_save_IFS - -rm -rf conftest.one conftest.two conftest.dir - -fi - if test "${ac_cv_path_install+set}" = set; then - INSTALL=$ac_cv_path_install - else - # As a last resort, use the slow shell script. Don't cache a - # value for INSTALL within a source directory, because that will - # break other packages using the cache if that directory is - # removed, or if the value is a relative name. - INSTALL=$ac_install_sh - fi -fi -{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5 -$as_echo "$INSTALL" >&6; } - -# Use test -z because SunOS4 sh mishandles braces in ${var-val}. -# It thinks the first close brace ends the variable substitution. -test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' - -test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' - -test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' case `pwd` in *\ * | *\ *) - { $as_echo "$as_me:$LINENO: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 $as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;; esac -macro_version='2.2.6b' -macro_revision='1.3017' +macro_version='2.4.2' +macro_revision='1.3337' @@ -4758,35 +4645,27 @@ # Make sure we can run config.sub. $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || - { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5 -$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 -{ $as_echo "$as_me:$LINENO: checking build system type" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 $as_echo_n "checking build system type... " >&6; } -if test "${ac_cv_build+set}" = set; then +if ${ac_cv_build+:} false; then : $as_echo_n "(cached) " >&6 else ac_build_alias=$build_alias test "x$ac_build_alias" = x && ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` test "x$ac_build_alias" = x && - { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 -$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || - { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5 -$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 $as_echo "$ac_cv_build" >&6; } case $ac_cv_build in *-*-*) ;; -*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5 -$as_echo "$as_me: error: invalid value of canonical build" >&2;} - { (exit 1); exit 1; }; };; +*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; esac build=$ac_cv_build ac_save_IFS=$IFS; IFS='-' @@ -4802,28 +4681,24 @@ case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac -{ $as_echo "$as_me:$LINENO: checking host system type" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 $as_echo_n "checking host system type... " >&6; } -if test "${ac_cv_host+set}" = set; then +if ${ac_cv_host+:} false; then : $as_echo_n "(cached) " >&6 else if test "x$host_alias" = x; then ac_cv_host=$ac_cv_build else ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || - { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5 -$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 fi fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 $as_echo "$ac_cv_host" >&6; } case $ac_cv_host in *-*-*) ;; -*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5 -$as_echo "$as_me: error: invalid value of canonical host" >&2;} - { (exit 1); exit 1; }; };; +*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; esac host=$ac_cv_host ac_save_IFS=$IFS; IFS='-' @@ -4839,9 +4714,78 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac -{ $as_echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5 +# Backslashify metacharacters that are still active within +# double-quoted strings. +sed_quote_subst='s/\(["`$\\]\)/\\\1/g' + +# Same as above, but do not quote variable references. +double_quote_subst='s/\(["`\\]\)/\\\1/g' + +# Sed substitution to delay expansion of an escaped shell variable in a +# double_quote_subst'ed string. +delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' + +# Sed substitution to delay expansion of an escaped single quote. +delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' + +# Sed substitution to avoid accidental globbing in evaled expressions +no_glob_subst='s/\*/\\\*/g' + +ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' +ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO +ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 +$as_echo_n "checking how to print strings... " >&6; } +# Test print first, because it will be a builtin if present. +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ + test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then + ECHO='print -r --' +elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then + ECHO='printf %s\n' +else + # Use this function as a fallback that always works. + func_fallback_echo () + { + eval 'cat <<_LTECHO_EOF +$1 +_LTECHO_EOF' + } + ECHO='func_fallback_echo' +fi + +# func_echo_all arg... +# Invoke $ECHO with all args, space-separated. +func_echo_all () +{ + $ECHO "" +} + +case "$ECHO" in + printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5 +$as_echo "printf" >&6; } ;; + print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5 +$as_echo "print -r" >&6; } ;; + *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5 +$as_echo "cat" >&6; } ;; +esac + + + + + + + + + + + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 $as_echo_n "checking for a sed that does not truncate output... " >&6; } -if test "${ac_cv_path_SED+set}" = set; then +if ${ac_cv_path_SED+:} false; then : $as_echo_n "(cached) " >&6 else ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ @@ -4849,7 +4793,7 @@ ac_script="$ac_script$as_nl$ac_script" done echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed - $as_unset ac_script || ac_script= + { ac_script=; unset ac_script;} if test -z "$SED"; then ac_path_SED_found=false # Loop through the user's path and test for each of PROGNAME-LIST @@ -4858,10 +4802,10 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_prog in sed gsed; do + for ac_prog in sed gsed; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue + as_fn_executable_p "$ac_path_SED" || continue # Check for GNU ac_path_SED and select it if it is found. # Check for GNU $ac_path_SED case `"$ac_path_SED" --version 2>&1` in @@ -4878,7 +4822,7 @@ $as_echo '' >> "conftest.nl" "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - ac_count=`expr $ac_count + 1` + as_fn_arith $ac_count + 1 && ac_count=$as_val if test $ac_count -gt ${ac_path_SED_max-0}; then # Best one so far, save it but keep looking for a better one ac_cv_path_SED="$ac_path_SED" @@ -4893,19 +4837,17 @@ $ac_path_SED_found && break 3 done done -done + done IFS=$as_save_IFS if test -z "$ac_cv_path_SED"; then - { { $as_echo "$as_me:$LINENO: error: no acceptable sed could be found in \$PATH" >&5 -$as_echo "$as_me: error: no acceptable sed could be found in \$PATH" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5 fi else ac_cv_path_SED=$SED fi fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_SED" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5 $as_echo "$ac_cv_path_SED" >&6; } SED="$ac_cv_path_SED" rm -f conftest.sed @@ -4923,9 +4865,9 @@ -{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 $as_echo_n "checking for grep that handles long lines and -e... " >&6; } -if test "${ac_cv_path_GREP+set}" = set; then +if ${ac_cv_path_GREP+:} false; then : $as_echo_n "(cached) " >&6 else if test -z "$GREP"; then @@ -4936,10 +4878,10 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_prog in grep ggrep; do + for ac_prog in grep ggrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue + as_fn_executable_p "$ac_path_GREP" || continue # Check for GNU ac_path_GREP and select it if it is found. # Check for GNU $ac_path_GREP case `"$ac_path_GREP" --version 2>&1` in @@ -4956,7 +4898,7 @@ $as_echo 'GREP' >> "conftest.nl" "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - ac_count=`expr $ac_count + 1` + as_fn_arith $ac_count + 1 && ac_count=$as_val if test $ac_count -gt ${ac_path_GREP_max-0}; then # Best one so far, save it but keep looking for a better one ac_cv_path_GREP="$ac_path_GREP" @@ -4971,26 +4913,24 @@ $ac_path_GREP_found && break 3 done done -done + done IFS=$as_save_IFS if test -z "$ac_cv_path_GREP"; then - { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 -$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 fi else ac_cv_path_GREP=$GREP fi fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 $as_echo "$ac_cv_path_GREP" >&6; } GREP="$ac_cv_path_GREP" -{ $as_echo "$as_me:$LINENO: checking for egrep" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 $as_echo_n "checking for egrep... " >&6; } -if test "${ac_cv_path_EGREP+set}" = set; then +if ${ac_cv_path_EGREP+:} false; then : $as_echo_n "(cached) " >&6 else if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 @@ -5004,10 +4944,10 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_prog in egrep; do + for ac_prog in egrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue + as_fn_executable_p "$ac_path_EGREP" || continue # Check for GNU ac_path_EGREP and select it if it is found. # Check for GNU $ac_path_EGREP case `"$ac_path_EGREP" --version 2>&1` in @@ -5024,7 +4964,7 @@ $as_echo 'EGREP' >> "conftest.nl" "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - ac_count=`expr $ac_count + 1` + as_fn_arith $ac_count + 1 && ac_count=$as_val if test $ac_count -gt ${ac_path_EGREP_max-0}; then # Best one so far, save it but keep looking for a better one ac_cv_path_EGREP="$ac_path_EGREP" @@ -5039,12 +4979,10 @@ $ac_path_EGREP_found && break 3 done done -done + done IFS=$as_save_IFS if test -z "$ac_cv_path_EGREP"; then - { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 -$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 fi else ac_cv_path_EGREP=$EGREP @@ -5052,14 +4990,14 @@ fi fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 $as_echo "$ac_cv_path_EGREP" >&6; } EGREP="$ac_cv_path_EGREP" -{ $as_echo "$as_me:$LINENO: checking for fgrep" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5 $as_echo_n "checking for fgrep... " >&6; } -if test "${ac_cv_path_FGREP+set}" = set; then +if ${ac_cv_path_FGREP+:} false; then : $as_echo_n "(cached) " >&6 else if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1 @@ -5073,10 +5011,10 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_prog in fgrep; do + for ac_prog in fgrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue + as_fn_executable_p "$ac_path_FGREP" || continue # Check for GNU ac_path_FGREP and select it if it is found. # Check for GNU $ac_path_FGREP case `"$ac_path_FGREP" --version 2>&1` in @@ -5093,7 +5031,7 @@ $as_echo 'FGREP' >> "conftest.nl" "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - ac_count=`expr $ac_count + 1` + as_fn_arith $ac_count + 1 && ac_count=$as_val if test $ac_count -gt ${ac_path_FGREP_max-0}; then # Best one so far, save it but keep looking for a better one ac_cv_path_FGREP="$ac_path_FGREP" @@ -5108,12 +5046,10 @@ $ac_path_FGREP_found && break 3 done done -done + done IFS=$as_save_IFS if test -z "$ac_cv_path_FGREP"; then - { { $as_echo "$as_me:$LINENO: error: no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 -$as_echo "$as_me: error: no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 fi else ac_cv_path_FGREP=$FGREP @@ -5121,7 +5057,7 @@ fi fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_FGREP" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5 $as_echo "$ac_cv_path_FGREP" >&6; } FGREP="$ac_cv_path_FGREP" @@ -5147,7 +5083,7 @@ # Check whether --with-gnu-ld was given. -if test "${with_gnu_ld+set}" = set; then +if test "${with_gnu_ld+set}" = set; then : withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes else with_gnu_ld=no @@ -5156,7 +5092,7 @@ ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. - { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 $as_echo_n "checking for ld used by $CC... " >&6; } case $host in *-*-mingw*) @@ -5186,13 +5122,13 @@ ;; esac elif test "$with_gnu_ld" = yes; then - { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 $as_echo_n "checking for GNU ld... " >&6; } else - { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 $as_echo_n "checking for non-GNU ld... " >&6; } fi -if test "${lt_cv_path_LD+set}" = set; then +if ${lt_cv_path_LD+:} false; then : $as_echo_n "(cached) " >&6 else if test -z "$LD"; then @@ -5223,18 +5159,16 @@ LD="$lt_cv_path_LD" if test -n "$LD"; then - { $as_echo "$as_me:$LINENO: result: $LD" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5 $as_echo "$LD" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi -test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 -$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} - { (exit 1); exit 1; }; } -{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 +test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } -if test "${lt_cv_prog_gnu_ld+set}" = set; then +if ${lt_cv_prog_gnu_ld+:} false; then : $as_echo_n "(cached) " >&6 else # I'd rather use --version here, but apparently some GNU lds only accept -v. @@ -5247,7 +5181,7 @@ ;; esac fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5 $as_echo "$lt_cv_prog_gnu_ld" >&6; } with_gnu_ld=$lt_cv_prog_gnu_ld @@ -5259,9 +5193,9 @@ -{ $as_echo "$as_me:$LINENO: checking for BSD- or MS-compatible name lister (nm)" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5 $as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; } -if test "${lt_cv_path_NM+set}" = set; then +if ${lt_cv_path_NM+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$NM"; then @@ -5308,20 +5242,23 @@ : ${lt_cv_path_NM=no} fi fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5 $as_echo "$lt_cv_path_NM" >&6; } if test "$lt_cv_path_NM" != "no"; then NM="$lt_cv_path_NM" else # Didn't find any BSD compatible name lister, look for dumpbin. - if test -n "$ac_tool_prefix"; then - for ac_prog in "dumpbin -symbols" "link -dump -symbols" + if test -n "$DUMPBIN"; then : + # Let the user override the test. + else + if test -n "$ac_tool_prefix"; then + for ac_prog in dumpbin "link -dump" do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_DUMPBIN+set}" = set; then +if ${ac_cv_prog_DUMPBIN+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$DUMPBIN"; then @@ -5332,24 +5269,24 @@ 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 + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi DUMPBIN=$ac_cv_prog_DUMPBIN if test -n "$DUMPBIN"; then - { $as_echo "$as_me:$LINENO: result: $DUMPBIN" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5 $as_echo "$DUMPBIN" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -5359,13 +5296,13 @@ fi if test -z "$DUMPBIN"; then ac_ct_DUMPBIN=$DUMPBIN - for ac_prog in "dumpbin -symbols" "link -dump -symbols" + for ac_prog in dumpbin "link -dump" do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then +if ${ac_cv_prog_ac_ct_DUMPBIN+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_DUMPBIN"; then @@ -5376,24 +5313,24 @@ 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 + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DUMPBIN="$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN if test -n "$ac_ct_DUMPBIN"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_DUMPBIN" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5 $as_echo "$ac_ct_DUMPBIN" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -5406,7 +5343,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -5414,6 +5351,15 @@ fi fi + case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in + *COFF*) + DUMPBIN="$DUMPBIN -symbols" + ;; + *) + DUMPBIN=: + ;; + esac + fi if test "$DUMPBIN" != ":"; then NM="$DUMPBIN" @@ -5426,44 +5372,44 @@ -{ $as_echo "$as_me:$LINENO: checking the name lister ($NM) interface" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5 $as_echo_n "checking the name lister ($NM) interface... " >&6; } -if test "${lt_cv_nm_interface+set}" = set; then +if ${lt_cv_nm_interface+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:5436: $ac_compile\"" >&5) + (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:5439: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:5442: output\"" >&5) + (eval echo "\"\$as_me:$LINENO: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" fi rm -f conftest* fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_nm_interface" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5 $as_echo "$lt_cv_nm_interface" >&6; } -{ $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5 $as_echo_n "checking whether ln -s works... " >&6; } LN_S=$as_ln_s if test "$LN_S" = "ln -s"; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else - { $as_echo "$as_me:$LINENO: result: no, using $LN_S" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5 $as_echo "no, using $LN_S" >&6; } fi # find the maximum length of command line arguments -{ $as_echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5 $as_echo_n "checking the maximum length of command line arguments... " >&6; } -if test "${lt_cv_sys_max_cmd_len+set}" = set; then +if ${lt_cv_sys_max_cmd_len+:} false; then : $as_echo_n "(cached) " >&6 else i=0 @@ -5496,6 +5442,11 @@ lt_cv_sys_max_cmd_len=8192; ;; + mint*) + # On MiNT this can take a long time and run out of memory. + lt_cv_sys_max_cmd_len=8192; + ;; + amigaos*) # On AmigaOS with pdksh, this test takes hours, literally. # So we just punt and use a minimum line length of 8192. @@ -5521,6 +5472,11 @@ lt_cv_sys_max_cmd_len=196608 ;; + os2*) + # The test takes a long time on OS/2. + lt_cv_sys_max_cmd_len=8192 + ;; + osf*) # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not @@ -5547,7 +5503,8 @@ ;; *) lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` - if test -n "$lt_cv_sys_max_cmd_len"; then + if test -n "$lt_cv_sys_max_cmd_len" && \ + test undefined != "$lt_cv_sys_max_cmd_len"; then lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` else @@ -5560,8 +5517,8 @@ # If test is not a shell built-in, we'll probably end up computing a # maximum length that is only half of the actual maximum length, but # we can't tell. - while { test "X"`$SHELL $0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \ - = "XX$teststring$teststring"; } >/dev/null 2>&1 && + while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ + = "X$teststring$teststring"; } >/dev/null 2>&1 && test $i != 17 # 1/2 MB should be enough do i=`expr $i + 1` @@ -5581,10 +5538,10 @@ fi if test -n $lt_cv_sys_max_cmd_len ; then - { $as_echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5 $as_echo "$lt_cv_sys_max_cmd_len" >&6; } else - { $as_echo "$as_me:$LINENO: result: none" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5 $as_echo "none" >&6; } fi max_cmd_len=$lt_cv_sys_max_cmd_len @@ -5598,27 +5555,27 @@ : ${MV="mv -f"} : ${RM="rm -f"} -{ $as_echo "$as_me:$LINENO: checking whether the shell understands some XSI constructs" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5 $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; } # Try some XSI features xsi_shell=no ( _lt_dummy="a/b/c" - test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ - = c,a/b,, \ + test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ + = c,a/b,b/c, \ && eval 'test $(( 1 + 1 )) -eq 2 \ && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ && xsi_shell=yes -{ $as_echo "$as_me:$LINENO: result: $xsi_shell" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5 $as_echo "$xsi_shell" >&6; } -{ $as_echo "$as_me:$LINENO: checking whether the shell understands \"+=\"" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5 $as_echo_n "checking whether the shell understands \"+=\"... " >&6; } lt_shell_append=no ( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \ >/dev/null 2>&1 \ && lt_shell_append=yes -{ $as_echo "$as_me:$LINENO: result: $lt_shell_append" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5 $as_echo "$lt_shell_append" >&6; } @@ -5653,14 +5610,88 @@ -{ $as_echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5 -$as_echo_n "checking for $LD option to reload object files... " >&6; } -if test "${lt_cv_ld_reload_flag+set}" = set; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 +$as_echo_n "checking how to convert $build file names to $host format... " >&6; } +if ${lt_cv_to_host_file_cmd+:} false; then : $as_echo_n "(cached) " >&6 else - lt_cv_ld_reload_flag='-r' -fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5 + case $host in + *-*-mingw* ) + case $build in + *-*-mingw* ) # actually msys + lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 + ;; + *-*-cygwin* ) + lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 + ;; + * ) # otherwise, assume *nix + lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 + ;; + esac + ;; + *-*-cygwin* ) + case $build in + *-*-mingw* ) # actually msys + lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin + ;; + *-*-cygwin* ) + lt_cv_to_host_file_cmd=func_convert_file_noop + ;; + * ) # otherwise, assume *nix + lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin + ;; + esac + ;; + * ) # unhandled hosts (and "normal" native builds) + lt_cv_to_host_file_cmd=func_convert_file_noop + ;; +esac + +fi + +to_host_file_cmd=$lt_cv_to_host_file_cmd +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 +$as_echo "$lt_cv_to_host_file_cmd" >&6; } + + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 +$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } +if ${lt_cv_to_tool_file_cmd+:} false; then : + $as_echo_n "(cached) " >&6 +else + #assume ordinary cross tools, or native build. +lt_cv_to_tool_file_cmd=func_convert_file_noop +case $host in + *-*-mingw* ) + case $build in + *-*-mingw* ) # actually msys + lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 + ;; + esac + ;; +esac + +fi + +to_tool_file_cmd=$lt_cv_to_tool_file_cmd +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 +$as_echo "$lt_cv_to_tool_file_cmd" >&6; } + + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 +$as_echo_n "checking for $LD option to reload object files... " >&6; } +if ${lt_cv_ld_reload_flag+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_ld_reload_flag='-r' +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5 $as_echo "$lt_cv_ld_reload_flag" >&6; } reload_flag=$lt_cv_ld_reload_flag case $reload_flag in @@ -5669,6 +5700,11 @@ esac reload_cmds='$LD$reload_flag -o $output$reload_objs' case $host_os in + cygwin* | mingw* | pw32* | cegcc*) + if test "$GCC" != yes; then + reload_cmds=false + fi + ;; darwin*) if test "$GCC" = yes; then reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' @@ -5689,9 +5725,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. set dummy ${ac_tool_prefix}objdump; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_OBJDUMP+set}" = set; then +if ${ac_cv_prog_OBJDUMP+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$OBJDUMP"; then @@ -5702,24 +5738,24 @@ 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 + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi OBJDUMP=$ac_cv_prog_OBJDUMP if test -n "$OBJDUMP"; then - { $as_echo "$as_me:$LINENO: result: $OBJDUMP" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5 $as_echo "$OBJDUMP" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -5729,9 +5765,9 @@ ac_ct_OBJDUMP=$OBJDUMP # Extract the first word of "objdump", so it can be a program name with args. set dummy objdump; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then +if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_OBJDUMP"; then @@ -5742,24 +5778,24 @@ 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 + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OBJDUMP="objdump" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP if test -n "$ac_ct_OBJDUMP"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5 $as_echo "$ac_ct_OBJDUMP" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -5768,7 +5804,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -5788,9 +5824,9 @@ -{ $as_echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5 $as_echo_n "checking how to recognize dependent libraries... " >&6; } -if test "${lt_cv_deplibs_check_method+set}" = set; then +if ${lt_cv_deplibs_check_method+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_file_magic_cmd='$MAGIC_CMD' @@ -5832,16 +5868,18 @@ # Base MSYS/MinGW do not provide the 'file' command needed by # func_win32_libid shell function, so use a weaker test based on 'objdump', # unless we find 'file', for example because we are cross-compiling. - if ( file / ) >/dev/null 2>&1; then + # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin. + if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' lt_cv_file_magic_cmd='func_win32_libid' else - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' + # Keep this pattern in sync with the one in func_win32_libid. + lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' lt_cv_file_magic_cmd='$OBJDUMP -f' fi ;; -cegcc) +cegcc*) # use the weaker test based on 'objdump'. See mingw*. lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?' lt_cv_file_magic_cmd='$OBJDUMP -f' @@ -5867,7 +5905,7 @@ fi ;; -gnu*) +haiku*) lt_cv_deplibs_check_method=pass_all ;; @@ -5879,11 +5917,11 @@ lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so ;; hppa*64*) - lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]' + lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]' lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl ;; *) - lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library' + lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9]\.[0-9]) shared library' lt_cv_file_magic_test_file=/usr/lib/libc.sl ;; esac @@ -5904,12 +5942,12 @@ lt_cv_deplibs_check_method=pass_all ;; -# This must be Linux ELF. -linux* | k*bsd*-gnu) +# This must be glibc/ELF. +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) lt_cv_deplibs_check_method=pass_all ;; -netbsd*) +netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' else @@ -5984,8 +6022,23 @@ esac fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 $as_echo "$lt_cv_deplibs_check_method" >&6; } + +file_magic_glob= +want_nocaseglob=no +if test "$build" = "$host"; then + case $host_os in + mingw* | pw32*) + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then + want_nocaseglob=yes + else + file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` + fi + ;; + esac +fi + file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method test -z "$deplibs_check_method" && deplibs_check_method=unknown @@ -6001,12 +6054,166 @@ + + + + + + + + + + +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. +set dummy ${ac_tool_prefix}dlltool; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_DLLTOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$DLLTOOL"; then + ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. +else +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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +DLLTOOL=$ac_cv_prog_DLLTOOL +if test -n "$DLLTOOL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 +$as_echo "$DLLTOOL" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_DLLTOOL"; then + ac_ct_DLLTOOL=$DLLTOOL + # Extract the first word of "dlltool", so it can be a program name with args. +set dummy dlltool; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_DLLTOOL"; then + ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. +else +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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_DLLTOOL="dlltool" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL +if test -n "$ac_ct_DLLTOOL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 +$as_echo "$ac_ct_DLLTOOL" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_DLLTOOL" = x; then + DLLTOOL="false" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + DLLTOOL=$ac_ct_DLLTOOL + fi +else + DLLTOOL="$ac_cv_prog_DLLTOOL" +fi + +test -z "$DLLTOOL" && DLLTOOL=dlltool + + + + + + + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 +$as_echo_n "checking how to associate runtime and link libraries... " >&6; } +if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_sharedlib_from_linklib_cmd='unknown' + +case $host_os in +cygwin* | mingw* | pw32* | cegcc*) + # two different shell functions defined in ltmain.sh + # decide which to use based on capabilities of $DLLTOOL + case `$DLLTOOL --help 2>&1` in + *--identify-strict*) + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib + ;; + *) + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback + ;; + esac + ;; +*) + # fallback: assume linklib IS sharedlib + lt_cv_sharedlib_from_linklib_cmd="$ECHO" + ;; +esac + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 +$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } +sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd +test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO + + + + + + + + if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. -set dummy ${ac_tool_prefix}ar; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 + for ac_prog in ar + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_AR+set}" = set; then +if ${ac_cv_prog_AR+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$AR"; then @@ -6017,36 +6224,40 @@ 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_prog_AR="${ac_tool_prefix}ar" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_AR="$ac_tool_prefix$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi AR=$ac_cv_prog_AR if test -n "$AR"; then - { $as_echo "$as_me:$LINENO: result: $AR" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5 $as_echo "$AR" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi + test -n "$AR" && break + done fi -if test -z "$ac_cv_prog_AR"; then +if test -z "$AR"; then ac_ct_AR=$AR - # Extract the first word of "ar", so it can be a program name with args. -set dummy ar; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 + for ac_prog in ar +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_AR+set}" = set; then +if ${ac_cv_prog_ac_ct_AR+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_AR"; then @@ -6057,48 +6268,108 @@ 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_prog_ac_ct_AR="ar" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_AR="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_AR=$ac_cv_prog_ac_ct_AR if test -n "$ac_ct_AR"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_AR" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5 $as_echo "$ac_ct_AR" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi + + test -n "$ac_ct_AR" && break +done + if test "x$ac_ct_AR" = x; then AR="false" else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac AR=$ac_ct_AR fi -else - AR="$ac_cv_prog_AR" fi -test -z "$AR" && AR=ar -test -z "$AR_FLAGS" && AR_FLAGS=cru +: ${AR=ar} +: ${AR_FLAGS=cru} + + + + + + + + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 +$as_echo_n "checking for archiver @FILE support... " >&6; } +if ${lt_cv_ar_at_file+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_ar_at_file=no + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + echo conftest.$ac_objext > conftest.lst + lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 + (eval $lt_ar_try) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + if test "$ac_status" -eq 0; then + # Ensure the archiver fails upon bogus file names. + rm -f conftest.$ac_objext libconftest.a + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 + (eval $lt_ar_try) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + if test "$ac_status" -ne 0; then + lt_cv_ar_at_file=@ + fi + fi + rm -f conftest.* libconftest.a +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 +$as_echo "$lt_cv_ar_at_file" >&6; } +if test "x$lt_cv_ar_at_file" = xno; then + archiver_list_spec= +else + archiver_list_spec=$lt_cv_ar_at_file +fi @@ -6109,9 +6380,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_STRIP+set}" = set; then +if ${ac_cv_prog_STRIP+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$STRIP"; then @@ -6122,24 +6393,24 @@ 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 + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi STRIP=$ac_cv_prog_STRIP if test -n "$STRIP"; then - { $as_echo "$as_me:$LINENO: result: $STRIP" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 $as_echo "$STRIP" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -6149,9 +6420,9 @@ ac_ct_STRIP=$STRIP # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then +if ${ac_cv_prog_ac_ct_STRIP+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_STRIP"; then @@ -6162,24 +6433,24 @@ 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 + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_STRIP="strip" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP if test -n "$ac_ct_STRIP"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 $as_echo "$ac_ct_STRIP" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -6188,7 +6459,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -6208,9 +6479,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_RANLIB+set}" = set; then +if ${ac_cv_prog_RANLIB+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$RANLIB"; then @@ -6221,24 +6492,24 @@ 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 + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi RANLIB=$ac_cv_prog_RANLIB if test -n "$RANLIB"; then - { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5 $as_echo "$RANLIB" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -6248,9 +6519,9 @@ ac_ct_RANLIB=$RANLIB # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then +if ${ac_cv_prog_ac_ct_RANLIB+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_RANLIB"; then @@ -6261,24 +6532,24 @@ 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 + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_RANLIB="ranlib" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB if test -n "$ac_ct_RANLIB"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5 $as_echo "$ac_ct_RANLIB" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -6287,7 +6558,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -6312,15 +6583,27 @@ if test -n "$RANLIB"; then case $host_os in openbsd*) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" ;; *) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" ;; esac - old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" + old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" fi +case $host_os in + darwin*) + lock_old_archive_extraction=yes ;; + *) + lock_old_archive_extraction=no ;; +esac + + + + + + @@ -6365,9 +6648,9 @@ # Check for command to grab the raw symbol name followed by C symbol from nm. -{ $as_echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5 $as_echo_n "checking command to parse $NM output from $compiler object... " >&6; } -if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then +if ${lt_cv_sys_global_symbol_pipe+:} false; then : $as_echo_n "(cached) " >&6 else @@ -6428,8 +6711,8 @@ lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" # Transform an extracted symbol line into symbol name and symbol address -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" # Handle CRLF in mingw tool chain opt_cr= @@ -6453,6 +6736,7 @@ # which start with @ or ?. lt_cv_sys_global_symbol_pipe="$AWK '"\ " {last_section=section; section=\$ 3};"\ +" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ " \$ 0!~/External *\|/{next};"\ " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ @@ -6465,6 +6749,7 @@ else lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" fi + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" # Check to see that the pipe works correctly. pipe_works=no @@ -6483,18 +6768,18 @@ int main(){nm_test_var='a';nm_test_func();return(0);} _LT_EOF - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then # Now try to grab the symbols. nlist=conftest.nm - if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5 - (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5 + (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && test -s "$nlist"; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && test -s "$nlist"; then # Try sorting and uniquifying the output. if sort "$nlist" | uniq > "$nlist"T; then mv -f "$nlist"T "$nlist" @@ -6506,6 +6791,18 @@ if $GREP ' nm_test_var$' "$nlist" >/dev/null; then if $GREP ' nm_test_func$' "$nlist" >/dev/null; then cat <<_LT_EOF > conftest.$ac_ext +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) +/* DATA imports from DLLs on WIN32 con't be const, because runtime + relocations are performed -- see ld's documentation on pseudo-relocs. */ +# define LT_DLSYM_CONST +#elif defined(__osf__) +/* This system does not cope well with relocations in const data. */ +# define LT_DLSYM_CONST +#else +# define LT_DLSYM_CONST const +#endif + #ifdef __cplusplus extern "C" { #endif @@ -6517,7 +6814,7 @@ cat <<_LT_EOF >> conftest.$ac_ext /* The mapping between symbol names and symbols. */ -const struct { +LT_DLSYM_CONST struct { const char *name; void *address; } @@ -6543,19 +6840,19 @@ _LT_EOF # Now try linking the two files. mv conftest.$ac_objext conftstm.$ac_objext - lt_save_LIBS="$LIBS" - lt_save_CFLAGS="$CFLAGS" + lt_globsym_save_LIBS=$LIBS + lt_globsym_save_CFLAGS=$CFLAGS LIBS="conftstm.$ac_objext" CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" - if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 (eval $ac_link) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && test -s conftest${ac_exeext}; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && test -s conftest${ac_exeext}; then pipe_works=yes fi - LIBS="$lt_save_LIBS" - CFLAGS="$lt_save_CFLAGS" + LIBS=$lt_globsym_save_LIBS + CFLAGS=$lt_globsym_save_CFLAGS else echo "cannot find nm_test_func in $nlist" >&5 fi @@ -6585,13 +6882,27 @@ lt_cv_sys_global_symbol_to_cdecl= fi if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then - { $as_echo "$as_me:$LINENO: result: failed" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5 $as_echo "failed" >&6; } else - { $as_echo "$as_me:$LINENO: result: ok" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 $as_echo "ok" >&6; } fi +# Response file support. +if test "$lt_cv_nm_interface" = "MS dumpbin"; then + nm_file_list_spec='@' +elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then + nm_file_list_spec='@' +fi + + + + + + + + @@ -6611,11 +6922,45 @@ +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 +$as_echo_n "checking for sysroot... " >&6; } + +# Check whether --with-sysroot was given. +if test "${with_sysroot+set}" = set; then : + withval=$with_sysroot; +else + with_sysroot=no +fi + + +lt_sysroot= +case ${with_sysroot} in #( + yes) + if test "$GCC" = yes; then + lt_sysroot=`$CC --print-sysroot 2>/dev/null` + fi + ;; #( + /*) + lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` + ;; #( + no|'') + ;; #( + *) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5 +$as_echo "${with_sysroot}" >&6; } + as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 + ;; +esac + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 +$as_echo "${lt_sysroot:-no}" >&6; } + + # Check whether --enable-libtool-lock was given. -if test "${enable_libtool_lock+set}" = set; then +if test "${enable_libtool_lock+set}" = set; then : enableval=$enable_libtool_lock; fi @@ -6627,11 +6972,11 @@ ia64-*-hpux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then case `/usr/bin/file conftest.$ac_objext` in *ELF-32*) HPUX_IA64_MODE="32" @@ -6645,12 +6990,12 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 6648 "configure"' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + echo '#line '$LINENO' "configure"' > conftest.$ac_ext + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then if test "$lt_cv_prog_gnu_ld" = yes; then case `/usr/bin/file conftest.$ac_objext` in *32-bit*) @@ -6680,15 +7025,15 @@ rm -rf conftest* ;; -x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ +x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then case `/usr/bin/file conftest.o` in *32-bit*) case $host in @@ -6696,9 +7041,19 @@ LD="${LD-ld} -m elf_i386_fbsd" ;; x86_64-*linux*) - LD="${LD-ld} -m elf_i386" + case `/usr/bin/file conftest.o` in + *x86-64*) + LD="${LD-ld} -m elf32_x86_64" + ;; + *) + LD="${LD-ld} -m elf_i386" + ;; + esac ;; - ppc64-*linux*|powerpc64-*linux*) + powerpc64le-*) + LD="${LD-ld} -m elf32lppclinux" + ;; + powerpc64-*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) @@ -6717,7 +7072,10 @@ x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; - ppc*-*linux*|powerpc*-*linux*) + powerpcle-*) + LD="${LD-ld} -m elf64lppc" + ;; + powerpc-*) LD="${LD-ld} -m elf64ppc" ;; s390*-*linux*|s390*-*tpf*) @@ -6737,9 +7095,9 @@ # On SCO OpenServer 5, we need -belf to get full-featured binaries. SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -belf" - { $as_echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5 $as_echo_n "checking whether the C compiler needs -belf... " >&6; } -if test "${lt_cv_cc_needs_belf+set}" = set; then +if ${lt_cv_cc_needs_belf+:} false; then : $as_echo_n "(cached) " >&6 else ac_ext=c @@ -6748,11 +7106,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -6763,38 +7117,13 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : lt_cv_cc_needs_belf=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - lt_cv_cc_needs_belf=no + lt_cv_cc_needs_belf=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -6802,25 +7131,38 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5 $as_echo "$lt_cv_cc_needs_belf" >&6; } if test x"$lt_cv_cc_needs_belf" != x"yes"; then # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf CFLAGS="$SAVE_CFLAGS" fi ;; -sparc*-*solaris*) +*-*solaris*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then case `/usr/bin/file conftest.o` in *64-bit*) case $lt_cv_prog_gnu_ld in - yes*) LD="${LD-ld} -m elf64_sparc" ;; + yes*) + case $host in + i?86-*-solaris*) + LD="${LD-ld} -m elf_x86_64" + ;; + sparc*-*-solaris*) + LD="${LD-ld} -m elf64_sparc" + ;; + esac + # GNU ld 2.21 introduced _sol2 emulations. Use them if available. + if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then + LD="${LD-ld}_sol2" + fi + ;; *) if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then LD="${LD-ld} -64" @@ -6836,15 +7178,132 @@ need_locks="$enable_libtool_lock" +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. +set dummy ${ac_tool_prefix}mt; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$MANIFEST_TOOL"; then + ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. +else +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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL +if test -n "$MANIFEST_TOOL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 +$as_echo "$MANIFEST_TOOL" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_MANIFEST_TOOL"; then + ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL + # Extract the first word of "mt", so it can be a program name with args. +set dummy mt; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_MANIFEST_TOOL"; then + ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. +else +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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL +if test -n "$ac_ct_MANIFEST_TOOL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 +$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_MANIFEST_TOOL" = x; then + MANIFEST_TOOL=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL + fi +else + MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" +fi + +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 +$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } +if ${lt_cv_path_mainfest_tool+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_path_mainfest_tool=no + echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 + $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out + cat conftest.err >&5 + if $GREP 'Manifest Tool' conftest.out > /dev/null; then + lt_cv_path_mainfest_tool=yes + fi + rm -f conftest* +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 +$as_echo "$lt_cv_path_mainfest_tool" >&6; } +if test "x$lt_cv_path_mainfest_tool" != xyes; then + MANIFEST_TOOL=: +fi + + + + + case $host_os in rhapsody* | darwin*) if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args. set dummy ${ac_tool_prefix}dsymutil; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_DSYMUTIL+set}" = set; then +if ${ac_cv_prog_DSYMUTIL+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$DSYMUTIL"; then @@ -6855,24 +7314,24 @@ 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 + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi DSYMUTIL=$ac_cv_prog_DSYMUTIL if test -n "$DSYMUTIL"; then - { $as_echo "$as_me:$LINENO: result: $DSYMUTIL" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5 $as_echo "$DSYMUTIL" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -6882,9 +7341,9 @@ ac_ct_DSYMUTIL=$DSYMUTIL # Extract the first word of "dsymutil", so it can be a program name with args. set dummy dsymutil; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then +if ${ac_cv_prog_ac_ct_DSYMUTIL+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_DSYMUTIL"; then @@ -6895,24 +7354,24 @@ 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 + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL if test -n "$ac_ct_DSYMUTIL"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5 $as_echo "$ac_ct_DSYMUTIL" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -6921,7 +7380,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -6934,9 +7393,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args. set dummy ${ac_tool_prefix}nmedit; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_NMEDIT+set}" = set; then +if ${ac_cv_prog_NMEDIT+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$NMEDIT"; then @@ -6947,24 +7406,24 @@ 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 + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi NMEDIT=$ac_cv_prog_NMEDIT if test -n "$NMEDIT"; then - { $as_echo "$as_me:$LINENO: result: $NMEDIT" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5 $as_echo "$NMEDIT" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -6974,9 +7433,9 @@ ac_ct_NMEDIT=$NMEDIT # Extract the first word of "nmedit", so it can be a program name with args. set dummy nmedit; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then +if ${ac_cv_prog_ac_ct_NMEDIT+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_NMEDIT"; then @@ -6987,24 +7446,24 @@ 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 + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_NMEDIT="nmedit" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT if test -n "$ac_ct_NMEDIT"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5 $as_echo "$ac_ct_NMEDIT" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -7013,7 +7472,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -7026,9 +7485,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args. set dummy ${ac_tool_prefix}lipo; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_LIPO+set}" = set; then +if ${ac_cv_prog_LIPO+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$LIPO"; then @@ -7039,24 +7498,24 @@ 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 + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_LIPO="${ac_tool_prefix}lipo" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi LIPO=$ac_cv_prog_LIPO if test -n "$LIPO"; then - { $as_echo "$as_me:$LINENO: result: $LIPO" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5 $as_echo "$LIPO" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -7066,9 +7525,9 @@ ac_ct_LIPO=$LIPO # Extract the first word of "lipo", so it can be a program name with args. set dummy lipo; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then +if ${ac_cv_prog_ac_ct_LIPO+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_LIPO"; then @@ -7079,24 +7538,24 @@ 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 + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_LIPO="lipo" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO if test -n "$ac_ct_LIPO"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_LIPO" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5 $as_echo "$ac_ct_LIPO" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -7105,7 +7564,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -7118,9 +7577,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args. set dummy ${ac_tool_prefix}otool; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_OTOOL+set}" = set; then +if ${ac_cv_prog_OTOOL+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$OTOOL"; then @@ -7131,24 +7590,24 @@ 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 + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OTOOL="${ac_tool_prefix}otool" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi OTOOL=$ac_cv_prog_OTOOL if test -n "$OTOOL"; then - { $as_echo "$as_me:$LINENO: result: $OTOOL" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5 $as_echo "$OTOOL" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -7158,9 +7617,9 @@ ac_ct_OTOOL=$OTOOL # Extract the first word of "otool", so it can be a program name with args. set dummy otool; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then +if ${ac_cv_prog_ac_ct_OTOOL+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_OTOOL"; then @@ -7171,24 +7630,24 @@ 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 + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OTOOL="otool" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL if test -n "$ac_ct_OTOOL"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_OTOOL" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5 $as_echo "$ac_ct_OTOOL" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -7197,7 +7656,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -7210,9 +7669,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args. set dummy ${ac_tool_prefix}otool64; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_OTOOL64+set}" = set; then +if ${ac_cv_prog_OTOOL64+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$OTOOL64"; then @@ -7223,24 +7682,24 @@ 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 + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi OTOOL64=$ac_cv_prog_OTOOL64 if test -n "$OTOOL64"; then - { $as_echo "$as_me:$LINENO: result: $OTOOL64" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5 $as_echo "$OTOOL64" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -7250,9 +7709,9 @@ ac_ct_OTOOL64=$OTOOL64 # Extract the first word of "otool64", so it can be a program name with args. set dummy otool64; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then +if ${ac_cv_prog_ac_ct_OTOOL64+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_OTOOL64"; then @@ -7263,24 +7722,24 @@ 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 + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OTOOL64="otool64" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64 if test -n "$ac_ct_OTOOL64"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_OTOOL64" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5 $as_echo "$ac_ct_OTOOL64" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -7289,7 +7748,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -7325,9 +7784,9 @@ - { $as_echo "$as_me:$LINENO: checking for -single_module linker flag" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5 $as_echo_n "checking for -single_module linker flag... " >&6; } -if test "${lt_cv_apple_cc_single_mod+set}" = set; then +if ${lt_cv_apple_cc_single_mod+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_apple_cc_single_mod=no @@ -7343,7 +7802,13 @@ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ -dynamiclib -Wl,-single_module conftest.c 2>conftest.err _lt_result=$? - if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then + # If there is a non-empty error log, and "single_module" + # appears in it, assume the flag caused a linker warning + if test -s conftest.err && $GREP single_module conftest.err; then + cat conftest.err >&5 + # Otherwise, if the output was created with a 0 exit code from + # the compiler, it worked. + elif test -f libconftest.dylib && test $_lt_result -eq 0; then lt_cv_apple_cc_single_mod=yes else cat conftest.err >&5 @@ -7352,22 +7817,19 @@ rm -f conftest.* fi fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5 $as_echo "$lt_cv_apple_cc_single_mod" >&6; } - { $as_echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5 + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5 $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; } -if test "${lt_cv_ld_exported_symbols_list+set}" = set; then +if ${lt_cv_ld_exported_symbols_list+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_ld_exported_symbols_list=no save_LDFLAGS=$LDFLAGS echo "_main" > conftest.sym LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -7378,1275 +7840,108 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : lt_cv_ld_exported_symbols_list=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - lt_cv_ld_exported_symbols_list=no + lt_cv_ld_exported_symbols_list=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LDFLAGS="$save_LDFLAGS" fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 $as_echo "$lt_cv_ld_exported_symbols_list" >&6; } - case $host_os in - rhapsody* | darwin1.[012]) - _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; - darwin1.*) - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; - darwin*) # darwin 5.x on - # if running on 10.5 or later, the deployment target defaults - # to the OS version, if on x86, and 10.4, the deployment - # target defaults to 10.4. Don't you love it? - case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in - 10.0,*86*-darwin8*|10.0,*-darwin[91]*) - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; - 10.[012]*) - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; - 10.*) - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; - esac - ;; - esac - if test "$lt_cv_apple_cc_single_mod" = "yes"; then - _lt_dar_single_mod='$single_module' - fi - if test "$lt_cv_ld_exported_symbols_list" = "yes"; then - _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' - else - _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' - fi - if test "$DSYMUTIL" != ":"; then - _lt_dsymutil='~$DSYMUTIL $lib || :' - else - _lt_dsymutil= - fi - ;; - esac -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 -$as_echo_n "checking how to run the C preprocessor... " >&6; } -# On Suns, sometimes $CPP names a directory. -if test -n "$CPP" && test -d "$CPP"; then - CPP= -fi -if test -z "$CPP"; then - if test "${ac_cv_prog_CPP+set}" = set; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5 +$as_echo_n "checking for -force_load linker flag... " >&6; } +if ${lt_cv_ld_force_load+:} false; then : $as_echo_n "(cached) " >&6 else - # Double quotes because CPP needs to be expanded - for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" - do - ac_preproc_ok=false -for ac_c_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif - Syntax error -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - : -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - # Broken: fails on valid input. -continue -fi - -rm -f conftest.err conftest.$ac_ext - - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - # Broken: success on invalid input. -continue -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - # Passes both tests. -ac_preproc_ok=: -break -fi - -rm -f conftest.err conftest.$ac_ext - -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then - break -fi - - done - ac_cv_prog_CPP=$CPP - -fi - CPP=$ac_cv_prog_CPP -else - ac_cv_prog_CPP=$CPP -fi -{ $as_echo "$as_me:$LINENO: result: $CPP" >&5 -$as_echo "$CPP" >&6; } -ac_preproc_ok=false -for ac_c_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif - Syntax error -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - : -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - # Broken: fails on valid input. -continue -fi - -rm -f conftest.err conftest.$ac_ext - - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - # Broken: success on invalid input. -continue -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - # Passes both tests. -ac_preproc_ok=: -break -fi - -rm -f conftest.err conftest.$ac_ext - -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then - : -else - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } -fi - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - -{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5 -$as_echo_n "checking for ANSI C header files... " >&6; } -if test "${ac_cv_header_stdc+set}" = set; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -#include -#include -#include - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_header_stdc=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_header_stdc=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - -if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "memchr" >/dev/null 2>&1; then - : -else - ac_cv_header_stdc=no -fi -rm -f conftest* - -fi - -if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "free" >/dev/null 2>&1; then - : -else - ac_cv_header_stdc=no -fi -rm -f conftest* - -fi - -if test $ac_cv_header_stdc = yes; then - # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. - if test "$cross_compiling" = yes; then - : -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -#include -#if ((' ' & 0x0FF) == 0x020) -# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -#else -# define ISLOWER(c) \ - (('a' <= (c) && (c) <= 'i') \ - || ('j' <= (c) && (c) <= 'r') \ - || ('s' <= (c) && (c) <= 'z')) -# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) -#endif - -#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) -int -main () -{ - int i; - for (i = 0; i < 256; i++) - if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) - return 2; - return 0; -} -_ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : -else - $as_echo "$as_me: program exited with status $ac_status" >&5 -$as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -ac_cv_header_stdc=no -fi -rm -rf conftest.dSYM -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi - - -fi -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 -$as_echo "$ac_cv_header_stdc" >&6; } -if test $ac_cv_header_stdc = yes; then - -cat >>confdefs.h <<\_ACEOF -#define STDC_HEADERS 1 -_ACEOF - -fi - -# On IRIX 5.3, sys/types and inttypes.h are conflicting. - - - - - - - - - -for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ - inttypes.h stdint.h unistd.h -do -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default - -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - eval "$as_ac_Header=yes" -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_Header=no" -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - -done - - - -for ac_header in dlfcn.h -do -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default - -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - eval "$as_ac_Header=yes" -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_Header=no" -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - -done - - - -ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -if test -z "$CXX"; then - if test -n "$CCC"; then - CXX=$CCC - else - if test -n "$ac_tool_prefix"; then - for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CXX+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test -n "$CXX"; then - ac_cv_prog_CXX="$CXX" # Let the user override the test. -else -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_prog_CXX="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -CXX=$ac_cv_prog_CXX -if test -n "$CXX"; then - { $as_echo "$as_me:$LINENO: result: $CXX" >&5 -$as_echo "$CXX" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$CXX" && break - done -fi -if test -z "$CXX"; then - ac_ct_CXX=$CXX - for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_CXX"; then - ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. -else -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_prog_ac_ct_CXX="$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -ac_ct_CXX=$ac_cv_prog_ac_ct_CXX -if test -n "$ac_ct_CXX"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 -$as_echo "$ac_ct_CXX" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$ac_ct_CXX" && break -done - - if test "x$ac_ct_CXX" = x; then - CXX="g++" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - CXX=$ac_ct_CXX - fi -fi - - fi -fi -# Provide some information about the compiler. -$as_echo "$as_me:$LINENO: checking for C++ compiler version" >&5 -set X $ac_compile -ac_compiler=$2 -{ (ac_try="$ac_compiler --version >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler --version >&5") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -v >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler -v >&5") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -V >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler -V >&5") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } - -{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 -$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; } -if test "${ac_cv_cxx_compiler_gnu+set}" = set; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ -#ifndef __GNUC__ - choke me -#endif - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_compiler_gnu=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_compiler_gnu=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -ac_cv_cxx_compiler_gnu=$ac_compiler_gnu - -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 -$as_echo "$ac_cv_cxx_compiler_gnu" >&6; } -if test $ac_compiler_gnu = yes; then - GXX=yes -else - GXX= -fi -ac_test_CXXFLAGS=${CXXFLAGS+set} -ac_save_CXXFLAGS=$CXXFLAGS -{ $as_echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 -$as_echo_n "checking whether $CXX accepts -g... " >&6; } -if test "${ac_cv_prog_cxx_g+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_save_cxx_werror_flag=$ac_cxx_werror_flag - ac_cxx_werror_flag=yes - ac_cv_prog_cxx_g=no - CXXFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_prog_cxx_g=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - CXXFLAGS="" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - : -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cxx_werror_flag=$ac_save_cxx_werror_flag - CXXFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_prog_cxx_g=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_cxx_werror_flag=$ac_save_cxx_werror_flag -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 -$as_echo "$ac_cv_prog_cxx_g" >&6; } -if test "$ac_test_CXXFLAGS" = set; then - CXXFLAGS=$ac_save_CXXFLAGS -elif test $ac_cv_prog_cxx_g = yes; then - if test "$GXX" = yes; then - CXXFLAGS="-g -O2" - else - CXXFLAGS="-g" - fi -else - if test "$GXX" = yes; then - CXXFLAGS="-O2" - else - CXXFLAGS= - fi -fi -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - -depcc="$CXX" am_compiler_list= - -{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 -$as_echo_n "checking dependency style of $depcc... " >&6; } -if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then - # We make a subdir and do the tests there. Otherwise we can end up - # making bogus files that we don't know about and never remove. For - # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. - mkdir conftest.dir - # Copy depcomp to subdir because otherwise we won't find it if we're - # using a relative directory. - cp "$am_depcomp" conftest.dir - cd conftest.dir - # We will build objects and dependencies in a subdirectory because - # it helps to detect inapplicable dependency modes. For instance - # both Tru64's cc and ICC support -MD to output dependencies as a - # side effect of compilation, but ICC will put the dependencies in - # the current directory while Tru64 will put them in the object - # directory. - mkdir sub - - am_cv_CXX_dependencies_compiler_type=none - if test "$am_compiler_list" = ""; then - am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` - fi - am__universal=false - case " $depcc " in #( - *\ -arch\ *\ -arch\ *) am__universal=true ;; - esac - - for depmode in $am_compiler_list; do - # Setup a source with many dependencies, because some compilers - # like to wrap large dependency lists on column 80 (with \), and - # we should not choose a depcomp mode which is confused by this. - # - # We need to recreate these files for each test, as the compiler may - # overwrite some of them when testing with obscure command lines. - # This happens at least with the AIX C compiler. - : > sub/conftest.c - for i in 1 2 3 4 5 6; do - echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h - done - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - - # We check with `-c' and `-o' for the sake of the "dashmstdout" - # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs - am__obj=sub/conftest.${OBJEXT-o} - am__minus_obj="-o $am__obj" - case $depmode in - gcc) - # This depmode causes a compiler race in universal mode. - test "$am__universal" = false || continue - ;; - nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested - if test "x$enable_dependency_tracking" = xyes; then - continue - else - break - fi - ;; - msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has - # not run yet. These depmodes are late enough in the game, and - # so weak that their functioning should not be impacted. - am__obj=conftest.${OBJEXT-o} - am__minus_obj= - ;; - none) break ;; - esac - if depmode=$depmode \ - source=sub/conftest.c object=$am__obj \ - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ - >/dev/null 2>conftest.err && - grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep $am__obj sub/conftest.Po > /dev/null 2>&1 && - ${MAKE-make} -s -f confmf > /dev/null 2>&1; then - # icc doesn't choke on unknown options, it will just issue warnings - # or remarks (even with -Werror). So we grep stderr for any message - # that says an option was ignored or not supported. - # When given -MP, icc 7.0 and 7.1 complain thusly: - # icc: Command line warning: ignoring option '-M'; no argument required - # The diagnosis changed in icc 8.0: - # icc: Command line remark: option '-MP' not supported - if (grep 'ignoring option' conftest.err || - grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else - am_cv_CXX_dependencies_compiler_type=$depmode - break - fi - fi - done - - cd .. - rm -rf conftest.dir -else - am_cv_CXX_dependencies_compiler_type=none -fi - -fi -{ $as_echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5 -$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; } -CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type - - if - test "x$enable_dependency_tracking" != xno \ - && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then - am__fastdepCXX_TRUE= - am__fastdepCXX_FALSE='#' -else - am__fastdepCXX_TRUE='#' - am__fastdepCXX_FALSE= -fi - - -depcc="$CXX" am_compiler_list= - -{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 -$as_echo_n "checking dependency style of $depcc... " >&6; } -if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then - # We make a subdir and do the tests there. Otherwise we can end up - # making bogus files that we don't know about and never remove. For - # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. - mkdir conftest.dir - # Copy depcomp to subdir because otherwise we won't find it if we're - # using a relative directory. - cp "$am_depcomp" conftest.dir - cd conftest.dir - # We will build objects and dependencies in a subdirectory because - # it helps to detect inapplicable dependency modes. For instance - # both Tru64's cc and ICC support -MD to output dependencies as a - # side effect of compilation, but ICC will put the dependencies in - # the current directory while Tru64 will put them in the object - # directory. - mkdir sub - - am_cv_CXX_dependencies_compiler_type=none - if test "$am_compiler_list" = ""; then - am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` - fi - am__universal=false - case " $depcc " in #( - *\ -arch\ *\ -arch\ *) am__universal=true ;; - esac - - for depmode in $am_compiler_list; do - # Setup a source with many dependencies, because some compilers - # like to wrap large dependency lists on column 80 (with \), and - # we should not choose a depcomp mode which is confused by this. - # - # We need to recreate these files for each test, as the compiler may - # overwrite some of them when testing with obscure command lines. - # This happens at least with the AIX C compiler. - : > sub/conftest.c - for i in 1 2 3 4 5 6; do - echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h - done - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - - # We check with `-c' and `-o' for the sake of the "dashmstdout" - # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs - am__obj=sub/conftest.${OBJEXT-o} - am__minus_obj="-o $am__obj" - case $depmode in - gcc) - # This depmode causes a compiler race in universal mode. - test "$am__universal" = false || continue - ;; - nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested - if test "x$enable_dependency_tracking" = xyes; then - continue - else - break - fi - ;; - msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has - # not run yet. These depmodes are late enough in the game, and - # so weak that their functioning should not be impacted. - am__obj=conftest.${OBJEXT-o} - am__minus_obj= - ;; - none) break ;; - esac - if depmode=$depmode \ - source=sub/conftest.c object=$am__obj \ - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ - >/dev/null 2>conftest.err && - grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep $am__obj sub/conftest.Po > /dev/null 2>&1 && - ${MAKE-make} -s -f confmf > /dev/null 2>&1; then - # icc doesn't choke on unknown options, it will just issue warnings - # or remarks (even with -Werror). So we grep stderr for any message - # that says an option was ignored or not supported. - # When given -MP, icc 7.0 and 7.1 complain thusly: - # icc: Command line warning: ignoring option '-M'; no argument required - # The diagnosis changed in icc 8.0: - # icc: Command line remark: option '-MP' not supported - if (grep 'ignoring option' conftest.err || - grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else - am_cv_CXX_dependencies_compiler_type=$depmode - break - fi - fi - done - - cd .. - rm -rf conftest.dir -else - am_cv_CXX_dependencies_compiler_type=none -fi + lt_cv_ld_force_load=no + cat > conftest.c << _LT_EOF +int forced_loaded() { return 2;} +_LT_EOF + echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5 + $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 + echo "$AR cru libconftest.a conftest.o" >&5 + $AR cru libconftest.a conftest.o 2>&5 + echo "$RANLIB libconftest.a" >&5 + $RANLIB libconftest.a 2>&5 + cat > conftest.c << _LT_EOF +int main() { return 0;} +_LT_EOF + echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5 + $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err + _lt_result=$? + if test -s conftest.err && $GREP force_load conftest.err; then + cat conftest.err >&5 + elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then + lt_cv_ld_force_load=yes + else + cat conftest.err >&5 + fi + rm -f conftest.err libconftest.a conftest conftest.c + rm -rf conftest.dSYM fi -{ $as_echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5 -$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; } -CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5 +$as_echo "$lt_cv_ld_force_load" >&6; } + case $host_os in + rhapsody* | darwin1.[012]) + _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; + darwin1.*) + _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + darwin*) # darwin 5.x on + # if running on 10.5 or later, the deployment target defaults + # to the OS version, if on x86, and 10.4, the deployment + # target defaults to 10.4. Don't you love it? + case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in + 10.0,*86*-darwin8*|10.0,*-darwin[91]*) + _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; + 10.[012]*) + _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + 10.*) + _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; + esac + ;; + esac + if test "$lt_cv_apple_cc_single_mod" = "yes"; then + _lt_dar_single_mod='$single_module' + fi + if test "$lt_cv_ld_exported_symbols_list" = "yes"; then + _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' + else + _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' + fi + if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then + _lt_dsymutil='~$DSYMUTIL $lib || :' + else + _lt_dsymutil= + fi + ;; + esac - if - test "x$enable_dependency_tracking" != xno \ - && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then - am__fastdepCXX_TRUE= - am__fastdepCXX_FALSE='#' -else - am__fastdepCXX_TRUE='#' - am__fastdepCXX_FALSE= +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 +$as_echo_n "checking how to run the C preprocessor... " >&6; } +# On Suns, sometimes $CPP names a directory. +if test -n "$CPP" && test -d "$CPP"; then + CPP= fi - - -if test -n "$CXX" && ( test "X$CXX" != "Xno" && - ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || - (test "X$CXX" != "Xg++"))) ; then - ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -{ $as_echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5 -$as_echo_n "checking how to run the C++ preprocessor... " >&6; } -if test -z "$CXXCPP"; then - if test "${ac_cv_prog_CXXCPP+set}" = set; then +if test -z "$CPP"; then + if ${ac_cv_prog_CPP+:} false; then : $as_echo_n "(cached) " >&6 else - # Double quotes because CXXCPP needs to be expanded - for CXXCPP in "$CXX -E" "/lib/cpp" + # Double quotes because CPP needs to be expanded + for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" do ac_preproc_ok=false -for ac_cxx_preproc_warn_flag in '' yes +for ac_c_preproc_warn_flag in '' yes do # Use a header file that comes with gcc, so configuring glibc # with a fresh cross-compiler works. @@ -8654,11 +7949,7 @@ # exists even on freestanding compilers. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifdef __STDC__ # include @@ -8667,93 +7958,49 @@ #endif Syntax error _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || - test ! -s conftest.err - }; then - : -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_c_try_cpp "$LINENO"; then : +else # Broken: fails on valid input. continue fi - -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || - test ! -s conftest.err - }; then +if ac_fn_c_try_cpp "$LINENO"; then : # Broken: success on invalid input. continue else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - # Passes both tests. ac_preproc_ok=: break fi - -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then +rm -f conftest.i conftest.err conftest.$ac_ext +if $ac_preproc_ok; then : break fi done - ac_cv_prog_CXXCPP=$CXXCPP + ac_cv_prog_CPP=$CPP fi - CXXCPP=$ac_cv_prog_CXXCPP + CPP=$ac_cv_prog_CPP else - ac_cv_prog_CXXCPP=$CXXCPP + ac_cv_prog_CPP=$CPP fi -{ $as_echo "$as_me:$LINENO: result: $CXXCPP" >&5 -$as_echo "$CXXCPP" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 +$as_echo "$CPP" >&6; } ac_preproc_ok=false -for ac_cxx_preproc_warn_flag in '' yes +for ac_c_preproc_warn_flag in '' yes do # Use a header file that comes with gcc, so configuring glibc # with a fresh cross-compiler works. @@ -8761,11 +8008,7 @@ # exists even on freestanding compilers. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifdef __STDC__ # include @@ -8774,83 +8017,40 @@ #endif Syntax error _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || - test ! -s conftest.err - }; then - : -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_c_try_cpp "$LINENO"; then : +else # Broken: fails on valid input. continue fi - -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || - test ! -s conftest.err - }; then +if ac_fn_c_try_cpp "$LINENO"; then : # Broken: success on invalid input. continue else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - # Passes both tests. ac_preproc_ok=: break fi - -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then - : +rm -f conftest.i conftest.err conftest.$ac_ext +if $ac_preproc_ok; then : + else - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -_lt_caught_CXX_error=yes; } +as_fn_error $? "C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details" "$LINENO" 5; } fi ac_ext=c @@ -8859,10 +8059,160 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -else - _lt_caught_CXX_error=yes + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 +$as_echo_n "checking for ANSI C header files... " >&6; } +if ${ac_cv_header_stdc+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include +#include +#include + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_header_stdc=yes +else + ac_cv_header_stdc=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +if test $ac_cv_header_stdc = yes; then + # SunOS 4.x string.h does not declare mem*, contrary to ANSI. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "memchr" >/dev/null 2>&1; then : + +else + ac_cv_header_stdc=no +fi +rm -f conftest* + +fi + +if test $ac_cv_header_stdc = yes; then + # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "free" >/dev/null 2>&1; then : + +else + ac_cv_header_stdc=no +fi +rm -f conftest* + +fi + +if test $ac_cv_header_stdc = yes; then + # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. + if test "$cross_compiling" = yes; then : + : +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include +#if ((' ' & 0x0FF) == 0x020) +# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') +# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) +#else +# define ISLOWER(c) \ + (('a' <= (c) && (c) <= 'i') \ + || ('j' <= (c) && (c) <= 'r') \ + || ('s' <= (c) && (c) <= 'z')) +# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) +#endif + +#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) +int +main () +{ + int i; + for (i = 0; i < 256; i++) + if (XOR (islower (i), ISLOWER (i)) + || toupper (i) != TOUPPER (i)) + return 2; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + +else + ac_cv_header_stdc=no +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 +$as_echo "$ac_cv_header_stdc" >&6; } +if test $ac_cv_header_stdc = yes; then + +$as_echo "#define STDC_HEADERS 1" >>confdefs.h + +fi + +# On IRIX 5.3, sys/types and inttypes.h are conflicting. +for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ + inttypes.h stdint.h unistd.h +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default +" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + +done + + +for ac_header in dlfcn.h +do : + ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default +" +if test "x$ac_cv_header_dlfcn_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_DLFCN_H 1 +_ACEOF + fi +done + + + + +func_stripname_cnf () +{ + case ${2} in + .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; + *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; + esac +} # func_stripname_cnf + @@ -8878,7 +8228,7 @@ # Check whether --enable-shared was given. -if test "${enable_shared+set}" = set; then +if test "${enable_shared+set}" = set; then : enableval=$enable_shared; p=${PACKAGE-default} case $enableval in yes) enable_shared=yes ;; @@ -8909,7 +8259,7 @@ # Check whether --enable-static was given. -if test "${enable_static+set}" = set; then +if test "${enable_static+set}" = set; then : enableval=$enable_static; p=${PACKAGE-default} case $enableval in yes) enable_static=yes ;; @@ -8941,8 +8291,23 @@ # Check whether --with-pic was given. -if test "${with_pic+set}" = set; then - withval=$with_pic; pic_mode="$withval" +if test "${with_pic+set}" = set; then : + withval=$with_pic; lt_p=${PACKAGE-default} + case $withval in + yes|no) pic_mode=$withval ;; + *) + pic_mode=default + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for lt_pkg in $withval; do + IFS="$lt_save_ifs" + if test "X$lt_pkg" = "X$lt_p"; then + pic_mode=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac else pic_mode=default fi @@ -8957,7 +8322,7 @@ # Check whether --enable-fast-install was given. -if test "${enable_fast_install+set}" = set; then +if test "${enable_fast_install+set}" = set; then : enableval=$enable_fast_install; p=${PACKAGE-default} case $enableval in yes) enable_fast_install=yes ;; @@ -9019,6 +8384,11 @@ + + + + + test -z "$LN_S" && LN_S="ln -s" @@ -9038,9 +8408,9 @@ setopt NO_GLOB_SUBST fi -{ $as_echo "$as_me:$LINENO: checking for objdir" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5 $as_echo_n "checking for objdir... " >&6; } -if test "${lt_cv_objdir+set}" = set; then +if ${lt_cv_objdir+:} false; then : $as_echo_n "(cached) " >&6 else rm -f .libs 2>/dev/null @@ -9053,7 +8423,7 @@ fi rmdir .libs 2>/dev/null fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5 $as_echo "$lt_cv_objdir" >&6; } objdir=$lt_cv_objdir @@ -9068,19 +8438,6 @@ - - - - - - - - - - - - - case $host_os in aix3*) # AIX sometimes has problems with the GCC collect2 program. For some @@ -9093,23 +8450,6 @@ ;; esac -# Sed substitution that helps us do robust quoting. It backslashifies -# metacharacters that are still active within double-quoted strings. -sed_quote_subst='s/\(["`$\\]\)/\\\1/g' - -# Same as above, but do not quote variable references. -double_quote_subst='s/\(["`\\]\)/\\\1/g' - -# Sed substitution to delay expansion of an escaped shell variable in a -# double_quote_subst'ed string. -delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' - -# Sed substitution to delay expansion of an escaped single quote. -delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' - -# Sed substitution to avoid accidental globbing in evaled expressions -no_glob_subst='s/\*/\\\*/g' - # Global variables: ofile=libtool can_build_shared=yes @@ -9138,7 +8478,7 @@ *) break;; esac done -cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` +cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` # Only perform the check for file, if the check method requires it @@ -9146,9 +8486,9 @@ case $deplibs_check_method in file_magic*) if test "$file_magic_cmd" = '$MAGIC_CMD'; then - { $as_echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5 $as_echo_n "checking for ${ac_tool_prefix}file... " >&6; } -if test "${lt_cv_path_MAGIC_CMD+set}" = set; then +if ${lt_cv_path_MAGIC_CMD+:} false; then : $as_echo_n "(cached) " >&6 else case $MAGIC_CMD in @@ -9199,10 +8539,10 @@ MAGIC_CMD="$lt_cv_path_MAGIC_CMD" if test -n "$MAGIC_CMD"; then - { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 $as_echo "$MAGIC_CMD" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -9212,9 +8552,9 @@ if test -z "$lt_cv_path_MAGIC_CMD"; then if test -n "$ac_tool_prefix"; then - { $as_echo "$as_me:$LINENO: checking for file" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5 $as_echo_n "checking for file... " >&6; } -if test "${lt_cv_path_MAGIC_CMD+set}" = set; then +if ${lt_cv_path_MAGIC_CMD+:} false; then : $as_echo_n "(cached) " >&6 else case $MAGIC_CMD in @@ -9265,10 +8605,10 @@ MAGIC_CMD="$lt_cv_path_MAGIC_CMD" if test -n "$MAGIC_CMD"; then - { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 $as_echo "$MAGIC_CMD" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -9347,11 +8687,16 @@ lt_prog_compiler_no_builtin_flag= if test "$GCC" = yes; then - lt_prog_compiler_no_builtin_flag=' -fno-builtin' + case $cc_basename in + nvcc*) + lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;; + *) + lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;; + esac - { $as_echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 $as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; } -if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then +if ${lt_cv_prog_compiler_rtti_exceptions+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_rtti_exceptions=no @@ -9367,15 +8712,15 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9370: $lt_compile\"" >&5) + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9374: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. - $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then lt_cv_prog_compiler_rtti_exceptions=yes @@ -9384,7 +8729,7 @@ $RM conftest* fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 $as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; } if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then @@ -9404,8 +8749,6 @@ lt_prog_compiler_pic= lt_prog_compiler_static= -{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 -$as_echo_n "checking for $compiler option to produce PIC... " >&6; } if test "$GCC" = yes; then lt_prog_compiler_wl='-Wl,' @@ -9453,6 +8796,12 @@ lt_prog_compiler_pic='-fno-common' ;; + haiku*) + # PIC is the default for Haiku. + # The "-static" flag exists, but is broken. + lt_prog_compiler_static= + ;; + hpux*) # PIC is the default for 64-bit PA HP-UX, but not for 32-bit # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag @@ -9495,6 +8844,15 @@ lt_prog_compiler_pic='-fPIC' ;; esac + + case $cc_basename in + nvcc*) # Cuda Compiler Driver 2.2 + lt_prog_compiler_wl='-Xlinker ' + if test -n "$lt_prog_compiler_pic"; then + lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic" + fi + ;; + esac else # PORTME Check for flag to pass linker flags through the system compiler. case $host_os in @@ -9536,7 +8894,7 @@ lt_prog_compiler_static='-non_shared' ;; - linux* | k*bsd*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in # old Intel for x86_64 which still supported -KPIC. ecc*) @@ -9557,7 +8915,13 @@ lt_prog_compiler_pic='--shared' lt_prog_compiler_static='--static' ;; - pgcc* | pgf77* | pgf90* | pgf95*) + nagfor*) + # NAG Fortran compiler + lt_prog_compiler_wl='-Wl,-Wl,,' + lt_prog_compiler_pic='-PIC' + lt_prog_compiler_static='-Bstatic' + ;; + pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) lt_prog_compiler_wl='-Wl,' @@ -9569,25 +8933,40 @@ # All Alpha code is PIC. lt_prog_compiler_static='-non_shared' ;; - xl*) - # IBM XL C 8.0/Fortran 10.1 on PPC + xl* | bgxl* | bgf* | mpixl*) + # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene lt_prog_compiler_wl='-Wl,' lt_prog_compiler_pic='-qpic' lt_prog_compiler_static='-qstaticlink' ;; *) case `$CC -V 2>&1 | sed 5q` in + *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*) + # Sun Fortran 8.3 passes all unrecognized flags to the linker + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + lt_prog_compiler_wl='' + ;; + *Sun\ F* | *Sun*Fortran*) + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + lt_prog_compiler_wl='-Qoption ld ' + ;; *Sun\ C*) # Sun C 5.9 lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' lt_prog_compiler_wl='-Wl,' ;; - *Sun\ F*) - # Sun Fortran 8.3 passes all unrecognized flags to the linker - lt_prog_compiler_pic='-KPIC' + *Intel*\ [CF]*Compiler*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fPIC' + lt_prog_compiler_static='-static' + ;; + *Portland\ Group*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fpic' lt_prog_compiler_static='-Bstatic' - lt_prog_compiler_wl='' ;; esac ;; @@ -9619,7 +8998,7 @@ lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' case $cc_basename in - f77* | f90* | f95*) + f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) lt_prog_compiler_wl='-Qoption ld ';; *) lt_prog_compiler_wl='-Wl,';; @@ -9676,21 +9055,25 @@ lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" ;; esac -{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5 -$as_echo "$lt_prog_compiler_pic" >&6; } - - - - +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 +$as_echo_n "checking for $compiler option to produce PIC... " >&6; } +if ${lt_cv_prog_compiler_pic+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_prog_compiler_pic=$lt_prog_compiler_pic +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 +$as_echo "$lt_cv_prog_compiler_pic" >&6; } +lt_prog_compiler_pic=$lt_cv_prog_compiler_pic # # Check to make sure the PIC flag actually works. # if test -n "$lt_prog_compiler_pic"; then - { $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 $as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; } -if test "${lt_cv_prog_compiler_pic_works+set}" = set; then +if ${lt_cv_prog_compiler_pic_works+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_pic_works=no @@ -9706,15 +9089,15 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9709: $lt_compile\"" >&5) + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9713: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. - $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then lt_cv_prog_compiler_pic_works=yes @@ -9723,7 +9106,7 @@ $RM conftest* fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5 $as_echo "$lt_cv_prog_compiler_pic_works" >&6; } if test x"$lt_cv_prog_compiler_pic_works" = xyes; then @@ -9743,13 +9126,18 @@ + + + + + # # Check to make sure the static flag actually works. # wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" -{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5 $as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } -if test "${lt_cv_prog_compiler_static_works+set}" = set; then +if ${lt_cv_prog_compiler_static_works+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_static_works=no @@ -9762,7 +9150,7 @@ if test -s conftest.err; then # Append any errors to the config.log. cat conftest.err 1>&5 - $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp + $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 if diff conftest.exp conftest.er2 >/dev/null; then lt_cv_prog_compiler_static_works=yes @@ -9775,7 +9163,7 @@ LDFLAGS="$save_LDFLAGS" fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5 $as_echo "$lt_cv_prog_compiler_static_works" >&6; } if test x"$lt_cv_prog_compiler_static_works" = xyes; then @@ -9790,9 +9178,9 @@ - { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } -if test "${lt_cv_prog_compiler_c_o+set}" = set; then +if ${lt_cv_prog_compiler_c_o+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_c_o=no @@ -9811,16 +9199,16 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9814: $lt_compile\"" >&5) + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9818: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings - $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then lt_cv_prog_compiler_c_o=yes @@ -9837,7 +9225,7 @@ $RM conftest* fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 $as_echo "$lt_cv_prog_compiler_c_o" >&6; } @@ -9845,9 +9233,9 @@ - { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } -if test "${lt_cv_prog_compiler_c_o+set}" = set; then +if ${lt_cv_prog_compiler_c_o+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_c_o=no @@ -9866,16 +9254,16 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9869: $lt_compile\"" >&5) + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9873: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings - $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then lt_cv_prog_compiler_c_o=yes @@ -9892,7 +9280,7 @@ $RM conftest* fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 $as_echo "$lt_cv_prog_compiler_c_o" >&6; } @@ -9901,7 +9289,7 @@ hard_links="nottested" if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then # do not overwrite the value of need_locks provided by the user - { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5 $as_echo_n "checking if we can lock with hard links... " >&6; } hard_links=yes $RM conftest* @@ -9909,10 +9297,10 @@ touch conftest.a ln conftest.a conftest.b 2>&5 || hard_links=no ln conftest.a conftest.b 2>/dev/null && hard_links=no - { $as_echo "$as_me:$LINENO: result: $hard_links" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5 $as_echo "$hard_links" >&6; } if test "$hard_links" = no; then - { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 $as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} need_locks=warn fi @@ -9925,7 +9313,7 @@ - { $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5 $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } runpath_var= @@ -9941,7 +9329,6 @@ hardcode_direct=no hardcode_direct_absolute=no hardcode_libdir_flag_spec= - hardcode_libdir_flag_spec_ld= hardcode_libdir_separator= hardcode_minus_L=no hardcode_shlibpath_var=unsupported @@ -9985,10 +9372,39 @@ openbsd*) with_gnu_ld=no ;; + linux* | k*bsd*-gnu | gnu*) + link_all_deplibs=no + ;; esac ld_shlibs=yes + + # On some targets, GNU ld is compatible enough with the native linker + # that we're better off using the native interface for both. + lt_use_gnu_ld_interface=no if test "$with_gnu_ld" = yes; then + case $host_os in + aix*) + # The AIX port of GNU ld has always aspired to compatibility + # with the native linker. However, as the warning in the GNU ld + # block says, versions before 2.19.5* couldn't really create working + # shared libraries, regardless of the interface used. + case `$LD -v 2>&1` in + *\ \(GNU\ Binutils\)\ 2.19.5*) ;; + *\ \(GNU\ Binutils\)\ 2.[2-9]*) ;; + *\ \(GNU\ Binutils\)\ [3-9]*) ;; + *) + lt_use_gnu_ld_interface=yes + ;; + esac + ;; + *) + lt_use_gnu_ld_interface=yes + ;; + esac + fi + + if test "$lt_use_gnu_ld_interface" = yes; then # If archive_cmds runs LD, not CC, wlarc should be empty wlarc='${wl}' @@ -10006,6 +9422,7 @@ fi supports_anon_versioning=no case `$LD -v 2>&1` in + *GNU\ gold*) supports_anon_versioning=yes ;; *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... @@ -10021,11 +9438,12 @@ ld_shlibs=no cat <<_LT_EOF 1>&2 -*** Warning: the GNU linker, at least up to release 2.9.1, is reported +*** Warning: the GNU linker, at least up to release 2.19, is reported *** to be unable to reliably create shared libraries on AIX. *** Therefore, libtool is disabling shared libraries support. If you -*** really care for shared libraries, you may want to modify your PATH -*** so that a non-GNU linker is found, and then restart. +*** really care for shared libraries, you may want to install binutils +*** 2.20 or above, or modify your PATH so that a non-GNU linker is found. +*** You will then need to restart the configuration process. _LT_EOF fi @@ -10061,10 +9479,12 @@ # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless, # as there is no search path for DLLs. hardcode_libdir_flag_spec='-L$libdir' + export_dynamic_flag_spec='${wl}--export-all-symbols' allow_undefined_flag=unsupported always_export_symbols=no enable_shared_with_static_runtimes=yes - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' + exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' @@ -10082,6 +9502,11 @@ fi ;; + haiku*) + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + link_all_deplibs=yes + ;; + interix[3-9]*) hardcode_direct=no hardcode_shlibpath_var=no @@ -10097,7 +9522,7 @@ archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; - gnu* | linux* | tpf* | k*bsd*-gnu) + gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) tmp_diet=no if test "$host_os" = linux-dietlibc; then case $cc_basename in @@ -10107,15 +9532,16 @@ if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ && test "$tmp_diet" = no then - tmp_addflag= + tmp_addflag=' $pic_flag' tmp_sharedflag='-shared' case $cc_basename,$host_cpu in pgcc*) # Portland Group C compiler - whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' + whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' tmp_addflag=' $pic_flag' ;; - pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers - whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' + pgf77* | pgf90* | pgf95* | pgfortran*) + # Portland Group f77 and f90 compilers + whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' tmp_addflag=' $pic_flag -Mnomain' ;; ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 tmp_addflag=' -i_dynamic' ;; @@ -10126,13 +9552,17 @@ lf95*) # Lahey Fortran 8.1 whole_archive_flag_spec= tmp_sharedflag='--shared' ;; - xl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below) + xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below) tmp_sharedflag='-qmkshrobj' tmp_addflag= ;; + nvcc*) # Cuda Compiler Driver 2.2 + whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + compiler_needs_object=yes + ;; esac case `$CC -V 2>&1 | sed 5q` in *Sun\ C*) # Sun C 5.9 - whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' + whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' compiler_needs_object=yes tmp_sharedflag='-G' ;; *Sun\ F*) # Sun Fortran 8.3 @@ -10148,17 +9578,16 @@ fi case $cc_basename in - xlf*) + xlf* | bgf* | bgxlf* | mpixlf*) # IBM XL Fortran 10.1 on PPC cannot create shared libs itself whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' - hardcode_libdir_flag_spec= - hardcode_libdir_flag_spec_ld='-rpath $libdir' - archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' if test "x$supports_anon_versioning" = xyes; then archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ echo "local: *; };" >> $output_objdir/$libname.ver~ - $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' fi ;; esac @@ -10167,13 +9596,13 @@ fi ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= else - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' fi ;; @@ -10191,8 +9620,8 @@ _LT_EOF elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' else ld_shlibs=no fi @@ -10238,8 +9667,8 @@ *) if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' else ld_shlibs=no fi @@ -10279,8 +9708,10 @@ else # If we're using GNU nm, then we don't want the "-C" option. # -C means demangle to AIX nm, but means don't demangle with GNU nm + # Also, AIX nm treats weak defined symbols like other global + # defined symbols, whereas GNU nm marks them as "W". if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then - export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' else export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' fi @@ -10342,6 +9773,7 @@ if test "$aix_use_runtimelinking" = yes; then shared_flag="$shared_flag "'${wl}-G' fi + link_all_deplibs=no else # not using gcc if test "$host_cpu" = ia64; then @@ -10367,11 +9799,13 @@ allow_undefined_flag='-berok' # Determine the default libpath from the value encoded in an # empty executable. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + if test "${lt_cv_aix_libpath+set}" = set; then + aix_libpath=$lt_cv_aix_libpath +else + if ${lt_cv_aix_libpath_+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -10382,54 +9816,34 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : -lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { - /^0/ { - s/^0 *\(.*\)$/\1/ - p - } - }' -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -# Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\([^ ]*\) *$/\1/ + p + } + }' + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + # Check for a 64-bit object if we didn't find anything. + if test -z "$lt_cv_aix_libpath_"; then + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + fi fi -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + if test -z "$lt_cv_aix_libpath_"; then + lt_cv_aix_libpath_="/usr/lib:/lib" + fi fi -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + aix_libpath=$lt_cv_aix_libpath_ +fi hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" else if test "$host_cpu" = ia64; then hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' @@ -10438,11 +9852,13 @@ else # Determine the default libpath from the value encoded in an # empty executable. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + if test "${lt_cv_aix_libpath+set}" = set; then + aix_libpath=$lt_cv_aix_libpath +else + if ${lt_cv_aix_libpath_+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -10453,59 +9869,44 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : -lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { - /^0/ { - s/^0 *\(.*\)$/\1/ - p - } - }' -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -# Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\([^ ]*\) *$/\1/ + p + } + }' + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + # Check for a 64-bit object if we didn't find anything. + if test -z "$lt_cv_aix_libpath_"; then + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + fi fi -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + if test -z "$lt_cv_aix_libpath_"; then + lt_cv_aix_libpath_="/usr/lib:/lib" + fi fi -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + aix_libpath=$lt_cv_aix_libpath_ +fi hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, # -berok will link without error, but may produce a broken library. no_undefined_flag=' ${wl}-bernotok' allow_undefined_flag=' ${wl}-berok' - # Exported symbols can be pulled into shared objects from archives - whole_archive_flag_spec='$convenience' + if test "$with_gnu_ld" = yes; then + # We only use this code for GNU lds that support --whole-archive. + whole_archive_flag_spec='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + else + # Exported symbols can be pulled into shared objects from archives + whole_archive_flag_spec='$convenience' + fi archive_cmds_need_lc=yes # This is similar to how AIX traditionally builds its shared libraries. archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' @@ -10537,20 +9938,64 @@ # Microsoft Visual C++. # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. - hardcode_libdir_flag_spec=' ' - allow_undefined_flag=unsupported - # Tell ltmain to make .lib files, not .a files. - libext=lib - # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" - # FIXME: Setting linknames here is a bad hack. - archive_cmds='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames=' - # The linker will automatically build a .lib file if we build a DLL. - old_archive_from_new_cmds='true' - # FIXME: Should let the user specify the lib program. - old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' - fix_srcfile_path='`cygpath -w "$srcfile"`' - enable_shared_with_static_runtimes=yes + case $cc_basename in + cl*) + # Native MSVC + hardcode_libdir_flag_spec=' ' + allow_undefined_flag=unsupported + always_export_symbols=yes + file_list_spec='@' + # Tell ltmain to make .lib files, not .a files. + libext=lib + # Tell ltmain to make .dll files, not .so files. + shrext_cmds=".dll" + # FIXME: Setting linknames here is a bad hack. + archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' + archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then + sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; + else + sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; + fi~ + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ + linknames=' + # The linker will not automatically build a static lib if we build a DLL. + # _LT_TAGVAR(old_archive_from_new_cmds, )='true' + enable_shared_with_static_runtimes=yes + exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' + # Don't use ranlib + old_postinstall_cmds='chmod 644 $oldlib' + postlink_cmds='lt_outputfile="@OUTPUT@"~ + lt_tool_outputfile="@TOOL_OUTPUT@"~ + case $lt_outputfile in + *.exe|*.EXE) ;; + *) + lt_outputfile="$lt_outputfile.exe" + lt_tool_outputfile="$lt_tool_outputfile.exe" + ;; + esac~ + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; + $RM "$lt_outputfile.manifest"; + fi' + ;; + *) + # Assume MSVC wrapper + hardcode_libdir_flag_spec=' ' + allow_undefined_flag=unsupported + # Tell ltmain to make .lib files, not .a files. + libext=lib + # Tell ltmain to make .dll files, not .so files. + shrext_cmds=".dll" + # FIXME: Setting linknames here is a bad hack. + archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' + # The linker will automatically build a .lib file if we build a DLL. + old_archive_from_new_cmds='true' + # FIXME: Should let the user specify the lib program. + old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' + enable_shared_with_static_runtimes=yes + ;; + esac ;; darwin* | rhapsody*) @@ -10560,7 +10005,12 @@ hardcode_direct=no hardcode_automatic=yes hardcode_shlibpath_var=unsupported - whole_archive_flag_spec='' + if test "$lt_cv_ld_force_load" = "yes"; then + whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' + + else + whole_archive_flag_spec='' + fi link_all_deplibs=yes allow_undefined_flag="$_lt_dar_allow_undefined" case $cc_basename in @@ -10568,7 +10018,7 @@ *) _lt_dar_can_shared=$GCC ;; esac if test "$_lt_dar_can_shared" = "yes"; then - output_verbose_link_cmd=echo + output_verbose_link_cmd=func_echo_all archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" @@ -10586,10 +10036,6 @@ hardcode_shlibpath_var=no ;; - freebsd1*) - ld_shlibs=no - ;; - # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor # support. Future versions do this automatically, but an explicit c++rt0.o # does not break anything, and helps significantly (at the cost of a little @@ -10602,7 +10048,7 @@ ;; # Unfortunately, older versions of FreeBSD 2 do not have this feature. - freebsd2*) + freebsd2.*) archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' hardcode_direct=yes hardcode_minus_L=yes @@ -10611,7 +10057,7 @@ # FreeBSD 3 and greater uses gcc -shared to do shared libraries. freebsd* | dragonfly*) - archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes hardcode_shlibpath_var=no @@ -10619,7 +10065,7 @@ hpux9*) if test "$GCC" = yes; then - archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' else archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' fi @@ -10634,14 +10080,13 @@ ;; hpux10*) - if test "$GCC" = yes -a "$with_gnu_ld" = no; then - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + if test "$GCC" = yes && test "$with_gnu_ld" = no; then + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' else archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi if test "$with_gnu_ld" = no; then hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' - hardcode_libdir_flag_spec_ld='+b $libdir' hardcode_libdir_separator=: hardcode_direct=yes hardcode_direct_absolute=yes @@ -10653,16 +10098,16 @@ ;; hpux11*) - if test "$GCC" = yes -a "$with_gnu_ld" = no; then + if test "$GCC" = yes && test "$with_gnu_ld" = no; then case $host_cpu in hppa*64*) archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ;; esac else @@ -10674,7 +10119,46 @@ archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) - archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + + # Older versions of the 11.00 compiler do not understand -b yet + # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does) + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5 +$as_echo_n "checking if $CC understands -b... " >&6; } +if ${lt_cv_prog_compiler__b+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_prog_compiler__b=no + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -b" + echo "$lt_simple_link_test_code" > conftest.$ac_ext + if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then + # The linker can only warn and ignore the option if not recognized + # So say no if there are warnings + if test -s conftest.err; then + # Append any errors to the config.log. + cat conftest.err 1>&5 + $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if diff conftest.exp conftest.er2 >/dev/null; then + lt_cv_prog_compiler__b=yes + fi + else + lt_cv_prog_compiler__b=yes + fi + fi + $RM -r conftest* + LDFLAGS="$save_LDFLAGS" + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5 +$as_echo "$lt_cv_prog_compiler__b" >&6; } + +if test x"$lt_cv_prog_compiler__b" = xyes; then + archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' +else + archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' +fi + ;; esac fi @@ -10702,52 +10186,39 @@ irix5* | irix6* | nonstopux*) if test "$GCC" = yes; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' # Try to use the -exported_symbol ld option, if it does not # work, assume that -exports_file does not work either and # implicitly export all symbols. - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" - cat >conftest.$ac_ext <<_ACEOF -int foo(void) {} + # This should be the same for all languages, so no per-tag cache variable. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 +$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } +if ${lt_cv_irix_exported_symbol+:} false; then : + $as_echo_n "(cached) " >&6 +else + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int foo (void) { return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' - +if ac_fn_c_try_link "$LINENO"; then : + lt_cv_irix_exported_symbol=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - + lt_cv_irix_exported_symbol=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LDFLAGS="$save_LDFLAGS" +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LDFLAGS="$save_LDFLAGS" +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 +$as_echo "$lt_cv_irix_exported_symbol" >&6; } + if test "$lt_cv_irix_exported_symbol" = yes; then + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' + fi else - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' fi archive_cmds_need_lc='no' hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' @@ -10756,7 +10227,7 @@ link_all_deplibs=yes ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else @@ -10809,17 +10280,17 @@ hardcode_libdir_flag_spec='-L$libdir' hardcode_minus_L=yes allow_undefined_flag=unsupported - archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' + archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' ;; osf3*) if test "$GCC" = yes; then allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' else allow_undefined_flag=' -expect_unresolved \*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' + archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' fi archive_cmds_need_lc='no' hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' @@ -10829,13 +10300,13 @@ osf4* | osf5*) # as osf3* with the addition of -msym flag if test "$GCC" = yes; then allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' else allow_undefined_flag=' -expect_unresolved \*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' + archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ - $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' + $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' # Both c and cxx compiler support -rpath directly hardcode_libdir_flag_spec='-rpath $libdir' @@ -10848,9 +10319,9 @@ no_undefined_flag=' -z defs' if test "$GCC" = yes; then wlarc='${wl}' - archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' else case `$CC -V 2>&1` in *"Compilers 5.0"*) @@ -10999,7 +10470,7 @@ fi fi -{ $as_echo "$as_me:$LINENO: result: $ld_shlibs" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5 $as_echo "$ld_shlibs" >&6; } test "$ld_shlibs" = no && can_build_shared=no @@ -11036,46 +10507,52 @@ # Test whether the compiler implicitly links with -lc since on some # systems, -lgcc has to come before -lc. If gcc already passes -lc # to ld, don't add -lc before -lgcc. - { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5 $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } - $RM conftest* - echo "$lt_simple_compile_test_code" > conftest.$ac_ext +if ${lt_cv_archive_cmds_need_lc+:} false; then : + $as_echo_n "(cached) " >&6 +else + $RM conftest* + echo "$lt_simple_compile_test_code" > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } 2>conftest.err; then - soname=conftest - lib=conftest - libobjs=conftest.$ac_objext - deplibs= - wl=$lt_prog_compiler_wl - pic_flag=$lt_prog_compiler_pic - compiler_flags=-v - linker_flags=-v - verstring= - output_objdir=. - libname=conftest - lt_save_allow_undefined_flag=$allow_undefined_flag - allow_undefined_flag= - if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\"") >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } 2>conftest.err; then + soname=conftest + lib=conftest + libobjs=conftest.$ac_objext + deplibs= + wl=$lt_prog_compiler_wl + pic_flag=$lt_prog_compiler_pic + compiler_flags=-v + linker_flags=-v + verstring= + output_objdir=. + libname=conftest + lt_save_allow_undefined_flag=$allow_undefined_flag + allow_undefined_flag= + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5 (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } - then - archive_cmds_need_lc=no - else - archive_cmds_need_lc=yes - fi - allow_undefined_flag=$lt_save_allow_undefined_flag - else - cat conftest.err 1>&5 - fi - $RM conftest* - { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5 -$as_echo "$archive_cmds_need_lc" >&6; } + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + then + lt_cv_archive_cmds_need_lc=no + else + lt_cv_archive_cmds_need_lc=yes + fi + allow_undefined_flag=$lt_save_allow_undefined_flag + else + cat conftest.err 1>&5 + fi + $RM conftest* + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5 +$as_echo "$lt_cv_archive_cmds_need_lc" >&6; } + archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc ;; esac fi @@ -11233,12 +10710,7 @@ - - - - - - { $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 $as_echo_n "checking dynamic linker characteristics... " >&6; } if test "$GCC" = yes; then @@ -11246,16 +10718,23 @@ darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; *) lt_awk_arg="/^libraries:/" ;; esac - lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"` - if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then + case $host_os in + mingw* | cegcc*) lt_sed_strip_eq="s,=\([A-Za-z]:\),\1,g" ;; + *) lt_sed_strip_eq="s,=/,/,g" ;; + esac + lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq` + case $lt_search_path_spec in + *\;*) # if the path contains ";" then we assume it to be the separator # otherwise default to the standard path separator (i.e. ":") - it is # assumed that no part of a normal pathname contains ";" but that should # okay in the real world where ";" in dirpaths is itself problematic. - lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'` - else - lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - fi + lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'` + ;; + *) + lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"` + ;; + esac # Ok, now we have the path, separated by spaces, we can step through it # and add multilib dir if necessary. lt_tmp_lt_search_path_spec= @@ -11268,7 +10747,7 @@ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" fi done - lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk ' + lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' BEGIN {RS=" "; FS="/|\n";} { lt_foo=""; lt_count=0; @@ -11288,7 +10767,13 @@ if (lt_foo != "") { lt_freq[lt_foo]++; } if (lt_freq[lt_foo] == 1) { print lt_foo; } }'` - sys_lib_search_path_spec=`$ECHO $lt_search_path_spec` + # AWK program above erroneously prepends '/' to C:/dos/paths + # for these hosts. + case $host_os in + mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\ + $SED 's,/\([A-Za-z]:\),\1,g'` ;; + esac + sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP` else sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" fi @@ -11314,7 +10799,7 @@ case $host_os in aix3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' shlibpath_var=LIBPATH @@ -11323,7 +10808,7 @@ ;; aix[4-9]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no hardcode_into_libs=yes @@ -11376,7 +10861,7 @@ m68k) library_names_spec='$libname.ixlibrary $libname.a' # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' ;; esac ;; @@ -11388,7 +10873,7 @@ ;; bsdi[45]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' @@ -11407,8 +10892,9 @@ need_version=no need_lib_prefix=no - case $GCC,$host_os in - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) + case $GCC,$cc_basename in + yes,*) + # gcc library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds postinstall_cmds='base_file=`basename \${file}`~ @@ -11429,36 +10915,83 @@ cygwin*) # Cygwin DLLs use 'cyg' prefix rather than 'lib' soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" + + sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api" ;; mingw* | cegcc*) # MinGW DLLs use traditional 'lib' prefix soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` - if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then - # It is most probably a Windows format PATH printed by - # mingw gcc, but we are running on Cygwin. Gcc prints its search - # path with ; separators, and with drive letters. We can handle the - # drive letters (cygwin fileutils understands them), so leave them, - # especially as we might pass files found there to a mingw objdump, - # which wouldn't understand a cygwinified path. Ahh. - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` - else - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - fi ;; pw32*) # pw32 DLLs use 'pw' prefix rather than 'lib' library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ;; esac + dynamic_linker='Win32 ld.exe' + ;; + + *,cl*) + # Native MSVC + libname_spec='$name' + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + library_names_spec='${libname}.dll.lib' + + case $build_os in + mingw*) + sys_lib_search_path_spec= + lt_save_ifs=$IFS + IFS=';' + for lt_path in $LIB + do + IFS=$lt_save_ifs + # Let DOS variable expansion print the short 8.3 style file name. + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" + done + IFS=$lt_save_ifs + # Convert to MSYS style. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` + ;; + cygwin*) + # Convert to unix form, then to dos form, then back to unix form + # but this time dos style (no spaces!) so that the unix form looks + # like /cygdrive/c/PROGRA~1:/cygdr... + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + ;; + *) + sys_lib_search_path_spec="$LIB" + if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then + # It is most probably a Windows format PATH. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` + else + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + fi + # FIXME: find the short name or the path components, as spaces are + # common. (e.g. "Program Files" -> "PROGRA~1") + ;; + esac + + # DLL is installed to $(libdir)/../bin by postinstall_cmds + postinstall_cmds='base_file=`basename \${file}`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ + $install_prog $dir/$dlname \$dldir/$dlname' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $RM \$dlpath' + shlibpath_overrides_runpath=yes + dynamic_linker='Win32 link.exe' ;; *) + # Assume MSVC wrapper library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' + dynamic_linker='Win32 ld.exe' ;; esac - dynamic_linker='Win32 ld.exe' # FIXME: first we should search . and the directory the executable is in shlibpath_var=PATH ;; @@ -11479,7 +11012,7 @@ ;; dgux*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' @@ -11487,10 +11020,6 @@ shlibpath_var=LD_LIBRARY_PATH ;; -freebsd1*) - dynamic_linker=no - ;; - freebsd* | dragonfly*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. @@ -11498,7 +11027,7 @@ objformat=`/usr/bin/objformat` else case $host_os in - freebsd[123]*) objformat=aout ;; + freebsd[23].*) objformat=aout ;; *) objformat=elf ;; esac fi @@ -11516,7 +11045,7 @@ esac shlibpath_var=LD_LIBRARY_PATH case $host_os in - freebsd2*) + freebsd2.*) shlibpath_overrides_runpath=yes ;; freebsd3.[01]* | freebsdelf3.[01]*) @@ -11535,13 +11064,16 @@ esac ;; -gnu*) - version_type=linux +haiku*) + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no + dynamic_linker="$host_os runtime_loader" library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH + shlibpath_var=LIBRARY_PATH + shlibpath_overrides_runpath=yes + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' hardcode_into_libs=yes ;; @@ -11587,12 +11119,14 @@ soname_spec='${libname}${release}${shared_ext}$major' ;; esac - # HP-UX runs *really* slowly unless shared libraries are mode 555. + # HP-UX runs *really* slowly unless shared libraries are mode 555, ... postinstall_cmds='chmod 555 $lib' + # or fails outright, so override atomically: + install_override_mode=555 ;; interix[3-9]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' @@ -11608,7 +11142,7 @@ nonstopux*) version_type=nonstopux ;; *) if test "$lt_cv_prog_gnu_ld" = yes; then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor else version_type=irix fi ;; @@ -11645,9 +11179,9 @@ dynamic_linker=no ;; -# This must be Linux ELF. -linux* | k*bsd*-gnu) - version_type=linux +# This must be glibc/ELF. +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -11655,16 +11189,17 @@ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no + # Some binutils ld are patched to set DT_RUNPATH - save_LDFLAGS=$LDFLAGS - save_libdir=$libdir - eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \ - LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\"" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + if ${lt_cv_shlibpath_overrides_runpath+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_shlibpath_overrides_runpath=no + save_LDFLAGS=$LDFLAGS + save_libdir=$libdir + eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \ + LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\"" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -11675,56 +11210,29 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then - shlibpath_overrides_runpath=yes +if ac_fn_c_try_link "$LINENO"; then : + if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then : + lt_cv_shlibpath_overrides_runpath=yes fi - -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LDFLAGS=$save_LDFLAGS + libdir=$save_libdir fi -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LDFLAGS=$save_LDFLAGS - libdir=$save_libdir + shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath # This implies no fast_install, which is unacceptable. # Some rework will be needed to allow for fast_install # before this can be enabled. hardcode_into_libs=yes - # Add ABI-specific directories to the system library path. - sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" - # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -11736,6 +11244,18 @@ dynamic_linker='GNU/Linux ld.so' ;; +netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='NetBSD ld.elf_so' + ;; + netbsd*) version_type=sunos need_lib_prefix=no @@ -11755,7 +11275,7 @@ ;; newsos6) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes @@ -11824,7 +11344,7 @@ ;; solaris*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -11849,7 +11369,7 @@ ;; sysv4 | sysv4.3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH @@ -11873,7 +11393,7 @@ sysv4*MP*) if test -d /usr/nec ;then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' soname_spec='$libname${shared_ext}.$major' shlibpath_var=LD_LIBRARY_PATH @@ -11904,7 +11424,7 @@ tpf*) # TPF is a cross-target only. Preferred cross-host = GNU/Linux. - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -11914,7 +11434,7 @@ ;; uts4*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH @@ -11924,7 +11444,7 @@ dynamic_linker=no ;; esac -{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 $as_echo "$dynamic_linker" >&6; } test "$dynamic_linker" = no && can_build_shared=no @@ -12026,7 +11546,12 @@ - { $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 + + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5 $as_echo_n "checking how to hardcode library paths into programs... " >&6; } hardcode_action= if test -n "$hardcode_libdir_flag_spec" || @@ -12051,7 +11576,7 @@ # directories. hardcode_action=unsupported fi -{ $as_echo "$as_me:$LINENO: result: $hardcode_action" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5 $as_echo "$hardcode_action" >&6; } if test "$hardcode_action" = relink || @@ -12096,18 +11621,14 @@ darwin*) # if libdl is installed we need to link against it - { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 $as_echo_n "checking for dlopen in -ldl... " >&6; } -if test "${ac_cv_lib_dl_dlopen+set}" = set; then +if ${ac_cv_lib_dl_dlopen+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-ldl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -12125,43 +11646,18 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_dl_dlopen=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_dl_dlopen=no + ac_cv_lib_dl_dlopen=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 $as_echo "$ac_cv_lib_dl_dlopen" >&6; } -if test "x$ac_cv_lib_dl_dlopen" = x""yes; then +if test "x$ac_cv_lib_dl_dlopen" = xyes; then : lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" else @@ -12174,106 +11670,18 @@ ;; *) - { $as_echo "$as_me:$LINENO: checking for shl_load" >&5 -$as_echo_n "checking for shl_load... " >&6; } -if test "${ac_cv_func_shl_load+set}" = set; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define shl_load to an innocuous variant, in case declares shl_load. - For example, HP-UX 11i declares gettimeofday. */ -#define shl_load innocuous_shl_load - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char shl_load (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef shl_load - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char shl_load (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_shl_load || defined __stub___shl_load -choke me -#endif - -int -main () -{ -return shl_load (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_func_shl_load=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_shl_load=no -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 -$as_echo "$ac_cv_func_shl_load" >&6; } -if test "x$ac_cv_func_shl_load" = x""yes; then + ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load" +if test "x$ac_cv_func_shl_load" = xyes; then : lt_cv_dlopen="shl_load" else - { $as_echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5 $as_echo_n "checking for shl_load in -ldld... " >&6; } -if test "${ac_cv_lib_dld_shl_load+set}" = set; then +if ${ac_cv_lib_dld_shl_load+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-ldld $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -12291,145 +11699,32 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_dld_shl_load=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_dld_shl_load=no + ac_cv_lib_dld_shl_load=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5 $as_echo "$ac_cv_lib_dld_shl_load" >&6; } -if test "x$ac_cv_lib_dld_shl_load" = x""yes; then +if test "x$ac_cv_lib_dld_shl_load" = xyes; then : lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" else - { $as_echo "$as_me:$LINENO: checking for dlopen" >&5 -$as_echo_n "checking for dlopen... " >&6; } -if test "${ac_cv_func_dlopen+set}" = set; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define dlopen to an innocuous variant, in case declares dlopen. - For example, HP-UX 11i declares gettimeofday. */ -#define dlopen innocuous_dlopen - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char dlopen (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef dlopen - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char dlopen (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_dlopen || defined __stub___dlopen -choke me -#endif - -int -main () -{ -return dlopen (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_func_dlopen=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_dlopen=no -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 -$as_echo "$ac_cv_func_dlopen" >&6; } -if test "x$ac_cv_func_dlopen" = x""yes; then + ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen" +if test "x$ac_cv_func_dlopen" = xyes; then : lt_cv_dlopen="dlopen" else - { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 $as_echo_n "checking for dlopen in -ldl... " >&6; } -if test "${ac_cv_lib_dl_dlopen+set}" = set; then +if ${ac_cv_lib_dl_dlopen+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-ldl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -12447,57 +11742,28 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_dl_dlopen=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_dl_dlopen=no + ac_cv_lib_dl_dlopen=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 $as_echo "$ac_cv_lib_dl_dlopen" >&6; } -if test "x$ac_cv_lib_dl_dlopen" = x""yes; then +if test "x$ac_cv_lib_dl_dlopen" = xyes; then : lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" else - { $as_echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5 $as_echo_n "checking for dlopen in -lsvld... " >&6; } -if test "${ac_cv_lib_svld_dlopen+set}" = set; then +if ${ac_cv_lib_svld_dlopen+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lsvld $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -12515,57 +11781,28 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_svld_dlopen=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_svld_dlopen=no + ac_cv_lib_svld_dlopen=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5 $as_echo "$ac_cv_lib_svld_dlopen" >&6; } -if test "x$ac_cv_lib_svld_dlopen" = x""yes; then +if test "x$ac_cv_lib_svld_dlopen" = xyes; then : lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" else - { $as_echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5 $as_echo_n "checking for dld_link in -ldld... " >&6; } -if test "${ac_cv_lib_dld_dld_link+set}" = set; then +if ${ac_cv_lib_dld_dld_link+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-ldld $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -12583,43 +11820,18 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_dld_dld_link=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_dld_dld_link=no + ac_cv_lib_dld_dld_link=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5 $as_echo "$ac_cv_lib_dld_dld_link" >&6; } -if test "x$ac_cv_lib_dld_dld_link" = x""yes; then +if test "x$ac_cv_lib_dld_dld_link" = xyes; then : lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" fi @@ -12658,9 +11870,9 @@ save_LIBS="$LIBS" LIBS="$lt_cv_dlopen_libs $LIBS" - { $as_echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5 $as_echo_n "checking whether a program can dlopen itself... " >&6; } -if test "${lt_cv_dlopen_self+set}" = set; then +if ${lt_cv_dlopen_self+:} false; then : $as_echo_n "(cached) " >&6 else if test "$cross_compiling" = yes; then : @@ -12669,7 +11881,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12672 "configure" +#line $LINENO "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12710,7 +11922,13 @@ # endif #endif -void fnord() { int i=42;} +/* When -fvisbility=hidden is used, assume the code has been annotated + correspondingly for the symbols needed. */ +#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) +int fnord () __attribute__((visibility("default"))); +#endif + +int fnord () { return 42; } int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); @@ -12719,7 +11937,11 @@ if (self) { if (dlsym (self,"fnord")) status = $lt_dlno_uscore; - else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; + else + { + if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; + else puts (dlerror ()); + } /* dlclose (self); */ } else @@ -12728,11 +11950,11 @@ return status; } _LT_EOF - if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 (eval $ac_link) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then (./conftest; exit; ) >&5 2>/dev/null lt_status=$? case x$lt_status in @@ -12749,14 +11971,14 @@ fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5 $as_echo "$lt_cv_dlopen_self" >&6; } if test "x$lt_cv_dlopen_self" = xyes; then wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" - { $as_echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5 $as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; } -if test "${lt_cv_dlopen_self_static+set}" = set; then +if ${lt_cv_dlopen_self_static+:} false; then : $as_echo_n "(cached) " >&6 else if test "$cross_compiling" = yes; then : @@ -12765,7 +11987,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12768 "configure" +#line $LINENO "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12806,7 +12028,13 @@ # endif #endif -void fnord() { int i=42;} +/* When -fvisbility=hidden is used, assume the code has been annotated + correspondingly for the symbols needed. */ +#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) +int fnord () __attribute__((visibility("default"))); +#endif + +int fnord () { return 42; } int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); @@ -12815,7 +12043,11 @@ if (self) { if (dlsym (self,"fnord")) status = $lt_dlno_uscore; - else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; + else + { + if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; + else puts (dlerror ()); + } /* dlclose (self); */ } else @@ -12824,11 +12056,11 @@ return status; } _LT_EOF - if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 (eval $ac_link) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then (./conftest; exit; ) >&5 2>/dev/null lt_status=$? case x$lt_status in @@ -12845,7 +12077,7 @@ fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5 $as_echo "$lt_cv_dlopen_self_static" >&6; } fi @@ -12884,12 +12116,12 @@ striplib= old_striplib= -{ $as_echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5 $as_echo_n "checking whether stripping libraries is possible... " >&6; } if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" test -z "$striplib" && striplib="$STRIP --strip-unneeded" - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else # FIXME - insert some real tests, host_os isn't really good enough @@ -12898,15 +12130,15 @@ if test -n "$STRIP" ; then striplib="$STRIP -x" old_striplib="$STRIP -S" - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi ;; *) - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } ;; esac @@ -12924,12 +12156,12 @@ # Report which library types will actually be built - { $as_echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5 $as_echo_n "checking if libtool supports shared libraries... " >&6; } - { $as_echo "$as_me:$LINENO: result: $can_build_shared" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5 $as_echo "$can_build_shared" >&6; } - { $as_echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5 $as_echo_n "checking whether to build shared libraries... " >&6; } test "$can_build_shared" = "no" && enable_shared=no @@ -12950,14 +12182,14 @@ fi ;; esac - { $as_echo "$as_me:$LINENO: result: $enable_shared" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5 $as_echo "$enable_shared" >&6; } - { $as_echo "$as_me:$LINENO: checking whether to build static libraries" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5 $as_echo_n "checking whether to build static libraries... " >&6; } # Make sure either enable_shared or enable_static is yes. test "$enable_shared" = yes || enable_static=yes - { $as_echo "$as_me:$LINENO: result: $enable_static" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5 $as_echo "$enable_static" >&6; } @@ -12972,6 +12204,145 @@ CC="$lt_save_CC" + if test -n "$CXX" && ( test "X$CXX" != "Xno" && + ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || + (test "X$CXX" != "Xg++"))) ; then + ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5 +$as_echo_n "checking how to run the C++ preprocessor... " >&6; } +if test -z "$CXXCPP"; then + if ${ac_cv_prog_CXXCPP+:} false; then : + $as_echo_n "(cached) " >&6 +else + # Double quotes because CXXCPP needs to be expanded + for CXXCPP in "$CXX -E" "/lib/cpp" + do + ac_preproc_ok=false +for ac_cxx_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#ifdef __STDC__ +# include +#else +# include +#endif + Syntax error +_ACEOF +if ac_fn_cxx_try_cpp "$LINENO"; then : + +else + # Broken: fails on valid input. +continue +fi +rm -f conftest.err conftest.i conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +_ACEOF +if ac_fn_cxx_try_cpp "$LINENO"; then : + # Broken: success on invalid input. +continue +else + # Passes both tests. +ac_preproc_ok=: +break +fi +rm -f conftest.err conftest.i conftest.$ac_ext + +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.i conftest.err conftest.$ac_ext +if $ac_preproc_ok; then : + break +fi + + done + ac_cv_prog_CXXCPP=$CXXCPP + +fi + CXXCPP=$ac_cv_prog_CXXCPP +else + ac_cv_prog_CXXCPP=$CXXCPP +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5 +$as_echo "$CXXCPP" >&6; } +ac_preproc_ok=false +for ac_cxx_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#ifdef __STDC__ +# include +#else +# include +#endif + Syntax error +_ACEOF +if ac_fn_cxx_try_cpp "$LINENO"; then : + +else + # Broken: fails on valid input. +continue +fi +rm -f conftest.err conftest.i conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +_ACEOF +if ac_fn_cxx_try_cpp "$LINENO"; then : + # Broken: success on invalid input. +continue +else + # Passes both tests. +ac_preproc_ok=: +break +fi +rm -f conftest.err conftest.i conftest.$ac_ext + +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.i conftest.err conftest.$ac_ext +if $ac_preproc_ok; then : + +else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check +See \`config.log' for more details" "$LINENO" 5; } +fi + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + +else + _lt_caught_CXX_error=yes +fi ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' @@ -12988,7 +12359,6 @@ hardcode_direct_CXX=no hardcode_direct_absolute_CXX=no hardcode_libdir_flag_spec_CXX= -hardcode_libdir_flag_spec_ld_CXX= hardcode_libdir_separator_CXX= hardcode_minus_L_CXX=no hardcode_shlibpath_var_CXX=unsupported @@ -12998,6 +12368,8 @@ module_expsym_cmds_CXX= link_all_deplibs_CXX=unknown old_archive_cmds_CXX=$old_archive_cmds +reload_flag_CXX=$reload_flag +reload_cmds_CXX=$reload_cmds no_undefined_flag_CXX= whole_archive_flag_spec_CXX= enable_shared_with_static_runtimes_CXX=no @@ -13053,6 +12425,7 @@ # Allow CC to be a program name with arguments. lt_save_CC=$CC + lt_save_CFLAGS=$CFLAGS lt_save_LD=$LD lt_save_GCC=$GCC GCC=$GXX @@ -13070,6 +12443,7 @@ fi test -z "${LDCXX+set}" || LD=$LDCXX CC=${CXX-"c++"} + CFLAGS=$CXXFLAGS compiler=$CC compiler_CXX=$CC for cc_temp in $compiler""; do @@ -13080,7 +12454,7 @@ *) break;; esac done -cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` +cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` if test -n "$compiler"; then @@ -13098,7 +12472,7 @@ # Check whether --with-gnu-ld was given. -if test "${with_gnu_ld+set}" = set; then +if test "${with_gnu_ld+set}" = set; then : withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes else with_gnu_ld=no @@ -13107,7 +12481,7 @@ ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. - { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 $as_echo_n "checking for ld used by $CC... " >&6; } case $host in *-*-mingw*) @@ -13137,13 +12511,13 @@ ;; esac elif test "$with_gnu_ld" = yes; then - { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 $as_echo_n "checking for GNU ld... " >&6; } else - { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 $as_echo_n "checking for non-GNU ld... " >&6; } fi -if test "${lt_cv_path_LD+set}" = set; then +if ${lt_cv_path_LD+:} false; then : $as_echo_n "(cached) " >&6 else if test -z "$LD"; then @@ -13174,18 +12548,16 @@ LD="$lt_cv_path_LD" if test -n "$LD"; then - { $as_echo "$as_me:$LINENO: result: $LD" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5 $as_echo "$LD" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi -test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 -$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} - { (exit 1); exit 1; }; } -{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 +test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } -if test "${lt_cv_prog_gnu_ld+set}" = set; then +if ${lt_cv_prog_gnu_ld+:} false; then : $as_echo_n "(cached) " >&6 else # I'd rather use --version here, but apparently some GNU lds only accept -v. @@ -13198,7 +12570,7 @@ ;; esac fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5 $as_echo "$lt_cv_prog_gnu_ld" >&6; } with_gnu_ld=$lt_cv_prog_gnu_ld @@ -13211,8 +12583,8 @@ # Check if GNU C++ uses GNU ld as the underlying linker, since the # archiving commands below assume that GNU ld is being used. if test "$with_gnu_ld" = yes; then - archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + archive_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' export_dynamic_flag_spec_CXX='${wl}--export-dynamic' @@ -13244,7 +12616,7 @@ # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' else GXX=no @@ -13253,7 +12625,7 @@ fi # PORTME: fill in a description of your system's C++ link characteristics - { $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5 $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } ld_shlibs_CXX=yes case $host_os in @@ -13354,11 +12726,13 @@ allow_undefined_flag_CXX='-berok' # Determine the default libpath from the value encoded in an empty # executable. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + if test "${lt_cv_aix_libpath+set}" = set; then + aix_libpath=$lt_cv_aix_libpath +else + if ${lt_cv_aix_libpath__CXX+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -13369,55 +12743,35 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_cxx_try_link "$LINENO"; then : -lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { - /^0/ { - s/^0 *\(.*\)$/\1/ - p - } - }' -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -# Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\([^ ]*\) *$/\1/ + p + } + }' + lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + # Check for a 64-bit object if we didn't find anything. + if test -z "$lt_cv_aix_libpath__CXX"; then + lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + fi fi -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + if test -z "$lt_cv_aix_libpath__CXX"; then + lt_cv_aix_libpath__CXX="/usr/lib:/lib" + fi fi -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + aix_libpath=$lt_cv_aix_libpath__CXX +fi hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" - archive_expsym_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + archive_expsym_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" else if test "$host_cpu" = ia64; then hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib' @@ -13426,11 +12780,13 @@ else # Determine the default libpath from the value encoded in an # empty executable. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + if test "${lt_cv_aix_libpath+set}" = set; then + aix_libpath=$lt_cv_aix_libpath +else + if ${lt_cv_aix_libpath__CXX+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -13441,59 +12797,44 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_cxx_try_link "$LINENO"; then : -lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { - /^0/ { - s/^0 *\(.*\)$/\1/ - p - } - }' -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -# Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\([^ ]*\) *$/\1/ + p + } + }' + lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + # Check for a 64-bit object if we didn't find anything. + if test -z "$lt_cv_aix_libpath__CXX"; then + lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + fi fi -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + if test -z "$lt_cv_aix_libpath__CXX"; then + lt_cv_aix_libpath__CXX="/usr/lib:/lib" + fi fi -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + aix_libpath=$lt_cv_aix_libpath__CXX +fi hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, # -berok will link without error, but may produce a broken library. no_undefined_flag_CXX=' ${wl}-bernotok' allow_undefined_flag_CXX=' ${wl}-berok' - # Exported symbols can be pulled into shared objects from archives - whole_archive_flag_spec_CXX='$convenience' + if test "$with_gnu_ld" = yes; then + # We only use this code for GNU lds that support --whole-archive. + whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + else + # Exported symbols can be pulled into shared objects from archives + whole_archive_flag_spec_CXX='$convenience' + fi archive_cmds_need_lc_CXX=yes # This is similar to how AIX traditionally builds its shared # libraries. @@ -13523,28 +12864,75 @@ ;; cygwin* | mingw* | pw32* | cegcc*) - # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless, - # as there is no search path for DLLs. - hardcode_libdir_flag_spec_CXX='-L$libdir' - allow_undefined_flag_CXX=unsupported - always_export_symbols_CXX=no - enable_shared_with_static_runtimes_CXX=yes - - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is; otherwise, prepend... - archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - else - ld_shlibs_CXX=no - fi - ;; + case $GXX,$cc_basename in + ,cl* | no,cl*) + # Native MSVC + # hardcode_libdir_flag_spec is actually meaningless, as there is + # no search path for DLLs. + hardcode_libdir_flag_spec_CXX=' ' + allow_undefined_flag_CXX=unsupported + always_export_symbols_CXX=yes + file_list_spec_CXX='@' + # Tell ltmain to make .lib files, not .a files. + libext=lib + # Tell ltmain to make .dll files, not .so files. + shrext_cmds=".dll" + # FIXME: Setting linknames here is a bad hack. + archive_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' + archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then + $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; + else + $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; + fi~ + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ + linknames=' + # The linker will not automatically build a static lib if we build a DLL. + # _LT_TAGVAR(old_archive_from_new_cmds, CXX)='true' + enable_shared_with_static_runtimes_CXX=yes + # Don't use ranlib + old_postinstall_cmds_CXX='chmod 644 $oldlib' + postlink_cmds_CXX='lt_outputfile="@OUTPUT@"~ + lt_tool_outputfile="@TOOL_OUTPUT@"~ + case $lt_outputfile in + *.exe|*.EXE) ;; + *) + lt_outputfile="$lt_outputfile.exe" + lt_tool_outputfile="$lt_tool_outputfile.exe" + ;; + esac~ + func_to_tool_file "$lt_outputfile"~ + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; + $RM "$lt_outputfile.manifest"; + fi' + ;; + *) + # g++ + # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless, + # as there is no search path for DLLs. + hardcode_libdir_flag_spec_CXX='-L$libdir' + export_dynamic_flag_spec_CXX='${wl}--export-all-symbols' + allow_undefined_flag_CXX=unsupported + always_export_symbols_CXX=no + enable_shared_with_static_runtimes_CXX=yes + + if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then + archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + # If the export-symbols file already is a .def file (1st line + # is EXPORTS), use it as is; otherwise, prepend... + archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then + cp $export_symbols $output_objdir/$soname.def; + else + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ + $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + else + ld_shlibs_CXX=no + fi + ;; + esac + ;; darwin* | rhapsody*) @@ -13552,7 +12940,12 @@ hardcode_direct_CXX=no hardcode_automatic_CXX=yes hardcode_shlibpath_var_CXX=unsupported - whole_archive_flag_spec_CXX='' + if test "$lt_cv_ld_force_load" = "yes"; then + whole_archive_flag_spec_CXX='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' + + else + whole_archive_flag_spec_CXX='' + fi link_all_deplibs_CXX=yes allow_undefined_flag_CXX="$_lt_dar_allow_undefined" case $cc_basename in @@ -13560,7 +12953,7 @@ *) _lt_dar_can_shared=$GCC ;; esac if test "$_lt_dar_can_shared" = "yes"; then - output_verbose_link_cmd=echo + output_verbose_link_cmd=func_echo_all archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" @@ -13594,7 +12987,7 @@ esac ;; - freebsd[12]*) + freebsd2.*) # C++ shared libraries reported to be fairly broken before # switch to ELF ld_shlibs_CXX=no @@ -13610,7 +13003,9 @@ ld_shlibs_CXX=yes ;; - gnu*) + haiku*) + archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + link_all_deplibs_CXX=yes ;; hpux9*) @@ -13637,11 +13032,11 @@ # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ;; *) if test "$GXX" = yes; then - archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' else # FIXME: insert proper C++ library support ld_shlibs_CXX=no @@ -13702,7 +13097,7 @@ # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ;; *) if test "$GXX" = yes; then @@ -13712,10 +13107,10 @@ archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; ia64*) - archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; *) - archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; esac fi @@ -13745,7 +13140,7 @@ case $cc_basename in CC*) # SGI C++ - archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' + archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' # Archives containing C++ object files must be created using # "CC -ar", where "CC" is the IRIX C++ compiler. This is @@ -13756,9 +13151,9 @@ *) if test "$GXX" = yes; then if test "$with_gnu_ld" = no; then - archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' else - archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -o $lib' + archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' fi fi link_all_deplibs_CXX=yes @@ -13769,7 +13164,7 @@ inherit_rpath_CXX=yes ;; - linux* | k*bsd*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in KCC*) # Kuck and Associates, Inc. (KAI) C++ Compiler @@ -13787,7 +13182,7 @@ # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' + output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' export_dynamic_flag_spec_CXX='${wl}--export-dynamic' @@ -13824,26 +13219,26 @@ pgCC* | pgcpp*) # Portland Group C++ compiler case `$CC -V` in - *pgCC\ [1-5]* | *pgcpp\ [1-5]*) + *pgCC\ [1-5].* | *pgcpp\ [1-5].*) prelink_cmds_CXX='tpldir=Template.dir~ rm -rf $tpldir~ $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ - compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"' + compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' old_archive_cmds_CXX='tpldir=Template.dir~ rm -rf $tpldir~ $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ - $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~ + $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ $RANLIB $oldlib' archive_cmds_CXX='tpldir=Template.dir~ rm -rf $tpldir~ $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' archive_expsym_cmds_CXX='tpldir=Template.dir~ rm -rf $tpldir~ $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' ;; - *) # Version 6 will use weak symbols + *) # Version 6 and above use weak symbols archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' ;; @@ -13851,7 +13246,7 @@ hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir' export_dynamic_flag_spec_CXX='${wl}--export-dynamic' - whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' + whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' ;; cxx*) # Compaq C++ @@ -13870,9 +13265,9 @@ # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed' ;; - xl*) + xl* | mpixl* | bgxl*) # IBM XL 8.0 on PPC, with GNU ld hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' export_dynamic_flag_spec_CXX='${wl}--export-dynamic' @@ -13892,13 +13287,13 @@ archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' archive_expsym_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' hardcode_libdir_flag_spec_CXX='-R$libdir' - whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' + whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' compiler_needs_object_CXX=yes # Not sure whether something based on # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 # would be better. - output_verbose_link_cmd='echo' + output_verbose_link_cmd='func_echo_all' # Archives containing C++ object files must be created using # "CC -xar", where "CC" is the Sun C++ compiler. This is @@ -13967,7 +13362,7 @@ export_dynamic_flag_spec_CXX='${wl}-E' whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' fi - output_verbose_link_cmd=echo + output_verbose_link_cmd=func_echo_all else ld_shlibs_CXX=no fi @@ -14002,15 +13397,15 @@ case $host in osf3*) allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' + archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' ;; *) allow_undefined_flag_CXX=' -expect_unresolved \*' - archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' + archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ echo "-hidden">> $lib.exp~ - $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~ + $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~ $RM $lib.exp' hardcode_libdir_flag_spec_CXX='-rpath $libdir' ;; @@ -14026,17 +13421,17 @@ # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ;; *) if test "$GXX" = yes && test "$with_gnu_ld" = no; then allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' case $host in osf3*) - archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ;; *) - archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + archive_cmds_CXX='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ;; esac @@ -14046,7 +13441,7 @@ # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' else # FIXME: insert proper C++ library support @@ -14082,7 +13477,7 @@ solaris*) case $cc_basename in - CC*) + CC* | sunCC*) # Sun C++ 4.2, 5.x and Centerline C++ archive_cmds_need_lc_CXX=yes no_undefined_flag_CXX=' -zdefs' @@ -14103,7 +13498,7 @@ esac link_all_deplibs_CXX=yes - output_verbose_link_cmd='echo' + output_verbose_link_cmd='func_echo_all' # Archives containing C++ object files must be created using # "CC -xar", where "CC" is the Sun C++ compiler. This is @@ -14123,14 +13518,14 @@ if test "$GXX" = yes && test "$with_gnu_ld" = no; then no_undefined_flag_CXX=' ${wl}-z ${wl}defs' if $CC --version | $GREP -v '^2\.7' > /dev/null; then - archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' else # g++ 2.7 appears to require `-G' NOT `-shared' on this # platform. @@ -14141,7 +13536,7 @@ # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. - output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' + output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' fi hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir' @@ -14195,6 +13590,10 @@ CC*) archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + old_archive_cmds_CXX='$CC -Tprelink_objects $oldobjs~ + '"$old_archive_cmds_CXX" + reload_cmds_CXX='$CC -Tprelink_objects $reload_objs~ + '"$reload_cmds_CXX" ;; *) archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' @@ -14228,7 +13627,7 @@ ;; esac - { $as_echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5 $as_echo "$ld_shlibs_CXX" >&6; } test "$ld_shlibs_CXX" = no && can_build_shared=no @@ -14256,11 +13655,19 @@ }; _LT_EOF -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + +_lt_libdeps_save_CFLAGS=$CFLAGS +case "$CC $CFLAGS " in #( +*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; +*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; +*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;; +esac + +if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then # Parse the compiler output and extract the necessary # objects, libraries and library flags. @@ -14269,7 +13676,7 @@ pre_test_object_deps_done=no for p in `eval "$output_verbose_link_cmd"`; do - case $p in + case ${prev}${p} in -L* | -R* | -l*) # Some compilers place space between "-{L,R}" and the path. @@ -14278,13 +13685,22 @@ test $p = "-R"; then prev=$p continue - else - prev= fi + # Expand the sysroot to ease extracting the directories later. + if test -z "$prev"; then + case $p in + -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;; + -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;; + -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;; + esac + fi + case $p in + =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;; + esac if test "$pre_test_object_deps_done" = no; then - case $p in - -L* | -R*) + case ${prev} in + -L | -R) # Internal compiler library paths should come after those # provided the user. The postdeps already come after the # user supplied libs so there is no need to process them. @@ -14304,8 +13720,10 @@ postdeps_CXX="${postdeps_CXX} ${prev}${p}" fi fi + prev= ;; + *.lto.$objext) ;; # Ignore GCC LTO objects *.$objext) # This assumes that the test object file only shows up # once in the compiler output. @@ -14341,6 +13759,7 @@ fi $RM -f confest.$objext +CFLAGS=$_lt_libdeps_save_CFLAGS # PORTME: override above test on systems where it is broken case $host_os in @@ -14376,7 +13795,7 @@ solaris*) case $cc_basename in - CC*) + CC* | sunCC*) # The more standards-conforming stlport4 library is # incompatible with the Cstd library. Avoid specifying # it if it's in CXXFLAGS. Ignore libCrun as @@ -14441,8 +13860,6 @@ lt_prog_compiler_pic_CXX= lt_prog_compiler_static_CXX= -{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 -$as_echo_n "checking for $compiler option to produce PIC... " >&6; } # C++ specific cases for pic, static, wl, etc. if test "$GXX" = yes; then @@ -14492,6 +13909,11 @@ # DJGPP does not support shared libraries at all lt_prog_compiler_pic_CXX= ;; + haiku*) + # PIC is the default for Haiku. + # The "-static" flag exists, but is broken. + lt_prog_compiler_static_CXX= + ;; interix[3-9]*) # Interix 3.x gcc -fpic/-fPIC options generate broken code. # Instead, we relocate shared libraries at runtime. @@ -14541,6 +13963,11 @@ ;; esac ;; + mingw* | cygwin* | os2* | pw32* | cegcc*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + lt_prog_compiler_pic_CXX='-DDLL_EXPORT' + ;; dgux*) case $cc_basename in ec++*) @@ -14597,7 +14024,7 @@ ;; esac ;; - linux* | k*bsd*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in KCC*) # KAI C++ Compiler @@ -14630,8 +14057,8 @@ lt_prog_compiler_pic_CXX= lt_prog_compiler_static_CXX='-non_shared' ;; - xlc* | xlC*) - # IBM XL 8.0 on PPC + xlc* | xlC* | bgxl[cC]* | mpixl[cC]*) + # IBM XL 8.0, 9.0 on PPC and BlueGene lt_prog_compiler_wl_CXX='-Wl,' lt_prog_compiler_pic_CXX='-qpic' lt_prog_compiler_static_CXX='-qstaticlink' @@ -14661,7 +14088,7 @@ ;; esac ;; - netbsd*) + netbsd* | netbsdelf*-gnu) ;; *qnx* | *nto*) # QNX uses GNU C++, but need to define -shared option too, otherwise @@ -14693,7 +14120,7 @@ ;; solaris*) case $cc_basename in - CC*) + CC* | sunCC*) # Sun C++ 4.2, 5.x and Centerline C++ lt_prog_compiler_pic_CXX='-KPIC' lt_prog_compiler_static_CXX='-Bstatic' @@ -14758,18 +14185,25 @@ lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC" ;; esac -{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5 -$as_echo "$lt_prog_compiler_pic_CXX" >&6; } - +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 +$as_echo_n "checking for $compiler option to produce PIC... " >&6; } +if ${lt_cv_prog_compiler_pic_CXX+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_prog_compiler_pic_CXX=$lt_prog_compiler_pic_CXX +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_CXX" >&5 +$as_echo "$lt_cv_prog_compiler_pic_CXX" >&6; } +lt_prog_compiler_pic_CXX=$lt_cv_prog_compiler_pic_CXX # # Check to make sure the PIC flag actually works. # if test -n "$lt_prog_compiler_pic_CXX"; then - { $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 $as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... " >&6; } -if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then +if ${lt_cv_prog_compiler_pic_works_CXX+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_pic_works_CXX=no @@ -14785,15 +14219,15 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14788: $lt_compile\"" >&5) + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:14792: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. - $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then lt_cv_prog_compiler_pic_works_CXX=yes @@ -14802,7 +14236,7 @@ $RM conftest* fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works_CXX" >&5 $as_echo "$lt_cv_prog_compiler_pic_works_CXX" >&6; } if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then @@ -14819,13 +14253,15 @@ + + # # Check to make sure the static flag actually works. # wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\" -{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5 $as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } -if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then +if ${lt_cv_prog_compiler_static_works_CXX+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_static_works_CXX=no @@ -14838,7 +14274,7 @@ if test -s conftest.err; then # Append any errors to the config.log. cat conftest.err 1>&5 - $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp + $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 if diff conftest.exp conftest.er2 >/dev/null; then lt_cv_prog_compiler_static_works_CXX=yes @@ -14851,7 +14287,7 @@ LDFLAGS="$save_LDFLAGS" fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_CXX" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works_CXX" >&5 $as_echo "$lt_cv_prog_compiler_static_works_CXX" >&6; } if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then @@ -14863,9 +14299,9 @@ - { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } -if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then +if ${lt_cv_prog_compiler_c_o_CXX+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_c_o_CXX=no @@ -14884,16 +14320,16 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14887: $lt_compile\"" >&5) + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14891: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings - $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then lt_cv_prog_compiler_c_o_CXX=yes @@ -14910,14 +14346,14 @@ $RM conftest* fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5 $as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; } - { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } -if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then +if ${lt_cv_prog_compiler_c_o_CXX+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_c_o_CXX=no @@ -14936,16 +14372,16 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14939: $lt_compile\"" >&5) + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14943: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings - $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then lt_cv_prog_compiler_c_o_CXX=yes @@ -14962,7 +14398,7 @@ $RM conftest* fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5 $as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; } @@ -14971,7 +14407,7 @@ hard_links="nottested" if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then # do not overwrite the value of need_locks provided by the user - { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5 $as_echo_n "checking if we can lock with hard links... " >&6; } hard_links=yes $RM conftest* @@ -14979,10 +14415,10 @@ touch conftest.a ln conftest.a conftest.b 2>&5 || hard_links=no ln conftest.a conftest.b 2>/dev/null && hard_links=no - { $as_echo "$as_me:$LINENO: result: $hard_links" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5 $as_echo "$hard_links" >&6; } if test "$hard_links" = no; then - { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 $as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} need_locks=warn fi @@ -14992,33 +14428,46 @@ - { $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5 $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' case $host_os in aix[4-9]*) # If we're using GNU nm, then we don't want the "-C" option. # -C means demangle to AIX nm, but means don't demangle with GNU nm + # Also, AIX nm treats weak defined symbols like other global defined + # symbols, whereas GNU nm marks them as "W". if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then - export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' else export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' fi ;; pw32*) export_symbols_cmds_CXX="$ltdll_cmds" - ;; + ;; cygwin* | mingw* | cegcc*) - export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' - ;; + case $cc_basename in + cl*) + exclude_expsyms_CXX='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' + ;; + *) + export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' + exclude_expsyms_CXX='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' + ;; + esac + ;; + linux* | k*bsd*-gnu | gnu*) + link_all_deplibs_CXX=no + ;; *) export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - ;; + ;; esac - exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' -{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5 $as_echo "$ld_shlibs_CXX" >&6; } test "$ld_shlibs_CXX" = no && can_build_shared=no @@ -15046,46 +14495,52 @@ # Test whether the compiler implicitly links with -lc since on some # systems, -lgcc has to come before -lc. If gcc already passes -lc # to ld, don't add -lc before -lgcc. - { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5 $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } - $RM conftest* - echo "$lt_simple_compile_test_code" > conftest.$ac_ext +if ${lt_cv_archive_cmds_need_lc_CXX+:} false; then : + $as_echo_n "(cached) " >&6 +else + $RM conftest* + echo "$lt_simple_compile_test_code" > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } 2>conftest.err; then - soname=conftest - lib=conftest - libobjs=conftest.$ac_objext - deplibs= - wl=$lt_prog_compiler_wl_CXX - pic_flag=$lt_prog_compiler_pic_CXX - compiler_flags=-v - linker_flags=-v - verstring= - output_objdir=. - libname=conftest - lt_save_allow_undefined_flag=$allow_undefined_flag_CXX - allow_undefined_flag_CXX= - if { (eval echo "$as_me:$LINENO: \"$archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\"") >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } 2>conftest.err; then + soname=conftest + lib=conftest + libobjs=conftest.$ac_objext + deplibs= + wl=$lt_prog_compiler_wl_CXX + pic_flag=$lt_prog_compiler_pic_CXX + compiler_flags=-v + linker_flags=-v + verstring= + output_objdir=. + libname=conftest + lt_save_allow_undefined_flag=$allow_undefined_flag_CXX + allow_undefined_flag_CXX= + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5 (eval $archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } - then - archive_cmds_need_lc_CXX=no - else - archive_cmds_need_lc_CXX=yes - fi - allow_undefined_flag_CXX=$lt_save_allow_undefined_flag - else - cat conftest.err 1>&5 - fi - $RM conftest* - { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5 -$as_echo "$archive_cmds_need_lc_CXX" >&6; } + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + then + lt_cv_archive_cmds_need_lc_CXX=no + else + lt_cv_archive_cmds_need_lc_CXX=yes + fi + allow_undefined_flag_CXX=$lt_save_allow_undefined_flag + else + cat conftest.err 1>&5 + fi + $RM conftest* + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc_CXX" >&5 +$as_echo "$lt_cv_archive_cmds_need_lc_CXX" >&6; } + archive_cmds_need_lc_CXX=$lt_cv_archive_cmds_need_lc_CXX ;; esac fi @@ -15153,9 +14608,7 @@ - - - { $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 $as_echo_n "checking dynamic linker characteristics... " >&6; } library_names_spec= @@ -15180,7 +14633,7 @@ case $host_os in aix3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' shlibpath_var=LIBPATH @@ -15189,7 +14642,7 @@ ;; aix[4-9]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no hardcode_into_libs=yes @@ -15242,7 +14695,7 @@ m68k) library_names_spec='$libname.ixlibrary $libname.a' # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' ;; esac ;; @@ -15254,7 +14707,7 @@ ;; bsdi[45]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' @@ -15273,8 +14726,9 @@ need_version=no need_lib_prefix=no - case $GCC,$host_os in - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) + case $GCC,$cc_basename in + yes,*) + # gcc library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds postinstall_cmds='base_file=`basename \${file}`~ @@ -15295,36 +14749,82 @@ cygwin*) # Cygwin DLLs use 'cyg' prefix rather than 'lib' soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" + ;; mingw* | cegcc*) # MinGW DLLs use traditional 'lib' prefix soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` - if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then - # It is most probably a Windows format PATH printed by - # mingw gcc, but we are running on Cygwin. Gcc prints its search - # path with ; separators, and with drive letters. We can handle the - # drive letters (cygwin fileutils understands them), so leave them, - # especially as we might pass files found there to a mingw objdump, - # which wouldn't understand a cygwinified path. Ahh. - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` - else - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - fi ;; pw32*) # pw32 DLLs use 'pw' prefix rather than 'lib' library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ;; esac + dynamic_linker='Win32 ld.exe' + ;; + + *,cl*) + # Native MSVC + libname_spec='$name' + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + library_names_spec='${libname}.dll.lib' + + case $build_os in + mingw*) + sys_lib_search_path_spec= + lt_save_ifs=$IFS + IFS=';' + for lt_path in $LIB + do + IFS=$lt_save_ifs + # Let DOS variable expansion print the short 8.3 style file name. + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" + done + IFS=$lt_save_ifs + # Convert to MSYS style. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` + ;; + cygwin*) + # Convert to unix form, then to dos form, then back to unix form + # but this time dos style (no spaces!) so that the unix form looks + # like /cygdrive/c/PROGRA~1:/cygdr... + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + ;; + *) + sys_lib_search_path_spec="$LIB" + if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then + # It is most probably a Windows format PATH. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` + else + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + fi + # FIXME: find the short name or the path components, as spaces are + # common. (e.g. "Program Files" -> "PROGRA~1") + ;; + esac + + # DLL is installed to $(libdir)/../bin by postinstall_cmds + postinstall_cmds='base_file=`basename \${file}`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ + $install_prog $dir/$dlname \$dldir/$dlname' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $RM \$dlpath' + shlibpath_overrides_runpath=yes + dynamic_linker='Win32 link.exe' ;; *) + # Assume MSVC wrapper library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' + dynamic_linker='Win32 ld.exe' ;; esac - dynamic_linker='Win32 ld.exe' # FIXME: first we should search . and the directory the executable is in shlibpath_var=PATH ;; @@ -15344,7 +14844,7 @@ ;; dgux*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' @@ -15352,10 +14852,6 @@ shlibpath_var=LD_LIBRARY_PATH ;; -freebsd1*) - dynamic_linker=no - ;; - freebsd* | dragonfly*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. @@ -15363,7 +14859,7 @@ objformat=`/usr/bin/objformat` else case $host_os in - freebsd[123]*) objformat=aout ;; + freebsd[23].*) objformat=aout ;; *) objformat=elf ;; esac fi @@ -15381,7 +14877,7 @@ esac shlibpath_var=LD_LIBRARY_PATH case $host_os in - freebsd2*) + freebsd2.*) shlibpath_overrides_runpath=yes ;; freebsd3.[01]* | freebsdelf3.[01]*) @@ -15400,13 +14896,16 @@ esac ;; -gnu*) - version_type=linux +haiku*) + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no + dynamic_linker="$host_os runtime_loader" library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH + shlibpath_var=LIBRARY_PATH + shlibpath_overrides_runpath=yes + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' hardcode_into_libs=yes ;; @@ -15452,12 +14951,14 @@ soname_spec='${libname}${release}${shared_ext}$major' ;; esac - # HP-UX runs *really* slowly unless shared libraries are mode 555. + # HP-UX runs *really* slowly unless shared libraries are mode 555, ... postinstall_cmds='chmod 555 $lib' + # or fails outright, so override atomically: + install_override_mode=555 ;; interix[3-9]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' @@ -15473,7 +14974,7 @@ nonstopux*) version_type=nonstopux ;; *) if test "$lt_cv_prog_gnu_ld" = yes; then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor else version_type=irix fi ;; @@ -15510,9 +15011,9 @@ dynamic_linker=no ;; -# This must be Linux ELF. -linux* | k*bsd*-gnu) - version_type=linux +# This must be glibc/ELF. +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -15520,16 +15021,17 @@ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no + # Some binutils ld are patched to set DT_RUNPATH - save_LDFLAGS=$LDFLAGS - save_libdir=$libdir - eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_CXX\"; \ - LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_CXX\"" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + if ${lt_cv_shlibpath_overrides_runpath+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_shlibpath_overrides_runpath=no + save_LDFLAGS=$LDFLAGS + save_libdir=$libdir + eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_CXX\"; \ + LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_CXX\"" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -15540,56 +15042,29 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then - shlibpath_overrides_runpath=yes +if ac_fn_cxx_try_link "$LINENO"; then : + if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then : + lt_cv_shlibpath_overrides_runpath=yes fi - -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LDFLAGS=$save_LDFLAGS + libdir=$save_libdir fi -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LDFLAGS=$save_LDFLAGS - libdir=$save_libdir + shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath # This implies no fast_install, which is unacceptable. # Some rework will be needed to allow for fast_install # before this can be enabled. hardcode_into_libs=yes - # Add ABI-specific directories to the system library path. - sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" - # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -15601,6 +15076,18 @@ dynamic_linker='GNU/Linux ld.so' ;; +netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='NetBSD ld.elf_so' + ;; + netbsd*) version_type=sunos need_lib_prefix=no @@ -15620,7 +15107,7 @@ ;; newsos6) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes @@ -15689,7 +15176,7 @@ ;; solaris*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -15714,7 +15201,7 @@ ;; sysv4 | sysv4.3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH @@ -15738,7 +15225,7 @@ sysv4*MP*) if test -d /usr/nec ;then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' soname_spec='$libname${shared_ext}.$major' shlibpath_var=LD_LIBRARY_PATH @@ -15769,7 +15256,7 @@ tpf*) # TPF is a cross-target only. Preferred cross-host = GNU/Linux. - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -15779,7 +15266,7 @@ ;; uts4*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH @@ -15789,7 +15276,7 @@ dynamic_linker=no ;; esac -{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 $as_echo "$dynamic_linker" >&6; } test "$dynamic_linker" = no && can_build_shared=no @@ -15840,7 +15327,9 @@ - { $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5 $as_echo_n "checking how to hardcode library paths into programs... " >&6; } hardcode_action_CXX= if test -n "$hardcode_libdir_flag_spec_CXX" || @@ -15865,7 +15354,7 @@ # directories. hardcode_action_CXX=unsupported fi -{ $as_echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action_CXX" >&5 $as_echo "$hardcode_action_CXX" >&6; } if test "$hardcode_action_CXX" = relink || @@ -15887,6 +15376,7 @@ fi # test -n "$compiler" CC=$lt_save_CC + CFLAGS=$lt_save_CFLAGS LDCXX=$LD LD=$lt_save_LD GCC=$lt_save_GCC @@ -15915,6 +15405,8 @@ + + ac_config_commands="$ac_config_commands libtool" @@ -15925,18 +15417,14 @@ # Checks for libraries. -{ $as_echo "$as_me:$LINENO: checking for cvGetRows in -lcv" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for cvGetRows in -lcv" >&5 $as_echo_n "checking for cvGetRows in -lcv... " >&6; } -if test "${ac_cv_lib_cv_cvGetRows+set}" = set; then +if ${ac_cv_lib_cv_cvGetRows+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lcv $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -15954,59 +15442,29 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_cv_cvGetRows=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_cv_cvGetRows=no + ac_cv_lib_cv_cvGetRows=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_cv_cvGetRows" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_cv_cvGetRows" >&5 $as_echo "$ac_cv_lib_cv_cvGetRows" >&6; } -if test "x$ac_cv_lib_cv_cvGetRows" = x""yes; then +if test "x$ac_cv_lib_cv_cvGetRows" = xyes; then : CVFOUND=1 fi - -{ $as_echo "$as_me:$LINENO: checking for Set_Mercator_Coordinates in -lgeotrans" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Set_Mercator_Coordinates in -lgeotrans" >&5 $as_echo_n "checking for Set_Mercator_Coordinates in -lgeotrans... " >&6; } -if test "${ac_cv_lib_geotrans_Set_Mercator_Coordinates+set}" = set; then +if ${ac_cv_lib_geotrans_Set_Mercator_Coordinates+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lgeotrans $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -16024,43 +15482,18 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_geotrans_Set_Mercator_Coordinates=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_geotrans_Set_Mercator_Coordinates=no + ac_cv_lib_geotrans_Set_Mercator_Coordinates=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_geotrans_Set_Mercator_Coordinates" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_geotrans_Set_Mercator_Coordinates" >&5 $as_echo "$ac_cv_lib_geotrans_Set_Mercator_Coordinates" >&6; } -if test "x$ac_cv_lib_geotrans_Set_Mercator_Coordinates" = x""yes; then +if test "x$ac_cv_lib_geotrans_Set_Mercator_Coordinates" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_LIBGEOTRANS 1 _ACEOF @@ -16069,18 +15502,14 @@ fi -{ $as_echo "$as_me:$LINENO: checking for fftw_execute in -lfftw3" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fftw_execute in -lfftw3" >&5 $as_echo_n "checking for fftw_execute in -lfftw3... " >&6; } -if test "${ac_cv_lib_fftw3_fftw_execute+set}" = set; then +if ${ac_cv_lib_fftw3_fftw_execute+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lfftw3 $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -16098,58 +15527,29 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_fftw3_fftw_execute=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_fftw3_fftw_execute=no + ac_cv_lib_fftw3_fftw_execute=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_fftw3_fftw_execute" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_fftw3_fftw_execute" >&5 $as_echo "$ac_cv_lib_fftw3_fftw_execute" >&6; } -if test "x$ac_cv_lib_fftw3_fftw_execute" = x""yes; then +if test "x$ac_cv_lib_fftw3_fftw_execute" = xyes; then : FFTWFOUND=1 fi -{ $as_echo "$as_me:$LINENO: checking for jas_calloc in -ljasper" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for jas_calloc in -ljasper" >&5 $as_echo_n "checking for jas_calloc in -ljasper... " >&6; } -if test "${ac_cv_lib_jasper_jas_calloc+set}" = set; then +if ${ac_cv_lib_jasper_jas_calloc+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-ljasper $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -16167,58 +15567,29 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_jasper_jas_calloc=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_jasper_jas_calloc=no + ac_cv_lib_jasper_jas_calloc=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_jasper_jas_calloc" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jasper_jas_calloc" >&5 $as_echo "$ac_cv_lib_jasper_jas_calloc" >&6; } -if test "x$ac_cv_lib_jasper_jas_calloc" = x""yes; then +if test "x$ac_cv_lib_jasper_jas_calloc" = xyes; then : JASPERFOUND=1 fi -{ $as_echo "$as_me:$LINENO: checking for LAS_GetVersion in -llas" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LAS_GetVersion in -llas" >&5 $as_echo_n "checking for LAS_GetVersion in -llas... " >&6; } -if test "${ac_cv_lib_las_LAS_GetVersion+set}" = set; then +if ${ac_cv_lib_las_LAS_GetVersion+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-llas $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -16236,58 +15607,29 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_las_LAS_GetVersion=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_las_LAS_GetVersion=no + ac_cv_lib_las_LAS_GetVersion=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_las_LAS_GetVersion" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_las_LAS_GetVersion" >&5 $as_echo "$ac_cv_lib_las_LAS_GetVersion" >&6; } -if test "x$ac_cv_lib_las_LAS_GetVersion" = x""yes; then +if test "x$ac_cv_lib_las_LAS_GetVersion" = xyes; then : LASFOUND=1 fi -{ $as_echo "$as_me:$LINENO: checking for HPDF_Pages_New in -lhpdf" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for HPDF_Pages_New in -lhpdf" >&5 $as_echo_n "checking for HPDF_Pages_New in -lhpdf... " >&6; } -if test "${ac_cv_lib_hpdf_HPDF_Pages_New+set}" = set; then +if ${ac_cv_lib_hpdf_HPDF_Pages_New+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lhpdf $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -16305,58 +15647,29 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_hpdf_HPDF_Pages_New=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_hpdf_HPDF_Pages_New=no + ac_cv_lib_hpdf_HPDF_Pages_New=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_hpdf_HPDF_Pages_New" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_hpdf_HPDF_Pages_New" >&5 $as_echo "$ac_cv_lib_hpdf_HPDF_Pages_New" >&6; } -if test "x$ac_cv_lib_hpdf_HPDF_Pages_New" = x""yes; then +if test "x$ac_cv_lib_hpdf_HPDF_Pages_New" = xyes; then : HARUFOUND=1 fi -{ $as_echo "$as_me:$LINENO: checking for SQLFetch in -lodbc" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SQLFetch in -lodbc" >&5 $as_echo_n "checking for SQLFetch in -lodbc... " >&6; } -if test "${ac_cv_lib_odbc_SQLFetch+set}" = set; then +if ${ac_cv_lib_odbc_SQLFetch+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lodbc $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -16374,60 +15687,31 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_odbc_SQLFetch=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_odbc_SQLFetch=no + ac_cv_lib_odbc_SQLFetch=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_odbc_SQLFetch" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_odbc_SQLFetch" >&5 $as_echo "$ac_cv_lib_odbc_SQLFetch" >&6; } -if test "x$ac_cv_lib_odbc_SQLFetch" = x""yes; then +if test "x$ac_cv_lib_odbc_SQLFetch" = xyes; then : ODBCFOUND=1 else ODBC \(libodbc\) library not found fi -{ $as_echo "$as_me:$LINENO: checking for pj_is_latlong in -lproj" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pj_is_latlong in -lproj" >&5 $as_echo_n "checking for pj_is_latlong in -lproj... " >&6; } -if test "${ac_cv_lib_proj_pj_is_latlong+set}" = set; then +if ${ac_cv_lib_proj_pj_is_latlong+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lproj $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -16445,58 +15729,29 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_proj_pj_is_latlong=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_proj_pj_is_latlong=no + ac_cv_lib_proj_pj_is_latlong=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_proj_pj_is_latlong" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_proj_pj_is_latlong" >&5 $as_echo "$ac_cv_lib_proj_pj_is_latlong" >&6; } -if test "x$ac_cv_lib_proj_pj_is_latlong" = x""yes; then +if test "x$ac_cv_lib_proj_pj_is_latlong" = xyes; then : PROJFOUND=1 fi -{ $as_echo "$as_me:$LINENO: checking for VIGRA_RGBE_ReadPixels_Raw in -lvigraimpex" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for VIGRA_RGBE_ReadPixels_Raw in -lvigraimpex" >&5 $as_echo_n "checking for VIGRA_RGBE_ReadPixels_Raw in -lvigraimpex... " >&6; } -if test "${ac_cv_lib_vigraimpex_VIGRA_RGBE_ReadPixels_Raw+set}" = set; then +if ${ac_cv_lib_vigraimpex_VIGRA_RGBE_ReadPixels_Raw+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lvigraimpex $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -16514,58 +15769,29 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_vigraimpex_VIGRA_RGBE_ReadPixels_Raw=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_vigraimpex_VIGRA_RGBE_ReadPixels_Raw=no + ac_cv_lib_vigraimpex_VIGRA_RGBE_ReadPixels_Raw=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_vigraimpex_VIGRA_RGBE_ReadPixels_Raw" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_vigraimpex_VIGRA_RGBE_ReadPixels_Raw" >&5 $as_echo "$ac_cv_lib_vigraimpex_VIGRA_RGBE_ReadPixels_Raw" >&6; } -if test "x$ac_cv_lib_vigraimpex_VIGRA_RGBE_ReadPixels_Raw" = x""yes; then +if test "x$ac_cv_lib_vigraimpex_VIGRA_RGBE_ReadPixels_Raw" = xyes; then : VIGRAFOUND=1 fi -{ $as_echo "$as_me:$LINENO: checking for omp_get_num_threads in -lgomp" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for omp_get_num_threads in -lgomp" >&5 $as_echo_n "checking for omp_get_num_threads in -lgomp... " >&6; } -if test "${ac_cv_lib_gomp_omp_get_num_threads+set}" = set; then +if ${ac_cv_lib_gomp_omp_get_num_threads+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lgomp $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -16583,58 +15809,29 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_gomp_omp_get_num_threads=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_gomp_omp_get_num_threads=no + ac_cv_lib_gomp_omp_get_num_threads=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_gomp_omp_get_num_threads" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gomp_omp_get_num_threads" >&5 $as_echo "$ac_cv_lib_gomp_omp_get_num_threads" >&6; } -if test "x$ac_cv_lib_gomp_omp_get_num_threads" = x""yes; then +if test "x$ac_cv_lib_gomp_omp_get_num_threads" = xyes; then : GOMPFOUND=1 fi # Checks for header files. -{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 $as_echo_n "checking for ANSI C header files... " >&6; } -if test "${ac_cv_header_stdc+set}" = set; then +if ${ac_cv_header_stdc+:} false; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include @@ -16649,48 +15846,23 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_header_stdc=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_header_stdc=no + ac_cv_header_stdc=no fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "memchr" >/dev/null 2>&1; then - : + $EGREP "memchr" >/dev/null 2>&1; then : + else ac_cv_header_stdc=no fi @@ -16700,18 +15872,14 @@ if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "free" >/dev/null 2>&1; then - : + $EGREP "free" >/dev/null 2>&1; then : + else ac_cv_header_stdc=no fi @@ -16721,14 +15889,10 @@ if test $ac_cv_header_stdc = yes; then # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. - if test "$cross_compiling" = yes; then + if test "$cross_compiling" = yes; then : : else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include @@ -16755,202 +15919,30 @@ return 0; } _ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : -else - $as_echo "$as_me: program exited with status $ac_status" >&5 -$as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_c_try_run "$LINENO"; then : -( exit $ac_status ) -ac_cv_header_stdc=no +else + ac_cv_header_stdc=no fi -rm -rf conftest.dSYM -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi - fi fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 $as_echo "$ac_cv_header_stdc" >&6; } if test $ac_cv_header_stdc = yes; then -cat >>confdefs.h <<\_ACEOF -#define STDC_HEADERS 1 -_ACEOF +$as_echo "#define STDC_HEADERS 1" >>confdefs.h fi - - - - - - for ac_header in float.h malloc.h memory.h stdlib.h string.h unistd.h -do -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -else - # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 -$as_echo_n "checking $ac_header usability... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } - -# Is the header present? -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 -$as_echo_n "checking $ac_header presence... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## --------------------------------- ## -## Report this to BUG-REPORT-ADDRESS ## -## --------------------------------- ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } - -fi -as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF @@ -16959,374 +15951,99 @@ done - for ac_header in wchar.h -do -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -else - # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 -$as_echo_n "checking $ac_header usability... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } - -# Is the header present? -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 -$as_echo_n "checking $ac_header presence... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## --------------------------------- ## -## Report this to BUG-REPORT-ADDRESS ## -## --------------------------------- ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } - -fi -as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then +do : + ac_fn_c_check_header_mongrel "$LINENO" "wchar.h" "ac_cv_header_wchar_h" "$ac_includes_default" +if test "x$ac_cv_header_wchar_h" = xyes; then : cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +#define HAVE_WCHAR_H 1 _ACEOF fi done -#todo: check for headers of the libraries above +# todo: check for headers of the libraries above # Checks for typedefs, structures, and compiler characteristics. -{ $as_echo "$as_me:$LINENO: checking for stdbool.h that conforms to C99" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdbool.h that conforms to C99" >&5 $as_echo_n "checking for stdbool.h that conforms to C99... " >&6; } -if test "${ac_cv_header_stdbool_h+set}" = set; then +if ${ac_cv_header_stdbool_h+:} false; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include -#ifndef bool - "error: bool is not defined" -#endif -#ifndef false - "error: false is not defined" -#endif -#if false - "error: false is not 0" -#endif -#ifndef true - "error: true is not defined" -#endif -#if true != 1 - "error: true is not 1" -#endif -#ifndef __bool_true_false_are_defined - "error: __bool_true_false_are_defined is not defined" -#endif - - struct s { _Bool s: 1; _Bool t; } s; - - char a[true == 1 ? 1 : -1]; - char b[false == 0 ? 1 : -1]; - char c[__bool_true_false_are_defined == 1 ? 1 : -1]; - char d[(bool) 0.5 == true ? 1 : -1]; - bool e = &s; - char f[(_Bool) 0.0 == false ? 1 : -1]; - char g[true]; - char h[sizeof (_Bool)]; - char i[sizeof s.t]; - enum { j = false, k = true, l = false * true, m = true * 256 }; - /* The following fails for - HP aC++/ANSI C B3910B A.05.55 [Dec 04 2003]. */ - _Bool n[m]; - char o[sizeof n == m * sizeof n[0] ? 1 : -1]; - char p[-1 - (_Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1]; -# if defined __xlc__ || defined __GNUC__ - /* Catch a bug in IBM AIX xlc compiler version 6.0.0.0 - reported by James Lemley on 2005-10-05; see - http://lists.gnu.org/archive/html/bug-coreutils/2005-10/msg00086.html - This test is not quite right, since xlc is allowed to - reject this program, as the initializer for xlcbug is - not one of the forms that C requires support for. - However, doing the test right would require a runtime - test, and that would make cross-compilation harder. - Let us hope that IBM fixes the xlc bug, and also adds - support for this kind of constant expression. In the - meantime, this test will reject xlc, which is OK, since - our stdbool.h substitute should suffice. We also test - this with GCC, where it should work, to detect more - quickly whether someone messes up the test in the - future. */ - char digs[] = "0123456789"; - int xlcbug = 1 / (&(digs + 5)[-2 + (bool) 1] == &digs[4] ? 1 : -1); -# endif - /* Catch a bug in an HP-UX C compiler. See - http://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html - http://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html - */ - _Bool q = true; - _Bool *pq = &q; + #include + #ifndef bool + "error: bool is not defined" + #endif + #ifndef false + "error: false is not defined" + #endif + #if false + "error: false is not 0" + #endif + #ifndef true + "error: true is not defined" + #endif + #if true != 1 + "error: true is not 1" + #endif + #ifndef __bool_true_false_are_defined + "error: __bool_true_false_are_defined is not defined" + #endif + + struct s { _Bool s: 1; _Bool t; } s; + + char a[true == 1 ? 1 : -1]; + char b[false == 0 ? 1 : -1]; + char c[__bool_true_false_are_defined == 1 ? 1 : -1]; + char d[(bool) 0.5 == true ? 1 : -1]; + /* See body of main program for 'e'. */ + char f[(_Bool) 0.0 == false ? 1 : -1]; + char g[true]; + char h[sizeof (_Bool)]; + char i[sizeof s.t]; + enum { j = false, k = true, l = false * true, m = true * 256 }; + /* The following fails for + HP aC++/ANSI C B3910B A.05.55 [Dec 04 2003]. */ + _Bool n[m]; + char o[sizeof n == m * sizeof n[0] ? 1 : -1]; + char p[-1 - (_Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1]; + /* Catch a bug in an HP-UX C compiler. See + http://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html + http://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html + */ + _Bool q = true; + _Bool *pq = &q; int main () { - *pq |= q; - *pq |= ! q; - /* Refer to every declared value, to avoid compiler optimizations. */ - return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !!j + !k + !!l - + !m + !n + !o + !p + !q + !pq); + bool e = &s; + *pq |= q; + *pq |= ! q; + /* Refer to every declared value, to avoid compiler optimizations. */ + return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !!j + !k + !!l + + !m + !n + !o + !p + !q + !pq); ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_header_stdbool_h=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_header_stdbool_h=no + ac_cv_header_stdbool_h=no fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdbool_h" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdbool_h" >&5 $as_echo "$ac_cv_header_stdbool_h" >&6; } -{ $as_echo "$as_me:$LINENO: checking for _Bool" >&5 -$as_echo_n "checking for _Bool... " >&6; } -if test "${ac_cv_type__Bool+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_cv_type__Bool=no -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -int -main () -{ -if (sizeof (_Bool)) - return 0; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -int -main () -{ -if (sizeof ((_Bool))) - return 0; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - : -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_type__Bool=yes -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type__Bool" >&5 -$as_echo "$ac_cv_type__Bool" >&6; } -if test "x$ac_cv_type__Bool" = x""yes; then + ac_fn_c_check_type "$LINENO" "_Bool" "ac_cv_type__Bool" "$ac_includes_default" +if test "x$ac_cv_type__Bool" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE__BOOL 1 @@ -17335,34 +16052,29 @@ fi + if test $ac_cv_header_stdbool_h = yes; then -cat >>confdefs.h <<\_ACEOF -#define HAVE_STDBOOL_H 1 -_ACEOF +$as_echo "#define HAVE_STDBOOL_H 1" >>confdefs.h fi -{ $as_echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5 $as_echo_n "checking for an ANSI C-conforming const... " >&6; } -if test "${ac_cv_c_const+set}" = set; then +if ${ac_cv_c_const+:} false; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int main () { -/* FIXME: Include the comments suggested by Paul. */ + #ifndef __cplusplus - /* Ultrix mips cc rejects this. */ + /* Ultrix mips cc rejects this sort of thing. */ typedef int charset[2]; - const charset cs; + const charset cs = { 0, 0 }; /* SunOS 4.1.1 cc rejects this. */ char const *const *pcpcc; char **ppc; @@ -17379,8 +16091,9 @@ ++pcpcc; ppc = (char**) pcpcc; pcpcc = (char const *const *) ppc; - { /* SCO 3.2v4 cc rejects this. */ - char *t; + { /* SCO 3.2v4 cc rejects this sort of thing. */ + char tx; + char *t = &tx; char const *s = 0 ? (char *) 0 : (char const *) 0; *t++ = 0; @@ -17396,10 +16109,10 @@ iptr p = 0; ++p; } - { /* AIX XL C 1.02.0.0 rejects this saying + { /* AIX XL C 1.02.0.0 rejects this sort of thing, saying "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ - struct s { int j; const int *ap[3]; }; - struct s *b; b->j = 5; + struct s { int j; const int *ap[3]; } bx; + struct s *b = &bx; b->j = 5; } { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ const int foo = 10; @@ -17412,56 +16125,29 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_c_const=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_c_const=no +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_c_const=yes +else + ac_cv_c_const=no fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5 $as_echo "$ac_cv_c_const" >&6; } if test $ac_cv_c_const = no; then -cat >>confdefs.h <<\_ACEOF -#define const /**/ -_ACEOF +$as_echo "#define const /**/" >>confdefs.h fi -{ $as_echo "$as_me:$LINENO: checking for inline" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5 $as_echo_n "checking for inline... " >&6; } -if test "${ac_cv_c_inline+set}" = set; then +if ${ac_cv_c_inline+:} false; then : $as_echo_n "(cached) " >&6 else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifndef __cplusplus typedef int foo_t; @@ -17470,41 +16156,17 @@ #endif _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_c_inline=$ac_kw -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext test "$ac_cv_c_inline" != no && break done fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5 $as_echo "$ac_cv_c_inline" >&6; } - case $ac_cv_c_inline in inline | yes) ;; *) @@ -17520,102 +16182,9 @@ ;; esac -{ $as_echo "$as_me:$LINENO: checking for size_t" >&5 -$as_echo_n "checking for size_t... " >&6; } -if test "${ac_cv_type_size_t+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_cv_type_size_t=no -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -int -main () -{ -if (sizeof (size_t)) - return 0; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -int -main () -{ -if (sizeof ((size_t))) - return 0; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - : -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_type_size_t=yes -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - -fi +ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default" +if test "x$ac_cv_type_size_t" = xyes; then : -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5 -$as_echo "$ac_cv_type_size_t" >&6; } -if test "x$ac_cv_type_size_t" = x""yes; then - : else cat >>confdefs.h <<_ACEOF @@ -17624,16 +16193,12 @@ fi -{ $as_echo "$as_me:$LINENO: checking whether struct tm is in sys/time.h or time.h" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether struct tm is in sys/time.h or time.h" >&5 $as_echo_n "checking whether struct tm is in sys/time.h or time.h... " >&6; } -if test "${ac_cv_struct_tm+set}" = set; then +if ${ac_cv_struct_tm+:} false; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include @@ -17648,59 +16213,31 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_struct_tm=time.h else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_struct_tm=sys/time.h + ac_cv_struct_tm=sys/time.h fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_struct_tm" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_tm" >&5 $as_echo "$ac_cv_struct_tm" >&6; } if test $ac_cv_struct_tm = sys/time.h; then -cat >>confdefs.h <<\_ACEOF -#define TM_IN_SYS_TIME 1 -_ACEOF +$as_echo "#define TM_IN_SYS_TIME 1" >>confdefs.h fi # Checks for platform characteristics. - - { $as_echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5 $as_echo_n "checking whether byte ordering is bigendian... " >&6; } -if test "${ac_cv_c_bigendian+set}" = set; then +if ${ac_cv_c_bigendian+:} false; then : $as_echo_n "(cached) " >&6 else ac_cv_c_bigendian=unknown # See if we're dealing with a universal compiler. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifndef __APPLE_CC__ not a universal capable compiler @@ -17708,46 +16245,34 @@ typedef int dummy; _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : # Check for potential -arch flags. It is not universal unless - # there are some -arch flags. Note that *ppc* also matches - # ppc64. This check is also rather less than ideal. - case "${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}" in #( - *-arch*ppc*|*-arch*i386*|*-arch*x86_64*) ac_cv_c_bigendian=universal;; - esac -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - + # there are at least two -arch flags with different values. + ac_arch= + ac_prev= + for ac_word in $CC $CFLAGS $CPPFLAGS $LDFLAGS; do + if test -n "$ac_prev"; then + case $ac_word in + i?86 | x86_64 | ppc | ppc64) + if test -z "$ac_arch" || test "$ac_arch" = "$ac_word"; then + ac_arch=$ac_word + else + ac_cv_c_bigendian=universal + break + fi + ;; + esac + ac_prev= + elif test "x$ac_word" = "x-arch"; then + ac_prev=arch + fi + done fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext if test $ac_cv_c_bigendian = unknown; then # See if sys/param.h defines the BYTE_ORDER macro. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include @@ -17765,30 +16290,9 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : # It does; now see whether it defined to BIG_ENDIAN or not. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include @@ -17804,49 +16308,18 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_c_bigendian=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_c_bigendian=no + ac_cv_c_bigendian=no fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi if test $ac_cv_c_bigendian = unknown; then # See if defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris). - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include @@ -17861,30 +16334,9 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : # It does; now see whether it defined to _BIG_ENDIAN or not. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include @@ -17899,51 +16351,20 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_c_bigendian=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_c_bigendian=no + ac_cv_c_bigendian=no fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi if test $ac_cv_c_bigendian = unknown; then # Compile a test program. - if test "$cross_compiling" = yes; then + if test "$cross_compiling" = yes; then : # Try to guess by grepping values from an object file. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ short int ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 }; @@ -17969,24 +16390,7 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then ac_cv_c_bigendian=yes fi @@ -17998,20 +16402,10 @@ ac_cv_c_bigendian=unknown fi fi -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $ac_includes_default int @@ -18031,235 +16425,58 @@ return 0; } _ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +if ac_fn_c_try_run "$LINENO"; then : ac_cv_c_bigendian=no else - $as_echo "$as_me: program exited with status $ac_status" >&5 -$as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -ac_cv_c_bigendian=yes + ac_cv_c_bigendian=yes fi -rm -rf conftest.dSYM -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi - fi fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5 $as_echo "$ac_cv_c_bigendian" >&6; } case $ac_cv_c_bigendian in #( yes) - cat >>confdefs.h <<\_ACEOF -#define WORDS_BIGENDIAN 1 -_ACEOF + $as_echo "#define WORDS_BIGENDIAN 1" >>confdefs.h ;; #( no) ;; #( universal) -cat >>confdefs.h <<\_ACEOF -#define AC_APPLE_UNIVERSAL_BUILD 1 -_ACEOF +$as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h ;; #( *) - { { $as_echo "$as_me:$LINENO: error: unknown endianness - presetting ac_cv_c_bigendian=no (or yes) will help" >&5 -$as_echo "$as_me: error: unknown endianness - presetting ac_cv_c_bigendian=no (or yes) will help" >&2;} - { (exit 1); exit 1; }; } ;; + as_fn_error $? "unknown endianness + presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;; esac -# Checks for library functions. - -for ac_header in stdlib.h -do -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -else - # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 -$as_echo_n "checking $ac_header usability... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } - -# Is the header present? -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 -$as_echo_n "checking $ac_header presence... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## --------------------------------- ## -## Report this to BUG-REPORT-ADDRESS ## -## --------------------------------- ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } - -fi -as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then +# Checks for library functions. +for ac_header in stdlib.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default" +if test "x$ac_cv_header_stdlib_h" = xyes; then : cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +#define HAVE_STDLIB_H 1 _ACEOF fi done -{ $as_echo "$as_me:$LINENO: checking for GNU libc compatible malloc" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU libc compatible malloc" >&5 $as_echo_n "checking for GNU libc compatible malloc... " >&6; } -if test "${ac_cv_func_malloc_0_nonnull+set}" = set; then +if ${ac_cv_func_malloc_0_nonnull+:} false; then : $as_echo_n "(cached) " >&6 else - if test "$cross_compiling" = yes; then + if test "$cross_compiling" = yes; then : ac_cv_func_malloc_0_nonnull=no else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #if defined STDC_HEADERS || defined HAVE_STDLIB_H # include @@ -18275,55 +16492,24 @@ return 0; } _ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +if ac_fn_c_try_run "$LINENO"; then : ac_cv_func_malloc_0_nonnull=yes else - $as_echo "$as_me: program exited with status $ac_status" >&5 -$as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -ac_cv_func_malloc_0_nonnull=no + ac_cv_func_malloc_0_nonnull=no fi -rm -rf conftest.dSYM -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi - fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_malloc_0_nonnull" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_malloc_0_nonnull" >&5 $as_echo "$ac_cv_func_malloc_0_nonnull" >&6; } -if test $ac_cv_func_malloc_0_nonnull = yes; then +if test $ac_cv_func_malloc_0_nonnull = yes; then : -cat >>confdefs.h <<\_ACEOF -#define HAVE_MALLOC 1 -_ACEOF +$as_echo "#define HAVE_MALLOC 1" >>confdefs.h else - cat >>confdefs.h <<\_ACEOF -#define HAVE_MALLOC 0 -_ACEOF + $as_echo "#define HAVE_MALLOC 0" >>confdefs.h case " $LIBOBJS " in *" malloc.$ac_objext "* ) ;; @@ -18332,27 +16518,20 @@ esac -cat >>confdefs.h <<\_ACEOF -#define malloc rpl_malloc -_ACEOF +$as_echo "#define malloc rpl_malloc" >>confdefs.h fi - -{ $as_echo "$as_me:$LINENO: checking for working memcmp" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working memcmp" >&5 $as_echo_n "checking for working memcmp... " >&6; } -if test "${ac_cv_func_memcmp_working+set}" = set; then +if ${ac_cv_func_memcmp_working+:} false; then : $as_echo_n "(cached) " >&6 else - if test "$cross_compiling" = yes; then + if test "$cross_compiling" = yes; then : ac_cv_func_memcmp_working=no else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $ac_includes_default int @@ -18387,44 +16566,17 @@ return 0; } _ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +if ac_fn_c_try_run "$LINENO"; then : ac_cv_func_memcmp_working=yes else - $as_echo "$as_me: program exited with status $ac_status" >&5 -$as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -ac_cv_func_memcmp_working=no + ac_cv_func_memcmp_working=no fi -rm -rf conftest.dSYM -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi - fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_memcmp_working" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_memcmp_working" >&5 $as_echo "$ac_cv_func_memcmp_working" >&6; } test $ac_cv_func_memcmp_working = no && case " $LIBOBJS " in *" memcmp.$ac_objext "* ) ;; @@ -18433,170 +16585,27 @@ esac - for ac_header in stdlib.h -do -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -else - # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 -$as_echo_n "checking $ac_header usability... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } - -# Is the header present? -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 -$as_echo_n "checking $ac_header presence... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## --------------------------------- ## -## Report this to BUG-REPORT-ADDRESS ## -## --------------------------------- ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } - -fi -as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then +do : + ac_fn_c_check_header_mongrel "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default" +if test "x$ac_cv_header_stdlib_h" = xyes; then : cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +#define HAVE_STDLIB_H 1 _ACEOF fi done -{ $as_echo "$as_me:$LINENO: checking for GNU libc compatible realloc" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU libc compatible realloc" >&5 $as_echo_n "checking for GNU libc compatible realloc... " >&6; } -if test "${ac_cv_func_realloc_0_nonnull+set}" = set; then +if ${ac_cv_func_realloc_0_nonnull+:} false; then : $as_echo_n "(cached) " >&6 else - if test "$cross_compiling" = yes; then + if test "$cross_compiling" = yes; then : ac_cv_func_realloc_0_nonnull=no else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #if defined STDC_HEADERS || defined HAVE_STDLIB_H # include @@ -18612,55 +16621,24 @@ return 0; } _ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +if ac_fn_c_try_run "$LINENO"; then : ac_cv_func_realloc_0_nonnull=yes else - $as_echo "$as_me: program exited with status $ac_status" >&5 -$as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -ac_cv_func_realloc_0_nonnull=no + ac_cv_func_realloc_0_nonnull=no fi -rm -rf conftest.dSYM -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi - fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_realloc_0_nonnull" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_realloc_0_nonnull" >&5 $as_echo "$ac_cv_func_realloc_0_nonnull" >&6; } -if test $ac_cv_func_realloc_0_nonnull = yes; then +if test $ac_cv_func_realloc_0_nonnull = yes; then : -cat >>confdefs.h <<\_ACEOF -#define HAVE_REALLOC 1 -_ACEOF +$as_echo "#define HAVE_REALLOC 1" >>confdefs.h else - cat >>confdefs.h <<\_ACEOF -#define HAVE_REALLOC 0 -_ACEOF + $as_echo "#define HAVE_REALLOC 0" >>confdefs.h case " $LIBOBJS " in *" realloc.$ac_objext "* ) ;; @@ -18669,37 +16647,30 @@ esac -cat >>confdefs.h <<\_ACEOF -#define realloc rpl_realloc -_ACEOF +$as_echo "#define realloc rpl_realloc" >>confdefs.h fi - -{ $as_echo "$as_me:$LINENO: checking whether lstat dereferences a symlink specified with a trailing slash" >&5 -$as_echo_n "checking whether lstat dereferences a symlink specified with a trailing slash... " >&6; } -if test "${ac_cv_func_lstat_dereferences_slashed_symlink+set}" = set; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether lstat correctly handles trailing slash" >&5 +$as_echo_n "checking whether lstat correctly handles trailing slash... " >&6; } +if ${ac_cv_func_lstat_dereferences_slashed_symlink+:} false; then : $as_echo_n "(cached) " >&6 else rm -f conftest.sym conftest.file echo >conftest.file if test "$as_ln_s" = "ln -s" && ln -s conftest.file conftest.sym; then - if test "$cross_compiling" = yes; then + if test "$cross_compiling" = yes; then : ac_cv_func_lstat_dereferences_slashed_symlink=no else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $ac_includes_default int main () { struct stat sbuf; - /* Linux will dereference the symlink and fail. + /* Linux will dereference the symlink and fail, as required by POSIX. That is better in the sense that it means we will not have to compile and use the lstat wrapper. */ return lstat ("conftest.sym/", &sbuf) == 0; @@ -18707,42 +16678,15 @@ return 0; } _ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +if ac_fn_c_try_run "$LINENO"; then : ac_cv_func_lstat_dereferences_slashed_symlink=yes else - $as_echo "$as_me: program exited with status $ac_status" >&5 -$as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -ac_cv_func_lstat_dereferences_slashed_symlink=no + ac_cv_func_lstat_dereferences_slashed_symlink=no fi -rm -rf conftest.dSYM -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi - else # If the `ln -s' command failed, then we probably don't even # have an lstat function. @@ -18751,7 +16695,7 @@ rm -f conftest.sym conftest.file fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_lstat_dereferences_slashed_symlink" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_lstat_dereferences_slashed_symlink" >&5 $as_echo "$ac_cv_func_lstat_dereferences_slashed_symlink" >&6; } test $ac_cv_func_lstat_dereferences_slashed_symlink = yes && @@ -18761,7 +16705,7 @@ _ACEOF -if test $ac_cv_func_lstat_dereferences_slashed_symlink = no; then +if test "x$ac_cv_func_lstat_dereferences_slashed_symlink" = xno; then case " $LIBOBJS " in *" lstat.$ac_objext "* ) ;; *) LIBOBJS="$LIBOBJS lstat.$ac_objext" @@ -18770,19 +16714,15 @@ fi -{ $as_echo "$as_me:$LINENO: checking whether stat accepts an empty string" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stat accepts an empty string" >&5 $as_echo_n "checking whether stat accepts an empty string... " >&6; } -if test "${ac_cv_func_stat_empty_string_bug+set}" = set; then +if ${ac_cv_func_stat_empty_string_bug+:} false; then : $as_echo_n "(cached) " >&6 else - if test "$cross_compiling" = yes; then + if test "$cross_compiling" = yes; then : ac_cv_func_stat_empty_string_bug=yes else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $ac_includes_default int @@ -18794,44 +16734,17 @@ return 0; } _ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +if ac_fn_c_try_run "$LINENO"; then : ac_cv_func_stat_empty_string_bug=no else - $as_echo "$as_me: program exited with status $ac_status" >&5 -$as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -ac_cv_func_stat_empty_string_bug=yes + ac_cv_func_stat_empty_string_bug=yes fi -rm -rf conftest.dSYM -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi - fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_stat_empty_string_bug" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_stat_empty_string_bug" >&5 $as_echo "$ac_cv_func_stat_empty_string_bug" >&6; } if test $ac_cv_func_stat_empty_string_bug = yes; then case " $LIBOBJS " in @@ -18847,19 +16760,15 @@ fi -{ $as_echo "$as_me:$LINENO: checking for working strtod" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working strtod" >&5 $as_echo_n "checking for working strtod... " >&6; } -if test "${ac_cv_func_strtod+set}" = set; then +if ${ac_cv_func_strtod+:} false; then : $as_echo_n "(cached) " >&6 else - if test "$cross_compiling" = yes; then + if test "$cross_compiling" = yes; then : ac_cv_func_strtod=no else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $ac_includes_default @@ -18892,151 +16801,39 @@ } _ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +if ac_fn_c_try_run "$LINENO"; then : ac_cv_func_strtod=yes else - $as_echo "$as_me: program exited with status $ac_status" >&5 -$as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -ac_cv_func_strtod=no + ac_cv_func_strtod=no fi -rm -rf conftest.dSYM -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi - fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_strtod" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_strtod" >&5 $as_echo "$ac_cv_func_strtod" >&6; } if test $ac_cv_func_strtod = no; then case " $LIBOBJS " in - *" strtod.$ac_objext "* ) ;; - *) LIBOBJS="$LIBOBJS strtod.$ac_objext" - ;; -esac - -{ $as_echo "$as_me:$LINENO: checking for pow" >&5 -$as_echo_n "checking for pow... " >&6; } -if test "${ac_cv_func_pow+set}" = set; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define pow to an innocuous variant, in case declares pow. - For example, HP-UX 11i declares gettimeofday. */ -#define pow innocuous_pow - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char pow (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef pow - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char pow (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_pow || defined __stub___pow -choke me -#endif - -int -main () -{ -return pow (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_func_pow=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + *" strtod.$ac_objext "* ) ;; + *) LIBOBJS="$LIBOBJS strtod.$ac_objext" + ;; +esac - ac_cv_func_pow=no -fi +ac_fn_c_check_func "$LINENO" "pow" "ac_cv_func_pow" +if test "x$ac_cv_func_pow" = xyes; then : -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_pow" >&5 -$as_echo "$ac_cv_func_pow" >&6; } if test $ac_cv_func_pow = no; then - { $as_echo "$as_me:$LINENO: checking for pow in -lm" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pow in -lm" >&5 $as_echo_n "checking for pow in -lm... " >&6; } -if test "${ac_cv_lib_m_pow+set}" = set; then +if ${ac_cv_lib_m_pow+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lm $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -19054,46 +16851,21 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_m_pow=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_m_pow=no + ac_cv_lib_m_pow=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_m_pow" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_pow" >&5 $as_echo "$ac_cv_lib_m_pow" >&6; } -if test "x$ac_cv_lib_m_pow" = x""yes; then +if test "x$ac_cv_lib_m_pow" = xyes; then : POW_LIB=-lm else - { $as_echo "$as_me:$LINENO: WARNING: cannot find library containing definition of pow" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cannot find library containing definition of pow" >&5 $as_echo "$as_me: WARNING: cannot find library containing definition of pow" >&2;} fi @@ -19101,375 +16873,268 @@ fi - for ac_func in vprintf -do -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -$as_echo_n "checking for $ac_func... " >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ +do : + ac_fn_c_check_func "$LINENO" "vprintf" "ac_cv_func_vprintf" +if test "x$ac_cv_func_vprintf" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_VPRINTF 1 _ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ +ac_fn_c_check_func "$LINENO" "_doprnt" "ac_cv_func__doprnt" +if test "x$ac_cv_func__doprnt" = xyes; then : -#ifdef __STDC__ -# include -#else -# include -#endif +$as_echo "#define HAVE_DOPRNT 1" >>confdefs.h -#undef $ac_func +fi -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_$ac_func || defined __stub___$ac_func -choke me -#endif +fi +done -int -main () -{ -return $ac_func (); - ; - return 0; -} + +for ac_func in floor memmove memset modf pow sqrt strchr strdup strerror strrchr strstr strtol +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - eval "$as_ac_var=yes" -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - eval "$as_ac_var=no" fi +done + + +# add a local directory as base for libs and include files +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for local include/lib path" >&5 +$as_echo_n "checking for local include/lib path... " >&6; } + -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +# Check whether --with-local was given. +if test "${with_local+set}" = set; then : + withval=$with_local; fi -ac_res=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF -{ $as_echo "$as_me:$LINENO: checking for _doprnt" >&5 -$as_echo_n "checking for _doprnt... " >&6; } -if test "${ac_cv_func__doprnt+set}" = set; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define _doprnt to an innocuous variant, in case declares _doprnt. - For example, HP-UX 11i declares gettimeofday. */ -#define _doprnt innocuous__doprnt -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char _doprnt (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ +if test "$with_local" != "no" -a "$with_local" != "" ; then -#ifdef __STDC__ -# include -#else -# include -#endif + if test "$with_local" = "yes" ; then + ADD_PREFIX=/usr/local + else + ADD_PREFIX=$with_local + fi -#undef _doprnt + { $as_echo "$as_me:${as_lineno-$LINENO}: result: adding $ADD_PREFIX" >&5 +$as_echo "adding $ADD_PREFIX" >&6; } -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char _doprnt (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub__doprnt || defined __stub____doprnt -choke me -#endif + LOCAL_LIBS="-L$ADD_PREFIX/lib" + LOCAL_INCS="-I$ADD_PREFIX/include" -int -main () -{ -return _doprnt (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_func__doprnt=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + LOCAL_LIBS=$LOCAL_LIBS - ac_cv_func__doprnt=no -fi + LOCAL_INCS=$LOCAL_INCS -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5 +$as_echo "none" >&6; } fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func__doprnt" >&5 -$as_echo "$ac_cv_func__doprnt" >&6; } -if test "x$ac_cv_func__doprnt" = x""yes; then -cat >>confdefs.h <<\_ACEOF -#define HAVE_DOPRNT 1 -_ACEOF +# conditionals +# wxwidgets +# the test could be extended to check for wx-config --version too +if test "`wx-config --list | grep unicode`" != "" ; then + if true; then + SAGA_UNICODE_TRUE= + SAGA_UNICODE_FALSE='#' +else + SAGA_UNICODE_TRUE='#' + SAGA_UNICODE_FALSE= fi +else + as_fn_error $? "SAGA requires a unicode build of wxGTK" "$LINENO" 5 + exit fi -done - +# postgresql/postgis +# Check whether --with-postgresql was given. +if test "${with_postgresql+set}" = set; then : + withval=$with_postgresql; + if test "$withval" = "no"; then + want_postgresql="no" + elif test "$withval" = "yes"; then + want_postgresql="yes" + else + want_postgresql="yes" + PG_CONFIG="$withval" + fi +else + want_postgresql="yes" +fi + POSTGRESQL_CFLAGS="" + POSTGRESQL_LDFLAGS="" + POSTGRESQL_VERSION="" + if test "$want_postgresql" = "yes"; then + if test -z "$PG_CONFIG" -o test; then + # Extract the first word of "pg_config", so it can be a program name with args. +set dummy pg_config; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_PG_CONFIG+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $PG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_PG_CONFIG="$PG_CONFIG" # 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_PG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + ;; +esac +fi +PG_CONFIG=$ac_cv_path_PG_CONFIG +if test -n "$PG_CONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PG_CONFIG" >&5 +$as_echo "$PG_CONFIG" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi -for ac_func in floor memmove memset modf pow sqrt strchr strdup strerror strrchr strstr strtol -do -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -$as_echo_n "checking for $ac_func... " >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func + fi -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ + if test ! -x "$PG_CONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $PG_CONFIG does not exist or it is not an executable file" >&5 +$as_echo "$as_me: WARNING: $PG_CONFIG does not exist or it is not an executable file" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PostgreSQL support disabled" >&5 +$as_echo "$as_me: WARNING: PostgreSQL support disabled" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: In case you like to enable it, verify that you have the" >&5 +$as_echo "$as_me: WARNING: In case you like to enable it, verify that you have the" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PostgreSQL development package installed; in case you have," >&5 +$as_echo "$as_me: WARNING: PostgreSQL development package installed; in case you have," >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but your pg_config is stored in a special location, provide" >&5 +$as_echo "$as_me: WARNING: but your pg_config is stored in a special location, provide" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: the full path with configure, e.g.:" >&5 +$as_echo "$as_me: WARNING: the full path with configure, e.g.:" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: '--with-postgresql=/usr/pgsql-9.1/bin/pg_config'" >&5 +$as_echo "$as_me: WARNING: '--with-postgresql=/usr/pgsql-9.1/bin/pg_config'" >&2;} + PG_CONFIG="no" + found_postgresql="no" + fi -#ifdef __STDC__ -# include -#else -# include -#endif + if test "$PG_CONFIG" != "no"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PostgreSQL libraries" >&5 +$as_echo_n "checking for PostgreSQL libraries... " >&6; } -#undef $ac_func + POSTGRESQL_CFLAGS="-I`$PG_CONFIG --includedir`" + POSTGRESQL_LDFLAGS="-L`$PG_CONFIG --libdir` -lpq" -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_$ac_func || defined __stub___$ac_func -choke me -#endif + POSTGRESQL_VERSION=`$PG_CONFIG --version | sed -e 's#PostgreSQL ##'` -int -main () -{ -return $ac_func (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - eval "$as_ac_var=yes" -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - eval "$as_ac_var=no" -fi +$as_echo "#define HAVE_POSTGRESQL 1" >>confdefs.h -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -ac_res=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF -fi -done + found_postgresql="yes" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + else + found_postgresql="no" +# AC_MSG_RESULT([no]) + fi + fi -# add a local directory as base for libs and include files -{ $as_echo "$as_me:$LINENO: checking for local include/lib path" >&5 -$as_echo_n "checking for local include/lib path... " >&6; } + postgresql_version_req=8.0 -# Check whether --with-local was given. -if test "${with_local+set}" = set; then - withval=$with_local; -fi + if test "$found_postgresql" = "yes" -a -n "$postgresql_version_req"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if PostgreSQL version is >= $postgresql_version_req" >&5 +$as_echo_n "checking if PostgreSQL version is >= $postgresql_version_req... " >&6; } -if test "$with_local" != "no" -a "$with_local" != "" ; then + postgresql_version_req_major=`expr $postgresql_version_req : '\([0-9]*\)'` + postgresql_version_req_minor=`expr $postgresql_version_req : '[0-9]*\.\([0-9]*\)'` + postgresql_version_req_micro=`expr $postgresql_version_req : '[0-9]*\.[0-9]*\.\([0-9]*\)'` + if test "x$postgresql_version_req_micro" = "x"; then + postgresql_version_req_micro="0" + fi - if test "$with_local" = "yes" ; then - ADD_PREFIX=/usr/local - else - ADD_PREFIX=$with_local - fi + postgresql_version_req_number=`expr $postgresql_version_req_major \* 1000000 \ + \+ $postgresql_version_req_minor \* 1000 \ + \+ $postgresql_version_req_micro` + + postgresql_version_major=`expr $POSTGRESQL_VERSION : '\([0-9]*\)'` + postgresql_version_minor=`expr $POSTGRESQL_VERSION : '[0-9]*\.\([0-9]*\)'` + postgresql_version_micro=`expr $POSTGRESQL_VERSION : '[0-9]*\.[0-9]*\.\([0-9]*\)'` + if test "x$postgresql_version_micro" = "x"; then + postgresql_version_micro="0" + fi - { $as_echo "$as_me:$LINENO: result: adding $ADD_PREFIX" >&5 -$as_echo "adding $ADD_PREFIX" >&6; } + postgresql_version_number=`expr $postgresql_version_major \* 1000000 \ + \+ $postgresql_version_minor \* 1000 \ + \+ $postgresql_version_micro` + + postgresql_version_check=`expr $postgresql_version_number \>\= $postgresql_version_req_number` + if test "$postgresql_version_check" = "1"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + fi + fi - LOCAL_LIBS="-L$ADD_PREFIX/lib" - LOCAL_INCS="-I$ADD_PREFIX/include" - LOCAL_LIBS=$LOCAL_LIBS - LOCAL_INCS=$LOCAL_INCS -else - { $as_echo "$as_me:$LINENO: result: none" >&5 -$as_echo "none" >&6; } -fi -# conditionals -# the test could be extended to check for wx-config --version too -if test "`wx-config --list | grep unicode`" != "" ; then - if true; then - SAGA_UNICODE_TRUE= - SAGA_UNICODE_FALSE='#' +if test "x$found_postgresql" = "xyes"; then + echo "checking whether to enable postgresql... yes" else - SAGA_UNICODE_TRUE='#' - SAGA_UNICODE_FALSE= + echo "checking whether to enable postgresql... no" fi - + if test "x$found_postgresql" = "xyes"; then + HAVE_POSTGRESQL_TRUE= + HAVE_POSTGRESQL_FALSE='#' else - { { $as_echo "$as_me:$LINENO: error: SAGA requires a unicode build of wxGTK" >&5 -$as_echo "$as_me: error: SAGA requires a unicode build of wxGTK" >&2;} - { (exit 1); exit 1; }; } - exit + HAVE_POSTGRESQL_TRUE='#' + HAVE_POSTGRESQL_FALSE= fi +# debug # Check whether --enable-debug was given. -if test "${enable_debug+set}" = set; then +if test "${enable_debug+set}" = set; then : enableval=$enable_debug; case "${enableval}" in yes) debug=true ;; no) debug=false ;; - *) { { $as_echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-debug" >&5 -$as_echo "$as_me: error: bad value ${enableval} for --enable-debug" >&2;} - { (exit 1); exit 1; }; } ;; + *) as_fn_error $? "bad value ${enableval} for --enable-debug" "$LINENO" 5 ;; esac else debug=false @@ -19484,14 +17149,13 @@ fi +# gui # Check whether --enable-gui was given. -if test "${enable_gui+set}" = set; then +if test "${enable_gui+set}" = set; then : enableval=$enable_gui; case "${enableval}" in yes) gui=true ;; no) gui=false ;; - *) { { $as_echo "$as_me:$LINENO: error: bad value ${enableval} for --disable-gui" >&5 -$as_echo "$as_me: error: bad value ${enableval} for --disable-gui" >&2;} - { (exit 1); exit 1; }; } ;; + *) as_fn_error $? "bad value ${enableval} for --disable-gui" "$LINENO" 5 ;; esac else gui=true @@ -19507,26 +17171,23 @@ if test $gui = "false" ; then - { $as_echo "$as_me:$LINENO: result: GUI and interactive modules will NOT be built" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: GUI and interactive modules will NOT be built" >&5 $as_echo " GUI and interactive modules will NOT be built" >&6; } else -cat >>confdefs.h <<\_ACEOF -#define WITH_GUI 1 -_ACEOF +$as_echo "#define WITH_GUI 1" >>confdefs.h - { $as_echo "$as_me:$LINENO: result: GUI and interactive modules will be built" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: GUI and interactive modules will be built" >&5 $as_echo " GUI and interactive modules will be built" >&6; } fi +# odbc # Check whether --enable-odbc was given. -if test "${enable_odbc+set}" = set; then +if test "${enable_odbc+set}" = set; then : enableval=$enable_odbc; case "${enableval}" in yes) odbc=true ;; no) odbc=false ;; - *) { { $as_echo "$as_me:$LINENO: error: bad value ${enableval} for --disable-odbc" >&5 -$as_echo "$as_me: error: bad value ${enableval} for --disable-odbc" >&2;} - { (exit 1); exit 1; }; } ;; + *) as_fn_error $? "bad value ${enableval} for --disable-odbc" "$LINENO" 5 ;; esac else odbc=true @@ -19542,26 +17203,24 @@ if test $odbc = "false" ; then - { $as_echo "$as_me:$LINENO: result: ODBC support will NOT be built" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ODBC support will NOT be built" >&5 $as_echo " ODBC support will NOT be built" >&6; } else -cat >>confdefs.h <<\_ACEOF -#define WITH_ODBC 1 -_ACEOF +$as_echo "#define WITH_ODBC 1" >>confdefs.h - { $as_echo "$as_me:$LINENO: result: ODBC support will be built" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ODBC support will be built" >&5 $as_echo " ODBC support will be built" >&6; } fi + +# openmp # Check whether --enable-openmp was given. -if test "${enable_openmp+set}" = set; then +if test "${enable_openmp+set}" = set; then : enableval=$enable_openmp; case "${enableval}" in yes) openmp=true ;; no) openmp=false ;; - *) { { $as_echo "$as_me:$LINENO: error: bad value ${enableval} for --disable-openmp" >&5 -$as_echo "$as_me: error: bad value ${enableval} for --disable-openmp" >&2;} - { (exit 1); exit 1; }; } ;; + *) as_fn_error $? "bad value ${enableval} for --disable-openmp" "$LINENO" 5 ;; esac else openmp=true @@ -19577,16 +17236,16 @@ if test $openmp = "false" ; then - { $as_echo "$as_me:$LINENO: result: OpenMP support disabled" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: OpenMP support disabled" >&5 $as_echo " OpenMP support disabled" >&6; } GOMPFLAGS="" else if test -n "$GOMPFOUND" ; then - { $as_echo "$as_me:$LINENO: result: Building with OpenMP support using libgomp" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Building with OpenMP support using libgomp" >&5 $as_echo " Building with OpenMP support using libgomp" >&6; } - GOMPFLAGS="-fopenmp" + GOMPFLAGS="-fopenmp -lgomp" else - { $as_echo "$as_me:$LINENO: result: libgomp not found, OpenMP support disabled" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: libgomp not found, OpenMP support disabled" >&5 $as_echo " libgomp not found, OpenMP support disabled" >&6; } GOMPFLAGS="" fi @@ -19629,12 +17288,12 @@ if test -n "$HARUFOUND" ; then - { $as_echo "$as_me:$LINENO: result: using lhpdf (libharu) from system libs." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: using lhpdf (libharu) from system libs." >&5 $as_echo " using lhpdf (libharu) from system libs." >&6; } DISABLELIBHARU="" HARU_LIB="-lhpdf" else - { $as_echo "$as_me:$LINENO: result: libharu was not found, pdf creation will be disabled" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: libharu was not found, pdf creation will be disabled" >&5 $as_echo " libharu was not found, pdf creation will be disabled" >&6; } DISABLELIBHARU="-D_SAGA_DONOTUSE_HARU" HARU_LIB="" @@ -19643,15 +17302,12 @@ - # Check whether --enable-python was given. -if test "${enable_python+set}" = set; then +if test "${enable_python+set}" = set; then : enableval=$enable_python; case "${enableval}" in yes) python=true ;; no) python=false ;; - *) { { $as_echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-python" >&5 -$as_echo "$as_me: error: bad value ${enableval} for --enable-python" >&2;} - { (exit 1); exit 1; }; } ;; + *) as_fn_error $? "bad value ${enableval} for --enable-python" "$LINENO" 5 ;; esac else python=false @@ -19670,15 +17326,17 @@ + + # Find any Python interpreter. if test -z "$PYTHON"; then - for ac_prog in python python2 python3 python3.0 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 + for ac_prog in python python2 python3 python3.3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_PYTHON+set}" = set; then +if ${ac_cv_path_PYTHON+:} false; then : $as_echo_n "(cached) " >&6 else case $PYTHON in @@ -19691,14 +17349,14 @@ 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 + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -19706,10 +17364,10 @@ fi PYTHON=$ac_cv_path_PYTHON if test -n "$PYTHON"; then - { $as_echo "$as_me:$LINENO: result: $PYTHON" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON" >&5 $as_echo "$PYTHON" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -19723,20 +17381,18 @@ if test "$PYTHON" = :; then - { { $as_echo "$as_me:$LINENO: error: no suitable Python interpreter found" >&5 -$as_echo "$as_me: error: no suitable Python interpreter found" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "no suitable Python interpreter found" "$LINENO" 5 else - { $as_echo "$as_me:$LINENO: checking for $am_display_PYTHON version" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON version" >&5 $as_echo_n "checking for $am_display_PYTHON version... " >&6; } -if test "${am_cv_python_version+set}" = set; then +if ${am_cv_python_version+:} false; then : $as_echo_n "(cached) " >&6 else am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"` fi -{ $as_echo "$as_me:$LINENO: result: $am_cv_python_version" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5 $as_echo "$am_cv_python_version" >&6; } PYTHON_VERSION=$am_cv_python_version @@ -19748,23 +17404,42 @@ - { $as_echo "$as_me:$LINENO: checking for $am_display_PYTHON platform" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON platform" >&5 $as_echo_n "checking for $am_display_PYTHON platform... " >&6; } -if test "${am_cv_python_platform+set}" = set; then +if ${am_cv_python_platform+:} false; then : $as_echo_n "(cached) " >&6 else am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"` fi -{ $as_echo "$as_me:$LINENO: result: $am_cv_python_platform" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_platform" >&5 $as_echo "$am_cv_python_platform" >&6; } PYTHON_PLATFORM=$am_cv_python_platform + # Just factor out some code duplication. + am_python_setup_sysconfig="\ +import sys +# Prefer sysconfig over distutils.sysconfig, for better compatibility +# with python 3.x. See automake bug#10227. +try: + import sysconfig +except ImportError: + can_use_sysconfig = 0 +else: + can_use_sysconfig = 1 +# Can't use sysconfig in CPython 2.7, since it's broken in virtualenvs: +# +try: + from platform import python_implementation + if python_implementation() == 'CPython' and sys.version[:3] == '2.7': + can_use_sysconfig = 0 +except ImportError: + pass" - { $as_echo "$as_me:$LINENO: checking for $am_display_PYTHON script directory" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON script directory" >&5 $as_echo_n "checking for $am_display_PYTHON script directory... " >&6; } -if test "${am_cv_python_pythondir+set}" = set; then +if ${am_cv_python_pythondir+:} false; then : $as_echo_n "(cached) " >&6 else if test "x$prefix" = xNONE @@ -19773,8 +17448,14 @@ else am_py_prefix=$prefix fi - am_cv_python_pythondir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(0,0,prefix='$am_py_prefix'))" 2>/dev/null || - echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"` + am_cv_python_pythondir=`$PYTHON -c " +$am_python_setup_sysconfig +if can_use_sysconfig: + sitedir = sysconfig.get_path('purelib', vars={'base':'$am_py_prefix'}) +else: + from distutils import sysconfig + sitedir = sysconfig.get_python_lib(0, 0, prefix='$am_py_prefix') +sys.stdout.write(sitedir)"` case $am_cv_python_pythondir in $am_py_prefix*) am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'` @@ -19791,7 +17472,7 @@ esac fi -{ $as_echo "$as_me:$LINENO: result: $am_cv_python_pythondir" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pythondir" >&5 $as_echo "$am_cv_python_pythondir" >&6; } pythondir=$am_cv_python_pythondir @@ -19800,9 +17481,9 @@ pkgpythondir=\${pythondir}/$PACKAGE - { $as_echo "$as_me:$LINENO: checking for $am_display_PYTHON extension module directory" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON extension module directory" >&5 $as_echo_n "checking for $am_display_PYTHON extension module directory... " >&6; } -if test "${am_cv_python_pyexecdir+set}" = set; then +if ${am_cv_python_pyexecdir+:} false; then : $as_echo_n "(cached) " >&6 else if test "x$exec_prefix" = xNONE @@ -19811,8 +17492,14 @@ else am_py_exec_prefix=$exec_prefix fi - am_cv_python_pyexecdir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(1,0,prefix='$am_py_exec_prefix'))" 2>/dev/null || - echo "$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages"` + am_cv_python_pyexecdir=`$PYTHON -c " +$am_python_setup_sysconfig +if can_use_sysconfig: + sitedir = sysconfig.get_path('platlib', vars={'platbase':'$am_py_prefix'}) +else: + from distutils import sysconfig + sitedir = sysconfig.get_python_lib(1, 0, prefix='$am_py_prefix') +sys.stdout.write(sitedir)"` case $am_cv_python_pyexecdir in $am_py_exec_prefix*) am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'` @@ -19829,7 +17516,7 @@ esac fi -{ $as_echo "$as_me:$LINENO: result: $am_cv_python_pyexecdir" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pyexecdir" >&5 $as_echo "$am_cv_python_pyexecdir" >&6; } pyexecdir=$am_cv_python_pyexecdir @@ -19842,8 +17529,6 @@ fi -# PYTHON_EXTRA_LIBS='-lgomp' -# PYTHON_EXTRA_LDFLAGS='-lgomp' # # Allow the use of a (user set) custom python version @@ -19852,9 +17537,9 @@ # Extract the first word of "python[$PYTHON_VERSION]", so it can be a program name with args. set dummy python$PYTHON_VERSION; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_PYTHON+set}" = set; then +if ${ac_cv_path_PYTHON+:} false; then : $as_echo_n "(cached) " >&6 else case $PYTHON in @@ -19867,14 +17552,14 @@ 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 + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -19882,46 +17567,34 @@ fi PYTHON=$ac_cv_path_PYTHON if test -n "$PYTHON"; then - { $as_echo "$as_me:$LINENO: result: $PYTHON" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON" >&5 $as_echo "$PYTHON" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi if test -z "$PYTHON"; then - { { $as_echo "$as_me:$LINENO: error: Cannot find python$PYTHON_VERSION in your system path" >&5 -$as_echo "$as_me: error: Cannot find python$PYTHON_VERSION in your system path" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Cannot find python$PYTHON_VERSION in your system path" "$LINENO" 5 PYTHON_VERSION="" fi # # Check for a version of Python >= 2.1.0 # - { $as_echo "$as_me:$LINENO: checking for a version of Python >= '2.1.0'" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a version of Python >= '2.1.0'" >&5 $as_echo_n "checking for a version of Python >= '2.1.0'... " >&6; } ac_supports_python_ver=`$PYTHON -c "import sys; \ ver = sys.version.split ()[0]; \ print (ver >= '2.1.0')"` if test "$ac_supports_python_ver" != "True"; then if test -z "$PYTHON_NOVERSIONCHECK"; then - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: -This version of the AC_PYTHON_DEVEL macro -doesn't work properly with versions of Python before -2.1.0. You may need to re-run configure, setting the -variables PYTHON_CPPFLAGS, PYTHON_LDFLAGS, PYTHON_SITE_PKG, -PYTHON_EXTRA_LIBS and PYTHON_EXTRA_LDFLAGS by hand. -Moreover, to disable this check, set PYTHON_NOVERSIONCHECK -to something else than an empty string. - -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: +as_fn_error $? " This version of the AC_PYTHON_DEVEL macro doesn't work properly with versions of Python before 2.1.0. You may need to re-run configure, setting the @@ -19930,14 +17603,13 @@ Moreover, to disable this check, set PYTHON_NOVERSIONCHECK to something else than an empty string. -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } +See \`config.log' for more details" "$LINENO" 5; } else - { $as_echo "$as_me:$LINENO: result: skip at user request" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: skip at user request" >&5 $as_echo "skip at user request" >&6; } fi else - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } fi @@ -19945,28 +17617,22 @@ # if the macro parameter ``version'' is set, honour it # if test -n ""; then - { $as_echo "$as_me:$LINENO: checking for a version of Python " >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a version of Python " >&5 $as_echo_n "checking for a version of Python ... " >&6; } ac_supports_python_ver=`$PYTHON -c "import sys; \ ver = sys.version.split ()[0]; \ print (ver )"` if test "$ac_supports_python_ver" = "True"; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - { { $as_echo "$as_me:$LINENO: error: this package requires Python . -If you have it installed, but it isn't the default Python -interpreter in your system path, please pass the PYTHON_VERSION -variable to configure. See \`\`configure --help'' for reference. -" >&5 -$as_echo "$as_me: error: this package requires Python . + as_fn_error $? "this package requires Python . If you have it installed, but it isn't the default Python interpreter in your system path, please pass the PYTHON_VERSION variable to configure. See \`\`configure --help'' for reference. -" >&2;} - { (exit 1); exit 1; }; } +" "$LINENO" 5 PYTHON_VERSION="" fi fi @@ -19974,46 +17640,48 @@ # # Check if you have distutils, else fail # - { $as_echo "$as_me:$LINENO: checking for the distutils Python package" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the distutils Python package" >&5 $as_echo_n "checking for the distutils Python package... " >&6; } ac_distutils_result=`$PYTHON -c "import distutils" 2>&1` if test -z "$ac_distutils_result"; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - { { $as_echo "$as_me:$LINENO: error: cannot import Python module \"distutils\". + as_fn_error $? "cannot import Python module \"distutils\". Please check your Python installation. The error was: -$ac_distutils_result" >&5 -$as_echo "$as_me: error: cannot import Python module \"distutils\". -Please check your Python installation. The error was: -$ac_distutils_result" >&2;} - { (exit 1); exit 1; }; } +$ac_distutils_result" "$LINENO" 5 PYTHON_VERSION="" fi # # Check for Python include path # - { $as_echo "$as_me:$LINENO: checking for Python include path" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Python include path" >&5 $as_echo_n "checking for Python include path... " >&6; } if test -z "$PYTHON_CPPFLAGS"; then python_path=`$PYTHON -c "import distutils.sysconfig; \ print (distutils.sysconfig.get_python_inc ());"` + plat_python_path=`$PYTHON -c "import distutils.sysconfig; \ + print (distutils.sysconfig.get_python_inc (plat_specific=1));"` if test -n "${python_path}"; then - python_path="-I$python_path" + if test "${plat_python_path}" != "${python_path}"; then + python_path="-I$python_path -I$plat_python_path" + else + python_path="-I$python_path" + fi fi PYTHON_CPPFLAGS=$python_path fi - { $as_echo "$as_me:$LINENO: result: $PYTHON_CPPFLAGS" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON_CPPFLAGS" >&5 $as_echo "$PYTHON_CPPFLAGS" >&6; } # # Check for Python library path # - { $as_echo "$as_me:$LINENO: checking for Python library path" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Python library path" >&5 $as_echo_n "checking for Python library path... " >&6; } if test -z "$PYTHON_LDFLAGS"; then # (makes two attempts to ensure we've got a version number @@ -20023,11 +17691,9 @@ # join all versioning strings, on some systems # major/minor numbers could be in different list elements from distutils.sysconfig import * -ret = '' -for e in get_config_vars ('VERSION'): - if (e != None): - ret += e -print (ret) +e = get_config_var('VERSION') +if e is not None: + print(e) EOD` if test -z "$ac_python_version"; then @@ -20051,33 +17717,27 @@ # There should be only one import distutils.sysconfig -for e in distutils.sysconfig.get_config_vars ('LIBDIR'): - if e != None: - print (e) - break +e = distutils.sysconfig.get_config_var('LIBDIR') +if e is not None: + print (e) EOD` - # Before checking for libpythonX.Y, we need to know - # the extension the OS we're on uses for libraries - # (we take the first one, if there's more than one fix me!): - ac_python_soext=`$PYTHON -c \ - "import distutils.sysconfig; \ - print (distutils.sysconfig.get_config_vars('SO')[0])"` - # Now, for the library: - ac_python_soname=`$PYTHON -c \ - "import distutils.sysconfig; \ - print (distutils.sysconfig.get_config_vars('LDLIBRARY')[0])"` + ac_python_library=`cat<&5 -$as_echo "$as_me: error: - Cannot determine location of your Python DSO. Please check it was installed with - dynamic libraries enabled, or try setting PYTHON_LDFLAGS by hand. - " >&2;} - { (exit 1); exit 1; }; } + " "$LINENO" 5 fi fi - { $as_echo "$as_me:$LINENO: result: $PYTHON_LDFLAGS" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON_LDFLAGS" >&5 $as_echo "$PYTHON_LDFLAGS" >&6; } # # Check for site packages # - { $as_echo "$as_me:$LINENO: checking for Python site-packages path" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Python site-packages path" >&5 $as_echo_n "checking for Python site-packages path... " >&6; } if test -z "$PYTHON_SITE_PKG"; then PYTHON_SITE_PKG=`$PYTHON -c "import distutils.sysconfig; \ print (distutils.sysconfig.get_python_lib(0,0));"` fi - { $as_echo "$as_me:$LINENO: result: $PYTHON_SITE_PKG" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON_SITE_PKG" >&5 $as_echo "$PYTHON_SITE_PKG" >&6; } # # libraries which must be linked in when embedding # - { $as_echo "$as_me:$LINENO: checking python extra libraries" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking python extra libraries" >&5 $as_echo_n "checking python extra libraries... " >&6; } if test -z "$PYTHON_EXTRA_LIBS"; then PYTHON_EXTRA_LIBS=`$PYTHON -c "import distutils.sysconfig; \ conf = distutils.sysconfig.get_config_var; \ - print (conf('LOCALMODLIBS') + ' ' + conf('LIBS'))"` + print (conf('LIBS'))"` fi - { $as_echo "$as_me:$LINENO: result: $PYTHON_EXTRA_LIBS" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON_EXTRA_LIBS" >&5 $as_echo "$PYTHON_EXTRA_LIBS" >&6; } # # linking flags needed when embedding # - { $as_echo "$as_me:$LINENO: checking python extra linking flags" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking python extra linking flags" >&5 $as_echo_n "checking python extra linking flags... " >&6; } if test -z "$PYTHON_EXTRA_LDFLAGS"; then PYTHON_EXTRA_LDFLAGS=`$PYTHON -c "import distutils.sysconfig; \ conf = distutils.sysconfig.get_config_var; \ print (conf('LINKFORSHARED'))"` fi - { $as_echo "$as_me:$LINENO: result: $PYTHON_EXTRA_LDFLAGS" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON_EXTRA_LDFLAGS" >&5 $as_echo "$PYTHON_EXTRA_LDFLAGS" >&6; } # # final check to see if everything compiles alright # - { $as_echo "$as_me:$LINENO: checking consistency of all components of python development environment" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking consistency of all components of python development environment" >&5 $as_echo_n "checking consistency of all components of python development environment... " >&6; } # save current global flags ac_save_LIBS="$LIBS" @@ -20164,14 +17819,10 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu - cat >conftest.$ac_ext <<_ACEOF - - /* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include + + #include int main () { @@ -20181,38 +17832,13 @@ } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : pythonexists=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - pythonexists=no + pythonexists=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -20223,25 +17849,13 @@ CPPFLAGS="$ac_save_CPPFLAGS" LIBS="$ac_save_LIBS" - { $as_echo "$as_me:$LINENO: result: $pythonexists" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pythonexists" >&5 $as_echo "$pythonexists" >&6; } if test ! "x$pythonexists" = "xyes"; then - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: - Could not link test program to Python. Maybe the main Python library has been - installed in some non-standard library path. If so, pass it to configure, - via the LDFLAGS environment variable. - Example: ./configure LDFLAGS=\"-L/usr/non-standard-path/python/lib\" - ============================================================================ - ERROR! - You probably have to install the development version of the Python package - for your distribution. The exact name of this package varies among them. - ============================================================================ - -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: +as_fn_error $? " Could not link test program to Python. Maybe the main Python library has been installed in some non-standard library path. If so, pass it to configure, via the LDFLAGS environment variable. @@ -20252,8 +17866,7 @@ for your distribution. The exact name of this package varies among them. ============================================================================ -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } +See \`config.log' for more details" "$LINENO" 5; } PYTHON_VERSION="" fi @@ -20263,11 +17876,14 @@ - # Extract the first word of "swig", so it can be a program name with args. -set dummy swig; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 + # Ubuntu has swig 2.0 as /usr/bin/swig2.0 + for ac_prog in swig swig2.0 +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_SWIG+set}" = set; then +if ${ac_cv_path_SWIG+:} false; then : $as_echo_n "(cached) " >&6 else case $SWIG in @@ -20280,14 +17896,14 @@ 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 + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_SWIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -20295,21 +17911,24 @@ fi SWIG=$ac_cv_path_SWIG if test -n "$SWIG"; then - { $as_echo "$as_me:$LINENO: result: $SWIG" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SWIG" >&5 $as_echo "$SWIG" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi + test -n "$SWIG" && break +done + if test -z "$SWIG" ; then : elif test -n "1.3.17" ; then - { $as_echo "$as_me:$LINENO: checking SWIG version" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking SWIG version" >&5 $as_echo_n "checking SWIG version... " >&6; } swig_version=`$SWIG -version 2>&1 | grep 'SWIG Version' | sed 's/.*\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*/\1/g'` - { $as_echo "$as_me:$LINENO: result: $swig_version" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $swig_version" >&5 $as_echo "$swig_version" >&6; } if test -n "$swig_version" ; then # Calculate the required version number components @@ -20353,20 +17972,20 @@ \+ $available_minor \* 100 \+ $available_patch` if test $available_swig_vernum -lt $required_swig_vernum; then - { $as_echo "$as_me:$LINENO: WARNING: SWIG version >= 1.3.17 is required. You have $swig_version." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: SWIG version >= 1.3.17 is required. You have $swig_version." >&5 $as_echo "$as_me: WARNING: SWIG version >= 1.3.17 is required. You have $swig_version." >&2;} SWIG='' else - { $as_echo "$as_me:$LINENO: checking for SWIG library" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SWIG library" >&5 $as_echo_n "checking for SWIG library... " >&6; } SWIG_LIB=`$SWIG -swiglib` - { $as_echo "$as_me:$LINENO: result: $SWIG_LIB" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SWIG_LIB" >&5 $as_echo "$SWIG_LIB" >&6; } fi else - { $as_echo "$as_me:$LINENO: WARNING: cannot determine SWIG version" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cannot determine SWIG version" >&5 $as_echo "$as_me: WARNING: cannot determine SWIG version" >&2;} SWIG='' @@ -20390,7 +18009,7 @@ fi #AC_CONFIG_FILES([Makefile]) -ac_config_files="$ac_config_files Makefile src/Makefile src/saga_core/Makefile src/saga_core/saga_api/Makefile src/saga_core/saga_gdi/Makefile src/saga_core/saga_gui/Makefile src/saga_core/saga_gui/man/Makefile src/saga_core/saga_odbc/Makefile src/saga_core/saga_cmd/Makefile src/saga_core/saga_cmd/man/Makefile src/modules/Makefile src/modules/climate/Makefile src/modules/climate/climate_tools/Makefile src/modules/grid/Makefile src/modules/grid/grid_analysis/Makefile src/modules/grid/grid_calculus/Makefile src/modules/grid/grid_calculus_bsl/Makefile src/modules/grid/grid_filter/Makefile src/modules/grid/grid_gridding/Makefile src/modules/grid/grid_spline/Makefile src/modules/grid/grid_tools/Makefile src/modules/grid/grid_visualisation/Makefile src/modules/pointcloud/Makefile src/modules/pointcloud/pointcloud_tools/Makefile src/modules/pointcloud/pointcloud_viewer/Makefile src/modules/shapes/Makefile src/modules/shapes/shapes_grid/Makefile src/modules/shapes/shapes_lines/Makefile src/modules/shapes/shapes_points/Makefile src/modules/shapes/shapes_polygons/Makefile src/modules/shapes/shapes_tools/Makefile src/modules/shapes/shapes_transect/Makefile src/modules/table/Makefile src/modules/table/table_calculus/Makefile src/modules/table/table_tools/Makefile src/modules/tin/Makefile src/modules/tin/tin_tools/Makefile src/modules/tin/tin_viewer/Makefile src/modules_contrib/Makefile src/modules_contrib/contrib_a_perego/Makefile src/modules_contrib/contrib_a_perego/contrib_a_perego/Makefile src/modules_contrib/contrib_s_liersch/Makefile src/modules_contrib/contrib_s_liersch/ihacres/Makefile src/modules_contrib/garden/Makefile src/modules_contrib/garden/garden_3d_viewer/Makefile src/modules_contrib/garden/garden_webservices/Makefile src/modules_geostatistics/Makefile src/modules_geostatistics/geostatistics/Makefile src/modules_geostatistics/geostatistics/geostatistics_points/Makefile src/modules_geostatistics/geostatistics/geostatistics_grid/Makefile src/modules_geostatistics/geostatistics/geostatistics_kriging/Makefile src/modules_geostatistics/geostatistics/geostatistics_regression/Makefile src/modules_images/Makefile src/modules_images/modules_imagery/Makefile src/modules_images/modules_imagery/imagery_classification/Makefile src/modules_images/modules_imagery/imagery_rga/Makefile src/modules_images/modules_imagery/imagery_segmentation/Makefile src/modules_images/modules_imagery/imagery_svm/Makefile src/modules_images/modules_imagery/imagery_tools/Makefile src/modules_images/modules_opencv/Makefile src/modules_images/modules_opencv/opencv/Makefile src/modules_images/modules_vigra/Makefile src/modules_images/modules_vigra/vigra/Makefile src/modules_io/Makefile src/modules_io/esri_e00/Makefile src/modules_io/esri_e00/io_esri_e00/Makefile src/modules_io/db/Makefile src/modules_io/db/io_odbc/Makefile src/modules_io/docs/Makefile src/modules_io/docs/docs_html/Makefile src/modules_io/docs/docs_pdf/Makefile src/modules_io/gdal/Makefile src/modules_io/gdal/io_gdal/Makefile src/modules_io/grid/Makefile src/modules_io/grid/io_grid/Makefile src/modules_io/grid/io_grid_image/Makefile src/modules_io/grid/io_grid_grib2/Makefile src/modules_io/gps/Makefile src/modules_io/gps/io_gps/Makefile src/modules_io/shapes/Makefile src/modules_io/shapes/io_shapes/Makefile src/modules_io/shapes/io_shapes_dxf/Makefile src/modules_io/shapes/io_shapes_las/Makefile src/modules_io/table/Makefile src/modules_io/table/io_table/Makefile src/modules_lectures/Makefile src/modules_lectures/lectures/Makefile src/modules_lectures/lectures/lectures_introduction/Makefile src/modules_projection/Makefile src/modules_projection/pj_georeference/Makefile src/modules_projection/pj_georeference/pj_georeference/Makefile src/modules_projection/pj_proj4/Makefile src/modules_projection/pj_proj4/pj_proj4/Makefile src/modules_recreations/Makefile src/modules_recreations/recreations/Makefile src/modules_recreations/recreations/recreations_fractals/Makefile src/modules_recreations/recreations/recreations_games/Makefile src/modules_simulation/Makefile src/modules_simulation/erosion/Makefile src/modules_simulation/erosion/sim_erosion/Makefile src/modules_simulation/hydrology/Makefile src/modules_simulation/hydrology/sim_hydrology/Makefile src/modules_simulation/cellular_automata/Makefile src/modules_simulation/cellular_automata/sim_cellular_automata/Makefile src/modules_simulation/ecosystems/Makefile src/modules_simulation/ecosystems/sim_ecosystems_hugget/Makefile src/modules_simulation/fire/Makefile src/modules_simulation/fire/sim_fire_spreading/Makefile src/modules_terrain_analysis/Makefile src/modules_terrain_analysis/terrain_analysis/Makefile src/modules_terrain_analysis/terrain_analysis/ta_channels/Makefile src/modules_terrain_analysis/terrain_analysis/ta_compound/Makefile src/modules_terrain_analysis/terrain_analysis/ta_hydrology/Makefile src/modules_terrain_analysis/terrain_analysis/ta_lighting/Makefile src/modules_terrain_analysis/terrain_analysis/ta_morphometry/Makefile src/modules_terrain_analysis/terrain_analysis/ta_preprocessor/Makefile src/modules_terrain_analysis/terrain_analysis/ta_profiles/Makefile" +ac_config_files="$ac_config_files Makefile src/Makefile src/saga_core/Makefile src/saga_core/saga_api/Makefile src/saga_core/saga_gdi/Makefile src/saga_core/saga_gui/Makefile src/saga_core/saga_gui/man/Makefile src/saga_core/saga_cmd/Makefile src/saga_core/saga_cmd/man/Makefile src/modules/Makefile src/modules/climate/Makefile src/modules/climate/climate_tools/Makefile src/modules/contrib/Makefile src/modules/contrib/contrib_peregro/Makefile src/modules/db/Makefile src/modules/db/db_odbc/Makefile src/modules/db/db_pgsql/Makefile src/modules/docs/Makefile src/modules/docs/docs_html/Makefile src/modules/docs/docs_pdf/Makefile src/modules/garden/Makefile src/modules/garden/garden_3d_viewer/Makefile src/modules/garden/garden_fractals/Makefile src/modules/garden/garden_games/Makefile src/modules/garden/garden_learn_to_program/Makefile src/modules/garden/garden_webservices/Makefile src/modules/grid/Makefile src/modules/grid/grid_analysis/Makefile src/modules/grid/grid_calculus/Makefile src/modules/grid/grid_calculus_bsl/Makefile src/modules/grid/grid_filter/Makefile src/modules/grid/grid_gridding/Makefile src/modules/grid/grid_spline/Makefile src/modules/grid/grid_tools/Makefile src/modules/grid/grid_visualisation/Makefile src/modules/imagery/Makefile src/modules/imagery/imagery_classification/Makefile src/modules/imagery/imagery_opencv/Makefile src/modules/imagery/imagery_photogrammetry/Makefile src/modules/imagery/imagery_segmentation/Makefile src/modules/imagery/imagery_svm/Makefile src/modules/imagery/imagery_tools/Makefile src/modules/imagery/imagery_vigra/Makefile src/modules/io/Makefile src/modules/io/io_esri_e00/Makefile src/modules/io/io_gdal/Makefile src/modules/io/io_gps/Makefile src/modules/io/io_grid/Makefile src/modules/io/io_grid_grib2/Makefile src/modules/io/io_grid_image/Makefile src/modules/io/io_shapes/Makefile src/modules/io/io_shapes_dxf/Makefile src/modules/io/io_shapes_las/Makefile src/modules/io/io_table/Makefile src/modules/io/io_virtual/Makefile src/modules/pointcloud/Makefile src/modules/pointcloud/pointcloud_tools/Makefile src/modules/pointcloud/pointcloud_viewer/Makefile src/modules/projection/Makefile src/modules/projection/pj_georeference/Makefile src/modules/projection/pj_proj4/Makefile src/modules/shapes/Makefile src/modules/shapes/shapes_grid/Makefile src/modules/shapes/shapes_lines/Makefile src/modules/shapes/shapes_points/Makefile src/modules/shapes/shapes_polygons/Makefile src/modules/shapes/shapes_tools/Makefile src/modules/shapes/shapes_transect/Makefile src/modules/simulation/Makefile src/modules/simulation/sim_cellular_automata/Makefile src/modules/simulation/sim_ecosystems_hugget/Makefile src/modules/simulation/sim_erosion/Makefile src/modules/simulation/sim_fire_spreading/Makefile src/modules/simulation/sim_hydrology/Makefile src/modules/simulation/sim_ihacres/Makefile src/modules/statistics/Makefile src/modules/statistics/statistics_grid/Makefile src/modules/statistics/statistics_kriging/Makefile src/modules/statistics/statistics_points/Makefile src/modules/statistics/statistics_regression/Makefile src/modules/table/Makefile src/modules/table/table_calculus/Makefile src/modules/table/table_tools/Makefile src/modules/terrain_analysis/Makefile src/modules/terrain_analysis/ta_channels/Makefile src/modules/terrain_analysis/ta_compound/Makefile src/modules/terrain_analysis/ta_hydrology/Makefile src/modules/terrain_analysis/ta_lighting/Makefile src/modules/terrain_analysis/ta_morphometry/Makefile src/modules/terrain_analysis/ta_preprocessor/Makefile src/modules/terrain_analysis/ta_profiles/Makefile src/modules/terrain_analysis/ta_slope_stability/Makefile src/modules/tin/Makefile src/modules/tin/tin_tools/Makefile src/modules/tin/tin_viewer/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -20419,13 +18038,13 @@ case $ac_val in #( *${as_nl}*) case $ac_var in #( - *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5 + *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; esac case $ac_var in #( _ | IFS | as_nl) ;; #( BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( - *) $as_unset $ac_var ;; + *) { eval $ac_var=; unset $ac_var;} ;; esac ;; esac done @@ -20433,8 +18052,8 @@ (set) 2>&1 | case $as_nl`(ac_space=' '; set) 2>&1` in #( *${as_nl}ac_space=\ *) - # `set' does not quote correctly, so add quotes (double-quote - # substitution turns \\\\ into \\, and sed turns \\ into \). + # `set' does not quote correctly, so add quotes: double-quote + # substitution turns \\\\ into \\, and sed turns \\ into \. sed -n \ "s/'/'\\\\''/g; s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" @@ -20456,12 +18075,23 @@ :end' >>confcache if diff "$cache_file" confcache >/dev/null 2>&1; then :; else if test -w "$cache_file"; then - test "x$cache_file" != "x/dev/null" && - { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5 + if test "x$cache_file" != "x/dev/null"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 $as_echo "$as_me: updating cache $cache_file" >&6;} - cat confcache >$cache_file + if test ! -f "$cache_file" || test -h "$cache_file"; then + cat confcache >"$cache_file" + else + case $cache_file in #( + */* | ?:*) + mv -f confcache "$cache_file"$$ && + mv -f "$cache_file"$$ "$cache_file" ;; #( + *) + mv -f confcache "$cache_file" ;; + esac + fi + fi else - { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} fi fi @@ -20475,28 +18105,29 @@ ac_libobjs= ac_ltlibobjs= +U= for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue # 1. Remove the extension, and $U if already installed. ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' ac_i=`$as_echo "$ac_i" | sed "$ac_script"` # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR # will be set to the directory where LIBOBJS objects are built. - ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext" - ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo' + as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext" + as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo' done LIBOBJS=$ac_libobjs LTLIBOBJS=$ac_ltlibobjs - if test -n "$EXEEXT"; then - am__EXEEXT_TRUE= - am__EXEEXT_FALSE='#' -else - am__EXEEXT_TRUE='#' - am__EXEEXT_FALSE= -fi - +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5 +$as_echo_n "checking that generated files are newer than configure... " >&6; } + if test -n "$am_sleep_pid"; then + # Hide warnings about reused PIDs. + wait $am_sleep_pid 2>/dev/null + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5 +$as_echo "done" >&6; } if test -n "$EXEEXT"; then am__EXEEXT_TRUE= am__EXEEXT_FALSE='#' @@ -20506,133 +18137,71 @@ fi if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"AMDEP\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi -if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "conditional \"AMDEP\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "conditional \"am__fastdepCXX\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi -if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi -if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi -if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "conditional \"am__fastdepCC\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${SAGA_UNICODE_TRUE}" && test -z "${SAGA_UNICODE_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"SAGA_UNICODE\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"SAGA_UNICODE\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "conditional \"SAGA_UNICODE\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${HAVE_POSTGRESQL_TRUE}" && test -z "${HAVE_POSTGRESQL_FALSE}"; then + as_fn_error $? "conditional \"HAVE_POSTGRESQL\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${DEBUG_TRUE}" && test -z "${DEBUG_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"DEBUG\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"DEBUG\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "conditional \"DEBUG\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${WITH_GUI_TRUE}" && test -z "${WITH_GUI_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"WITH_GUI\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"WITH_GUI\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "conditional \"WITH_GUI\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${WITH_ODBC_TRUE}" && test -z "${WITH_ODBC_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"WITH_ODBC\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"WITH_ODBC\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "conditional \"WITH_ODBC\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${OPENMP_TRUE}" && test -z "${OPENMP_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"OPENMP\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"OPENMP\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "conditional \"OPENMP\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${HAVE_CV_TRUE}" && test -z "${HAVE_CV_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_CV\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"HAVE_CV\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "conditional \"HAVE_CV\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${HAVE_LLAS_TRUE}" && test -z "${HAVE_LLAS_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_LLAS\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"HAVE_LLAS\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "conditional \"HAVE_LLAS\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${HAVE_VIGRA_TRUE}" && test -z "${HAVE_VIGRA_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_VIGRA\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"HAVE_VIGRA\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "conditional \"HAVE_VIGRA\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${HAVE_HARU_TRUE}" && test -z "${HAVE_HARU_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_HARU\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"HAVE_HARU\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "conditional \"HAVE_HARU\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${SAGA_PYTHON_TRUE}" && test -z "${SAGA_PYTHON_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"SAGA_PYTHON\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"SAGA_PYTHON\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "conditional \"SAGA_PYTHON\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -: ${CONFIG_STATUS=./config.status} +: "${CONFIG_STATUS=./config.status}" ac_write_fail=0 ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 $as_echo "$as_me: creating $CONFIG_STATUS" >&6;} -cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +as_write_fail=0 +cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1 #! $SHELL # Generated by $as_me. # Run this file to recreate the current configuration. @@ -20642,17 +18211,18 @@ debug=false ac_cs_recheck=false ac_cs_silent=false -SHELL=\${CONFIG_SHELL-$SHELL} -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -## --------------------- ## -## M4sh Initialization. ## -## --------------------- ## +SHELL=\${CONFIG_SHELL-$SHELL} +export SHELL +_ASEOF +cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1 +## -------------------- ## +## M4sh Initialization. ## +## -------------------- ## # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : emulate sh NULLCMD=: # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which @@ -20660,23 +18230,15 @@ alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; + case `(set -o) 2>/dev/null` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; esac - fi - - -# PATH needs CR -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits - as_nl=' ' export as_nl @@ -20684,7 +18246,13 @@ as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo -if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then +# Prefer a ksh shell builtin over an external printf program on Solaris, +# but without wasting forks for bash or zsh. +if test -z "$BASH_VERSION$ZSH_VERSION" \ + && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='print -r --' + as_echo_n='print -rn --' +elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then as_echo='printf %s\n' as_echo_n='printf %s' else @@ -20695,7 +18263,7 @@ as_echo_body='eval expr "X$1" : "X\\(.*\\)"' as_echo_n_body='eval arg=$1; - case $arg in + case $arg in #( *"$as_nl"*) expr "X$arg" : "X\\(.*\\)$as_nl"; arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; @@ -20718,13 +18286,6 @@ } fi -# Support unset when possible. -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then - as_unset=unset -else - as_unset=false -fi - # IFS # We need space, tab and new line, in precisely that order. Quoting is @@ -20734,15 +18295,16 @@ IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. -case $0 in +as_myself= +case $0 in #(( *[\\/]* ) as_myself=$0 ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -done + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break + done IFS=$as_save_IFS ;; @@ -20754,12 +18316,16 @@ fi if test ! -f "$as_myself"; then $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 - { (exit 1); exit 1; } + exit 1 fi -# Work around bugs in pre-3.0 UWIN ksh. -for as_var in ENV MAIL MAILPATH -do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var +# Unset variables that we do not need and which cause bugs (e.g. in +# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" +# suppresses any "Segmentation fault" message there. '((' could +# trigger a bug in pdksh 5.2.14. +for as_var in BASH_ENV ENV MAIL MAILPATH +do eval test x\${$as_var+set} = xset \ + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : done PS1='$ ' PS2='> ' @@ -20771,7 +18337,89 @@ LANGUAGE=C export LANGUAGE -# Required to use basename. +# CDPATH. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + + +# as_fn_error STATUS ERROR [LINENO LOG_FD] +# ---------------------------------------- +# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are +# provided, also output the error to LOG_FD, referencing LINENO. Then exit the +# script with STATUS, using 1 if that was 0. +as_fn_error () +{ + as_status=$1; test $as_status -eq 0 && as_status=1 + if test "$4"; then + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + fi + $as_echo "$as_me: error: $2" >&2 + as_fn_exit $as_status +} # as_fn_error + + +# as_fn_set_status STATUS +# ----------------------- +# Set $? to STATUS, without forking. +as_fn_set_status () +{ + return $1 +} # as_fn_set_status + +# as_fn_exit STATUS +# ----------------- +# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. +as_fn_exit () +{ + set +e + as_fn_set_status $1 + exit $1 +} # as_fn_exit + +# as_fn_unset VAR +# --------------- +# Portably unset VAR. +as_fn_unset () +{ + { eval $1=; unset $1;} +} +as_unset=as_fn_unset +# as_fn_append VAR VALUE +# ---------------------- +# Append the text in VALUE to the end of the definition contained in VAR. Take +# advantage of any shell optimizations that allow amortized linear growth over +# repeated appends, instead of the typical quadratic growth present in naive +# implementations. +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : + eval 'as_fn_append () + { + eval $1+=\$2 + }' +else + as_fn_append () + { + eval $1=\$$1\$2 + } +fi # as_fn_append + +# as_fn_arith ARG... +# ------------------ +# Perform arithmetic evaluation on the ARGs, and store the result in the +# global $as_val. Take advantage of shells that can avoid forks. The arguments +# must be portable across $(()) and expr. +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : + eval 'as_fn_arith () + { + as_val=$(( $* )) + }' +else + as_fn_arith () + { + as_val=`expr "$@" || test $? -eq 1` + } +fi # as_fn_arith + + if expr a : '\(a\)' >/dev/null 2>&1 && test "X`expr 00001 : '.*\(...\)'`" = X001; then as_expr=expr @@ -20785,8 +18433,12 @@ as_basename=false fi +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then + as_dirname=dirname +else + as_dirname=false +fi -# Name of the executable. as_me=`$as_basename -- "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ @@ -20806,133 +18458,118 @@ } s/.*/./; q'` -# CDPATH. -$as_unset CDPATH - - - - as_lineno_1=$LINENO - as_lineno_2=$LINENO - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { - - # Create $as_me.lineno as a copy of $as_myself, but with $LINENO - # uniformly replaced by the line number. The first 'sed' inserts a - # line-number line after each line using $LINENO; the second 'sed' - # does the real work. The second script uses 'N' to pair each - # line-number line with the line containing $LINENO, and appends - # trailing '-' during substitution so that $LINENO is not a special - # case at line end. - # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the - # scripts with optimization help from Paolo Bonzini. Blame Lee - # E. McMahon (1931-1989) for sed's syntax. :-) - sed -n ' - p - /[$]LINENO/= - ' <$as_myself | - sed ' - s/[$]LINENO.*/&-/ - t lineno - b - :lineno - N - :loop - s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ - t loop - s/-\n.*// - ' >$as_me.lineno && - chmod +x "$as_me.lineno" || - { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 - { (exit 1); exit 1; }; } - - # Don't try to exec as it changes $[0], causing all sort of problems - # (the dirname of $[0] is not the place where we might find the - # original and so on. Autoconf is especially sensitive to this). - . "./$as_me.lineno" - # Exit status is that of the last command. - exit -} - - -if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then - as_dirname=dirname -else - as_dirname=false -fi +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits ECHO_C= ECHO_N= ECHO_T= -case `echo -n x` in +case `echo -n x` in #((((( -n*) - case `echo 'x\c'` in + case `echo 'xy\c'` in *c*) ECHO_T=' ';; # ECHO_T is single tab character. - *) ECHO_C='\c';; + xy) ECHO_C='\c';; + *) echo `echo ksh88 bug on AIX 6.1` > /dev/null + ECHO_T=' ';; esac;; *) ECHO_N='-n';; esac -if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr + +rm -f conf$$ conf$$.exe conf$$.file +if test -d conf$$.dir; then + rm -f conf$$.dir/conf$$.file else - as_expr=false + rm -f conf$$.dir + mkdir conf$$.dir 2>/dev/null +fi +if (echo >conf$$.file) 2>/dev/null; then + if ln -s conf$$.file conf$$ 2>/dev/null; then + as_ln_s='ln -s' + # ... but there are two gotchas: + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. + # In both cases, we have to default to `cp -pR'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || + as_ln_s='cp -pR' + elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln + else + as_ln_s='cp -pR' + fi +else + as_ln_s='cp -pR' fi +rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file +rmdir conf$$.dir 2>/dev/null + + +# as_fn_mkdir_p +# ------------- +# Create "$as_dir" as a directory, including parents if necessary. +as_fn_mkdir_p () +{ + + case $as_dir in #( + -*) as_dir=./$as_dir;; + esac + test -d "$as_dir" || eval $as_mkdir_p || { + as_dirs= + while :; do + case $as_dir in #( + *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *) as_qdir=$as_dir;; + esac + as_dirs="'$as_qdir' $as_dirs" + as_dir=`$as_dirname -- "$as_dir" || +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$as_dir" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + test -d "$as_dir" && break + done + test -z "$as_dirs" || eval "mkdir $as_dirs" + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" -rm -f conf$$ conf$$.exe conf$$.file -if test -d conf$$.dir; then - rm -f conf$$.dir/conf$$.file -else - rm -f conf$$.dir - mkdir conf$$.dir 2>/dev/null -fi -if (echo >conf$$.file) 2>/dev/null; then - if ln -s conf$$.file conf$$ 2>/dev/null; then - as_ln_s='ln -s' - # ... but there are two gotchas: - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. - ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' - elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln - else - as_ln_s='cp -p' - fi -else - as_ln_s='cp -p' -fi -rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file -rmdir conf$$.dir 2>/dev/null +} # as_fn_mkdir_p if mkdir -p . 2>/dev/null; then - as_mkdir_p=: + as_mkdir_p='mkdir -p "$as_dir"' else test -d ./-p && rmdir ./-p as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -20942,13 +18579,19 @@ exec 6>&1 +## ----------------------------------- ## +## Main body of $CONFIG_STATUS script. ## +## ----------------------------------- ## +_ASEOF +test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1 -# Save the log message, to keep $[0] and so on meaningful, and to +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +# Save the log message, to keep $0 and so on meaningful, and to # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by saga $as_me 2.1.0, which was -generated by GNU Autoconf 2.63. Invocation command line was +This file was extended by saga $as_me 2.1.4, which was +generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -20980,13 +18623,15 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ac_cs_usage="\ -\`$as_me' instantiates files from templates according to the -current configuration. +\`$as_me' instantiates files and other configuration actions +from templates according to the current configuration. Unless the files +and actions are specified as TAGs, all are instantiated by default. -Usage: $0 [OPTION]... [FILE]... +Usage: $0 [OPTION]... [TAG]... -h, --help print this help, then exit -V, --version print version number and configuration settings, then exit + --config print configuration, then exit -q, --quiet, --silent do not print progress messages -d, --debug don't remove temporary files @@ -21005,16 +18650,17 @@ Configuration commands: $config_commands -Report bugs to ." +Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -saga config.status 2.1.0 -configured by $0, generated by GNU Autoconf 2.63, - with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" +saga config.status 2.1.4 +configured by $0, generated by GNU Autoconf 2.69, + with options \\"\$ac_cs_config\\" -Copyright (C) 2008 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -21032,11 +18678,16 @@ while test $# != 0 do case $1 in - --*=*) + --*=?*) ac_option=`expr "X$1" : 'X\([^=]*\)='` ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` ac_shift=: ;; + --*=) + ac_option=`expr "X$1" : 'X\([^=]*\)='` + ac_optarg= + ac_shift=: + ;; *) ac_option=$1 ac_optarg=$2 @@ -21050,27 +18701,29 @@ ac_cs_recheck=: ;; --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) $as_echo "$ac_cs_version"; exit ;; + --config | --confi | --conf | --con | --co | --c ) + $as_echo "$ac_cs_config"; exit ;; --debug | --debu | --deb | --de | --d | -d ) debug=: ;; --file | --fil | --fi | --f ) $ac_shift case $ac_optarg in *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + '') as_fn_error $? "missing file argument" ;; esac - CONFIG_FILES="$CONFIG_FILES '$ac_optarg'" + as_fn_append CONFIG_FILES " '$ac_optarg'" ac_need_defaults=false;; --header | --heade | --head | --hea ) $ac_shift case $ac_optarg in *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; esac - CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'" + as_fn_append CONFIG_HEADERS " '$ac_optarg'" ac_need_defaults=false;; --he | --h) # Conflict between --help and --header - { $as_echo "$as_me: error: ambiguous option: $1 -Try \`$0 --help' for more information." >&2 - { (exit 1); exit 1; }; };; + as_fn_error $? "ambiguous option: \`$1' +Try \`$0 --help' for more information.";; --help | --hel | -h ) $as_echo "$ac_cs_usage"; exit ;; -q | -quiet | --quiet | --quie | --qui | --qu | --q \ @@ -21078,11 +18731,10 @@ ac_cs_silent=: ;; # This is an error. - -*) { $as_echo "$as_me: error: unrecognized option: $1 -Try \`$0 --help' for more information." >&2 - { (exit 1); exit 1; }; } ;; + -*) as_fn_error $? "unrecognized option: \`$1' +Try \`$0 --help' for more information." ;; - *) ac_config_targets="$ac_config_targets $1" + *) as_fn_append ac_config_targets " $1" ac_need_defaults=false ;; esac @@ -21099,7 +18751,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 if \$ac_cs_recheck; then - set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion shift \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 CONFIG_SHELL='$SHELL' @@ -21133,184 +18785,208 @@ sed_quote_subst='$sed_quote_subst' double_quote_subst='$double_quote_subst' delay_variable_subst='$delay_variable_subst' -macro_version='`$ECHO "X$macro_version" | $Xsed -e "$delay_single_quote_subst"`' -macro_revision='`$ECHO "X$macro_revision" | $Xsed -e "$delay_single_quote_subst"`' -enable_shared='`$ECHO "X$enable_shared" | $Xsed -e "$delay_single_quote_subst"`' -enable_static='`$ECHO "X$enable_static" | $Xsed -e "$delay_single_quote_subst"`' -pic_mode='`$ECHO "X$pic_mode" | $Xsed -e "$delay_single_quote_subst"`' -enable_fast_install='`$ECHO "X$enable_fast_install" | $Xsed -e "$delay_single_quote_subst"`' -host_alias='`$ECHO "X$host_alias" | $Xsed -e "$delay_single_quote_subst"`' -host='`$ECHO "X$host" | $Xsed -e "$delay_single_quote_subst"`' -host_os='`$ECHO "X$host_os" | $Xsed -e "$delay_single_quote_subst"`' -build_alias='`$ECHO "X$build_alias" | $Xsed -e "$delay_single_quote_subst"`' -build='`$ECHO "X$build" | $Xsed -e "$delay_single_quote_subst"`' -build_os='`$ECHO "X$build_os" | $Xsed -e "$delay_single_quote_subst"`' -SED='`$ECHO "X$SED" | $Xsed -e "$delay_single_quote_subst"`' -Xsed='`$ECHO "X$Xsed" | $Xsed -e "$delay_single_quote_subst"`' -GREP='`$ECHO "X$GREP" | $Xsed -e "$delay_single_quote_subst"`' -EGREP='`$ECHO "X$EGREP" | $Xsed -e "$delay_single_quote_subst"`' -FGREP='`$ECHO "X$FGREP" | $Xsed -e "$delay_single_quote_subst"`' -LD='`$ECHO "X$LD" | $Xsed -e "$delay_single_quote_subst"`' -NM='`$ECHO "X$NM" | $Xsed -e "$delay_single_quote_subst"`' -LN_S='`$ECHO "X$LN_S" | $Xsed -e "$delay_single_quote_subst"`' -max_cmd_len='`$ECHO "X$max_cmd_len" | $Xsed -e "$delay_single_quote_subst"`' -ac_objext='`$ECHO "X$ac_objext" | $Xsed -e "$delay_single_quote_subst"`' -exeext='`$ECHO "X$exeext" | $Xsed -e "$delay_single_quote_subst"`' -lt_unset='`$ECHO "X$lt_unset" | $Xsed -e "$delay_single_quote_subst"`' -lt_SP2NL='`$ECHO "X$lt_SP2NL" | $Xsed -e "$delay_single_quote_subst"`' -lt_NL2SP='`$ECHO "X$lt_NL2SP" | $Xsed -e "$delay_single_quote_subst"`' -reload_flag='`$ECHO "X$reload_flag" | $Xsed -e "$delay_single_quote_subst"`' -reload_cmds='`$ECHO "X$reload_cmds" | $Xsed -e "$delay_single_quote_subst"`' -OBJDUMP='`$ECHO "X$OBJDUMP" | $Xsed -e "$delay_single_quote_subst"`' -deplibs_check_method='`$ECHO "X$deplibs_check_method" | $Xsed -e "$delay_single_quote_subst"`' -file_magic_cmd='`$ECHO "X$file_magic_cmd" | $Xsed -e "$delay_single_quote_subst"`' -AR='`$ECHO "X$AR" | $Xsed -e "$delay_single_quote_subst"`' -AR_FLAGS='`$ECHO "X$AR_FLAGS" | $Xsed -e "$delay_single_quote_subst"`' -STRIP='`$ECHO "X$STRIP" | $Xsed -e "$delay_single_quote_subst"`' -RANLIB='`$ECHO "X$RANLIB" | $Xsed -e "$delay_single_quote_subst"`' -old_postinstall_cmds='`$ECHO "X$old_postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`' -old_postuninstall_cmds='`$ECHO "X$old_postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`' -old_archive_cmds='`$ECHO "X$old_archive_cmds" | $Xsed -e "$delay_single_quote_subst"`' -CC='`$ECHO "X$CC" | $Xsed -e "$delay_single_quote_subst"`' -CFLAGS='`$ECHO "X$CFLAGS" | $Xsed -e "$delay_single_quote_subst"`' -compiler='`$ECHO "X$compiler" | $Xsed -e "$delay_single_quote_subst"`' -GCC='`$ECHO "X$GCC" | $Xsed -e "$delay_single_quote_subst"`' -lt_cv_sys_global_symbol_pipe='`$ECHO "X$lt_cv_sys_global_symbol_pipe" | $Xsed -e "$delay_single_quote_subst"`' -lt_cv_sys_global_symbol_to_cdecl='`$ECHO "X$lt_cv_sys_global_symbol_to_cdecl" | $Xsed -e "$delay_single_quote_subst"`' -lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address" | $Xsed -e "$delay_single_quote_subst"`' -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`' -objdir='`$ECHO "X$objdir" | $Xsed -e "$delay_single_quote_subst"`' -SHELL='`$ECHO "X$SHELL" | $Xsed -e "$delay_single_quote_subst"`' -ECHO='`$ECHO "X$ECHO" | $Xsed -e "$delay_single_quote_subst"`' -MAGIC_CMD='`$ECHO "X$MAGIC_CMD" | $Xsed -e "$delay_single_quote_subst"`' -lt_prog_compiler_no_builtin_flag='`$ECHO "X$lt_prog_compiler_no_builtin_flag" | $Xsed -e "$delay_single_quote_subst"`' -lt_prog_compiler_wl='`$ECHO "X$lt_prog_compiler_wl" | $Xsed -e "$delay_single_quote_subst"`' -lt_prog_compiler_pic='`$ECHO "X$lt_prog_compiler_pic" | $Xsed -e "$delay_single_quote_subst"`' -lt_prog_compiler_static='`$ECHO "X$lt_prog_compiler_static" | $Xsed -e "$delay_single_quote_subst"`' -lt_cv_prog_compiler_c_o='`$ECHO "X$lt_cv_prog_compiler_c_o" | $Xsed -e "$delay_single_quote_subst"`' -need_locks='`$ECHO "X$need_locks" | $Xsed -e "$delay_single_quote_subst"`' -DSYMUTIL='`$ECHO "X$DSYMUTIL" | $Xsed -e "$delay_single_quote_subst"`' -NMEDIT='`$ECHO "X$NMEDIT" | $Xsed -e "$delay_single_quote_subst"`' -LIPO='`$ECHO "X$LIPO" | $Xsed -e "$delay_single_quote_subst"`' -OTOOL='`$ECHO "X$OTOOL" | $Xsed -e "$delay_single_quote_subst"`' -OTOOL64='`$ECHO "X$OTOOL64" | $Xsed -e "$delay_single_quote_subst"`' -libext='`$ECHO "X$libext" | $Xsed -e "$delay_single_quote_subst"`' -shrext_cmds='`$ECHO "X$shrext_cmds" | $Xsed -e "$delay_single_quote_subst"`' -extract_expsyms_cmds='`$ECHO "X$extract_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`' -archive_cmds_need_lc='`$ECHO "X$archive_cmds_need_lc" | $Xsed -e "$delay_single_quote_subst"`' -enable_shared_with_static_runtimes='`$ECHO "X$enable_shared_with_static_runtimes" | $Xsed -e "$delay_single_quote_subst"`' -export_dynamic_flag_spec='`$ECHO "X$export_dynamic_flag_spec" | $Xsed -e "$delay_single_quote_subst"`' -whole_archive_flag_spec='`$ECHO "X$whole_archive_flag_spec" | $Xsed -e "$delay_single_quote_subst"`' -compiler_needs_object='`$ECHO "X$compiler_needs_object" | $Xsed -e "$delay_single_quote_subst"`' -old_archive_from_new_cmds='`$ECHO "X$old_archive_from_new_cmds" | $Xsed -e "$delay_single_quote_subst"`' -old_archive_from_expsyms_cmds='`$ECHO "X$old_archive_from_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`' -archive_cmds='`$ECHO "X$archive_cmds" | $Xsed -e "$delay_single_quote_subst"`' -archive_expsym_cmds='`$ECHO "X$archive_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`' -module_cmds='`$ECHO "X$module_cmds" | $Xsed -e "$delay_single_quote_subst"`' -module_expsym_cmds='`$ECHO "X$module_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`' -with_gnu_ld='`$ECHO "X$with_gnu_ld" | $Xsed -e "$delay_single_quote_subst"`' -allow_undefined_flag='`$ECHO "X$allow_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`' -no_undefined_flag='`$ECHO "X$no_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_libdir_flag_spec='`$ECHO "X$hardcode_libdir_flag_spec" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_libdir_flag_spec_ld='`$ECHO "X$hardcode_libdir_flag_spec_ld" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_libdir_separator='`$ECHO "X$hardcode_libdir_separator" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_direct='`$ECHO "X$hardcode_direct" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_direct_absolute='`$ECHO "X$hardcode_direct_absolute" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_minus_L='`$ECHO "X$hardcode_minus_L" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_shlibpath_var='`$ECHO "X$hardcode_shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_automatic='`$ECHO "X$hardcode_automatic" | $Xsed -e "$delay_single_quote_subst"`' -inherit_rpath='`$ECHO "X$inherit_rpath" | $Xsed -e "$delay_single_quote_subst"`' -link_all_deplibs='`$ECHO "X$link_all_deplibs" | $Xsed -e "$delay_single_quote_subst"`' -fix_srcfile_path='`$ECHO "X$fix_srcfile_path" | $Xsed -e "$delay_single_quote_subst"`' -always_export_symbols='`$ECHO "X$always_export_symbols" | $Xsed -e "$delay_single_quote_subst"`' -export_symbols_cmds='`$ECHO "X$export_symbols_cmds" | $Xsed -e "$delay_single_quote_subst"`' -exclude_expsyms='`$ECHO "X$exclude_expsyms" | $Xsed -e "$delay_single_quote_subst"`' -include_expsyms='`$ECHO "X$include_expsyms" | $Xsed -e "$delay_single_quote_subst"`' -prelink_cmds='`$ECHO "X$prelink_cmds" | $Xsed -e "$delay_single_quote_subst"`' -file_list_spec='`$ECHO "X$file_list_spec" | $Xsed -e "$delay_single_quote_subst"`' -variables_saved_for_relink='`$ECHO "X$variables_saved_for_relink" | $Xsed -e "$delay_single_quote_subst"`' -need_lib_prefix='`$ECHO "X$need_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`' -need_version='`$ECHO "X$need_version" | $Xsed -e "$delay_single_quote_subst"`' -version_type='`$ECHO "X$version_type" | $Xsed -e "$delay_single_quote_subst"`' -runpath_var='`$ECHO "X$runpath_var" | $Xsed -e "$delay_single_quote_subst"`' -shlibpath_var='`$ECHO "X$shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`' -shlibpath_overrides_runpath='`$ECHO "X$shlibpath_overrides_runpath" | $Xsed -e "$delay_single_quote_subst"`' -libname_spec='`$ECHO "X$libname_spec" | $Xsed -e "$delay_single_quote_subst"`' -library_names_spec='`$ECHO "X$library_names_spec" | $Xsed -e "$delay_single_quote_subst"`' -soname_spec='`$ECHO "X$soname_spec" | $Xsed -e "$delay_single_quote_subst"`' -postinstall_cmds='`$ECHO "X$postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`' -postuninstall_cmds='`$ECHO "X$postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`' -finish_cmds='`$ECHO "X$finish_cmds" | $Xsed -e "$delay_single_quote_subst"`' -finish_eval='`$ECHO "X$finish_eval" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_into_libs='`$ECHO "X$hardcode_into_libs" | $Xsed -e "$delay_single_quote_subst"`' -sys_lib_search_path_spec='`$ECHO "X$sys_lib_search_path_spec" | $Xsed -e "$delay_single_quote_subst"`' -sys_lib_dlsearch_path_spec='`$ECHO "X$sys_lib_dlsearch_path_spec" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_action='`$ECHO "X$hardcode_action" | $Xsed -e "$delay_single_quote_subst"`' -enable_dlopen='`$ECHO "X$enable_dlopen" | $Xsed -e "$delay_single_quote_subst"`' -enable_dlopen_self='`$ECHO "X$enable_dlopen_self" | $Xsed -e "$delay_single_quote_subst"`' -enable_dlopen_self_static='`$ECHO "X$enable_dlopen_self_static" | $Xsed -e "$delay_single_quote_subst"`' -old_striplib='`$ECHO "X$old_striplib" | $Xsed -e "$delay_single_quote_subst"`' -striplib='`$ECHO "X$striplib" | $Xsed -e "$delay_single_quote_subst"`' -compiler_lib_search_dirs='`$ECHO "X$compiler_lib_search_dirs" | $Xsed -e "$delay_single_quote_subst"`' -predep_objects='`$ECHO "X$predep_objects" | $Xsed -e "$delay_single_quote_subst"`' -postdep_objects='`$ECHO "X$postdep_objects" | $Xsed -e "$delay_single_quote_subst"`' -predeps='`$ECHO "X$predeps" | $Xsed -e "$delay_single_quote_subst"`' -postdeps='`$ECHO "X$postdeps" | $Xsed -e "$delay_single_quote_subst"`' -compiler_lib_search_path='`$ECHO "X$compiler_lib_search_path" | $Xsed -e "$delay_single_quote_subst"`' -LD_CXX='`$ECHO "X$LD_CXX" | $Xsed -e "$delay_single_quote_subst"`' -old_archive_cmds_CXX='`$ECHO "X$old_archive_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' -compiler_CXX='`$ECHO "X$compiler_CXX" | $Xsed -e "$delay_single_quote_subst"`' -GCC_CXX='`$ECHO "X$GCC_CXX" | $Xsed -e "$delay_single_quote_subst"`' -lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "X$lt_prog_compiler_no_builtin_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`' -lt_prog_compiler_wl_CXX='`$ECHO "X$lt_prog_compiler_wl_CXX" | $Xsed -e "$delay_single_quote_subst"`' -lt_prog_compiler_pic_CXX='`$ECHO "X$lt_prog_compiler_pic_CXX" | $Xsed -e "$delay_single_quote_subst"`' -lt_prog_compiler_static_CXX='`$ECHO "X$lt_prog_compiler_static_CXX" | $Xsed -e "$delay_single_quote_subst"`' -lt_cv_prog_compiler_c_o_CXX='`$ECHO "X$lt_cv_prog_compiler_c_o_CXX" | $Xsed -e "$delay_single_quote_subst"`' -archive_cmds_need_lc_CXX='`$ECHO "X$archive_cmds_need_lc_CXX" | $Xsed -e "$delay_single_quote_subst"`' -enable_shared_with_static_runtimes_CXX='`$ECHO "X$enable_shared_with_static_runtimes_CXX" | $Xsed -e "$delay_single_quote_subst"`' -export_dynamic_flag_spec_CXX='`$ECHO "X$export_dynamic_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`' -whole_archive_flag_spec_CXX='`$ECHO "X$whole_archive_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`' -compiler_needs_object_CXX='`$ECHO "X$compiler_needs_object_CXX" | $Xsed -e "$delay_single_quote_subst"`' -old_archive_from_new_cmds_CXX='`$ECHO "X$old_archive_from_new_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' -old_archive_from_expsyms_cmds_CXX='`$ECHO "X$old_archive_from_expsyms_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' -archive_cmds_CXX='`$ECHO "X$archive_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' -archive_expsym_cmds_CXX='`$ECHO "X$archive_expsym_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' -module_cmds_CXX='`$ECHO "X$module_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' -module_expsym_cmds_CXX='`$ECHO "X$module_expsym_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' -with_gnu_ld_CXX='`$ECHO "X$with_gnu_ld_CXX" | $Xsed -e "$delay_single_quote_subst"`' -allow_undefined_flag_CXX='`$ECHO "X$allow_undefined_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`' -no_undefined_flag_CXX='`$ECHO "X$no_undefined_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_libdir_flag_spec_CXX='`$ECHO "X$hardcode_libdir_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_libdir_flag_spec_ld_CXX='`$ECHO "X$hardcode_libdir_flag_spec_ld_CXX" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_libdir_separator_CXX='`$ECHO "X$hardcode_libdir_separator_CXX" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_direct_CXX='`$ECHO "X$hardcode_direct_CXX" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_direct_absolute_CXX='`$ECHO "X$hardcode_direct_absolute_CXX" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_minus_L_CXX='`$ECHO "X$hardcode_minus_L_CXX" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_shlibpath_var_CXX='`$ECHO "X$hardcode_shlibpath_var_CXX" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_automatic_CXX='`$ECHO "X$hardcode_automatic_CXX" | $Xsed -e "$delay_single_quote_subst"`' -inherit_rpath_CXX='`$ECHO "X$inherit_rpath_CXX" | $Xsed -e "$delay_single_quote_subst"`' -link_all_deplibs_CXX='`$ECHO "X$link_all_deplibs_CXX" | $Xsed -e "$delay_single_quote_subst"`' -fix_srcfile_path_CXX='`$ECHO "X$fix_srcfile_path_CXX" | $Xsed -e "$delay_single_quote_subst"`' -always_export_symbols_CXX='`$ECHO "X$always_export_symbols_CXX" | $Xsed -e "$delay_single_quote_subst"`' -export_symbols_cmds_CXX='`$ECHO "X$export_symbols_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' -exclude_expsyms_CXX='`$ECHO "X$exclude_expsyms_CXX" | $Xsed -e "$delay_single_quote_subst"`' -include_expsyms_CXX='`$ECHO "X$include_expsyms_CXX" | $Xsed -e "$delay_single_quote_subst"`' -prelink_cmds_CXX='`$ECHO "X$prelink_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' -file_list_spec_CXX='`$ECHO "X$file_list_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_action_CXX='`$ECHO "X$hardcode_action_CXX" | $Xsed -e "$delay_single_quote_subst"`' -compiler_lib_search_dirs_CXX='`$ECHO "X$compiler_lib_search_dirs_CXX" | $Xsed -e "$delay_single_quote_subst"`' -predep_objects_CXX='`$ECHO "X$predep_objects_CXX" | $Xsed -e "$delay_single_quote_subst"`' -postdep_objects_CXX='`$ECHO "X$postdep_objects_CXX" | $Xsed -e "$delay_single_quote_subst"`' -predeps_CXX='`$ECHO "X$predeps_CXX" | $Xsed -e "$delay_single_quote_subst"`' -postdeps_CXX='`$ECHO "X$postdeps_CXX" | $Xsed -e "$delay_single_quote_subst"`' -compiler_lib_search_path_CXX='`$ECHO "X$compiler_lib_search_path_CXX" | $Xsed -e "$delay_single_quote_subst"`' +macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`' +macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`' +enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`' +enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`' +pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`' +enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`' +SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`' +ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`' +PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`' +host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`' +host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`' +host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`' +build_alias='`$ECHO "$build_alias" | $SED "$delay_single_quote_subst"`' +build='`$ECHO "$build" | $SED "$delay_single_quote_subst"`' +build_os='`$ECHO "$build_os" | $SED "$delay_single_quote_subst"`' +SED='`$ECHO "$SED" | $SED "$delay_single_quote_subst"`' +Xsed='`$ECHO "$Xsed" | $SED "$delay_single_quote_subst"`' +GREP='`$ECHO "$GREP" | $SED "$delay_single_quote_subst"`' +EGREP='`$ECHO "$EGREP" | $SED "$delay_single_quote_subst"`' +FGREP='`$ECHO "$FGREP" | $SED "$delay_single_quote_subst"`' +LD='`$ECHO "$LD" | $SED "$delay_single_quote_subst"`' +NM='`$ECHO "$NM" | $SED "$delay_single_quote_subst"`' +LN_S='`$ECHO "$LN_S" | $SED "$delay_single_quote_subst"`' +max_cmd_len='`$ECHO "$max_cmd_len" | $SED "$delay_single_quote_subst"`' +ac_objext='`$ECHO "$ac_objext" | $SED "$delay_single_quote_subst"`' +exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' +lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' +lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' +lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' +lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' +lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' +reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' +reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' +OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' +deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' +file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' +file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' +want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' +DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' +sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' +AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' +AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' +archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' +STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' +RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' +old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' +old_postuninstall_cmds='`$ECHO "$old_postuninstall_cmds" | $SED "$delay_single_quote_subst"`' +old_archive_cmds='`$ECHO "$old_archive_cmds" | $SED "$delay_single_quote_subst"`' +lock_old_archive_extraction='`$ECHO "$lock_old_archive_extraction" | $SED "$delay_single_quote_subst"`' +CC='`$ECHO "$CC" | $SED "$delay_single_quote_subst"`' +CFLAGS='`$ECHO "$CFLAGS" | $SED "$delay_single_quote_subst"`' +compiler='`$ECHO "$compiler" | $SED "$delay_single_quote_subst"`' +GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`' +lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`' +lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' +lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' +nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' +lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' +objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' +MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' +lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' +lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' +lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' +lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' +lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' +need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' +MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' +DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' +NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' +LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' +OTOOL='`$ECHO "$OTOOL" | $SED "$delay_single_quote_subst"`' +OTOOL64='`$ECHO "$OTOOL64" | $SED "$delay_single_quote_subst"`' +libext='`$ECHO "$libext" | $SED "$delay_single_quote_subst"`' +shrext_cmds='`$ECHO "$shrext_cmds" | $SED "$delay_single_quote_subst"`' +extract_expsyms_cmds='`$ECHO "$extract_expsyms_cmds" | $SED "$delay_single_quote_subst"`' +archive_cmds_need_lc='`$ECHO "$archive_cmds_need_lc" | $SED "$delay_single_quote_subst"`' +enable_shared_with_static_runtimes='`$ECHO "$enable_shared_with_static_runtimes" | $SED "$delay_single_quote_subst"`' +export_dynamic_flag_spec='`$ECHO "$export_dynamic_flag_spec" | $SED "$delay_single_quote_subst"`' +whole_archive_flag_spec='`$ECHO "$whole_archive_flag_spec" | $SED "$delay_single_quote_subst"`' +compiler_needs_object='`$ECHO "$compiler_needs_object" | $SED "$delay_single_quote_subst"`' +old_archive_from_new_cmds='`$ECHO "$old_archive_from_new_cmds" | $SED "$delay_single_quote_subst"`' +old_archive_from_expsyms_cmds='`$ECHO "$old_archive_from_expsyms_cmds" | $SED "$delay_single_quote_subst"`' +archive_cmds='`$ECHO "$archive_cmds" | $SED "$delay_single_quote_subst"`' +archive_expsym_cmds='`$ECHO "$archive_expsym_cmds" | $SED "$delay_single_quote_subst"`' +module_cmds='`$ECHO "$module_cmds" | $SED "$delay_single_quote_subst"`' +module_expsym_cmds='`$ECHO "$module_expsym_cmds" | $SED "$delay_single_quote_subst"`' +with_gnu_ld='`$ECHO "$with_gnu_ld" | $SED "$delay_single_quote_subst"`' +allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`' +no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`' +hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`' +hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`' +hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`' +hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`' +hardcode_minus_L='`$ECHO "$hardcode_minus_L" | $SED "$delay_single_quote_subst"`' +hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_quote_subst"`' +hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' +inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' +link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' +always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' +export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' +exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' +include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' +prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' +postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' +file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' +variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' +need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' +need_version='`$ECHO "$need_version" | $SED "$delay_single_quote_subst"`' +version_type='`$ECHO "$version_type" | $SED "$delay_single_quote_subst"`' +runpath_var='`$ECHO "$runpath_var" | $SED "$delay_single_quote_subst"`' +shlibpath_var='`$ECHO "$shlibpath_var" | $SED "$delay_single_quote_subst"`' +shlibpath_overrides_runpath='`$ECHO "$shlibpath_overrides_runpath" | $SED "$delay_single_quote_subst"`' +libname_spec='`$ECHO "$libname_spec" | $SED "$delay_single_quote_subst"`' +library_names_spec='`$ECHO "$library_names_spec" | $SED "$delay_single_quote_subst"`' +soname_spec='`$ECHO "$soname_spec" | $SED "$delay_single_quote_subst"`' +install_override_mode='`$ECHO "$install_override_mode" | $SED "$delay_single_quote_subst"`' +postinstall_cmds='`$ECHO "$postinstall_cmds" | $SED "$delay_single_quote_subst"`' +postuninstall_cmds='`$ECHO "$postuninstall_cmds" | $SED "$delay_single_quote_subst"`' +finish_cmds='`$ECHO "$finish_cmds" | $SED "$delay_single_quote_subst"`' +finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`' +hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`' +sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`' +sys_lib_dlsearch_path_spec='`$ECHO "$sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`' +hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`' +enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`' +enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`' +enable_dlopen_self_static='`$ECHO "$enable_dlopen_self_static" | $SED "$delay_single_quote_subst"`' +old_striplib='`$ECHO "$old_striplib" | $SED "$delay_single_quote_subst"`' +striplib='`$ECHO "$striplib" | $SED "$delay_single_quote_subst"`' +compiler_lib_search_dirs='`$ECHO "$compiler_lib_search_dirs" | $SED "$delay_single_quote_subst"`' +predep_objects='`$ECHO "$predep_objects" | $SED "$delay_single_quote_subst"`' +postdep_objects='`$ECHO "$postdep_objects" | $SED "$delay_single_quote_subst"`' +predeps='`$ECHO "$predeps" | $SED "$delay_single_quote_subst"`' +postdeps='`$ECHO "$postdeps" | $SED "$delay_single_quote_subst"`' +compiler_lib_search_path='`$ECHO "$compiler_lib_search_path" | $SED "$delay_single_quote_subst"`' +LD_CXX='`$ECHO "$LD_CXX" | $SED "$delay_single_quote_subst"`' +reload_flag_CXX='`$ECHO "$reload_flag_CXX" | $SED "$delay_single_quote_subst"`' +reload_cmds_CXX='`$ECHO "$reload_cmds_CXX" | $SED "$delay_single_quote_subst"`' +old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote_subst"`' +compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`' +GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`' +lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`' +lt_prog_compiler_pic_CXX='`$ECHO "$lt_prog_compiler_pic_CXX" | $SED "$delay_single_quote_subst"`' +lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`' +lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`' +lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`' +archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`' +enable_shared_with_static_runtimes_CXX='`$ECHO "$enable_shared_with_static_runtimes_CXX" | $SED "$delay_single_quote_subst"`' +export_dynamic_flag_spec_CXX='`$ECHO "$export_dynamic_flag_spec_CXX" | $SED "$delay_single_quote_subst"`' +whole_archive_flag_spec_CXX='`$ECHO "$whole_archive_flag_spec_CXX" | $SED "$delay_single_quote_subst"`' +compiler_needs_object_CXX='`$ECHO "$compiler_needs_object_CXX" | $SED "$delay_single_quote_subst"`' +old_archive_from_new_cmds_CXX='`$ECHO "$old_archive_from_new_cmds_CXX" | $SED "$delay_single_quote_subst"`' +old_archive_from_expsyms_cmds_CXX='`$ECHO "$old_archive_from_expsyms_cmds_CXX" | $SED "$delay_single_quote_subst"`' +archive_cmds_CXX='`$ECHO "$archive_cmds_CXX" | $SED "$delay_single_quote_subst"`' +archive_expsym_cmds_CXX='`$ECHO "$archive_expsym_cmds_CXX" | $SED "$delay_single_quote_subst"`' +module_cmds_CXX='`$ECHO "$module_cmds_CXX" | $SED "$delay_single_quote_subst"`' +module_expsym_cmds_CXX='`$ECHO "$module_expsym_cmds_CXX" | $SED "$delay_single_quote_subst"`' +with_gnu_ld_CXX='`$ECHO "$with_gnu_ld_CXX" | $SED "$delay_single_quote_subst"`' +allow_undefined_flag_CXX='`$ECHO "$allow_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`' +no_undefined_flag_CXX='`$ECHO "$no_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`' +hardcode_libdir_flag_spec_CXX='`$ECHO "$hardcode_libdir_flag_spec_CXX" | $SED "$delay_single_quote_subst"`' +hardcode_libdir_separator_CXX='`$ECHO "$hardcode_libdir_separator_CXX" | $SED "$delay_single_quote_subst"`' +hardcode_direct_CXX='`$ECHO "$hardcode_direct_CXX" | $SED "$delay_single_quote_subst"`' +hardcode_direct_absolute_CXX='`$ECHO "$hardcode_direct_absolute_CXX" | $SED "$delay_single_quote_subst"`' +hardcode_minus_L_CXX='`$ECHO "$hardcode_minus_L_CXX" | $SED "$delay_single_quote_subst"`' +hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_single_quote_subst"`' +hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`' +inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`' +link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`' +always_export_symbols_CXX='`$ECHO "$always_export_symbols_CXX" | $SED "$delay_single_quote_subst"`' +export_symbols_cmds_CXX='`$ECHO "$export_symbols_cmds_CXX" | $SED "$delay_single_quote_subst"`' +exclude_expsyms_CXX='`$ECHO "$exclude_expsyms_CXX" | $SED "$delay_single_quote_subst"`' +include_expsyms_CXX='`$ECHO "$include_expsyms_CXX" | $SED "$delay_single_quote_subst"`' +prelink_cmds_CXX='`$ECHO "$prelink_cmds_CXX" | $SED "$delay_single_quote_subst"`' +postlink_cmds_CXX='`$ECHO "$postlink_cmds_CXX" | $SED "$delay_single_quote_subst"`' +file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`' +hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`' +compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`' +predep_objects_CXX='`$ECHO "$predep_objects_CXX" | $SED "$delay_single_quote_subst"`' +postdep_objects_CXX='`$ECHO "$postdep_objects_CXX" | $SED "$delay_single_quote_subst"`' +predeps_CXX='`$ECHO "$predeps_CXX" | $SED "$delay_single_quote_subst"`' +postdeps_CXX='`$ECHO "$postdeps_CXX" | $SED "$delay_single_quote_subst"`' +compiler_lib_search_path_CXX='`$ECHO "$compiler_lib_search_path_CXX" | $SED "$delay_single_quote_subst"`' LTCC='$LTCC' LTCFLAGS='$LTCFLAGS' compiler='$compiler_DEFAULT' +# A function that is used when there is no print builtin or printf. +func_fallback_echo () +{ + eval 'cat <<_LTECHO_EOF +\$1 +_LTECHO_EOF' +} + # Quote evaled strings. -for var in SED \ +for var in SHELL \ +ECHO \ +PATH_SEPARATOR \ +SED \ GREP \ EGREP \ FGREP \ @@ -21323,8 +18999,13 @@ OBJDUMP \ deplibs_check_method \ file_magic_cmd \ +file_magic_glob \ +want_nocaseglob \ +DLLTOOL \ +sharedlib_from_linklib_cmd \ AR \ AR_FLAGS \ +archiver_list_spec \ STRIP \ RANLIB \ CC \ @@ -21334,14 +19015,14 @@ lt_cv_sys_global_symbol_to_cdecl \ lt_cv_sys_global_symbol_to_c_name_address \ lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ -SHELL \ -ECHO \ +nm_file_list_spec \ lt_prog_compiler_no_builtin_flag \ -lt_prog_compiler_wl \ lt_prog_compiler_pic \ +lt_prog_compiler_wl \ lt_prog_compiler_static \ lt_cv_prog_compiler_c_o \ need_locks \ +MANIFEST_TOOL \ DSYMUTIL \ NMEDIT \ LIPO \ @@ -21355,9 +19036,7 @@ allow_undefined_flag \ no_undefined_flag \ hardcode_libdir_flag_spec \ -hardcode_libdir_flag_spec_ld \ hardcode_libdir_separator \ -fix_srcfile_path \ exclude_expsyms \ include_expsyms \ file_list_spec \ @@ -21365,6 +19044,7 @@ libname_spec \ library_names_spec \ soname_spec \ +install_override_mode \ finish_eval \ old_striplib \ striplib \ @@ -21375,10 +19055,11 @@ postdeps \ compiler_lib_search_path \ LD_CXX \ +reload_flag_CXX \ compiler_CXX \ lt_prog_compiler_no_builtin_flag_CXX \ -lt_prog_compiler_wl_CXX \ lt_prog_compiler_pic_CXX \ +lt_prog_compiler_wl_CXX \ lt_prog_compiler_static_CXX \ lt_cv_prog_compiler_c_o_CXX \ export_dynamic_flag_spec_CXX \ @@ -21388,9 +19069,7 @@ allow_undefined_flag_CXX \ no_undefined_flag_CXX \ hardcode_libdir_flag_spec_CXX \ -hardcode_libdir_flag_spec_ld_CXX \ hardcode_libdir_separator_CXX \ -fix_srcfile_path_CXX \ exclude_expsyms_CXX \ include_expsyms_CXX \ file_list_spec_CXX \ @@ -21400,9 +19079,9 @@ predeps_CXX \ postdeps_CXX \ compiler_lib_search_path_CXX; do - case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in + case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in *[\\\\\\\`\\"\\\$]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ;; *) eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" @@ -21424,11 +19103,13 @@ module_expsym_cmds \ export_symbols_cmds \ prelink_cmds \ +postlink_cmds \ postinstall_cmds \ postuninstall_cmds \ finish_cmds \ sys_lib_search_path_spec \ sys_lib_dlsearch_path_spec \ +reload_cmds_CXX \ old_archive_cmds_CXX \ old_archive_from_new_cmds_CXX \ old_archive_from_expsyms_cmds_CXX \ @@ -21437,10 +19118,11 @@ module_cmds_CXX \ module_expsym_cmds_CXX \ export_symbols_cmds_CXX \ -prelink_cmds_CXX; do - case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in +prelink_cmds_CXX \ +postlink_cmds_CXX; do + case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in *[\\\\\\\`\\"\\\$]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ;; *) eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" @@ -21448,12 +19130,6 @@ esac done -# Fix-up fallback echo if it was mangled by the above quoting rules. -case \$lt_ECHO in -*'\\\$0 --fallback-echo"') lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\$0 --fallback-echo"\$/\$0 --fallback-echo"/'\` - ;; -esac - ac_aux_dir='$ac_aux_dir' xsi_shell='$xsi_shell' lt_shell_append='$lt_shell_append' @@ -21494,12 +19170,25 @@ "src/saga_core/saga_gdi/Makefile") CONFIG_FILES="$CONFIG_FILES src/saga_core/saga_gdi/Makefile" ;; "src/saga_core/saga_gui/Makefile") CONFIG_FILES="$CONFIG_FILES src/saga_core/saga_gui/Makefile" ;; "src/saga_core/saga_gui/man/Makefile") CONFIG_FILES="$CONFIG_FILES src/saga_core/saga_gui/man/Makefile" ;; - "src/saga_core/saga_odbc/Makefile") CONFIG_FILES="$CONFIG_FILES src/saga_core/saga_odbc/Makefile" ;; "src/saga_core/saga_cmd/Makefile") CONFIG_FILES="$CONFIG_FILES src/saga_core/saga_cmd/Makefile" ;; "src/saga_core/saga_cmd/man/Makefile") CONFIG_FILES="$CONFIG_FILES src/saga_core/saga_cmd/man/Makefile" ;; "src/modules/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/Makefile" ;; "src/modules/climate/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/climate/Makefile" ;; "src/modules/climate/climate_tools/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/climate/climate_tools/Makefile" ;; + "src/modules/contrib/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/contrib/Makefile" ;; + "src/modules/contrib/contrib_peregro/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/contrib/contrib_peregro/Makefile" ;; + "src/modules/db/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/db/Makefile" ;; + "src/modules/db/db_odbc/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/db/db_odbc/Makefile" ;; + "src/modules/db/db_pgsql/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/db/db_pgsql/Makefile" ;; + "src/modules/docs/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/docs/Makefile" ;; + "src/modules/docs/docs_html/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/docs/docs_html/Makefile" ;; + "src/modules/docs/docs_pdf/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/docs/docs_pdf/Makefile" ;; + "src/modules/garden/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/garden/Makefile" ;; + "src/modules/garden/garden_3d_viewer/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/garden/garden_3d_viewer/Makefile" ;; + "src/modules/garden/garden_fractals/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/garden/garden_fractals/Makefile" ;; + "src/modules/garden/garden_games/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/garden/garden_games/Makefile" ;; + "src/modules/garden/garden_learn_to_program/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/garden/garden_learn_to_program/Makefile" ;; + "src/modules/garden/garden_webservices/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/garden/garden_webservices/Makefile" ;; "src/modules/grid/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/grid/Makefile" ;; "src/modules/grid/grid_analysis/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/grid/grid_analysis/Makefile" ;; "src/modules/grid/grid_calculus/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/grid/grid_calculus/Makefile" ;; @@ -21509,9 +19198,32 @@ "src/modules/grid/grid_spline/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/grid/grid_spline/Makefile" ;; "src/modules/grid/grid_tools/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/grid/grid_tools/Makefile" ;; "src/modules/grid/grid_visualisation/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/grid/grid_visualisation/Makefile" ;; + "src/modules/imagery/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/imagery/Makefile" ;; + "src/modules/imagery/imagery_classification/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/imagery/imagery_classification/Makefile" ;; + "src/modules/imagery/imagery_opencv/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/imagery/imagery_opencv/Makefile" ;; + "src/modules/imagery/imagery_photogrammetry/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/imagery/imagery_photogrammetry/Makefile" ;; + "src/modules/imagery/imagery_segmentation/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/imagery/imagery_segmentation/Makefile" ;; + "src/modules/imagery/imagery_svm/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/imagery/imagery_svm/Makefile" ;; + "src/modules/imagery/imagery_tools/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/imagery/imagery_tools/Makefile" ;; + "src/modules/imagery/imagery_vigra/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/imagery/imagery_vigra/Makefile" ;; + "src/modules/io/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/io/Makefile" ;; + "src/modules/io/io_esri_e00/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/io/io_esri_e00/Makefile" ;; + "src/modules/io/io_gdal/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/io/io_gdal/Makefile" ;; + "src/modules/io/io_gps/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/io/io_gps/Makefile" ;; + "src/modules/io/io_grid/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/io/io_grid/Makefile" ;; + "src/modules/io/io_grid_grib2/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/io/io_grid_grib2/Makefile" ;; + "src/modules/io/io_grid_image/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/io/io_grid_image/Makefile" ;; + "src/modules/io/io_shapes/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/io/io_shapes/Makefile" ;; + "src/modules/io/io_shapes_dxf/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/io/io_shapes_dxf/Makefile" ;; + "src/modules/io/io_shapes_las/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/io/io_shapes_las/Makefile" ;; + "src/modules/io/io_table/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/io/io_table/Makefile" ;; + "src/modules/io/io_virtual/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/io/io_virtual/Makefile" ;; "src/modules/pointcloud/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/pointcloud/Makefile" ;; "src/modules/pointcloud/pointcloud_tools/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/pointcloud/pointcloud_tools/Makefile" ;; "src/modules/pointcloud/pointcloud_viewer/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/pointcloud/pointcloud_viewer/Makefile" ;; + "src/modules/projection/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/projection/Makefile" ;; + "src/modules/projection/pj_georeference/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/projection/pj_georeference/Makefile" ;; + "src/modules/projection/pj_proj4/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/projection/pj_proj4/Makefile" ;; "src/modules/shapes/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/shapes/Makefile" ;; "src/modules/shapes/shapes_grid/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/shapes/shapes_grid/Makefile" ;; "src/modules/shapes/shapes_lines/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/shapes/shapes_lines/Makefile" ;; @@ -21519,95 +19231,35 @@ "src/modules/shapes/shapes_polygons/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/shapes/shapes_polygons/Makefile" ;; "src/modules/shapes/shapes_tools/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/shapes/shapes_tools/Makefile" ;; "src/modules/shapes/shapes_transect/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/shapes/shapes_transect/Makefile" ;; + "src/modules/simulation/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/simulation/Makefile" ;; + "src/modules/simulation/sim_cellular_automata/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/simulation/sim_cellular_automata/Makefile" ;; + "src/modules/simulation/sim_ecosystems_hugget/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/simulation/sim_ecosystems_hugget/Makefile" ;; + "src/modules/simulation/sim_erosion/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/simulation/sim_erosion/Makefile" ;; + "src/modules/simulation/sim_fire_spreading/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/simulation/sim_fire_spreading/Makefile" ;; + "src/modules/simulation/sim_hydrology/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/simulation/sim_hydrology/Makefile" ;; + "src/modules/simulation/sim_ihacres/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/simulation/sim_ihacres/Makefile" ;; + "src/modules/statistics/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/statistics/Makefile" ;; + "src/modules/statistics/statistics_grid/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/statistics/statistics_grid/Makefile" ;; + "src/modules/statistics/statistics_kriging/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/statistics/statistics_kriging/Makefile" ;; + "src/modules/statistics/statistics_points/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/statistics/statistics_points/Makefile" ;; + "src/modules/statistics/statistics_regression/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/statistics/statistics_regression/Makefile" ;; "src/modules/table/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/table/Makefile" ;; "src/modules/table/table_calculus/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/table/table_calculus/Makefile" ;; "src/modules/table/table_tools/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/table/table_tools/Makefile" ;; + "src/modules/terrain_analysis/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/terrain_analysis/Makefile" ;; + "src/modules/terrain_analysis/ta_channels/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/terrain_analysis/ta_channels/Makefile" ;; + "src/modules/terrain_analysis/ta_compound/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/terrain_analysis/ta_compound/Makefile" ;; + "src/modules/terrain_analysis/ta_hydrology/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/terrain_analysis/ta_hydrology/Makefile" ;; + "src/modules/terrain_analysis/ta_lighting/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/terrain_analysis/ta_lighting/Makefile" ;; + "src/modules/terrain_analysis/ta_morphometry/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/terrain_analysis/ta_morphometry/Makefile" ;; + "src/modules/terrain_analysis/ta_preprocessor/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/terrain_analysis/ta_preprocessor/Makefile" ;; + "src/modules/terrain_analysis/ta_profiles/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/terrain_analysis/ta_profiles/Makefile" ;; + "src/modules/terrain_analysis/ta_slope_stability/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/terrain_analysis/ta_slope_stability/Makefile" ;; "src/modules/tin/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/tin/Makefile" ;; "src/modules/tin/tin_tools/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/tin/tin_tools/Makefile" ;; "src/modules/tin/tin_viewer/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/tin/tin_viewer/Makefile" ;; - "src/modules_contrib/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules_contrib/Makefile" ;; - "src/modules_contrib/contrib_a_perego/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules_contrib/contrib_a_perego/Makefile" ;; - "src/modules_contrib/contrib_a_perego/contrib_a_perego/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules_contrib/contrib_a_perego/contrib_a_perego/Makefile" ;; - "src/modules_contrib/contrib_s_liersch/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules_contrib/contrib_s_liersch/Makefile" ;; - "src/modules_contrib/contrib_s_liersch/ihacres/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules_contrib/contrib_s_liersch/ihacres/Makefile" ;; - "src/modules_contrib/garden/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules_contrib/garden/Makefile" ;; - "src/modules_contrib/garden/garden_3d_viewer/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules_contrib/garden/garden_3d_viewer/Makefile" ;; - "src/modules_contrib/garden/garden_webservices/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules_contrib/garden/garden_webservices/Makefile" ;; - "src/modules_geostatistics/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules_geostatistics/Makefile" ;; - "src/modules_geostatistics/geostatistics/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules_geostatistics/geostatistics/Makefile" ;; - "src/modules_geostatistics/geostatistics/geostatistics_points/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules_geostatistics/geostatistics/geostatistics_points/Makefile" ;; - "src/modules_geostatistics/geostatistics/geostatistics_grid/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules_geostatistics/geostatistics/geostatistics_grid/Makefile" ;; - "src/modules_geostatistics/geostatistics/geostatistics_kriging/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules_geostatistics/geostatistics/geostatistics_kriging/Makefile" ;; - "src/modules_geostatistics/geostatistics/geostatistics_regression/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules_geostatistics/geostatistics/geostatistics_regression/Makefile" ;; - "src/modules_images/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules_images/Makefile" ;; - "src/modules_images/modules_imagery/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules_images/modules_imagery/Makefile" ;; - "src/modules_images/modules_imagery/imagery_classification/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules_images/modules_imagery/imagery_classification/Makefile" ;; - "src/modules_images/modules_imagery/imagery_rga/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules_images/modules_imagery/imagery_rga/Makefile" ;; - "src/modules_images/modules_imagery/imagery_segmentation/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules_images/modules_imagery/imagery_segmentation/Makefile" ;; - "src/modules_images/modules_imagery/imagery_svm/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules_images/modules_imagery/imagery_svm/Makefile" ;; - "src/modules_images/modules_imagery/imagery_tools/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules_images/modules_imagery/imagery_tools/Makefile" ;; - "src/modules_images/modules_opencv/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules_images/modules_opencv/Makefile" ;; - "src/modules_images/modules_opencv/opencv/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules_images/modules_opencv/opencv/Makefile" ;; - "src/modules_images/modules_vigra/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules_images/modules_vigra/Makefile" ;; - "src/modules_images/modules_vigra/vigra/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules_images/modules_vigra/vigra/Makefile" ;; - "src/modules_io/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules_io/Makefile" ;; - "src/modules_io/esri_e00/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules_io/esri_e00/Makefile" ;; - "src/modules_io/esri_e00/io_esri_e00/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules_io/esri_e00/io_esri_e00/Makefile" ;; - "src/modules_io/db/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules_io/db/Makefile" ;; - "src/modules_io/db/io_odbc/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules_io/db/io_odbc/Makefile" ;; - "src/modules_io/docs/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules_io/docs/Makefile" ;; - "src/modules_io/docs/docs_html/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules_io/docs/docs_html/Makefile" ;; - "src/modules_io/docs/docs_pdf/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules_io/docs/docs_pdf/Makefile" ;; - "src/modules_io/gdal/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules_io/gdal/Makefile" ;; - "src/modules_io/gdal/io_gdal/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules_io/gdal/io_gdal/Makefile" ;; - "src/modules_io/grid/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules_io/grid/Makefile" ;; - "src/modules_io/grid/io_grid/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules_io/grid/io_grid/Makefile" ;; - "src/modules_io/grid/io_grid_image/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules_io/grid/io_grid_image/Makefile" ;; - "src/modules_io/grid/io_grid_grib2/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules_io/grid/io_grid_grib2/Makefile" ;; - "src/modules_io/gps/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules_io/gps/Makefile" ;; - "src/modules_io/gps/io_gps/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules_io/gps/io_gps/Makefile" ;; - "src/modules_io/shapes/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules_io/shapes/Makefile" ;; - "src/modules_io/shapes/io_shapes/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules_io/shapes/io_shapes/Makefile" ;; - "src/modules_io/shapes/io_shapes_dxf/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules_io/shapes/io_shapes_dxf/Makefile" ;; - "src/modules_io/shapes/io_shapes_las/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules_io/shapes/io_shapes_las/Makefile" ;; - "src/modules_io/table/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules_io/table/Makefile" ;; - "src/modules_io/table/io_table/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules_io/table/io_table/Makefile" ;; - "src/modules_lectures/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules_lectures/Makefile" ;; - "src/modules_lectures/lectures/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules_lectures/lectures/Makefile" ;; - "src/modules_lectures/lectures/lectures_introduction/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules_lectures/lectures/lectures_introduction/Makefile" ;; - "src/modules_projection/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules_projection/Makefile" ;; - "src/modules_projection/pj_georeference/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules_projection/pj_georeference/Makefile" ;; - "src/modules_projection/pj_georeference/pj_georeference/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules_projection/pj_georeference/pj_georeference/Makefile" ;; - "src/modules_projection/pj_proj4/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules_projection/pj_proj4/Makefile" ;; - "src/modules_projection/pj_proj4/pj_proj4/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules_projection/pj_proj4/pj_proj4/Makefile" ;; - "src/modules_recreations/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules_recreations/Makefile" ;; - "src/modules_recreations/recreations/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules_recreations/recreations/Makefile" ;; - "src/modules_recreations/recreations/recreations_fractals/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules_recreations/recreations/recreations_fractals/Makefile" ;; - "src/modules_recreations/recreations/recreations_games/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules_recreations/recreations/recreations_games/Makefile" ;; - "src/modules_simulation/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules_simulation/Makefile" ;; - "src/modules_simulation/erosion/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules_simulation/erosion/Makefile" ;; - "src/modules_simulation/erosion/sim_erosion/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules_simulation/erosion/sim_erosion/Makefile" ;; - "src/modules_simulation/hydrology/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules_simulation/hydrology/Makefile" ;; - "src/modules_simulation/hydrology/sim_hydrology/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules_simulation/hydrology/sim_hydrology/Makefile" ;; - "src/modules_simulation/cellular_automata/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules_simulation/cellular_automata/Makefile" ;; - "src/modules_simulation/cellular_automata/sim_cellular_automata/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules_simulation/cellular_automata/sim_cellular_automata/Makefile" ;; - "src/modules_simulation/ecosystems/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules_simulation/ecosystems/Makefile" ;; - "src/modules_simulation/ecosystems/sim_ecosystems_hugget/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules_simulation/ecosystems/sim_ecosystems_hugget/Makefile" ;; - "src/modules_simulation/fire/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules_simulation/fire/Makefile" ;; - "src/modules_simulation/fire/sim_fire_spreading/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules_simulation/fire/sim_fire_spreading/Makefile" ;; - "src/modules_terrain_analysis/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules_terrain_analysis/Makefile" ;; - "src/modules_terrain_analysis/terrain_analysis/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules_terrain_analysis/terrain_analysis/Makefile" ;; - "src/modules_terrain_analysis/terrain_analysis/ta_channels/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules_terrain_analysis/terrain_analysis/ta_channels/Makefile" ;; - "src/modules_terrain_analysis/terrain_analysis/ta_compound/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules_terrain_analysis/terrain_analysis/ta_compound/Makefile" ;; - "src/modules_terrain_analysis/terrain_analysis/ta_hydrology/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules_terrain_analysis/terrain_analysis/ta_hydrology/Makefile" ;; - "src/modules_terrain_analysis/terrain_analysis/ta_lighting/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules_terrain_analysis/terrain_analysis/ta_lighting/Makefile" ;; - "src/modules_terrain_analysis/terrain_analysis/ta_morphometry/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules_terrain_analysis/terrain_analysis/ta_morphometry/Makefile" ;; - "src/modules_terrain_analysis/terrain_analysis/ta_preprocessor/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules_terrain_analysis/terrain_analysis/ta_preprocessor/Makefile" ;; - "src/modules_terrain_analysis/terrain_analysis/ta_profiles/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules_terrain_analysis/terrain_analysis/ta_profiles/Makefile" ;; - - *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 -$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;} - { (exit 1); exit 1; }; };; + + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac done @@ -21630,26 +19282,24 @@ # after its creation but before its name has been assigned to `$tmp'. $debug || { - tmp= + tmp= ac_tmp= trap 'exit_status=$? - { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status + : "${ac_tmp:=$tmp}" + { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status ' 0 - trap '{ (exit 1); exit 1; }' 1 2 13 15 + trap 'as_fn_exit 1' 1 2 13 15 } # Create a (secure) tmp directory for tmp files. { tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && - test -n "$tmp" && test -d "$tmp" + test -d "$tmp" } || { tmp=./conf$$-$RANDOM (umask 077 && mkdir "$tmp") -} || -{ - $as_echo "$as_me: cannot create a temporary directory in ." >&2 - { (exit 1); exit 1; } -} +} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 +ac_tmp=$tmp # Set up the scripts for CONFIG_FILES section. # No need to generate them if there are no CONFIG_FILES. @@ -21657,7 +19307,13 @@ if test -n "$CONFIG_FILES"; then -ac_cr=' ' +ac_cr=`echo X | tr X '\015'` +# On cygwin, bash can eat \r inside `` if the user requested igncr. +# But we know of no other shell where ac_cr would be empty at this +# point, so we can use a bashism as a fallback. +if test "x$ac_cr" = x; then + eval ac_cr=\$\'\\r\' +fi ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /dev/null` if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then ac_cs_awk_cr='\\r' @@ -21665,7 +19321,7 @@ ac_cs_awk_cr=$ac_cr fi -echo 'BEGIN {' >"$tmp/subs1.awk" && +echo 'BEGIN {' >"$ac_tmp/subs1.awk" && _ACEOF @@ -21674,24 +19330,18 @@ echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && echo "_ACEOF" } >conf$$subs.sh || - { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} - { (exit 1); exit 1; }; } -ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 +ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'` ac_delim='%!_!# ' for ac_last_try in false false false false false :; do . ./conf$$subs.sh || - { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` if test $ac_delim_n = $ac_delim_num; then break elif $ac_last_try; then - { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi @@ -21699,7 +19349,7 @@ rm -f conf$$subs.sh cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -cat >>"\$tmp/subs1.awk" <<\\_ACAWK && +cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK && _ACEOF sed -n ' h @@ -21713,7 +19363,7 @@ t delim :nl h -s/\(.\{148\}\).*/\1/ +s/\(.\{148\}\)..*/\1/ t more1 s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ p @@ -21727,7 +19377,7 @@ t nl :delim h -s/\(.\{148\}\).*/\1/ +s/\(.\{148\}\)..*/\1/ t more2 s/["\\]/\\&/g; s/^/"/; s/$/"/ p @@ -21747,7 +19397,7 @@ rm -f conf$$subs.awk cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 _ACAWK -cat >>"\$tmp/subs1.awk" <<_ACAWK && +cat >>"\$ac_tmp/subs1.awk" <<_ACAWK && for (key in S) S_is_set[key] = 1 FS = "" @@ -21779,23 +19429,29 @@ sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" else cat -fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ - || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5 -$as_echo "$as_me: error: could not setup config files machinery" >&2;} - { (exit 1); exit 1; }; } +fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \ + || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 _ACEOF -# VPATH may cause trouble with some makes, so we remove $(srcdir), -# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and +# VPATH may cause trouble with some makes, so we remove sole $(srcdir), +# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and # trailing colons and then remove the whole line if VPATH becomes empty # (actually we leave an empty line to preserve line numbers). if test "x$srcdir" = x.; then - ac_vpsub='/^[ ]*VPATH[ ]*=/{ -s/:*\$(srcdir):*/:/ -s/:*\${srcdir}:*/:/ -s/:*@srcdir@:*/:/ -s/^\([^=]*=[ ]*\):*/\1/ + ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{ +h +s/// +s/^/:/ +s/[ ]*$/:/ +s/:\$(srcdir):/:/g +s/:\${srcdir}:/:/g +s/:@srcdir@:/:/g +s/^:*// s/:*$// +x +s/\(=[ ]*\).*/\1/ +G +s/\n// s/^[^=]*=[ ]*$// }' fi @@ -21807,7 +19463,7 @@ # No need to generate them if there are no CONFIG_HEADERS. # This happens for instance with `./config.status Makefile'. if test -n "$CONFIG_HEADERS"; then -cat >"$tmp/defines.awk" <<\_ACAWK || +cat >"$ac_tmp/defines.awk" <<\_ACAWK || BEGIN { _ACEOF @@ -21819,13 +19475,11 @@ # handling of long lines. ac_delim='%!_!# ' for ac_last_try in false false :; do - ac_t=`sed -n "/$ac_delim/p" confdefs.h` - if test -z "$ac_t"; then + ac_tt=`sed -n "/$ac_delim/p" confdefs.h` + if test -z "$ac_tt"; then break elif $ac_last_try; then - { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_HEADERS" >&5 -$as_echo "$as_me: error: could not make $CONFIG_HEADERS" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5 else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi @@ -21910,9 +19564,7 @@ _ACAWK _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 - { { $as_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&5 -$as_echo "$as_me: error: could not setup config headers machinery" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "could not setup config headers machinery" "$LINENO" 5 fi # test -n "$CONFIG_HEADERS" @@ -21925,9 +19577,7 @@ esac case $ac_mode$ac_tag in :[FHL]*:*);; - :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5 -$as_echo "$as_me: error: invalid tag $ac_tag" >&2;} - { (exit 1); exit 1; }; };; + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac @@ -21946,7 +19596,7 @@ for ac_f do case $ac_f in - -) ac_f="$tmp/stdin";; + -) ac_f="$ac_tmp/stdin";; *) # Look for the file first in the build tree, then in the source tree # (if the path is not absolute). The absolute path cannot be DOS-style, # because $ac_f cannot contain `:'. @@ -21955,12 +19605,10 @@ [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || - { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5 -$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;} - { (exit 1); exit 1; }; };; + as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; esac case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac - ac_file_inputs="$ac_file_inputs '$ac_f'" + as_fn_append ac_file_inputs " '$ac_f'" done # Let's still pretend it is `configure' which instantiates (i.e., don't @@ -21971,7 +19619,7 @@ `' by configure.' if test x"$ac_file" != x-; then configure_input="$ac_file. $configure_input" - { $as_echo "$as_me:$LINENO: creating $ac_file" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 $as_echo "$as_me: creating $ac_file" >&6;} fi # Neutralize special characters interpreted by sed in replacement strings. @@ -21983,10 +19631,8 @@ esac case $ac_tag in - *:-:* | *:-) cat >"$tmp/stdin" \ - || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 -$as_echo "$as_me: error: could not create $ac_file" >&2;} - { (exit 1); exit 1; }; } ;; + *:-:* | *:-) cat >"$ac_tmp/stdin" \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; esac ;; esac @@ -22014,47 +19660,7 @@ q } s/.*/./; q'` - { as_dir="$ac_dir" - case $as_dir in #( - -*) as_dir=./$as_dir;; - esac - test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { - as_dirs= - while :; do - case $as_dir in #( - *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( - *) as_qdir=$as_dir;; - esac - as_dirs="'$as_qdir' $as_dirs" - as_dir=`$as_dirname -- "$as_dir" || -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - test -d "$as_dir" && break - done - test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 -$as_echo "$as_me: error: cannot create directory $as_dir" >&2;} - { (exit 1); exit 1; }; }; } + as_dir="$ac_dir"; as_fn_mkdir_p ac_builddir=. case "$ac_dir" in @@ -22111,7 +19717,6 @@ # If the template does not know about datarootdir, expand it. # FIXME: This hack should be removed a few years after 2.60. ac_datarootdir_hack=; ac_datarootdir_seen= - ac_sed_dataroot=' /datarootdir/ { p @@ -22121,12 +19726,11 @@ /@docdir@/p /@infodir@/p /@localedir@/p -/@mandir@/p -' +/@mandir@/p' case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in *datarootdir*) ac_datarootdir_seen=yes;; *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) - { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 $as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 @@ -22136,7 +19740,7 @@ s&@infodir@&$infodir&g s&@localedir@&$localedir&g s&@mandir@&$mandir&g - s&\\\${datarootdir}&$datarootdir&g' ;; + s&\\\${datarootdir}&$datarootdir&g' ;; esac _ACEOF @@ -22164,27 +19768,24 @@ s&@MKDIR_P@&$ac_MKDIR_P&;t t $ac_datarootdir_hack " -eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ - || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 -$as_echo "$as_me: error: could not create $ac_file" >&2;} - { (exit 1); exit 1; }; } +eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \ + >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && - { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && - { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && - { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined." >&5 + { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && + { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ + "$ac_tmp/out"`; test -z "$ac_out"; } && + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' +which seems to be undefined. Please make sure it is defined" >&5 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined." >&2;} +which seems to be undefined. Please make sure it is defined" >&2;} - rm -f "$tmp/stdin" + rm -f "$ac_tmp/stdin" case $ac_file in - -) cat "$tmp/out" && rm -f "$tmp/out";; - *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; + -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";; + *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";; esac \ - || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 -$as_echo "$as_me: error: could not create $ac_file" >&2;} - { (exit 1); exit 1; }; } + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; :H) # @@ -22193,27 +19794,21 @@ if test x"$ac_file" != x-; then { $as_echo "/* $configure_input */" \ - && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" - } >"$tmp/config.h" \ - || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 -$as_echo "$as_me: error: could not create $ac_file" >&2;} - { (exit 1); exit 1; }; } - if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then - { $as_echo "$as_me:$LINENO: $ac_file is unchanged" >&5 + && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" + } >"$ac_tmp/config.h" \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then + { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 $as_echo "$as_me: $ac_file is unchanged" >&6;} else rm -f "$ac_file" - mv "$tmp/config.h" "$ac_file" \ - || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 -$as_echo "$as_me: error: could not create $ac_file" >&2;} - { (exit 1); exit 1; }; } + mv "$ac_tmp/config.h" "$ac_file" \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 fi else $as_echo "/* $configure_input */" \ - && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ - || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5 -$as_echo "$as_me: error: could not create -" >&2;} - { (exit 1); exit 1; }; } + && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \ + || as_fn_error $? "could not create -" "$LINENO" 5 fi # Compute "$ac_file"'s index in $config_headers. _am_arg="$ac_file" @@ -22251,7 +19846,7 @@ s/.*/./; q'`/stamp-h$_am_stamp_count ;; - :C) { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5 + :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5 $as_echo "$as_me: executing $ac_file commands" >&6;} ;; esac @@ -22259,7 +19854,7 @@ case $ac_file$ac_mode in "depfiles":C) test x"$AMDEP_TRUE" != x"" || { - # Autoconf 2.62 quotes --file arguments for eval, but not when files + # Older Autoconf quotes --file arguments for eval, but not when files # are listed without --file. Let's play safe and only enable the eval # if we detect the quoting. case $CONFIG_FILES in @@ -22272,7 +19867,7 @@ # Strip MF so we end up with the name of the file. mf=`echo "$mf" | sed -e 's/:.*$//'` # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named `Makefile.in', but + # We used to match only the files named 'Makefile.in', but # some people rename them; so instead we look at the file content. # Grep'ing the first line is not enough: some people post-process # each Makefile.in and add a new line on top of each file to say so. @@ -22306,21 +19901,19 @@ continue fi # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running `make'. + # from the Makefile without running 'make'. DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` test -z "$DEPDIR" && continue am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "am__include" && continue + test -z "$am__include" && continue am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //p' < "$mf"` # Find all dependency output files, they are included files with # $(DEPDIR) in their names. We invoke sed twice because it is the # simplest approach to changing $(DEPDIR) to its actual value in the # expansion. for file in `sed -n " s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue fdir=`$as_dirname -- "$file" || @@ -22346,47 +19939,7 @@ q } s/.*/./; q'` - { as_dir=$dirpart/$fdir - case $as_dir in #( - -*) as_dir=./$as_dir;; - esac - test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { - as_dirs= - while :; do - case $as_dir in #( - *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( - *) as_qdir=$as_dir;; - esac - as_dirs="'$as_qdir' $as_dirs" - as_dir=`$as_dirname -- "$as_dir" || -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - test -d "$as_dir" && break - done - test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 -$as_echo "$as_me: error: cannot create directory $as_dir" >&2;} - { (exit 1); exit 1; }; }; } + as_dir=$dirpart/$fdir; as_fn_mkdir_p # echo "creating $dirpart/$file" echo '# dummy' > "$dirpart/$file" done @@ -22414,7 +19967,8 @@ # NOTE: Changes made to this file will be lost: look at ltmain.sh. # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008 Free Software Foundation, Inc. +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. @@ -22462,6 +20016,15 @@ # Whether or not to optimize for fast installation. fast_install=$enable_fast_install +# Shell to use when invoking shell scripts. +SHELL=$lt_SHELL + +# An echo program that protects backslashes. +ECHO=$lt_ECHO + +# The PATH separator for the build system. +PATH_SEPARATOR=$lt_PATH_SEPARATOR + # The host system. host_alias=$host_alias host=$host @@ -22511,9 +20074,11 @@ # turn newlines into spaces. NL2SP=$lt_lt_NL2SP -# How to create reloadable object files. -reload_flag=$lt_reload_flag -reload_cmds=$lt_reload_cmds +# convert \$build file names to \$host format. +to_host_file_cmd=$lt_cv_to_host_file_cmd + +# convert \$build files to toolchain format. +to_tool_file_cmd=$lt_cv_to_tool_file_cmd # An object symbol dumper. OBJDUMP=$lt_OBJDUMP @@ -22521,13 +20086,30 @@ # Method to check whether dependent libraries are shared objects. deplibs_check_method=$lt_deplibs_check_method -# Command to use when deplibs_check_method == "file_magic". +# Command to use when deplibs_check_method = "file_magic". file_magic_cmd=$lt_file_magic_cmd +# How to find potential files when deplibs_check_method = "file_magic". +file_magic_glob=$lt_file_magic_glob + +# Find potential files using nocaseglob when deplibs_check_method = "file_magic". +want_nocaseglob=$lt_want_nocaseglob + +# DLL creation program. +DLLTOOL=$lt_DLLTOOL + +# Command to associate shared and link libraries. +sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd + # The archiver. AR=$lt_AR + +# Flags to create an archive. AR_FLAGS=$lt_AR_FLAGS +# How to feed a file listing to the archiver. +archiver_list_spec=$lt_archiver_list_spec + # A symbol stripping program. STRIP=$lt_STRIP @@ -22536,6 +20118,9 @@ old_postinstall_cmds=$lt_old_postinstall_cmds old_postuninstall_cmds=$lt_old_postuninstall_cmds +# Whether to use a lock for old archive extraction. +lock_old_archive_extraction=$lock_old_archive_extraction + # A C compiler. LTCC=$lt_CC @@ -22554,14 +20139,14 @@ # Transform the output of nm in a C name address pair when lib prefix is needed. global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix -# The name of the directory that contains temporary libtool files. -objdir=$objdir +# Specify filename containing input files for \$NM. +nm_file_list_spec=$lt_nm_file_list_spec -# Shell to use when invoking shell scripts. -SHELL=$lt_SHELL +# The root where to search for dependent libraries,and in which our libraries should be installed. +lt_sysroot=$lt_sysroot -# An echo program that does not interpret backslashes. -ECHO=$lt_ECHO +# The name of the directory that contains temporary libtool files. +objdir=$objdir # Used to examine libraries when file_magic_cmd begins with "file". MAGIC_CMD=$MAGIC_CMD @@ -22569,6 +20154,9 @@ # Must we lock files when doing compilation? need_locks=$lt_need_locks +# Manifest tool. +MANIFEST_TOOL=$lt_MANIFEST_TOOL + # Tool to manipulate archived DWARF debug symbol files on Mac OS X. DSYMUTIL=$lt_DSYMUTIL @@ -22625,6 +20213,9 @@ # The coded name of the library, if different from the real name. soname_spec=$lt_soname_spec +# Permission mode override for installation of shared libraries. +install_override_mode=$lt_install_override_mode + # Command to use after installation of a shared archive. postinstall_cmds=$lt_postinstall_cmds @@ -22664,6 +20255,10 @@ # The linker used to build libraries. LD=$lt_LD +# How to create reloadable object files. +reload_flag=$lt_reload_flag +reload_cmds=$lt_reload_cmds + # Commands used to build an old-style archive. old_archive_cmds=$lt_old_archive_cmds @@ -22676,12 +20271,12 @@ # Compiler flag to turn off builtin functions. no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag -# How to pass a linker flag through the compiler. -wl=$lt_lt_prog_compiler_wl - # Additional compiler flags for building library objects. pic_flag=$lt_lt_prog_compiler_pic +# How to pass a linker flag through the compiler. +wl=$lt_lt_prog_compiler_wl + # Compiler flag to prevent dynamic linking. link_static_flag=$lt_lt_prog_compiler_static @@ -22731,10 +20326,6 @@ # This must work even if \$libdir does not exist hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec -# If ld is used when linking, flag to hardcode \$libdir into a binary -# during linking. This must work even if \$libdir does not exist. -hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld - # Whether we need a single "-rpath" flag with a separated argument. hardcode_libdir_separator=$lt_hardcode_libdir_separator @@ -22768,9 +20359,6 @@ # Whether libtool must link a program against all its dependency libraries. link_all_deplibs=$link_all_deplibs -# Fix the shell variable \$srcfile for the compiler. -fix_srcfile_path=$lt_fix_srcfile_path - # Set to "yes" if exported symbols are required. always_export_symbols=$always_export_symbols @@ -22786,6 +20374,9 @@ # Commands necessary for linking programs (against libraries) with templates. prelink_cmds=$lt_prelink_cmds +# Commands necessary for finishing linking programs. +postlink_cmds=$lt_postlink_cmds + # Specify filename containing input files. file_list_spec=$lt_file_list_spec @@ -22832,212 +20423,169 @@ # if finds mixed CR/LF and LF-only lines. Since sed operates in # text mode, it properly converts lines to CR/LF. This bash problem # is reportedly fixed, but why not run on old versions too? - sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ - || (rm -f "$cfgfile"; exit 1) - - case $xsi_shell in - yes) - cat << \_LT_EOF >> "$cfgfile" - -# func_dirname file append nondir_replacement -# Compute the dirname of FILE. If nonempty, add APPEND to the result, -# otherwise set result to NONDIR_REPLACEMENT. -func_dirname () -{ - case ${1} in - */*) func_dirname_result="${1%/*}${2}" ;; - * ) func_dirname_result="${3}" ;; - esac -} - -# func_basename file -func_basename () -{ - func_basename_result="${1##*/}" -} - -# func_dirname_and_basename file append nondir_replacement -# perform func_basename and func_dirname in a single function -# call: -# dirname: Compute the dirname of FILE. If nonempty, -# add APPEND to the result, otherwise set result -# to NONDIR_REPLACEMENT. -# value returned in "$func_dirname_result" -# basename: Compute filename of FILE. -# value retuned in "$func_basename_result" -# Implementation must be kept synchronized with func_dirname -# and func_basename. For efficiency, we do not delegate to -# those functions but instead duplicate the functionality here. -func_dirname_and_basename () -{ - case ${1} in - */*) func_dirname_result="${1%/*}${2}" ;; - * ) func_dirname_result="${3}" ;; - esac - func_basename_result="${1##*/}" -} - -# func_stripname prefix suffix name -# strip PREFIX and SUFFIX off of NAME. -# PREFIX and SUFFIX must not contain globbing or regex special -# characters, hashes, percent signs, but SUFFIX may contain a leading -# dot (in which case that matches only a dot). -func_stripname () -{ - # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are - # positional parameters, so assign one to ordinary parameter first. - func_stripname_result=${3} - func_stripname_result=${func_stripname_result#"${1}"} - func_stripname_result=${func_stripname_result%"${2}"} -} - -# func_opt_split -func_opt_split () -{ - func_opt_split_opt=${1%%=*} - func_opt_split_arg=${1#*=} -} - -# func_lo2o object -func_lo2o () -{ - case ${1} in - *.lo) func_lo2o_result=${1%.lo}.${objext} ;; - *) func_lo2o_result=${1} ;; - esac -} - -# func_xform libobj-or-source -func_xform () -{ - func_xform_result=${1%.*}.lo -} - -# func_arith arithmetic-term... -func_arith () -{ - func_arith_result=$(( $* )) -} - -# func_len string -# STRING may not start with a hyphen. -func_len () -{ - func_len_result=${#1} -} - -_LT_EOF - ;; - *) # Bourne compatible functions. - cat << \_LT_EOF >> "$cfgfile" - -# func_dirname file append nondir_replacement -# Compute the dirname of FILE. If nonempty, add APPEND to the result, -# otherwise set result to NONDIR_REPLACEMENT. -func_dirname () -{ - # Extract subdirectory from the argument. - func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"` - if test "X$func_dirname_result" = "X${1}"; then - func_dirname_result="${3}" - else - func_dirname_result="$func_dirname_result${2}" - fi -} - -# func_basename file -func_basename () -{ - func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"` -} - - -# func_stripname prefix suffix name -# strip PREFIX and SUFFIX off of NAME. -# PREFIX and SUFFIX must not contain globbing or regex special -# characters, hashes, percent signs, but SUFFIX may contain a leading -# dot (in which case that matches only a dot). -# func_strip_suffix prefix name -func_stripname () -{ - case ${2} in - .*) func_stripname_result=`$ECHO "X${3}" \ - | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;; - *) func_stripname_result=`$ECHO "X${3}" \ - | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;; - esac -} - -# sed scripts: -my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' -my_sed_long_arg='1s/^-[^=]*=//' - -# func_opt_split -func_opt_split () -{ - func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"` - func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"` -} - -# func_lo2o object -func_lo2o () -{ - func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"` -} - -# func_xform libobj-or-source -func_xform () -{ - func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[^.]*$/.lo/'` -} - -# func_arith arithmetic-term... -func_arith () -{ - func_arith_result=`expr "$@"` -} - -# func_len string -# STRING may not start with a hyphen. -func_len () -{ - func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` -} - -_LT_EOF -esac - -case $lt_shell_append in - yes) - cat << \_LT_EOF >> "$cfgfile" - -# func_append var value -# Append VALUE to the end of shell variable VAR. -func_append () -{ - eval "$1+=\$2" -} -_LT_EOF - ;; - *) - cat << \_LT_EOF >> "$cfgfile" - -# func_append var value -# Append VALUE to the end of shell variable VAR. -func_append () -{ - eval "$1=\$$1\$2" -} - -_LT_EOF - ;; - esac + sed '$q' "$ltmain" >> "$cfgfile" \ + || (rm -f "$cfgfile"; exit 1) + if test x"$xsi_shell" = xyes; then + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ +func_dirname ()\ +{\ +\ case ${1} in\ +\ */*) func_dirname_result="${1%/*}${2}" ;;\ +\ * ) func_dirname_result="${3}" ;;\ +\ esac\ +} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_basename ()$/,/^} # func_basename /c\ +func_basename ()\ +{\ +\ func_basename_result="${1##*/}"\ +} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ +func_dirname_and_basename ()\ +{\ +\ case ${1} in\ +\ */*) func_dirname_result="${1%/*}${2}" ;;\ +\ * ) func_dirname_result="${3}" ;;\ +\ esac\ +\ func_basename_result="${1##*/}"\ +} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ +func_stripname ()\ +{\ +\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ +\ # positional parameters, so assign one to ordinary parameter first.\ +\ func_stripname_result=${3}\ +\ func_stripname_result=${func_stripname_result#"${1}"}\ +\ func_stripname_result=${func_stripname_result%"${2}"}\ +} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ +func_split_long_opt ()\ +{\ +\ func_split_long_opt_name=${1%%=*}\ +\ func_split_long_opt_arg=${1#*=}\ +} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ +func_split_short_opt ()\ +{\ +\ func_split_short_opt_arg=${1#??}\ +\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ +} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ +func_lo2o ()\ +{\ +\ case ${1} in\ +\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ +\ *) func_lo2o_result=${1} ;;\ +\ esac\ +} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_xform ()$/,/^} # func_xform /c\ +func_xform ()\ +{\ + func_xform_result=${1%.*}.lo\ +} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_arith ()$/,/^} # func_arith /c\ +func_arith ()\ +{\ + func_arith_result=$(( $* ))\ +} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_len ()$/,/^} # func_len /c\ +func_len ()\ +{\ + func_len_result=${#1}\ +} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + +fi + +if test x"$lt_shell_append" = xyes; then + sed -e '/^func_append ()$/,/^} # func_append /c\ +func_append ()\ +{\ + eval "${1}+=\\${2}"\ +} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ +func_append_quoted ()\ +{\ +\ func_quote_for_eval "${2}"\ +\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ +} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + # Save a `func_append' function call where possible by direct use of '+=' + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") + test 0 -eq $? || _lt_function_replace_fail=: +else + # Save a `func_append' function call even when '+=' is not available + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") + test 0 -eq $? || _lt_function_replace_fail=: +fi + +if test x"$_lt_function_replace_fail" = x":"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} +fi - sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ - || (rm -f "$cfgfile"; exit 1) - mv -f "$cfgfile" "$ofile" || + mv -f "$cfgfile" "$ofile" || (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") chmod +x "$ofile" @@ -23049,6 +20597,10 @@ # The linker used to build libraries. LD=$lt_LD_CXX +# How to create reloadable object files. +reload_flag=$lt_reload_flag_CXX +reload_cmds=$lt_reload_cmds_CXX + # Commands used to build an old-style archive. old_archive_cmds=$lt_old_archive_cmds_CXX @@ -23061,12 +20613,12 @@ # Compiler flag to turn off builtin functions. no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX -# How to pass a linker flag through the compiler. -wl=$lt_lt_prog_compiler_wl_CXX - # Additional compiler flags for building library objects. pic_flag=$lt_lt_prog_compiler_pic_CXX +# How to pass a linker flag through the compiler. +wl=$lt_lt_prog_compiler_wl_CXX + # Compiler flag to prevent dynamic linking. link_static_flag=$lt_lt_prog_compiler_static_CXX @@ -23116,10 +20668,6 @@ # This must work even if \$libdir does not exist hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX -# If ld is used when linking, flag to hardcode \$libdir into a binary -# during linking. This must work even if \$libdir does not exist. -hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX - # Whether we need a single "-rpath" flag with a separated argument. hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX @@ -23153,9 +20701,6 @@ # Whether libtool must link a program against all its dependency libraries. link_all_deplibs=$link_all_deplibs_CXX -# Fix the shell variable \$srcfile for the compiler. -fix_srcfile_path=$lt_fix_srcfile_path_CXX - # Set to "yes" if exported symbols are required. always_export_symbols=$always_export_symbols_CXX @@ -23171,6 +20716,9 @@ # Commands necessary for linking programs (against libraries) with templates. prelink_cmds=$lt_prelink_cmds_CXX +# Commands necessary for finishing linking programs. +postlink_cmds=$lt_postlink_cmds_CXX + # Specify filename containing input files. file_list_spec=$lt_file_list_spec_CXX @@ -23200,15 +20748,12 @@ done # for ac_tag -{ (exit 0); exit 0; } +as_fn_exit 0 _ACEOF -chmod +x $CONFIG_STATUS ac_clean_files=$ac_clean_files_save test $ac_write_fail = 0 || - { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5 -$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5 # configure is writing to config.log, and then calls config.status. @@ -23229,10 +20774,10 @@ exec 5>>config.log # Use ||, not &&, to avoid exiting from the if with $? = 1, which # would make configure fail if this is the last instruction. - $ac_cs_success || { (exit 1); exit 1; } + $ac_cs_success || as_fn_exit 1 fi if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then - { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} fi diff -Nru saga-2.1.0+dfsg/configure.ac saga-2.1.4+dfsg/configure.ac --- saga-2.1.0+dfsg/configure.ac 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/configure.ac 2014-11-13 08:32:09.000000000 +0000 @@ -0,0 +1,301 @@ +# $Id: configure.ac 2324 2014-11-04 14:28:22Z oconrad $ +# -*- Autoconf -*- +# Process this file with autoconf to produce a configure script. + +AC_PREREQ(2.59) +AC_INIT(saga, 2.1.4, BUG-REPORT-ADDRESS) +AC_CONFIG_SRCDIR([src/saga_core/saga_gui/wksp_data_menu_files.cpp]) +AC_CONFIG_HEADER([config.h]) +AC_CONFIG_MACRO_DIR([m4]) +AM_INIT_AUTOMAKE(foreign tar-ustar) + + +# Checks for programs. +AC_PROG_CXX +AC_PROG_CC +AC_PROG_INSTALL +AC_PROG_LIBTOOL + +# Checks for libraries. +AC_CHECK_LIB([cv], [cvGetRows], CVFOUND=1,,) +AC_CHECK_LIB([geotrans], [Set_Mercator_Coordinates]) +AC_CHECK_LIB([fftw3],[fftw_execute],FFTWFOUND=1,) +AC_CHECK_LIB([jasper], [jas_calloc],JASPERFOUND=1,,) +AC_CHECK_LIB([las], [LAS_GetVersion], LASFOUND=1,,) +AC_CHECK_LIB(hpdf, HPDF_Pages_New, HARUFOUND=1,,) +AC_CHECK_LIB([odbc], [SQLFetch], ODBCFOUND=1,[ODBC \(libodbc\) library not found]) +AC_CHECK_LIB([proj], [pj_is_latlong], PROJFOUND=1,,) +AC_CHECK_LIB([vigraimpex], [VIGRA_RGBE_ReadPixels_Raw],VIGRAFOUND=1,) +AC_CHECK_LIB([gomp], [omp_get_num_threads], GOMPFOUND=1,,) + +# Checks for header files. +AC_HEADER_STDC +AC_CHECK_HEADERS([float.h malloc.h memory.h stdlib.h string.h unistd.h]) +AC_CHECK_HEADERS([wchar.h]) +# todo: check for headers of the libraries above + +# Checks for typedefs, structures, and compiler characteristics. +AC_HEADER_STDBOOL +AC_C_CONST +AC_C_INLINE +AC_TYPE_SIZE_T +AC_STRUCT_TM + +# Checks for platform characteristics. +AC_C_BIGENDIAN + +# Checks for library functions. +AC_FUNC_MALLOC +AC_FUNC_MEMCMP +AC_FUNC_REALLOC +AC_FUNC_STAT +AC_FUNC_STRTOD +AC_FUNC_VPRINTF +AC_CHECK_FUNCS([floor memmove memset modf pow sqrt strchr strdup strerror strrchr strstr strtol]) + +# add a local directory as base for libs and include files +AC_MSG_CHECKING([for local include/lib path]) + +AC_ARG_WITH(local,[ --with-local[=dir] search /usr/local or other directory for includes and libs],,) + +if test "$with_local" != "no" -a "$with_local" != "" ; then + + if test "$with_local" = "yes" ; then + ADD_PREFIX=/usr/local + else + ADD_PREFIX=$with_local + fi + + AC_MSG_RESULT(adding $ADD_PREFIX) + + LOCAL_LIBS="-L$ADD_PREFIX/lib" + LOCAL_INCS="-I$ADD_PREFIX/include" + + AC_SUBST(LOCAL_LIBS,$LOCAL_LIBS) + AC_SUBST(LOCAL_INCS,$LOCAL_INCS) +else + AC_MSG_RESULT([none]) +fi + +# conditionals + +# wxwidgets +# the test could be extended to check for wx-config --version too +if test "`wx-config --list | grep unicode`" != "" ; then + AM_CONDITIONAL(SAGA_UNICODE, true) +else + AC_MSG_ERROR(SAGA requires a unicode build of wxGTK) + exit +fi + +# postgresql/postgis +AX_LIB_POSTGRESQL([8.0]) +if test "x$found_postgresql" = "xyes"; then + echo "checking whether to enable postgresql... yes" +else + echo "checking whether to enable postgresql... no" +fi +AM_CONDITIONAL(HAVE_POSTGRESQL, test "x$found_postgresql" = "xyes") + +# debug +AC_ARG_ENABLE(debug, + [ --enable-debug Turn on debugging], + [case "${enableval}" in + yes) debug=true ;; + no) debug=false ;; + *) AC_MSG_ERROR(bad value ${enableval} for --enable-debug) ;; + esac],[debug=false]) + AM_CONDITIONAL(DEBUG, test x$debug = xtrue) + +# gui +AC_ARG_ENABLE(gui, + [ --disable-gui Do not build GUI and interactive modules], + [case "${enableval}" in + yes) gui=true ;; + no) gui=false ;; + *) AC_MSG_ERROR(bad value ${enableval} for --disable-gui) ;; + esac],[gui=true]) + AM_CONDITIONAL(WITH_GUI, test x$gui = xtrue) + + if test $gui = "false" ; then + AC_MSG_RESULT([ GUI and interactive modules will NOT be built]) + else + AC_DEFINE([WITH_GUI], [1], ["built with GUI and interactive modules"]) + AC_MSG_RESULT([ GUI and interactive modules will be built]) + fi + +# odbc +AC_ARG_ENABLE(odbc, + [ --disable-odbc Build without ODBC support], + [case "${enableval}" in + yes) odbc=true ;; + no) odbc=false ;; + *) AC_MSG_ERROR(bad value ${enableval} for --disable-odbc) ;; + esac],[odbc=true]) + AM_CONDITIONAL(WITH_ODBC, test x$odbc = xtrue) + + if test $odbc = "false" ; then + AC_MSG_RESULT([ ODBC support will NOT be built]) + else + AC_DEFINE([WITH_ODBC], [1], ["built with ODBC support"]) + AC_MSG_RESULT([ ODBC support will be built]) + fi + + +# openmp +AC_ARG_ENABLE(openmp, + [ --disable-openmp Build without OpenMP support], + [case "${enableval}" in + yes) openmp=true ;; + no) openmp=false ;; + *) AC_MSG_ERROR(bad value ${enableval} for --disable-openmp) ;; + esac],[openmp=true]) + AM_CONDITIONAL(OPENMP, test x$openmp = xtrue) + + if test $openmp = "false" ; then + AC_MSG_RESULT([ OpenMP support disabled]) + GOMPFLAGS="" + else + if test -n "$GOMPFOUND" ; then + AC_MSG_RESULT([ Building with OpenMP support using libgomp]) + GOMPFLAGS="-fopenmp -lgomp" + else + AC_MSG_RESULT([ libgomp not found, OpenMP support disabled]) + GOMPFLAGS="" + fi + fi + +AC_SUBST(GOMPFLAGS) + +#AM_CONDITIONAL(X86_64, test "`uname -m`" = "x86_64") + AM_CONDITIONAL(HAVE_CV, test -n "$CVFOUND") + AM_CONDITIONAL(HAVE_LLAS, test -n "$LASFOUND") + AM_CONDITIONAL(HAVE_VIGRA, test -n "$VIGRAFOUND" -a -n "$FFTWFOUND") + AM_CONDITIONAL(HAVE_HARU, test -n "$HARUFOUND") + + if test -n "$HARUFOUND" ; then + AC_MSG_RESULT([ using lhpdf (libharu) from system libs.]) + DISABLELIBHARU="" + HARU_LIB="-lhpdf" + else + AC_MSG_RESULT([ libharu was not found, pdf creation will be disabled]) + DISABLELIBHARU="-D_SAGA_DONOTUSE_HARU" + HARU_LIB="" + fi + +AC_SUBST(HARU_LIB) +AC_SUBST(DISABLELIBHARU) + +AC_ARG_ENABLE(python, + [ --enable-python Build python bindings for the saga api], + [case "${enableval}" in + yes) python=true ;; + no) python=false ;; + *) AC_MSG_ERROR(bad value ${enableval} for --enable-python) ;; + esac],[python=false]) + AM_CONDITIONAL(SAGA_PYTHON, test x$python = xtrue) +if test x$python = xtrue; then +AM_PATH_PYTHON +AX_PYTHON_DEVEL([]) + +AX_PKG_SWIG(1.3.17,[],[]) +AX_SWIG_ENABLE_CXX +AX_SWIG_PYTHON +fi +#AC_CONFIG_FILES([Makefile]) +AC_OUTPUT(Makefile \ + src/Makefile \ + src/saga_core/Makefile \ + src/saga_core/saga_api/Makefile \ + src/saga_core/saga_gdi/Makefile \ + src/saga_core/saga_gui/Makefile \ + src/saga_core/saga_gui/man/Makefile \ + src/saga_core/saga_cmd/Makefile \ + src/saga_core/saga_cmd/man/Makefile \ + src/modules/Makefile \ + src/modules/climate/Makefile \ + src/modules/climate/climate_tools/Makefile \ + src/modules/contrib/Makefile \ + src/modules/contrib/contrib_peregro/Makefile \ + src/modules/db/Makefile \ + src/modules/db/db_odbc/Makefile \ + src/modules/db/db_pgsql/Makefile \ + src/modules/docs/Makefile \ + src/modules/docs/docs_html/Makefile \ + src/modules/docs/docs_pdf/Makefile \ + src/modules/garden/Makefile \ + src/modules/garden/garden_3d_viewer/Makefile \ + src/modules/garden/garden_fractals/Makefile \ + src/modules/garden/garden_games/Makefile \ + src/modules/garden/garden_learn_to_program/Makefile \ + src/modules/garden/garden_webservices/Makefile \ + src/modules/grid/Makefile \ + src/modules/grid/grid_analysis/Makefile \ + src/modules/grid/grid_calculus/Makefile \ + src/modules/grid/grid_calculus_bsl/Makefile \ + src/modules/grid/grid_filter/Makefile \ + src/modules/grid/grid_gridding/Makefile \ + src/modules/grid/grid_spline/Makefile \ + src/modules/grid/grid_tools/Makefile \ + src/modules/grid/grid_visualisation/Makefile \ + src/modules/imagery/Makefile \ + src/modules/imagery/imagery_classification/Makefile \ + src/modules/imagery/imagery_opencv/Makefile \ + src/modules/imagery/imagery_photogrammetry/Makefile \ + src/modules/imagery/imagery_segmentation/Makefile \ + src/modules/imagery/imagery_svm/Makefile \ + src/modules/imagery/imagery_tools/Makefile \ + src/modules/imagery/imagery_vigra/Makefile \ + src/modules/io/Makefile \ + src/modules/io/io_esri_e00/Makefile \ + src/modules/io/io_gdal/Makefile \ + src/modules/io/io_gps/Makefile \ + src/modules/io/io_grid/Makefile \ + src/modules/io/io_grid_grib2/Makefile \ + src/modules/io/io_grid_image/Makefile \ + src/modules/io/io_shapes/Makefile \ + src/modules/io/io_shapes_dxf/Makefile \ + src/modules/io/io_shapes_las/Makefile \ + src/modules/io/io_table/Makefile \ + src/modules/io/io_virtual/Makefile \ + src/modules/pointcloud/Makefile \ + src/modules/pointcloud/pointcloud_tools/Makefile \ + src/modules/pointcloud/pointcloud_viewer/Makefile \ + src/modules/projection/Makefile \ + src/modules/projection/pj_georeference/Makefile \ + src/modules/projection/pj_proj4/Makefile \ + src/modules/shapes/Makefile \ + src/modules/shapes/shapes_grid/Makefile \ + src/modules/shapes/shapes_lines/Makefile \ + src/modules/shapes/shapes_points/Makefile \ + src/modules/shapes/shapes_polygons/Makefile \ + src/modules/shapes/shapes_tools/Makefile \ + src/modules/shapes/shapes_transect/Makefile \ + src/modules/simulation/Makefile \ + src/modules/simulation/sim_cellular_automata/Makefile \ + src/modules/simulation/sim_ecosystems_hugget/Makefile \ + src/modules/simulation/sim_erosion/Makefile \ + src/modules/simulation/sim_fire_spreading/Makefile \ + src/modules/simulation/sim_hydrology/Makefile \ + src/modules/simulation/sim_ihacres/Makefile \ + src/modules/statistics/Makefile \ + src/modules/statistics/statistics_grid/Makefile \ + src/modules/statistics/statistics_kriging/Makefile \ + src/modules/statistics/statistics_points/Makefile \ + src/modules/statistics/statistics_regression/Makefile \ + src/modules/table/Makefile \ + src/modules/table/table_calculus/Makefile \ + src/modules/table/table_tools/Makefile \ + src/modules/terrain_analysis/Makefile \ + src/modules/terrain_analysis/ta_channels/Makefile \ + src/modules/terrain_analysis/ta_compound/Makefile \ + src/modules/terrain_analysis/ta_hydrology/Makefile \ + src/modules/terrain_analysis/ta_lighting/Makefile \ + src/modules/terrain_analysis/ta_morphometry/Makefile \ + src/modules/terrain_analysis/ta_preprocessor/Makefile \ + src/modules/terrain_analysis/ta_profiles/Makefile \ + src/modules/terrain_analysis/ta_slope_stability/Makefile \ + src/modules/tin/Makefile \ + src/modules/tin/tin_tools/Makefile \ + src/modules/tin/tin_viewer/Makefile \ +) diff -Nru saga-2.1.0+dfsg/configure.in saga-2.1.4+dfsg/configure.in --- saga-2.1.0+dfsg/configure.in 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/configure.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,310 +0,0 @@ -# $Id: configure.in 1580 2012-12-26 15:31:58Z reklov_w $ -# -*- Autoconf -*- -# Process this file with autoconf to produce a configure script. - -AC_PREREQ(2.59) -AC_INIT(saga, 2.1.0, BUG-REPORT-ADDRESS) -AC_CONFIG_SRCDIR([src/saga_core/saga_gui/wksp_data_menu_files.cpp]) -AC_CONFIG_HEADER([config.h]) -AM_INIT_AUTOMAKE(saga, 2.1.0beta) -AM_INIT_AUTOMAKE(tar-ustar) - -# Checks for programs. -AC_PROG_CXX -AC_PROG_CC -AC_PROG_INSTALL -AC_PROG_LIBTOOL - -# Checks for libraries. -AC_CHECK_LIB([cv], [cvGetRows], CVFOUND=1,,) -AC_CHECK_LIB([geotrans], [Set_Mercator_Coordinates]) -AC_CHECK_LIB([fftw3],[fftw_execute],FFTWFOUND=1,) -AC_CHECK_LIB([jasper], [jas_calloc],JASPERFOUND=1,,) -AC_CHECK_LIB([las], [LAS_GetVersion], LASFOUND=1,,) -AC_CHECK_LIB(hpdf, HPDF_Pages_New, HARUFOUND=1,,) -AC_CHECK_LIB([odbc], [SQLFetch], ODBCFOUND=1,[ODBC \(libodbc\) library not found]) -AC_CHECK_LIB([proj], [pj_is_latlong], PROJFOUND=1,,) -AC_CHECK_LIB([vigraimpex], [VIGRA_RGBE_ReadPixels_Raw],VIGRAFOUND=1,) -AC_CHECK_LIB([gomp], [omp_get_num_threads], GOMPFOUND=1,,) - -# Checks for header files. -AC_HEADER_STDC -AC_CHECK_HEADERS([float.h malloc.h memory.h stdlib.h string.h unistd.h]) -AC_CHECK_HEADERS([wchar.h]) -#todo: check for headers of the libraries above - -# Checks for typedefs, structures, and compiler characteristics. -AC_HEADER_STDBOOL -AC_C_CONST -AC_C_INLINE -AC_TYPE_SIZE_T -AC_STRUCT_TM - -# Checks for platform characteristics. -AC_C_BIGENDIAN - -# Checks for library functions. -AC_FUNC_MALLOC -AC_FUNC_MEMCMP -AC_FUNC_REALLOC -AC_FUNC_STAT -AC_FUNC_STRTOD -AC_FUNC_VPRINTF -AC_CHECK_FUNCS([floor memmove memset modf pow sqrt strchr strdup strerror strrchr strstr strtol]) - -# add a local directory as base for libs and include files -AC_MSG_CHECKING([for local include/lib path]) - -AC_ARG_WITH(local,[ --with-local[=dir] search /usr/local or other directory for includes and libs],,) - -if test "$with_local" != "no" -a "$with_local" != "" ; then - - if test "$with_local" = "yes" ; then - ADD_PREFIX=/usr/local - else - ADD_PREFIX=$with_local - fi - - AC_MSG_RESULT(adding $ADD_PREFIX) - - LOCAL_LIBS="-L$ADD_PREFIX/lib" - LOCAL_INCS="-I$ADD_PREFIX/include" - - AC_SUBST(LOCAL_LIBS,$LOCAL_LIBS) - AC_SUBST(LOCAL_INCS,$LOCAL_INCS) -else - AC_MSG_RESULT([none]) -fi - -# conditionals -# the test could be extended to check for wx-config --version too -if test "`wx-config --list | grep unicode`" != "" ; then - AM_CONDITIONAL(SAGA_UNICODE, true) -else - AC_MSG_ERROR(SAGA requires a unicode build of wxGTK) - exit -fi - - -AC_ARG_ENABLE(debug, - [ --enable-debug Turn on debugging], - [case "${enableval}" in - yes) debug=true ;; - no) debug=false ;; - *) AC_MSG_ERROR(bad value ${enableval} for --enable-debug) ;; - esac],[debug=false]) - AM_CONDITIONAL(DEBUG, test x$debug = xtrue) - -AC_ARG_ENABLE(gui, - [ --disable-gui Do not build GUI and interactive modules], - [case "${enableval}" in - yes) gui=true ;; - no) gui=false ;; - *) AC_MSG_ERROR(bad value ${enableval} for --disable-gui) ;; - esac],[gui=true]) - AM_CONDITIONAL(WITH_GUI, test x$gui = xtrue) - - if test $gui = "false" ; then - AC_MSG_RESULT([ GUI and interactive modules will NOT be built]) - else - AC_DEFINE([WITH_GUI], [1], ["built with GUI and interactive modules"]) - AC_MSG_RESULT([ GUI and interactive modules will be built]) - fi - -AC_ARG_ENABLE(odbc, - [ --disable-odbc Build without ODBC support], - [case "${enableval}" in - yes) odbc=true ;; - no) odbc=false ;; - *) AC_MSG_ERROR(bad value ${enableval} for --disable-odbc) ;; - esac],[odbc=true]) - AM_CONDITIONAL(WITH_ODBC, test x$odbc = xtrue) - - if test $odbc = "false" ; then - AC_MSG_RESULT([ ODBC support will NOT be built]) - else - AC_DEFINE([WITH_ODBC], [1], ["built with ODBC support"]) - AC_MSG_RESULT([ ODBC support will be built]) - fi - -AC_ARG_ENABLE(openmp, - [ --disable-openmp Build without OpenMP support], - [case "${enableval}" in - yes) openmp=true ;; - no) openmp=false ;; - *) AC_MSG_ERROR(bad value ${enableval} for --disable-openmp) ;; - esac],[openmp=true]) - AM_CONDITIONAL(OPENMP, test x$openmp = xtrue) - - if test $openmp = "false" ; then - AC_MSG_RESULT([ OpenMP support disabled]) - GOMPFLAGS="" - else - if test -n "$GOMPFOUND" ; then - AC_MSG_RESULT([ Building with OpenMP support using libgomp]) - GOMPFLAGS="-fopenmp" - else - AC_MSG_RESULT([ libgomp not found, OpenMP support disabled]) - GOMPFLAGS="" - fi - fi - -AC_SUBST(GOMPFLAGS) - -#AM_CONDITIONAL(X86_64, test "`uname -m`" = "x86_64") - AM_CONDITIONAL(HAVE_CV, test -n "$CVFOUND") - AM_CONDITIONAL(HAVE_LLAS, test -n "$LASFOUND") - AM_CONDITIONAL(HAVE_VIGRA, test -n "$VIGRAFOUND" -a -n "$FFTWFOUND") - AM_CONDITIONAL(HAVE_HARU, test -n "$HARUFOUND") - - if test -n "$HARUFOUND" ; then - AC_MSG_RESULT([ using lhpdf (libharu) from system libs.]) - DISABLELIBHARU="" - HARU_LIB="-lhpdf" - else - AC_MSG_RESULT([ libharu was not found, pdf creation will be disabled]) - DISABLELIBHARU="-D_SAGA_DONOTUSE_HARU" - HARU_LIB="" - fi - -AC_SUBST(HARU_LIB) -AC_SUBST(DISABLELIBHARU) - -AC_CONFIG_MACRO_DIR([m4]) -AC_ARG_ENABLE(python, - [ --enable-python Build python bindings for the saga api], - [case "${enableval}" in - yes) python=true ;; - no) python=false ;; - *) AC_MSG_ERROR(bad value ${enableval} for --enable-python) ;; - esac],[python=false]) - AM_CONDITIONAL(SAGA_PYTHON, test x$python = xtrue) -if test x$python = xtrue; then -AM_PATH_PYTHON -# PYTHON_EXTRA_LIBS='-lgomp' -# PYTHON_EXTRA_LDFLAGS='-lgomp' -AX_PYTHON_DEVEL([]) - -AX_PKG_SWIG(1.3.17,[],[]) -AX_SWIG_ENABLE_CXX -AX_SWIG_PYTHON -fi -#AC_CONFIG_FILES([Makefile]) -AC_OUTPUT(Makefile \ - src/Makefile \ - src/saga_core/Makefile \ - src/saga_core/saga_api/Makefile \ - src/saga_core/saga_gdi/Makefile \ - src/saga_core/saga_gui/Makefile \ - src/saga_core/saga_gui/man/Makefile \ - src/saga_core/saga_odbc/Makefile \ - src/saga_core/saga_cmd/Makefile \ - src/saga_core/saga_cmd/man/Makefile \ - src/modules/Makefile \ - src/modules/climate/Makefile \ - src/modules/climate/climate_tools/Makefile \ - src/modules/grid/Makefile \ - src/modules/grid/grid_analysis/Makefile \ - src/modules/grid/grid_calculus/Makefile \ - src/modules/grid/grid_calculus_bsl/Makefile \ - src/modules/grid/grid_filter/Makefile \ - src/modules/grid/grid_gridding/Makefile \ - src/modules/grid/grid_spline/Makefile \ - src/modules/grid/grid_tools/Makefile \ - src/modules/grid/grid_visualisation/Makefile \ - src/modules/pointcloud/Makefile \ - src/modules/pointcloud/pointcloud_tools/Makefile \ - src/modules/pointcloud/pointcloud_viewer/Makefile \ - src/modules/shapes/Makefile \ - src/modules/shapes/shapes_grid/Makefile \ - src/modules/shapes/shapes_lines/Makefile \ - src/modules/shapes/shapes_points/Makefile \ - src/modules/shapes/shapes_polygons/Makefile \ - src/modules/shapes/shapes_tools/Makefile \ - src/modules/shapes/shapes_transect/Makefile \ - src/modules/table/Makefile \ - src/modules/table/table_calculus/Makefile \ - src/modules/table/table_tools/Makefile \ - src/modules/tin/Makefile \ - src/modules/tin/tin_tools/Makefile \ - src/modules/tin/tin_viewer/Makefile \ - src/modules_contrib/Makefile \ - src/modules_contrib/contrib_a_perego/Makefile \ - src/modules_contrib/contrib_a_perego/contrib_a_perego/Makefile \ - src/modules_contrib/contrib_s_liersch/Makefile \ - src/modules_contrib/contrib_s_liersch/ihacres/Makefile \ - src/modules_contrib/garden/Makefile \ - src/modules_contrib/garden/garden_3d_viewer/Makefile \ - src/modules_contrib/garden/garden_webservices/Makefile \ - src/modules_geostatistics/Makefile \ - src/modules_geostatistics/geostatistics/Makefile \ - src/modules_geostatistics/geostatistics/geostatistics_points/Makefile \ - src/modules_geostatistics/geostatistics/geostatistics_grid/Makefile \ - src/modules_geostatistics/geostatistics/geostatistics_kriging/Makefile \ - src/modules_geostatistics/geostatistics/geostatistics_regression/Makefile \ - src/modules_images/Makefile \ - src/modules_images/modules_imagery/Makefile \ - src/modules_images/modules_imagery/imagery_classification/Makefile \ - src/modules_images/modules_imagery/imagery_rga/Makefile \ - src/modules_images/modules_imagery/imagery_segmentation/Makefile \ - src/modules_images/modules_imagery/imagery_svm/Makefile \ - src/modules_images/modules_imagery/imagery_tools/Makefile \ - src/modules_images/modules_opencv/Makefile \ - src/modules_images/modules_opencv/opencv/Makefile \ - src/modules_images/modules_vigra/Makefile \ - src/modules_images/modules_vigra/vigra/Makefile \ - src/modules_io/Makefile \ - src/modules_io/esri_e00/Makefile \ - src/modules_io/esri_e00/io_esri_e00/Makefile \ - src/modules_io/db/Makefile \ - src/modules_io/db/io_odbc/Makefile \ - src/modules_io/docs/Makefile \ - src/modules_io/docs/docs_html/Makefile \ - src/modules_io/docs/docs_pdf/Makefile \ - src/modules_io/gdal/Makefile \ - src/modules_io/gdal/io_gdal/Makefile \ - src/modules_io/grid/Makefile \ - src/modules_io/grid/io_grid/Makefile \ - src/modules_io/grid/io_grid_image/Makefile \ - src/modules_io/grid/io_grid_grib2/Makefile \ - src/modules_io/gps/Makefile \ - src/modules_io/gps/io_gps/Makefile \ - src/modules_io/shapes/Makefile \ - src/modules_io/shapes/io_shapes/Makefile \ - src/modules_io/shapes/io_shapes_dxf/Makefile \ - src/modules_io/shapes/io_shapes_las/Makefile \ - src/modules_io/table/Makefile \ - src/modules_io/table/io_table/Makefile \ - src/modules_lectures/Makefile \ - src/modules_lectures/lectures/Makefile \ - src/modules_lectures/lectures/lectures_introduction/Makefile \ - src/modules_projection/Makefile \ - src/modules_projection/pj_georeference/Makefile \ - src/modules_projection/pj_georeference/pj_georeference/Makefile \ - src/modules_projection/pj_proj4/Makefile \ - src/modules_projection/pj_proj4/pj_proj4/Makefile \ - src/modules_recreations/Makefile \ - src/modules_recreations/recreations/Makefile \ - src/modules_recreations/recreations/recreations_fractals/Makefile \ - src/modules_recreations/recreations/recreations_games/Makefile \ - src/modules_simulation/Makefile \ - src/modules_simulation/erosion/Makefile \ - src/modules_simulation/erosion/sim_erosion/Makefile \ - src/modules_simulation/hydrology/Makefile \ - src/modules_simulation/hydrology/sim_hydrology/Makefile \ - src/modules_simulation/cellular_automata/Makefile \ - src/modules_simulation/cellular_automata/sim_cellular_automata/Makefile \ - src/modules_simulation/ecosystems/Makefile \ - src/modules_simulation/ecosystems/sim_ecosystems_hugget/Makefile \ - src/modules_simulation/fire/Makefile \ - src/modules_simulation/fire/sim_fire_spreading/Makefile \ - src/modules_terrain_analysis/Makefile \ - src/modules_terrain_analysis/terrain_analysis/Makefile \ - src/modules_terrain_analysis/terrain_analysis/ta_channels/Makefile \ - src/modules_terrain_analysis/terrain_analysis/ta_compound/Makefile \ - src/modules_terrain_analysis/terrain_analysis/ta_hydrology/Makefile \ - src/modules_terrain_analysis/terrain_analysis/ta_lighting/Makefile \ - src/modules_terrain_analysis/terrain_analysis/ta_morphometry/Makefile \ - src/modules_terrain_analysis/terrain_analysis/ta_preprocessor/Makefile \ - src/modules_terrain_analysis/terrain_analysis/ta_profiles/Makefile \ -) diff -Nru saga-2.1.0+dfsg/COPYING saga-2.1.4+dfsg/COPYING --- saga-2.1.0+dfsg/COPYING 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/COPYING 2014-11-13 08:32:22.000000000 +0000 @@ -1,674 +1,77 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 +Copyright and License Statement +_______________________________________________________________________________ + + +The System for Automated Geoscientific Analyses (SAGA) is copyright by the +authors listed below. + +This program is free software; you can redistribute it and/or modify it under +the terms of the GNU General Public License (GPL) and the GNU Lesser General +Public License (LGPL) as published by the Free Software Foundation. + +_______________________________________________________________________________ + +------------------------------------------ + SAGA GUI - SAGA Graphical User Interface +------------------------------------------ + +Copyrights (c) 2005-2014 by Olaf Conrad +Portions (c) 2008-2014 by Volker Wichmann + +GNU General Public License (GPL) + + +---------------------------------------- + SAGA CMD - SAGA Command Line Processor +---------------------------------------- + +Copyrights (c) 2005-2014 by Olaf Conrad + +GNU General Public License (GPL) + + +--------------------------------------------------- + SAGA API - SAGA Application Programming Interface +--------------------------------------------------- + +Copyrights (c) 2002-2014 by Olaf Conrad +Portions (c) 2008-2014 by Volker Wichmann +Portions (c) 2005-2006 by Victor Olaya +Portions (c) 2002 by Andre Ringeler + +GNU Lesser General Public License (LGPL) + + +-------------- + SAGA Modules +-------------- + +Please have a look at the module descriptions supplied with each module on +information about the responsible authors and the licenses used. Most modules +are licensed under the GNU General Public License (GPL). + + +_______________________________________________________________________________ + +This program is distributed in the hope that it will be useful, but WITHOUT ANY +WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A +PARTICULAR PURPOSE. See the GNU General Public License (GPL) and GNU Lesser +General Public License (LGPL) for more details. + +You should have received a copy of both licenses along with this program; if +not, write to the + + Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor + Boston, MA 02110-1301, USA + + +_______________________________________________________________________________ + +Questions regarding SAGA GIS should be directed to one of the SAGA forums or +the developer mailing list available here: + +https://sourceforge.net/projects/saga-gis/ + +Project homepage: http://www.saga-gis.org/ - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - Copyright (C) - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. diff -Nru saga-2.1.0+dfsg/debian/changelog saga-2.1.4+dfsg/debian/changelog --- saga-2.1.0+dfsg/debian/changelog 2014-02-23 12:31:00.000000000 +0000 +++ saga-2.1.4+dfsg/debian/changelog 2014-11-30 23:09:35.000000000 +0000 @@ -1,14 +1,42 @@ -saga (2.1.0+dfsg-1build2) trusty; urgency=medium +saga (2.1.4+dfsg-1~trusty) trusty; urgency=medium - * rebuild against libqhull6 + * Trusty build - -- Julian Taylor Sun, 23 Feb 2014 13:29:57 +0100 + -- Johan Van de Wauw Mon, 01 Dec 2014 00:02:43 +0100 -saga (2.1.0+dfsg-1build1) trusty; urgency=medium +saga (2.1.4+dfsg-1) unstable; urgency=medium - * No-change rebuild for the libgdal1 -> libgdal1h transition. + * Update to new upstream version - -- Adam Conrad Sun, 29 Dec 2013 03:15:42 -0700 + -- Johan Van de Wauw Fri, 31 Oct 2014 21:31:09 +0100 + +saga (2.1.2+dfsg-3) unstable; urgency=medium + + * Use dep-5 style copyright file + * Enable OpenMP + * Revert "Temporarily disable building saga gui on arm" - bug resolved in gcc + * Fix provides tag + + -- Johan Van de Wauw Thu, 09 Oct 2014 21:09:35 +0200 + +saga (2.1.2+dfsg-2) unstable; urgency=medium + + * Remove unneeded configure option + * Fix wrong version number in saga-depends + * Temporarily disable building saga gui on arm (closes: #755361) + + -- Johan Van de Wauw Tue, 12 Aug 2014 18:48:40 +0200 + +saga (2.1.2+dfsg-1) unstable; urgency=medium + + * Import new upstream (closes: #717624) + * Fix patches - remove autoreconf results - rename configure.in + * Remove changes to Makefile.am (autoreconf) + * Remove patch (included upstream) + * Delete missing icons from menu fil + * Bump standards version - no changes needed + + -- Johan Van de Wauw Tue, 15 Jul 2014 04:38:14 -0400 saga (2.1.0+dfsg-1) unstable; urgency=low diff -Nru saga-2.1.0+dfsg/debian/compat saga-2.1.4+dfsg/debian/compat --- saga-2.1.0+dfsg/debian/compat 2013-12-05 17:41:26.000000000 +0000 +++ saga-2.1.4+dfsg/debian/compat 2014-11-13 23:10:25.000000000 +0000 @@ -1 +1 @@ -8 +9 diff -Nru saga-2.1.0+dfsg/debian/control saga-2.1.4+dfsg/debian/control --- saga-2.1.0+dfsg/debian/control 2013-12-05 17:41:26.000000000 +0000 +++ saga-2.1.4+dfsg/debian/control 2014-11-23 21:00:06.000000000 +0000 @@ -1,19 +1,36 @@ Source: saga +Maintainer: Debian GIS Project +Uploaders: Johan Van de Wauw , + Francesco Paolo Lovergine Section: science Priority: optional -Maintainer: Debian GIS Project -Uploaders: Johan Van de Wauw , Francesco Paolo Lovergine -Build-Depends: libwxgtk3.0-dev, wx-common, libgdal-dev, libexpat-dev, - libogdi3.2-dev, libproj-dev, libgrib2c-dev, debhelper (>=8), swig, - libqhull-dev, libhpdf-dev, python-dev, liblas-dev, dh-autoreconf -Standards-Version: 3.9.4 +Build-Depends: libwxgtk3.0-dev, + wx-common, + libgdal-dev, + libexpat-dev, + libogdi3.2-dev, + libproj-dev, + libgrib2c-dev, + debhelper (>= 9), + swig, + libqhull-dev, + libhpdf-dev, + python-dev, + liblas-dev, + dh-autoreconf, + libsvm-dev, + libvigraimpex-dev +Standards-Version: 3.9.6 +Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/saga.git +Vcs-Git: git://anonscm.debian.org/pkg-grass/saga.git -b experimental Homepage: http://www.saga-gis.org/ -Vcs-Git: git://git.debian.org/pkg-grass/saga.git -Vcs-Browser: http://git.debian.org/?p=pkg-grass/saga.git Package: saga Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, libsaga (= ${binary:Version}) +Depends: ${shlibs:Depends}, + ${misc:Depends}, + libsaga (= ${binary:Version}) +Pre-Depends: ${misc:Pre-Depends} Description: System for Automated Geoscientific Analyses SAGA GIS (System for Automated Geoscientific Analyses) is a free and open source geographic information system used for editing and @@ -26,12 +43,15 @@ by using the C++ API. Package: libsaga-dev -Section: libdevel Architecture: any +Multi-Arch: same +Section: libdevel +Depends: ${shlibs:Depends}, + ${misc:Depends}, + libsaga (= ${binary:Version}) Suggests: saga (= ${binary:Version}) -Depends: ${shlibs:Depends}, ${misc:Depends}, libsaga (= ${binary:Version}) -Replaces: libsaga (<< 2.0.4+dfsg-3~) Breaks: libsaga (<< 2.0.4+dfsg-3~) +Replaces: libsaga (<< 2.0.4+dfsg-3~) Description: SAGA GIS development files SAGA GIS (System for Automated Geoscientific Analyses) is a geographic information system used for editing and analysing spatial data. @@ -40,23 +60,30 @@ Install this package if you wish to develop software that uses the SAGA API. Package: libsaga -Section: libs Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} -Provides: libsaga-2.1.0 -Description: SAGA GIS development files +Multi-Arch: same +Section: libs +Depends: ${shlibs:Depends}, + ${misc:Depends} +Pre-Depends: ${misc:Pre-Depends} +Provides: libsaga-2.1.2 +Description: SAGA GIS shared libraries SAGA GIS (System for Automated Geoscientific Analyses) is a geographic information system used for editing and analysing spatial data. . This package contains the library files for developing with SAGA. Package: python-saga -Section: python Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, libsaga (= ${binary:Version}) +Section: python +Depends: ${shlibs:Depends}, + ${misc:Depends}, + ${python:Depends}, + libsaga (= ${binary:Version}) Suggests: saga (= ${binary:Version}) -Description: SAGA GIS python bindings +Pre-Depends: ${misc:Pre-Depends} +Description: SAGA GIS Python bindings SAGA GIS (System for Automated Geoscientific Analyses) is a geographic information system used for editing and analysing spatial data. . - This package contains the python bindings to SAGA. + This package contains the Python bindings to SAGA. diff -Nru saga-2.1.0+dfsg/debian/copyright saga-2.1.4+dfsg/debian/copyright --- saga-2.1.0+dfsg/debian/copyright 2013-12-05 17:41:26.000000000 +0000 +++ saga-2.1.4+dfsg/debian/copyright 2014-11-23 21:08:11.000000000 +0000 @@ -1,234 +1,216 @@ -The original source was downloaded from http://www.saga-gis.org -The main upstream author is: Olaf Conrad +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: SAGA GIS +Upstream-Contact: Olaf Conrad +Source: http://www.saga-gis.org +Comment: Saga is generally licensed using two licenses: LGPL-2.1 for the libraries and GPL-2 for the rest of the program. +Files-Excluded: src/modules/grid/grid_gridding/nn/triangle.c src/modules/grid/grid_gridding/nn/triangle.h src/modules/simulation/sim_fire_spreading /src/modules/io/io_grid_grib2/g2clib-1.0.4/ src/modules/imagery/imagery_svm/svm.cpp src/modules/imagery/imagery_svm/svm.h + +Files: * +Copyright: 2001-2014 Olaf Conrad + 2003-2006 Victor Olaya + 2001-2004 Andre Ringeler + 2007 Thomas Schorr + 2003-2014 Volker Wichmann +License: GPL-2 + +Files: src/saga_core/saga_api/* src/saga_core/saga_gdi/* +Copyright: 2001-2014 Olaf Conrad + 2003-2006 Victor Olaya + 2001-2004 Andre Ringeler + 2007 Thomas Schorr + 2003-2014 Volker Wichmann +License: LGPL-2.1 -On two places files were removed to adhere to the DFSG: -- the files triangle.c and triangle.h were removed from libgrid_gridding - because they are incompatible with the DFSG. The functionality - could be retained by linking to libqhull - src/modules/grid/grid_gridding/nn/triangle.[c/h] -- the module fire simulation: src/modules_simulation/fire/* - it relies on a non DFSG library: libfire (www.fire.org) - - -***Saga API and cli/gui - Copyright*** -src/saga_core/*: +Files: src/modules/* Copyright: 2001-2013 Olaf Conrad -Copyright: 2003-2006 Victor Olaya -Copyright: 2001-2004 Andre Ringeler -Copyright: 2007 Thomas Schorr -Copyright: 2003-2013 Volker Wichmann - -src/saga_core/saga_api/mat_formula.cpp -contains code base on work by: -Copyright 1993-1998 Herald Helfgott - -src/saga_core/saga_api/clipper.cpp -src/saga_core/saga_api/clipper.hpp -Copyright 2010-2011, Angus Johnson http://www.angusj.com - -src/saga_core/saga_odbc/otlv4.h -Copyright (C) 1996-2010, Sergei Kuchin (skuchin@gmail.com) - -***Saga API and cli/gui - License*** -src/saga_core/saga_api/* -src/saga_core/saga_gdi/* -src/saga_core/saga_odbc/* -License: LGPGL-2.1 available on debian at: /usr/share/common-licenses/LGPL-2.1 - -src/saga_core/saga_api/clipper.cpp -src/saga_core/saga_api/clipper.hpp -License: Boost Software License ver 1. -Boost Software License - Version 1.0 - August 17th, 2003 - -Permission is hereby granted, free of charge, to any person or organization -obtaining a copy of the software and accompanying documentation covered by -this license (the "Software") to use, reproduce, display, distribute, -execute, and transmit the Software, and to prepare derivative works of the -Software, and to permit third-parties to whom the Software is furnished to -do so, all subject to the following: - -The copyright notices in the Software and this entire statement, including -the above license grant, this restriction and the following disclaimer, -must be included in all copies of the Software, in whole or in part, and -all derivative works of the Software, unless such copies or derivative -works are solely in the form of machine-executable object code generated by -a source language processor. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT -SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE -FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, -ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -DEALINGS IN THE SOFTWARE. - - -src/saga_core/saga_odbc/otlv4.h -============================================================================= -ORACLE, ODBC and DB2/CLI Template Library, Version 4.0.210, -Copyright (C) 1996-2010, Sergei Kuchin (skuchin@gmail.com) - -This library is free software. Permission to use, copy, modify, -and/or distribute this software for any purpose with or without fee -is hereby granted, provided that the above copyright notice and -this permission notice appear in all copies. - -THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR -ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF -OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - -src/saga_core/saga_gui/* -src/saga_core/saga_cmd/* -License: GPL-2 available on debian at: /usr/share/common-licenses/GPL-2 - -*** SAGA modules: Copyright *** -src/modules/* -src/modules_* -Copyright: 2001-2013 Olaf Conrad -Copyright: 2002-2010 SAGA User Group Association -Copyright: 2003-2006 Victor Olaya -Copyright: 2001-2009 Andre Ringeler -Copyright: 2007 Thomas Schorr -Copyright: 2003-2011 Volker Wichmann -Copyright: 2004 Antonio Boggia -Copyright: 2004 Gianluca Massei -Copyright: 2006 Stefan Liersch -Copyright: Alessandro Perego -Copyright: 2007-2011 Johan Van de Wauw -Copyright: 2013 Benjamin Bechteld -Copyright: 2012 Magnus Bremer -Copyright: 2012 Muhammed Setiawan -Copyright: 2013 Luca Piras - -License: GPL-2 available on debian at: /usr/share/common-licenses/GPL-2 - -Some modules contain (parts of) previously published software: -src/modules_io/esri_e00/io_esri_e00/e00compr/* -Copyright 1998-1999 Frank Warmerdam and Daniel Morisette -MIT license: -Permission is hereby granted, free of charge, to any person obtaining a -copy of this software and associated documentation files (the "Software"), -to deal in the Software without restriction, including without limitation -the rights to use, copy, modify, merge, publish, distribute, sublicense, -and/or sell copies of the Software, and to permit persons to whom the -Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included -in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -DEALINGS IN THE SOFTWARE. - -shapes/io_shapes_dxf/dxflib -Copyright (C) 2001-2003 RibbonSoft. All rights reserved. -Copyright (C) 2001 Robert J. Campbell Jr -License: GPL-2 available on debian at: /usr/share/common-licenses/GPL-2 - -src/modules/shapes/shapes_lines_ex/* -Contains code from Plot Graphic Library -a C++/MFC charting library. -http://pgl.codeplex.com/ -Copyright (C) 2001 de Halleux Jonathan -LGPLv2.1+ (2.1 or higher) -the complete text of this license can be found in the file: -/usr/share/common-licenses/LGPL-2.1 - -src/modules_projection/pj_georeference/pj_georeference/* -A number of files in this directory comes from CMinpack: -http://devernay.free.fr/hacks/cminpack.html - -Minpack Copyright Notice (1999) University of Chicago. All rights reserved - -Redistribution and use in source and binary forms, with or -without modification, are permitted provided that the -following conditions are met: - -1. Redistributions of source code must retain the above -copyright notice, this list of conditions and the following -disclaimer. - -2. Redistributions in binary form must reproduce the above -copyright notice, this list of conditions and the following -disclaimer in the documentation and/or other materials -provided with the distribution. - -3. The end-user documentation included with the -redistribution, if any, must include the following -acknowledgment: - - "This product includes software developed by the - University of Chicago, as Operator of Argonne National - Laboratory. - -Alternately, this acknowledgment may appear in the software -itself, if and wherever such third-party acknowledgments -normally appear. - -4. WARRANTY DISCLAIMER. THE SOFTWARE IS SUPPLIED "AS IS" -WITHOUT WARRANTY OF ANY KIND. THE COPYRIGHT HOLDER, THE -UNITED STATES, THE UNITED STATES DEPARTMENT OF ENERGY, AND -THEIR EMPLOYEES: (1) DISCLAIM ANY WARRANTIES, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO ANY IMPLIED WARRANTIES -OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE -OR NON-INFRINGEMENT, (2) DO NOT ASSUME ANY LEGAL LIABILITY -OR RESPONSIBILITY FOR THE ACCURACY, COMPLETENESS, OR -USEFULNESS OF THE SOFTWARE, (3) DO NOT REPRESENT THAT USE OF -THE SOFTWARE WOULD NOT INFRINGE PRIVATELY OWNED RIGHTS, (4) -DO NOT WARRANT THAT THE SOFTWARE WILL FUNCTION -UNINTERRUPTED, THAT IT IS ERROR-FREE OR THAT ANY ERRORS WILL -BE CORRECTED. - -5. LIMITATION OF LIABILITY. IN NO EVENT WILL THE COPYRIGHT -HOLDER, THE UNITED STATES, THE UNITED STATES DEPARTMENT OF -ENERGY, OR THEIR EMPLOYEES: BE LIABLE FOR ANY INDIRECT, -INCIDENTAL, CONSEQUENTIAL, SPECIAL OR PUNITIVE DAMAGES OF -ANY KIND OR NATURE, INCLUDING BUT NOT LIMITED TO LOSS OF -PROFITS OR LOSS OF DATA, FOR ANY REASON WHATSOEVER, WHETHER -SUCH LIABILITY IS ASSERTED ON THE BASIS OF CONTRACT, TORT -(INCLUDING NEGLIGENCE OR STRICT LIABILITY), OR OTHERWISE, -EVEN IF ANY OF SAID PARTIES HAS BEEN WARNED OF THE -POSSIBILITY OF SUCH LOSS OR DAMAGES. - -src/modules/grid/grid_gridding/nn/*.[c|h] -saga/src/modules/grid/grid_spline/csa.[c|h] -upstream URL: http://code.google.com/p/nn-c/source/browse/nn/LICENSE -- the files triangle.[c|h] are removed -and upstream URL: http://http://code.google.com/p/csa-c/ - -Copyright (C) 2000-2008 Pavel Sakov and CSIRO - -Redistribution and use of material from the package `nn', with or without -modification, are permitted provided that the following conditions are -met: - - 1. Redistributions of material must retain the above copyright notice, this - list of conditions and the following disclaimer. - 2. The names of the authors may not be used to endorse or promote products - derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR IMPLIED -WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT -OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING -IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY -OF SUCH DAMAGE. + 2002-2010 SAGA User Group Association + 2003-2006 Victor Olaya + 2001-2009 Andre Ringeler + 2007 Thomas Schorr + 2003-2011 Volker Wichmann + 2004 Antonio Boggia + 2004 Gianluca Massei + 2006 Stefan Liersch + Alessandro Perego + 2007-2011 Johan Van de Wauw + 2013 Benjamin Bechteld + 2012 Magnus Bremer + 2012 Muhammed Setiawan + 2013 Luca Piras +License: GPL-2 + +Files:src/modules/imagery/imagery_tools/landsat_toar_core.cpp +Copyright: 2000-2005 Liam Girdwood + 2006 E. Jorge Tizado +Comment: Contains code modified from libnova-0.12, grass +License: GPL-2 + +Files: src/saga_core/saga_api/clipper.cpp src/saga_core/saga_api/clipper.hpp +Copyright: 2010-2011, Angus Johnson +License: Boost_Software_License + +Files: src/modules/db/db_odbc/otlv4.h +Copyright: 1996-2010 Sergei Kuchin +License: BSD-2-clause + ORACLE, ODBC and DB2/CLI Template Library, Version 4.0.210, + Copyright (C) 1996-2010, Sergei Kuchin (skuchin@gmail.com) + . + This library is free software. Permission to use, copy, modify, + and/or distribute this software for any purpose with or without fee + is hereby granted, provided that the above copyright notice and + this permission notice appear in all copies. + . + THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +Files: src/modules/io/io_esri_e00/e00compr/* +Copyright: 1998-1999 Frank Warmerdam and Daniel Morisette +Comment: these files are also part of the package e00compr, it makes sense to build + a library there +License: MIT + Permission is hereby granted, free of charge, to any person obtaining a + copy of this software and associated documentation files (the "Software"), + to deal in the Software without restriction, including without limitation + the rights to use, copy, modify, merge, publish, distribute, sublicense, + and/or sell copies of the Software, and to permit persons to whom the + Software is furnished to do so, subject to the following conditions: + . + The above copyright notice and this permission notice shall be included + in all copies or substantial portions of the Software. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + DEALINGS IN THE SOFTWARE. + +Files: src/modules/io/io_shapes_dxf/dxflib/* +Copyright: (C) 2001-2003 RibbonSoft. All rights reserved. + (C) 2001 Robert J. Campbell Jr +License: GPL-2 + +Files: src/modules/grid/grid_gridding/nn/* src/modules/grid/grid_spline/csa.* +Copyright:2000-2008 Pavel Sakov and CSIRO +License: BSD-4-clause + Redistribution and use of material from the package `nn', with or without + modification, are permitted provided that the following conditions are + met: + . + 1. Redistributions of material must retain the above copyright notice, this + list of conditions and the following disclaimer. + 2. The names of the authors may not be used to endorse or promote products + derived from this software without specific prior written permission. + . + THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR IMPLIED + WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO + EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING + IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + OF SUCH DAMAGE. -*** Debian packaging *** Files: debian/* -Copyright: 2010 Johan Van de Wauw -License: LGPLv2.1+ (2.1 or higher) -the complete text of this license can be found in the file: -/usr/share/common-licenses/LGPL-2.1 +Copyright: 2010-2014 Johan Van de Wauw +License: LGPL-2.1+ + +License: GPL-2 + This program is free software; you can redistribute it + and/or modify it under the terms of the GNU General Public + License as published by the Free Software Foundation; either + version 2 of the License. + . + This program is distributed in the hope that it will be + useful, but WITHOUT ANY WARRANTY; without even the implied + warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + PURPOSE. See the GNU General Public License for more + details. + . + You should have received a copy of the GNU General Public + License along with this package; if not, write to the Free + Software Foundation, Inc., 51 Franklin St, Fifth Floor, + Boston, MA 02110-1301 USA + . + On Debian systems, the full text of the GNU General Public + License version 2 can be found in the file + `/usr/share/common-licenses/GPL-2'. + +License: LGPL-2.1 + This library is free software; you can redistribute + it and/or modify it under the terms of the GNU Lesser + General Public License as published by the Free + Software Foundation, version 2.1 of the License. + . + This library is distributed in the hope that it will + be useful, but WITHOUT ANY WARRANTY; without even the + implied warranty of MERCHANTABILITY or FITNESS FOR A + PARTICULAR PURPOSE. See the GNU Lesser General Public + License for more details. + . + You should have received a copy of the GNU Lesser + General Public License along with this program; if + not, write to the Free Software Foundation, Inc., + 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, + USA. + . + On Debian systems, the full text of the GNU General Public + License version 2 can be found in the file + `/usr/share/common-licenses/LGPL-2.1'. + +License: LGPL-2.1+ + This library is free software; you can redistribute + it and/or modify it under the terms of the GNU Lesser + General Public License as published by the Free + Software Foundation, version 2.1 of the License, or (at your + option) any later version.. + . + This library is distributed in the hope that it will + be useful, but WITHOUT ANY WARRANTY; without even the + implied warranty of MERCHANTABILITY or FITNESS FOR A + PARTICULAR PURPOSE. See the GNU Lesser General Public + License for more details. + . + You should have received a copy of the GNU Lesser + General Public License along with this program; if + not, write to the Free Software Foundation, Inc., + 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, + USA. + . + On Debian systems, the full text of the GNU General Public + License version 2 can be found in the file + `/usr/share/common-licenses/LGPL-2.1'. + + +License: Boost_Software_License + Boost Software License - Version 1.0 - August 17th, 2003 + . + Permission is hereby granted, free of charge, to any person or organization + obtaining a copy of the software and accompanying documentation covered by + this license (the "Software") to use, reproduce, display, distribute, + execute, and transmit the Software, and to prepare derivative works of the + Software, and to permit third-parties to whom the Software is furnished to + do so, all subject to the following: + . + The copyright notices in the Software and this entire statement, including + the above license grant, this restriction and the following disclaimer, + must be included in all copies of the Software, in whole or in part, and + all derivative works of the Software, unless such copies or derivative + works are solely in the form of machine-executable object code generated by + a source language processor. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT + SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE + FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, + ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + DEALINGS IN THE SOFTWARE. diff -Nru saga-2.1.0+dfsg/debian/gbp.conf saga-2.1.4+dfsg/debian/gbp.conf --- saga-2.1.0+dfsg/debian/gbp.conf 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/debian/gbp.conf 2014-11-23 21:00:06.000000000 +0000 @@ -0,0 +1,16 @@ +[DEFAULT] + +# The default name for the upstream branch is "upstream". +# Change it if the name is different (for instance, "master"). +upstream-branch = upstream + +# The default name for the Debian branch is "master". +# Change it if the name is different (for instance, "debian/unstable"). +debian-branch = experimental + +# git-import-orig uses the following names for the upstream tags. +# Change the value if you are not using git-import-orig +upstream-tag = upstream/%(version)s + +# Always use pristine-tar. +pristine-tar = True diff -Nru saga-2.1.0+dfsg/debian/libsaga-dev.install saga-2.1.4+dfsg/debian/libsaga-dev.install --- saga-2.1.0+dfsg/debian/libsaga-dev.install 2013-12-05 17:41:26.000000000 +0000 +++ saga-2.1.4+dfsg/debian/libsaga-dev.install 2014-11-13 23:10:25.000000000 +0000 @@ -1,5 +1,5 @@ src/saga_core/saga_api/*.h /usr/include/saga_api/ src/saga_core/saga_gdi/*.h /usr/include/saga_gdi/ debian/saga-depends /usr/bin/ -usr/lib/libsaga_api.so -usr/lib/libsaga_gdi.so +usr/lib/*/libsaga_api.so +usr/lib/*/libsaga_gdi.so diff -Nru saga-2.1.0+dfsg/debian/libsaga.install saga-2.1.4+dfsg/debian/libsaga.install --- saga-2.1.0+dfsg/debian/libsaga.install 2013-12-05 17:41:26.000000000 +0000 +++ saga-2.1.4+dfsg/debian/libsaga.install 2014-11-13 23:10:25.000000000 +0000 @@ -1 +1 @@ -usr/lib/libsaga*-*.so +usr/lib/*/libsaga*-*.so diff -Nru saga-2.1.0+dfsg/debian/menu saga-2.1.4+dfsg/debian/menu --- saga-2.1.0+dfsg/debian/menu 2013-12-05 17:41:26.000000000 +0000 +++ saga-2.1.4+dfsg/debian/menu 2014-11-13 23:10:25.000000000 +0000 @@ -1,5 +1,2 @@ ?package(saga):needs="X11" section="Applications/Science/Geoscience"\ - title="saga" command="/usr/bin/saga_gui" \ - icon32x32="/usr/share/pixmaps/saga_icon_32.xpm"\ - icon16x16="/usr/share/pixmaps/saga_icon_16.xpm" - + title="saga" command="/usr/bin/saga_gui" diff -Nru saga-2.1.0+dfsg/debian/patches/0001-Remove-references-to-libfire.patch saga-2.1.4+dfsg/debian/patches/0001-Remove-references-to-libfire.patch --- saga-2.1.0+dfsg/debian/patches/0001-Remove-references-to-libfire.patch 2013-12-05 17:41:26.000000000 +0000 +++ saga-2.1.4+dfsg/debian/patches/0001-Remove-references-to-libfire.patch 2014-11-23 21:00:06.000000000 +0000 @@ -1,30 +1,42 @@ From: Johan Van de Wauw -Date: Thu, 14 Nov 2013 20:58:08 -0500 +Date: Tue, 15 Jul 2014 04:24:25 -0400 Subject: Remove references to libfire -libfire --- - configure.in | 2 -- - src/modules_simulation/Makefile.am | 2 +- - 2 files changed, 1 insertion(+), 3 deletions(-) + configure.ac | 1 - + src/modules/simulation/Makefile.am | 2 +- + src/modules/simulation/Makefile.in | 2 +- + 3 files changed, 2 insertions(+), 3 deletions(-) -diff --git a/configure.in b/configure.in -index 69eb6fd..7837a32 100755 ---- a/configure.in -+++ b/configure.in -@@ -296,8 +296,6 @@ AC_OUTPUT(Makefile \ - src/modules_simulation/cellular_automata/sim_cellular_automata/Makefile \ - src/modules_simulation/ecosystems/Makefile \ - src/modules_simulation/ecosystems/sim_ecosystems_hugget/Makefile \ -- src/modules_simulation/fire/Makefile \ -- src/modules_simulation/fire/sim_fire_spreading/Makefile \ - src/modules_terrain_analysis/Makefile \ - src/modules_terrain_analysis/terrain_analysis/Makefile \ - src/modules_terrain_analysis/terrain_analysis/ta_channels/Makefile \ -diff --git a/src/modules_simulation/Makefile.am b/src/modules_simulation/Makefile.am -index 431dee5..0d38f09 100644 ---- a/src/modules_simulation/Makefile.am -+++ b/src/modules_simulation/Makefile.am +diff --git a/configure.ac b/configure.ac +index d419561..dff2da2 100755 +--- a/configure.ac ++++ b/configure.ac +@@ -276,7 +276,6 @@ AC_OUTPUT(Makefile \ + src/modules/simulation/sim_cellular_automata/Makefile \ + src/modules/simulation/sim_ecosystems_hugget/Makefile \ + src/modules/simulation/sim_erosion/Makefile \ +- src/modules/simulation/sim_fire_spreading/Makefile \ + src/modules/simulation/sim_hydrology/Makefile \ + src/modules/simulation/sim_ihacres/Makefile \ + src/modules/statistics/Makefile \ +diff --git a/src/modules/simulation/Makefile.am b/src/modules/simulation/Makefile.am +index 7ec461d..2f378e2 100644 +--- a/src/modules/simulation/Makefile.am ++++ b/src/modules/simulation/Makefile.am @@ -1 +1 @@ --SUBDIRS = hydrology fire ecosystems cellular_automata erosion -+SUBDIRS = hydrology ecosystems cellular_automata erosion +-SUBDIRS = sim_cellular_automata sim_ecosystems_hugget sim_erosion sim_fire_spreading sim_hydrology sim_ihacres ++SUBDIRS = sim_cellular_automata sim_ecosystems_hugget sim_erosion sim_hydrology sim_ihacres +diff --git a/src/modules/simulation/Makefile.in b/src/modules/simulation/Makefile.in +index c4823da..2f9e27c 100644 +--- a/src/modules/simulation/Makefile.in ++++ b/src/modules/simulation/Makefile.in +@@ -236,7 +236,7 @@ target_alias = @target_alias@ + top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ +-SUBDIRS = sim_cellular_automata sim_ecosystems_hugget sim_erosion sim_fire_spreading sim_hydrology sim_ihacres ++SUBDIRS = sim_cellular_automata sim_ecosystems_hugget sim_erosion sim_hydrology sim_ihacres + all: all-recursive + + .SUFFIXES: diff -Nru saga-2.1.0+dfsg/debian/patches/0002-Use-debian-version-of-grib2.patch saga-2.1.4+dfsg/debian/patches/0002-Use-debian-version-of-grib2.patch --- saga-2.1.0+dfsg/debian/patches/0002-Use-debian-version-of-grib2.patch 2013-12-05 17:41:26.000000000 +0000 +++ saga-2.1.4+dfsg/debian/patches/0002-Use-debian-version-of-grib2.patch 2014-11-23 21:00:06.000000000 +0000 @@ -1,16 +1,15 @@ From: Johan Van de Wauw -Date: Thu, 14 Nov 2013 21:00:49 -0500 +Date: Tue, 15 Jul 2014 04:28:04 -0400 Subject: Use debian version of grib2 --- - src/modules_io/grid/io_grid_grib2/Makefile.am | 50 +----------------------- - src/modules_io/grid/io_grid_grib2/grib2_import.h | 2 +- - 2 files changed, 2 insertions(+), 50 deletions(-) + src/modules/io/io_grid_grib2/Makefile.am | 50 +------------------------------- + 1 file changed, 1 insertion(+), 49 deletions(-) -diff --git a/src/modules_io/grid/io_grid_grib2/Makefile.am b/src/modules_io/grid/io_grid_grib2/Makefile.am +diff --git a/src/modules/io/io_grid_grib2/Makefile.am b/src/modules/io/io_grid_grib2/Makefile.am index 2d6ff24..7e006ae 100644 ---- a/src/modules_io/grid/io_grid_grib2/Makefile.am -+++ b/src/modules_io/grid/io_grid_grib2/Makefile.am +--- a/src/modules/io/io_grid_grib2/Makefile.am ++++ b/src/modules/io/io_grid_grib2/Makefile.am @@ -11,57 +11,9 @@ DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -DUSE_JPEG200 CXX_INCS = -I$(top_srcdir)/src/saga_core $(LOCAL_INCS) AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS) @@ -70,16 +69,3 @@ grib2_import.cpp\ MLB_Interface.cpp\ grib2_import.h\ -diff --git a/src/modules_io/grid/io_grid_grib2/grib2_import.h b/src/modules_io/grid/io_grid_grib2/grib2_import.h -index 6381b89..5ab426b 100644 ---- a/src/modules_io/grid/io_grid_grib2/grib2_import.h -+++ b/src/modules_io/grid/io_grid_grib2/grib2_import.h -@@ -11,7 +11,7 @@ - - #include "MLB_Interface.h" - extern "C" { --#include "g2clib-1.0.4/grib2.h" -+#include - } - - diff -Nru saga-2.1.0+dfsg/debian/patches/0003-Autoreconf-fi-result.patch saga-2.1.4+dfsg/debian/patches/0003-Autoreconf-fi-result.patch --- saga-2.1.0+dfsg/debian/patches/0003-Autoreconf-fi-result.patch 2013-12-05 17:41:26.000000000 +0000 +++ saga-2.1.4+dfsg/debian/patches/0003-Autoreconf-fi-result.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,89985 +0,0 @@ -From: Johan Van de Wauw -Date: Thu, 14 Nov 2013 21:58:12 -0500 -Subject: Autoreconf -fi result - ---- - INSTALL | 15 +- - Makefile.in | 396 +- - aclocal.m4 | 739 +- - config.guess | 405 +- - config.h.in | 3 + - config.sub | 286 +- - configure | 15819 ++++++++----------- - depcomp | 531 +- - install-sh | 35 +- - ltmain.sh | 4039 +++-- - m4/libtool.m4 | 2281 ++- - m4/ltoptions.m4 | 32 +- - m4/ltversion.m4 | 12 +- - m4/lt~obsolete.m4 | 12 +- - missing | 461 +- - py-compile | 68 +- - src/Makefile.in | 292 +- - src/modules/Makefile.in | 292 +- - src/modules/climate/Makefile.in | 292 +- - src/modules/climate/climate_tools/Makefile.in | 288 +- - src/modules/grid/Makefile.in | 292 +- - src/modules/grid/grid_analysis/Makefile.in | 288 +- - src/modules/grid/grid_calculus/Makefile.in | 288 +- - src/modules/grid/grid_calculus_bsl/Makefile.in | 288 +- - src/modules/grid/grid_filter/Makefile.in | 288 +- - src/modules/grid/grid_gridding/Makefile.in | 376 +- - src/modules/grid/grid_spline/Makefile.in | 312 +- - src/modules/grid/grid_tools/Makefile.in | 288 +- - src/modules/grid/grid_visualisation/Makefile.in | 288 +- - src/modules/pointcloud/Makefile.in | 292 +- - .../pointcloud/pointcloud_tools/Makefile.in | 288 +- - .../pointcloud/pointcloud_viewer/Makefile.in | 288 +- - src/modules/shapes/Makefile.in | 292 +- - src/modules/shapes/shapes_grid/Makefile.in | 288 +- - src/modules/shapes/shapes_lines/Makefile.in | 288 +- - src/modules/shapes/shapes_points/Makefile.in | 288 +- - src/modules/shapes/shapes_polygons/Makefile.in | 288 +- - src/modules/shapes/shapes_tools/Makefile.in | 288 +- - src/modules/shapes/shapes_transect/Makefile.in | 288 +- - src/modules/table/Makefile.in | 292 +- - src/modules/table/table_calculus/Makefile.in | 288 +- - src/modules/table/table_tools/Makefile.in | 288 +- - src/modules/tin/Makefile.in | 292 +- - src/modules/tin/tin_tools/Makefile.in | 288 +- - src/modules/tin/tin_viewer/Makefile.in | 288 +- - src/modules_contrib/Makefile.in | 292 +- - src/modules_contrib/contrib_a_perego/Makefile.in | 292 +- - .../contrib_a_perego/contrib_a_perego/Makefile.in | 288 +- - src/modules_contrib/contrib_s_liersch/Makefile.in | 292 +- - .../contrib_s_liersch/ihacres/Makefile.in | 288 +- - src/modules_contrib/garden/Makefile.in | 292 +- - .../garden/garden_3d_viewer/Makefile.in | 288 +- - .../garden/garden_webservices/Makefile.in | 288 +- - src/modules_geostatistics/Makefile.in | 292 +- - .../geostatistics/Makefile.in | 292 +- - .../geostatistics/geostatistics_grid/Makefile.in | 288 +- - .../geostatistics_kriging/Makefile.in | 288 +- - .../geostatistics/geostatistics_points/Makefile.in | 288 +- - .../geostatistics_regression/Makefile.in | 288 +- - src/modules_images/Makefile.in | 292 +- - src/modules_images/modules_imagery/Makefile.in | 292 +- - .../imagery_classification/Makefile.in | 288 +- - .../modules_imagery/imagery_rga/Makefile.in | 288 +- - .../imagery_segmentation/Makefile.in | 288 +- - .../modules_imagery/imagery_svm/Makefile.in | 288 +- - .../modules_imagery/imagery_tools/Makefile.in | 288 +- - src/modules_images/modules_opencv/Makefile.in | 292 +- - .../modules_opencv/opencv/Makefile.in | 288 +- - src/modules_images/modules_vigra/Makefile.in | 292 +- - src/modules_images/modules_vigra/vigra/Makefile.in | 288 +- - src/modules_io/Makefile.in | 292 +- - src/modules_io/db/Makefile.in | 292 +- - src/modules_io/db/io_odbc/Makefile.in | 288 +- - src/modules_io/docs/Makefile.in | 292 +- - src/modules_io/docs/docs_html/Makefile.in | 288 +- - src/modules_io/docs/docs_pdf/Makefile.in | 288 +- - src/modules_io/esri_e00/Makefile.in | 292 +- - src/modules_io/esri_e00/io_esri_e00/Makefile.in | 352 +- - src/modules_io/gdal/Makefile.in | 292 +- - src/modules_io/gdal/io_gdal/Makefile.in | 288 +- - src/modules_io/gps/Makefile.in | 292 +- - src/modules_io/gps/io_gps/Makefile.in | 288 +- - src/modules_io/grid/Makefile.in | 292 +- - src/modules_io/grid/io_grid/Makefile.in | 288 +- - src/modules_io/grid/io_grid_grib2/Makefile.in | 731 +- - src/modules_io/grid/io_grid_image/Makefile.in | 288 +- - src/modules_io/shapes/Makefile.in | 292 +- - src/modules_io/shapes/io_shapes/Makefile.in | 288 +- - src/modules_io/shapes/io_shapes_dxf/Makefile.in | 304 +- - src/modules_io/shapes/io_shapes_las/Makefile.in | 288 +- - src/modules_io/table/Makefile.in | 292 +- - src/modules_io/table/io_table/Makefile.in | 288 +- - src/modules_lectures/Makefile.in | 292 +- - src/modules_lectures/lectures/Makefile.in | 292 +- - .../lectures/lectures_introduction/Makefile.in | 288 +- - src/modules_projection/Makefile.in | 292 +- - src/modules_projection/pj_georeference/Makefile.in | 292 +- - .../pj_georeference/pj_georeference/Makefile.in | 312 +- - src/modules_projection/pj_proj4/Makefile.in | 292 +- - .../pj_proj4/pj_proj4/Makefile.in | 288 +- - src/modules_recreations/Makefile.in | 292 +- - src/modules_recreations/recreations/Makefile.in | 292 +- - .../recreations/recreations_fractals/Makefile.in | 288 +- - .../recreations/recreations_games/Makefile.in | 288 +- - src/modules_simulation/Makefile.in | 294 +- - .../cellular_automata/Makefile.in | 292 +- - .../sim_cellular_automata/Makefile.in | 288 +- - src/modules_simulation/ecosystems/Makefile.in | 292 +- - .../ecosystems/sim_ecosystems_hugget/Makefile.in | 288 +- - src/modules_simulation/erosion/Makefile.in | 292 +- - .../erosion/sim_erosion/Makefile.in | 288 +- - src/modules_simulation/hydrology/Makefile.in | 292 +- - .../hydrology/sim_hydrology/Makefile.in | 288 +- - src/modules_terrain_analysis/Makefile.in | 292 +- - .../terrain_analysis/Makefile.in | 292 +- - .../terrain_analysis/ta_channels/Makefile.in | 288 +- - .../terrain_analysis/ta_compound/Makefile.in | 288 +- - .../terrain_analysis/ta_hydrology/Makefile.in | 288 +- - .../terrain_analysis/ta_lighting/Makefile.in | 288 +- - .../terrain_analysis/ta_morphometry/Makefile.in | 288 +- - .../terrain_analysis/ta_preprocessor/Makefile.in | 288 +- - .../terrain_analysis/ta_profiles/Makefile.in | 288 +- - src/saga_core/Makefile.in | 292 +- - src/saga_core/saga_api/Makefile.in | 392 +- - src/saga_core/saga_cmd/Makefile.in | 388 +- - src/saga_core/saga_cmd/man/Makefile.in | 162 +- - src/saga_core/saga_gdi/Makefile.in | 290 +- - src/saga_core/saga_gui/Makefile.in | 388 +- - src/saga_core/saga_gui/man/Makefile.in | 162 +- - src/saga_core/saga_odbc/Makefile.in | 290 +- - 130 files changed, 34634 insertions(+), 24217 deletions(-) - mode change 100755 => 100644 ltmain.sh - -diff --git a/INSTALL b/INSTALL -index 7d1c323..007e939 100644 ---- a/INSTALL -+++ b/INSTALL -@@ -1,8 +1,8 @@ - Installation Instructions - ************************* - --Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, --2006, 2007, 2008, 2009 Free Software Foundation, Inc. -+Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation, -+Inc. - - Copying and distribution of this file, with or without modification, - are permitted in any medium without royalty provided the copyright -@@ -226,6 +226,11 @@ order to use an ANSI C compiler: - - and if that doesn't work, install pre-built binaries of GCC for HP-UX. - -+ HP-UX `make' updates targets which have the same time stamps as -+their prerequisites, which makes it generally unusable when shipped -+generated files such as `configure' are involved. Use GNU `make' -+instead. -+ - On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot - parse its `' header file. The option `-nodtk' can be used as - a workaround. If GNU CC is not installed, it is therefore recommended -@@ -304,9 +309,10 @@ causes the specified `gcc' to be used as the C compiler (unless it is - overridden in the site shell script). - - Unfortunately, this technique does not work for `CONFIG_SHELL' due to --an Autoconf bug. Until the bug is fixed you can use this workaround: -+an Autoconf limitation. Until the limitation is lifted, you can use -+this workaround: - -- CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash -+ CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash - - `configure' Invocation - ====================== -@@ -362,4 +368,3 @@ operates. - - `configure' also accepts some other, not widely useful, options. Run - `configure --help' for more details. -- -diff --git a/Makefile.in b/Makefile.in -index 1822491..47869c1 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -1,9 +1,8 @@ --# Makefile.in generated by automake 1.11.1 from Makefile.am. -+# Makefile.in generated by automake 1.14 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, --# Inc. -+# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+ - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -15,6 +14,51 @@ - - @SET_MAKE@ - VPATH = @srcdir@ -+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -+am__make_running_with_option = \ -+ case $${target_option-} in \ -+ ?) ;; \ -+ *) echo "am__make_running_with_option: internal error: invalid" \ -+ "target option '$${target_option-}' specified" >&2; \ -+ exit 1;; \ -+ esac; \ -+ has_opt=no; \ -+ sane_makeflags=$$MAKEFLAGS; \ -+ if $(am__is_gnu_make); then \ -+ sane_makeflags=$$MFLAGS; \ -+ else \ -+ case $$MAKEFLAGS in \ -+ *\\[\ \ ]*) \ -+ bs=\\; \ -+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -+ esac; \ -+ fi; \ -+ skip_next=no; \ -+ strip_trailopt () \ -+ { \ -+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -+ }; \ -+ for flg in $$sane_makeflags; do \ -+ test $$skip_next = yes && { skip_next=no; continue; }; \ -+ case $$flg in \ -+ *=*|--*) continue;; \ -+ -*I) strip_trailopt 'I'; skip_next=yes;; \ -+ -*I?*) strip_trailopt 'I';; \ -+ -*O) strip_trailopt 'O'; skip_next=yes;; \ -+ -*O?*) strip_trailopt 'O';; \ -+ -*l) strip_trailopt 'l'; skip_next=yes;; \ -+ -*l?*) strip_trailopt 'l';; \ -+ -[dEDm]) skip_next=yes;; \ -+ -[JT]) skip_next=yes;; \ -+ esac; \ -+ case $$flg in \ -+ *$$target_option*) has_opt=yes; break;; \ -+ esac; \ -+ done; \ -+ test $$has_opt = yes -+am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -+am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -34,11 +78,11 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - subdir = . --DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ -- $(srcdir)/Makefile.in $(srcdir)/config.h.in \ -- $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \ -- config.guess config.sub depcomp install-sh ltmain.sh missing \ -- py-compile -+DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \ -+ $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ -+ $(top_srcdir)/configure $(am__configure_deps) \ -+ $(srcdir)/config.h.in COPYING compile config.guess config.sub \ -+ depcomp install-sh missing py-compile ltmain.sh - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ - $(top_srcdir)/m4/ax_python_devel.m4 \ -@@ -55,30 +99,73 @@ mkinstalldirs = $(install_sh) -d - CONFIG_HEADER = config.h - CONFIG_CLEAN_FILES = - CONFIG_CLEAN_VPATH_FILES = -+AM_V_P = $(am__v_P_@AM_V@) -+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -+am__v_P_0 = false -+am__v_P_1 = : -+AM_V_GEN = $(am__v_GEN_@AM_V@) -+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+am__v_GEN_0 = @echo " GEN " $@; -+am__v_GEN_1 = -+AM_V_at = $(am__v_at_@AM_V@) -+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+am__v_at_0 = @ -+am__v_at_1 = - SOURCES = - DIST_SOURCES = --RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ -- html-recursive info-recursive install-data-recursive \ -- install-dvi-recursive install-exec-recursive \ -- install-html-recursive install-info-recursive \ -- install-pdf-recursive install-ps-recursive install-recursive \ -- installcheck-recursive installdirs-recursive pdf-recursive \ -- ps-recursive uninstall-recursive -+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ -+ ctags-recursive dvi-recursive html-recursive info-recursive \ -+ install-data-recursive install-dvi-recursive \ -+ install-exec-recursive install-html-recursive \ -+ install-info-recursive install-pdf-recursive \ -+ install-ps-recursive install-recursive installcheck-recursive \ -+ installdirs-recursive pdf-recursive ps-recursive \ -+ tags-recursive uninstall-recursive -+am__can_run_installinfo = \ -+ case $$AM_UPDATE_INFO_DIR in \ -+ n|no|NO) false;; \ -+ *) (install-info --version) >/dev/null 2>&1;; \ -+ esac - RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ - distclean-recursive maintainer-clean-recursive --AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ -- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ -- distdir dist dist-all distcheck -+am__recursive_targets = \ -+ $(RECURSIVE_TARGETS) \ -+ $(RECURSIVE_CLEAN_TARGETS) \ -+ $(am__extra_recursive_targets) -+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ -+ cscope distdir dist dist-all distcheck -+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \ -+ $(LISP)config.h.in -+# Read a list of newline-separated strings from the standard input, -+# and print each of them once, without duplicates. Input order is -+# *not* preserved. -+am__uniquify_input = $(AWK) '\ -+ BEGIN { nonempty = 0; } \ -+ { items[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in items) print i; }; } \ -+' -+# Make sure the list of sources is unique. This is necessary because, -+# e.g., the same source file might be shared among _SOURCES variables -+# for different programs/libraries. -+am__define_uniq_tagged_files = \ -+ list='$(am__tagged_files)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | $(am__uniquify_input)` - ETAGS = etags - CTAGS = ctags -+CSCOPE = cscope - DIST_SUBDIRS = $(SUBDIRS) - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - distdir = $(PACKAGE)-$(VERSION) - top_distdir = $(distdir) - am__remove_distdir = \ -- { test ! -d "$(distdir)" \ -- || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ -- && rm -fr "$(distdir)"; }; } -+ if test -d "$(distdir)"; then \ -+ find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ -+ && rm -rf "$(distdir)" \ -+ || { sleep 5 && rm -rf "$(distdir)"; }; \ -+ else :; fi -+am__post_remove_distdir = $(am__remove_distdir) - am__relativize = \ - dir0=`pwd`; \ - sed_first='s,^\([^/]*\)/.*$$,\1,'; \ -@@ -106,10 +193,14 @@ am__relativize = \ - reldir="$$dir2" - DIST_ARCHIVES = $(distdir).tar.gz - GZIP_ENV = --best -+DIST_TARGETS = dist-gzip - distuninstallcheck_listfiles = find . -type f -print -+am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ -+ | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' - distcleancheck_listfiles = find . -type f -print - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ -+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ -@@ -130,6 +221,7 @@ CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DISABLELIBHARU = @DISABLELIBHARU@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -157,6 +249,7 @@ LOCAL_INCS = @LOCAL_INCS@ - LOCAL_LIBS = @LOCAL_LIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - NM = @NM@ - NMEDIT = @NMEDIT@ -@@ -169,6 +262,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - POW_LIB = @POW_LIB@ -@@ -194,6 +288,7 @@ abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -@@ -227,7 +322,6 @@ libdir = @libdir@ - libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -@@ -255,7 +349,7 @@ all: config.h - $(MAKE) $(AM_MAKEFLAGS) all-recursive - - .SUFFIXES: --am--refresh: -+am--refresh: Makefile - @: - $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ -@@ -291,10 +385,8 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) - $(am__aclocal_m4_deps): - - config.h: stamp-h1 -- @if test ! -f $@; then \ -- rm -f stamp-h1; \ -- $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \ -- else :; fi -+ @test -f $@ || rm -f stamp-h1 -+ @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1 - - stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status - @rm -f stamp-h1 -@@ -317,22 +409,25 @@ distclean-libtool: - -rm -f libtool config.lt - - # This directory's subdirectories are mostly independent; you can cd --# into them and run `make' without going through this Makefile. --# To change the values of `make' variables: instead of editing Makefiles, --# (1) if the variable is set in `config.status', edit `config.status' --# (which will cause the Makefiles to be regenerated when you run `make'); --# (2) otherwise, pass the desired values on the `make' command line. --$(RECURSIVE_TARGETS): -- @fail= failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -+# into them and run 'make' without going through this Makefile. -+# To change the values of 'make' variables: instead of editing Makefiles, -+# (1) if the variable is set in 'config.status', edit 'config.status' -+# (which will cause the Makefiles to be regenerated when you run 'make'); -+# (2) otherwise, pass the desired values on the 'make' command line. -+$(am__recursive_targets): -+ @fail=; \ -+ if $(am__make_keepgoing); then \ -+ failcom='fail=yes'; \ -+ else \ -+ failcom='exit 1'; \ -+ fi; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ -- list='$(SUBDIRS)'; for subdir in $$list; do \ -+ case "$@" in \ -+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -+ *) list='$(SUBDIRS)' ;; \ -+ esac; \ -+ for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ -@@ -347,57 +442,12 @@ $(RECURSIVE_TARGETS): - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - --$(RECURSIVE_CLEAN_TARGETS): -- @fail= failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -- dot_seen=no; \ -- case "$@" in \ -- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -- *) list='$(SUBDIRS)' ;; \ -- esac; \ -- rev=''; for subdir in $$list; do \ -- if test "$$subdir" = "."; then :; else \ -- rev="$$subdir $$rev"; \ -- fi; \ -- done; \ -- rev="$$rev ."; \ -- target=`echo $@ | sed s/-recursive//`; \ -- for subdir in $$rev; do \ -- echo "Making $$target in $$subdir"; \ -- if test "$$subdir" = "."; then \ -- local_target="$$target-am"; \ -- else \ -- local_target="$$target"; \ -- fi; \ -- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || eval $$failcom; \ -- done && test -z "$$fail" --tags-recursive: -- list='$(SUBDIRS)'; for subdir in $$list; do \ -- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ -- done --ctags-recursive: -- list='$(SUBDIRS)'; for subdir in $$list; do \ -- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ -- done -+ID: $(am__tagged_files) -+ $(am__define_uniq_tagged_files); mkid -fID $$unique -+tags: tags-recursive -+TAGS: tags - --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ - if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ -@@ -413,12 +463,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ - set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ -- list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ -@@ -430,15 +475,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ - $$unique; \ - fi; \ - fi --ctags: CTAGS --CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ctags: ctags-recursive -+ -+CTAGS: ctags -+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) -+ $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique -@@ -447,9 +488,31 @@ GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -+cscope: cscope.files -+ test ! -s cscope.files \ -+ || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS) -+clean-cscope: -+ -rm -f cscope.files -+cscope.files: clean-cscope cscopelist -+cscopelist: cscopelist-recursive -+ -+cscopelist-am: $(am__tagged_files) -+ list='$(am__tagged_files)'; \ -+ case "$(srcdir)" in \ -+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ -+ *) sdir=$(subdir)/$(srcdir) ;; \ -+ esac; \ -+ for i in $$list; do \ -+ if test -f "$$i"; then \ -+ echo "$(subdir)/$$i"; \ -+ else \ -+ echo "$$sdir/$$i"; \ -+ fi; \ -+ done >> $(top_builddir)/cscope.files - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -+ -rm -f cscope.out cscope.in.out cscope.po.out cscope.files - - distdir: $(DISTFILES) - $(am__remove_distdir) -@@ -485,13 +548,10 @@ distdir: $(DISTFILES) - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test -d "$(distdir)/$$subdir" \ -- || $(MKDIR_P) "$(distdir)/$$subdir" \ -- || exit 1; \ -- fi; \ -- done -- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ -- if test "$$subdir" = .; then :; else \ -+ $(am__make_dryrun) \ -+ || test -d "$(distdir)/$$subdir" \ -+ || $(MKDIR_P) "$(distdir)/$$subdir" \ -+ || exit 1; \ - dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ - $(am__relativize); \ - new_distdir=$$reldir; \ -@@ -520,36 +580,42 @@ distdir: $(DISTFILES) - || chmod -R a+r "$(distdir)" - dist-gzip: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz -- $(am__remove_distdir) -+ $(am__post_remove_distdir) - - dist-bzip2: distdir -- tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 -- $(am__remove_distdir) -+ tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 -+ $(am__post_remove_distdir) - --dist-lzma: distdir -- tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma -- $(am__remove_distdir) -+dist-lzip: distdir -+ tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz -+ $(am__post_remove_distdir) - - dist-xz: distdir -- tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz -- $(am__remove_distdir) -+ tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz -+ $(am__post_remove_distdir) - - dist-tarZ: distdir -+ @echo WARNING: "Support for shar distribution archives is" \ -+ "deprecated." >&2 -+ @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 - tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z -- $(am__remove_distdir) -+ $(am__post_remove_distdir) - - dist-shar: distdir -+ @echo WARNING: "Support for distribution archives compressed with" \ -+ "legacy program 'compress' is deprecated." >&2 -+ @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 - shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz -- $(am__remove_distdir) -+ $(am__post_remove_distdir) - - dist-zip: distdir - -rm -f $(distdir).zip - zip -rq $(distdir).zip $(distdir) -- $(am__remove_distdir) -+ $(am__post_remove_distdir) - --dist dist-all: distdir -- tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz -- $(am__remove_distdir) -+dist dist-all: -+ $(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:' -+ $(am__post_remove_distdir) - - # This target untars the dist file and tries a VPATH configuration. Then - # it guarantees that the distribution is self-contained by making another -@@ -560,8 +626,8 @@ distcheck: dist - GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ - *.tar.bz2*) \ - bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ -- *.tar.lzma*) \ -- lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ -+ *.tar.lz*) \ -+ lzip -dc $(distdir).tar.lz | $(am__untar) ;;\ - *.tar.xz*) \ - xz -dc $(distdir).tar.xz | $(am__untar) ;;\ - *.tar.Z*) \ -@@ -571,9 +637,9 @@ distcheck: dist - *.zip*) \ - unzip $(distdir).zip ;;\ - esac -- chmod -R a-w $(distdir); chmod u+w $(distdir) -- mkdir $(distdir)/_build -- mkdir $(distdir)/_inst -+ chmod -R a-w $(distdir) -+ chmod u+w $(distdir) -+ mkdir $(distdir)/_build $(distdir)/_inst - chmod a-w $(distdir) - test -d $(distdir)/_build || exit 0; \ - dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ -@@ -581,6 +647,7 @@ distcheck: dist - && am__cwd=`pwd` \ - && $(am__cd) $(distdir)/_build \ - && ../configure --srcdir=.. --prefix="$$dc_install_base" \ -+ $(AM_DISTCHECK_CONFIGURE_FLAGS) \ - $(DISTCHECK_CONFIGURE_FLAGS) \ - && $(MAKE) $(AM_MAKEFLAGS) \ - && $(MAKE) $(AM_MAKEFLAGS) dvi \ -@@ -604,13 +671,21 @@ distcheck: dist - && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \ - && cd "$$am__cwd" \ - || exit 1 -- $(am__remove_distdir) -+ $(am__post_remove_distdir) - @(echo "$(distdir) archives ready for distribution: "; \ - list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ - sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' - distuninstallcheck: -- @$(am__cd) '$(distuninstallcheck_dir)' \ -- && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ -+ @test -n '$(distuninstallcheck_dir)' || { \ -+ echo 'ERROR: trying to run $@ with an empty' \ -+ '$$(distuninstallcheck_dir)' >&2; \ -+ exit 1; \ -+ }; \ -+ $(am__cd) '$(distuninstallcheck_dir)' || { \ -+ echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \ -+ exit 1; \ -+ }; \ -+ test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \ - || { echo "ERROR: files left after uninstall:" ; \ - if test -n "$(DESTDIR)"; then \ - echo " (check DESTDIR support)"; \ -@@ -641,10 +716,15 @@ install-am: all-am - - installcheck: installcheck-recursive - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+ if test -z '$(STRIP)'; then \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ install; \ -+ else \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -+ fi - mostlyclean-generic: - - clean-generic: -@@ -726,24 +806,24 @@ ps-am: - - uninstall-am: - --.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \ -- ctags-recursive install-am install-strip tags-recursive -- --.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ -- all all-am am--refresh check check-am clean clean-generic \ -- clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \ -- dist-gzip dist-lzma dist-shar dist-tarZ dist-xz dist-zip \ -- distcheck distclean distclean-generic distclean-hdr \ -- distclean-libtool distclean-tags distcleancheck distdir \ -- distuninstallcheck dvi dvi-am html html-am info info-am \ -- install install-am install-data install-data-am install-dvi \ -- install-dvi-am install-exec install-exec-am install-html \ -- install-html-am install-info install-info-am install-man \ -- install-pdf install-pdf-am install-ps install-ps-am \ -- install-strip installcheck installcheck-am installdirs \ -- installdirs-am maintainer-clean maintainer-clean-generic \ -- mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ -- ps ps-am tags tags-recursive uninstall uninstall-am -+.MAKE: $(am__recursive_targets) all install-am install-strip -+ -+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \ -+ am--refresh check check-am clean clean-cscope clean-generic \ -+ clean-libtool cscope cscopelist-am ctags ctags-am dist \ -+ dist-all dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ \ -+ dist-xz dist-zip distcheck distclean distclean-generic \ -+ distclean-hdr distclean-libtool distclean-tags distcleancheck \ -+ distdir distuninstallcheck dvi dvi-am html html-am info \ -+ info-am install install-am install-data install-data-am \ -+ install-dvi install-dvi-am install-exec install-exec-am \ -+ install-html install-html-am install-info install-info-am \ -+ install-man install-pdf install-pdf-am install-ps \ -+ install-ps-am install-strip installcheck installcheck-am \ -+ installdirs installdirs-am maintainer-clean \ -+ maintainer-clean-generic mostlyclean mostlyclean-generic \ -+ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ -+ uninstall-am - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff --git a/aclocal.m4 b/aclocal.m4 -index c31f506..70cf5a4 100644 ---- a/aclocal.m4 -+++ b/aclocal.m4 -@@ -1,7 +1,7 @@ --# generated automatically by aclocal 1.11.1 -*- Autoconf -*- -+# generated automatically by aclocal 1.14 -*- Autoconf -*- -+ -+# Copyright (C) 1996-2013 Free Software Foundation, Inc. - --# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, --# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. - # This file is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -11,15 +11,16 @@ - # even the implied warranty of MERCHANTABILITY or FITNESS FOR A - # PARTICULAR PURPOSE. - -+m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) - m4_ifndef([AC_AUTOCONF_VERSION], - [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl --m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],, --[m4_warning([this file was generated for autoconf 2.63. -+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],, -+[m4_warning([this file was generated for autoconf 2.69. - You have another version of autoconf. It may work, but is not guaranteed to. - If you have problems, you may need to regenerate the build system entirely. --To do so, use the procedure documented by the package, typically `autoreconf'.])]) -+To do so, use the procedure documented by the package, typically 'autoreconf'.])]) - --# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. -+# Copyright (C) 2002-2013 Free Software Foundation, Inc. - # - # This file is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, -@@ -31,10 +32,10 @@ To do so, use the procedure documented by the package, typically `autoreconf'.]) - # generated from the m4 files accompanying Automake X.Y. - # (This private macro should not be called outside this file.) - AC_DEFUN([AM_AUTOMAKE_VERSION], --[am__api_version='1.11' -+[am__api_version='1.14' - dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to - dnl require some minimum version. Point them to the right macro. --m4_if([$1], [1.11.1], [], -+m4_if([$1], [1.14], [], - [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl - ]) - -@@ -50,22 +51,22 @@ m4_define([_AM_AUTOCONF_VERSION], []) - # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. - # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. - AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], --[AM_AUTOMAKE_VERSION([1.11.1])dnl -+[AM_AUTOMAKE_VERSION([1.14])dnl - m4_ifndef([AC_AUTOCONF_VERSION], - [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl - _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) - - # AM_AUX_DIR_EXPAND -*- Autoconf -*- - --# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. -+# Copyright (C) 2001-2013 Free Software Foundation, Inc. - # - # This file is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. - - # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets --# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to --# `$srcdir', `$srcdir/..', or `$srcdir/../..'. -+# $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to -+# '$srcdir', '$srcdir/..', or '$srcdir/../..'. - # - # Of course, Automake must honor this variable whenever it calls a - # tool from the auxiliary directory. The problem is that $srcdir (and -@@ -84,7 +85,7 @@ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) - # - # The reason of the latter failure is that $top_srcdir and $ac_aux_dir - # are both prefixed by $srcdir. In an in-source build this is usually --# harmless because $srcdir is `.', but things will broke when you -+# harmless because $srcdir is '.', but things will broke when you - # start a VPATH build or use an absolute $srcdir. - # - # So we could use something similar to $top_srcdir/$ac_aux_dir/missing, -@@ -110,22 +111,19 @@ am_aux_dir=`cd $ac_aux_dir && pwd` - - # AM_CONDITIONAL -*- Autoconf -*- - --# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008 --# Free Software Foundation, Inc. -+# Copyright (C) 1997-2013 Free Software Foundation, Inc. - # - # This file is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. - --# serial 9 -- - # AM_CONDITIONAL(NAME, SHELL-CONDITION) - # ------------------------------------- - # Define a conditional. - AC_DEFUN([AM_CONDITIONAL], --[AC_PREREQ(2.52)dnl -- ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], -- [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl -+[AC_PREREQ([2.52])dnl -+ m4_if([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], -+ [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl - AC_SUBST([$1_TRUE])dnl - AC_SUBST([$1_FALSE])dnl - _AM_SUBST_NOTMAKE([$1_TRUE])dnl -@@ -144,16 +142,14 @@ AC_CONFIG_COMMANDS_PRE( - Usually this means the macro was only invoked conditionally.]]) - fi])]) - --# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009 --# Free Software Foundation, Inc. -+# Copyright (C) 1999-2013 Free Software Foundation, Inc. - # - # This file is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. - --# serial 10 - --# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be -+# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be - # written in clear, in which case automake, when reading aclocal.m4, - # will think it sees a *use*, and therefore will trigger all it's - # C support machinery. Also note that it means that autoscan, seeing -@@ -163,7 +159,7 @@ fi])]) - # _AM_DEPENDENCIES(NAME) - # ---------------------- - # See how the compiler implements dependency checking. --# NAME is "CC", "CXX", "GCJ", or "OBJC". -+# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC". - # We try a few techniques and use that to set a single cache variable. - # - # We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was -@@ -176,12 +172,13 @@ AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl - AC_REQUIRE([AM_MAKE_INCLUDE])dnl - AC_REQUIRE([AM_DEP_TRACK])dnl - --ifelse([$1], CC, [depcc="$CC" am_compiler_list=], -- [$1], CXX, [depcc="$CXX" am_compiler_list=], -- [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], -- [$1], UPC, [depcc="$UPC" am_compiler_list=], -- [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], -- [depcc="$$1" am_compiler_list=]) -+m4_if([$1], [CC], [depcc="$CC" am_compiler_list=], -+ [$1], [CXX], [depcc="$CXX" am_compiler_list=], -+ [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'], -+ [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'], -+ [$1], [UPC], [depcc="$UPC" am_compiler_list=], -+ [$1], [GCJ], [depcc="$GCJ" am_compiler_list='gcc3 gcc'], -+ [depcc="$$1" am_compiler_list=]) - - AC_CACHE_CHECK([dependency style of $depcc], - [am_cv_$1_dependencies_compiler_type], -@@ -189,8 +186,9 @@ AC_CACHE_CHECK([dependency style of $depcc], - # We make a subdir and do the tests there. Otherwise we can end up - # making bogus files that we don't know about and never remove. For - # instance it was reported that on HP-UX the gcc test will end up -- # making a dummy file named `D' -- because `-MD' means `put the output -- # in D'. -+ # making a dummy file named 'D' -- because '-MD' means "put the output -+ # in D". -+ rm -rf conftest.dir - mkdir conftest.dir - # Copy depcomp to subdir because otherwise we won't find it if we're - # using a relative directory. -@@ -229,16 +227,16 @@ AC_CACHE_CHECK([dependency style of $depcc], - : > sub/conftest.c - for i in 1 2 3 4 5 6; do - echo '#include "conftst'$i'.h"' >> sub/conftest.c -- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with -- # Solaris 8's {/usr,}/bin/sh. -- touch sub/conftst$i.h -+ # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with -+ # Solaris 10 /bin/sh. -+ echo '/* dummy */' > sub/conftst$i.h - done - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - -- # We check with `-c' and `-o' for the sake of the "dashmstdout" -+ # We check with '-c' and '-o' for the sake of the "dashmstdout" - # mode. It turns out that the SunPro C++ compiler does not properly -- # handle `-M -o', and we need to detect this. Also, some Intel -- # versions had trouble with output in subdirs -+ # handle '-M -o', and we need to detect this. Also, some Intel -+ # versions had trouble with output in subdirs. - am__obj=sub/conftest.${OBJEXT-o} - am__minus_obj="-o $am__obj" - case $depmode in -@@ -247,16 +245,16 @@ AC_CACHE_CHECK([dependency style of $depcc], - test "$am__universal" = false || continue - ;; - nosideeffect) -- # after this tag, mechanisms are not by side-effect, so they'll -- # only be used when explicitly requested -+ # After this tag, mechanisms are not by side-effect, so they'll -+ # only be used when explicitly requested. - if test "x$enable_dependency_tracking" = xyes; then - continue - else - break - fi - ;; -- msvisualcpp | msvcmsys) -- # This compiler won't grok `-c -o', but also, the minuso test has -+ msvc7 | msvc7msys | msvisualcpp | msvcmsys) -+ # This compiler won't grok '-c -o', but also, the minuso test has - # not run yet. These depmodes are late enough in the game, and - # so weak that their functioning should not be impacted. - am__obj=conftest.${OBJEXT-o} -@@ -304,7 +302,7 @@ AM_CONDITIONAL([am__fastdep$1], [ - # AM_SET_DEPDIR - # ------------- - # Choose a directory name for dependency files. --# This macro is AC_REQUIREd in _AM_DEPENDENCIES -+# This macro is AC_REQUIREd in _AM_DEPENDENCIES. - AC_DEFUN([AM_SET_DEPDIR], - [AC_REQUIRE([AM_SET_LEADING_DOT])dnl - AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl -@@ -314,34 +312,39 @@ AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl - # AM_DEP_TRACK - # ------------ - AC_DEFUN([AM_DEP_TRACK], --[AC_ARG_ENABLE(dependency-tracking, --[ --disable-dependency-tracking speeds up one-time build -- --enable-dependency-tracking do not reject slow dependency extractors]) -+[AC_ARG_ENABLE([dependency-tracking], [dnl -+AS_HELP_STRING( -+ [--enable-dependency-tracking], -+ [do not reject slow dependency extractors]) -+AS_HELP_STRING( -+ [--disable-dependency-tracking], -+ [speeds up one-time build])]) - if test "x$enable_dependency_tracking" != xno; then - am_depcomp="$ac_aux_dir/depcomp" - AMDEPBACKSLASH='\' -+ am__nodep='_no' - fi - AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) - AC_SUBST([AMDEPBACKSLASH])dnl - _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl -+AC_SUBST([am__nodep])dnl -+_AM_SUBST_NOTMAKE([am__nodep])dnl - ]) - - # Generate code to set up dependency tracking. -*- Autoconf -*- - --# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008 --# Free Software Foundation, Inc. -+# Copyright (C) 1999-2013 Free Software Foundation, Inc. - # - # This file is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. - --#serial 5 - - # _AM_OUTPUT_DEPENDENCY_COMMANDS - # ------------------------------ - AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], - [{ -- # Autoconf 2.62 quotes --file arguments for eval, but not when files -+ # Older Autoconf quotes --file arguments for eval, but not when files - # are listed without --file. Let's play safe and only enable the eval - # if we detect the quoting. - case $CONFIG_FILES in -@@ -354,7 +357,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], - # Strip MF so we end up with the name of the file. - mf=`echo "$mf" | sed -e 's/:.*$//'` - # Check whether this is an Automake generated Makefile or not. -- # We used to match only the files named `Makefile.in', but -+ # We used to match only the files named 'Makefile.in', but - # some people rename them; so instead we look at the file content. - # Grep'ing the first line is not enough: some people post-process - # each Makefile.in and add a new line on top of each file to say so. -@@ -366,21 +369,19 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], - continue - fi - # Extract the definition of DEPDIR, am__include, and am__quote -- # from the Makefile without running `make'. -+ # from the Makefile without running 'make'. - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` - test -z "$DEPDIR" && continue - am__include=`sed -n 's/^am__include = //p' < "$mf"` -- test -z "am__include" && continue -+ test -z "$am__include" && continue - am__quote=`sed -n 's/^am__quote = //p' < "$mf"` -- # When using ansi2knr, U may be empty or an underscore; expand it -- U=`sed -n 's/^U = //p' < "$mf"` - # Find all dependency output files, they are included files with - # $(DEPDIR) in their names. We invoke sed twice because it is the - # simplest approach to changing $(DEPDIR) to its actual value in the - # expansion. - for file in `sed -n " - s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ -- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do -+ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do - # Make sure the directory exists. - test -f "$dirpart/$file" && continue - fdir=`AS_DIRNAME(["$file"])` -@@ -398,7 +399,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], - # This macro should only be invoked once -- use via AC_REQUIRE. - # - # This code is only required when automatic dependency tracking --# is enabled. FIXME. This creates each `.P' file that we will -+# is enabled. FIXME. This creates each '.P' file that we will - # need in order to bootstrap the dependency handling code. - AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], - [AC_CONFIG_COMMANDS([depfiles], -@@ -408,18 +409,21 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], - - # Do all the work for Automake. -*- Autoconf -*- - --# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, --# 2005, 2006, 2008, 2009 Free Software Foundation, Inc. -+# Copyright (C) 1996-2013 Free Software Foundation, Inc. - # - # This file is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. - --# serial 16 -- - # This macro actually does too much. Some checks are only needed if - # your package does certain things. But this isn't really a big deal. - -+dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O. -+m4_define([AC_PROG_CC], -+m4_defn([AC_PROG_CC]) -+[_AM_PROG_CC_C_O -+]) -+ - # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) - # AM_INIT_AUTOMAKE([OPTIONS]) - # ----------------------------------------------- -@@ -432,7 +436,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], - # arguments mandatory, and then we can depend on a new Autoconf - # release and drop the old call support. - AC_DEFUN([AM_INIT_AUTOMAKE], --[AC_PREREQ([2.62])dnl -+[AC_PREREQ([2.65])dnl - dnl Autoconf wants to disallow AM_ names. We explicitly allow - dnl the ones we care about. - m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl -@@ -461,31 +465,40 @@ AC_SUBST([CYGPATH_W]) - # Define the identity of the package. - dnl Distinguish between old-style and new-style calls. - m4_ifval([$2], --[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl -+[AC_DIAGNOSE([obsolete], -+ [$0: two- and three-arguments forms are deprecated.]) -+m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl - AC_SUBST([PACKAGE], [$1])dnl - AC_SUBST([VERSION], [$2])], - [_AM_SET_OPTIONS([$1])dnl - dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. --m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, -+m4_if( -+ m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]), -+ [ok:ok],, - [m4_fatal([AC_INIT should be called with package and version arguments])])dnl - AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl - AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl - - _AM_IF_OPTION([no-define],, --[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) -- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl -+[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package]) -+ AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl - - # Some tools Automake needs. - AC_REQUIRE([AM_SANITY_CHECK])dnl - AC_REQUIRE([AC_ARG_PROGRAM])dnl --AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) --AM_MISSING_PROG(AUTOCONF, autoconf) --AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) --AM_MISSING_PROG(AUTOHEADER, autoheader) --AM_MISSING_PROG(MAKEINFO, makeinfo) -+AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}]) -+AM_MISSING_PROG([AUTOCONF], [autoconf]) -+AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}]) -+AM_MISSING_PROG([AUTOHEADER], [autoheader]) -+AM_MISSING_PROG([MAKEINFO], [makeinfo]) - AC_REQUIRE([AM_PROG_INSTALL_SH])dnl - AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl --AC_REQUIRE([AM_PROG_MKDIR_P])dnl -+AC_REQUIRE([AC_PROG_MKDIR_P])dnl -+# For better backward compatibility. To be removed once Automake 1.9.x -+# dies out for good. For more background, see: -+# -+# -+AC_SUBST([mkdir_p], ['$(MKDIR_P)']) - # We need awk for the "check" target. The system "awk" is bad on - # some platforms. - AC_REQUIRE([AC_PROG_AWK])dnl -@@ -496,34 +509,78 @@ _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], - [_AM_PROG_TAR([v7])])]) - _AM_IF_OPTION([no-dependencies],, - [AC_PROVIDE_IFELSE([AC_PROG_CC], -- [_AM_DEPENDENCIES(CC)], -- [define([AC_PROG_CC], -- defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl -+ [_AM_DEPENDENCIES([CC])], -+ [m4_define([AC_PROG_CC], -+ m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl - AC_PROVIDE_IFELSE([AC_PROG_CXX], -- [_AM_DEPENDENCIES(CXX)], -- [define([AC_PROG_CXX], -- defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl -+ [_AM_DEPENDENCIES([CXX])], -+ [m4_define([AC_PROG_CXX], -+ m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl - AC_PROVIDE_IFELSE([AC_PROG_OBJC], -- [_AM_DEPENDENCIES(OBJC)], -- [define([AC_PROG_OBJC], -- defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl -+ [_AM_DEPENDENCIES([OBJC])], -+ [m4_define([AC_PROG_OBJC], -+ m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl -+AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], -+ [_AM_DEPENDENCIES([OBJCXX])], -+ [m4_define([AC_PROG_OBJCXX], -+ m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl - ]) --_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl --dnl The `parallel-tests' driver may need to know about EXEEXT, so add the --dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro --dnl is hooked onto _AC_COMPILER_EXEEXT early, see below. -+AC_REQUIRE([AM_SILENT_RULES])dnl -+dnl The testsuite driver may need to know about EXEEXT, so add the -+dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This -+dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below. - AC_CONFIG_COMMANDS_PRE(dnl - [m4_provide_if([_AM_COMPILER_EXEEXT], - [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl --]) - --dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not -+# POSIX will say in a future version that running "rm -f" with no argument -+# is OK; and we want to be able to make that assumption in our Makefile -+# recipes. So use an aggressive probe to check that the usage we want is -+# actually supported "in the wild" to an acceptable degree. -+# See automake bug#10828. -+# To make any issue more visible, cause the running configure to be aborted -+# by default if the 'rm' program in use doesn't match our expectations; the -+# user can still override this though. -+if rm -f && rm -fr && rm -rf; then : OK; else -+ cat >&2 <<'END' -+Oops! -+ -+Your 'rm' program seems unable to run without file operands specified -+on the command line, even when the '-f' option is present. This is contrary -+to the behaviour of most rm programs out there, and not conforming with -+the upcoming POSIX standard: -+ -+Please tell bug-automake@gnu.org about your system, including the value -+of your $PATH and any error possibly output before this message. This -+can help us improve future automake versions. -+ -+END -+ if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then -+ echo 'Configuration will proceed anyway, since you have set the' >&2 -+ echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 -+ echo >&2 -+ else -+ cat >&2 <<'END' -+Aborting the configuration process, to ensure you take notice of the issue. -+ -+You can download and install GNU coreutils to get an 'rm' implementation -+that behaves properly: . -+ -+If you want to complete the configuration process using your problematic -+'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM -+to "yes", and re-run configure. -+ -+END -+ AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) -+ fi -+fi]) -+ -+dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not - dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further - dnl mangled by Autoconf and run in a shell conditional statement. - m4_define([_AC_COMPILER_EXEEXT], - m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) - -- - # When config.status generates a header, we must update the stamp-h file. - # This file resides in the same directory as the config header - # that is generated. The stamp files are numbered to have different names. -@@ -545,7 +602,7 @@ for _am_header in $config_headers :; do - done - echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) - --# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc. -+# Copyright (C) 2001-2013 Free Software Foundation, Inc. - # - # This file is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, -@@ -564,16 +621,14 @@ if test x"${install_sh}" != xset; then - install_sh="\${SHELL} $am_aux_dir/install-sh" - esac - fi --AC_SUBST(install_sh)]) -+AC_SUBST([install_sh])]) - --# Copyright (C) 2003, 2005 Free Software Foundation, Inc. -+# Copyright (C) 2003-2013 Free Software Foundation, Inc. - # - # This file is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. - --# serial 2 -- - # Check whether the underlying file-system supports filenames - # with a leading dot. For instance MS-DOS doesn't. - AC_DEFUN([AM_SET_LEADING_DOT], -@@ -589,14 +644,12 @@ AC_SUBST([am__leading_dot])]) - - # Check to see how 'make' treats includes. -*- Autoconf -*- - --# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc. -+# Copyright (C) 2001-2013 Free Software Foundation, Inc. - # - # This file is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. - --# serial 4 -- - # AM_MAKE_INCLUDE() - # ----------------- - # Check to see how make treats includes. -@@ -614,7 +667,7 @@ am__quote= - _am_result=none - # First try GNU make style include. - echo "include confinc" > confmf --# Ignore all kinds of additional output from `make'. -+# Ignore all kinds of additional output from 'make'. - case `$am_make -s -f confmf 2> /dev/null` in #( - *the\ am__doit\ target*) - am__include=include -@@ -641,15 +694,12 @@ rm -f confinc confmf - - # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- - --# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008 --# Free Software Foundation, Inc. -+# Copyright (C) 1997-2013 Free Software Foundation, Inc. - # - # This file is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. - --# serial 6 -- - # AM_MISSING_PROG(NAME, PROGRAM) - # ------------------------------ - AC_DEFUN([AM_MISSING_PROG], -@@ -657,11 +707,10 @@ AC_DEFUN([AM_MISSING_PROG], - $1=${$1-"${am_missing_run}$2"} - AC_SUBST($1)]) - -- - # AM_MISSING_HAS_RUN - # ------------------ --# Define MISSING if not defined so far and test if it supports --run. --# If it does, set am_missing_run to use it, otherwise, to nothing. -+# Define MISSING if not defined so far and test if it is modern enough. -+# If it is, set am_missing_run to use it, otherwise, to nothing. - AC_DEFUN([AM_MISSING_HAS_RUN], - [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl - AC_REQUIRE_AUX_FILE([missing])dnl -@@ -674,63 +723,35 @@ if test x"${MISSING+set}" != xset; then - esac - fi - # Use eval to expand $SHELL --if eval "$MISSING --run true"; then -- am_missing_run="$MISSING --run " -+if eval "$MISSING --is-lightweight"; then -+ am_missing_run="$MISSING " - else - am_missing_run= -- AC_MSG_WARN([`missing' script is too old or missing]) -+ AC_MSG_WARN(['missing' script is too old or missing]) - fi - ]) - --# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. --# --# This file is free software; the Free Software Foundation --# gives unlimited permission to copy and/or distribute it, --# with or without modifications, as long as this notice is preserved. -- --# AM_PROG_MKDIR_P --# --------------- --# Check for `mkdir -p'. --AC_DEFUN([AM_PROG_MKDIR_P], --[AC_PREREQ([2.60])dnl --AC_REQUIRE([AC_PROG_MKDIR_P])dnl --dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, --dnl while keeping a definition of mkdir_p for backward compatibility. --dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. --dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of --dnl Makefile.ins that do not define MKDIR_P, so we do our own --dnl adjustment using top_builddir (which is defined more often than --dnl MKDIR_P). --AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl --case $mkdir_p in -- [[\\/$]]* | ?:[[\\/]]*) ;; -- */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; --esac --]) -- - # Helper functions for option handling. -*- Autoconf -*- - --# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc. -+# Copyright (C) 2001-2013 Free Software Foundation, Inc. - # - # This file is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. - --# serial 4 -- - # _AM_MANGLE_OPTION(NAME) - # ----------------------- - AC_DEFUN([_AM_MANGLE_OPTION], - [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) - - # _AM_SET_OPTION(NAME) --# ------------------------------ -+# -------------------- - # Set option NAME. Presently that only means defining a flag for this option. - AC_DEFUN([_AM_SET_OPTION], --[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) -+[m4_define(_AM_MANGLE_OPTION([$1]), [1])]) - - # _AM_SET_OPTIONS(OPTIONS) --# ---------------------------------- -+# ------------------------ - # OPTIONS is a space-separated list of Automake options. - AC_DEFUN([_AM_SET_OPTIONS], - [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) -@@ -741,13 +762,60 @@ AC_DEFUN([_AM_SET_OPTIONS], - AC_DEFUN([_AM_IF_OPTION], - [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) - --# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008, 2009 --# Free Software Foundation, Inc. -+# Copyright (C) 1999-2013 Free Software Foundation, Inc. - # - # This file is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. - -+# _AM_PROG_CC_C_O -+# --------------- -+# Like AC_PROG_CC_C_O, but changed for automake. We rewrite AC_PROG_CC -+# to automatically call this. -+AC_DEFUN([_AM_PROG_CC_C_O], -+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -+AC_REQUIRE_AUX_FILE([compile])dnl -+AC_LANG_PUSH([C])dnl -+AC_CACHE_CHECK( -+ [whether $CC understands -c and -o together], -+ [am_cv_prog_cc_c_o], -+ [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])]) -+ # Make sure it works both with $CC and with simple cc. -+ # Following AC_PROG_CC_C_O, we do the test twice because some -+ # compilers refuse to overwrite an existing .o file with -o, -+ # though they will create one. -+ am_cv_prog_cc_c_o=yes -+ for am_i in 1 2; do -+ if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \ -+ && test -f conftest2.$ac_objext; then -+ : OK -+ else -+ am_cv_prog_cc_c_o=no -+ break -+ fi -+ done -+ rm -f core conftest* -+ unset am_i]) -+if test "$am_cv_prog_cc_c_o" != yes; then -+ # Losing compiler, so override with the script. -+ # FIXME: It is wrong to rewrite CC. -+ # But if we don't then we get into trouble of one sort or another. -+ # A longer-term fix would be to have automake use am__CC in this case, -+ # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" -+ CC="$am_aux_dir/compile $CC" -+fi -+AC_LANG_POP([C])]) -+ -+# For backward compatibility. -+AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) -+ -+# Copyright (C) 1999-2013 Free Software Foundation, Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. -+ -+ - # AM_PATH_PYTHON([MINIMUM-VERSION], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) - # --------------------------------------------------------------------------- - # Adds support for distributing Python modules and packages. To -@@ -775,8 +843,10 @@ AC_DEFUN([AM_PATH_PYTHON], - dnl Find a Python interpreter. Python versions prior to 2.0 are not - dnl supported. (2.0 was released on October 16, 2000). - m4_define_default([_AM_PYTHON_INTERPRETER_LIST], -- [python python2 python3 python3.0 python2.5 python2.4 python2.3 python2.2 dnl --python2.1 python2.0]) -+[python python2 python3 python3.3 python3.2 python3.1 python3.0 python2.7 dnl -+ python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0]) -+ -+ AC_ARG_VAR([PYTHON], [the Python interpreter]) - - m4_if([$1],[],[ - dnl No version check is needed. -@@ -789,10 +859,11 @@ python2.1 python2.0]) - dnl A version check is needed. - if test -n "$PYTHON"; then - # If the user set $PYTHON, use it and don't search something else. -- AC_MSG_CHECKING([whether $PYTHON version >= $1]) -+ AC_MSG_CHECKING([whether $PYTHON version is >= $1]) - AM_PYTHON_CHECK_VERSION([$PYTHON], [$1], -- [AC_MSG_RESULT(yes)], -- [AC_MSG_ERROR(too old)]) -+ [AC_MSG_RESULT([yes])], -+ [AC_MSG_RESULT([no]) -+ AC_MSG_ERROR([Python interpreter is too old])]) - am_display_PYTHON=$PYTHON - else - # Otherwise, try each interpreter until we find one that satisfies -@@ -841,6 +912,25 @@ python2.1 python2.0]) - [am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"`]) - AC_SUBST([PYTHON_PLATFORM], [$am_cv_python_platform]) - -+ # Just factor out some code duplication. -+ am_python_setup_sysconfig="\ -+import sys -+# Prefer sysconfig over distutils.sysconfig, for better compatibility -+# with python 3.x. See automake bug#10227. -+try: -+ import sysconfig -+except ImportError: -+ can_use_sysconfig = 0 -+else: -+ can_use_sysconfig = 1 -+# Can't use sysconfig in CPython 2.7, since it's broken in virtualenvs: -+# -+try: -+ from platform import python_implementation -+ if python_implementation() == 'CPython' and sys.version[[:3]] == '2.7': -+ can_use_sysconfig = 0 -+except ImportError: -+ pass" - - dnl Set up 4 directories: - -@@ -848,9 +938,7 @@ python2.1 python2.0]) - dnl site-packages directory, not the python standard library - dnl directory like in previous automake betas. This behavior - dnl is more consistent with lispdir.m4 for example. -- dnl Query distutils for this directory. distutils does not exist in -- dnl Python 1.5, so we fall back to the hardcoded directory if it -- dnl doesn't work. -+ dnl Query distutils for this directory. - AC_CACHE_CHECK([for $am_display_PYTHON script directory], - [am_cv_python_pythondir], - [if test "x$prefix" = xNONE -@@ -859,8 +947,14 @@ python2.1 python2.0]) - else - am_py_prefix=$prefix - fi -- am_cv_python_pythondir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(0,0,prefix='$am_py_prefix'))" 2>/dev/null || -- echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"` -+ am_cv_python_pythondir=`$PYTHON -c " -+$am_python_setup_sysconfig -+if can_use_sysconfig: -+ sitedir = sysconfig.get_path('purelib', vars={'base':'$am_py_prefix'}) -+else: -+ from distutils import sysconfig -+ sitedir = sysconfig.get_python_lib(0, 0, prefix='$am_py_prefix') -+sys.stdout.write(sitedir)"` - case $am_cv_python_pythondir in - $am_py_prefix*) - am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'` -@@ -886,9 +980,7 @@ python2.1 python2.0]) - - dnl pyexecdir -- directory for installing python extension modules - dnl (shared libraries) -- dnl Query distutils for this directory. distutils does not exist in -- dnl Python 1.5, so we fall back to the hardcoded directory if it -- dnl doesn't work. -+ dnl Query distutils for this directory. - AC_CACHE_CHECK([for $am_display_PYTHON extension module directory], - [am_cv_python_pyexecdir], - [if test "x$exec_prefix" = xNONE -@@ -897,8 +989,14 @@ python2.1 python2.0]) - else - am_py_exec_prefix=$exec_prefix - fi -- am_cv_python_pyexecdir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(1,0,prefix='$am_py_exec_prefix'))" 2>/dev/null || -- echo "$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages"` -+ am_cv_python_pyexecdir=`$PYTHON -c " -+$am_python_setup_sysconfig -+if can_use_sysconfig: -+ sitedir = sysconfig.get_path('platlib', vars={'platbase':'$am_py_prefix'}) -+else: -+ from distutils import sysconfig -+ sitedir = sysconfig.get_python_lib(1, 0, prefix='$am_py_prefix') -+sys.stdout.write(sitedir)"` - case $am_cv_python_pyexecdir in - $am_py_exec_prefix*) - am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'` -@@ -946,7 +1044,7 @@ for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[[i]] - sys.exit(sys.hexversion < minverhex)" - AS_IF([AM_RUN_LOG([$1 -c "$prog"])], [$3], [$4])]) - --# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. -+# Copyright (C) 2001-2013 Free Software Foundation, Inc. - # - # This file is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, -@@ -965,22 +1063,16 @@ AC_DEFUN([AM_RUN_LOG], - - # Check to make sure that the build environment is sane. -*- Autoconf -*- - --# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008 --# Free Software Foundation, Inc. -+# Copyright (C) 1996-2013 Free Software Foundation, Inc. - # - # This file is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. - --# serial 5 -- - # AM_SANITY_CHECK - # --------------- - AC_DEFUN([AM_SANITY_CHECK], - [AC_MSG_CHECKING([whether build environment is sane]) --# Just in case --sleep 1 --echo timestamp > conftest.file - # Reject unsafe characters in $srcdir or the absolute working directory - # name. Accept space and tab only in the latter. - am_lf=' -@@ -991,32 +1083,40 @@ case `pwd` in - esac - case $srcdir in - *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) -- AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);; -+ AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);; - esac - --# Do `set' in a subshell so we don't clobber the current shell's -+# Do 'set' in a subshell so we don't clobber the current shell's - # arguments. Must try -L first in case configure is actually a - # symlink; some systems play weird games with the mod time of symlinks - # (eg FreeBSD returns the mod time of the symlink's containing - # directory). - if ( -- set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` -- if test "$[*]" = "X"; then -- # -L didn't work. -- set X `ls -t "$srcdir/configure" conftest.file` -- fi -- rm -f conftest.file -- if test "$[*]" != "X $srcdir/configure conftest.file" \ -- && test "$[*]" != "X conftest.file $srcdir/configure"; then -- -- # If neither matched, then we have a broken ls. This can happen -- # if, for instance, CONFIG_SHELL is bash and it inherits a -- # broken ls alias from the environment. This has actually -- # happened. Such a system could not be considered "sane". -- AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken --alias in your environment]) -- fi -- -+ am_has_slept=no -+ for am_try in 1 2; do -+ echo "timestamp, slept: $am_has_slept" > conftest.file -+ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` -+ if test "$[*]" = "X"; then -+ # -L didn't work. -+ set X `ls -t "$srcdir/configure" conftest.file` -+ fi -+ if test "$[*]" != "X $srcdir/configure conftest.file" \ -+ && test "$[*]" != "X conftest.file $srcdir/configure"; then -+ -+ # If neither matched, then we have a broken ls. This can happen -+ # if, for instance, CONFIG_SHELL is bash and it inherits a -+ # broken ls alias from the environment. This has actually -+ # happened. Such a system could not be considered "sane". -+ AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken -+ alias in your environment]) -+ fi -+ if test "$[2]" = conftest.file || test $am_try -eq 2; then -+ break -+ fi -+ # Just in case. -+ sleep 1 -+ am_has_slept=yes -+ done - test "$[2]" = conftest.file - ) - then -@@ -1026,9 +1126,85 @@ else - AC_MSG_ERROR([newly created file is older than distributed files! - Check your system clock]) - fi --AC_MSG_RESULT(yes)]) -+AC_MSG_RESULT([yes]) -+# If we didn't sleep, we still need to ensure time stamps of config.status and -+# generated files are strictly newer. -+am_sleep_pid= -+if grep 'slept: no' conftest.file >/dev/null 2>&1; then -+ ( sleep 1 ) & -+ am_sleep_pid=$! -+fi -+AC_CONFIG_COMMANDS_PRE( -+ [AC_MSG_CHECKING([that generated files are newer than configure]) -+ if test -n "$am_sleep_pid"; then -+ # Hide warnings about reused PIDs. -+ wait $am_sleep_pid 2>/dev/null -+ fi -+ AC_MSG_RESULT([done])]) -+rm -f conftest.file -+]) - --# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. -+# Copyright (C) 2009-2013 Free Software Foundation, Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. -+ -+# AM_SILENT_RULES([DEFAULT]) -+# -------------------------- -+# Enable less verbose build rules; with the default set to DEFAULT -+# ("yes" being less verbose, "no" or empty being verbose). -+AC_DEFUN([AM_SILENT_RULES], -+[AC_ARG_ENABLE([silent-rules], [dnl -+AS_HELP_STRING( -+ [--enable-silent-rules], -+ [less verbose build output (undo: "make V=1")]) -+AS_HELP_STRING( -+ [--disable-silent-rules], -+ [verbose build output (undo: "make V=0")])dnl -+]) -+case $enable_silent_rules in @%:@ ((( -+ yes) AM_DEFAULT_VERBOSITY=0;; -+ no) AM_DEFAULT_VERBOSITY=1;; -+ *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; -+esac -+dnl -+dnl A few 'make' implementations (e.g., NonStop OS and NextStep) -+dnl do not support nested variable expansions. -+dnl See automake bug#9928 and bug#10237. -+am_make=${MAKE-make} -+AC_CACHE_CHECK([whether $am_make supports nested variables], -+ [am_cv_make_support_nested_variables], -+ [if AS_ECHO([['TRUE=$(BAR$(V)) -+BAR0=false -+BAR1=true -+V=1 -+am__doit: -+ @$(TRUE) -+.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then -+ am_cv_make_support_nested_variables=yes -+else -+ am_cv_make_support_nested_variables=no -+fi]) -+if test $am_cv_make_support_nested_variables = yes; then -+ dnl Using '$V' instead of '$(V)' breaks IRIX make. -+ AM_V='$(V)' -+ AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' -+else -+ AM_V=$AM_DEFAULT_VERBOSITY -+ AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY -+fi -+AC_SUBST([AM_V])dnl -+AM_SUBST_NOTMAKE([AM_V])dnl -+AC_SUBST([AM_DEFAULT_V])dnl -+AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl -+AC_SUBST([AM_DEFAULT_VERBOSITY])dnl -+AM_BACKSLASH='\' -+AC_SUBST([AM_BACKSLASH])dnl -+_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl -+]) -+ -+# Copyright (C) 2001-2013 Free Software Foundation, Inc. - # - # This file is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, -@@ -1036,34 +1212,32 @@ AC_MSG_RESULT(yes)]) - - # AM_PROG_INSTALL_STRIP - # --------------------- --# One issue with vendor `install' (even GNU) is that you can't -+# One issue with vendor 'install' (even GNU) is that you can't - # specify the program used to strip binaries. This is especially - # annoying in cross-compiling environments, where the build's strip - # is unlikely to handle the host's binaries. - # Fortunately install-sh will honor a STRIPPROG variable, so we --# always use install-sh in `make install-strip', and initialize -+# always use install-sh in "make install-strip", and initialize - # STRIPPROG with the value of the STRIP variable (set by the user). - AC_DEFUN([AM_PROG_INSTALL_STRIP], - [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl --# Installed binaries are usually stripped using `strip' when the user --# run `make install-strip'. However `strip' might not be the right -+# Installed binaries are usually stripped using 'strip' when the user -+# run "make install-strip". However 'strip' might not be the right - # tool to use in cross-compilation environments, therefore Automake --# will honor the `STRIP' environment variable to overrule this program. --dnl Don't test for $cross_compiling = yes, because it might be `maybe'. -+# will honor the 'STRIP' environment variable to overrule this program. -+dnl Don't test for $cross_compiling = yes, because it might be 'maybe'. - if test "$cross_compiling" != no; then - AC_CHECK_TOOL([STRIP], [strip], :) - fi - INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" - AC_SUBST([INSTALL_STRIP_PROGRAM])]) - --# Copyright (C) 2006, 2008 Free Software Foundation, Inc. -+# Copyright (C) 2006-2013 Free Software Foundation, Inc. - # - # This file is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. - --# serial 2 -- - # _AM_SUBST_NOTMAKE(VARIABLE) - # --------------------------- - # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. -@@ -1071,24 +1245,22 @@ AC_SUBST([INSTALL_STRIP_PROGRAM])]) - AC_DEFUN([_AM_SUBST_NOTMAKE]) - - # AM_SUBST_NOTMAKE(VARIABLE) --# --------------------------- -+# -------------------------- - # Public sister of _AM_SUBST_NOTMAKE. - AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) - - # Check how to create a tarball. -*- Autoconf -*- - --# Copyright (C) 2004, 2005 Free Software Foundation, Inc. -+# Copyright (C) 2004-2013 Free Software Foundation, Inc. - # - # This file is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. - --# serial 2 -- - # _AM_PROG_TAR(FORMAT) - # -------------------- - # Check how to create a tarball in format FORMAT. --# FORMAT should be one of `v7', `ustar', or `pax'. -+# FORMAT should be one of 'v7', 'ustar', or 'pax'. - # - # Substitute a variable $(am__tar) that is a command - # writing to stdout a FORMAT-tarball containing the directory -@@ -1098,75 +1270,114 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) - # Substitute a variable $(am__untar) that extract such - # a tarball read from stdin. - # $(am__untar) < result.tar -+# - AC_DEFUN([_AM_PROG_TAR], --[# Always define AMTAR for backward compatibility. --AM_MISSING_PROG([AMTAR], [tar]) --m4_if([$1], [v7], -- [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], -- [m4_case([$1], [ustar],, [pax],, -- [m4_fatal([Unknown tar format])]) --AC_MSG_CHECKING([how to create a $1 tar archive]) --# Loop over all known methods to create a tar archive until one works. -+[# Always define AMTAR for backward compatibility. Yes, it's still used -+# in the wild :-( We should find a proper way to deprecate it ... -+AC_SUBST([AMTAR], ['$${TAR-tar}']) -+ -+# We'll loop over all known methods to create a tar archive until one works. - _am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' --_am_tools=${am_cv_prog_tar_$1-$_am_tools} --# Do not fold the above two line into one, because Tru64 sh and --# Solaris sh will not grok spaces in the rhs of `-'. --for _am_tool in $_am_tools --do -- case $_am_tool in -- gnutar) -- for _am_tar in tar gnutar gtar; -- do -- AM_RUN_LOG([$_am_tar --version]) && break -- done -- am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' -- am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' -- am__untar="$_am_tar -xf -" -- ;; -- plaintar) -- # Must skip GNU tar: if it does not support --format= it doesn't create -- # ustar tarball either. -- (tar --version) >/dev/null 2>&1 && continue -- am__tar='tar chf - "$$tardir"' -- am__tar_='tar chf - "$tardir"' -- am__untar='tar xf -' -- ;; -- pax) -- am__tar='pax -L -x $1 -w "$$tardir"' -- am__tar_='pax -L -x $1 -w "$tardir"' -- am__untar='pax -r' -- ;; -- cpio) -- am__tar='find "$$tardir" -print | cpio -o -H $1 -L' -- am__tar_='find "$tardir" -print | cpio -o -H $1 -L' -- am__untar='cpio -i -H $1 -d' -- ;; -- none) -- am__tar=false -- am__tar_=false -- am__untar=false -- ;; -- esac - -- # If the value was cached, stop now. We just wanted to have am__tar -- # and am__untar set. -- test -n "${am_cv_prog_tar_$1}" && break -+m4_if([$1], [v7], -+ [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], -+ -+ [m4_case([$1], -+ [ustar], -+ [# The POSIX 1988 'ustar' format is defined with fixed-size fields. -+ # There is notably a 21 bits limit for the UID and the GID. In fact, -+ # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343 -+ # and bug#13588). -+ am_max_uid=2097151 # 2^21 - 1 -+ am_max_gid=$am_max_uid -+ # The $UID and $GID variables are not portable, so we need to resort -+ # to the POSIX-mandated id(1) utility. Errors in the 'id' calls -+ # below are definitely unexpected, so allow the users to see them -+ # (that is, avoid stderr redirection). -+ am_uid=`id -u || echo unknown` -+ am_gid=`id -g || echo unknown` -+ AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format]) -+ if test $am_uid -le $am_max_uid; then -+ AC_MSG_RESULT([yes]) -+ else -+ AC_MSG_RESULT([no]) -+ _am_tools=none -+ fi -+ AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format]) -+ if test $am_gid -le $am_max_gid; then -+ AC_MSG_RESULT([yes]) -+ else -+ AC_MSG_RESULT([no]) -+ _am_tools=none -+ fi], -+ -+ [pax], -+ [], -+ -+ [m4_fatal([Unknown tar format])]) -+ -+ AC_MSG_CHECKING([how to create a $1 tar archive]) -+ -+ # Go ahead even if we have the value already cached. We do so because we -+ # need to set the values for the 'am__tar' and 'am__untar' variables. -+ _am_tools=${am_cv_prog_tar_$1-$_am_tools} -+ -+ for _am_tool in $_am_tools; do -+ case $_am_tool in -+ gnutar) -+ for _am_tar in tar gnutar gtar; do -+ AM_RUN_LOG([$_am_tar --version]) && break -+ done -+ am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' -+ am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' -+ am__untar="$_am_tar -xf -" -+ ;; -+ plaintar) -+ # Must skip GNU tar: if it does not support --format= it doesn't create -+ # ustar tarball either. -+ (tar --version) >/dev/null 2>&1 && continue -+ am__tar='tar chf - "$$tardir"' -+ am__tar_='tar chf - "$tardir"' -+ am__untar='tar xf -' -+ ;; -+ pax) -+ am__tar='pax -L -x $1 -w "$$tardir"' -+ am__tar_='pax -L -x $1 -w "$tardir"' -+ am__untar='pax -r' -+ ;; -+ cpio) -+ am__tar='find "$$tardir" -print | cpio -o -H $1 -L' -+ am__tar_='find "$tardir" -print | cpio -o -H $1 -L' -+ am__untar='cpio -i -H $1 -d' -+ ;; -+ none) -+ am__tar=false -+ am__tar_=false -+ am__untar=false -+ ;; -+ esac - -- # tar/untar a dummy directory, and stop if the command works -- rm -rf conftest.dir -- mkdir conftest.dir -- echo GrepMe > conftest.dir/file -- AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) -+ # If the value was cached, stop now. We just wanted to have am__tar -+ # and am__untar set. -+ test -n "${am_cv_prog_tar_$1}" && break -+ -+ # tar/untar a dummy directory, and stop if the command works. -+ rm -rf conftest.dir -+ mkdir conftest.dir -+ echo GrepMe > conftest.dir/file -+ AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) -+ rm -rf conftest.dir -+ if test -s conftest.tar; then -+ AM_RUN_LOG([$am__untar /dev/null 2>&1 && break -+ fi -+ done - rm -rf conftest.dir -- if test -s conftest.tar; then -- AM_RUN_LOG([$am__untar /dev/null 2>&1 && break -- fi --done --rm -rf conftest.dir - --AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) --AC_MSG_RESULT([$am_cv_prog_tar_$1])]) -+ AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) -+ AC_MSG_RESULT([$am_cv_prog_tar_$1])]) -+ - AC_SUBST([am__tar]) - AC_SUBST([am__untar]) - ]) # _AM_PROG_TAR -diff --git a/config.guess b/config.guess -index dc84c68..b79252d 100755 ---- a/config.guess -+++ b/config.guess -@@ -1,14 +1,12 @@ - #! /bin/sh - # Attempt to guess a canonical system name. --# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, --# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 --# Free Software Foundation, Inc. -+# Copyright 1992-2013 Free Software Foundation, Inc. - --timestamp='2009-11-20' -+timestamp='2013-06-10' - - # This file is free software; you can redistribute it and/or modify it - # under the terms of the GNU General Public License as published by --# the Free Software Foundation; either version 2 of the License, or -+# the Free Software Foundation; either version 3 of the License, or - # (at your option) any later version. - # - # This program is distributed in the hope that it will be useful, but -@@ -17,26 +15,22 @@ timestamp='2009-11-20' - # General Public License for more details. - # - # You should have received a copy of the GNU General Public License --# along with this program; if not, write to the Free Software --# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA --# 02110-1301, USA. -+# along with this program; if not, see . - # - # As a special exception to the GNU General Public License, if you - # distribute this file as part of a program that contains a - # configuration script generated by Autoconf, you may include it under --# the same distribution terms that you use for the rest of that program. -- -- --# Originally written by Per Bothner. Please send patches (context --# diff format) to and include a ChangeLog --# entry. -+# the same distribution terms that you use for the rest of that -+# program. This Exception is an additional permission under section 7 -+# of the GNU General Public License, version 3 ("GPLv3"). - # --# This script attempts to guess a canonical system name similar to --# config.sub. If it succeeds, it prints the system name on stdout, and --# exits with 0. Otherwise, it exits with 1. -+# Originally written by Per Bothner. - # - # You can get the latest version of this script from: - # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD -+# -+# Please send patches with a ChangeLog entry to config-patches@gnu.org. -+ - - me=`echo "$0" | sed -e 's,.*/,,'` - -@@ -56,8 +50,7 @@ version="\ - GNU config.guess ($timestamp) - - Originally written by Per Bothner. --Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, --2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. -+Copyright 1992-2013 Free Software Foundation, Inc. - - This is free software; see the source for copying conditions. There is NO - warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." -@@ -139,12 +132,33 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown - UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown - UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown - -+case "${UNAME_SYSTEM}" in -+Linux|GNU|GNU/*) -+ # If the system lacks a compiler, then just pick glibc. -+ # We could probably try harder. -+ LIBC=gnu -+ -+ eval $set_cc_for_build -+ cat <<-EOF > $dummy.c -+ #include -+ #if defined(__UCLIBC__) -+ LIBC=uclibc -+ #elif defined(__dietlibc__) -+ LIBC=dietlibc -+ #else -+ LIBC=gnu -+ #endif -+ EOF -+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` -+ ;; -+esac -+ - # Note: order is significant - the case branches are not exclusive. - - case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in - *:NetBSD:*:*) - # NetBSD (nbsd) targets should (where applicable) match one or -- # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, -+ # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, - # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently - # switched to ELF, *-*-netbsd* would select the old - # object file format. This provides both forward -@@ -180,7 +194,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in - fi - ;; - *) -- os=netbsd -+ os=netbsd - ;; - esac - # The OS release -@@ -201,6 +215,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in - # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. - echo "${machine}-${os}${release}" - exit ;; -+ *:Bitrig:*:*) -+ UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` -+ echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} -+ exit ;; - *:OpenBSD:*:*) - UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` - echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} -@@ -223,7 +241,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` - ;; - *5.*) -- UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` -+ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` - ;; - esac - # According to Compaq, /usr/sbin/psrinfo has been available on -@@ -269,7 +287,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in - # A Xn.n version is an unreleased experimental baselevel. - # 1.2 uses "1.2" for uname -r. - echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` -- exit ;; -+ # Reset EXIT trap before exiting to avoid spurious non-zero exit code. -+ exitcode=$? -+ trap '' 0 -+ exit $exitcode ;; - Alpha\ *:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # Should we change UNAME_MACHINE based on the output of uname instead -@@ -295,12 +316,12 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in - echo s390-ibm-zvmoe - exit ;; - *:OS400:*:*) -- echo powerpc-ibm-os400 -+ echo powerpc-ibm-os400 - exit ;; - arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) - echo arm-acorn-riscix${UNAME_RELEASE} - exit ;; -- arm:riscos:*:*|arm:RISCOS:*:*) -+ arm*:riscos:*:*|arm*:RISCOS:*:*) - echo arm-unknown-riscos - exit ;; - SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) -@@ -394,23 +415,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in - # MiNT. But MiNT is downward compatible to TOS, so this should - # be no problem. - atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) -- echo m68k-atari-mint${UNAME_RELEASE} -+ echo m68k-atari-mint${UNAME_RELEASE} - exit ;; - atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} -- exit ;; -+ exit ;; - *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) -- echo m68k-atari-mint${UNAME_RELEASE} -+ echo m68k-atari-mint${UNAME_RELEASE} - exit ;; - milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) -- echo m68k-milan-mint${UNAME_RELEASE} -- exit ;; -+ echo m68k-milan-mint${UNAME_RELEASE} -+ exit ;; - hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) -- echo m68k-hades-mint${UNAME_RELEASE} -- exit ;; -+ echo m68k-hades-mint${UNAME_RELEASE} -+ exit ;; - *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) -- echo m68k-unknown-mint${UNAME_RELEASE} -- exit ;; -+ echo m68k-unknown-mint${UNAME_RELEASE} -+ exit ;; - m68k:machten:*:*) - echo m68k-apple-machten${UNAME_RELEASE} - exit ;; -@@ -480,8 +501,8 @@ EOF - echo m88k-motorola-sysv3 - exit ;; - AViiON:dgux:*:*) -- # DG/UX returns AViiON for all architectures -- UNAME_PROCESSOR=`/usr/bin/uname -p` -+ # DG/UX returns AViiON for all architectures -+ UNAME_PROCESSOR=`/usr/bin/uname -p` - if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] - then - if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ -@@ -494,7 +515,7 @@ EOF - else - echo i586-dg-dgux${UNAME_RELEASE} - fi -- exit ;; -+ exit ;; - M88*:DolphinOS:*:*) # DolphinOS (SVR3) - echo m88k-dolphin-sysv3 - exit ;; -@@ -551,7 +572,7 @@ EOF - echo rs6000-ibm-aix3.2 - fi - exit ;; -- *:AIX:*:[456]) -+ *:AIX:*:[4567]) - IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` - if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then - IBM_ARCH=rs6000 -@@ -594,52 +615,52 @@ EOF - 9000/[678][0-9][0-9]) - if [ -x /usr/bin/getconf ]; then - sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` -- sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` -- case "${sc_cpu_version}" in -- 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 -- 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 -- 532) # CPU_PA_RISC2_0 -- case "${sc_kernel_bits}" in -- 32) HP_ARCH="hppa2.0n" ;; -- 64) HP_ARCH="hppa2.0w" ;; -+ sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` -+ case "${sc_cpu_version}" in -+ 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 -+ 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 -+ 532) # CPU_PA_RISC2_0 -+ case "${sc_kernel_bits}" in -+ 32) HP_ARCH="hppa2.0n" ;; -+ 64) HP_ARCH="hppa2.0w" ;; - '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 -- esac ;; -- esac -+ esac ;; -+ esac - fi - if [ "${HP_ARCH}" = "" ]; then - eval $set_cc_for_build -- sed 's/^ //' << EOF >$dummy.c -+ sed 's/^ //' << EOF >$dummy.c - -- #define _HPUX_SOURCE -- #include -- #include -+ #define _HPUX_SOURCE -+ #include -+ #include - -- int main () -- { -- #if defined(_SC_KERNEL_BITS) -- long bits = sysconf(_SC_KERNEL_BITS); -- #endif -- long cpu = sysconf (_SC_CPU_VERSION); -+ int main () -+ { -+ #if defined(_SC_KERNEL_BITS) -+ long bits = sysconf(_SC_KERNEL_BITS); -+ #endif -+ long cpu = sysconf (_SC_CPU_VERSION); - -- switch (cpu) -- { -- case CPU_PA_RISC1_0: puts ("hppa1.0"); break; -- case CPU_PA_RISC1_1: puts ("hppa1.1"); break; -- case CPU_PA_RISC2_0: -- #if defined(_SC_KERNEL_BITS) -- switch (bits) -- { -- case 64: puts ("hppa2.0w"); break; -- case 32: puts ("hppa2.0n"); break; -- default: puts ("hppa2.0"); break; -- } break; -- #else /* !defined(_SC_KERNEL_BITS) */ -- puts ("hppa2.0"); break; -- #endif -- default: puts ("hppa1.0"); break; -- } -- exit (0); -- } -+ switch (cpu) -+ { -+ case CPU_PA_RISC1_0: puts ("hppa1.0"); break; -+ case CPU_PA_RISC1_1: puts ("hppa1.1"); break; -+ case CPU_PA_RISC2_0: -+ #if defined(_SC_KERNEL_BITS) -+ switch (bits) -+ { -+ case 64: puts ("hppa2.0w"); break; -+ case 32: puts ("hppa2.0n"); break; -+ default: puts ("hppa2.0"); break; -+ } break; -+ #else /* !defined(_SC_KERNEL_BITS) */ -+ puts ("hppa2.0"); break; -+ #endif -+ default: puts ("hppa1.0"); break; -+ } -+ exit (0); -+ } - EOF - (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` - test -z "$HP_ARCH" && HP_ARCH=hppa -@@ -730,22 +751,22 @@ EOF - exit ;; - C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) - echo c1-convex-bsd -- exit ;; -+ exit ;; - C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) - if getsysinfo -f scalar_acc - then echo c32-convex-bsd - else echo c2-convex-bsd - fi -- exit ;; -+ exit ;; - C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) - echo c34-convex-bsd -- exit ;; -+ exit ;; - C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) - echo c38-convex-bsd -- exit ;; -+ exit ;; - C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) - echo c4-convex-bsd -- exit ;; -+ exit ;; - CRAY*Y-MP:*:*:*) - echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; -@@ -769,14 +790,14 @@ EOF - exit ;; - F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) - FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` -- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` -- FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` -- echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" -- exit ;; -+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` -+ FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` -+ echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" -+ exit ;; - 5000:UNIX_System_V:4.*:*) -- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` -- FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` -- echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" -+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` -+ FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` -+ echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit ;; - i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) - echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} -@@ -788,30 +809,35 @@ EOF - echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} - exit ;; - *:FreeBSD:*:*) -- case ${UNAME_MACHINE} in -- pc98) -- echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; -+ UNAME_PROCESSOR=`/usr/bin/uname -p` -+ case ${UNAME_PROCESSOR} in - amd64) - echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; - *) -- echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; -+ echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; - esac - exit ;; - i*:CYGWIN*:*) - echo ${UNAME_MACHINE}-pc-cygwin - exit ;; -+ *:MINGW64*:*) -+ echo ${UNAME_MACHINE}-pc-mingw64 -+ exit ;; - *:MINGW*:*) - echo ${UNAME_MACHINE}-pc-mingw32 - exit ;; -+ i*:MSYS*:*) -+ echo ${UNAME_MACHINE}-pc-msys -+ exit ;; - i*:windows32*:*) -- # uname -m includes "-pc" on this system. -- echo ${UNAME_MACHINE}-mingw32 -+ # uname -m includes "-pc" on this system. -+ echo ${UNAME_MACHINE}-mingw32 - exit ;; - i*:PW*:*) - echo ${UNAME_MACHINE}-pc-pw32 - exit ;; - *:Interix*:*) -- case ${UNAME_MACHINE} in -+ case ${UNAME_MACHINE} in - x86) - echo i586-pc-interix${UNAME_RELEASE} - exit ;; -@@ -848,15 +874,22 @@ EOF - exit ;; - *:GNU:*:*) - # the GNU system -- echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` -+ echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` - exit ;; - *:GNU/*:*:*) - # other systems with GNU libc and userland -- echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu -+ echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} - exit ;; - i*86:Minix:*:*) - echo ${UNAME_MACHINE}-pc-minix - exit ;; -+ aarch64:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} -+ exit ;; -+ aarch64_be:Linux:*:*) -+ UNAME_MACHINE=aarch64_be -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} -+ exit ;; - alpha:Linux:*:*) - case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in - EV5) UNAME_MACHINE=alphaev5 ;; -@@ -866,52 +899,56 @@ EOF - EV6) UNAME_MACHINE=alphaev6 ;; - EV67) UNAME_MACHINE=alphaev67 ;; - EV68*) UNAME_MACHINE=alphaev68 ;; -- esac -+ esac - objdump --private-headers /bin/sh | grep -q ld.so.1 -- if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi -- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} -+ if test "$?" = 0 ; then LIBC="gnulibc1" ; fi -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} -+ exit ;; -+ arc:Linux:*:* | arceb:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - arm*:Linux:*:*) - eval $set_cc_for_build - if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ - | grep -q __ARM_EABI__ - then -- echo ${UNAME_MACHINE}-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - else -- echo ${UNAME_MACHINE}-unknown-linux-gnueabi -+ if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ -+ | grep -q __ARM_PCS_VFP -+ then -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi -+ else -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf -+ fi - fi - exit ;; - avr32*:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - cris:Linux:*:*) -- echo cris-axis-linux-gnu -+ echo ${UNAME_MACHINE}-axis-linux-${LIBC} - exit ;; - crisv32:Linux:*:*) -- echo crisv32-axis-linux-gnu -+ echo ${UNAME_MACHINE}-axis-linux-${LIBC} - exit ;; - frv:Linux:*:*) -- echo frv-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} -+ exit ;; -+ hexagon:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - i*86:Linux:*:*) -- LIBC=gnu -- eval $set_cc_for_build -- sed 's/^ //' << EOF >$dummy.c -- #ifdef __dietlibc__ -- LIBC=dietlibc -- #endif --EOF -- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` -- echo "${UNAME_MACHINE}-pc-linux-${LIBC}" -+ echo ${UNAME_MACHINE}-pc-linux-${LIBC} - exit ;; - ia64:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - m32r*:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - m68*:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - mips:Linux:*:* | mips64:Linux:*:*) - eval $set_cc_for_build -@@ -930,51 +967,63 @@ EOF - #endif - EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` -- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } -+ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } - ;; -+ or1k:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} -+ exit ;; - or32:Linux:*:*) -- echo or32-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - padre:Linux:*:*) -- echo sparc-unknown-linux-gnu -+ echo sparc-unknown-linux-${LIBC} - exit ;; - parisc64:Linux:*:* | hppa64:Linux:*:*) -- echo hppa64-unknown-linux-gnu -+ echo hppa64-unknown-linux-${LIBC} - exit ;; - parisc:Linux:*:* | hppa:Linux:*:*) - # Look for CPU level - case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in -- PA7*) echo hppa1.1-unknown-linux-gnu ;; -- PA8*) echo hppa2.0-unknown-linux-gnu ;; -- *) echo hppa-unknown-linux-gnu ;; -+ PA7*) echo hppa1.1-unknown-linux-${LIBC} ;; -+ PA8*) echo hppa2.0-unknown-linux-${LIBC} ;; -+ *) echo hppa-unknown-linux-${LIBC} ;; - esac - exit ;; - ppc64:Linux:*:*) -- echo powerpc64-unknown-linux-gnu -+ echo powerpc64-unknown-linux-${LIBC} - exit ;; - ppc:Linux:*:*) -- echo powerpc-unknown-linux-gnu -+ echo powerpc-unknown-linux-${LIBC} -+ exit ;; -+ ppc64le:Linux:*:*) -+ echo powerpc64le-unknown-linux-${LIBC} -+ exit ;; -+ ppcle:Linux:*:*) -+ echo powerpcle-unknown-linux-${LIBC} - exit ;; - s390:Linux:*:* | s390x:Linux:*:*) -- echo ${UNAME_MACHINE}-ibm-linux -+ echo ${UNAME_MACHINE}-ibm-linux-${LIBC} - exit ;; - sh64*:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - sh*:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - sparc:Linux:*:* | sparc64:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} -+ exit ;; -+ tile*:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - vax:Linux:*:*) -- echo ${UNAME_MACHINE}-dec-linux-gnu -+ echo ${UNAME_MACHINE}-dec-linux-${LIBC} - exit ;; - x86_64:Linux:*:*) -- echo x86_64-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - xtensa*:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - i*86:DYNIX/ptx:4*:*) - # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. -@@ -983,11 +1032,11 @@ EOF - echo i386-sequent-sysv4 - exit ;; - i*86:UNIX_SV:4.2MP:2.*) -- # Unixware is an offshoot of SVR4, but it has its own version -- # number series starting with 2... -- # I am not positive that other SVR4 systems won't match this, -+ # Unixware is an offshoot of SVR4, but it has its own version -+ # number series starting with 2... -+ # I am not positive that other SVR4 systems won't match this, - # I just have to hope. -- rms. -- # Use sysv4.2uw... so that sysv4* matches it. -+ # Use sysv4.2uw... so that sysv4* matches it. - echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} - exit ;; - i*86:OS/2:*:*) -@@ -1019,7 +1068,7 @@ EOF - fi - exit ;; - i*86:*:5:[678]*) -- # UnixWare 7.x, OpenUNIX and OpenServer 6. -+ # UnixWare 7.x, OpenUNIX and OpenServer 6. - case `/bin/uname -X | grep "^Machine"` in - *486*) UNAME_MACHINE=i486 ;; - *Pentium) UNAME_MACHINE=i586 ;; -@@ -1047,13 +1096,13 @@ EOF - exit ;; - pc:*:*:*) - # Left here for compatibility: -- # uname -m prints for DJGPP always 'pc', but it prints nothing about -- # the processor, so we play safe by assuming i586. -+ # uname -m prints for DJGPP always 'pc', but it prints nothing about -+ # the processor, so we play safe by assuming i586. - # Note: whatever this is, it MUST be the same as what config.sub - # prints for the "djgpp" host, or else GDB configury will decide that - # this is a cross-build. - echo i586-pc-msdosdjgpp -- exit ;; -+ exit ;; - Intel:Mach:3*:*) - echo i386-pc-mach3 - exit ;; -@@ -1088,8 +1137,8 @@ EOF - /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; - 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) -- /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ -- && { echo i486-ncr-sysv4; exit; } ;; -+ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ -+ && { echo i486-ncr-sysv4; exit; } ;; - NCR*:*:4.2:* | MPRAS*:*:4.2:*) - OS_REL='.3' - test -r /etc/.relid \ -@@ -1132,10 +1181,10 @@ EOF - echo ns32k-sni-sysv - fi - exit ;; -- PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort -- # says -- echo i586-unisys-sysv4 -- exit ;; -+ PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort -+ # says -+ echo i586-unisys-sysv4 -+ exit ;; - *:UNIX_System_V:4*:FTX*) - # From Gerald Hewes . - # How about differentiating between stratus architectures? -djm -@@ -1161,11 +1210,11 @@ EOF - exit ;; - R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) - if [ -d /usr/nec ]; then -- echo mips-nec-sysv${UNAME_RELEASE} -+ echo mips-nec-sysv${UNAME_RELEASE} - else -- echo mips-unknown-sysv${UNAME_RELEASE} -+ echo mips-unknown-sysv${UNAME_RELEASE} - fi -- exit ;; -+ exit ;; - BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. - echo powerpc-be-beos - exit ;; -@@ -1178,6 +1227,9 @@ EOF - BePC:Haiku:*:*) # Haiku running on Intel PC compatible. - echo i586-pc-haiku - exit ;; -+ x86_64:Haiku:*:*) -+ echo x86_64-unknown-haiku -+ exit ;; - SX-4:SUPER-UX:*:*) - echo sx4-nec-superux${UNAME_RELEASE} - exit ;; -@@ -1204,19 +1256,21 @@ EOF - exit ;; - *:Darwin:*:*) - UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown -- case $UNAME_PROCESSOR in -- i386) -- eval $set_cc_for_build -- if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then -- if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ -- (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ -- grep IS_64BIT_ARCH >/dev/null -- then -- UNAME_PROCESSOR="x86_64" -- fi -- fi ;; -- unknown) UNAME_PROCESSOR=powerpc ;; -- esac -+ eval $set_cc_for_build -+ if test "$UNAME_PROCESSOR" = unknown ; then -+ UNAME_PROCESSOR=powerpc -+ fi -+ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then -+ if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ -+ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ -+ grep IS_64BIT_ARCH >/dev/null -+ then -+ case $UNAME_PROCESSOR in -+ i386) UNAME_PROCESSOR=x86_64 ;; -+ powerpc) UNAME_PROCESSOR=powerpc64 ;; -+ esac -+ fi -+ fi - echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} - exit ;; - *:procnto*:*:* | *:QNX:[0123456789]*:*) -@@ -1230,7 +1284,10 @@ EOF - *:QNX:*:4*) - echo i386-pc-qnx - exit ;; -- NSE-?:NONSTOP_KERNEL:*:*) -+ NEO-?:NONSTOP_KERNEL:*:*) -+ echo neo-tandem-nsk${UNAME_RELEASE} -+ exit ;; -+ NSE-*:NONSTOP_KERNEL:*:*) - echo nse-tandem-nsk${UNAME_RELEASE} - exit ;; - NSR-?:NONSTOP_KERNEL:*:*) -@@ -1275,13 +1332,13 @@ EOF - echo pdp10-unknown-its - exit ;; - SEI:*:*:SEIUX) -- echo mips-sei-seiux${UNAME_RELEASE} -+ echo mips-sei-seiux${UNAME_RELEASE} - exit ;; - *:DragonFly:*:*) - echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` - exit ;; - *:*VMS:*:*) -- UNAME_MACHINE=`(uname -p) 2>/dev/null` -+ UNAME_MACHINE=`(uname -p) 2>/dev/null` - case "${UNAME_MACHINE}" in - A*) echo alpha-dec-vms ; exit ;; - I*) echo ia64-dec-vms ; exit ;; -@@ -1299,11 +1356,11 @@ EOF - i*86:AROS:*:*) - echo ${UNAME_MACHINE}-pc-aros - exit ;; -+ x86_64:VMkernel:*:*) -+ echo ${UNAME_MACHINE}-unknown-esx -+ exit ;; - esac - --#echo '(No uname command or uname output not recognized.)' 1>&2 --#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 -- - eval $set_cc_for_build - cat >$dummy.c < - printf ("m68k-sony-newsos%s\n", - #ifdef NEWSOS4 -- "4" -+ "4" - #else -- "" -+ "" - #endif -- ); exit (0); -+ ); exit (0); - #endif - #endif - -diff --git a/config.h.in b/config.h.in -index 6a2c1a7..57e6966 100644 ---- a/config.h.in -+++ b/config.h.in -@@ -131,6 +131,9 @@ - /* Define to the one symbol short name of this package. */ - #undef PACKAGE_TARNAME - -+/* Define to the home page for this package. */ -+#undef PACKAGE_URL -+ - /* Define to the version of this package. */ - #undef PACKAGE_VERSION - -diff --git a/config.sub b/config.sub -index 2a55a50..9633db7 100755 ---- a/config.sub -+++ b/config.sub -@@ -1,38 +1,31 @@ - #! /bin/sh - # Configuration validation subroutine script. --# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, --# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 --# Free Software Foundation, Inc. -+# Copyright 1992-2013 Free Software Foundation, Inc. - --timestamp='2009-11-20' -+timestamp='2013-08-10' - --# This file is (in principle) common to ALL GNU software. --# The presence of a machine in this file suggests that SOME GNU software --# can handle that machine. It does not imply ALL GNU software can. --# --# This file is free software; you can redistribute it and/or modify --# it under the terms of the GNU General Public License as published by --# the Free Software Foundation; either version 2 of the License, or -+# This file is free software; you can redistribute it and/or modify it -+# under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 3 of the License, or - # (at your option) any later version. - # --# This program is distributed in the hope that it will be useful, --# but WITHOUT ANY WARRANTY; without even the implied warranty of --# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --# GNU General Public License for more details. -+# This program is distributed in the hope that it will be useful, but -+# WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+# General Public License for more details. - # - # You should have received a copy of the GNU General Public License --# along with this program; if not, write to the Free Software --# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA --# 02110-1301, USA. -+# along with this program; if not, see . - # - # As a special exception to the GNU General Public License, if you - # distribute this file as part of a program that contains a - # configuration script generated by Autoconf, you may include it under --# the same distribution terms that you use for the rest of that program. -+# the same distribution terms that you use for the rest of that -+# program. This Exception is an additional permission under section 7 -+# of the GNU General Public License, version 3 ("GPLv3"). - - --# Please send patches to . Submit a context --# diff and a properly formatted GNU ChangeLog entry. -+# Please send patches with a ChangeLog entry to config-patches@gnu.org. - # - # Configuration subroutine to validate and canonicalize a configuration type. - # Supply the specified configuration type as an argument. -@@ -75,8 +68,7 @@ Report bugs and patches to ." - version="\ - GNU config.sub ($timestamp) - --Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, --2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. -+Copyright 1992-2013 Free Software Foundation, Inc. - - This is free software; see the source for copying conditions. There is NO - warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." -@@ -123,13 +115,18 @@ esac - # Here we must recognize all the valid KERNEL-OS combinations. - maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` - case $maybe_os in -- nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ -- uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ -+ nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ -+ linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ -+ knetbsd*-gnu* | netbsd*-gnu* | \ - kopensolaris*-gnu* | \ - storm-chaos* | os2-emx* | rtmk-nova*) - os=-$maybe_os - basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` - ;; -+ android-linux) -+ os=-linux-android -+ basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown -+ ;; - *) - basic_machine=`echo $1 | sed 's/-[^-]*$//'` - if [ $basic_machine != $1 ] -@@ -152,12 +149,12 @@ case $os in - -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ - -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ - -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ -- -apple | -axis | -knuth | -cray | -microblaze) -+ -apple | -axis | -knuth | -cray | -microblaze*) - os= - basic_machine=$1 - ;; -- -bluegene*) -- os=-cnk -+ -bluegene*) -+ os=-cnk - ;; - -sim | -cisco | -oki | -wec | -winbond) - os= -@@ -173,10 +170,10 @@ case $os in - os=-chorusos - basic_machine=$1 - ;; -- -chorusrdb) -- os=-chorusrdb -+ -chorusrdb) -+ os=-chorusrdb - basic_machine=$1 -- ;; -+ ;; - -hiux*) - os=-hiuxwe2 - ;; -@@ -221,6 +218,12 @@ case $os in - -isc*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; -+ -lynx*178) -+ os=-lynxos178 -+ ;; -+ -lynx*5) -+ os=-lynxos5 -+ ;; - -lynx*) - os=-lynxos - ;; -@@ -245,20 +248,27 @@ case $basic_machine in - # Some are omitted here because they have special meanings below. - 1750a | 580 \ - | a29k \ -+ | aarch64 | aarch64_be \ - | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ - | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ - | am33_2.0 \ -- | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ -+ | arc | arceb \ -+ | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ -+ | avr | avr32 \ -+ | be32 | be64 \ - | bfin \ -- | c4x | clipper \ -+ | c4x | c8051 | clipper \ - | d10v | d30v | dlx | dsp16xx \ -+ | epiphany \ - | fido | fr30 | frv \ - | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ -+ | hexagon \ - | i370 | i860 | i960 | ia64 \ - | ip2k | iq2000 \ -+ | le32 | le64 \ - | lm32 \ - | m32c | m32r | m32rle | m68000 | m68k | m88k \ -- | maxq | mb | microblaze | mcore | mep | metag \ -+ | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ - | mips | mipsbe | mipseb | mipsel | mipsle \ - | mips16 \ - | mips64 | mips64el \ -@@ -276,34 +286,45 @@ case $basic_machine in - | mipsisa64r2 | mipsisa64r2el \ - | mipsisa64sb1 | mipsisa64sb1el \ - | mipsisa64sr71k | mipsisa64sr71kel \ -+ | mipsr5900 | mipsr5900el \ - | mipstx39 | mipstx39el \ - | mn10200 | mn10300 \ - | moxie \ - | mt \ - | msp430 \ -- | nios | nios2 \ -+ | nds32 | nds32le | nds32be \ -+ | nios | nios2 | nios2eb | nios2el \ - | ns16k | ns32k \ -- | or32 \ -+ | open8 \ -+ | or1k | or32 \ - | pdp10 | pdp11 | pj | pjl \ -- | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ -+ | powerpc | powerpc64 | powerpc64le | powerpcle \ - | pyramid \ -- | rx \ -+ | rl78 | rx \ - | score \ - | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ - | sh64 | sh64le \ - | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ - | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ -- | spu | strongarm \ -- | tahoe | thumb | tic4x | tic80 | tron \ -+ | spu \ -+ | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ - | ubicom32 \ -- | v850 | v850e \ -+ | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ - | we32k \ -- | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ -+ | x86 | xc16x | xstormy16 | xtensa \ - | z8k | z80) - basic_machine=$basic_machine-unknown - ;; -- m6811 | m68hc11 | m6812 | m68hc12 | picochip) -- # Motorola 68HC11/12. -+ c54x) -+ basic_machine=tic54x-unknown -+ ;; -+ c55x) -+ basic_machine=tic55x-unknown -+ ;; -+ c6x) -+ basic_machine=tic6x-unknown -+ ;; -+ m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) - basic_machine=$basic_machine-unknown - os=-none - ;; -@@ -313,6 +334,21 @@ case $basic_machine in - basic_machine=mt-unknown - ;; - -+ strongarm | thumb | xscale) -+ basic_machine=arm-unknown -+ ;; -+ xgate) -+ basic_machine=$basic_machine-unknown -+ os=-none -+ ;; -+ xscaleeb) -+ basic_machine=armeb-unknown -+ ;; -+ -+ xscaleel) -+ basic_machine=armel-unknown -+ ;; -+ - # We use `pc' rather than `unknown' - # because (1) that's what they normally are, and - # (2) the word "unknown" tends to confuse beginning users. -@@ -327,25 +363,30 @@ case $basic_machine in - # Recognize the basic CPU types with company name. - 580-* \ - | a29k-* \ -+ | aarch64-* | aarch64_be-* \ - | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ - | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ -- | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ -+ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ - | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ - | avr-* | avr32-* \ -+ | be32-* | be64-* \ - | bfin-* | bs2000-* \ -- | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ -- | clipper-* | craynv-* | cydra-* \ -+ | c[123]* | c30-* | [cjt]90-* | c4x-* \ -+ | c8051-* | clipper-* | craynv-* | cydra-* \ - | d10v-* | d30v-* | dlx-* \ - | elxsi-* \ - | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ - | h8300-* | h8500-* \ - | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ -+ | hexagon-* \ - | i*86-* | i860-* | i960-* | ia64-* \ - | ip2k-* | iq2000-* \ -+ | le32-* | le64-* \ - | lm32-* \ - | m32c-* | m32r-* | m32rle-* \ - | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ -- | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \ -+ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ -+ | microblaze-* | microblazeel-* \ - | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ - | mips16-* \ - | mips64-* | mips64el-* \ -@@ -363,29 +404,34 @@ case $basic_machine in - | mipsisa64r2-* | mipsisa64r2el-* \ - | mipsisa64sb1-* | mipsisa64sb1el-* \ - | mipsisa64sr71k-* | mipsisa64sr71kel-* \ -+ | mipsr5900-* | mipsr5900el-* \ - | mipstx39-* | mipstx39el-* \ - | mmix-* \ - | mt-* \ - | msp430-* \ -- | nios-* | nios2-* \ -+ | nds32-* | nds32le-* | nds32be-* \ -+ | nios-* | nios2-* | nios2eb-* | nios2el-* \ - | none-* | np1-* | ns16k-* | ns32k-* \ -+ | open8-* \ - | orion-* \ - | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ -- | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ -+ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ - | pyramid-* \ -- | romp-* | rs6000-* | rx-* \ -+ | rl78-* | romp-* | rs6000-* | rx-* \ - | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ - | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ - | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ - | sparclite-* \ -- | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ -- | tahoe-* | thumb-* \ -- | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \ -+ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ -+ | tahoe-* \ -+ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ -+ | tile*-* \ - | tron-* \ - | ubicom32-* \ -- | v850-* | v850e-* | vax-* \ -+ | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ -+ | vax-* \ - | we32k-* \ -- | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ -+ | x86-* | x86_64-* | xc16x-* | xps100-* \ - | xstormy16-* | xtensa*-* \ - | ymp-* \ - | z8k-* | z80-*) -@@ -410,7 +456,7 @@ case $basic_machine in - basic_machine=a29k-amd - os=-udi - ;; -- abacus) -+ abacus) - basic_machine=abacus-unknown - ;; - adobe68k) -@@ -480,11 +526,20 @@ case $basic_machine in - basic_machine=powerpc-ibm - os=-cnk - ;; -+ c54x-*) -+ basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` -+ ;; -+ c55x-*) -+ basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` -+ ;; -+ c6x-*) -+ basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` -+ ;; - c90) - basic_machine=c90-cray - os=-unicos - ;; -- cegcc) -+ cegcc) - basic_machine=arm-unknown - os=-cegcc - ;; -@@ -516,7 +571,7 @@ case $basic_machine in - basic_machine=craynv-cray - os=-unicosmp - ;; -- cr16) -+ cr16 | cr16-*) - basic_machine=cr16-unknown - os=-elf - ;; -@@ -674,7 +729,6 @@ case $basic_machine in - i370-ibm* | ibm*) - basic_machine=i370-ibm - ;; --# I'm not sure what "Sysv32" means. Should this be sysv3.2? - i*86v32) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-sysv32 -@@ -732,11 +786,15 @@ case $basic_machine in - basic_machine=ns32k-utek - os=-sysv - ;; -- microblaze) -+ microblaze*) - basic_machine=microblaze-xilinx - ;; -+ mingw64) -+ basic_machine=x86_64-pc -+ os=-mingw64 -+ ;; - mingw32) -- basic_machine=i386-pc -+ basic_machine=i686-pc - os=-mingw32 - ;; - mingw32ce) -@@ -771,10 +829,18 @@ case $basic_machine in - ms1-*) - basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` - ;; -+ msys) -+ basic_machine=i686-pc -+ os=-msys -+ ;; - mvs) - basic_machine=i370-ibm - os=-mvs - ;; -+ nacl) -+ basic_machine=le32-unknown -+ os=-nacl -+ ;; - ncr3000) - basic_machine=i486-ncr - os=-sysv4 -@@ -839,6 +905,12 @@ case $basic_machine in - np1) - basic_machine=np1-gould - ;; -+ neo-tandem) -+ basic_machine=neo-tandem -+ ;; -+ nse-tandem) -+ basic_machine=nse-tandem -+ ;; - nsr-tandem) - basic_machine=nsr-tandem - ;; -@@ -921,9 +993,10 @@ case $basic_machine in - ;; - power) basic_machine=power-ibm - ;; -- ppc) basic_machine=powerpc-unknown -+ ppc | ppcbe) basic_machine=powerpc-unknown - ;; -- ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` -+ ppc-* | ppcbe-*) -+ basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ppcle | powerpclittle | ppc-le | powerpc-little) - basic_machine=powerpcle-unknown -@@ -948,7 +1021,11 @@ case $basic_machine in - basic_machine=i586-unknown - os=-pw32 - ;; -- rdos) -+ rdos | rdos64) -+ basic_machine=x86_64-pc -+ os=-rdos -+ ;; -+ rdos32) - basic_machine=i386-pc - os=-rdos - ;; -@@ -1017,6 +1094,9 @@ case $basic_machine in - basic_machine=i860-stratus - os=-sysv4 - ;; -+ strongarm-* | thumb-*) -+ basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` -+ ;; - sun2) - basic_machine=m68000-sun - ;; -@@ -1073,20 +1153,8 @@ case $basic_machine in - basic_machine=t90-cray - os=-unicos - ;; -- tic54x | c54x*) -- basic_machine=tic54x-unknown -- os=-coff -- ;; -- tic55x | c55x*) -- basic_machine=tic55x-unknown -- os=-coff -- ;; -- tic6x | c6x*) -- basic_machine=tic6x-unknown -- os=-coff -- ;; - tile*) -- basic_machine=tile-unknown -+ basic_machine=$basic_machine-unknown - os=-linux-gnu - ;; - tx39) -@@ -1156,6 +1224,9 @@ case $basic_machine in - xps | xps100) - basic_machine=xps100-honeywell - ;; -+ xscale-* | xscalee[bl]-*) -+ basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` -+ ;; - ymp) - basic_machine=ymp-cray - os=-unicos -@@ -1253,11 +1324,11 @@ esac - if [ x"$os" != x"" ] - then - case $os in -- # First match some system type aliases -- # that might get confused with valid system types. -+ # First match some system type aliases -+ # that might get confused with valid system types. - # -solaris* is a basic system type, with this one exception. -- -auroraux) -- os=-auroraux -+ -auroraux) -+ os=-auroraux - ;; - -solaris1 | -solaris1.*) - os=`echo $os | sed -e 's|solaris1|sunos4|'` -@@ -1281,20 +1352,21 @@ case $os in - -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ - | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ - | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ -- | -sym* | -kopensolaris* \ -+ | -sym* | -kopensolaris* | -plan9* \ - | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ - | -aos* | -aros* \ - | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ - | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ - | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ -- | -openbsd* | -solidbsd* \ -+ | -bitrig* | -openbsd* | -solidbsd* \ - | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ - | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ - | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ - | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ - | -chorusos* | -chorusrdb* | -cegcc* \ -- | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ -- | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ -+ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ -+ | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ -+ | -linux-newlib* | -linux-musl* | -linux-uclibc* \ - | -uxpv* | -beos* | -mpeix* | -udk* \ - | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ - | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ -@@ -1341,7 +1413,7 @@ case $os in - -opened*) - os=-openedition - ;; -- -os400*) -+ -os400*) - os=-os400 - ;; - -wince*) -@@ -1390,7 +1462,7 @@ case $os in - -sinix*) - os=-sysv4 - ;; -- -tpf*) -+ -tpf*) - os=-tpf - ;; - -triton*) -@@ -1426,15 +1498,14 @@ case $os in - -aros*) - os=-aros - ;; -- -kaos*) -- os=-kaos -- ;; - -zvmoe) - os=-zvmoe - ;; - -dicos*) - os=-dicos - ;; -+ -nacl*) -+ ;; - -none) - ;; - *) -@@ -1457,10 +1528,10 @@ else - # system, and we'll never get to this point. - - case $basic_machine in -- score-*) -+ score-*) - os=-elf - ;; -- spu-*) -+ spu-*) - os=-elf - ;; - *-acorn) -@@ -1472,8 +1543,23 @@ case $basic_machine in - arm*-semi) - os=-aout - ;; -- c4x-* | tic4x-*) -- os=-coff -+ c4x-* | tic4x-*) -+ os=-coff -+ ;; -+ c8051-*) -+ os=-elf -+ ;; -+ hexagon-*) -+ os=-elf -+ ;; -+ tic54x-*) -+ os=-coff -+ ;; -+ tic55x-*) -+ os=-coff -+ ;; -+ tic6x-*) -+ os=-coff - ;; - # This must come before the *-dec entry. - pdp10-*) -@@ -1493,14 +1579,11 @@ case $basic_machine in - ;; - m68000-sun) - os=-sunos3 -- # This also exists in the configure program, but was not the -- # default. -- # os=-sunos4 - ;; - m68*-cisco) - os=-aout - ;; -- mep-*) -+ mep-*) - os=-elf - ;; - mips*-cisco) -@@ -1509,6 +1592,9 @@ case $basic_machine in - mips*-*) - os=-elf - ;; -+ or1k-*) -+ os=-elf -+ ;; - or32-*) - os=-coff - ;; -@@ -1527,7 +1613,7 @@ case $basic_machine in - *-ibm) - os=-aix - ;; -- *-knuth) -+ *-knuth) - os=-mmixware - ;; - *-wec) -diff --git a/configure b/configure -index 60cda03..29291a4 100755 ---- a/configure -+++ b/configure -@@ -1,20 +1,22 @@ - #! /bin/sh - # Guess values for system-dependent variables and create Makefiles. --# Generated by GNU Autoconf 2.63 for saga 2.1.0. -+# Generated by GNU Autoconf 2.69 for saga 2.1.0. - # - # Report bugs to . - # --# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, --# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. -+# -+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. -+# -+# - # This configure script is free software; the Free Software Foundation - # gives unlimited permission to copy, distribute and modify it. --## --------------------- ## --## M4sh Initialization. ## --## --------------------- ## -+## -------------------- ## -+## M4sh Initialization. ## -+## -------------------- ## - - # Be more Bourne compatible - DUALCASE=1; export DUALCASE # for MKS sh --if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then -+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : - emulate sh - NULLCMD=: - # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which -@@ -22,23 +24,15 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST - else -- case `(set -o) 2>/dev/null` in -- *posix*) set -o posix ;; -+ case `(set -o) 2>/dev/null` in #( -+ *posix*) : -+ set -o posix ;; #( -+ *) : -+ ;; - esac -- - fi - - -- -- --# PATH needs CR --# Avoid depending upon Character Ranges. --as_cr_letters='abcdefghijklmnopqrstuvwxyz' --as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' --as_cr_Letters=$as_cr_letters$as_cr_LETTERS --as_cr_digits='0123456789' --as_cr_alnum=$as_cr_Letters$as_cr_digits -- - as_nl=' - ' - export as_nl -@@ -46,7 +40,13 @@ export as_nl - as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' - as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo - as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo --if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then -+# Prefer a ksh shell builtin over an external printf program on Solaris, -+# but without wasting forks for bash or zsh. -+if test -z "$BASH_VERSION$ZSH_VERSION" \ -+ && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then -+ as_echo='print -r --' -+ as_echo_n='print -rn --' -+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then - as_echo='printf %s\n' - as_echo_n='printf %s' - else -@@ -57,7 +57,7 @@ else - as_echo_body='eval expr "X$1" : "X\\(.*\\)"' - as_echo_n_body='eval - arg=$1; -- case $arg in -+ case $arg in #( - *"$as_nl"*) - expr "X$arg" : "X\\(.*\\)$as_nl"; - arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; -@@ -80,13 +80,6 @@ if test "${PATH_SEPARATOR+set}" != set; then - } - fi - --# Support unset when possible. --if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then -- as_unset=unset --else -- as_unset=false --fi -- - - # IFS - # We need space, tab and new line, in precisely that order. Quoting is -@@ -96,15 +89,16 @@ fi - IFS=" "" $as_nl" - - # Find who we are. Look in the path if we contain no directory separator. --case $0 in -+as_myself= -+case $0 in #(( - *[\\/]* ) as_myself=$0 ;; - *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR - for as_dir in $PATH - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break --done -+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -+ done - IFS=$as_save_IFS - - ;; -@@ -116,12 +110,16 @@ if test "x$as_myself" = x; then - fi - if test ! -f "$as_myself"; then - $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 -- { (exit 1); exit 1; } -+ exit 1 - fi - --# Work around bugs in pre-3.0 UWIN ksh. --for as_var in ENV MAIL MAILPATH --do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var -+# Unset variables that we do not need and which cause bugs (e.g. in -+# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" -+# suppresses any "Segmentation fault" message there. '((' could -+# trigger a bug in pdksh 5.2.14. -+for as_var in BASH_ENV ENV MAIL MAILPATH -+do eval test x\${$as_var+set} = xset \ -+ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : - done - PS1='$ ' - PS2='> ' -@@ -133,7 +131,302 @@ export LC_ALL - LANGUAGE=C - export LANGUAGE - --# Required to use basename. -+# CDPATH. -+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH -+ -+# Use a proper internal environment variable to ensure we don't fall -+ # into an infinite loop, continuously re-executing ourselves. -+ if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then -+ _as_can_reexec=no; export _as_can_reexec; -+ # We cannot yet assume a decent shell, so we have to provide a -+# neutralization value for shells without unset; and this also -+# works around shells that cannot unset nonexistent variables. -+# Preserve -v and -x to the replacement shell. -+BASH_ENV=/dev/null -+ENV=/dev/null -+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV -+case $- in # (((( -+ *v*x* | *x*v* ) as_opts=-vx ;; -+ *v* ) as_opts=-v ;; -+ *x* ) as_opts=-x ;; -+ * ) as_opts= ;; -+esac -+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} -+# Admittedly, this is quite paranoid, since all the known shells bail -+# out after a failed `exec'. -+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 -+as_fn_exit 255 -+ fi -+ # We don't want this to propagate to other subprocesses. -+ { _as_can_reexec=; unset _as_can_reexec;} -+if test "x$CONFIG_SHELL" = x; then -+ as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : -+ emulate sh -+ NULLCMD=: -+ # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which -+ # is contrary to our usage. Disable this feature. -+ alias -g '\${1+\"\$@\"}'='\"\$@\"' -+ setopt NO_GLOB_SUBST -+else -+ case \`(set -o) 2>/dev/null\` in #( -+ *posix*) : -+ set -o posix ;; #( -+ *) : -+ ;; -+esac -+fi -+" -+ as_required="as_fn_return () { (exit \$1); } -+as_fn_success () { as_fn_return 0; } -+as_fn_failure () { as_fn_return 1; } -+as_fn_ret_success () { return 0; } -+as_fn_ret_failure () { return 1; } -+ -+exitcode=0 -+as_fn_success || { exitcode=1; echo as_fn_success failed.; } -+as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; } -+as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; } -+as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } -+if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : -+ -+else -+ exitcode=1; echo positional parameters were not saved. -+fi -+test x\$exitcode = x0 || exit 1 -+test -x / || exit 1" -+ as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO -+ as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO -+ eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && -+ test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1 -+ -+ test -n \"\${ZSH_VERSION+set}\${BASH_VERSION+set}\" || ( -+ ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' -+ ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO -+ ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO -+ PATH=/empty FPATH=/empty; export PATH FPATH -+ test \"X\`printf %s \$ECHO\`\" = \"X\$ECHO\" \\ -+ || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1 -+test \$(( 1 + 1 )) = 2 || exit 1" -+ if (eval "$as_required") 2>/dev/null; then : -+ as_have_required=yes -+else -+ as_have_required=no -+fi -+ if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then : -+ -+else -+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+as_found=false -+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ as_found=: -+ case $as_dir in #( -+ /*) -+ for as_base in sh bash ksh sh5; do -+ # Try only shells that exist, to save several forks. -+ as_shell=$as_dir/$as_base -+ if { test -f "$as_shell" || test -f "$as_shell.exe"; } && -+ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then : -+ CONFIG_SHELL=$as_shell as_have_required=yes -+ if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then : -+ break 2 -+fi -+fi -+ done;; -+ esac -+ as_found=false -+done -+$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } && -+ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then : -+ CONFIG_SHELL=$SHELL as_have_required=yes -+fi; } -+IFS=$as_save_IFS -+ -+ -+ if test "x$CONFIG_SHELL" != x; then : -+ export CONFIG_SHELL -+ # We cannot yet assume a decent shell, so we have to provide a -+# neutralization value for shells without unset; and this also -+# works around shells that cannot unset nonexistent variables. -+# Preserve -v and -x to the replacement shell. -+BASH_ENV=/dev/null -+ENV=/dev/null -+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV -+case $- in # (((( -+ *v*x* | *x*v* ) as_opts=-vx ;; -+ *v* ) as_opts=-v ;; -+ *x* ) as_opts=-x ;; -+ * ) as_opts= ;; -+esac -+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} -+# Admittedly, this is quite paranoid, since all the known shells bail -+# out after a failed `exec'. -+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 -+exit 255 -+fi -+ -+ if test x$as_have_required = xno; then : -+ $as_echo "$0: This script requires a shell more modern than all" -+ $as_echo "$0: the shells that I found on your system." -+ if test x${ZSH_VERSION+set} = xset ; then -+ $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" -+ $as_echo "$0: be upgraded to zsh 4.3.4 or later." -+ else -+ $as_echo "$0: Please tell bug-autoconf@gnu.org and BUG-REPORT-ADDRESS -+$0: about your system, including any error possibly output -+$0: before this message. Then install a modern shell, or -+$0: manually run the script under such a shell if you do -+$0: have one." -+ fi -+ exit 1 -+fi -+fi -+fi -+SHELL=${CONFIG_SHELL-/bin/sh} -+export SHELL -+# Unset more variables known to interfere with behavior of common tools. -+CLICOLOR_FORCE= GREP_OPTIONS= -+unset CLICOLOR_FORCE GREP_OPTIONS -+ -+## --------------------- ## -+## M4sh Shell Functions. ## -+## --------------------- ## -+# as_fn_unset VAR -+# --------------- -+# Portably unset VAR. -+as_fn_unset () -+{ -+ { eval $1=; unset $1;} -+} -+as_unset=as_fn_unset -+ -+# as_fn_set_status STATUS -+# ----------------------- -+# Set $? to STATUS, without forking. -+as_fn_set_status () -+{ -+ return $1 -+} # as_fn_set_status -+ -+# as_fn_exit STATUS -+# ----------------- -+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. -+as_fn_exit () -+{ -+ set +e -+ as_fn_set_status $1 -+ exit $1 -+} # as_fn_exit -+ -+# as_fn_mkdir_p -+# ------------- -+# Create "$as_dir" as a directory, including parents if necessary. -+as_fn_mkdir_p () -+{ -+ -+ case $as_dir in #( -+ -*) as_dir=./$as_dir;; -+ esac -+ test -d "$as_dir" || eval $as_mkdir_p || { -+ as_dirs= -+ while :; do -+ case $as_dir in #( -+ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( -+ *) as_qdir=$as_dir;; -+ esac -+ as_dirs="'$as_qdir' $as_dirs" -+ as_dir=`$as_dirname -- "$as_dir" || -+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -+ X"$as_dir" : 'X\(//\)[^/]' \| \ -+ X"$as_dir" : 'X\(//\)$' \| \ -+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -+$as_echo X"$as_dir" | -+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)[^/].*/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` -+ test -d "$as_dir" && break -+ done -+ test -z "$as_dirs" || eval "mkdir $as_dirs" -+ } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" -+ -+ -+} # as_fn_mkdir_p -+ -+# as_fn_executable_p FILE -+# ----------------------- -+# Test if FILE is an executable regular file. -+as_fn_executable_p () -+{ -+ test -f "$1" && test -x "$1" -+} # as_fn_executable_p -+# as_fn_append VAR VALUE -+# ---------------------- -+# Append the text in VALUE to the end of the definition contained in VAR. Take -+# advantage of any shell optimizations that allow amortized linear growth over -+# repeated appends, instead of the typical quadratic growth present in naive -+# implementations. -+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : -+ eval 'as_fn_append () -+ { -+ eval $1+=\$2 -+ }' -+else -+ as_fn_append () -+ { -+ eval $1=\$$1\$2 -+ } -+fi # as_fn_append -+ -+# as_fn_arith ARG... -+# ------------------ -+# Perform arithmetic evaluation on the ARGs, and store the result in the -+# global $as_val. Take advantage of shells that can avoid forks. The arguments -+# must be portable across $(()) and expr. -+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : -+ eval 'as_fn_arith () -+ { -+ as_val=$(( $* )) -+ }' -+else -+ as_fn_arith () -+ { -+ as_val=`expr "$@" || test $? -eq 1` -+ } -+fi # as_fn_arith -+ -+ -+# as_fn_error STATUS ERROR [LINENO LOG_FD] -+# ---------------------------------------- -+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are -+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the -+# script with STATUS, using 1 if that was 0. -+as_fn_error () -+{ -+ as_status=$1; test $as_status -eq 0 && as_status=1 -+ if test "$4"; then -+ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 -+ fi -+ $as_echo "$as_me: error: $2" >&2 -+ as_fn_exit $as_status -+} # as_fn_error -+ - if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr -@@ -147,8 +440,12 @@ else - as_basename=false - fi - -+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then -+ as_dirname=dirname -+else -+ as_dirname=false -+fi - --# Name of the executable. - as_me=`$as_basename -- "$0" || - $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ - X"$0" : 'X\(//\)$' \| \ -@@ -168,566 +465,115 @@ $as_echo X/"$0" | - } - s/.*/./; q'` - --# CDPATH. --$as_unset CDPATH -+# Avoid depending upon Character Ranges. -+as_cr_letters='abcdefghijklmnopqrstuvwxyz' -+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -+as_cr_Letters=$as_cr_letters$as_cr_LETTERS -+as_cr_digits='0123456789' -+as_cr_alnum=$as_cr_Letters$as_cr_digits - - --if test "x$CONFIG_SHELL" = x; then -- if (eval ":") 2>/dev/null; then -- as_have_required=yes --else -- as_have_required=no --fi -+ as_lineno_1=$LINENO as_lineno_1a=$LINENO -+ as_lineno_2=$LINENO as_lineno_2a=$LINENO -+ eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" && -+ test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || { -+ # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-) -+ sed -n ' -+ p -+ /[$]LINENO/= -+ ' <$as_myself | -+ sed ' -+ s/[$]LINENO.*/&-/ -+ t lineno -+ b -+ :lineno -+ N -+ :loop -+ s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ -+ t loop -+ s/-\n.*// -+ ' >$as_me.lineno && -+ chmod +x "$as_me.lineno" || -+ { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } - -- if test $as_have_required = yes && (eval ": --(as_func_return () { -- (exit \$1) --} --as_func_success () { -- as_func_return 0 --} --as_func_failure () { -- as_func_return 1 --} --as_func_ret_success () { -- return 0 --} --as_func_ret_failure () { -- return 1 -+ # If we had to re-execute with $CONFIG_SHELL, we're ensured to have -+ # already done that, so ensure we don't try to do so again and fall -+ # in an infinite loop. This has already happened in practice. -+ _as_can_reexec=no; export _as_can_reexec -+ # Don't try to exec as it changes $[0], causing all sort of problems -+ # (the dirname of $[0] is not the place where we might find the -+ # original and so on. Autoconf is especially sensitive to this). -+ . "./$as_me.lineno" -+ # Exit status is that of the last command. -+ exit - } - --exitcode=0 --if as_func_success; then -- : --else -- exitcode=1 -- echo as_func_success failed. --fi -- --if as_func_failure; then -- exitcode=1 -- echo as_func_failure succeeded. --fi -+ECHO_C= ECHO_N= ECHO_T= -+case `echo -n x` in #((((( -+-n*) -+ case `echo 'xy\c'` in -+ *c*) ECHO_T=' ';; # ECHO_T is single tab character. -+ xy) ECHO_C='\c';; -+ *) echo `echo ksh88 bug on AIX 6.1` > /dev/null -+ ECHO_T=' ';; -+ esac;; -+*) -+ ECHO_N='-n';; -+esac - --if as_func_ret_success; then -- : -+rm -f conf$$ conf$$.exe conf$$.file -+if test -d conf$$.dir; then -+ rm -f conf$$.dir/conf$$.file - else -- exitcode=1 -- echo as_func_ret_success failed. -+ rm -f conf$$.dir -+ mkdir conf$$.dir 2>/dev/null - fi -- --if as_func_ret_failure; then -- exitcode=1 -- echo as_func_ret_failure succeeded. -+if (echo >conf$$.file) 2>/dev/null; then -+ if ln -s conf$$.file conf$$ 2>/dev/null; then -+ as_ln_s='ln -s' -+ # ... but there are two gotchas: -+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. -+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. -+ # In both cases, we have to default to `cp -pR'. -+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || -+ as_ln_s='cp -pR' -+ elif ln conf$$.file conf$$ 2>/dev/null; then -+ as_ln_s=ln -+ else -+ as_ln_s='cp -pR' -+ fi -+else -+ as_ln_s='cp -pR' - fi -+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file -+rmdir conf$$.dir 2>/dev/null - --if ( set x; as_func_ret_success y && test x = \"\$1\" ); then -- : -+if mkdir -p . 2>/dev/null; then -+ as_mkdir_p='mkdir -p "$as_dir"' - else -- exitcode=1 -- echo positional parameters were not saved. -+ test -d ./-p && rmdir ./-p -+ as_mkdir_p=false - fi - --test \$exitcode = 0) || { (exit 1); exit 1; } -- --( -- as_lineno_1=\$LINENO -- as_lineno_2=\$LINENO -- test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" && -- test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; } --") 2> /dev/null; then -- : --else -- as_candidate_shells= -- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- case $as_dir in -- /*) -- for as_base in sh bash ksh sh5; do -- as_candidate_shells="$as_candidate_shells $as_dir/$as_base" -- done;; -- esac --done --IFS=$as_save_IFS -+as_test_x='test -x' -+as_executable_p=as_fn_executable_p - -+# Sed expression to map a string onto a valid CPP name. -+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" - -- for as_shell in $as_candidate_shells $SHELL; do -- # Try only shells that exist, to save several forks. -- if { test -f "$as_shell" || test -f "$as_shell.exe"; } && -- { ("$as_shell") 2> /dev/null <<\_ASEOF --if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then -- emulate sh -- NULLCMD=: -- # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which -- # is contrary to our usage. Disable this feature. -- alias -g '${1+"$@"}'='"$@"' -- setopt NO_GLOB_SUBST --else -- case `(set -o) 2>/dev/null` in -- *posix*) set -o posix ;; --esac -+# Sed expression to map a string onto a valid variable name. -+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" - --fi -+SHELL=${CONFIG_SHELL-/bin/sh} - - --: --_ASEOF --}; then -- CONFIG_SHELL=$as_shell -- as_have_required=yes -- if { "$as_shell" 2> /dev/null <<\_ASEOF --if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then -- emulate sh -- NULLCMD=: -- # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which -- # is contrary to our usage. Disable this feature. -- alias -g '${1+"$@"}'='"$@"' -- setopt NO_GLOB_SUBST --else -- case `(set -o) 2>/dev/null` in -- *posix*) set -o posix ;; --esac -+test -n "$DJDIR" || exec 7<&0 &1 - --fi -- -- --: --(as_func_return () { -- (exit $1) --} --as_func_success () { -- as_func_return 0 --} --as_func_failure () { -- as_func_return 1 --} --as_func_ret_success () { -- return 0 --} --as_func_ret_failure () { -- return 1 --} -- --exitcode=0 --if as_func_success; then -- : --else -- exitcode=1 -- echo as_func_success failed. --fi -- --if as_func_failure; then -- exitcode=1 -- echo as_func_failure succeeded. --fi -- --if as_func_ret_success; then -- : --else -- exitcode=1 -- echo as_func_ret_success failed. --fi -- --if as_func_ret_failure; then -- exitcode=1 -- echo as_func_ret_failure succeeded. --fi -- --if ( set x; as_func_ret_success y && test x = "$1" ); then -- : --else -- exitcode=1 -- echo positional parameters were not saved. --fi -- --test $exitcode = 0) || { (exit 1); exit 1; } -- --( -- as_lineno_1=$LINENO -- as_lineno_2=$LINENO -- test "x$as_lineno_1" != "x$as_lineno_2" && -- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; } -- --_ASEOF --}; then -- break --fi -- --fi -- -- done -- -- if test "x$CONFIG_SHELL" != x; then -- for as_var in BASH_ENV ENV -- do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var -- done -- export CONFIG_SHELL -- exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} --fi -- -- -- if test $as_have_required = no; then -- echo This script requires a shell more modern than all the -- echo shells that I found on your system. Please install a -- echo modern shell, or manually run the script under such a -- echo shell if you do have one. -- { (exit 1); exit 1; } --fi -- -- --fi -- --fi -- -- -- --(eval "as_func_return () { -- (exit \$1) --} --as_func_success () { -- as_func_return 0 --} --as_func_failure () { -- as_func_return 1 --} --as_func_ret_success () { -- return 0 --} --as_func_ret_failure () { -- return 1 --} -- --exitcode=0 --if as_func_success; then -- : --else -- exitcode=1 -- echo as_func_success failed. --fi -- --if as_func_failure; then -- exitcode=1 -- echo as_func_failure succeeded. --fi -- --if as_func_ret_success; then -- : --else -- exitcode=1 -- echo as_func_ret_success failed. --fi -- --if as_func_ret_failure; then -- exitcode=1 -- echo as_func_ret_failure succeeded. --fi -- --if ( set x; as_func_ret_success y && test x = \"\$1\" ); then -- : --else -- exitcode=1 -- echo positional parameters were not saved. --fi -- --test \$exitcode = 0") || { -- echo No shell found that supports shell functions. -- echo Please tell bug-autoconf@gnu.org about your system, -- echo including any error possibly output before this message. -- echo This can help us improve future autoconf versions. -- echo Configuration will now proceed without shell functions. --} -- -- -- -- as_lineno_1=$LINENO -- as_lineno_2=$LINENO -- test "x$as_lineno_1" != "x$as_lineno_2" && -- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { -- -- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO -- # uniformly replaced by the line number. The first 'sed' inserts a -- # line-number line after each line using $LINENO; the second 'sed' -- # does the real work. The second script uses 'N' to pair each -- # line-number line with the line containing $LINENO, and appends -- # trailing '-' during substitution so that $LINENO is not a special -- # case at line end. -- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the -- # scripts with optimization help from Paolo Bonzini. Blame Lee -- # E. McMahon (1931-1989) for sed's syntax. :-) -- sed -n ' -- p -- /[$]LINENO/= -- ' <$as_myself | -- sed ' -- s/[$]LINENO.*/&-/ -- t lineno -- b -- :lineno -- N -- :loop -- s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ -- t loop -- s/-\n.*// -- ' >$as_me.lineno && -- chmod +x "$as_me.lineno" || -- { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 -- { (exit 1); exit 1; }; } -- -- # Don't try to exec as it changes $[0], causing all sort of problems -- # (the dirname of $[0] is not the place where we might find the -- # original and so on. Autoconf is especially sensitive to this). -- . "./$as_me.lineno" -- # Exit status is that of the last command. -- exit --} -- -- --if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then -- as_dirname=dirname --else -- as_dirname=false --fi -- --ECHO_C= ECHO_N= ECHO_T= --case `echo -n x` in ---n*) -- case `echo 'x\c'` in -- *c*) ECHO_T=' ';; # ECHO_T is single tab character. -- *) ECHO_C='\c';; -- esac;; --*) -- ECHO_N='-n';; --esac --if expr a : '\(a\)' >/dev/null 2>&1 && -- test "X`expr 00001 : '.*\(...\)'`" = X001; then -- as_expr=expr --else -- as_expr=false --fi -- --rm -f conf$$ conf$$.exe conf$$.file --if test -d conf$$.dir; then -- rm -f conf$$.dir/conf$$.file --else -- rm -f conf$$.dir -- mkdir conf$$.dir 2>/dev/null --fi --if (echo >conf$$.file) 2>/dev/null; then -- if ln -s conf$$.file conf$$ 2>/dev/null; then -- as_ln_s='ln -s' -- # ... but there are two gotchas: -- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. -- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. -- # In both cases, we have to default to `cp -p'. -- ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || -- as_ln_s='cp -p' -- elif ln conf$$.file conf$$ 2>/dev/null; then -- as_ln_s=ln -- else -- as_ln_s='cp -p' -- fi --else -- as_ln_s='cp -p' --fi --rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file --rmdir conf$$.dir 2>/dev/null -- --if mkdir -p . 2>/dev/null; then -- as_mkdir_p=: --else -- test -d ./-p && rmdir ./-p -- as_mkdir_p=false --fi -- --if test -x / >/dev/null 2>&1; then -- as_test_x='test -x' --else -- if ls -dL / >/dev/null 2>&1; then -- as_ls_L_option=L -- else -- as_ls_L_option= -- fi -- as_test_x=' -- eval sh -c '\'' -- if test -d "$1"; then -- test -d "$1/."; -- else -- case $1 in -- -*)set "./$1";; -- esac; -- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in -- ???[sx]*):;;*)false;;esac;fi -- '\'' sh -- ' --fi --as_executable_p=$as_test_x -- --# Sed expression to map a string onto a valid CPP name. --as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" -- --# Sed expression to map a string onto a valid variable name. --as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" -- -- -- -- --# Check that we are running under the correct shell. --SHELL=${CONFIG_SHELL-/bin/sh} -- --case X$lt_ECHO in --X*--fallback-echo) -- # Remove one level of quotation (which was required for Make). -- ECHO=`echo "$lt_ECHO" | sed 's,\\\\\$\\$0,'$0','` -- ;; --esac -- --ECHO=${lt_ECHO-echo} --if test "X$1" = X--no-reexec; then -- # Discard the --no-reexec flag, and continue. -- shift --elif test "X$1" = X--fallback-echo; then -- # Avoid inline document here, it may be left over -- : --elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then -- # Yippee, $ECHO works! -- : --else -- # Restart under the correct shell. -- exec $SHELL "$0" --no-reexec ${1+"$@"} --fi -- --if test "X$1" = X--fallback-echo; then -- # used as fallback echo -- shift -- cat <<_LT_EOF --$* --_LT_EOF -- exit 0 --fi -- --# The HP-UX ksh and POSIX shell print the target directory to stdout --# if CDPATH is set. --(unset CDPATH) >/dev/null 2>&1 && unset CDPATH -- --if test -z "$lt_ECHO"; then -- if test "X${echo_test_string+set}" != Xset; then -- # find a string as large as possible, as long as the shell can cope with it -- for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do -- # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... -- if { echo_test_string=`eval $cmd`; } 2>/dev/null && -- { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null -- then -- break -- fi -- done -- fi -- -- if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && -- echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && -- test "X$echo_testing_string" = "X$echo_test_string"; then -- : -- else -- # The Solaris, AIX, and Digital Unix default echo programs unquote -- # backslashes. This makes it impossible to quote backslashes using -- # echo "$something" | sed 's/\\/\\\\/g' -- # -- # So, first we look for a working echo in the user's PATH. -- -- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR -- for dir in $PATH /usr/ucb; do -- IFS="$lt_save_ifs" -- if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && -- test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && -- echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && -- test "X$echo_testing_string" = "X$echo_test_string"; then -- ECHO="$dir/echo" -- break -- fi -- done -- IFS="$lt_save_ifs" -- -- if test "X$ECHO" = Xecho; then -- # We didn't find a better echo, so look for alternatives. -- if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' && -- echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` && -- test "X$echo_testing_string" = "X$echo_test_string"; then -- # This shell has a builtin print -r that does the trick. -- ECHO='print -r' -- elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } && -- test "X$CONFIG_SHELL" != X/bin/ksh; then -- # If we have ksh, try running configure again with it. -- ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} -- export ORIGINAL_CONFIG_SHELL -- CONFIG_SHELL=/bin/ksh -- export CONFIG_SHELL -- exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"} -- else -- # Try using printf. -- ECHO='printf %s\n' -- if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && -- echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && -- test "X$echo_testing_string" = "X$echo_test_string"; then -- # Cool, printf works -- : -- elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` && -- test "X$echo_testing_string" = 'X\t' && -- echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` && -- test "X$echo_testing_string" = "X$echo_test_string"; then -- CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL -- export CONFIG_SHELL -- SHELL="$CONFIG_SHELL" -- export SHELL -- ECHO="$CONFIG_SHELL $0 --fallback-echo" -- elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` && -- test "X$echo_testing_string" = 'X\t' && -- echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` && -- test "X$echo_testing_string" = "X$echo_test_string"; then -- ECHO="$CONFIG_SHELL $0 --fallback-echo" -- else -- # maybe with a smaller string... -- prev=: -- -- for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do -- if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null -- then -- break -- fi -- prev="$cmd" -- done -- -- if test "$prev" != 'sed 50q "$0"'; then -- echo_test_string=`eval $prev` -- export echo_test_string -- exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"} -- else -- # Oops. We lost completely, so just stick with echo. -- ECHO=echo -- fi -- fi -- fi -- fi -- fi --fi -- --# Copy echo and quote the copy suitably for passing to libtool from --# the Makefile, instead of quoting the original, which is used later. --lt_ECHO=$ECHO --if test "X$lt_ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then -- lt_ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo" --fi -- -- -- -- --exec 7<&0 &1 -- --# Name of the host. --# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, --# so uname gets run too. --ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` -+# Name of the host. -+# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status, -+# so uname gets run too. -+ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` - - # - # Initializations. -@@ -740,7 +586,6 @@ cross_compiling=no - subdirs= - MFLAGS= - MAKEFLAGS= --SHELL=${CONFIG_SHELL-/bin/sh} - - # Identity of this package. - PACKAGE_NAME='saga' -@@ -748,6 +593,7 @@ PACKAGE_TARNAME='saga' - PACKAGE_VERSION='2.1.0' - PACKAGE_STRING='saga 2.1.0' - PACKAGE_BUGREPORT='BUG-REPORT-ADDRESS' -+PACKAGE_URL='' - - ac_unique_file="src/saga_core/saga_gui/wksp_data_menu_files.cpp" - # Factoring default headers for most tests. -@@ -841,9 +687,11 @@ OTOOL - LIPO - NMEDIT - DSYMUTIL --lt_ECHO -+MANIFEST_TOOL - RANLIB -+ac_ct_AR - AR -+DLLTOOL - OBJDUMP - LN_S - NM -@@ -872,6 +720,7 @@ CC - am__fastdepCXX_FALSE - am__fastdepCXX_TRUE - CXXDEPMODE -+am__nodep - AMDEPBACKSLASH - AMDEP_FALSE - AMDEP_TRUE -@@ -885,6 +734,10 @@ CPPFLAGS - LDFLAGS - CXXFLAGS - CXX -+AM_BACKSLASH -+AM_DEFAULT_VERBOSITY -+AM_DEFAULT_V -+AM_V - am__untar - am__tar - AMTAR -@@ -938,6 +791,7 @@ bindir - program_transform_name - prefix - exec_prefix -+PACKAGE_URL - PACKAGE_BUGREPORT - PACKAGE_STRING - PACKAGE_VERSION -@@ -948,12 +802,14 @@ SHELL' - ac_subst_files='' - ac_user_opts=' - enable_option_checking -+enable_silent_rules - enable_dependency_tracking - enable_shared - enable_static - with_pic - enable_fast_install - with_gnu_ld -+with_sysroot - enable_libtool_lock - with_local - enable_debug -@@ -975,6 +831,7 @@ CC - CFLAGS - CPP - CXXCPP -+PYTHON - PYTHON_VERSION' - - -@@ -1038,8 +895,9 @@ do - fi - - case $ac_option in -- *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; -- *) ac_optarg=yes ;; -+ *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; -+ *=) ac_optarg= ;; -+ *) ac_optarg=yes ;; - esac - - # Accept the important Cygnus configure options, so we can diagnose typos. -@@ -1084,8 +942,7 @@ do - ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` - # Reject names that are not valid shell variable names. - expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && -- { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2 -- { (exit 1); exit 1; }; } -+ as_fn_error $? "invalid feature name: $ac_useropt" - ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` - case $ac_user_opts in -@@ -1111,8 +968,7 @@ do - ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` - # Reject names that are not valid shell variable names. - expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && -- { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2 -- { (exit 1); exit 1; }; } -+ as_fn_error $? "invalid feature name: $ac_useropt" - ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` - case $ac_user_opts in -@@ -1316,8 +1172,7 @@ do - ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` - # Reject names that are not valid shell variable names. - expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && -- { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2 -- { (exit 1); exit 1; }; } -+ as_fn_error $? "invalid package name: $ac_useropt" - ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` - case $ac_user_opts in -@@ -1333,8 +1188,7 @@ do - ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` - # Reject names that are not valid shell variable names. - expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && -- { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2 -- { (exit 1); exit 1; }; } -+ as_fn_error $? "invalid package name: $ac_useropt" - ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` - case $ac_user_opts in -@@ -1364,17 +1218,17 @@ do - | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) - x_libraries=$ac_optarg ;; - -- -*) { $as_echo "$as_me: error: unrecognized option: $ac_option --Try \`$0 --help' for more information." >&2 -- { (exit 1); exit 1; }; } -+ -*) as_fn_error $? "unrecognized option: \`$ac_option' -+Try \`$0 --help' for more information" - ;; - - *=*) - ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` - # Reject names that are not valid shell variable names. -- expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && -- { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2 -- { (exit 1); exit 1; }; } -+ case $ac_envvar in #( -+ '' | [0-9]* | *[!_$as_cr_alnum]* ) -+ as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; -+ esac - eval $ac_envvar=\$ac_optarg - export $ac_envvar ;; - -@@ -1383,7 +1237,7 @@ Try \`$0 --help' for more information." >&2 - $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 - expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && - $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 -- : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} -+ : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" - ;; - - esac -@@ -1391,15 +1245,13 @@ done - - if test -n "$ac_prev"; then - ac_option=--`echo $ac_prev | sed 's/_/-/g'` -- { $as_echo "$as_me: error: missing argument to $ac_option" >&2 -- { (exit 1); exit 1; }; } -+ as_fn_error $? "missing argument to $ac_option" - fi - - if test -n "$ac_unrecognized_opts"; then - case $enable_option_checking in - no) ;; -- fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2 -- { (exit 1); exit 1; }; } ;; -+ fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; - *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; - esac - fi -@@ -1422,8 +1274,7 @@ do - [\\/$]* | ?:[\\/]* ) continue;; - NONE | '' ) case $ac_var in *prefix ) continue;; esac;; - esac -- { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 -- { (exit 1); exit 1; }; } -+ as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" - done - - # There might be people who depend on the old broken behavior: `$host' -@@ -1437,8 +1288,6 @@ target=$target_alias - if test "x$host_alias" != x; then - if test "x$build_alias" = x; then - cross_compiling=maybe -- $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. -- If a cross compiler is detected then cross compile mode will be used." >&2 - elif test "x$build_alias" != "x$host_alias"; then - cross_compiling=yes - fi -@@ -1453,11 +1302,9 @@ test "$silent" = yes && exec 6>/dev/null - ac_pwd=`pwd` && test -n "$ac_pwd" && - ac_ls_di=`ls -di .` && - ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || -- { $as_echo "$as_me: error: working directory cannot be determined" >&2 -- { (exit 1); exit 1; }; } -+ as_fn_error $? "working directory cannot be determined" - test "X$ac_ls_di" = "X$ac_pwd_ls_di" || -- { $as_echo "$as_me: error: pwd does not report name of working directory" >&2 -- { (exit 1); exit 1; }; } -+ as_fn_error $? "pwd does not report name of working directory" - - - # Find the source files, if location was not specified. -@@ -1496,13 +1343,11 @@ else - fi - if test ! -r "$srcdir/$ac_unique_file"; then - test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." -- { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 -- { (exit 1); exit 1; }; } -+ as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" - fi - ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" - ac_abs_confdir=`( -- cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2 -- { (exit 1); exit 1; }; } -+ cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" - pwd)` - # When building in place, set srcdir=. - if test "$ac_abs_confdir" = "$ac_pwd"; then -@@ -1542,7 +1387,7 @@ Configuration: - --help=short display options specific to this package - --help=recursive display the short help of all the included packages - -V, --version display version information and exit -- -q, --quiet, --silent do not print \`checking...' messages -+ -q, --quiet, --silent do not print \`checking ...' messages - --cache-file=FILE cache test results in FILE [disabled] - -C, --config-cache alias for \`--cache-file=config.cache' - -n, --no-create do not create output files -@@ -1606,8 +1451,12 @@ Optional Features: - --disable-option-checking ignore unrecognized --enable/--with options - --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) - --enable-FEATURE[=ARG] include FEATURE [ARG=yes] -- --disable-dependency-tracking speeds up one-time build -- --enable-dependency-tracking do not reject slow dependency extractors -+ --enable-silent-rules less verbose build output (undo: "make V=1") -+ --disable-silent-rules verbose build output (undo: "make V=0") -+ --enable-dependency-tracking -+ do not reject slow dependency extractors -+ --disable-dependency-tracking -+ speeds up one-time build - --enable-shared[=PKGS] build shared libraries [default=yes] - --enable-static[=PKGS] build static libraries [default=yes] - --enable-fast-install[=PKGS] -@@ -1622,9 +1471,11 @@ Optional Features: - Optional Packages: - --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] - --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) -- --with-pic try to use only PIC/non-PIC objects [default=use -+ --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use - both] - --with-gnu-ld assume the C compiler uses GNU ld [default=no] -+ --with-sysroot=DIR Search for dependent libraries within DIR -+ (or the compiler's sysroot if not specified). - --with-local=dir search /usr/local or other directory for includes and libs - - Some influential environment variables: -@@ -1633,12 +1484,13 @@ Some influential environment variables: - LDFLAGS linker flags, e.g. -L if you have libraries in a - nonstandard directory - LIBS libraries to pass to the linker, e.g. -l -- CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I if -+ CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if - you have headers in a nonstandard directory - CC C compiler command - CFLAGS C compiler flags - CPP C preprocessor - CXXCPP C++ preprocessor -+ PYTHON the Python interpreter - PYTHON_VERSION - The installed Python version to use, for example '2.3'. This - string will be appended to the Python interpreter canonical -@@ -1711,34 +1563,564 @@ test -n "$ac_init_help" && exit $ac_status - if $ac_init_version; then - cat <<\_ACEOF - saga configure 2.1.0 --generated by GNU Autoconf 2.63 -+generated by GNU Autoconf 2.69 - --Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, --2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. -+Copyright (C) 2012 Free Software Foundation, Inc. - This configure script is free software; the Free Software Foundation - gives unlimited permission to copy, distribute and modify it. - _ACEOF - exit - fi --cat >config.log <<_ACEOF --This file contains any messages produced by compilers while --running configure, to aid debugging if configure makes a mistake. -- --It was created by saga $as_me 2.1.0, which was --generated by GNU Autoconf 2.63. Invocation command line was - -- $ $0 $@ -+## ------------------------ ## -+## Autoconf initialization. ## -+## ------------------------ ## - --_ACEOF --exec 5>>config.log -+# ac_fn_cxx_try_compile LINENO -+# ---------------------------- -+# Try to compile conftest.$ac_ext, and return whether this succeeded. -+ac_fn_cxx_try_compile () - { --cat <<_ASUNAME --## --------- ## --## Platform. ## --## --------- ## -+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ rm -f conftest.$ac_objext -+ if { { ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_compile") 2>conftest.err -+ ac_status=$? -+ if test -s conftest.err; then -+ grep -v '^ *+' conftest.err >conftest.er1 -+ cat conftest.er1 >&5 -+ mv -f conftest.er1 conftest.err -+ fi -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } && { -+ test -z "$ac_cxx_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then : -+ ac_retval=0 -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - --hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` --uname -m = `(uname -m) 2>/dev/null || echo unknown` -+ ac_retval=1 -+fi -+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno -+ as_fn_set_status $ac_retval -+ -+} # ac_fn_cxx_try_compile -+ -+# ac_fn_c_try_compile LINENO -+# -------------------------- -+# Try to compile conftest.$ac_ext, and return whether this succeeded. -+ac_fn_c_try_compile () -+{ -+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ rm -f conftest.$ac_objext -+ if { { ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_compile") 2>conftest.err -+ ac_status=$? -+ if test -s conftest.err; then -+ grep -v '^ *+' conftest.err >conftest.er1 -+ cat conftest.er1 >&5 -+ mv -f conftest.er1 conftest.err -+ fi -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then : -+ ac_retval=0 -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_retval=1 -+fi -+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno -+ as_fn_set_status $ac_retval -+ -+} # ac_fn_c_try_compile -+ -+# ac_fn_c_try_link LINENO -+# ----------------------- -+# Try to link conftest.$ac_ext, and return whether this succeeded. -+ac_fn_c_try_link () -+{ -+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ rm -f conftest.$ac_objext conftest$ac_exeext -+ if { { ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_link") 2>conftest.err -+ ac_status=$? -+ if test -s conftest.err; then -+ grep -v '^ *+' conftest.err >conftest.er1 -+ cat conftest.er1 >&5 -+ mv -f conftest.er1 conftest.err -+ fi -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ test -x conftest$ac_exeext -+ }; then : -+ ac_retval=0 -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_retval=1 -+fi -+ # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information -+ # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would -+ # interfere with the next link command; also delete a directory that is -+ # left behind by Apple's compiler. We do this before executing the actions. -+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo -+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno -+ as_fn_set_status $ac_retval -+ -+} # ac_fn_c_try_link -+ -+# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES -+# ------------------------------------------------------- -+# Tests whether HEADER exists and can be compiled using the include files in -+# INCLUDES, setting the cache variable VAR accordingly. -+ac_fn_c_check_header_compile () -+{ -+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -+$as_echo_n "checking for $2... " >&6; } -+if eval \${$3+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+$4 -+#include <$2> -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ eval "$3=yes" -+else -+ eval "$3=no" -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+eval ac_res=\$$3 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno -+ -+} # ac_fn_c_check_header_compile -+ -+# ac_fn_c_try_cpp LINENO -+# ---------------------- -+# Try to preprocess conftest.$ac_ext, and return whether this succeeded. -+ac_fn_c_try_cpp () -+{ -+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ if { { ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err -+ ac_status=$? -+ if test -s conftest.err; then -+ grep -v '^ *+' conftest.err >conftest.er1 -+ cat conftest.er1 >&5 -+ mv -f conftest.er1 conftest.err -+ fi -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } > conftest.i && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ test ! -s conftest.err -+ }; then : -+ ac_retval=0 -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_retval=1 -+fi -+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno -+ as_fn_set_status $ac_retval -+ -+} # ac_fn_c_try_cpp -+ -+# ac_fn_c_try_run LINENO -+# ---------------------- -+# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes -+# that executables *can* be run. -+ac_fn_c_try_run () -+{ -+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ if { { ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_link") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } && { ac_try='./conftest$ac_exeext' -+ { { case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_try") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; }; then : -+ ac_retval=0 -+else -+ $as_echo "$as_me: program exited with status $ac_status" >&5 -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_retval=$ac_status -+fi -+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo -+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno -+ as_fn_set_status $ac_retval -+ -+} # ac_fn_c_try_run -+ -+# ac_fn_c_check_func LINENO FUNC VAR -+# ---------------------------------- -+# Tests whether FUNC exists, setting the cache variable VAR accordingly -+ac_fn_c_check_func () -+{ -+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -+$as_echo_n "checking for $2... " >&6; } -+if eval \${$3+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+/* Define $2 to an innocuous variant, in case declares $2. -+ For example, HP-UX 11i declares gettimeofday. */ -+#define $2 innocuous_$2 -+ -+/* System header to define __stub macros and hopefully few prototypes, -+ which can conflict with char $2 (); below. -+ Prefer to if __STDC__ is defined, since -+ exists even on freestanding compilers. */ -+ -+#ifdef __STDC__ -+# include -+#else -+# include -+#endif -+ -+#undef $2 -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char $2 (); -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined __stub_$2 || defined __stub___$2 -+choke me -+#endif -+ -+int -+main () -+{ -+return $2 (); -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_link "$LINENO"; then : -+ eval "$3=yes" -+else -+ eval "$3=no" -+fi -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+fi -+eval ac_res=\$$3 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno -+ -+} # ac_fn_c_check_func -+ -+# ac_fn_cxx_try_cpp LINENO -+# ------------------------ -+# Try to preprocess conftest.$ac_ext, and return whether this succeeded. -+ac_fn_cxx_try_cpp () -+{ -+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ if { { ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err -+ ac_status=$? -+ if test -s conftest.err; then -+ grep -v '^ *+' conftest.err >conftest.er1 -+ cat conftest.er1 >&5 -+ mv -f conftest.er1 conftest.err -+ fi -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } > conftest.i && { -+ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || -+ test ! -s conftest.err -+ }; then : -+ ac_retval=0 -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_retval=1 -+fi -+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno -+ as_fn_set_status $ac_retval -+ -+} # ac_fn_cxx_try_cpp -+ -+# ac_fn_cxx_try_link LINENO -+# ------------------------- -+# Try to link conftest.$ac_ext, and return whether this succeeded. -+ac_fn_cxx_try_link () -+{ -+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ rm -f conftest.$ac_objext conftest$ac_exeext -+ if { { ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_link") 2>conftest.err -+ ac_status=$? -+ if test -s conftest.err; then -+ grep -v '^ *+' conftest.err >conftest.er1 -+ cat conftest.er1 >&5 -+ mv -f conftest.er1 conftest.err -+ fi -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } && { -+ test -z "$ac_cxx_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ test -x conftest$ac_exeext -+ }; then : -+ ac_retval=0 -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_retval=1 -+fi -+ # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information -+ # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would -+ # interfere with the next link command; also delete a directory that is -+ # left behind by Apple's compiler. We do this before executing the actions. -+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo -+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno -+ as_fn_set_status $ac_retval -+ -+} # ac_fn_cxx_try_link -+ -+# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES -+# ------------------------------------------------------- -+# Tests whether HEADER exists, giving a warning if it cannot be compiled using -+# the include files in INCLUDES and setting the cache variable VAR -+# accordingly. -+ac_fn_c_check_header_mongrel () -+{ -+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ if eval \${$3+:} false; then : -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -+$as_echo_n "checking for $2... " >&6; } -+if eval \${$3+:} false; then : -+ $as_echo_n "(cached) " >&6 -+fi -+eval ac_res=\$$3 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+else -+ # Is the header compilable? -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5 -+$as_echo_n "checking $2 usability... " >&6; } -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+$4 -+#include <$2> -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ ac_header_compiler=yes -+else -+ ac_header_compiler=no -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5 -+$as_echo "$ac_header_compiler" >&6; } -+ -+# Is the header present? -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5 -+$as_echo_n "checking $2 presence... " >&6; } -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include <$2> -+_ACEOF -+if ac_fn_c_try_cpp "$LINENO"; then : -+ ac_header_preproc=yes -+else -+ ac_header_preproc=no -+fi -+rm -f conftest.err conftest.i conftest.$ac_ext -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 -+$as_echo "$ac_header_preproc" >&6; } -+ -+# So? What about this header? -+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #(( -+ yes:no: ) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5 -+$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 -+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} -+ ;; -+ no:yes:* ) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5 -+$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5 -+$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5 -+$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5 -+$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 -+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} -+( $as_echo "## --------------------------------- ## -+## Report this to BUG-REPORT-ADDRESS ## -+## --------------------------------- ##" -+ ) | sed "s/^/$as_me: WARNING: /" >&2 -+ ;; -+esac -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -+$as_echo_n "checking for $2... " >&6; } -+if eval \${$3+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ eval "$3=\$ac_header_compiler" -+fi -+eval ac_res=\$$3 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+fi -+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno -+ -+} # ac_fn_c_check_header_mongrel -+ -+# ac_fn_c_check_type LINENO TYPE VAR INCLUDES -+# ------------------------------------------- -+# Tests whether TYPE exists after having included INCLUDES, setting cache -+# variable VAR accordingly. -+ac_fn_c_check_type () -+{ -+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -+$as_echo_n "checking for $2... " >&6; } -+if eval \${$3+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ eval "$3=no" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+$4 -+int -+main () -+{ -+if (sizeof ($2)) -+ return 0; -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+$4 -+int -+main () -+{ -+if (sizeof (($2))) -+ return 0; -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ -+else -+ eval "$3=yes" -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+eval ac_res=\$$3 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno -+ -+} # ac_fn_c_check_type -+cat >config.log <<_ACEOF -+This file contains any messages produced by compilers while -+running configure, to aid debugging if configure makes a mistake. -+ -+It was created by saga $as_me 2.1.0, which was -+generated by GNU Autoconf 2.69. Invocation command line was -+ -+ $ $0 $@ -+ -+_ACEOF -+exec 5>>config.log -+{ -+cat <<_ASUNAME -+## --------- ## -+## Platform. ## -+## --------- ## -+ -+hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` -+uname -m = `(uname -m) 2>/dev/null || echo unknown` - uname -r = `(uname -r) 2>/dev/null || echo unknown` - uname -s = `(uname -s) 2>/dev/null || echo unknown` - uname -v = `(uname -v) 2>/dev/null || echo unknown` -@@ -1761,8 +2143,8 @@ for as_dir in $PATH - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- $as_echo "PATH: $as_dir" --done -+ $as_echo "PATH: $as_dir" -+ done - IFS=$as_save_IFS - - } >&5 -@@ -1799,9 +2181,9 @@ do - ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; - esac - case $ac_pass in -- 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; -+ 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;; - 2) -- ac_configure_args1="$ac_configure_args1 '$ac_arg'" -+ as_fn_append ac_configure_args1 " '$ac_arg'" - if test $ac_must_keep_next = true; then - ac_must_keep_next=false # Got value, back to normal. - else -@@ -1817,13 +2199,13 @@ do - -* ) ac_must_keep_next=true ;; - esac - fi -- ac_configure_args="$ac_configure_args '$ac_arg'" -+ as_fn_append ac_configure_args " '$ac_arg'" - ;; - esac - done - done --$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; } --$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; } -+{ ac_configure_args0=; unset ac_configure_args0;} -+{ ac_configure_args1=; unset ac_configure_args1;} - - # When interrupted or exit'd, cleanup temporary files, and complete - # config.log. We remove comments because anyway the quotes in there -@@ -1835,11 +2217,9 @@ trap 'exit_status=$? - { - echo - -- cat <<\_ASBOX --## ---------------- ## -+ $as_echo "## ---------------- ## - ## Cache variables. ## --## ---------------- ## --_ASBOX -+## ---------------- ##" - echo - # The following way of writing the cache mishandles newlines in values, - ( -@@ -1848,13 +2228,13 @@ _ASBOX - case $ac_val in #( - *${as_nl}*) - case $ac_var in #( -- *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5 -+ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 - $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; - esac - case $ac_var in #( - _ | IFS | as_nl) ;; #( - BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( -- *) $as_unset $ac_var ;; -+ *) { eval $ac_var=; unset $ac_var;} ;; - esac ;; - esac - done -@@ -1873,11 +2253,9 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; - ) - echo - -- cat <<\_ASBOX --## ----------------- ## -+ $as_echo "## ----------------- ## - ## Output variables. ## --## ----------------- ## --_ASBOX -+## ----------------- ##" - echo - for ac_var in $ac_subst_vars - do -@@ -1890,11 +2268,9 @@ _ASBOX - echo - - if test -n "$ac_subst_files"; then -- cat <<\_ASBOX --## ------------------- ## -+ $as_echo "## ------------------- ## - ## File substitutions. ## --## ------------------- ## --_ASBOX -+## ------------------- ##" - echo - for ac_var in $ac_subst_files - do -@@ -1908,11 +2284,9 @@ _ASBOX - fi - - if test -s confdefs.h; then -- cat <<\_ASBOX --## ----------- ## -+ $as_echo "## ----------- ## - ## confdefs.h. ## --## ----------- ## --_ASBOX -+## ----------- ##" - echo - cat confdefs.h - echo -@@ -1926,46 +2300,53 @@ _ASBOX - exit $exit_status - ' 0 - for ac_signal in 1 2 13 15; do -- trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal -+ trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal - done - ac_signal=0 - - # confdefs.h avoids OS command line length limits that DEFS can exceed. - rm -f -r conftest* confdefs.h - -+$as_echo "/* confdefs.h */" > confdefs.h -+ - # Predefined preprocessor variables. - - cat >>confdefs.h <<_ACEOF - #define PACKAGE_NAME "$PACKAGE_NAME" - _ACEOF - -- - cat >>confdefs.h <<_ACEOF - #define PACKAGE_TARNAME "$PACKAGE_TARNAME" - _ACEOF - -- - cat >>confdefs.h <<_ACEOF - #define PACKAGE_VERSION "$PACKAGE_VERSION" - _ACEOF - -- - cat >>confdefs.h <<_ACEOF - #define PACKAGE_STRING "$PACKAGE_STRING" - _ACEOF - -- - cat >>confdefs.h <<_ACEOF - #define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" - _ACEOF - -+cat >>confdefs.h <<_ACEOF -+#define PACKAGE_URL "$PACKAGE_URL" -+_ACEOF -+ - - # Let the site file select an alternate cache file if it wants to. - # Prefer an explicitly selected file to automatically selected ones. - ac_site_file1=NONE - ac_site_file2=NONE - if test -n "$CONFIG_SITE"; then -- ac_site_file1=$CONFIG_SITE -+ # We do not want a PATH search for config.site. -+ case $CONFIG_SITE in #(( -+ -*) ac_site_file1=./$CONFIG_SITE;; -+ */*) ac_site_file1=$CONFIG_SITE;; -+ *) ac_site_file1=./$CONFIG_SITE;; -+ esac - elif test "x$prefix" != xNONE; then - ac_site_file1=$prefix/share/config.site - ac_site_file2=$prefix/etc/config.site -@@ -1976,19 +2357,23 @@ fi - for ac_site_file in "$ac_site_file1" "$ac_site_file2" - do - test "x$ac_site_file" = xNONE && continue -- if test -r "$ac_site_file"; then -- { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 -+ if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 - $as_echo "$as_me: loading site script $ac_site_file" >&6;} - sed 's/^/| /' "$ac_site_file" >&5 -- . "$ac_site_file" -+ . "$ac_site_file" \ -+ || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+as_fn_error $? "failed to load site script $ac_site_file -+See \`config.log' for more details" "$LINENO" 5; } - fi - done - - if test -r "$cache_file"; then -- # Some versions of bash will fail to source /dev/null (special -- # files actually), so we avoid doing that. -- if test -f "$cache_file"; then -- { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5 -+ # Some versions of bash will fail to source /dev/null (special files -+ # actually), so we avoid doing that. DJGPP emulates it as a regular file. -+ if test /dev/null != "$cache_file" && test -f "$cache_file"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 - $as_echo "$as_me: loading cache $cache_file" >&6;} - case $cache_file in - [\\/]* | ?:[\\/]* ) . "$cache_file";; -@@ -1996,7 +2381,7 @@ $as_echo "$as_me: loading cache $cache_file" >&6;} - esac - fi - else -- { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 - $as_echo "$as_me: creating cache $cache_file" >&6;} - >$cache_file - fi -@@ -2011,11 +2396,11 @@ for ac_var in $ac_precious_vars; do - eval ac_new_val=\$ac_env_${ac_var}_value - case $ac_old_set,$ac_new_set in - set,) -- { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 - $as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} - ac_cache_corrupted=: ;; - ,set) -- { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 - $as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} - ac_cache_corrupted=: ;; - ,);; -@@ -2025,17 +2410,17 @@ $as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} - ac_old_val_w=`echo x $ac_old_val` - ac_new_val_w=`echo x $ac_new_val` - if test "$ac_old_val_w" != "$ac_new_val_w"; then -- { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 - $as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} - ac_cache_corrupted=: - else -- { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 - $as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} - eval $ac_var=\$ac_old_val - fi -- { $as_echo "$as_me:$LINENO: former value: \`$ac_old_val'" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 - $as_echo "$as_me: former value: \`$ac_old_val'" >&2;} -- { $as_echo "$as_me:$LINENO: current value: \`$ac_new_val'" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 - $as_echo "$as_me: current value: \`$ac_new_val'" >&2;} - fi;; - esac -@@ -2047,43 +2432,20 @@ $as_echo "$as_me: current value: \`$ac_new_val'" >&2;} - esac - case " $ac_configure_args " in - *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. -- *) ac_configure_args="$ac_configure_args '$ac_arg'" ;; -+ *) as_fn_append ac_configure_args " '$ac_arg'" ;; - esac - fi - done - if $ac_cache_corrupted; then -- { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 - $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -- { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 - $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} -- { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 --$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} -- { (exit 1); exit 1; }; } -+ as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 - fi -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -+## -------------------- ## -+## Main body of script. ## -+## -------------------- ## - - ac_ext=c - ac_cpp='$CPP $CPPFLAGS' -@@ -2095,7 +2457,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - - ac_config_headers="$ac_config_headers config.h" - --am__api_version='1.11' -+am__api_version='1.14' - - ac_aux_dir= - for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do -@@ -2114,9 +2476,7 @@ for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do - fi - done - if test -z "$ac_aux_dir"; then -- { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5 --$as_echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;} -- { (exit 1); exit 1; }; } -+ as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 - fi - - # These three variables are undocumented and unsupported, -@@ -2142,10 +2502,10 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. - # OS/2's system install, which has a completely different semantic - # ./install, which can be erroneously created by make from ./install.sh. - # Reject install programs that cannot install multiple files. --{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 - $as_echo_n "checking for a BSD-compatible install... " >&6; } - if test -z "$INSTALL"; then --if test "${ac_cv_path_install+set}" = set; then -+if ${ac_cv_path_install+:} false; then : - $as_echo_n "(cached) " >&6 - else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -@@ -2153,11 +2513,11 @@ for as_dir in $PATH - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- # Account for people who put trailing slashes in PATH elements. --case $as_dir/ in -- ./ | .// | /cC/* | \ -+ # Account for people who put trailing slashes in PATH elements. -+case $as_dir/ in #(( -+ ./ | .// | /[cC]/* | \ - /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ -- ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \ -+ ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \ - /usr/ucb/* ) ;; - *) - # OSF1 and SCO ODT 3.0 have their own names for install. -@@ -2165,7 +2525,7 @@ case $as_dir/ in - # by default. - for ac_prog in ginstall scoinst install; do - for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then -+ if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then - if test $ac_prog = install && - grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # AIX install. It has an incompatible calling convention. -@@ -2194,7 +2554,7 @@ case $as_dir/ in - ;; - esac - --done -+ done - IFS=$as_save_IFS - - rm -rf conftest.one conftest.two conftest.dir -@@ -2210,7 +2570,7 @@ fi - INSTALL=$ac_install_sh - fi - fi --{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 - $as_echo "$INSTALL" >&6; } - - # Use test -z because SunOS4 sh mishandles braces in ${var-val}. -@@ -2221,68 +2581,73 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' - - test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' - --{ $as_echo "$as_me:$LINENO: checking whether build environment is sane" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 - $as_echo_n "checking whether build environment is sane... " >&6; } --# Just in case --sleep 1 --echo timestamp > conftest.file - # Reject unsafe characters in $srcdir or the absolute working directory - # name. Accept space and tab only in the latter. - am_lf=' - ' - case `pwd` in - *[\\\"\#\$\&\'\`$am_lf]*) -- { { $as_echo "$as_me:$LINENO: error: unsafe absolute working directory name" >&5 --$as_echo "$as_me: error: unsafe absolute working directory name" >&2;} -- { (exit 1); exit 1; }; };; -+ as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;; - esac - case $srcdir in - *[\\\"\#\$\&\'\`$am_lf\ \ ]*) -- { { $as_echo "$as_me:$LINENO: error: unsafe srcdir value: \`$srcdir'" >&5 --$as_echo "$as_me: error: unsafe srcdir value: \`$srcdir'" >&2;} -- { (exit 1); exit 1; }; };; -+ as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;; - esac - --# Do `set' in a subshell so we don't clobber the current shell's -+# Do 'set' in a subshell so we don't clobber the current shell's - # arguments. Must try -L first in case configure is actually a - # symlink; some systems play weird games with the mod time of symlinks - # (eg FreeBSD returns the mod time of the symlink's containing - # directory). - if ( -- set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` -- if test "$*" = "X"; then -- # -L didn't work. -- set X `ls -t "$srcdir/configure" conftest.file` -- fi -- rm -f conftest.file -- if test "$*" != "X $srcdir/configure conftest.file" \ -- && test "$*" != "X conftest.file $srcdir/configure"; then -- -- # If neither matched, then we have a broken ls. This can happen -- # if, for instance, CONFIG_SHELL is bash and it inherits a -- # broken ls alias from the environment. This has actually -- # happened. Such a system could not be considered "sane". -- { { $as_echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken --alias in your environment" >&5 --$as_echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken --alias in your environment" >&2;} -- { (exit 1); exit 1; }; } -- fi -- -+ am_has_slept=no -+ for am_try in 1 2; do -+ echo "timestamp, slept: $am_has_slept" > conftest.file -+ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` -+ if test "$*" = "X"; then -+ # -L didn't work. -+ set X `ls -t "$srcdir/configure" conftest.file` -+ fi -+ if test "$*" != "X $srcdir/configure conftest.file" \ -+ && test "$*" != "X conftest.file $srcdir/configure"; then -+ -+ # If neither matched, then we have a broken ls. This can happen -+ # if, for instance, CONFIG_SHELL is bash and it inherits a -+ # broken ls alias from the environment. This has actually -+ # happened. Such a system could not be considered "sane". -+ as_fn_error $? "ls -t appears to fail. Make sure there is not a broken -+ alias in your environment" "$LINENO" 5 -+ fi -+ if test "$2" = conftest.file || test $am_try -eq 2; then -+ break -+ fi -+ # Just in case. -+ sleep 1 -+ am_has_slept=yes -+ done - test "$2" = conftest.file - ) - then - # Ok. - : - else -- { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files! --Check your system clock" >&5 --$as_echo "$as_me: error: newly created file is older than distributed files! --Check your system clock" >&2;} -- { (exit 1); exit 1; }; } -+ as_fn_error $? "newly created file is older than distributed files! -+Check your system clock" "$LINENO" 5 - fi --{ $as_echo "$as_me:$LINENO: result: yes" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 - $as_echo "yes" >&6; } -+# If we didn't sleep, we still need to ensure time stamps of config.status and -+# generated files are strictly newer. -+am_sleep_pid= -+if grep 'slept: no' conftest.file >/dev/null 2>&1; then -+ ( sleep 1 ) & -+ am_sleep_pid=$! -+fi -+ -+rm -f conftest.file -+ - test "$program_prefix" != NONE && - program_transform_name="s&^&$program_prefix&;$program_transform_name" - # Use a double $ so make ignores it. -@@ -2305,12 +2670,12 @@ if test x"${MISSING+set}" != xset; then - esac - fi - # Use eval to expand $SHELL --if eval "$MISSING --run true"; then -- am_missing_run="$MISSING --run " -+if eval "$MISSING --is-lightweight"; then -+ am_missing_run="$MISSING " - else - am_missing_run= -- { $as_echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5 --$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5 -+$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;} - fi - - if test x"${install_sh}" != xset; then -@@ -2322,17 +2687,17 @@ if test x"${install_sh}" != xset; then - esac - fi - --# Installed binaries are usually stripped using `strip' when the user --# run `make install-strip'. However `strip' might not be the right -+# Installed binaries are usually stripped using 'strip' when the user -+# run "make install-strip". However 'strip' might not be the right - # tool to use in cross-compilation environments, therefore Automake --# will honor the `STRIP' environment variable to overrule this program. -+# will honor the 'STRIP' environment variable to overrule this program. - if test "$cross_compiling" != no; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. - set dummy ${ac_tool_prefix}strip; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_STRIP+set}" = set; then -+if ${ac_cv_prog_STRIP+:} false; then : - $as_echo_n "(cached) " >&6 - else - if test -n "$STRIP"; then -@@ -2343,24 +2708,24 @@ 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 -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_STRIP="${ac_tool_prefix}strip" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done - IFS=$as_save_IFS - - fi - fi - STRIP=$ac_cv_prog_STRIP - if test -n "$STRIP"; then -- { $as_echo "$as_me:$LINENO: result: $STRIP" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 - $as_echo "$STRIP" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } - fi - -@@ -2370,9 +2735,9 @@ if test -z "$ac_cv_prog_STRIP"; then - ac_ct_STRIP=$STRIP - # Extract the first word of "strip", so it can be a program name with args. - set dummy strip; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then -+if ${ac_cv_prog_ac_ct_STRIP+:} false; then : - $as_echo_n "(cached) " >&6 - else - if test -n "$ac_ct_STRIP"; then -@@ -2383,24 +2748,24 @@ 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 -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_STRIP="strip" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done - IFS=$as_save_IFS - - fi - fi - ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP - if test -n "$ac_ct_STRIP"; then -- { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 - $as_echo "$ac_ct_STRIP" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } - fi - -@@ -2409,7 +2774,7 @@ fi - else - case $cross_compiling:$ac_tool_warned in - yes:) --{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 - $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} - ac_tool_warned=yes ;; - esac -@@ -2422,10 +2787,10 @@ fi - fi - INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" - --{ $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5 - $as_echo_n "checking for a thread-safe mkdir -p... " >&6; } - if test -z "$MKDIR_P"; then -- if test "${ac_cv_path_mkdir+set}" = set; then -+ if ${ac_cv_path_mkdir+:} false; then : - $as_echo_n "(cached) " >&6 - else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -@@ -2433,9 +2798,9 @@ for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_prog in mkdir gmkdir; do -+ for ac_prog in mkdir gmkdir; do - for ac_exec_ext in '' $ac_executable_extensions; do -- { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue -+ as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue - case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( - 'mkdir (GNU coreutils) '* | \ - 'mkdir (coreutils) '* | \ -@@ -2445,11 +2810,12 @@ do - esac - done - done --done -+ done - IFS=$as_save_IFS - - fi - -+ test -d ./--version && rmdir ./--version - if test "${ac_cv_path_mkdir+set}" = set; then - MKDIR_P="$ac_cv_path_mkdir -p" - else -@@ -2457,26 +2823,19 @@ fi - # value for MKDIR_P within a source directory, because that will - # break other packages using the cache if that directory is - # removed, or if the value is a relative name. -- test -d ./--version && rmdir ./--version - MKDIR_P="$ac_install_sh -d" - fi - fi --{ $as_echo "$as_me:$LINENO: result: $MKDIR_P" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 - $as_echo "$MKDIR_P" >&6; } - --mkdir_p="$MKDIR_P" --case $mkdir_p in -- [\\/$]* | ?:[\\/]*) ;; -- */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; --esac -- - for ac_prog in gawk mawk nawk awk - do - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_AWK+set}" = set; then -+if ${ac_cv_prog_AWK+:} false; then : - $as_echo_n "(cached) " >&6 - else - if test -n "$AWK"; then -@@ -2487,24 +2846,24 @@ 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 -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_AWK="$ac_prog" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done - IFS=$as_save_IFS - - fi - fi - AWK=$ac_cv_prog_AWK - if test -n "$AWK"; then -- { $as_echo "$as_me:$LINENO: result: $AWK" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 - $as_echo "$AWK" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } - fi - -@@ -2512,11 +2871,11 @@ fi - test -n "$AWK" && break - done - --{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 - $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } - set x ${MAKE-make} - ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` --if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then -+if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then : - $as_echo_n "(cached) " >&6 - else - cat >conftest.make <<\_ACEOF -@@ -2524,7 +2883,7 @@ SHELL = /bin/sh - all: - @echo '@@@%%%=$(MAKE)=@@@%%%' - _ACEOF --# GNU make sometimes prints "make[1]: Entering...", which would confuse us. -+# GNU make sometimes prints "make[1]: Entering ...", which would confuse us. - case `${MAKE-make} -f conftest.make 2>/dev/null` in - *@@@%%%=?*=@@@%%%*) - eval ac_cv_prog_make_${ac_make}_set=yes;; -@@ -2534,11 +2893,11 @@ esac - rm -f conftest.make - fi - if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then -- { $as_echo "$as_me:$LINENO: result: yes" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 - $as_echo "yes" >&6; } - SET_MAKE= - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } - SET_MAKE="MAKE=${MAKE-make}" - fi -@@ -2552,15 +2911,52 @@ else - fi - rmdir .tst 2>/dev/null - -+# Check whether --enable-silent-rules was given. -+if test "${enable_silent_rules+set}" = set; then : -+ enableval=$enable_silent_rules; -+fi -+ -+case $enable_silent_rules in # ((( -+ yes) AM_DEFAULT_VERBOSITY=0;; -+ no) AM_DEFAULT_VERBOSITY=1;; -+ *) AM_DEFAULT_VERBOSITY=1;; -+esac -+am_make=${MAKE-make} -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 -+$as_echo_n "checking whether $am_make supports nested variables... " >&6; } -+if ${am_cv_make_support_nested_variables+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if $as_echo 'TRUE=$(BAR$(V)) -+BAR0=false -+BAR1=true -+V=1 -+am__doit: -+ @$(TRUE) -+.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then -+ am_cv_make_support_nested_variables=yes -+else -+ am_cv_make_support_nested_variables=no -+fi -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 -+$as_echo "$am_cv_make_support_nested_variables" >&6; } -+if test $am_cv_make_support_nested_variables = yes; then -+ AM_V='$(V)' -+ AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' -+else -+ AM_V=$AM_DEFAULT_VERBOSITY -+ AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY -+fi -+AM_BACKSLASH='\' -+ - if test "`cd $srcdir && pwd`" != "`pwd`"; then - # Use -I$(srcdir) only when $(srcdir) != ., so that make's output - # is not polluted with repeated "-I." - am__isrc=' -I$(srcdir)' - # test to see if srcdir already configured - if test -f $srcdir/config.status; then -- { { $as_echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 --$as_echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} -- { (exit 1); exit 1; }; } -+ as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 - fi - fi - -@@ -2575,6 +2971,7 @@ fi - - - # Define the identity of the package. -+ - PACKAGE=saga - VERSION=2.1.0beta - -@@ -2604,27 +3001,77 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"} - - MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} - -+# For better backward compatibility. To be removed once Automake 1.9.x -+# dies out for good. For more background, see: -+# -+# -+mkdir_p='$(MKDIR_P)' -+ - # We need awk for the "check" target. The system "awk" is bad on - # some platforms. --# Always define AMTAR for backward compatibility. -+# Always define AMTAR for backward compatibility. Yes, it's still used -+# in the wild :-( We should find a proper way to deprecate it ... -+AMTAR='$${TAR-tar}' -+ - --AMTAR=${AMTAR-"${am_missing_run}tar"} -+# We'll loop over all known methods to create a tar archive until one works. -+_am_tools='gnutar pax cpio none' - --am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' -+am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' - - - - - -+ -+# POSIX will say in a future version that running "rm -f" with no argument -+# is OK; and we want to be able to make that assumption in our Makefile -+# recipes. So use an aggressive probe to check that the usage we want is -+# actually supported "in the wild" to an acceptable degree. -+# See automake bug#10828. -+# To make any issue more visible, cause the running configure to be aborted -+# by default if the 'rm' program in use doesn't match our expectations; the -+# user can still override this though. -+if rm -f && rm -fr && rm -rf; then : OK; else -+ cat >&2 <<'END' -+Oops! -+ -+Your 'rm' program seems unable to run without file operands specified -+on the command line, even when the '-f' option is present. This is contrary -+to the behaviour of most rm programs out there, and not conforming with -+the upcoming POSIX standard: -+ -+Please tell bug-automake@gnu.org about your system, including the value -+of your $PATH and any error possibly output before this message. This -+can help us improve future automake versions. -+ -+END -+ if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then -+ echo 'Configuration will proceed anyway, since you have set the' >&2 -+ echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 -+ echo >&2 -+ else -+ cat >&2 <<'END' -+Aborting the configuration process, to ensure you take notice of the issue. -+ -+You can download and install GNU coreutils to get an 'rm' implementation -+that behaves properly: . -+ -+If you want to complete the configuration process using your problematic -+'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM -+to "yes", and re-run configure. -+ -+END -+ as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5 -+ fi -+fi - if test "`cd $srcdir && pwd`" != "`pwd`"; then - # Use -I$(srcdir) only when $(srcdir) != ., so that make's output - # is not polluted with repeated "-I." - am__isrc=' -I$(srcdir)' - # test to see if srcdir already configured - if test -f $srcdir/config.status; then -- { { $as_echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 --$as_echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} -- { (exit 1); exit 1; }; } -+ as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 - fi - fi - -@@ -2668,93 +3115,138 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"} - - MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} - -+# For better backward compatibility. To be removed once Automake 1.9.x -+# dies out for good. For more background, see: -+# -+# -+mkdir_p='$(MKDIR_P)' -+ - # We need awk for the "check" target. The system "awk" is bad on - # some platforms. --# Always define AMTAR for backward compatibility. -+# Always define AMTAR for backward compatibility. Yes, it's still used -+# in the wild :-( We should find a proper way to deprecate it ... -+AMTAR='$${TAR-tar}' -+ - --AMTAR=${AMTAR-"${am_missing_run}tar"} -+# We'll loop over all known methods to create a tar archive until one works. -+_am_tools='gnutar plaintar pax cpio none' - -+# The POSIX 1988 'ustar' format is defined with fixed-size fields. -+ # There is notably a 21 bits limit for the UID and the GID. In fact, -+ # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343 -+ # and bug#13588). -+ am_max_uid=2097151 # 2^21 - 1 -+ am_max_gid=$am_max_uid -+ # The $UID and $GID variables are not portable, so we need to resort -+ # to the POSIX-mandated id(1) utility. Errors in the 'id' calls -+ # below are definitely unexpected, so allow the users to see them -+ # (that is, avoid stderr redirection). -+ am_uid=`id -u || echo unknown` -+ am_gid=`id -g || echo unknown` -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether UID '$am_uid' is supported by ustar format" >&5 -+$as_echo_n "checking whether UID '$am_uid' is supported by ustar format... " >&6; } -+ if test $am_uid -le $am_max_uid; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+$as_echo "yes" >&6; } -+ else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+ _am_tools=none -+ fi -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether GID '$am_gid' is supported by ustar format" >&5 -+$as_echo_n "checking whether GID '$am_gid' is supported by ustar format... " >&6; } -+ if test $am_gid -le $am_max_gid; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+$as_echo "yes" >&6; } -+ else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+ _am_tools=none -+ fi - --{ $as_echo "$as_me:$LINENO: checking how to create a ustar tar archive" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to create a ustar tar archive" >&5 - $as_echo_n "checking how to create a ustar tar archive... " >&6; } --# Loop over all known methods to create a tar archive until one works. --_am_tools='gnutar plaintar pax cpio none' --_am_tools=${am_cv_prog_tar_ustar-$_am_tools} --# Do not fold the above two line into one, because Tru64 sh and --# Solaris sh will not grok spaces in the rhs of `-'. --for _am_tool in $_am_tools --do -- case $_am_tool in -- gnutar) -- for _am_tar in tar gnutar gtar; -- do -- { echo "$as_me:$LINENO: $_am_tar --version" >&5 -+ -+ # Go ahead even if we have the value already cached. We do so because we -+ # need to set the values for the 'am__tar' and 'am__untar' variables. -+ _am_tools=${am_cv_prog_tar_ustar-$_am_tools} -+ -+ for _am_tool in $_am_tools; do -+ case $_am_tool in -+ gnutar) -+ for _am_tar in tar gnutar gtar; do -+ { echo "$as_me:$LINENO: $_am_tar --version" >&5 - ($_am_tar --version) >&5 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && break -- done -- am__tar="$_am_tar --format=ustar -chf - "'"$$tardir"' -- am__tar_="$_am_tar --format=ustar -chf - "'"$tardir"' -- am__untar="$_am_tar -xf -" -- ;; -- plaintar) -- # Must skip GNU tar: if it does not support --format= it doesn't create -- # ustar tarball either. -- (tar --version) >/dev/null 2>&1 && continue -- am__tar='tar chf - "$$tardir"' -- am__tar_='tar chf - "$tardir"' -- am__untar='tar xf -' -- ;; -- pax) -- am__tar='pax -L -x ustar -w "$$tardir"' -- am__tar_='pax -L -x ustar -w "$tardir"' -- am__untar='pax -r' -- ;; -- cpio) -- am__tar='find "$$tardir" -print | cpio -o -H ustar -L' -- am__tar_='find "$tardir" -print | cpio -o -H ustar -L' -- am__untar='cpio -i -H ustar -d' -- ;; -- none) -- am__tar=false -- am__tar_=false -- am__untar=false -- ;; -- esac -+ done -+ am__tar="$_am_tar --format=ustar -chf - "'"$$tardir"' -+ am__tar_="$_am_tar --format=ustar -chf - "'"$tardir"' -+ am__untar="$_am_tar -xf -" -+ ;; -+ plaintar) -+ # Must skip GNU tar: if it does not support --format= it doesn't create -+ # ustar tarball either. -+ (tar --version) >/dev/null 2>&1 && continue -+ am__tar='tar chf - "$$tardir"' -+ am__tar_='tar chf - "$tardir"' -+ am__untar='tar xf -' -+ ;; -+ pax) -+ am__tar='pax -L -x ustar -w "$$tardir"' -+ am__tar_='pax -L -x ustar -w "$tardir"' -+ am__untar='pax -r' -+ ;; -+ cpio) -+ am__tar='find "$$tardir" -print | cpio -o -H ustar -L' -+ am__tar_='find "$tardir" -print | cpio -o -H ustar -L' -+ am__untar='cpio -i -H ustar -d' -+ ;; -+ none) -+ am__tar=false -+ am__tar_=false -+ am__untar=false -+ ;; -+ esac - -- # If the value was cached, stop now. We just wanted to have am__tar -- # and am__untar set. -- test -n "${am_cv_prog_tar_ustar}" && break -+ # If the value was cached, stop now. We just wanted to have am__tar -+ # and am__untar set. -+ test -n "${am_cv_prog_tar_ustar}" && break - -- # tar/untar a dummy directory, and stop if the command works -- rm -rf conftest.dir -- mkdir conftest.dir -- echo GrepMe > conftest.dir/file -- { echo "$as_me:$LINENO: tardir=conftest.dir && eval $am__tar_ >conftest.tar" >&5 -+ # tar/untar a dummy directory, and stop if the command works. -+ rm -rf conftest.dir -+ mkdir conftest.dir -+ echo GrepMe > conftest.dir/file -+ { echo "$as_me:$LINENO: tardir=conftest.dir && eval $am__tar_ >conftest.tar" >&5 - (tardir=conftest.dir && eval $am__tar_ >conftest.tar) >&5 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -- rm -rf conftest.dir -- if test -s conftest.tar; then -- { echo "$as_me:$LINENO: $am__untar &5 -+ rm -rf conftest.dir -+ if test -s conftest.tar; then -+ { echo "$as_me:$LINENO: $am__untar &5 - ($am__untar &5 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -- grep GrepMe conftest.dir/file >/dev/null 2>&1 && break -- fi --done --rm -rf conftest.dir -+ { echo "$as_me:$LINENO: cat conftest.dir/file" >&5 -+ (cat conftest.dir/file) >&5 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } -+ grep GrepMe conftest.dir/file >/dev/null 2>&1 && break -+ fi -+ done -+ rm -rf conftest.dir - --if test "${am_cv_prog_tar_ustar+set}" = set; then -+ if ${am_cv_prog_tar_ustar+:} false; then : - $as_echo_n "(cached) " >&6 - else - am_cv_prog_tar_ustar=$_am_tool - fi - --{ $as_echo "$as_me:$LINENO: result: $am_cv_prog_tar_ustar" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_tar_ustar" >&5 - $as_echo "$am_cv_prog_tar_ustar" >&6; } - - -@@ -2762,6 +3254,48 @@ $as_echo "$am_cv_prog_tar_ustar" >&6; } - - - -+# POSIX will say in a future version that running "rm -f" with no argument -+# is OK; and we want to be able to make that assumption in our Makefile -+# recipes. So use an aggressive probe to check that the usage we want is -+# actually supported "in the wild" to an acceptable degree. -+# See automake bug#10828. -+# To make any issue more visible, cause the running configure to be aborted -+# by default if the 'rm' program in use doesn't match our expectations; the -+# user can still override this though. -+if rm -f && rm -fr && rm -rf; then : OK; else -+ cat >&2 <<'END' -+Oops! -+ -+Your 'rm' program seems unable to run without file operands specified -+on the command line, even when the '-f' option is present. This is contrary -+to the behaviour of most rm programs out there, and not conforming with -+the upcoming POSIX standard: -+ -+Please tell bug-automake@gnu.org about your system, including the value -+of your $PATH and any error possibly output before this message. This -+can help us improve future automake versions. -+ -+END -+ if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then -+ echo 'Configuration will proceed anyway, since you have set the' >&2 -+ echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 -+ echo >&2 -+ else -+ cat >&2 <<'END' -+Aborting the configuration process, to ensure you take notice of the issue. -+ -+You can download and install GNU coreutils to get an 'rm' implementation -+that behaves properly: . -+ -+If you want to complete the configuration process using your problematic -+'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM -+to "yes", and re-run configure. -+ -+END -+ as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5 -+ fi -+fi -+ - # Checks for programs. - ac_ext=cpp - ac_cpp='$CXXCPP $CPPFLAGS' -@@ -2777,9 +3311,9 @@ if test -z "$CXX"; then - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. - set dummy $ac_tool_prefix$ac_prog; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_CXX+set}" = set; then -+if ${ac_cv_prog_CXX+:} false; then : - $as_echo_n "(cached) " >&6 - else - if test -n "$CXX"; then -@@ -2790,24 +3324,24 @@ 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 -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done - IFS=$as_save_IFS - - fi - fi - CXX=$ac_cv_prog_CXX - if test -n "$CXX"; then -- { $as_echo "$as_me:$LINENO: result: $CXX" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5 - $as_echo "$CXX" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } - fi - -@@ -2821,9 +3355,9 @@ if test -z "$CXX"; then - do - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then -+if ${ac_cv_prog_ac_ct_CXX+:} false; then : - $as_echo_n "(cached) " >&6 - else - if test -n "$ac_ct_CXX"; then -@@ -2834,24 +3368,24 @@ 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 -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_CXX="$ac_prog" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done - IFS=$as_save_IFS - - fi - fi - ac_ct_CXX=$ac_cv_prog_ac_ct_CXX - if test -n "$ac_ct_CXX"; then -- { $as_echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5 - $as_echo "$ac_ct_CXX" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } - fi - -@@ -2864,7 +3398,7 @@ done - else - case $cross_compiling:$ac_tool_warned in - yes:) --{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 - $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} - ac_tool_warned=yes ;; - esac -@@ -2875,48 +3409,31 @@ fi - fi - fi - # Provide some information about the compiler. --$as_echo "$as_me:$LINENO: checking for C++ compiler version" >&5 -+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5 - set X $ac_compile - ac_compiler=$2 --{ (ac_try="$ac_compiler --version >&5" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_compiler --version >&5") 2>&5 -- ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } --{ (ac_try="$ac_compiler -v >&5" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_compiler -v >&5") 2>&5 -- ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } --{ (ac_try="$ac_compiler -V >&5" -+for ac_option in --version -v -V -qversion; do -+ { { ac_try="$ac_compiler $ac_option >&5" - case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_compiler -V >&5") 2>&5 -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_compiler $ac_option >&5") 2>conftest.err - ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } -+ if test -s conftest.err; then -+ sed '10a\ -+... rest of stderr output deleted ... -+ 10q' conftest.err >conftest.er1 -+ cat conftest.er1 >&5 -+ fi -+ rm -f conftest.er1 conftest.err -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+done - --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -2932,8 +3449,8 @@ ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" - # Try to create an executable without -o first, disregard a.out. - # It will help us diagnose broken compilers, and finding out an intuition - # of exeext. --{ $as_echo "$as_me:$LINENO: checking for C++ compiler default output file name" >&5 --$as_echo_n "checking for C++ compiler default output file name... " >&6; } -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C++ compiler works" >&5 -+$as_echo_n "checking whether the C++ compiler works... " >&6; } - ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` - - # The possible output files: -@@ -2949,17 +3466,17 @@ do - done - rm -f $ac_rmfiles - --if { (ac_try="$ac_link_default" -+if { { ac_try="$ac_link_default" - case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_link_default") 2>&5 - ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; then -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; then : - # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. - # So ignore a value of `no', otherwise this would lead to `EXEEXT = no' - # in a Makefile. We should not override ac_cv_exeext if it was cached, -@@ -2976,7 +3493,7 @@ do - # certainly right. - break;; - *.* ) -- if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; -+ if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; - then :; else - ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - fi -@@ -2995,84 +3512,41 @@ test "$ac_cv_exeext" = no && ac_cv_exeext= - else - ac_file='' - fi -- --{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5 --$as_echo "$ac_file" >&6; } --if test -z "$ac_file"; then -- $as_echo "$as_me: failed program was:" >&5 -+if test -z "$ac_file"; then : -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+$as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 - $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} --{ { $as_echo "$as_me:$LINENO: error: C++ compiler cannot create executables --See \`config.log' for more details." >&5 --$as_echo "$as_me: error: C++ compiler cannot create executables --See \`config.log' for more details." >&2;} -- { (exit 77); exit 77; }; }; } -+as_fn_error 77 "C++ compiler cannot create executables -+See \`config.log' for more details" "$LINENO" 5; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+$as_echo "yes" >&6; } - fi -- -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler default output file name" >&5 -+$as_echo_n "checking for C++ compiler default output file name... " >&6; } -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 -+$as_echo "$ac_file" >&6; } - ac_exeext=$ac_cv_exeext - --# Check that the compiler produces executables we can run. If not, either --# the compiler is broken, or we cross compile. --{ $as_echo "$as_me:$LINENO: checking whether the C++ compiler works" >&5 --$as_echo_n "checking whether the C++ compiler works... " >&6; } --# FIXME: These cross compiler hacks should be removed for Autoconf 3.0 --# If not cross compiling, check that we can run a simple program. --if test "$cross_compiling" != yes; then -- if { ac_try='./$ac_file' -- { (case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_try") 2>&5 -- ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- cross_compiling=no -- else -- if test "$cross_compiling" = maybe; then -- cross_compiling=yes -- else -- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 --$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} --{ { $as_echo "$as_me:$LINENO: error: cannot run C++ compiled programs. --If you meant to cross compile, use \`--host'. --See \`config.log' for more details." >&5 --$as_echo "$as_me: error: cannot run C++ compiled programs. --If you meant to cross compile, use \`--host'. --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; }; } -- fi -- fi --fi --{ $as_echo "$as_me:$LINENO: result: yes" >&5 --$as_echo "yes" >&6; } -- - rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out - ac_clean_files=$ac_clean_files_save --# Check that the compiler produces executables we can run. If not, either --# the compiler is broken, or we cross compile. --{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 --$as_echo_n "checking whether we are cross compiling... " >&6; } --{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5 --$as_echo "$cross_compiling" >&6; } -- --{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 - $as_echo_n "checking for suffix of executables... " >&6; } --if { (ac_try="$ac_link" -+if { { ac_try="$ac_link" - case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_link") 2>&5 - ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; then -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; then : - # If both `conftest.exe' and `conftest' are `present' (well, observable) - # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will - # work properly (i.e., refer to `conftest.exe'), while it won't with -@@ -3087,32 +3561,83 @@ for ac_file in conftest.exe conftest conftest.*; do - esac - done - else -- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 - $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} --{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link --See \`config.log' for more details." >&5 --$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; }; } -+as_fn_error $? "cannot compute suffix of executables: cannot compile and link -+See \`config.log' for more details" "$LINENO" 5; } - fi -- --rm -f conftest$ac_cv_exeext --{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 -+rm -f conftest conftest$ac_cv_exeext -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 - $as_echo "$ac_cv_exeext" >&6; } - - rm -f conftest.$ac_ext - EXEEXT=$ac_cv_exeext - ac_exeext=$EXEEXT --{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5 -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include -+int -+main () -+{ -+FILE *f = fopen ("conftest.out", "w"); -+ return ferror (f) || fclose (f) != 0; -+ -+ ; -+ return 0; -+} -+_ACEOF -+ac_clean_files="$ac_clean_files conftest.out" -+# Check that the compiler produces executables we can run. If not, either -+# the compiler is broken, or we cross compile. -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 -+$as_echo_n "checking whether we are cross compiling... " >&6; } -+if test "$cross_compiling" != yes; then -+ { { ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_link") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+ if { ac_try='./conftest$ac_cv_exeext' -+ { { case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_try") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; }; then -+ cross_compiling=no -+ else -+ if test "$cross_compiling" = maybe; then -+ cross_compiling=yes -+ else -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+as_fn_error $? "cannot run C++ compiled programs. -+If you meant to cross compile, use \`--host'. -+See \`config.log' for more details" "$LINENO" 5; } -+ fi -+ fi -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 -+$as_echo "$cross_compiling" >&6; } -+ -+rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out -+ac_clean_files=$ac_clean_files_save -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 - $as_echo_n "checking for suffix of object files... " >&6; } --if test "${ac_cv_objext+set}" = set; then -+if ${ac_cv_objext+:} false; then : - $as_echo_n "(cached) " >&6 - else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -3124,17 +3649,17 @@ main () - } - _ACEOF - rm -f conftest.o conftest.obj --if { (ac_try="$ac_compile" -+if { { ac_try="$ac_compile" - case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_compile") 2>&5 - ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; then -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; then : - for ac_file in conftest.o conftest.obj conftest.*; do - test -f "$ac_file" || continue; - case $ac_file in -@@ -3147,31 +3672,23 @@ else - $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 - $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} --{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile --See \`config.log' for more details." >&5 --$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; }; } -+as_fn_error $? "cannot compute suffix of object files: cannot compile -+See \`config.log' for more details" "$LINENO" 5; } - fi -- - rm -f conftest.$ac_cv_objext conftest.$ac_ext - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 - $as_echo "$ac_cv_objext" >&6; } - OBJEXT=$ac_cv_objext - ac_objext=$OBJEXT --{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5 - $as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; } --if test "${ac_cv_cxx_compiler_gnu+set}" = set; then -+if ${ac_cv_cxx_compiler_gnu+:} false; then : - $as_echo_n "(cached) " >&6 - else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -3185,37 +3702,16 @@ main () - return 0; - } - _ACEOF --rm -f conftest.$ac_objext --if { (ac_try="$ac_compile" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_compile") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_cxx_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest.$ac_objext; then -+if ac_fn_cxx_try_compile "$LINENO"; then : - ac_compiler_gnu=yes - else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_compiler_gnu=no -+ ac_compiler_gnu=no - fi -- - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_cv_cxx_compiler_gnu=$ac_compiler_gnu - - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5 - $as_echo "$ac_cv_cxx_compiler_gnu" >&6; } - if test $ac_compiler_gnu = yes; then - GXX=yes -@@ -3224,20 +3720,16 @@ else - fi - ac_test_CXXFLAGS=${CXXFLAGS+set} - ac_save_CXXFLAGS=$CXXFLAGS --{ $as_echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5 - $as_echo_n "checking whether $CXX accepts -g... " >&6; } --if test "${ac_cv_prog_cxx_g+set}" = set; then -+if ${ac_cv_prog_cxx_g+:} false; then : - $as_echo_n "(cached) " >&6 - else - ac_save_cxx_werror_flag=$ac_cxx_werror_flag - ac_cxx_werror_flag=yes - ac_cv_prog_cxx_g=no - CXXFLAGS="-g" -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -3248,35 +3740,11 @@ main () - return 0; - } - _ACEOF --rm -f conftest.$ac_objext --if { (ac_try="$ac_compile" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_compile") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_cxx_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest.$ac_objext; then -+if ac_fn_cxx_try_compile "$LINENO"; then : - ac_cv_prog_cxx_g=yes - else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- CXXFLAGS="" -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ CXXFLAGS="" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -3287,36 +3755,12 @@ main () - return 0; - } - _ACEOF --rm -f conftest.$ac_objext --if { (ac_try="$ac_compile" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_compile") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_cxx_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest.$ac_objext; then -- : --else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -+if ac_fn_cxx_try_compile "$LINENO"; then : - -- ac_cxx_werror_flag=$ac_save_cxx_werror_flag -+else -+ ac_cxx_werror_flag=$ac_save_cxx_werror_flag - CXXFLAGS="-g" -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -3327,42 +3771,17 @@ main () - return 0; - } - _ACEOF --rm -f conftest.$ac_objext --if { (ac_try="$ac_compile" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_compile") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_cxx_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest.$ac_objext; then -+if ac_fn_cxx_try_compile "$LINENO"; then : - ac_cv_prog_cxx_g=yes --else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- - fi -- - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi -- - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi -- - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_cxx_werror_flag=$ac_save_cxx_werror_flag - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5 - $as_echo "$ac_cv_prog_cxx_g" >&6; } - if test "$ac_test_CXXFLAGS" = set; then - CXXFLAGS=$ac_save_CXXFLAGS -@@ -3396,14 +3815,14 @@ am__doit: - .PHONY: am__doit - END - # If we don't find an include directive, just comment out the code. --{ $as_echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5 - $as_echo_n "checking for style of include used by $am_make... " >&6; } - am__include="#" - am__quote= - _am_result=none - # First try GNU make style include. - echo "include confinc" > confmf --# Ignore all kinds of additional output from `make'. -+# Ignore all kinds of additional output from 'make'. - case `$am_make -s -f confmf 2> /dev/null` in #( - *the\ am__doit\ target*) - am__include=include -@@ -3424,18 +3843,19 @@ if test "$am__include" = "#"; then - fi - - --{ $as_echo "$as_me:$LINENO: result: $_am_result" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5 - $as_echo "$_am_result" >&6; } - rm -f confinc confmf - - # Check whether --enable-dependency-tracking was given. --if test "${enable_dependency_tracking+set}" = set; then -+if test "${enable_dependency_tracking+set}" = set; then : - enableval=$enable_dependency_tracking; - fi - - if test "x$enable_dependency_tracking" != xno; then - am_depcomp="$ac_aux_dir/depcomp" - AMDEPBACKSLASH='\' -+ am__nodep='_no' - fi - if test "x$enable_dependency_tracking" != xno; then - AMDEP_TRUE= -@@ -3449,17 +3869,18 @@ fi - - depcc="$CXX" am_compiler_list= - --{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 - $as_echo_n "checking dependency style of $depcc... " >&6; } --if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then -+if ${am_cv_CXX_dependencies_compiler_type+:} false; then : - $as_echo_n "(cached) " >&6 - else - if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then - # We make a subdir and do the tests there. Otherwise we can end up - # making bogus files that we don't know about and never remove. For - # instance it was reported that on HP-UX the gcc test will end up -- # making a dummy file named `D' -- because `-MD' means `put the output -- # in D'. -+ # making a dummy file named 'D' -- because '-MD' means "put the output -+ # in D". -+ rm -rf conftest.dir - mkdir conftest.dir - # Copy depcomp to subdir because otherwise we won't find it if we're - # using a relative directory. -@@ -3493,16 +3914,16 @@ else - : > sub/conftest.c - for i in 1 2 3 4 5 6; do - echo '#include "conftst'$i'.h"' >> sub/conftest.c -- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with -- # Solaris 8's {/usr,}/bin/sh. -- touch sub/conftst$i.h -+ # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with -+ # Solaris 10 /bin/sh. -+ echo '/* dummy */' > sub/conftst$i.h - done - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - -- # We check with `-c' and `-o' for the sake of the "dashmstdout" -+ # We check with '-c' and '-o' for the sake of the "dashmstdout" - # mode. It turns out that the SunPro C++ compiler does not properly -- # handle `-M -o', and we need to detect this. Also, some Intel -- # versions had trouble with output in subdirs -+ # handle '-M -o', and we need to detect this. Also, some Intel -+ # versions had trouble with output in subdirs. - am__obj=sub/conftest.${OBJEXT-o} - am__minus_obj="-o $am__obj" - case $depmode in -@@ -3511,16 +3932,16 @@ else - test "$am__universal" = false || continue - ;; - nosideeffect) -- # after this tag, mechanisms are not by side-effect, so they'll -- # only be used when explicitly requested -+ # After this tag, mechanisms are not by side-effect, so they'll -+ # only be used when explicitly requested. - if test "x$enable_dependency_tracking" = xyes; then - continue - else - break - fi - ;; -- msvisualcpp | msvcmsys) -- # This compiler won't grok `-c -o', but also, the minuso test has -+ msvc7 | msvc7msys | msvisualcpp | msvcmsys) -+ # This compiler won't grok '-c -o', but also, the minuso test has - # not run yet. These depmodes are late enough in the game, and - # so weak that their functioning should not be impacted. - am__obj=conftest.${OBJEXT-o} -@@ -3559,7 +3980,7 @@ else - fi - - fi --{ $as_echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5 - $as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; } - CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type - -@@ -3576,17 +3997,18 @@ fi - - depcc="$CXX" am_compiler_list= - --{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 - $as_echo_n "checking dependency style of $depcc... " >&6; } --if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then -+if ${am_cv_CXX_dependencies_compiler_type+:} false; then : - $as_echo_n "(cached) " >&6 - else - if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then - # We make a subdir and do the tests there. Otherwise we can end up - # making bogus files that we don't know about and never remove. For - # instance it was reported that on HP-UX the gcc test will end up -- # making a dummy file named `D' -- because `-MD' means `put the output -- # in D'. -+ # making a dummy file named 'D' -- because '-MD' means "put the output -+ # in D". -+ rm -rf conftest.dir - mkdir conftest.dir - # Copy depcomp to subdir because otherwise we won't find it if we're - # using a relative directory. -@@ -3620,16 +4042,16 @@ else - : > sub/conftest.c - for i in 1 2 3 4 5 6; do - echo '#include "conftst'$i'.h"' >> sub/conftest.c -- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with -- # Solaris 8's {/usr,}/bin/sh. -- touch sub/conftst$i.h -+ # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with -+ # Solaris 10 /bin/sh. -+ echo '/* dummy */' > sub/conftst$i.h - done - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - -- # We check with `-c' and `-o' for the sake of the "dashmstdout" -+ # We check with '-c' and '-o' for the sake of the "dashmstdout" - # mode. It turns out that the SunPro C++ compiler does not properly -- # handle `-M -o', and we need to detect this. Also, some Intel -- # versions had trouble with output in subdirs -+ # handle '-M -o', and we need to detect this. Also, some Intel -+ # versions had trouble with output in subdirs. - am__obj=sub/conftest.${OBJEXT-o} - am__minus_obj="-o $am__obj" - case $depmode in -@@ -3638,16 +4060,16 @@ else - test "$am__universal" = false || continue - ;; - nosideeffect) -- # after this tag, mechanisms are not by side-effect, so they'll -- # only be used when explicitly requested -+ # After this tag, mechanisms are not by side-effect, so they'll -+ # only be used when explicitly requested. - if test "x$enable_dependency_tracking" = xyes; then - continue - else - break - fi - ;; -- msvisualcpp | msvcmsys) -- # This compiler won't grok `-c -o', but also, the minuso test has -+ msvc7 | msvc7msys | msvisualcpp | msvcmsys) -+ # This compiler won't grok '-c -o', but also, the minuso test has - # not run yet. These depmodes are late enough in the game, and - # so weak that their functioning should not be impacted. - am__obj=conftest.${OBJEXT-o} -@@ -3686,7 +4108,7 @@ else - fi - - fi --{ $as_echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5 - $as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; } - CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type - -@@ -3709,9 +4131,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. - set dummy ${ac_tool_prefix}gcc; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_CC+set}" = set; then -+if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 - else - if test -n "$CC"; then -@@ -3722,24 +4144,24 @@ 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 -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_CC="${ac_tool_prefix}gcc" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done - IFS=$as_save_IFS - - fi - fi - CC=$ac_cv_prog_CC - if test -n "$CC"; then -- { $as_echo "$as_me:$LINENO: result: $CC" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 - $as_echo "$CC" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } - fi - -@@ -3749,9 +4171,9 @@ if test -z "$ac_cv_prog_CC"; then - ac_ct_CC=$CC - # Extract the first word of "gcc", so it can be a program name with args. - set dummy gcc; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_ac_ct_CC+set}" = set; then -+if ${ac_cv_prog_ac_ct_CC+:} false; then : - $as_echo_n "(cached) " >&6 - else - if test -n "$ac_ct_CC"; then -@@ -3762,24 +4184,24 @@ 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 -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_CC="gcc" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done - IFS=$as_save_IFS - - fi - fi - ac_ct_CC=$ac_cv_prog_ac_ct_CC - if test -n "$ac_ct_CC"; then -- { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 - $as_echo "$ac_ct_CC" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } - fi - -@@ -3788,7 +4210,7 @@ fi - else - case $cross_compiling:$ac_tool_warned in - yes:) --{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 - $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} - ac_tool_warned=yes ;; - esac -@@ -3802,9 +4224,9 @@ if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. - set dummy ${ac_tool_prefix}cc; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_CC+set}" = set; then -+if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 - else - if test -n "$CC"; then -@@ -3815,24 +4237,24 @@ 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 -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_CC="${ac_tool_prefix}cc" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done - IFS=$as_save_IFS - - fi - fi - CC=$ac_cv_prog_CC - if test -n "$CC"; then -- { $as_echo "$as_me:$LINENO: result: $CC" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 - $as_echo "$CC" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } - fi - -@@ -3842,9 +4264,9 @@ fi - if test -z "$CC"; then - # Extract the first word of "cc", so it can be a program name with args. - set dummy cc; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_CC+set}" = set; then -+if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 - else - if test -n "$CC"; then -@@ -3856,18 +4278,18 @@ 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 -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then - ac_prog_rejected=yes - continue - fi - ac_cv_prog_CC="cc" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done - IFS=$as_save_IFS - - if test $ac_prog_rejected = yes; then -@@ -3886,10 +4308,10 @@ fi - fi - CC=$ac_cv_prog_CC - if test -n "$CC"; then -- { $as_echo "$as_me:$LINENO: result: $CC" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 - $as_echo "$CC" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } - fi - -@@ -3901,9 +4323,9 @@ if test -z "$CC"; then - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. - set dummy $ac_tool_prefix$ac_prog; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_CC+set}" = set; then -+if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 - else - if test -n "$CC"; then -@@ -3914,24 +4336,24 @@ 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 -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_CC="$ac_tool_prefix$ac_prog" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done - IFS=$as_save_IFS - - fi - fi - CC=$ac_cv_prog_CC - if test -n "$CC"; then -- { $as_echo "$as_me:$LINENO: result: $CC" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 - $as_echo "$CC" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } - fi - -@@ -3945,9 +4367,9 @@ if test -z "$CC"; then - do - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_ac_ct_CC+set}" = set; then -+if ${ac_cv_prog_ac_ct_CC+:} false; then : - $as_echo_n "(cached) " >&6 - else - if test -n "$ac_ct_CC"; then -@@ -3958,24 +4380,24 @@ 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 -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_CC="$ac_prog" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done - IFS=$as_save_IFS - - fi - fi - ac_ct_CC=$ac_cv_prog_ac_ct_CC - if test -n "$ac_ct_CC"; then -- { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 - $as_echo "$ac_ct_CC" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } - fi - -@@ -3988,7 +4410,7 @@ done - else - case $cross_compiling:$ac_tool_warned in - yes:) --{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 - $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} - ac_tool_warned=yes ;; - esac -@@ -3999,62 +4421,42 @@ fi - fi - - --test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 - $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} --{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH --See \`config.log' for more details." >&5 --$as_echo "$as_me: error: no acceptable C compiler found in \$PATH --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; }; } -+as_fn_error $? "no acceptable C compiler found in \$PATH -+See \`config.log' for more details" "$LINENO" 5; } - - # Provide some information about the compiler. --$as_echo "$as_me:$LINENO: checking for C compiler version" >&5 -+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 - set X $ac_compile - ac_compiler=$2 --{ (ac_try="$ac_compiler --version >&5" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_compiler --version >&5") 2>&5 -- ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } --{ (ac_try="$ac_compiler -v >&5" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_compiler -v >&5") 2>&5 -- ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } --{ (ac_try="$ac_compiler -V >&5" -+for ac_option in --version -v -V -qversion; do -+ { { ac_try="$ac_compiler $ac_option >&5" - case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_compiler -V >&5") 2>&5 -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_compiler $ac_option >&5") 2>conftest.err - ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } -+ if test -s conftest.err; then -+ sed '10a\ -+... rest of stderr output deleted ... -+ 10q' conftest.err >conftest.er1 -+ cat conftest.er1 >&5 -+ fi -+ rm -f conftest.er1 conftest.err -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+done - --{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 - $as_echo_n "checking whether we are using the GNU C compiler... " >&6; } --if test "${ac_cv_c_compiler_gnu+set}" = set; then -+if ${ac_cv_c_compiler_gnu+:} false; then : - $as_echo_n "(cached) " >&6 - else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -4068,37 +4470,16 @@ main () - return 0; - } - _ACEOF --rm -f conftest.$ac_objext --if { (ac_try="$ac_compile" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_compile") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest.$ac_objext; then -+if ac_fn_c_try_compile "$LINENO"; then : - ac_compiler_gnu=yes - else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_compiler_gnu=no -+ ac_compiler_gnu=no - fi -- - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_cv_c_compiler_gnu=$ac_compiler_gnu - - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 - $as_echo "$ac_cv_c_compiler_gnu" >&6; } - if test $ac_compiler_gnu = yes; then - GCC=yes -@@ -4107,20 +4488,16 @@ else - fi - ac_test_CFLAGS=${CFLAGS+set} - ac_save_CFLAGS=$CFLAGS --{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 - $as_echo_n "checking whether $CC accepts -g... " >&6; } --if test "${ac_cv_prog_cc_g+set}" = set; then -+if ${ac_cv_prog_cc_g+:} false; then : - $as_echo_n "(cached) " >&6 - else - ac_save_c_werror_flag=$ac_c_werror_flag - ac_c_werror_flag=yes - ac_cv_prog_cc_g=no - CFLAGS="-g" -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -4131,35 +4508,11 @@ main () - return 0; - } - _ACEOF --rm -f conftest.$ac_objext --if { (ac_try="$ac_compile" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_compile") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest.$ac_objext; then -+if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_prog_cc_g=yes - else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- CFLAGS="" -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ CFLAGS="" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -4170,36 +4523,12 @@ main () - return 0; - } - _ACEOF --rm -f conftest.$ac_objext --if { (ac_try="$ac_compile" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_compile") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest.$ac_objext; then -- : --else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -+if ac_fn_c_try_compile "$LINENO"; then : - -- ac_c_werror_flag=$ac_save_c_werror_flag -+else -+ ac_c_werror_flag=$ac_save_c_werror_flag - CFLAGS="-g" -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -4210,42 +4539,17 @@ main () - return 0; - } - _ACEOF --rm -f conftest.$ac_objext --if { (ac_try="$ac_compile" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_compile") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest.$ac_objext; then -+if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_prog_cc_g=yes --else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- - fi -- - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi -- - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi -- - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_c_werror_flag=$ac_save_c_werror_flag - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 - $as_echo "$ac_cv_prog_cc_g" >&6; } - if test "$ac_test_CFLAGS" = set; then - CFLAGS=$ac_save_CFLAGS -@@ -4262,23 +4566,18 @@ else - CFLAGS= - fi - fi --{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 - $as_echo_n "checking for $CC option to accept ISO C89... " >&6; } --if test "${ac_cv_prog_cc_c89+set}" = set; then -+if ${ac_cv_prog_cc_c89+:} false; then : - $as_echo_n "(cached) " >&6 - else - ac_cv_prog_cc_c89=no - ac_save_CC=$CC --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include - #include --#include --#include -+struct stat; - /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ - struct buf { int x; }; - FILE * (*rcsopen) (struct buf *, struct stat *, int); -@@ -4330,32 +4629,9 @@ for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ - -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" - do - CC="$ac_save_CC $ac_arg" -- rm -f conftest.$ac_objext --if { (ac_try="$ac_compile" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_compile") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest.$ac_objext; then -+ if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_prog_cc_c89=$ac_arg --else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- - fi -- - rm -f core conftest.err conftest.$ac_objext - test "x$ac_cv_prog_cc_c89" != "xno" && break - done -@@ -4366,37 +4642,99 @@ fi - # AC_CACHE_VAL - case "x$ac_cv_prog_cc_c89" in - x) -- { $as_echo "$as_me:$LINENO: result: none needed" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 - $as_echo "none needed" >&6; } ;; - xno) -- { $as_echo "$as_me:$LINENO: result: unsupported" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 - $as_echo "unsupported" >&6; } ;; - *) - CC="$CC $ac_cv_prog_cc_c89" -- { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 - $as_echo "$ac_cv_prog_cc_c89" >&6; } ;; - esac -+if test "x$ac_cv_prog_cc_c89" != xno; then : -+ -+fi -+ -+ac_ext=c -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_c_compiler_gnu -+ -+ac_ext=c -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_c_compiler_gnu -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 -+$as_echo_n "checking whether $CC understands -c and -o together... " >&6; } -+if ${am_cv_prog_cc_c_o+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ - -+int -+main () -+{ - -+ ; -+ return 0; -+} -+_ACEOF -+ # Make sure it works both with $CC and with simple cc. -+ # Following AC_PROG_CC_C_O, we do the test twice because some -+ # compilers refuse to overwrite an existing .o file with -o, -+ # though they will create one. -+ am_cv_prog_cc_c_o=yes -+ for am_i in 1 2; do -+ if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5 -+ ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } \ -+ && test -f conftest2.$ac_objext; then -+ : OK -+ else -+ am_cv_prog_cc_c_o=no -+ break -+ fi -+ done -+ rm -f core conftest* -+ unset am_i -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 -+$as_echo "$am_cv_prog_cc_c_o" >&6; } -+if test "$am_cv_prog_cc_c_o" != yes; then -+ # Losing compiler, so override with the script. -+ # FIXME: It is wrong to rewrite CC. -+ # But if we don't then we get into trouble of one sort or another. -+ # A longer-term fix would be to have automake use am__CC in this case, -+ # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" -+ CC="$am_aux_dir/compile $CC" -+fi - ac_ext=c - ac_cpp='$CPP $CPPFLAGS' - ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' - ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' - ac_compiler_gnu=$ac_cv_c_compiler_gnu - -+ - depcc="$CC" am_compiler_list= - --{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 - $as_echo_n "checking dependency style of $depcc... " >&6; } --if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then -+if ${am_cv_CC_dependencies_compiler_type+:} false; then : - $as_echo_n "(cached) " >&6 - else - if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then - # We make a subdir and do the tests there. Otherwise we can end up - # making bogus files that we don't know about and never remove. For - # instance it was reported that on HP-UX the gcc test will end up -- # making a dummy file named `D' -- because `-MD' means `put the output -- # in D'. -+ # making a dummy file named 'D' -- because '-MD' means "put the output -+ # in D". -+ rm -rf conftest.dir - mkdir conftest.dir - # Copy depcomp to subdir because otherwise we won't find it if we're - # using a relative directory. -@@ -4430,16 +4768,16 @@ else - : > sub/conftest.c - for i in 1 2 3 4 5 6; do - echo '#include "conftst'$i'.h"' >> sub/conftest.c -- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with -- # Solaris 8's {/usr,}/bin/sh. -- touch sub/conftst$i.h -+ # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with -+ # Solaris 10 /bin/sh. -+ echo '/* dummy */' > sub/conftst$i.h - done - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - -- # We check with `-c' and `-o' for the sake of the "dashmstdout" -+ # We check with '-c' and '-o' for the sake of the "dashmstdout" - # mode. It turns out that the SunPro C++ compiler does not properly -- # handle `-M -o', and we need to detect this. Also, some Intel -- # versions had trouble with output in subdirs -+ # handle '-M -o', and we need to detect this. Also, some Intel -+ # versions had trouble with output in subdirs. - am__obj=sub/conftest.${OBJEXT-o} - am__minus_obj="-o $am__obj" - case $depmode in -@@ -4448,16 +4786,16 @@ else - test "$am__universal" = false || continue - ;; - nosideeffect) -- # after this tag, mechanisms are not by side-effect, so they'll -- # only be used when explicitly requested -+ # After this tag, mechanisms are not by side-effect, so they'll -+ # only be used when explicitly requested. - if test "x$enable_dependency_tracking" = xyes; then - continue - else - break - fi - ;; -- msvisualcpp | msvcmsys) -- # This compiler won't grok `-c -o', but also, the minuso test has -+ msvc7 | msvc7msys | msvisualcpp | msvcmsys) -+ # This compiler won't grok '-c -o', but also, the minuso test has - # not run yet. These depmodes are late enough in the game, and - # so weak that their functioning should not be impacted. - am__obj=conftest.${OBJEXT-o} -@@ -4496,7 +4834,7 @@ else - fi - - fi --{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 - $as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } - CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type - -@@ -4513,17 +4851,18 @@ fi - - depcc="$CC" am_compiler_list= - --{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 - $as_echo_n "checking dependency style of $depcc... " >&6; } --if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then -+if ${am_cv_CC_dependencies_compiler_type+:} false; then : - $as_echo_n "(cached) " >&6 - else - if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then - # We make a subdir and do the tests there. Otherwise we can end up - # making bogus files that we don't know about and never remove. For - # instance it was reported that on HP-UX the gcc test will end up -- # making a dummy file named `D' -- because `-MD' means `put the output -- # in D'. -+ # making a dummy file named 'D' -- because '-MD' means "put the output -+ # in D". -+ rm -rf conftest.dir - mkdir conftest.dir - # Copy depcomp to subdir because otherwise we won't find it if we're - # using a relative directory. -@@ -4557,16 +4896,16 @@ else - : > sub/conftest.c - for i in 1 2 3 4 5 6; do - echo '#include "conftst'$i'.h"' >> sub/conftest.c -- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with -- # Solaris 8's {/usr,}/bin/sh. -- touch sub/conftst$i.h -+ # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with -+ # Solaris 10 /bin/sh. -+ echo '/* dummy */' > sub/conftst$i.h - done - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - -- # We check with `-c' and `-o' for the sake of the "dashmstdout" -+ # We check with '-c' and '-o' for the sake of the "dashmstdout" - # mode. It turns out that the SunPro C++ compiler does not properly -- # handle `-M -o', and we need to detect this. Also, some Intel -- # versions had trouble with output in subdirs -+ # handle '-M -o', and we need to detect this. Also, some Intel -+ # versions had trouble with output in subdirs. - am__obj=sub/conftest.${OBJEXT-o} - am__minus_obj="-o $am__obj" - case $depmode in -@@ -4575,16 +4914,16 @@ else - test "$am__universal" = false || continue - ;; - nosideeffect) -- # after this tag, mechanisms are not by side-effect, so they'll -- # only be used when explicitly requested -+ # After this tag, mechanisms are not by side-effect, so they'll -+ # only be used when explicitly requested. - if test "x$enable_dependency_tracking" = xyes; then - continue - else - break - fi - ;; -- msvisualcpp | msvcmsys) -- # This compiler won't grok `-c -o', but also, the minuso test has -+ msvc7 | msvc7msys | msvisualcpp | msvcmsys) -+ # This compiler won't grok '-c -o', but also, the minuso test has - # not run yet. These depmodes are late enough in the game, and - # so weak that their functioning should not be impacted. - am__obj=conftest.${OBJEXT-o} -@@ -4623,7 +4962,7 @@ else - fi - - fi --{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 - $as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } - CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type - -@@ -4638,109 +4977,17 @@ else - fi - - --# Find a good install program. We prefer a C program (faster), --# so one script is as good as another. But avoid the broken or --# incompatible versions: --# SysV /etc/install, /usr/sbin/install --# SunOS /usr/etc/install --# IRIX /sbin/install --# AIX /bin/install --# AmigaOS /C/install, which installs bootblocks on floppy discs --# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag --# AFS /usr/afsws/bin/install, which mishandles nonexistent args --# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" --# OS/2's system install, which has a completely different semantic --# ./install, which can be erroneously created by make from ./install.sh. --# Reject install programs that cannot install multiple files. --{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 --$as_echo_n "checking for a BSD-compatible install... " >&6; } --if test -z "$INSTALL"; then --if test "${ac_cv_path_install+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- # Account for people who put trailing slashes in PATH elements. --case $as_dir/ in -- ./ | .// | /cC/* | \ -- /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ -- ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \ -- /usr/ucb/* ) ;; -- *) -- # OSF1 and SCO ODT 3.0 have their own names for install. -- # Don't use installbsd from OSF since it installs stuff as root -- # by default. -- for ac_prog in ginstall scoinst install; do -- for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then -- if test $ac_prog = install && -- grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then -- # AIX install. It has an incompatible calling convention. -- : -- elif test $ac_prog = install && -- grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then -- # program-specific install script used by HP pwplus--don't use. -- : -- else -- rm -rf conftest.one conftest.two conftest.dir -- echo one > conftest.one -- echo two > conftest.two -- mkdir conftest.dir -- if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && -- test -s conftest.one && test -s conftest.two && -- test -s conftest.dir/conftest.one && -- test -s conftest.dir/conftest.two -- then -- ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" -- break 3 -- fi -- fi -- fi -- done -- done -- ;; -+ -+case `pwd` in -+ *\ * | *\ *) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 -+$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;; - esac - --done --IFS=$as_save_IFS - --rm -rf conftest.one conftest.two conftest.dir - --fi -- if test "${ac_cv_path_install+set}" = set; then -- INSTALL=$ac_cv_path_install -- else -- # As a last resort, use the slow shell script. Don't cache a -- # value for INSTALL within a source directory, because that will -- # break other packages using the cache if that directory is -- # removed, or if the value is a relative name. -- INSTALL=$ac_install_sh -- fi --fi --{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5 --$as_echo "$INSTALL" >&6; } -- --# Use test -z because SunOS4 sh mishandles braces in ${var-val}. --# It thinks the first close brace ends the variable substitution. --test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' -- --test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' -- --test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -- --case `pwd` in -- *\ * | *\ *) -- { $as_echo "$as_me:$LINENO: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 --$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;; --esac -- -- -- --macro_version='2.2.6b' --macro_revision='1.3017' -+macro_version='2.4.2' -+macro_revision='1.3337' - - - -@@ -4758,35 +5005,27 @@ ltmain="$ac_aux_dir/ltmain.sh" - - # Make sure we can run config.sub. - $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || -- { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5 --$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;} -- { (exit 1); exit 1; }; } -+ as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 - --{ $as_echo "$as_me:$LINENO: checking build system type" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 - $as_echo_n "checking build system type... " >&6; } --if test "${ac_cv_build+set}" = set; then -+if ${ac_cv_build+:} false; then : - $as_echo_n "(cached) " >&6 - else - ac_build_alias=$build_alias - test "x$ac_build_alias" = x && - ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` - test "x$ac_build_alias" = x && -- { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 --$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;} -- { (exit 1); exit 1; }; } -+ as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 - ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || -- { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5 --$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;} -- { (exit 1); exit 1; }; } -+ as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 - - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 - $as_echo "$ac_cv_build" >&6; } - case $ac_cv_build in - *-*-*) ;; --*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5 --$as_echo "$as_me: error: invalid value of canonical build" >&2;} -- { (exit 1); exit 1; }; };; -+*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; - esac - build=$ac_cv_build - ac_save_IFS=$IFS; IFS='-' -@@ -4802,28 +5041,24 @@ IFS=$ac_save_IFS - case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac - - --{ $as_echo "$as_me:$LINENO: checking host system type" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 - $as_echo_n "checking host system type... " >&6; } --if test "${ac_cv_host+set}" = set; then -+if ${ac_cv_host+:} false; then : - $as_echo_n "(cached) " >&6 - else - if test "x$host_alias" = x; then - ac_cv_host=$ac_cv_build - else - ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || -- { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5 --$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;} -- { (exit 1); exit 1; }; } -+ as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 - fi - - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 - $as_echo "$ac_cv_host" >&6; } - case $ac_cv_host in - *-*-*) ;; --*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5 --$as_echo "$as_me: error: invalid value of canonical host" >&2;} -- { (exit 1); exit 1; }; };; -+*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; - esac - host=$ac_cv_host - ac_save_IFS=$IFS; IFS='-' -@@ -4839,9 +5074,78 @@ IFS=$ac_save_IFS - case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac - - --{ $as_echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5 -+# Backslashify metacharacters that are still active within -+# double-quoted strings. -+sed_quote_subst='s/\(["`$\\]\)/\\\1/g' -+ -+# Same as above, but do not quote variable references. -+double_quote_subst='s/\(["`\\]\)/\\\1/g' -+ -+# Sed substitution to delay expansion of an escaped shell variable in a -+# double_quote_subst'ed string. -+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' -+ -+# Sed substitution to delay expansion of an escaped single quote. -+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' -+ -+# Sed substitution to avoid accidental globbing in evaled expressions -+no_glob_subst='s/\*/\\\*/g' -+ -+ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' -+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO -+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 -+$as_echo_n "checking how to print strings... " >&6; } -+# Test print first, because it will be a builtin if present. -+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ -+ test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then -+ ECHO='print -r --' -+elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then -+ ECHO='printf %s\n' -+else -+ # Use this function as a fallback that always works. -+ func_fallback_echo () -+ { -+ eval 'cat <<_LTECHO_EOF -+$1 -+_LTECHO_EOF' -+ } -+ ECHO='func_fallback_echo' -+fi -+ -+# func_echo_all arg... -+# Invoke $ECHO with all args, space-separated. -+func_echo_all () -+{ -+ $ECHO "" -+} -+ -+case "$ECHO" in -+ printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5 -+$as_echo "printf" >&6; } ;; -+ print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5 -+$as_echo "print -r" >&6; } ;; -+ *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5 -+$as_echo "cat" >&6; } ;; -+esac -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 - $as_echo_n "checking for a sed that does not truncate output... " >&6; } --if test "${ac_cv_path_SED+set}" = set; then -+if ${ac_cv_path_SED+:} false; then : - $as_echo_n "(cached) " >&6 - else - ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ -@@ -4849,7 +5153,7 @@ else - ac_script="$ac_script$as_nl$ac_script" - done - echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed -- $as_unset ac_script || ac_script= -+ { ac_script=; unset ac_script;} - if test -z "$SED"; then - ac_path_SED_found=false - # Loop through the user's path and test for each of PROGNAME-LIST -@@ -4858,10 +5162,10 @@ for as_dir in $PATH - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_prog in sed gsed; do -+ for ac_prog in sed gsed; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" -- { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue -+ as_fn_executable_p "$ac_path_SED" || continue - # Check for GNU ac_path_SED and select it if it is found. - # Check for GNU $ac_path_SED - case `"$ac_path_SED" --version 2>&1` in -@@ -4878,7 +5182,7 @@ case `"$ac_path_SED" --version 2>&1` in - $as_echo '' >> "conftest.nl" - "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break - diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break -- ac_count=`expr $ac_count + 1` -+ as_fn_arith $ac_count + 1 && ac_count=$as_val - if test $ac_count -gt ${ac_path_SED_max-0}; then - # Best one so far, save it but keep looking for a better one - ac_cv_path_SED="$ac_path_SED" -@@ -4893,19 +5197,17 @@ esac - $ac_path_SED_found && break 3 - done - done --done -+ done - IFS=$as_save_IFS - if test -z "$ac_cv_path_SED"; then -- { { $as_echo "$as_me:$LINENO: error: no acceptable sed could be found in \$PATH" >&5 --$as_echo "$as_me: error: no acceptable sed could be found in \$PATH" >&2;} -- { (exit 1); exit 1; }; } -+ as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5 - fi - else - ac_cv_path_SED=$SED - fi - - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_SED" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5 - $as_echo "$ac_cv_path_SED" >&6; } - SED="$ac_cv_path_SED" - rm -f conftest.sed -@@ -4923,9 +5225,9 @@ Xsed="$SED -e 1s/^X//" - - - --{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 - $as_echo_n "checking for grep that handles long lines and -e... " >&6; } --if test "${ac_cv_path_GREP+set}" = set; then -+if ${ac_cv_path_GREP+:} false; then : - $as_echo_n "(cached) " >&6 - else - if test -z "$GREP"; then -@@ -4936,10 +5238,10 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_prog in grep ggrep; do -+ for ac_prog in grep ggrep; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" -- { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue -+ as_fn_executable_p "$ac_path_GREP" || continue - # Check for GNU ac_path_GREP and select it if it is found. - # Check for GNU $ac_path_GREP - case `"$ac_path_GREP" --version 2>&1` in -@@ -4956,7 +5258,7 @@ case `"$ac_path_GREP" --version 2>&1` in - $as_echo 'GREP' >> "conftest.nl" - "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break - diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break -- ac_count=`expr $ac_count + 1` -+ as_fn_arith $ac_count + 1 && ac_count=$as_val - if test $ac_count -gt ${ac_path_GREP_max-0}; then - # Best one so far, save it but keep looking for a better one - ac_cv_path_GREP="$ac_path_GREP" -@@ -4971,26 +5273,24 @@ esac - $ac_path_GREP_found && break 3 - done - done --done -+ done - IFS=$as_save_IFS - if test -z "$ac_cv_path_GREP"; then -- { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 --$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} -- { (exit 1); exit 1; }; } -+ as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 - fi - else - ac_cv_path_GREP=$GREP - fi - - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 - $as_echo "$ac_cv_path_GREP" >&6; } - GREP="$ac_cv_path_GREP" - - --{ $as_echo "$as_me:$LINENO: checking for egrep" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 - $as_echo_n "checking for egrep... " >&6; } --if test "${ac_cv_path_EGREP+set}" = set; then -+if ${ac_cv_path_EGREP+:} false; then : - $as_echo_n "(cached) " >&6 - else - if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 -@@ -5004,10 +5304,10 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_prog in egrep; do -+ for ac_prog in egrep; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" -- { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue -+ as_fn_executable_p "$ac_path_EGREP" || continue - # Check for GNU ac_path_EGREP and select it if it is found. - # Check for GNU $ac_path_EGREP - case `"$ac_path_EGREP" --version 2>&1` in -@@ -5024,7 +5324,7 @@ case `"$ac_path_EGREP" --version 2>&1` in - $as_echo 'EGREP' >> "conftest.nl" - "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break - diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break -- ac_count=`expr $ac_count + 1` -+ as_fn_arith $ac_count + 1 && ac_count=$as_val - if test $ac_count -gt ${ac_path_EGREP_max-0}; then - # Best one so far, save it but keep looking for a better one - ac_cv_path_EGREP="$ac_path_EGREP" -@@ -5039,12 +5339,10 @@ esac - $ac_path_EGREP_found && break 3 - done - done --done -+ done - IFS=$as_save_IFS - if test -z "$ac_cv_path_EGREP"; then -- { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 --$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} -- { (exit 1); exit 1; }; } -+ as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 - fi - else - ac_cv_path_EGREP=$EGREP -@@ -5052,14 +5350,14 @@ fi - - fi - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 - $as_echo "$ac_cv_path_EGREP" >&6; } - EGREP="$ac_cv_path_EGREP" - - --{ $as_echo "$as_me:$LINENO: checking for fgrep" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5 - $as_echo_n "checking for fgrep... " >&6; } --if test "${ac_cv_path_FGREP+set}" = set; then -+if ${ac_cv_path_FGREP+:} false; then : - $as_echo_n "(cached) " >&6 - else - if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1 -@@ -5073,10 +5371,10 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_prog in fgrep; do -+ for ac_prog in fgrep; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext" -- { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue -+ as_fn_executable_p "$ac_path_FGREP" || continue - # Check for GNU ac_path_FGREP and select it if it is found. - # Check for GNU $ac_path_FGREP - case `"$ac_path_FGREP" --version 2>&1` in -@@ -5093,7 +5391,7 @@ case `"$ac_path_FGREP" --version 2>&1` in - $as_echo 'FGREP' >> "conftest.nl" - "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break - diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break -- ac_count=`expr $ac_count + 1` -+ as_fn_arith $ac_count + 1 && ac_count=$as_val - if test $ac_count -gt ${ac_path_FGREP_max-0}; then - # Best one so far, save it but keep looking for a better one - ac_cv_path_FGREP="$ac_path_FGREP" -@@ -5108,12 +5406,10 @@ esac - $ac_path_FGREP_found && break 3 - done - done --done -+ done - IFS=$as_save_IFS - if test -z "$ac_cv_path_FGREP"; then -- { { $as_echo "$as_me:$LINENO: error: no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 --$as_echo "$as_me: error: no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} -- { (exit 1); exit 1; }; } -+ as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 - fi - else - ac_cv_path_FGREP=$FGREP -@@ -5121,7 +5417,7 @@ fi - - fi - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_FGREP" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5 - $as_echo "$ac_cv_path_FGREP" >&6; } - FGREP="$ac_cv_path_FGREP" - -@@ -5147,7 +5443,7 @@ test -z "$GREP" && GREP=grep - - - # Check whether --with-gnu-ld was given. --if test "${with_gnu_ld+set}" = set; then -+if test "${with_gnu_ld+set}" = set; then : - withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes - else - with_gnu_ld=no -@@ -5156,7 +5452,7 @@ fi - ac_prog=ld - if test "$GCC" = yes; then - # Check if gcc -print-prog-name=ld gives a path. -- { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 - $as_echo_n "checking for ld used by $CC... " >&6; } - case $host in - *-*-mingw*) -@@ -5186,13 +5482,13 @@ $as_echo_n "checking for ld used by $CC... " >&6; } - ;; - esac - elif test "$with_gnu_ld" = yes; then -- { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 - $as_echo_n "checking for GNU ld... " >&6; } - else -- { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 - $as_echo_n "checking for non-GNU ld... " >&6; } - fi --if test "${lt_cv_path_LD+set}" = set; then -+if ${lt_cv_path_LD+:} false; then : - $as_echo_n "(cached) " >&6 - else - if test -z "$LD"; then -@@ -5223,18 +5519,16 @@ fi - - LD="$lt_cv_path_LD" - if test -n "$LD"; then -- { $as_echo "$as_me:$LINENO: result: $LD" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5 - $as_echo "$LD" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } - fi --test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 --$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} -- { (exit 1); exit 1; }; } --{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 -+test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 - $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } --if test "${lt_cv_prog_gnu_ld+set}" = set; then -+if ${lt_cv_prog_gnu_ld+:} false; then : - $as_echo_n "(cached) " >&6 - else - # I'd rather use --version here, but apparently some GNU lds only accept -v. -@@ -5247,7 +5541,7 @@ case `$LD -v 2>&1 &5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5 - $as_echo "$lt_cv_prog_gnu_ld" >&6; } - with_gnu_ld=$lt_cv_prog_gnu_ld - -@@ -5259,9 +5553,9 @@ with_gnu_ld=$lt_cv_prog_gnu_ld - - - --{ $as_echo "$as_me:$LINENO: checking for BSD- or MS-compatible name lister (nm)" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5 - $as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; } --if test "${lt_cv_path_NM+set}" = set; then -+if ${lt_cv_path_NM+:} false; then : - $as_echo_n "(cached) " >&6 - else - if test -n "$NM"; then -@@ -5308,20 +5602,23 @@ else - : ${lt_cv_path_NM=no} - fi - fi --{ $as_echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5 - $as_echo "$lt_cv_path_NM" >&6; } - if test "$lt_cv_path_NM" != "no"; then - NM="$lt_cv_path_NM" - else - # Didn't find any BSD compatible name lister, look for dumpbin. -- if test -n "$ac_tool_prefix"; then -- for ac_prog in "dumpbin -symbols" "link -dump -symbols" -+ if test -n "$DUMPBIN"; then : -+ # Let the user override the test. -+ else -+ if test -n "$ac_tool_prefix"; then -+ for ac_prog in dumpbin "link -dump" - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. - set dummy $ac_tool_prefix$ac_prog; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_DUMPBIN+set}" = set; then -+if ${ac_cv_prog_DUMPBIN+:} false; then : - $as_echo_n "(cached) " >&6 - else - if test -n "$DUMPBIN"; then -@@ -5332,24 +5629,24 @@ 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 -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done - IFS=$as_save_IFS - - fi - fi - DUMPBIN=$ac_cv_prog_DUMPBIN - if test -n "$DUMPBIN"; then -- { $as_echo "$as_me:$LINENO: result: $DUMPBIN" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5 - $as_echo "$DUMPBIN" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } - fi - -@@ -5359,13 +5656,13 @@ fi - fi - if test -z "$DUMPBIN"; then - ac_ct_DUMPBIN=$DUMPBIN -- for ac_prog in "dumpbin -symbols" "link -dump -symbols" -+ for ac_prog in dumpbin "link -dump" - do - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then -+if ${ac_cv_prog_ac_ct_DUMPBIN+:} false; then : - $as_echo_n "(cached) " >&6 - else - if test -n "$ac_ct_DUMPBIN"; then -@@ -5376,24 +5673,24 @@ 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 -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_DUMPBIN="$ac_prog" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done - IFS=$as_save_IFS - - fi - fi - ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN - if test -n "$ac_ct_DUMPBIN"; then -- { $as_echo "$as_me:$LINENO: result: $ac_ct_DUMPBIN" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5 - $as_echo "$ac_ct_DUMPBIN" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } - fi - -@@ -5406,7 +5703,7 @@ done - else - case $cross_compiling:$ac_tool_warned in - yes:) --{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 - $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} - ac_tool_warned=yes ;; - esac -@@ -5414,6 +5711,15 @@ esac - fi - fi - -+ case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in -+ *COFF*) -+ DUMPBIN="$DUMPBIN -symbols" -+ ;; -+ *) -+ DUMPBIN=: -+ ;; -+ esac -+ fi - - if test "$DUMPBIN" != ":"; then - NM="$DUMPBIN" -@@ -5426,44 +5732,44 @@ test -z "$NM" && NM=nm - - - --{ $as_echo "$as_me:$LINENO: checking the name lister ($NM) interface" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5 - $as_echo_n "checking the name lister ($NM) interface... " >&6; } --if test "${lt_cv_nm_interface+set}" = set; then -+if ${lt_cv_nm_interface+:} false; then : - $as_echo_n "(cached) " >&6 - else - lt_cv_nm_interface="BSD nm" - echo "int some_variable = 0;" > conftest.$ac_ext -- (eval echo "\"\$as_me:5436: $ac_compile\"" >&5) -+ (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5) - (eval "$ac_compile" 2>conftest.err) - cat conftest.err >&5 -- (eval echo "\"\$as_me:5439: $NM \\\"conftest.$ac_objext\\\"\"" >&5) -+ (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&5) - (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) - cat conftest.err >&5 -- (eval echo "\"\$as_me:5442: output\"" >&5) -+ (eval echo "\"\$as_me:$LINENO: output\"" >&5) - cat conftest.out >&5 - if $GREP 'External.*some_variable' conftest.out > /dev/null; then - lt_cv_nm_interface="MS dumpbin" - fi - rm -f conftest* - fi --{ $as_echo "$as_me:$LINENO: result: $lt_cv_nm_interface" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5 - $as_echo "$lt_cv_nm_interface" >&6; } - --{ $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5 - $as_echo_n "checking whether ln -s works... " >&6; } - LN_S=$as_ln_s - if test "$LN_S" = "ln -s"; then -- { $as_echo "$as_me:$LINENO: result: yes" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 - $as_echo "yes" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no, using $LN_S" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5 - $as_echo "no, using $LN_S" >&6; } - fi - - # find the maximum length of command line arguments --{ $as_echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5 - $as_echo_n "checking the maximum length of command line arguments... " >&6; } --if test "${lt_cv_sys_max_cmd_len+set}" = set; then -+if ${lt_cv_sys_max_cmd_len+:} false; then : - $as_echo_n "(cached) " >&6 - else - i=0 -@@ -5496,6 +5802,11 @@ else - lt_cv_sys_max_cmd_len=8192; - ;; - -+ mint*) -+ # On MiNT this can take a long time and run out of memory. -+ lt_cv_sys_max_cmd_len=8192; -+ ;; -+ - amigaos*) - # On AmigaOS with pdksh, this test takes hours, literally. - # So we just punt and use a minimum line length of 8192. -@@ -5521,6 +5832,11 @@ else - lt_cv_sys_max_cmd_len=196608 - ;; - -+ os2*) -+ # The test takes a long time on OS/2. -+ lt_cv_sys_max_cmd_len=8192 -+ ;; -+ - osf*) - # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure - # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not -@@ -5547,7 +5863,8 @@ else - ;; - *) - lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` -- if test -n "$lt_cv_sys_max_cmd_len"; then -+ if test -n "$lt_cv_sys_max_cmd_len" && \ -+ test undefined != "$lt_cv_sys_max_cmd_len"; then - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` - else -@@ -5560,8 +5877,8 @@ else - # If test is not a shell built-in, we'll probably end up computing a - # maximum length that is only half of the actual maximum length, but - # we can't tell. -- while { test "X"`$SHELL $0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \ -- = "XX$teststring$teststring"; } >/dev/null 2>&1 && -+ while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ -+ = "X$teststring$teststring"; } >/dev/null 2>&1 && - test $i != 17 # 1/2 MB should be enough - do - i=`expr $i + 1` -@@ -5581,10 +5898,10 @@ else - fi - - if test -n $lt_cv_sys_max_cmd_len ; then -- { $as_echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5 - $as_echo "$lt_cv_sys_max_cmd_len" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: none" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5 - $as_echo "none" >&6; } - fi - max_cmd_len=$lt_cv_sys_max_cmd_len -@@ -5598,27 +5915,27 @@ max_cmd_len=$lt_cv_sys_max_cmd_len - : ${MV="mv -f"} - : ${RM="rm -f"} - --{ $as_echo "$as_me:$LINENO: checking whether the shell understands some XSI constructs" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5 - $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; } - # Try some XSI features - xsi_shell=no - ( _lt_dummy="a/b/c" -- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ -- = c,a/b,, \ -+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ -+ = c,a/b,b/c, \ - && eval 'test $(( 1 + 1 )) -eq 2 \ - && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ - && xsi_shell=yes --{ $as_echo "$as_me:$LINENO: result: $xsi_shell" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5 - $as_echo "$xsi_shell" >&6; } - - --{ $as_echo "$as_me:$LINENO: checking whether the shell understands \"+=\"" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5 - $as_echo_n "checking whether the shell understands \"+=\"... " >&6; } - lt_shell_append=no - ( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \ - >/dev/null 2>&1 \ - && lt_shell_append=yes --{ $as_echo "$as_me:$LINENO: result: $lt_shell_append" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5 - $as_echo "$lt_shell_append" >&6; } - - -@@ -5653,14 +5970,88 @@ esac - - - --{ $as_echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 -+$as_echo_n "checking how to convert $build file names to $host format... " >&6; } -+if ${lt_cv_to_host_file_cmd+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ case $host in -+ *-*-mingw* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 -+ ;; -+ *-*-cygwin* ) -+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 -+ ;; -+ * ) # otherwise, assume *nix -+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 -+ ;; -+ esac -+ ;; -+ *-*-cygwin* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin -+ ;; -+ *-*-cygwin* ) -+ lt_cv_to_host_file_cmd=func_convert_file_noop -+ ;; -+ * ) # otherwise, assume *nix -+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin -+ ;; -+ esac -+ ;; -+ * ) # unhandled hosts (and "normal" native builds) -+ lt_cv_to_host_file_cmd=func_convert_file_noop -+ ;; -+esac -+ -+fi -+ -+to_host_file_cmd=$lt_cv_to_host_file_cmd -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 -+$as_echo "$lt_cv_to_host_file_cmd" >&6; } -+ -+ -+ -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 -+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } -+if ${lt_cv_to_tool_file_cmd+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ #assume ordinary cross tools, or native build. -+lt_cv_to_tool_file_cmd=func_convert_file_noop -+case $host in -+ *-*-mingw* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 -+ ;; -+ esac -+ ;; -+esac -+ -+fi -+ -+to_tool_file_cmd=$lt_cv_to_tool_file_cmd -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 -+$as_echo "$lt_cv_to_tool_file_cmd" >&6; } -+ -+ -+ -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 - $as_echo_n "checking for $LD option to reload object files... " >&6; } --if test "${lt_cv_ld_reload_flag+set}" = set; then -+if ${lt_cv_ld_reload_flag+:} false; then : - $as_echo_n "(cached) " >&6 - else - lt_cv_ld_reload_flag='-r' - fi --{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5 - $as_echo "$lt_cv_ld_reload_flag" >&6; } - reload_flag=$lt_cv_ld_reload_flag - case $reload_flag in -@@ -5669,6 +6060,11 @@ case $reload_flag in - esac - reload_cmds='$LD$reload_flag -o $output$reload_objs' - case $host_os in -+ cygwin* | mingw* | pw32* | cegcc*) -+ if test "$GCC" != yes; then -+ reload_cmds=false -+ fi -+ ;; - darwin*) - if test "$GCC" = yes; then - reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' -@@ -5689,9 +6085,9 @@ esac - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. - set dummy ${ac_tool_prefix}objdump; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_OBJDUMP+set}" = set; then -+if ${ac_cv_prog_OBJDUMP+:} false; then : - $as_echo_n "(cached) " >&6 - else - if test -n "$OBJDUMP"; then -@@ -5702,24 +6098,24 @@ 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 -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done - IFS=$as_save_IFS - - fi - fi - OBJDUMP=$ac_cv_prog_OBJDUMP - if test -n "$OBJDUMP"; then -- { $as_echo "$as_me:$LINENO: result: $OBJDUMP" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5 - $as_echo "$OBJDUMP" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } - fi - -@@ -5729,9 +6125,9 @@ if test -z "$ac_cv_prog_OBJDUMP"; then - ac_ct_OBJDUMP=$OBJDUMP - # Extract the first word of "objdump", so it can be a program name with args. - set dummy objdump; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then -+if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then : - $as_echo_n "(cached) " >&6 - else - if test -n "$ac_ct_OBJDUMP"; then -@@ -5742,24 +6138,24 @@ 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 -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_OBJDUMP="objdump" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done - IFS=$as_save_IFS - - fi - fi - ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP - if test -n "$ac_ct_OBJDUMP"; then -- { $as_echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5 - $as_echo "$ac_ct_OBJDUMP" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } - fi - -@@ -5768,7 +6164,7 @@ fi - else - case $cross_compiling:$ac_tool_warned in - yes:) --{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 - $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} - ac_tool_warned=yes ;; - esac -@@ -5788,9 +6184,9 @@ test -z "$OBJDUMP" && OBJDUMP=objdump - - - --{ $as_echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5 - $as_echo_n "checking how to recognize dependent libraries... " >&6; } --if test "${lt_cv_deplibs_check_method+set}" = set; then -+if ${lt_cv_deplibs_check_method+:} false; then : - $as_echo_n "(cached) " >&6 - else - lt_cv_file_magic_cmd='$MAGIC_CMD' -@@ -5832,16 +6228,18 @@ mingw* | pw32*) - # Base MSYS/MinGW do not provide the 'file' command needed by - # func_win32_libid shell function, so use a weaker test based on 'objdump', - # unless we find 'file', for example because we are cross-compiling. -- if ( file / ) >/dev/null 2>&1; then -+ # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin. -+ if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' - lt_cv_file_magic_cmd='func_win32_libid' - else -- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' -+ # Keep this pattern in sync with the one in func_win32_libid. -+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' - lt_cv_file_magic_cmd='$OBJDUMP -f' - fi - ;; - --cegcc) -+cegcc*) - # use the weaker test based on 'objdump'. See mingw*. - lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?' - lt_cv_file_magic_cmd='$OBJDUMP -f' -@@ -5867,7 +6265,7 @@ freebsd* | dragonfly*) - fi - ;; - --gnu*) -+haiku*) - lt_cv_deplibs_check_method=pass_all - ;; - -@@ -5879,11 +6277,11 @@ hpux10.20* | hpux11*) - lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so - ;; - hppa*64*) -- lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]' -+ lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]' - lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl - ;; - *) -- lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library' -+ lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9]\.[0-9]) shared library' - lt_cv_file_magic_test_file=/usr/lib/libc.sl - ;; - esac -@@ -5904,12 +6302,12 @@ irix5* | irix6* | nonstopux*) - lt_cv_deplibs_check_method=pass_all - ;; - --# This must be Linux ELF. --linux* | k*bsd*-gnu) -+# This must be glibc/ELF. -+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) - lt_cv_deplibs_check_method=pass_all - ;; - --netbsd*) -+netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then - lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' - else -@@ -5984,8 +6382,23 @@ tpf*) - esac - - fi --{ $as_echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 - $as_echo "$lt_cv_deplibs_check_method" >&6; } -+ -+file_magic_glob= -+want_nocaseglob=no -+if test "$build" = "$host"; then -+ case $host_os in -+ mingw* | pw32*) -+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then -+ want_nocaseglob=yes -+ else -+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` -+ fi -+ ;; -+ esac -+fi -+ - file_magic_cmd=$lt_cv_file_magic_cmd - deplibs_check_method=$lt_cv_deplibs_check_method - test -z "$deplibs_check_method" && deplibs_check_method=unknown -@@ -6001,104 +6414,151 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown - - - -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - if test -n "$ac_tool_prefix"; then -- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. --set dummy ${ac_tool_prefix}ar; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. -+set dummy ${ac_tool_prefix}dlltool; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_AR+set}" = set; then -+if ${ac_cv_prog_DLLTOOL+:} false; then : - $as_echo_n "(cached) " >&6 - else -- if test -n "$AR"; then -- ac_cv_prog_AR="$AR" # Let the user override the test. -+ if test -n "$DLLTOOL"; then -+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. - else - 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_prog_AR="${ac_tool_prefix}ar" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done - IFS=$as_save_IFS - - fi - fi --AR=$ac_cv_prog_AR --if test -n "$AR"; then -- { $as_echo "$as_me:$LINENO: result: $AR" >&5 --$as_echo "$AR" >&6; } -+DLLTOOL=$ac_cv_prog_DLLTOOL -+if test -n "$DLLTOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 -+$as_echo "$DLLTOOL" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } - fi - - - fi --if test -z "$ac_cv_prog_AR"; then -- ac_ct_AR=$AR -- # Extract the first word of "ar", so it can be a program name with args. --set dummy ar; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+if test -z "$ac_cv_prog_DLLTOOL"; then -+ ac_ct_DLLTOOL=$DLLTOOL -+ # Extract the first word of "dlltool", so it can be a program name with args. -+set dummy dlltool; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_ac_ct_AR+set}" = set; then -+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : - $as_echo_n "(cached) " >&6 - else -- if test -n "$ac_ct_AR"; then -- ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test. -+ if test -n "$ac_ct_DLLTOOL"; then -+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. - else - 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_prog_ac_ct_AR="ar" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_ac_ct_DLLTOOL="dlltool" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done - IFS=$as_save_IFS - - fi - fi --ac_ct_AR=$ac_cv_prog_ac_ct_AR --if test -n "$ac_ct_AR"; then -- { $as_echo "$as_me:$LINENO: result: $ac_ct_AR" >&5 --$as_echo "$ac_ct_AR" >&6; } -+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL -+if test -n "$ac_ct_DLLTOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 -+$as_echo "$ac_ct_DLLTOOL" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } - fi - -- if test "x$ac_ct_AR" = x; then -- AR="false" -+ if test "x$ac_ct_DLLTOOL" = x; then -+ DLLTOOL="false" - else - case $cross_compiling:$ac_tool_warned in - yes:) --{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 - $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} - ac_tool_warned=yes ;; - esac -- AR=$ac_ct_AR -+ DLLTOOL=$ac_ct_DLLTOOL - fi - else -- AR="$ac_cv_prog_AR" -+ DLLTOOL="$ac_cv_prog_DLLTOOL" - fi - --test -z "$AR" && AR=ar --test -z "$AR_FLAGS" && AR_FLAGS=cru -+test -z "$DLLTOOL" && DLLTOOL=dlltool -+ -+ -+ -+ -+ -+ - - - - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 -+$as_echo_n "checking how to associate runtime and link libraries... " >&6; } -+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_sharedlib_from_linklib_cmd='unknown' -+ -+case $host_os in -+cygwin* | mingw* | pw32* | cegcc*) -+ # two different shell functions defined in ltmain.sh -+ # decide which to use based on capabilities of $DLLTOOL -+ case `$DLLTOOL --help 2>&1` in -+ *--identify-strict*) -+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib -+ ;; -+ *) -+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback -+ ;; -+ esac -+ ;; -+*) -+ # fallback: assume linklib IS sharedlib -+ lt_cv_sharedlib_from_linklib_cmd="$ECHO" -+ ;; -+esac -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 -+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } -+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd -+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO -+ - - - -@@ -6107,138 +6567,309 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru - - - if test -n "$ac_tool_prefix"; then -- # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. --set dummy ${ac_tool_prefix}strip; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+ for ac_prog in ar -+ do -+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -+set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_STRIP+set}" = set; then -+if ${ac_cv_prog_AR+:} false; then : - $as_echo_n "(cached) " >&6 - else -- if test -n "$STRIP"; then -- ac_cv_prog_STRIP="$STRIP" # Let the user override the test. -+ if test -n "$AR"; then -+ ac_cv_prog_AR="$AR" # Let the user override the test. - else - 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_prog_STRIP="${ac_tool_prefix}strip" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done - IFS=$as_save_IFS - - fi - fi --STRIP=$ac_cv_prog_STRIP --if test -n "$STRIP"; then -- { $as_echo "$as_me:$LINENO: result: $STRIP" >&5 --$as_echo "$STRIP" >&6; } -+AR=$ac_cv_prog_AR -+if test -n "$AR"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5 -+$as_echo "$AR" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } - fi - - -+ test -n "$AR" && break -+ done - fi --if test -z "$ac_cv_prog_STRIP"; then -- ac_ct_STRIP=$STRIP -- # Extract the first word of "strip", so it can be a program name with args. --set dummy strip; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+if test -z "$AR"; then -+ ac_ct_AR=$AR -+ for ac_prog in ar -+do -+ # Extract the first word of "$ac_prog", so it can be a program name with args. -+set dummy $ac_prog; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then -+if ${ac_cv_prog_ac_ct_AR+:} false; then : - $as_echo_n "(cached) " >&6 - else -- if test -n "$ac_ct_STRIP"; then -- ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. -+ if test -n "$ac_ct_AR"; then -+ ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test. - else - 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_prog_ac_ct_STRIP="strip" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_ac_ct_AR="$ac_prog" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done - IFS=$as_save_IFS - - fi - fi --ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP --if test -n "$ac_ct_STRIP"; then -- { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 --$as_echo "$ac_ct_STRIP" >&6; } -+ac_ct_AR=$ac_cv_prog_ac_ct_AR -+if test -n "$ac_ct_AR"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5 -+$as_echo "$ac_ct_AR" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } - fi - -- if test "x$ac_ct_STRIP" = x; then -- STRIP=":" -+ -+ test -n "$ac_ct_AR" && break -+done -+ -+ if test "x$ac_ct_AR" = x; then -+ AR="false" - else - case $cross_compiling:$ac_tool_warned in - yes:) --{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 - $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} - ac_tool_warned=yes ;; - esac -- STRIP=$ac_ct_STRIP -+ AR=$ac_ct_AR - fi --else -- STRIP="$ac_cv_prog_STRIP" - fi - --test -z "$STRIP" && STRIP=: -+: ${AR=ar} -+: ${AR_FLAGS=cru} - - - - - - --if test -n "$ac_tool_prefix"; then -- # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. --set dummy ${ac_tool_prefix}ranlib; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_RANLIB+set}" = set; then -+ -+ -+ -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 -+$as_echo_n "checking for archiver @FILE support... " >&6; } -+if ${lt_cv_ar_at_file+:} false; then : - $as_echo_n "(cached) " >&6 - else -- if test -n "$RANLIB"; then -- ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. --else --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_prog_RANLIB="${ac_tool_prefix}ranlib" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ lt_cv_ar_at_file=no -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ echo conftest.$ac_objext > conftest.lst -+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' -+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 -+ (eval $lt_ar_try) 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+ if test "$ac_status" -eq 0; then -+ # Ensure the archiver fails upon bogus file names. -+ rm -f conftest.$ac_objext libconftest.a -+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 -+ (eval $lt_ar_try) 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+ if test "$ac_status" -ne 0; then -+ lt_cv_ar_at_file=@ -+ fi -+ fi -+ rm -f conftest.* libconftest.a -+ -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 -+$as_echo "$lt_cv_ar_at_file" >&6; } -+ -+if test "x$lt_cv_ar_at_file" = xno; then -+ archiver_list_spec= -+else -+ archiver_list_spec=$lt_cv_ar_at_file -+fi -+ -+ -+ -+ -+ -+ -+ -+if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. -+set dummy ${ac_tool_prefix}strip; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_STRIP+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$STRIP"; then -+ ac_cv_prog_STRIP="$STRIP" # Let the user override the test. -+else -+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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_STRIP="${ac_tool_prefix}strip" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+STRIP=$ac_cv_prog_STRIP -+if test -n "$STRIP"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 -+$as_echo "$STRIP" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ -+fi -+if test -z "$ac_cv_prog_STRIP"; then -+ ac_ct_STRIP=$STRIP -+ # Extract the first word of "strip", so it can be a program name with args. -+set dummy strip; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_ac_ct_STRIP+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$ac_ct_STRIP"; then -+ ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. -+else -+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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_ac_ct_STRIP="strip" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP -+if test -n "$ac_ct_STRIP"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 -+$as_echo "$ac_ct_STRIP" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ if test "x$ac_ct_STRIP" = x; then -+ STRIP=":" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ STRIP=$ac_ct_STRIP -+ fi -+else -+ STRIP="$ac_cv_prog_STRIP" -+fi -+ -+test -z "$STRIP" && STRIP=: -+ -+ -+ -+ -+ -+ -+if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. -+set dummy ${ac_tool_prefix}ranlib; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_RANLIB+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$RANLIB"; then -+ ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. -+else -+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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi - done -+ done - IFS=$as_save_IFS - - fi - fi - RANLIB=$ac_cv_prog_RANLIB - if test -n "$RANLIB"; then -- { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5 - $as_echo "$RANLIB" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } - fi - -@@ -6248,9 +6879,9 @@ if test -z "$ac_cv_prog_RANLIB"; then - ac_ct_RANLIB=$RANLIB - # Extract the first word of "ranlib", so it can be a program name with args. - set dummy ranlib; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then -+if ${ac_cv_prog_ac_ct_RANLIB+:} false; then : - $as_echo_n "(cached) " >&6 - else - if test -n "$ac_ct_RANLIB"; then -@@ -6261,24 +6892,24 @@ 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 -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_RANLIB="ranlib" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done - IFS=$as_save_IFS - - fi - fi - ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB - if test -n "$ac_ct_RANLIB"; then -- { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5 - $as_echo "$ac_ct_RANLIB" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } - fi - -@@ -6287,7 +6918,7 @@ fi - else - case $cross_compiling:$ac_tool_warned in - yes:) --{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 - $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} - ac_tool_warned=yes ;; - esac -@@ -6312,15 +6943,27 @@ old_postuninstall_cmds= - if test -n "$RANLIB"; then - case $host_os in - openbsd*) -- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" -+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" - ;; - *) -- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" -+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" - ;; - esac -- old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" -+ old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" - fi - -+case $host_os in -+ darwin*) -+ lock_old_archive_extraction=yes ;; -+ *) -+ lock_old_archive_extraction=no ;; -+esac -+ -+ -+ -+ -+ -+ - - - -@@ -6365,9 +7008,9 @@ compiler=$CC - - - # Check for command to grab the raw symbol name followed by C symbol from nm. --{ $as_echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5 - $as_echo_n "checking command to parse $NM output from $compiler object... " >&6; } --if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then -+if ${lt_cv_sys_global_symbol_pipe+:} false; then : - $as_echo_n "(cached) " >&6 - else - -@@ -6428,8 +7071,8 @@ esac - lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" - - # Transform an extracted symbol line into symbol name and symbol address --lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" --lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" -+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" -+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" - - # Handle CRLF in mingw tool chain - opt_cr= -@@ -6453,6 +7096,7 @@ for ac_symprfx in "" "_"; do - # which start with @ or ?. - lt_cv_sys_global_symbol_pipe="$AWK '"\ - " {last_section=section; section=\$ 3};"\ -+" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ - " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ - " \$ 0!~/External *\|/{next};"\ - " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ -@@ -6465,6 +7109,7 @@ for ac_symprfx in "" "_"; do - else - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" - fi -+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" - - # Check to see that the pipe works correctly. - pipe_works=no -@@ -6483,18 +7128,18 @@ void nm_test_func(void){} - int main(){nm_test_var='a';nm_test_func();return(0);} - _LT_EOF - -- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; then -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; then - # Now try to grab the symbols. - nlist=conftest.nm -- if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5 -- (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5 -+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5 -+ (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5 - ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && test -s "$nlist"; then -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } && test -s "$nlist"; then - # Try sorting and uniquifying the output. - if sort "$nlist" | uniq > "$nlist"T; then - mv -f "$nlist"T "$nlist" -@@ -6506,6 +7151,18 @@ _LT_EOF - if $GREP ' nm_test_var$' "$nlist" >/dev/null; then - if $GREP ' nm_test_func$' "$nlist" >/dev/null; then - cat <<_LT_EOF > conftest.$ac_ext -+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -+/* DATA imports from DLLs on WIN32 con't be const, because runtime -+ relocations are performed -- see ld's documentation on pseudo-relocs. */ -+# define LT_DLSYM_CONST -+#elif defined(__osf__) -+/* This system does not cope well with relocations in const data. */ -+# define LT_DLSYM_CONST -+#else -+# define LT_DLSYM_CONST const -+#endif -+ - #ifdef __cplusplus - extern "C" { - #endif -@@ -6517,7 +7174,7 @@ _LT_EOF - cat <<_LT_EOF >> conftest.$ac_ext - - /* The mapping between symbol names and symbols. */ --const struct { -+LT_DLSYM_CONST struct { - const char *name; - void *address; - } -@@ -6543,19 +7200,19 @@ static const void *lt_preloaded_setup() { - _LT_EOF - # Now try linking the two files. - mv conftest.$ac_objext conftstm.$ac_objext -- lt_save_LIBS="$LIBS" -- lt_save_CFLAGS="$CFLAGS" -+ lt_globsym_save_LIBS=$LIBS -+ lt_globsym_save_CFLAGS=$CFLAGS - LIBS="conftstm.$ac_objext" - CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" -- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && test -s conftest${ac_exeext}; then -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } && test -s conftest${ac_exeext}; then - pipe_works=yes - fi -- LIBS="$lt_save_LIBS" -- CFLAGS="$lt_save_CFLAGS" -+ LIBS=$lt_globsym_save_LIBS -+ CFLAGS=$lt_globsym_save_CFLAGS - else - echo "cannot find nm_test_func in $nlist" >&5 - fi -@@ -6585,13 +7242,31 @@ if test -z "$lt_cv_sys_global_symbol_pipe"; then - lt_cv_sys_global_symbol_to_cdecl= - fi - if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then -- { $as_echo "$as_me:$LINENO: result: failed" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5 - $as_echo "failed" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: ok" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 - $as_echo "ok" >&6; } - fi - -+# Response file support. -+if test "$lt_cv_nm_interface" = "MS dumpbin"; then -+ nm_file_list_spec='@' -+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then -+ nm_file_list_spec='@' -+fi -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - - - -@@ -6607,15 +7282,45 @@ fi - - - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 -+$as_echo_n "checking for sysroot... " >&6; } - -+# Check whether --with-sysroot was given. -+if test "${with_sysroot+set}" = set; then : -+ withval=$with_sysroot; -+else -+ with_sysroot=no -+fi -+ -+ -+lt_sysroot= -+case ${with_sysroot} in #( -+ yes) -+ if test "$GCC" = yes; then -+ lt_sysroot=`$CC --print-sysroot 2>/dev/null` -+ fi -+ ;; #( -+ /*) -+ lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` -+ ;; #( -+ no|'') -+ ;; #( -+ *) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5 -+$as_echo "${with_sysroot}" >&6; } -+ as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 -+ ;; -+esac - -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 -+$as_echo "${lt_sysroot:-no}" >&6; } - - - - - - # Check whether --enable-libtool-lock was given. --if test "${enable_libtool_lock+set}" = set; then -+if test "${enable_libtool_lock+set}" = set; then : - enableval=$enable_libtool_lock; - fi - -@@ -6627,11 +7332,11 @@ case $host in - ia64-*-hpux*) - # Find out which ABI we are using. - echo 'int i;' > conftest.$ac_ext -- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; then -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; then - case `/usr/bin/file conftest.$ac_objext` in - *ELF-32*) - HPUX_IA64_MODE="32" -@@ -6645,12 +7350,12 @@ ia64-*-hpux*) - ;; - *-*-irix6*) - # Find out which ABI we are using. -- echo '#line 6648 "configure"' > conftest.$ac_ext -- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -+ echo '#line '$LINENO' "configure"' > conftest.$ac_ext -+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; then -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; then - if test "$lt_cv_prog_gnu_ld" = yes; then - case `/usr/bin/file conftest.$ac_objext` in - *32-bit*) -@@ -6684,11 +7389,11 @@ x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ - s390*-*linux*|s390*-*tpf*|sparc*-*linux*) - # Find out which ABI we are using. - echo 'int i;' > conftest.$ac_ext -- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; then -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; then - case `/usr/bin/file conftest.o` in - *32-bit*) - case $host in -@@ -6696,7 +7401,14 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) - LD="${LD-ld} -m elf_i386_fbsd" - ;; - x86_64-*linux*) -- LD="${LD-ld} -m elf_i386" -+ case `/usr/bin/file conftest.o` in -+ *x86-64*) -+ LD="${LD-ld} -m elf32_x86_64" -+ ;; -+ *) -+ LD="${LD-ld} -m elf_i386" -+ ;; -+ esac - ;; - ppc64-*linux*|powerpc64-*linux*) - LD="${LD-ld} -m elf32ppclinux" -@@ -6737,9 +7449,9 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) - # On SCO OpenServer 5, we need -belf to get full-featured binaries. - SAVE_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -belf" -- { $as_echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5 - $as_echo_n "checking whether the C compiler needs -belf... " >&6; } --if test "${lt_cv_cc_needs_belf+set}" = set; then -+if ${lt_cv_cc_needs_belf+:} false; then : - $as_echo_n "(cached) " >&6 - else - ac_ext=c -@@ -6748,11 +7460,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' - ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' - ac_compiler_gnu=$ac_cv_c_compiler_gnu - -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -6763,38 +7471,13 @@ main () - return 0; - } - _ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (ac_try="$ac_link" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_link") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -+if ac_fn_c_try_link "$LINENO"; then : - lt_cv_cc_needs_belf=yes - else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- lt_cv_cc_needs_belf=no -+ lt_cv_cc_needs_belf=no - fi -- --rm -rf conftest.dSYM --rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -- conftest$ac_exeext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext - ac_ext=c - ac_cpp='$CPP $CPPFLAGS' - ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -@@ -6802,25 +7485,38 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ - ac_compiler_gnu=$ac_cv_c_compiler_gnu - - fi --{ $as_echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5 - $as_echo "$lt_cv_cc_needs_belf" >&6; } - if test x"$lt_cv_cc_needs_belf" != x"yes"; then - # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf - CFLAGS="$SAVE_CFLAGS" - fi - ;; --sparc*-*solaris*) -+*-*solaris*) - # Find out which ABI we are using. - echo 'int i;' > conftest.$ac_ext -- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; then -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; then - case `/usr/bin/file conftest.o` in - *64-bit*) - case $lt_cv_prog_gnu_ld in -- yes*) LD="${LD-ld} -m elf64_sparc" ;; -+ yes*) -+ case $host in -+ i?86-*-solaris*) -+ LD="${LD-ld} -m elf_x86_64" -+ ;; -+ sparc*-*-solaris*) -+ LD="${LD-ld} -m elf64_sparc" -+ ;; -+ esac -+ # GNU ld 2.21 introduced _sol2 emulations. Use them if available. -+ if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then -+ LD="${LD-ld}_sol2" -+ fi -+ ;; - *) - if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then - LD="${LD-ld} -64" -@@ -6836,147 +7532,264 @@ esac - - need_locks="$enable_libtool_lock" - -- -- case $host_os in -- rhapsody* | darwin*) -- if test -n "$ac_tool_prefix"; then -- # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args. --set dummy ${ac_tool_prefix}dsymutil; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. -+set dummy ${ac_tool_prefix}mt; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_DSYMUTIL+set}" = set; then -+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : - $as_echo_n "(cached) " >&6 - else -- if test -n "$DSYMUTIL"; then -- ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test. -+ if test -n "$MANIFEST_TOOL"; then -+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. - else - 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_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done - IFS=$as_save_IFS - - fi - fi --DSYMUTIL=$ac_cv_prog_DSYMUTIL --if test -n "$DSYMUTIL"; then -- { $as_echo "$as_me:$LINENO: result: $DSYMUTIL" >&5 --$as_echo "$DSYMUTIL" >&6; } -+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL -+if test -n "$MANIFEST_TOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 -+$as_echo "$MANIFEST_TOOL" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } - fi - - - fi --if test -z "$ac_cv_prog_DSYMUTIL"; then -- ac_ct_DSYMUTIL=$DSYMUTIL -- # Extract the first word of "dsymutil", so it can be a program name with args. --set dummy dsymutil; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then -+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL -+ # Extract the first word of "mt", so it can be a program name with args. -+set dummy mt; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then -+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : - $as_echo_n "(cached) " >&6 - else -- if test -n "$ac_ct_DSYMUTIL"; then -- ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test. -+ if test -n "$ac_ct_MANIFEST_TOOL"; then -+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. - else - 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_prog_ac_ct_DSYMUTIL="dsymutil" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done - IFS=$as_save_IFS - - fi - fi --ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL --if test -n "$ac_ct_DSYMUTIL"; then -- { $as_echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5 --$as_echo "$ac_ct_DSYMUTIL" >&6; } -+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL -+if test -n "$ac_ct_MANIFEST_TOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 -+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } - fi - -- if test "x$ac_ct_DSYMUTIL" = x; then -- DSYMUTIL=":" -+ if test "x$ac_ct_MANIFEST_TOOL" = x; then -+ MANIFEST_TOOL=":" - else - case $cross_compiling:$ac_tool_warned in - yes:) --{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 - $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} - ac_tool_warned=yes ;; - esac -- DSYMUTIL=$ac_ct_DSYMUTIL -+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL - fi - else -- DSYMUTIL="$ac_cv_prog_DSYMUTIL" -+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" -+fi -+ -+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 -+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } -+if ${lt_cv_path_mainfest_tool+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_path_mainfest_tool=no -+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 -+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out -+ cat conftest.err >&5 -+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then -+ lt_cv_path_mainfest_tool=yes -+ fi -+ rm -f conftest* - fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 -+$as_echo "$lt_cv_path_mainfest_tool" >&6; } -+if test "x$lt_cv_path_mainfest_tool" != xyes; then -+ MANIFEST_TOOL=: -+fi -+ -+ -+ - -+ -+ -+ case $host_os in -+ rhapsody* | darwin*) - if test -n "$ac_tool_prefix"; then -- # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args. --set dummy ${ac_tool_prefix}nmedit; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+ # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args. -+set dummy ${ac_tool_prefix}dsymutil; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_NMEDIT+set}" = set; then -+if ${ac_cv_prog_DSYMUTIL+:} false; then : - $as_echo_n "(cached) " >&6 - else -- if test -n "$NMEDIT"; then -- ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test. -+ if test -n "$DSYMUTIL"; then -+ ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test. - else - 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_prog_NMEDIT="${ac_tool_prefix}nmedit" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done - IFS=$as_save_IFS - - fi - fi --NMEDIT=$ac_cv_prog_NMEDIT --if test -n "$NMEDIT"; then -- { $as_echo "$as_me:$LINENO: result: $NMEDIT" >&5 --$as_echo "$NMEDIT" >&6; } -+DSYMUTIL=$ac_cv_prog_DSYMUTIL -+if test -n "$DSYMUTIL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5 -+$as_echo "$DSYMUTIL" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } - fi - - - fi --if test -z "$ac_cv_prog_NMEDIT"; then -+if test -z "$ac_cv_prog_DSYMUTIL"; then -+ ac_ct_DSYMUTIL=$DSYMUTIL -+ # Extract the first word of "dsymutil", so it can be a program name with args. -+set dummy dsymutil; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_ac_ct_DSYMUTIL+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$ac_ct_DSYMUTIL"; then -+ ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test. -+else -+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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL -+if test -n "$ac_ct_DSYMUTIL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5 -+$as_echo "$ac_ct_DSYMUTIL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ if test "x$ac_ct_DSYMUTIL" = x; then -+ DSYMUTIL=":" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ DSYMUTIL=$ac_ct_DSYMUTIL -+ fi -+else -+ DSYMUTIL="$ac_cv_prog_DSYMUTIL" -+fi -+ -+ if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args. -+set dummy ${ac_tool_prefix}nmedit; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_NMEDIT+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$NMEDIT"; then -+ ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test. -+else -+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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+NMEDIT=$ac_cv_prog_NMEDIT -+if test -n "$NMEDIT"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5 -+$as_echo "$NMEDIT" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ -+fi -+if test -z "$ac_cv_prog_NMEDIT"; then - ac_ct_NMEDIT=$NMEDIT - # Extract the first word of "nmedit", so it can be a program name with args. - set dummy nmedit; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then -+if ${ac_cv_prog_ac_ct_NMEDIT+:} false; then : - $as_echo_n "(cached) " >&6 - else - if test -n "$ac_ct_NMEDIT"; then -@@ -6987,24 +7800,24 @@ 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 -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_NMEDIT="nmedit" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done - IFS=$as_save_IFS - - fi - fi - ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT - if test -n "$ac_ct_NMEDIT"; then -- { $as_echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5 - $as_echo "$ac_ct_NMEDIT" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } - fi - -@@ -7013,7 +7826,7 @@ fi - else - case $cross_compiling:$ac_tool_warned in - yes:) --{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 - $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} - ac_tool_warned=yes ;; - esac -@@ -7026,9 +7839,9 @@ fi - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args. - set dummy ${ac_tool_prefix}lipo; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_LIPO+set}" = set; then -+if ${ac_cv_prog_LIPO+:} false; then : - $as_echo_n "(cached) " >&6 - else - if test -n "$LIPO"; then -@@ -7039,24 +7852,24 @@ 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 -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_LIPO="${ac_tool_prefix}lipo" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done - IFS=$as_save_IFS - - fi - fi - LIPO=$ac_cv_prog_LIPO - if test -n "$LIPO"; then -- { $as_echo "$as_me:$LINENO: result: $LIPO" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5 - $as_echo "$LIPO" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } - fi - -@@ -7066,9 +7879,9 @@ if test -z "$ac_cv_prog_LIPO"; then - ac_ct_LIPO=$LIPO - # Extract the first word of "lipo", so it can be a program name with args. - set dummy lipo; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then -+if ${ac_cv_prog_ac_ct_LIPO+:} false; then : - $as_echo_n "(cached) " >&6 - else - if test -n "$ac_ct_LIPO"; then -@@ -7079,24 +7892,24 @@ 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 -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_LIPO="lipo" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done - IFS=$as_save_IFS - - fi - fi - ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO - if test -n "$ac_ct_LIPO"; then -- { $as_echo "$as_me:$LINENO: result: $ac_ct_LIPO" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5 - $as_echo "$ac_ct_LIPO" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } - fi - -@@ -7105,7 +7918,7 @@ fi - else - case $cross_compiling:$ac_tool_warned in - yes:) --{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 - $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} - ac_tool_warned=yes ;; - esac -@@ -7118,9 +7931,9 @@ fi - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args. - set dummy ${ac_tool_prefix}otool; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_OTOOL+set}" = set; then -+if ${ac_cv_prog_OTOOL+:} false; then : - $as_echo_n "(cached) " >&6 - else - if test -n "$OTOOL"; then -@@ -7131,24 +7944,24 @@ 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 -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_OTOOL="${ac_tool_prefix}otool" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done - IFS=$as_save_IFS - - fi - fi - OTOOL=$ac_cv_prog_OTOOL - if test -n "$OTOOL"; then -- { $as_echo "$as_me:$LINENO: result: $OTOOL" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5 - $as_echo "$OTOOL" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } - fi - -@@ -7158,9 +7971,9 @@ if test -z "$ac_cv_prog_OTOOL"; then - ac_ct_OTOOL=$OTOOL - # Extract the first word of "otool", so it can be a program name with args. - set dummy otool; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then -+if ${ac_cv_prog_ac_ct_OTOOL+:} false; then : - $as_echo_n "(cached) " >&6 - else - if test -n "$ac_ct_OTOOL"; then -@@ -7171,24 +7984,24 @@ 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 -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_OTOOL="otool" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done - IFS=$as_save_IFS - - fi - fi - ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL - if test -n "$ac_ct_OTOOL"; then -- { $as_echo "$as_me:$LINENO: result: $ac_ct_OTOOL" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5 - $as_echo "$ac_ct_OTOOL" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } - fi - -@@ -7197,7 +8010,7 @@ fi - else - case $cross_compiling:$ac_tool_warned in - yes:) --{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 - $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} - ac_tool_warned=yes ;; - esac -@@ -7210,9 +8023,9 @@ fi - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args. - set dummy ${ac_tool_prefix}otool64; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_OTOOL64+set}" = set; then -+if ${ac_cv_prog_OTOOL64+:} false; then : - $as_echo_n "(cached) " >&6 - else - if test -n "$OTOOL64"; then -@@ -7223,24 +8036,24 @@ 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 -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done - IFS=$as_save_IFS - - fi - fi - OTOOL64=$ac_cv_prog_OTOOL64 - if test -n "$OTOOL64"; then -- { $as_echo "$as_me:$LINENO: result: $OTOOL64" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5 - $as_echo "$OTOOL64" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } - fi - -@@ -7250,9 +8063,9 @@ if test -z "$ac_cv_prog_OTOOL64"; then - ac_ct_OTOOL64=$OTOOL64 - # Extract the first word of "otool64", so it can be a program name with args. - set dummy otool64; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then -+if ${ac_cv_prog_ac_ct_OTOOL64+:} false; then : - $as_echo_n "(cached) " >&6 - else - if test -n "$ac_ct_OTOOL64"; then -@@ -7263,24 +8076,24 @@ 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 -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_OTOOL64="otool64" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done - IFS=$as_save_IFS - - fi - fi - ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64 - if test -n "$ac_ct_OTOOL64"; then -- { $as_echo "$as_me:$LINENO: result: $ac_ct_OTOOL64" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5 - $as_echo "$ac_ct_OTOOL64" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } - fi - -@@ -7289,7 +8102,7 @@ fi - else - case $cross_compiling:$ac_tool_warned in - yes:) --{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 - $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} - ac_tool_warned=yes ;; - esac -@@ -7325,9 +8138,9 @@ fi - - - -- { $as_echo "$as_me:$LINENO: checking for -single_module linker flag" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5 - $as_echo_n "checking for -single_module linker flag... " >&6; } --if test "${lt_cv_apple_cc_single_mod+set}" = set; then -+if ${lt_cv_apple_cc_single_mod+:} false; then : - $as_echo_n "(cached) " >&6 - else - lt_cv_apple_cc_single_mod=no -@@ -7343,7 +8156,13 @@ else - $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ - -dynamiclib -Wl,-single_module conftest.c 2>conftest.err - _lt_result=$? -- if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then -+ # If there is a non-empty error log, and "single_module" -+ # appears in it, assume the flag caused a linker warning -+ if test -s conftest.err && $GREP single_module conftest.err; then -+ cat conftest.err >&5 -+ # Otherwise, if the output was created with a 0 exit code from -+ # the compiler, it worked. -+ elif test -f libconftest.dylib && test $_lt_result -eq 0; then - lt_cv_apple_cc_single_mod=yes - else - cat conftest.err >&5 -@@ -7352,22 +8171,19 @@ else - rm -f conftest.* - fi - fi --{ $as_echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5 - $as_echo "$lt_cv_apple_cc_single_mod" >&6; } -- { $as_echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5 -+ -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5 - $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; } --if test "${lt_cv_ld_exported_symbols_list+set}" = set; then -+if ${lt_cv_ld_exported_symbols_list+:} false; then : - $as_echo_n "(cached) " >&6 - else - lt_cv_ld_exported_symbols_list=no - save_LDFLAGS=$LDFLAGS - echo "_main" > conftest.sym - LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -7378,43 +8194,53 @@ main () - return 0; - } - _ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (ac_try="$ac_link" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_link") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -+if ac_fn_c_try_link "$LINENO"; then : - lt_cv_ld_exported_symbols_list=yes - else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- lt_cv_ld_exported_symbols_list=no -+ lt_cv_ld_exported_symbols_list=no - fi -- --rm -rf conftest.dSYM --rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -- conftest$ac_exeext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext - LDFLAGS="$save_LDFLAGS" - - fi --{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 - $as_echo "$lt_cv_ld_exported_symbols_list" >&6; } -+ -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5 -+$as_echo_n "checking for -force_load linker flag... " >&6; } -+if ${lt_cv_ld_force_load+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_ld_force_load=no -+ cat > conftest.c << _LT_EOF -+int forced_loaded() { return 2;} -+_LT_EOF -+ echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5 -+ $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 -+ echo "$AR cru libconftest.a conftest.o" >&5 -+ $AR cru libconftest.a conftest.o 2>&5 -+ echo "$RANLIB libconftest.a" >&5 -+ $RANLIB libconftest.a 2>&5 -+ cat > conftest.c << _LT_EOF -+int main() { return 0;} -+_LT_EOF -+ echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5 -+ $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err -+ _lt_result=$? -+ if test -s conftest.err && $GREP force_load conftest.err; then -+ cat conftest.err >&5 -+ elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then -+ lt_cv_ld_force_load=yes -+ else -+ cat conftest.err >&5 -+ fi -+ rm -f conftest.err libconftest.a conftest conftest.c -+ rm -rf conftest.dSYM -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5 -+$as_echo "$lt_cv_ld_force_load" >&6; } - case $host_os in - rhapsody* | darwin1.[012]) - _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; -@@ -7442,7 +8268,7 @@ $as_echo "$lt_cv_ld_exported_symbols_list" >&6; } - else - _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' - fi -- if test "$DSYMUTIL" != ":"; then -+ if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then - _lt_dsymutil='~$DSYMUTIL $lib || :' - else - _lt_dsymutil= -@@ -7455,14 +8281,14 @@ ac_cpp='$CPP $CPPFLAGS' - ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' - ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' - ac_compiler_gnu=$ac_cv_c_compiler_gnu --{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 - $as_echo_n "checking how to run the C preprocessor... " >&6; } - # On Suns, sometimes $CPP names a directory. - if test -n "$CPP" && test -d "$CPP"; then - CPP= - fi - if test -z "$CPP"; then -- if test "${ac_cv_prog_CPP+set}" = set; then -+ if ${ac_cv_prog_CPP+:} false; then : - $as_echo_n "(cached) " >&6 - else - # Double quotes because CPP needs to be expanded -@@ -7477,11 +8303,7 @@ do - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #ifdef __STDC__ - # include -@@ -7490,78 +8312,34 @@ cat >>conftest.$ac_ext <<_ACEOF - #endif - Syntax error - _ACEOF --if { (ac_try="$ac_cpp conftest.$ac_ext" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null && { -- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -- test ! -s conftest.err -- }; then -- : --else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -+if ac_fn_c_try_cpp "$LINENO"; then : - -+else - # Broken: fails on valid input. - continue - fi -- --rm -f conftest.err conftest.$ac_ext -+rm -f conftest.err conftest.i conftest.$ac_ext - - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include - _ACEOF --if { (ac_try="$ac_cpp conftest.$ac_ext" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null && { -- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -- test ! -s conftest.err -- }; then -+if ac_fn_c_try_cpp "$LINENO"; then : - # Broken: success on invalid input. - continue - else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- - # Passes both tests. - ac_preproc_ok=: - break - fi -- --rm -f conftest.err conftest.$ac_ext -+rm -f conftest.err conftest.i conftest.$ac_ext - - done - # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. --rm -f conftest.err conftest.$ac_ext --if $ac_preproc_ok; then -+rm -f conftest.i conftest.err conftest.$ac_ext -+if $ac_preproc_ok; then : - break - fi - -@@ -7573,7 +8351,7 @@ fi - else - ac_cv_prog_CPP=$CPP - fi --{ $as_echo "$as_me:$LINENO: result: $CPP" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 - $as_echo "$CPP" >&6; } - ac_preproc_ok=false - for ac_c_preproc_warn_flag in '' yes -@@ -7584,11 +8362,7 @@ do - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #ifdef __STDC__ - # include -@@ -7597,87 +8371,40 @@ cat >>conftest.$ac_ext <<_ACEOF - #endif - Syntax error - _ACEOF --if { (ac_try="$ac_cpp conftest.$ac_ext" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null && { -- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -- test ! -s conftest.err -- }; then -- : --else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -+if ac_fn_c_try_cpp "$LINENO"; then : - -+else - # Broken: fails on valid input. - continue - fi -- --rm -f conftest.err conftest.$ac_ext -+rm -f conftest.err conftest.i conftest.$ac_ext - - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include - _ACEOF --if { (ac_try="$ac_cpp conftest.$ac_ext" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null && { -- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -- test ! -s conftest.err -- }; then -+if ac_fn_c_try_cpp "$LINENO"; then : - # Broken: success on invalid input. - continue - else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- - # Passes both tests. - ac_preproc_ok=: - break - fi -- --rm -f conftest.err conftest.$ac_ext -+rm -f conftest.err conftest.i conftest.$ac_ext - - done - # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. --rm -f conftest.err conftest.$ac_ext --if $ac_preproc_ok; then -- : -+rm -f conftest.i conftest.err conftest.$ac_ext -+if $ac_preproc_ok; then : -+ - else -- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 - $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} --{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check --See \`config.log' for more details." >&5 --$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; }; } -+as_fn_error $? "C preprocessor \"$CPP\" fails sanity check -+See \`config.log' for more details" "$LINENO" 5; } - fi - - ac_ext=c -@@ -7687,16 +8414,12 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ - ac_compiler_gnu=$ac_cv_c_compiler_gnu - - --{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 - $as_echo_n "checking for ANSI C header files... " >&6; } --if test "${ac_cv_header_stdc+set}" = set; then -+if ${ac_cv_header_stdc+:} false; then : - $as_echo_n "(cached) " >&6 - else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include - #include -@@ -7711,48 +8434,23 @@ main () - return 0; - } - _ACEOF --rm -f conftest.$ac_objext --if { (ac_try="$ac_compile" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_compile") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest.$ac_objext; then -+if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_header_stdc=yes - else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_cv_header_stdc=no -+ ac_cv_header_stdc=no - fi -- - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - - if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include - - _ACEOF - if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -- $EGREP "memchr" >/dev/null 2>&1; then -- : -+ $EGREP "memchr" >/dev/null 2>&1; then : -+ - else - ac_cv_header_stdc=no - fi -@@ -7762,18 +8460,14 @@ fi - - if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include - - _ACEOF - if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -- $EGREP "free" >/dev/null 2>&1; then -- : -+ $EGREP "free" >/dev/null 2>&1; then : -+ - else - ac_cv_header_stdc=no - fi -@@ -7783,14 +8477,10 @@ fi - - if test $ac_cv_header_stdc = yes; then - # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. -- if test "$cross_compiling" = yes; then -+ if test "$cross_compiling" = yes; then : - : - else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include - #include -@@ -7817,1245 +8507,279 @@ main () - return 0; - } - _ACEOF --rm -f conftest$ac_exeext --if { (ac_try="$ac_link" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_link") 2>&5 -- ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_try") 2>&5 -- ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- : --else -- $as_echo "$as_me: program exited with status $ac_status" >&5 --$as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -+if ac_fn_c_try_run "$LINENO"; then : - --( exit $ac_status ) --ac_cv_header_stdc=no -+else -+ ac_cv_header_stdc=no - fi --rm -rf conftest.dSYM --rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ -+ conftest.$ac_objext conftest.beam conftest.$ac_ext - fi - -- - fi - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 - $as_echo "$ac_cv_header_stdc" >&6; } - if test $ac_cv_header_stdc = yes; then - --cat >>confdefs.h <<\_ACEOF --#define STDC_HEADERS 1 --_ACEOF -+$as_echo "#define STDC_HEADERS 1" >>confdefs.h - - fi - - # On IRIX 5.3, sys/types and inttypes.h are conflicting. -+for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ -+ inttypes.h stdint.h unistd.h -+do : -+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default -+" -+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : -+ cat >>confdefs.h <<_ACEOF -+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+_ACEOF - -+fi - -+done - - -+for ac_header in dlfcn.h -+do : -+ ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default -+" -+if test "x$ac_cv_header_dlfcn_h" = xyes; then : -+ cat >>confdefs.h <<_ACEOF -+#define HAVE_DLFCN_H 1 -+_ACEOF - -+fi - -+done - - - --for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ -- inttypes.h stdint.h unistd.h --do --as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` --{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 --$as_echo_n "checking for $ac_header... " >&6; } --if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -- $as_echo_n "(cached) " >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default - --#include <$ac_header> --_ACEOF --rm -f conftest.$ac_objext --if { (ac_try="$ac_compile" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_compile") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest.$ac_objext; then -- eval "$as_ac_Header=yes" --else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -+func_stripname_cnf () -+{ -+ case ${2} in -+ .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; -+ *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; -+ esac -+} # func_stripname_cnf - -- eval "$as_ac_Header=no" --fi - --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext --fi --ac_res=`eval 'as_val=${'$as_ac_Header'} -- $as_echo "$as_val"'` -- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 --$as_echo "$ac_res" >&6; } --as_val=`eval 'as_val=${'$as_ac_Header'} -- $as_echo "$as_val"'` -- if test "x$as_val" = x""yes; then -- cat >>confdefs.h <<_ACEOF --#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 --_ACEOF - --fi - --done - -+# Set options - - --for ac_header in dlfcn.h --do --as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` --{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 --$as_echo_n "checking for $ac_header... " >&6; } --if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -- $as_echo_n "(cached) " >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default - --#include <$ac_header> --_ACEOF --rm -f conftest.$ac_objext --if { (ac_try="$ac_compile" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_compile") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest.$ac_objext; then -- eval "$as_ac_Header=yes" --else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -+ enable_dlopen=no - -- eval "$as_ac_Header=no" --fi - --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext --fi --ac_res=`eval 'as_val=${'$as_ac_Header'} -- $as_echo "$as_val"'` -- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 --$as_echo "$ac_res" >&6; } --as_val=`eval 'as_val=${'$as_ac_Header'} -- $as_echo "$as_val"'` -- if test "x$as_val" = x""yes; then -- cat >>confdefs.h <<_ACEOF --#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 --_ACEOF -+ enable_win32_dll=no - -+ -+ # Check whether --enable-shared was given. -+if test "${enable_shared+set}" = set; then : -+ enableval=$enable_shared; p=${PACKAGE-default} -+ case $enableval in -+ yes) enable_shared=yes ;; -+ no) enable_shared=no ;; -+ *) -+ enable_shared=no -+ # Look at the argument we got. We use all the common list separators. -+ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," -+ for pkg in $enableval; do -+ IFS="$lt_save_ifs" -+ if test "X$pkg" = "X$p"; then -+ enable_shared=yes -+ fi -+ done -+ IFS="$lt_save_ifs" -+ ;; -+ esac -+else -+ enable_shared=yes - fi - --done - - - --ac_ext=cpp --ac_cpp='$CXXCPP $CPPFLAGS' --ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' --ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' --ac_compiler_gnu=$ac_cv_cxx_compiler_gnu --if test -z "$CXX"; then -- if test -n "$CCC"; then -- CXX=$CCC -- else -- if test -n "$ac_tool_prefix"; then -- for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC -- do -- # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. --set dummy $ac_tool_prefix$ac_prog; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_CXX+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- if test -n "$CXX"; then -- ac_cv_prog_CXX="$CXX" # Let the user override the test. --else --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_prog_CXX="$ac_tool_prefix$ac_prog" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done --done --IFS=$as_save_IFS - --fi --fi --CXX=$ac_cv_prog_CXX --if test -n "$CXX"; then -- { $as_echo "$as_me:$LINENO: result: $CXX" >&5 --$as_echo "$CXX" >&6; } --else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } --fi - - -- test -n "$CXX" && break -- done --fi --if test -z "$CXX"; then -- ac_ct_CXX=$CXX -- for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC --do -- # Extract the first word of "$ac_prog", so it can be a program name with args. --set dummy $ac_prog; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- if test -n "$ac_ct_CXX"; then -- ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. --else --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_prog_ac_ct_CXX="$ac_prog" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done --done --IFS=$as_save_IFS - --fi --fi --ac_ct_CXX=$ac_cv_prog_ac_ct_CXX --if test -n "$ac_ct_CXX"; then -- { $as_echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 --$as_echo "$ac_ct_CXX" >&6; } -+ -+ # Check whether --enable-static was given. -+if test "${enable_static+set}" = set; then : -+ enableval=$enable_static; p=${PACKAGE-default} -+ case $enableval in -+ yes) enable_static=yes ;; -+ no) enable_static=no ;; -+ *) -+ enable_static=no -+ # Look at the argument we got. We use all the common list separators. -+ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," -+ for pkg in $enableval; do -+ IFS="$lt_save_ifs" -+ if test "X$pkg" = "X$p"; then -+ enable_static=yes -+ fi -+ done -+ IFS="$lt_save_ifs" -+ ;; -+ esac - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -+ enable_static=yes - fi - - -- test -n "$ac_ct_CXX" && break --done - -- if test "x$ac_ct_CXX" = x; then -- CXX="g++" -- else -- case $cross_compiling:$ac_tool_warned in --yes:) --{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 --$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} --ac_tool_warned=yes ;; --esac -- CXX=$ac_ct_CXX -- fi --fi - -- fi --fi --# Provide some information about the compiler. --$as_echo "$as_me:$LINENO: checking for C++ compiler version" >&5 --set X $ac_compile --ac_compiler=$2 --{ (ac_try="$ac_compiler --version >&5" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_compiler --version >&5") 2>&5 -- ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } --{ (ac_try="$ac_compiler -v >&5" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_compiler -v >&5") 2>&5 -- ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } --{ (ac_try="$ac_compiler -V >&5" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_compiler -V >&5") 2>&5 -- ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } - --{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 --$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; } --if test "${ac_cv_cxx_compiler_gnu+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ - --int --main () --{ --#ifndef __GNUC__ -- choke me --#endif - -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (ac_try="$ac_compile" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_compile") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_cxx_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest.$ac_objext; then -- ac_compiler_gnu=yes --else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 - -- ac_compiler_gnu=no --fi - --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext --ac_cv_cxx_compiler_gnu=$ac_compiler_gnu - --fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 --$as_echo "$ac_cv_cxx_compiler_gnu" >&6; } --if test $ac_compiler_gnu = yes; then -- GXX=yes -+# Check whether --with-pic was given. -+if test "${with_pic+set}" = set; then : -+ withval=$with_pic; lt_p=${PACKAGE-default} -+ case $withval in -+ yes|no) pic_mode=$withval ;; -+ *) -+ pic_mode=default -+ # Look at the argument we got. We use all the common list separators. -+ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," -+ for lt_pkg in $withval; do -+ IFS="$lt_save_ifs" -+ if test "X$lt_pkg" = "X$lt_p"; then -+ pic_mode=yes -+ fi -+ done -+ IFS="$lt_save_ifs" -+ ;; -+ esac - else -- GXX= -+ pic_mode=default - fi --ac_test_CXXFLAGS=${CXXFLAGS+set} --ac_save_CXXFLAGS=$CXXFLAGS --{ $as_echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 --$as_echo_n "checking whether $CXX accepts -g... " >&6; } --if test "${ac_cv_prog_cxx_g+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- ac_save_cxx_werror_flag=$ac_cxx_werror_flag -- ac_cxx_werror_flag=yes -- ac_cv_prog_cxx_g=no -- CXXFLAGS="-g" -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ - --int --main () --{ - -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (ac_try="$ac_compile" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_compile") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_cxx_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest.$ac_objext; then -- ac_cv_prog_cxx_g=yes --else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -+test -z "$pic_mode" && pic_mode=default - -- CXXFLAGS="" -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ - --int --main () --{ - -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (ac_try="$ac_compile" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_compile") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_cxx_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest.$ac_objext; then -- : --else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 - -- ac_cxx_werror_flag=$ac_save_cxx_werror_flag -- CXXFLAGS="-g" -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ - --int --main () --{ - -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (ac_try="$ac_compile" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_compile") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_cxx_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest.$ac_objext; then -- ac_cv_prog_cxx_g=yes -+ -+ # Check whether --enable-fast-install was given. -+if test "${enable_fast_install+set}" = set; then : -+ enableval=$enable_fast_install; p=${PACKAGE-default} -+ case $enableval in -+ yes) enable_fast_install=yes ;; -+ no) enable_fast_install=no ;; -+ *) -+ enable_fast_install=no -+ # Look at the argument we got. We use all the common list separators. -+ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," -+ for pkg in $enableval; do -+ IFS="$lt_save_ifs" -+ if test "X$pkg" = "X$p"; then -+ enable_fast_install=yes -+ fi -+ done -+ IFS="$lt_save_ifs" -+ ;; -+ esac - else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -+ enable_fast_install=yes -+fi - - --fi - --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext --fi - --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext --fi - --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -- ac_cxx_werror_flag=$ac_save_cxx_werror_flag --fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 --$as_echo "$ac_cv_prog_cxx_g" >&6; } --if test "$ac_test_CXXFLAGS" = set; then -- CXXFLAGS=$ac_save_CXXFLAGS --elif test $ac_cv_prog_cxx_g = yes; then -- if test "$GXX" = yes; then -- CXXFLAGS="-g -O2" -- else -- CXXFLAGS="-g" -- fi --else -- if test "$GXX" = yes; then -- CXXFLAGS="-O2" -- else -- CXXFLAGS= -- fi --fi --ac_ext=c --ac_cpp='$CPP $CPPFLAGS' --ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' --ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' --ac_compiler_gnu=$ac_cv_c_compiler_gnu - --depcc="$CXX" am_compiler_list= - --{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 --$as_echo_n "checking dependency style of $depcc... " >&6; } --if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then -- # We make a subdir and do the tests there. Otherwise we can end up -- # making bogus files that we don't know about and never remove. For -- # instance it was reported that on HP-UX the gcc test will end up -- # making a dummy file named `D' -- because `-MD' means `put the output -- # in D'. -- mkdir conftest.dir -- # Copy depcomp to subdir because otherwise we won't find it if we're -- # using a relative directory. -- cp "$am_depcomp" conftest.dir -- cd conftest.dir -- # We will build objects and dependencies in a subdirectory because -- # it helps to detect inapplicable dependency modes. For instance -- # both Tru64's cc and ICC support -MD to output dependencies as a -- # side effect of compilation, but ICC will put the dependencies in -- # the current directory while Tru64 will put them in the object -- # directory. -- mkdir sub - -- am_cv_CXX_dependencies_compiler_type=none -- if test "$am_compiler_list" = ""; then -- am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` -- fi -- am__universal=false -- case " $depcc " in #( -- *\ -arch\ *\ -arch\ *) am__universal=true ;; -- esac - -- for depmode in $am_compiler_list; do -- # Setup a source with many dependencies, because some compilers -- # like to wrap large dependency lists on column 80 (with \), and -- # we should not choose a depcomp mode which is confused by this. -- # -- # We need to recreate these files for each test, as the compiler may -- # overwrite some of them when testing with obscure command lines. -- # This happens at least with the AIX C compiler. -- : > sub/conftest.c -- for i in 1 2 3 4 5 6; do -- echo '#include "conftst'$i'.h"' >> sub/conftest.c -- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with -- # Solaris 8's {/usr,}/bin/sh. -- touch sub/conftst$i.h -- done -- echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - -- # We check with `-c' and `-o' for the sake of the "dashmstdout" -- # mode. It turns out that the SunPro C++ compiler does not properly -- # handle `-M -o', and we need to detect this. Also, some Intel -- # versions had trouble with output in subdirs -- am__obj=sub/conftest.${OBJEXT-o} -- am__minus_obj="-o $am__obj" -- case $depmode in -- gcc) -- # This depmode causes a compiler race in universal mode. -- test "$am__universal" = false || continue -- ;; -- nosideeffect) -- # after this tag, mechanisms are not by side-effect, so they'll -- # only be used when explicitly requested -- if test "x$enable_dependency_tracking" = xyes; then -- continue -- else -- break -- fi -- ;; -- msvisualcpp | msvcmsys) -- # This compiler won't grok `-c -o', but also, the minuso test has -- # not run yet. These depmodes are late enough in the game, and -- # so weak that their functioning should not be impacted. -- am__obj=conftest.${OBJEXT-o} -- am__minus_obj= -- ;; -- none) break ;; -- esac -- if depmode=$depmode \ -- source=sub/conftest.c object=$am__obj \ -- depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ -- $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ -- >/dev/null 2>conftest.err && -- grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && -- grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && -- grep $am__obj sub/conftest.Po > /dev/null 2>&1 && -- ${MAKE-make} -s -f confmf > /dev/null 2>&1; then -- # icc doesn't choke on unknown options, it will just issue warnings -- # or remarks (even with -Werror). So we grep stderr for any message -- # that says an option was ignored or not supported. -- # When given -MP, icc 7.0 and 7.1 complain thusly: -- # icc: Command line warning: ignoring option '-M'; no argument required -- # The diagnosis changed in icc 8.0: -- # icc: Command line remark: option '-MP' not supported -- if (grep 'ignoring option' conftest.err || -- grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else -- am_cv_CXX_dependencies_compiler_type=$depmode -- break -- fi -- fi -- done - -- cd .. -- rm -rf conftest.dir --else -- am_cv_CXX_dependencies_compiler_type=none --fi -+# This can be used to rebuild libtool when needed -+LIBTOOL_DEPS="$ltmain" - --fi --{ $as_echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5 --$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; } --CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type -+# Always use our own libtool. -+LIBTOOL='$(SHELL) $(top_builddir)/libtool' - -- if -- test "x$enable_dependency_tracking" != xno \ -- && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then -- am__fastdepCXX_TRUE= -- am__fastdepCXX_FALSE='#' --else -- am__fastdepCXX_TRUE='#' -- am__fastdepCXX_FALSE= --fi - - --depcc="$CXX" am_compiler_list= - --{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 --$as_echo_n "checking dependency style of $depcc... " >&6; } --if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then -- # We make a subdir and do the tests there. Otherwise we can end up -- # making bogus files that we don't know about and never remove. For -- # instance it was reported that on HP-UX the gcc test will end up -- # making a dummy file named `D' -- because `-MD' means `put the output -- # in D'. -- mkdir conftest.dir -- # Copy depcomp to subdir because otherwise we won't find it if we're -- # using a relative directory. -- cp "$am_depcomp" conftest.dir -- cd conftest.dir -- # We will build objects and dependencies in a subdirectory because -- # it helps to detect inapplicable dependency modes. For instance -- # both Tru64's cc and ICC support -MD to output dependencies as a -- # side effect of compilation, but ICC will put the dependencies in -- # the current directory while Tru64 will put them in the object -- # directory. -- mkdir sub - -- am_cv_CXX_dependencies_compiler_type=none -- if test "$am_compiler_list" = ""; then -- am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` -- fi -- am__universal=false -- case " $depcc " in #( -- *\ -arch\ *\ -arch\ *) am__universal=true ;; -- esac - -- for depmode in $am_compiler_list; do -- # Setup a source with many dependencies, because some compilers -- # like to wrap large dependency lists on column 80 (with \), and -- # we should not choose a depcomp mode which is confused by this. -- # -- # We need to recreate these files for each test, as the compiler may -- # overwrite some of them when testing with obscure command lines. -- # This happens at least with the AIX C compiler. -- : > sub/conftest.c -- for i in 1 2 3 4 5 6; do -- echo '#include "conftst'$i'.h"' >> sub/conftest.c -- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with -- # Solaris 8's {/usr,}/bin/sh. -- touch sub/conftst$i.h -- done -- echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - -- # We check with `-c' and `-o' for the sake of the "dashmstdout" -- # mode. It turns out that the SunPro C++ compiler does not properly -- # handle `-M -o', and we need to detect this. Also, some Intel -- # versions had trouble with output in subdirs -- am__obj=sub/conftest.${OBJEXT-o} -- am__minus_obj="-o $am__obj" -- case $depmode in -- gcc) -- # This depmode causes a compiler race in universal mode. -- test "$am__universal" = false || continue -- ;; -- nosideeffect) -- # after this tag, mechanisms are not by side-effect, so they'll -- # only be used when explicitly requested -- if test "x$enable_dependency_tracking" = xyes; then -- continue -- else -- break -- fi -- ;; -- msvisualcpp | msvcmsys) -- # This compiler won't grok `-c -o', but also, the minuso test has -- # not run yet. These depmodes are late enough in the game, and -- # so weak that their functioning should not be impacted. -- am__obj=conftest.${OBJEXT-o} -- am__minus_obj= -- ;; -- none) break ;; -- esac -- if depmode=$depmode \ -- source=sub/conftest.c object=$am__obj \ -- depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ -- $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ -- >/dev/null 2>conftest.err && -- grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && -- grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && -- grep $am__obj sub/conftest.Po > /dev/null 2>&1 && -- ${MAKE-make} -s -f confmf > /dev/null 2>&1; then -- # icc doesn't choke on unknown options, it will just issue warnings -- # or remarks (even with -Werror). So we grep stderr for any message -- # that says an option was ignored or not supported. -- # When given -MP, icc 7.0 and 7.1 complain thusly: -- # icc: Command line warning: ignoring option '-M'; no argument required -- # The diagnosis changed in icc 8.0: -- # icc: Command line remark: option '-MP' not supported -- if (grep 'ignoring option' conftest.err || -- grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else -- am_cv_CXX_dependencies_compiler_type=$depmode -- break -- fi -- fi -- done - -- cd .. -- rm -rf conftest.dir --else -- am_cv_CXX_dependencies_compiler_type=none --fi - --fi --{ $as_echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5 --$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; } --CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type - -- if -- test "x$enable_dependency_tracking" != xno \ -- && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then -- am__fastdepCXX_TRUE= -- am__fastdepCXX_FALSE='#' --else -- am__fastdepCXX_TRUE='#' -- am__fastdepCXX_FALSE= --fi - - --if test -n "$CXX" && ( test "X$CXX" != "Xno" && -- ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || -- (test "X$CXX" != "Xg++"))) ; then -- ac_ext=cpp --ac_cpp='$CXXCPP $CPPFLAGS' --ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' --ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' --ac_compiler_gnu=$ac_cv_cxx_compiler_gnu --{ $as_echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5 --$as_echo_n "checking how to run the C++ preprocessor... " >&6; } --if test -z "$CXXCPP"; then -- if test "${ac_cv_prog_CXXCPP+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- # Double quotes because CXXCPP needs to be expanded -- for CXXCPP in "$CXX -E" "/lib/cpp" -- do -- ac_preproc_ok=false --for ac_cxx_preproc_warn_flag in '' yes --do -- # Use a header file that comes with gcc, so configuring glibc -- # with a fresh cross-compiler works. -- # Prefer to if __STDC__ is defined, since -- # exists even on freestanding compilers. -- # On the NeXT, cc -E runs the code through the compiler's parser, -- # not just through cpp. "Syntax error" is here to catch this case. -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#ifdef __STDC__ --# include --#else --# include --#endif -- Syntax error --_ACEOF --if { (ac_try="$ac_cpp conftest.$ac_ext" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null && { -- test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || -- test ! -s conftest.err -- }; then -- : --else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 - -- # Broken: fails on valid input. --continue --fi - --rm -f conftest.err conftest.$ac_ext - -- # OK, works on sane cases. Now check whether nonexistent headers -- # can be detected and how. -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include --_ACEOF --if { (ac_try="$ac_cpp conftest.$ac_ext" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null && { -- test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || -- test ! -s conftest.err -- }; then -- # Broken: success on invalid input. --continue --else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 - -- # Passes both tests. --ac_preproc_ok=: --break --fi - --rm -f conftest.err conftest.$ac_ext - --done --# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. --rm -f conftest.err conftest.$ac_ext --if $ac_preproc_ok; then -- break --fi - -- done -- ac_cv_prog_CXXCPP=$CXXCPP - --fi -- CXXCPP=$ac_cv_prog_CXXCPP --else -- ac_cv_prog_CXXCPP=$CXXCPP --fi --{ $as_echo "$as_me:$LINENO: result: $CXXCPP" >&5 --$as_echo "$CXXCPP" >&6; } --ac_preproc_ok=false --for ac_cxx_preproc_warn_flag in '' yes --do -- # Use a header file that comes with gcc, so configuring glibc -- # with a fresh cross-compiler works. -- # Prefer to if __STDC__ is defined, since -- # exists even on freestanding compilers. -- # On the NeXT, cc -E runs the code through the compiler's parser, -- # not just through cpp. "Syntax error" is here to catch this case. -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#ifdef __STDC__ --# include --#else --# include --#endif -- Syntax error --_ACEOF --if { (ac_try="$ac_cpp conftest.$ac_ext" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null && { -- test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || -- test ! -s conftest.err -- }; then -- : --else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 - -- # Broken: fails on valid input. --continue --fi - --rm -f conftest.err conftest.$ac_ext - -- # OK, works on sane cases. Now check whether nonexistent headers -- # can be detected and how. -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include --_ACEOF --if { (ac_try="$ac_cpp conftest.$ac_ext" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null && { -- test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || -- test ! -s conftest.err -- }; then -- # Broken: success on invalid input. --continue --else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 - -- # Passes both tests. --ac_preproc_ok=: --break --fi - --rm -f conftest.err conftest.$ac_ext - --done --# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. --rm -f conftest.err conftest.$ac_ext --if $ac_preproc_ok; then -- : --else -- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 --$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} --_lt_caught_CXX_error=yes; } --fi - --ac_ext=c --ac_cpp='$CPP $CPPFLAGS' --ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' --ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' --ac_compiler_gnu=$ac_cv_c_compiler_gnu - --else -- _lt_caught_CXX_error=yes --fi - - -+test -z "$LN_S" && LN_S="ln -s" - - - --# Set options - - - -- enable_dlopen=no - - -- enable_win32_dll=no - - -- # Check whether --enable-shared was given. --if test "${enable_shared+set}" = set; then -- enableval=$enable_shared; p=${PACKAGE-default} -- case $enableval in -- yes) enable_shared=yes ;; -- no) enable_shared=no ;; -- *) -- enable_shared=no -- # Look at the argument we got. We use all the common list separators. -- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," -- for pkg in $enableval; do -- IFS="$lt_save_ifs" -- if test "X$pkg" = "X$p"; then -- enable_shared=yes -- fi -- done -- IFS="$lt_save_ifs" -- ;; -- esac --else -- enable_shared=yes --fi - - - - -+if test -n "${ZSH_VERSION+set}" ; then -+ setopt NO_GLOB_SUBST -+fi - -- -- -- -- -- # Check whether --enable-static was given. --if test "${enable_static+set}" = set; then -- enableval=$enable_static; p=${PACKAGE-default} -- case $enableval in -- yes) enable_static=yes ;; -- no) enable_static=no ;; -- *) -- enable_static=no -- # Look at the argument we got. We use all the common list separators. -- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," -- for pkg in $enableval; do -- IFS="$lt_save_ifs" -- if test "X$pkg" = "X$p"; then -- enable_static=yes -- fi -- done -- IFS="$lt_save_ifs" -- ;; -- esac --else -- enable_static=yes --fi -- -- -- -- -- -- -- -- -- -- --# Check whether --with-pic was given. --if test "${with_pic+set}" = set; then -- withval=$with_pic; pic_mode="$withval" --else -- pic_mode=default --fi -- -- --test -z "$pic_mode" && pic_mode=default -- -- -- -- -- -- -- -- # Check whether --enable-fast-install was given. --if test "${enable_fast_install+set}" = set; then -- enableval=$enable_fast_install; p=${PACKAGE-default} -- case $enableval in -- yes) enable_fast_install=yes ;; -- no) enable_fast_install=no ;; -- *) -- enable_fast_install=no -- # Look at the argument we got. We use all the common list separators. -- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," -- for pkg in $enableval; do -- IFS="$lt_save_ifs" -- if test "X$pkg" = "X$p"; then -- enable_fast_install=yes -- fi -- done -- IFS="$lt_save_ifs" -- ;; -- esac --else -- enable_fast_install=yes --fi -- -- -- -- -- -- -- -- -- -- -- --# This can be used to rebuild libtool when needed --LIBTOOL_DEPS="$ltmain" -- --# Always use our own libtool. --LIBTOOL='$(SHELL) $(top_builddir)/libtool' -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --test -z "$LN_S" && LN_S="ln -s" -- -- -- -- -- -- -- -- -- -- -- -- -- -- --if test -n "${ZSH_VERSION+set}" ; then -- setopt NO_GLOB_SUBST --fi -- --{ $as_echo "$as_me:$LINENO: checking for objdir" >&5 --$as_echo_n "checking for objdir... " >&6; } --if test "${lt_cv_objdir+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- rm -f .libs 2>/dev/null --mkdir .libs 2>/dev/null --if test -d .libs; then -- lt_cv_objdir=.libs --else -- # MS-DOS does not allow filenames that begin with a dot. -- lt_cv_objdir=_libs --fi --rmdir .libs 2>/dev/null --fi --{ $as_echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5 --$as_echo "$lt_cv_objdir" >&6; } --objdir=$lt_cv_objdir -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5 -+$as_echo_n "checking for objdir... " >&6; } -+if ${lt_cv_objdir+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ rm -f .libs 2>/dev/null -+mkdir .libs 2>/dev/null -+if test -d .libs; then -+ lt_cv_objdir=.libs -+else -+ # MS-DOS does not allow filenames that begin with a dot. -+ lt_cv_objdir=_libs -+fi -+rmdir .libs 2>/dev/null -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5 -+$as_echo "$lt_cv_objdir" >&6; } -+objdir=$lt_cv_objdir - - - -@@ -9068,19 +8792,6 @@ _ACEOF - - - -- -- -- -- -- -- -- -- -- -- -- -- -- - case $host_os in - aix3*) - # AIX sometimes has problems with the GCC collect2 program. For some -@@ -9093,23 +8804,6 @@ aix3*) - ;; - esac - --# Sed substitution that helps us do robust quoting. It backslashifies --# metacharacters that are still active within double-quoted strings. --sed_quote_subst='s/\(["`$\\]\)/\\\1/g' -- --# Same as above, but do not quote variable references. --double_quote_subst='s/\(["`\\]\)/\\\1/g' -- --# Sed substitution to delay expansion of an escaped shell variable in a --# double_quote_subst'ed string. --delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' -- --# Sed substitution to delay expansion of an escaped single quote. --delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' -- --# Sed substitution to avoid accidental globbing in evaled expressions --no_glob_subst='s/\*/\\\*/g' -- - # Global variables: - ofile=libtool - can_build_shared=yes -@@ -9138,7 +8832,7 @@ for cc_temp in $compiler""; do - *) break;; - esac - done --cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` -+cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` - - - # Only perform the check for file, if the check method requires it -@@ -9146,9 +8840,9 @@ test -z "$MAGIC_CMD" && MAGIC_CMD=file - case $deplibs_check_method in - file_magic*) - if test "$file_magic_cmd" = '$MAGIC_CMD'; then -- { $as_echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5 - $as_echo_n "checking for ${ac_tool_prefix}file... " >&6; } --if test "${lt_cv_path_MAGIC_CMD+set}" = set; then -+if ${lt_cv_path_MAGIC_CMD+:} false; then : - $as_echo_n "(cached) " >&6 - else - case $MAGIC_CMD in -@@ -9199,10 +8893,10 @@ fi - - MAGIC_CMD="$lt_cv_path_MAGIC_CMD" - if test -n "$MAGIC_CMD"; then -- { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 - $as_echo "$MAGIC_CMD" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } - fi - -@@ -9212,9 +8906,9 @@ fi - - if test -z "$lt_cv_path_MAGIC_CMD"; then - if test -n "$ac_tool_prefix"; then -- { $as_echo "$as_me:$LINENO: checking for file" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5 - $as_echo_n "checking for file... " >&6; } --if test "${lt_cv_path_MAGIC_CMD+set}" = set; then -+if ${lt_cv_path_MAGIC_CMD+:} false; then : - $as_echo_n "(cached) " >&6 - else - case $MAGIC_CMD in -@@ -9265,10 +8959,10 @@ fi - - MAGIC_CMD="$lt_cv_path_MAGIC_CMD" - if test -n "$MAGIC_CMD"; then -- { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 - $as_echo "$MAGIC_CMD" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } - fi - -@@ -9347,11 +9041,16 @@ if test -n "$compiler"; then - lt_prog_compiler_no_builtin_flag= - - if test "$GCC" = yes; then -- lt_prog_compiler_no_builtin_flag=' -fno-builtin' -+ case $cc_basename in -+ nvcc*) -+ lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;; -+ *) -+ lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;; -+ esac - -- { $as_echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 - $as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; } --if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then -+if ${lt_cv_prog_compiler_rtti_exceptions+:} false; then : - $as_echo_n "(cached) " >&6 - else - lt_cv_prog_compiler_rtti_exceptions=no -@@ -9367,15 +9066,15 @@ else - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:9370: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:9374: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. -- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp -+ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then - lt_cv_prog_compiler_rtti_exceptions=yes -@@ -9384,7 +9083,7 @@ else - $RM conftest* - - fi --{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 - $as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; } - - if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then -@@ -9404,8 +9103,6 @@ fi - lt_prog_compiler_pic= - lt_prog_compiler_static= - --{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 --$as_echo_n "checking for $compiler option to produce PIC... " >&6; } - - if test "$GCC" = yes; then - lt_prog_compiler_wl='-Wl,' -@@ -9453,6 +9150,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } - lt_prog_compiler_pic='-fno-common' - ;; - -+ haiku*) -+ # PIC is the default for Haiku. -+ # The "-static" flag exists, but is broken. -+ lt_prog_compiler_static= -+ ;; -+ - hpux*) - # PIC is the default for 64-bit PA HP-UX, but not for 32-bit - # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag -@@ -9495,6 +9198,15 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } - lt_prog_compiler_pic='-fPIC' - ;; - esac -+ -+ case $cc_basename in -+ nvcc*) # Cuda Compiler Driver 2.2 -+ lt_prog_compiler_wl='-Xlinker ' -+ if test -n "$lt_prog_compiler_pic"; then -+ lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic" -+ fi -+ ;; -+ esac - else - # PORTME Check for flag to pass linker flags through the system compiler. - case $host_os in -@@ -9536,7 +9248,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } - lt_prog_compiler_static='-non_shared' - ;; - -- linux* | k*bsd*-gnu) -+ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) - case $cc_basename in - # old Intel for x86_64 which still supported -KPIC. - ecc*) -@@ -9557,7 +9269,13 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } - lt_prog_compiler_pic='--shared' - lt_prog_compiler_static='--static' - ;; -- pgcc* | pgf77* | pgf90* | pgf95*) -+ nagfor*) -+ # NAG Fortran compiler -+ lt_prog_compiler_wl='-Wl,-Wl,,' -+ lt_prog_compiler_pic='-PIC' -+ lt_prog_compiler_static='-Bstatic' -+ ;; -+ pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) - # Portland Group compilers (*not* the Pentium gcc compiler, - # which looks to be a dead project) - lt_prog_compiler_wl='-Wl,' -@@ -9569,25 +9287,40 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } - # All Alpha code is PIC. - lt_prog_compiler_static='-non_shared' - ;; -- xl*) -- # IBM XL C 8.0/Fortran 10.1 on PPC -+ xl* | bgxl* | bgf* | mpixl*) -+ # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='-qpic' - lt_prog_compiler_static='-qstaticlink' - ;; - *) - case `$CC -V 2>&1 | sed 5q` in -+ *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*) -+ # Sun Fortran 8.3 passes all unrecognized flags to the linker -+ lt_prog_compiler_pic='-KPIC' -+ lt_prog_compiler_static='-Bstatic' -+ lt_prog_compiler_wl='' -+ ;; -+ *Sun\ F* | *Sun*Fortran*) -+ lt_prog_compiler_pic='-KPIC' -+ lt_prog_compiler_static='-Bstatic' -+ lt_prog_compiler_wl='-Qoption ld ' -+ ;; - *Sun\ C*) - # Sun C 5.9 - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - lt_prog_compiler_wl='-Wl,' - ;; -- *Sun\ F*) -- # Sun Fortran 8.3 passes all unrecognized flags to the linker -- lt_prog_compiler_pic='-KPIC' -+ *Intel*\ [CF]*Compiler*) -+ lt_prog_compiler_wl='-Wl,' -+ lt_prog_compiler_pic='-fPIC' -+ lt_prog_compiler_static='-static' -+ ;; -+ *Portland\ Group*) -+ lt_prog_compiler_wl='-Wl,' -+ lt_prog_compiler_pic='-fpic' - lt_prog_compiler_static='-Bstatic' -- lt_prog_compiler_wl='' - ;; - esac - ;; -@@ -9619,7 +9352,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - case $cc_basename in -- f77* | f90* | f95*) -+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) - lt_prog_compiler_wl='-Qoption ld ';; - *) - lt_prog_compiler_wl='-Wl,';; -@@ -9676,21 +9409,25 @@ case $host_os in - lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" - ;; - esac --{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5 --$as_echo "$lt_prog_compiler_pic" >&6; } -- -- -- -- - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 -+$as_echo_n "checking for $compiler option to produce PIC... " >&6; } -+if ${lt_cv_prog_compiler_pic+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 -+$as_echo "$lt_cv_prog_compiler_pic" >&6; } -+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic - - # - # Check to make sure the PIC flag actually works. - # - if test -n "$lt_prog_compiler_pic"; then -- { $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 - $as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; } --if test "${lt_cv_prog_compiler_pic_works+set}" = set; then -+if ${lt_cv_prog_compiler_pic_works+:} false; then : - $as_echo_n "(cached) " >&6 - else - lt_cv_prog_compiler_pic_works=no -@@ -9706,15 +9443,15 @@ else - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:9709: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:9713: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. -- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp -+ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then - lt_cv_prog_compiler_pic_works=yes -@@ -9723,7 +9460,7 @@ else - $RM conftest* - - fi --{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5 - $as_echo "$lt_cv_prog_compiler_pic_works" >&6; } - - if test x"$lt_cv_prog_compiler_pic_works" = xyes; then -@@ -9743,13 +9480,18 @@ fi - - - -+ -+ -+ -+ -+ - # - # Check to make sure the static flag actually works. - # - wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" --{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5 - $as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } --if test "${lt_cv_prog_compiler_static_works+set}" = set; then -+if ${lt_cv_prog_compiler_static_works+:} false; then : - $as_echo_n "(cached) " >&6 - else - lt_cv_prog_compiler_static_works=no -@@ -9762,7 +9504,7 @@ else - if test -s conftest.err; then - # Append any errors to the config.log. - cat conftest.err 1>&5 -- $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp -+ $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if diff conftest.exp conftest.er2 >/dev/null; then - lt_cv_prog_compiler_static_works=yes -@@ -9775,7 +9517,7 @@ else - LDFLAGS="$save_LDFLAGS" - - fi --{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5 - $as_echo "$lt_cv_prog_compiler_static_works" >&6; } - - if test x"$lt_cv_prog_compiler_static_works" = xyes; then -@@ -9790,9 +9532,9 @@ fi - - - -- { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 - $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } --if test "${lt_cv_prog_compiler_c_o+set}" = set; then -+if ${lt_cv_prog_compiler_c_o+:} false; then : - $as_echo_n "(cached) " >&6 - else - lt_cv_prog_compiler_c_o=no -@@ -9811,16 +9553,16 @@ else - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:9814: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 -- echo "$as_me:9818: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings -- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp -+ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp - $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 - if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then - lt_cv_prog_compiler_c_o=yes -@@ -9837,7 +9579,7 @@ else - $RM conftest* - - fi --{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 - $as_echo "$lt_cv_prog_compiler_c_o" >&6; } - - -@@ -9845,9 +9587,9 @@ $as_echo "$lt_cv_prog_compiler_c_o" >&6; } - - - -- { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 - $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } --if test "${lt_cv_prog_compiler_c_o+set}" = set; then -+if ${lt_cv_prog_compiler_c_o+:} false; then : - $as_echo_n "(cached) " >&6 - else - lt_cv_prog_compiler_c_o=no -@@ -9866,16 +9608,16 @@ else - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:9869: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 -- echo "$as_me:9873: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings -- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp -+ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp - $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 - if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then - lt_cv_prog_compiler_c_o=yes -@@ -9892,7 +9634,7 @@ else - $RM conftest* - - fi --{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 - $as_echo "$lt_cv_prog_compiler_c_o" >&6; } - - -@@ -9901,7 +9643,7 @@ $as_echo "$lt_cv_prog_compiler_c_o" >&6; } - hard_links="nottested" - if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then - # do not overwrite the value of need_locks provided by the user -- { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5 - $as_echo_n "checking if we can lock with hard links... " >&6; } - hard_links=yes - $RM conftest* -@@ -9909,10 +9651,10 @@ $as_echo_n "checking if we can lock with hard links... " >&6; } - touch conftest.a - ln conftest.a conftest.b 2>&5 || hard_links=no - ln conftest.a conftest.b 2>/dev/null && hard_links=no -- { $as_echo "$as_me:$LINENO: result: $hard_links" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5 - $as_echo "$hard_links" >&6; } - if test "$hard_links" = no; then -- { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 - $as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} - need_locks=warn - fi -@@ -9925,7 +9667,7 @@ fi - - - -- { $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5 - $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } - - runpath_var= -@@ -9941,7 +9683,6 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie - hardcode_direct=no - hardcode_direct_absolute=no - hardcode_libdir_flag_spec= -- hardcode_libdir_flag_spec_ld= - hardcode_libdir_separator= - hardcode_minus_L=no - hardcode_shlibpath_var=unsupported -@@ -9985,10 +9726,39 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie - openbsd*) - with_gnu_ld=no - ;; -+ linux* | k*bsd*-gnu | gnu*) -+ link_all_deplibs=no -+ ;; - esac - - ld_shlibs=yes -+ -+ # On some targets, GNU ld is compatible enough with the native linker -+ # that we're better off using the native interface for both. -+ lt_use_gnu_ld_interface=no - if test "$with_gnu_ld" = yes; then -+ case $host_os in -+ aix*) -+ # The AIX port of GNU ld has always aspired to compatibility -+ # with the native linker. However, as the warning in the GNU ld -+ # block says, versions before 2.19.5* couldn't really create working -+ # shared libraries, regardless of the interface used. -+ case `$LD -v 2>&1` in -+ *\ \(GNU\ Binutils\)\ 2.19.5*) ;; -+ *\ \(GNU\ Binutils\)\ 2.[2-9]*) ;; -+ *\ \(GNU\ Binutils\)\ [3-9]*) ;; -+ *) -+ lt_use_gnu_ld_interface=yes -+ ;; -+ esac -+ ;; -+ *) -+ lt_use_gnu_ld_interface=yes -+ ;; -+ esac -+ fi -+ -+ if test "$lt_use_gnu_ld_interface" = yes; then - # If archive_cmds runs LD, not CC, wlarc should be empty - wlarc='${wl}' - -@@ -10006,6 +9776,7 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie - fi - supports_anon_versioning=no - case `$LD -v 2>&1` in -+ *GNU\ gold*) supports_anon_versioning=yes ;; - *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 - *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... - *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... -@@ -10021,11 +9792,12 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie - ld_shlibs=no - cat <<_LT_EOF 1>&2 - --*** Warning: the GNU linker, at least up to release 2.9.1, is reported -+*** Warning: the GNU linker, at least up to release 2.19, is reported - *** to be unable to reliably create shared libraries on AIX. - *** Therefore, libtool is disabling shared libraries support. If you --*** really care for shared libraries, you may want to modify your PATH --*** so that a non-GNU linker is found, and then restart. -+*** really care for shared libraries, you may want to install binutils -+*** 2.20 or above, or modify your PATH so that a non-GNU linker is found. -+*** You will then need to restart the configuration process. - - _LT_EOF - fi -@@ -10061,10 +9833,12 @@ _LT_EOF - # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless, - # as there is no search path for DLLs. - hardcode_libdir_flag_spec='-L$libdir' -+ export_dynamic_flag_spec='${wl}--export-all-symbols' - allow_undefined_flag=unsupported - always_export_symbols=no - enable_shared_with_static_runtimes=yes -- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' -+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' -+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' - - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -@@ -10082,6 +9856,11 @@ _LT_EOF - fi - ;; - -+ haiku*) -+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ link_all_deplibs=yes -+ ;; -+ - interix[3-9]*) - hardcode_direct=no - hardcode_shlibpath_var=no -@@ -10097,7 +9876,7 @@ _LT_EOF - archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - ;; - -- gnu* | linux* | tpf* | k*bsd*-gnu) -+ gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) - tmp_diet=no - if test "$host_os" = linux-dietlibc; then - case $cc_basename in -@@ -10107,15 +9886,16 @@ _LT_EOF - if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ - && test "$tmp_diet" = no - then -- tmp_addflag= -+ tmp_addflag=' $pic_flag' - tmp_sharedflag='-shared' - case $cc_basename,$host_cpu in - pgcc*) # Portland Group C compiler -- whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' -+ whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' - tmp_addflag=' $pic_flag' - ;; -- pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers -- whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' -+ pgf77* | pgf90* | pgf95* | pgfortran*) -+ # Portland Group f77 and f90 compilers -+ whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' - tmp_addflag=' $pic_flag -Mnomain' ;; - ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 - tmp_addflag=' -i_dynamic' ;; -@@ -10126,13 +9906,17 @@ _LT_EOF - lf95*) # Lahey Fortran 8.1 - whole_archive_flag_spec= - tmp_sharedflag='--shared' ;; -- xl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below) -+ xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below) - tmp_sharedflag='-qmkshrobj' - tmp_addflag= ;; -+ nvcc*) # Cuda Compiler Driver 2.2 -+ whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' -+ compiler_needs_object=yes -+ ;; - esac - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) # Sun C 5.9 -- whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' -+ whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' - compiler_needs_object=yes - tmp_sharedflag='-G' ;; - *Sun\ F*) # Sun Fortran 8.3 -@@ -10148,17 +9932,16 @@ _LT_EOF - fi - - case $cc_basename in -- xlf*) -+ xlf* | bgf* | bgxlf* | mpixlf*) - # IBM XL Fortran 10.1 on PPC cannot create shared libs itself - whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' -- hardcode_libdir_flag_spec= -- hardcode_libdir_flag_spec_ld='-rpath $libdir' -- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' -+ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' -+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then - archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ -- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' -+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' - fi - ;; - esac -@@ -10167,13 +9950,13 @@ _LT_EOF - fi - ;; - -- netbsd*) -+ netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= - else -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - fi - ;; - -@@ -10191,8 +9974,8 @@ _LT_EOF - - _LT_EOF - elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi -@@ -10238,8 +10021,8 @@ _LT_EOF - - *) - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi -@@ -10279,8 +10062,10 @@ _LT_EOF - else - # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm -+ # Also, AIX nm treats weak defined symbols like other global -+ # defined symbols, whereas GNU nm marks them as "W". - if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then -- export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' -+ export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' - else - export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' - fi -@@ -10342,6 +10127,7 @@ _LT_EOF - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' - fi -+ link_all_deplibs=no - else - # not using gcc - if test "$host_cpu" = ia64; then -@@ -10367,11 +10153,13 @@ _LT_EOF - allow_undefined_flag='-berok' - # Determine the default libpath from the value encoded in an - # empty executable. -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ if test "${lt_cv_aix_libpath+set}" = set; then -+ aix_libpath=$lt_cv_aix_libpath -+else -+ if ${lt_cv_aix_libpath_+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -10382,54 +10170,34 @@ main () - return 0; - } - _ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (ac_try="$ac_link" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_link") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -- --lt_aix_libpath_sed=' -- /Import File Strings/,/^$/ { -- /^0/ { -- s/^0 *\(.*\)$/\1/ -- p -- } -- }' --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --# Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then -- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --fi --else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -+if ac_fn_c_try_link "$LINENO"; then : - -+ lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\([^ ]*\) *$/\1/ -+ p -+ } -+ }' -+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ # Check for a 64-bit object if we didn't find anything. -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ fi -+fi -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_="/usr/lib:/lib" -+ fi - - fi - --rm -rf conftest.dSYM --rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -- conftest$ac_exeext conftest.$ac_ext --if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ aix_libpath=$lt_cv_aix_libpath_ -+fi - - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" -- archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -+ archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" - else - if test "$host_cpu" = ia64; then - hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' -@@ -10438,11 +10206,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - else - # Determine the default libpath from the value encoded in an - # empty executable. -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ if test "${lt_cv_aix_libpath+set}" = set; then -+ aix_libpath=$lt_cv_aix_libpath -+else -+ if ${lt_cv_aix_libpath_+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -10453,59 +10223,44 @@ main () - return 0; - } - _ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (ac_try="$ac_link" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_link") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -- --lt_aix_libpath_sed=' -- /Import File Strings/,/^$/ { -- /^0/ { -- s/^0 *\(.*\)$/\1/ -- p -- } -- }' --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --# Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then -- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --fi --else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -+if ac_fn_c_try_link "$LINENO"; then : - -+ lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\([^ ]*\) *$/\1/ -+ p -+ } -+ }' -+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ # Check for a 64-bit object if we didn't find anything. -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ fi -+fi -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+ if test -z "$lt_cv_aix_libpath_"; then -+ lt_cv_aix_libpath_="/usr/lib:/lib" -+ fi - - fi - --rm -rf conftest.dSYM --rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -- conftest$ac_exeext conftest.$ac_ext --if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ aix_libpath=$lt_cv_aix_libpath_ -+fi - - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, - # -berok will link without error, but may produce a broken library. - no_undefined_flag=' ${wl}-bernotok' - allow_undefined_flag=' ${wl}-berok' -- # Exported symbols can be pulled into shared objects from archives -- whole_archive_flag_spec='$convenience' -+ if test "$with_gnu_ld" = yes; then -+ # We only use this code for GNU lds that support --whole-archive. -+ whole_archive_flag_spec='${wl}--whole-archive$convenience ${wl}--no-whole-archive' -+ else -+ # Exported symbols can be pulled into shared objects from archives -+ whole_archive_flag_spec='$convenience' -+ fi - archive_cmds_need_lc=yes - # This is similar to how AIX traditionally builds its shared libraries. - archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' -@@ -10537,20 +10292,64 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - # Microsoft Visual C++. - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. -- hardcode_libdir_flag_spec=' ' -- allow_undefined_flag=unsupported -- # Tell ltmain to make .lib files, not .a files. -- libext=lib -- # Tell ltmain to make .dll files, not .so files. -- shrext_cmds=".dll" -- # FIXME: Setting linknames here is a bad hack. -- archive_cmds='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames=' -- # The linker will automatically build a .lib file if we build a DLL. -- old_archive_from_new_cmds='true' -- # FIXME: Should let the user specify the lib program. -- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' -- fix_srcfile_path='`cygpath -w "$srcfile"`' -- enable_shared_with_static_runtimes=yes -+ case $cc_basename in -+ cl*) -+ # Native MSVC -+ hardcode_libdir_flag_spec=' ' -+ allow_undefined_flag=unsupported -+ always_export_symbols=yes -+ file_list_spec='@' -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' -+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; -+ else -+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; -+ fi~ -+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ -+ linknames=' -+ # The linker will not automatically build a static lib if we build a DLL. -+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true' -+ enable_shared_with_static_runtimes=yes -+ exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' -+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' -+ # Don't use ranlib -+ old_postinstall_cmds='chmod 644 $oldlib' -+ postlink_cmds='lt_outputfile="@OUTPUT@"~ -+ lt_tool_outputfile="@TOOL_OUTPUT@"~ -+ case $lt_outputfile in -+ *.exe|*.EXE) ;; -+ *) -+ lt_outputfile="$lt_outputfile.exe" -+ lt_tool_outputfile="$lt_tool_outputfile.exe" -+ ;; -+ esac~ -+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then -+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; -+ $RM "$lt_outputfile.manifest"; -+ fi' -+ ;; -+ *) -+ # Assume MSVC wrapper -+ hardcode_libdir_flag_spec=' ' -+ allow_undefined_flag=unsupported -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' -+ # The linker will automatically build a .lib file if we build a DLL. -+ old_archive_from_new_cmds='true' -+ # FIXME: Should let the user specify the lib program. -+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' -+ enable_shared_with_static_runtimes=yes -+ ;; -+ esac - ;; - - darwin* | rhapsody*) -@@ -10560,7 +10359,12 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - hardcode_direct=no - hardcode_automatic=yes - hardcode_shlibpath_var=unsupported -- whole_archive_flag_spec='' -+ if test "$lt_cv_ld_force_load" = "yes"; then -+ whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' -+ -+ else -+ whole_archive_flag_spec='' -+ fi - link_all_deplibs=yes - allow_undefined_flag="$_lt_dar_allow_undefined" - case $cc_basename in -@@ -10568,7 +10372,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - *) _lt_dar_can_shared=$GCC ;; - esac - if test "$_lt_dar_can_shared" = "yes"; then -- output_verbose_link_cmd=echo -+ output_verbose_link_cmd=func_echo_all - archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" - module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" - archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -@@ -10586,10 +10390,6 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - hardcode_shlibpath_var=no - ;; - -- freebsd1*) -- ld_shlibs=no -- ;; -- - # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor - # support. Future versions do this automatically, but an explicit c++rt0.o - # does not break anything, and helps significantly (at the cost of a little -@@ -10602,7 +10402,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - ;; - - # Unfortunately, older versions of FreeBSD 2 do not have this feature. -- freebsd2*) -+ freebsd2.*) - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct=yes - hardcode_minus_L=yes -@@ -10611,7 +10411,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly*) -- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - hardcode_shlibpath_var=no -@@ -10619,7 +10419,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - - hpux9*) - if test "$GCC" = yes; then -- archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - fi -@@ -10634,14 +10434,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - ;; - - hpux10*) -- if test "$GCC" = yes -a "$with_gnu_ld" = no; then -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ if test "$GCC" = yes && test "$with_gnu_ld" = no; then -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' - fi - if test "$with_gnu_ld" = no; then - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' -- hardcode_libdir_flag_spec_ld='+b $libdir' - hardcode_libdir_separator=: - hardcode_direct=yes - hardcode_direct_absolute=yes -@@ -10653,16 +10452,16 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - ;; - - hpux11*) -- if test "$GCC" = yes -a "$with_gnu_ld" = no; then -+ if test "$GCC" = yes && test "$with_gnu_ld" = no; then - case $host_cpu in - hppa*64*) - archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - else -@@ -10674,7 +10473,46 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) -- archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ -+ # Older versions of the 11.00 compiler do not understand -b yet -+ # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5 -+$as_echo_n "checking if $CC understands -b... " >&6; } -+if ${lt_cv_prog_compiler__b+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_prog_compiler__b=no -+ save_LDFLAGS="$LDFLAGS" -+ LDFLAGS="$LDFLAGS -b" -+ echo "$lt_simple_link_test_code" > conftest.$ac_ext -+ if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then -+ # The linker can only warn and ignore the option if not recognized -+ # So say no if there are warnings -+ if test -s conftest.err; then -+ # Append any errors to the config.log. -+ cat conftest.err 1>&5 -+ $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp -+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 -+ if diff conftest.exp conftest.er2 >/dev/null; then -+ lt_cv_prog_compiler__b=yes -+ fi -+ else -+ lt_cv_prog_compiler__b=yes -+ fi -+ fi -+ $RM -r conftest* -+ LDFLAGS="$save_LDFLAGS" -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5 -+$as_echo "$lt_cv_prog_compiler__b" >&6; } -+ -+if test x"$lt_cv_prog_compiler__b" = xyes; then -+ archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+else -+ archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' -+fi -+ - ;; - esac - fi -@@ -10702,52 +10540,39 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - - irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - # Try to use the -exported_symbol ld option, if it does not - # work, assume that -exports_file does not work either and - # implicitly export all symbols. -- save_LDFLAGS="$LDFLAGS" -- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" -- cat >conftest.$ac_ext <<_ACEOF --int foo(void) {} -+ # This should be the same for all languages, so no per-tag cache variable. -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 -+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } -+if ${lt_cv_irix_exported_symbol+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ save_LDFLAGS="$LDFLAGS" -+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+int foo (void) { return 0; } - _ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (ac_try="$ac_link" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_link") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' -- -+if ac_fn_c_try_link "$LINENO"; then : -+ lt_cv_irix_exported_symbol=yes - else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- -+ lt_cv_irix_exported_symbol=no - fi -- --rm -rf conftest.dSYM --rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -- conftest$ac_exeext conftest.$ac_ext -- LDFLAGS="$save_LDFLAGS" -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+ LDFLAGS="$save_LDFLAGS" -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 -+$as_echo "$lt_cv_irix_exported_symbol" >&6; } -+ if test "$lt_cv_irix_exported_symbol" = yes; then -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' -+ fi - else -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' -+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' -+ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' - fi - archive_cmds_need_lc='no' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' -@@ -10756,7 +10581,7 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - link_all_deplibs=yes - ;; - -- netbsd*) -+ netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out - else -@@ -10809,17 +10634,17 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - hardcode_libdir_flag_spec='-L$libdir' - hardcode_minus_L=yes - allow_undefined_flag=unsupported -- archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' -+ archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' - old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' - ;; - - osf3*) - if test "$GCC" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' -- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else - allow_undefined_flag=' -expect_unresolved \*' -- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' -+ archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - fi - archive_cmds_need_lc='no' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' -@@ -10829,13 +10654,13 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' -- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - else - allow_undefined_flag=' -expect_unresolved \*' -- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' -+ archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ -- $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' -+ $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' - - # Both c and cxx compiler support -rpath directly - hardcode_libdir_flag_spec='-rpath $libdir' -@@ -10848,9 +10673,9 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - no_undefined_flag=' -z defs' - if test "$GCC" = yes; then - wlarc='${wl}' -- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ -- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' -+ $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' - else - case `$CC -V 2>&1` in - *"Compilers 5.0"*) -@@ -10999,7 +10824,7 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - fi - fi - --{ $as_echo "$as_me:$LINENO: result: $ld_shlibs" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5 - $as_echo "$ld_shlibs" >&6; } - test "$ld_shlibs" = no && can_build_shared=no - -@@ -11036,46 +10861,52 @@ x|xyes) - # Test whether the compiler implicitly links with -lc since on some - # systems, -lgcc has to come before -lc. If gcc already passes -lc - # to ld, don't add -lc before -lgcc. -- { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5 - $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } -- $RM conftest* -- echo "$lt_simple_compile_test_code" > conftest.$ac_ext -+if ${lt_cv_archive_cmds_need_lc+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ $RM conftest* -+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext - -- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } 2>conftest.err; then -- soname=conftest -- lib=conftest -- libobjs=conftest.$ac_objext -- deplibs= -- wl=$lt_prog_compiler_wl -- pic_flag=$lt_prog_compiler_pic -- compiler_flags=-v -- linker_flags=-v -- verstring= -- output_objdir=. -- libname=conftest -- lt_save_allow_undefined_flag=$allow_undefined_flag -- allow_undefined_flag= -- if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\"") >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } 2>conftest.err; then -+ soname=conftest -+ lib=conftest -+ libobjs=conftest.$ac_objext -+ deplibs= -+ wl=$lt_prog_compiler_wl -+ pic_flag=$lt_prog_compiler_pic -+ compiler_flags=-v -+ linker_flags=-v -+ verstring= -+ output_objdir=. -+ libname=conftest -+ lt_save_allow_undefined_flag=$allow_undefined_flag -+ allow_undefined_flag= -+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5 - (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5 - ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } -- then -- archive_cmds_need_lc=no -- else -- archive_cmds_need_lc=yes -- fi -- allow_undefined_flag=$lt_save_allow_undefined_flag -- else -- cat conftest.err 1>&5 -- fi -- $RM conftest* -- { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5 --$as_echo "$archive_cmds_need_lc" >&6; } -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+ then -+ lt_cv_archive_cmds_need_lc=no -+ else -+ lt_cv_archive_cmds_need_lc=yes -+ fi -+ allow_undefined_flag=$lt_save_allow_undefined_flag -+ else -+ cat conftest.err 1>&5 -+ fi -+ $RM conftest* -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5 -+$as_echo "$lt_cv_archive_cmds_need_lc" >&6; } -+ archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc - ;; - esac - fi -@@ -11233,12 +11064,7 @@ esac - - - -- -- -- -- -- -- { $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 - $as_echo_n "checking dynamic linker characteristics... " >&6; } - - if test "$GCC" = yes; then -@@ -11246,16 +11072,23 @@ if test "$GCC" = yes; then - darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; - *) lt_awk_arg="/^libraries:/" ;; - esac -- lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"` -- if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then -+ case $host_os in -+ mingw* | cegcc*) lt_sed_strip_eq="s,=\([A-Za-z]:\),\1,g" ;; -+ *) lt_sed_strip_eq="s,=/,/,g" ;; -+ esac -+ lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq` -+ case $lt_search_path_spec in -+ *\;*) - # if the path contains ";" then we assume it to be the separator - # otherwise default to the standard path separator (i.e. ":") - it is - # assumed that no part of a normal pathname contains ";" but that should - # okay in the real world where ";" in dirpaths is itself problematic. -- lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'` -- else -- lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -- fi -+ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'` -+ ;; -+ *) -+ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"` -+ ;; -+ esac - # Ok, now we have the path, separated by spaces, we can step through it - # and add multilib dir if necessary. - lt_tmp_lt_search_path_spec= -@@ -11268,7 +11101,7 @@ if test "$GCC" = yes; then - lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" - fi - done -- lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk ' -+ lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' - BEGIN {RS=" "; FS="/|\n";} { - lt_foo=""; - lt_count=0; -@@ -11288,7 +11121,13 @@ BEGIN {RS=" "; FS="/|\n";} { - if (lt_foo != "") { lt_freq[lt_foo]++; } - if (lt_freq[lt_foo] == 1) { print lt_foo; } - }'` -- sys_lib_search_path_spec=`$ECHO $lt_search_path_spec` -+ # AWK program above erroneously prepends '/' to C:/dos/paths -+ # for these hosts. -+ case $host_os in -+ mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\ -+ $SED 's,/\([A-Za-z]:\),\1,g'` ;; -+ esac -+ sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP` - else - sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" - fi -@@ -11314,7 +11153,7 @@ need_version=unknown - - case $host_os in - aix3*) -- version_type=linux -+ version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' - shlibpath_var=LIBPATH - -@@ -11323,7 +11162,7 @@ aix3*) - ;; - - aix[4-9]*) -- version_type=linux -+ version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - hardcode_into_libs=yes -@@ -11376,7 +11215,7 @@ amigaos*) - m68k) - library_names_spec='$libname.ixlibrary $libname.a' - # Create ${libname}_ixlibrary.a entries in /sys/libs. -- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' -+ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' - ;; - esac - ;; -@@ -11388,7 +11227,7 @@ beos*) - ;; - - bsdi[45]*) -- version_type=linux -+ version_type=linux # correct to gnu/linux during the next big refactor - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' -@@ -11407,8 +11246,9 @@ cygwin* | mingw* | pw32* | cegcc*) - need_version=no - need_lib_prefix=no - -- case $GCC,$host_os in -- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) -+ case $GCC,$cc_basename in -+ yes,*) -+ # gcc - library_names_spec='$libname.dll.a' - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ -@@ -11429,36 +11269,83 @@ cygwin* | mingw* | pw32* | cegcc*) - cygwin*) - # Cygwin DLLs use 'cyg' prefix rather than 'lib' - soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -- sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" -+ -+ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api" - ;; - mingw* | cegcc*) - # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -- sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` -- if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then -- # It is most probably a Windows format PATH printed by -- # mingw gcc, but we are running on Cygwin. Gcc prints its search -- # path with ; separators, and with drive letters. We can handle the -- # drive letters (cygwin fileutils understands them), so leave them, -- # especially as we might pass files found there to a mingw objdump, -- # which wouldn't understand a cygwinified path. Ahh. -- sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` -- else -- sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -- fi - ;; - pw32*) - # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - ;; - esac -+ dynamic_linker='Win32 ld.exe' -+ ;; -+ -+ *,cl*) -+ # Native MSVC -+ libname_spec='$name' -+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -+ library_names_spec='${libname}.dll.lib' -+ -+ case $build_os in -+ mingw*) -+ sys_lib_search_path_spec= -+ lt_save_ifs=$IFS -+ IFS=';' -+ for lt_path in $LIB -+ do -+ IFS=$lt_save_ifs -+ # Let DOS variable expansion print the short 8.3 style file name. -+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` -+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" -+ done -+ IFS=$lt_save_ifs -+ # Convert to MSYS style. -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` -+ ;; -+ cygwin*) -+ # Convert to unix form, then to dos form, then back to unix form -+ # but this time dos style (no spaces!) so that the unix form looks -+ # like /cygdrive/c/PROGRA~1:/cygdr... -+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` -+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` -+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ ;; -+ *) -+ sys_lib_search_path_spec="$LIB" -+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then -+ # It is most probably a Windows format PATH. -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` -+ else -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ fi -+ # FIXME: find the short name or the path components, as spaces are -+ # common. (e.g. "Program Files" -> "PROGRA~1") -+ ;; -+ esac -+ -+ # DLL is installed to $(libdir)/../bin by postinstall_cmds -+ postinstall_cmds='base_file=`basename \${file}`~ -+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ -+ dldir=$destdir/`dirname \$dlpath`~ -+ test -d \$dldir || mkdir -p \$dldir~ -+ $install_prog $dir/$dlname \$dldir/$dlname' -+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ -+ dlpath=$dir/\$dldll~ -+ $RM \$dlpath' -+ shlibpath_overrides_runpath=yes -+ dynamic_linker='Win32 link.exe' - ;; - - *) -+ # Assume MSVC wrapper - library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' -+ dynamic_linker='Win32 ld.exe' - ;; - esac -- dynamic_linker='Win32 ld.exe' - # FIXME: first we should search . and the directory the executable is in - shlibpath_var=PATH - ;; -@@ -11479,7 +11366,7 @@ darwin* | rhapsody*) - ;; - - dgux*) -- version_type=linux -+ version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' -@@ -11487,10 +11374,6 @@ dgux*) - shlibpath_var=LD_LIBRARY_PATH - ;; - --freebsd1*) -- dynamic_linker=no -- ;; -- - freebsd* | dragonfly*) - # DragonFly does not have aout. When/if they implement a new - # versioning mechanism, adjust this. -@@ -11498,7 +11381,7 @@ freebsd* | dragonfly*) - objformat=`/usr/bin/objformat` - else - case $host_os in -- freebsd[123]*) objformat=aout ;; -+ freebsd[23].*) objformat=aout ;; - *) objformat=elf ;; - esac - fi -@@ -11516,7 +11399,7 @@ freebsd* | dragonfly*) - esac - shlibpath_var=LD_LIBRARY_PATH - case $host_os in -- freebsd2*) -+ freebsd2.*) - shlibpath_overrides_runpath=yes - ;; - freebsd3.[01]* | freebsdelf3.[01]*) -@@ -11535,13 +11418,16 @@ freebsd* | dragonfly*) - esac - ;; - --gnu*) -- version_type=linux -+haiku*) -+ version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no -+ dynamic_linker="$host_os runtime_loader" - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' -- shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_var=LIBRARY_PATH -+ shlibpath_overrides_runpath=yes -+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' - hardcode_into_libs=yes - ;; - -@@ -11587,12 +11473,14 @@ hpux9* | hpux10* | hpux11*) - soname_spec='${libname}${release}${shared_ext}$major' - ;; - esac -- # HP-UX runs *really* slowly unless shared libraries are mode 555. -+ # HP-UX runs *really* slowly unless shared libraries are mode 555, ... - postinstall_cmds='chmod 555 $lib' -+ # or fails outright, so override atomically: -+ install_override_mode=555 - ;; - - interix[3-9]*) -- version_type=linux -+ version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -@@ -11608,7 +11496,7 @@ irix5* | irix6* | nonstopux*) - nonstopux*) version_type=nonstopux ;; - *) - if test "$lt_cv_prog_gnu_ld" = yes; then -- version_type=linux -+ version_type=linux # correct to gnu/linux during the next big refactor - else - version_type=irix - fi ;; -@@ -11645,9 +11533,9 @@ linux*oldld* | linux*aout* | linux*coff*) - dynamic_linker=no - ;; - --# This must be Linux ELF. --linux* | k*bsd*-gnu) -- version_type=linux -+# This must be glibc/ELF. -+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) -+ version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -@@ -11655,16 +11543,17 @@ linux* | k*bsd*-gnu) - finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no -+ - # Some binutils ld are patched to set DT_RUNPATH -- save_LDFLAGS=$LDFLAGS -- save_libdir=$libdir -- eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \ -- LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\"" -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ if ${lt_cv_shlibpath_overrides_runpath+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_shlibpath_overrides_runpath=no -+ save_LDFLAGS=$LDFLAGS -+ save_libdir=$libdir -+ eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \ -+ LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\"" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -11675,56 +11564,29 @@ main () - return 0; - } - _ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (ac_try="$ac_link" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_link") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -- if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then -- shlibpath_overrides_runpath=yes -+if ac_fn_c_try_link "$LINENO"; then : -+ if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then : -+ lt_cv_shlibpath_overrides_runpath=yes - fi -- --else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -+fi -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+ LDFLAGS=$save_LDFLAGS -+ libdir=$save_libdir - - fi - --rm -rf conftest.dSYM --rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -- conftest$ac_exeext conftest.$ac_ext -- LDFLAGS=$save_LDFLAGS -- libdir=$save_libdir -+ shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath - - # This implies no fast_install, which is unacceptable. - # Some rework will be needed to allow for fast_install - # before this can be enabled. - hardcode_into_libs=yes - -- # Add ABI-specific directories to the system library path. -- sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" -- - # Append ld.so.conf contents to the search path - if test -f /etc/ld.so.conf; then -- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` -- sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" -+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` -+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" - fi - - # We used to test for /lib/ld.so.1 and disable shared libraries on -@@ -11736,6 +11598,18 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - dynamic_linker='GNU/Linux ld.so' - ;; - -+netbsdelf*-gnu) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no -+ hardcode_into_libs=yes -+ dynamic_linker='NetBSD ld.elf_so' -+ ;; -+ - netbsd*) - version_type=sunos - need_lib_prefix=no -@@ -11755,7 +11629,7 @@ netbsd*) - ;; - - newsos6) -- version_type=linux -+ version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes -@@ -11824,7 +11698,7 @@ rdos*) - ;; - - solaris*) -- version_type=linux -+ version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -@@ -11849,7 +11723,7 @@ sunos4*) - ;; - - sysv4 | sysv4.3*) -- version_type=linux -+ version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH -@@ -11873,7 +11747,7 @@ sysv4 | sysv4.3*) - - sysv4*MP*) - if test -d /usr/nec ;then -- version_type=linux -+ version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' - soname_spec='$libname${shared_ext}.$major' - shlibpath_var=LD_LIBRARY_PATH -@@ -11904,7 +11778,7 @@ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - - tpf*) - # TPF is a cross-target only. Preferred cross-host = GNU/Linux. -- version_type=linux -+ version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -@@ -11914,7 +11788,7 @@ tpf*) - ;; - - uts4*) -- version_type=linux -+ version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH -@@ -11924,7 +11798,7 @@ uts4*) - dynamic_linker=no - ;; - esac --{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 - $as_echo "$dynamic_linker" >&6; } - test "$dynamic_linker" = no && can_build_shared=no - -@@ -12026,7 +11900,12 @@ fi - - - -- { $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 -+ -+ -+ -+ -+ -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5 - $as_echo_n "checking how to hardcode library paths into programs... " >&6; } - hardcode_action= - if test -n "$hardcode_libdir_flag_spec" || -@@ -12051,7 +11930,7 @@ else - # directories. - hardcode_action=unsupported - fi --{ $as_echo "$as_me:$LINENO: result: $hardcode_action" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5 - $as_echo "$hardcode_action" >&6; } - - if test "$hardcode_action" = relink || -@@ -12096,18 +11975,14 @@ else - - darwin*) - # if libdl is installed we need to link against it -- { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 - $as_echo_n "checking for dlopen in -ldl... " >&6; } --if test "${ac_cv_lib_dl_dlopen+set}" = set; then -+if ${ac_cv_lib_dl_dlopen+:} false; then : - $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS - LIBS="-ldl $LIBS" --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - /* Override any GCC internal prototype to avoid an error. -@@ -12125,43 +12000,18 @@ return dlopen (); - return 0; - } - _ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (ac_try="$ac_link" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_link") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -+if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_dl_dlopen=yes - else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_cv_lib_dl_dlopen=no -+ ac_cv_lib_dl_dlopen=no - fi -- --rm -rf conftest.dSYM --rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -- conftest$ac_exeext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 - $as_echo "$ac_cv_lib_dl_dlopen" >&6; } --if test "x$ac_cv_lib_dl_dlopen" = x""yes; then -+if test "x$ac_cv_lib_dl_dlopen" = xyes; then : - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" - else - -@@ -12174,33 +12024,19 @@ fi - ;; - - *) -- { $as_echo "$as_me:$LINENO: checking for shl_load" >&5 --$as_echo_n "checking for shl_load... " >&6; } --if test "${ac_cv_func_shl_load+set}" = set; then -+ ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load" -+if test "x$ac_cv_func_shl_load" = xyes; then : -+ lt_cv_dlopen="shl_load" -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5 -+$as_echo_n "checking for shl_load in -ldld... " >&6; } -+if ${ac_cv_lib_dld_shl_load+:} false; then : - $as_echo_n "(cached) " >&6 - else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-ldld $LIBS" -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ --/* Define shl_load to an innocuous variant, in case declares shl_load. -- For example, HP-UX 11i declares gettimeofday. */ --#define shl_load innocuous_shl_load -- --/* System header to define __stub macros and hopefully few prototypes, -- which can conflict with char shl_load (); below. -- Prefer to if __STDC__ is defined, since -- exists even on freestanding compilers. */ -- --#ifdef __STDC__ --# include --#else --# include --#endif -- --#undef shl_load - - /* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC -@@ -12209,13 +12045,6 @@ cat >>conftest.$ac_ext <<_ACEOF - extern "C" - #endif - char shl_load (); --/* The GNU C library defines this for functions which it implements -- to always fail with ENOSYS. Some functions are actually named -- something starting with __ and the normal name is an alias. */ --#if defined __stub_shl_load || defined __stub___shl_load --choke me --#endif -- - int - main () - { -@@ -12224,212 +12053,32 @@ return shl_load (); - return 0; - } - _ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (ac_try="$ac_link" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_link") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -- ac_cv_func_shl_load=yes -+if ac_fn_c_try_link "$LINENO"; then : -+ ac_cv_lib_dld_shl_load=yes - else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_cv_func_shl_load=no --fi -- --rm -rf conftest.dSYM --rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -- conftest$ac_exeext conftest.$ac_ext --fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 --$as_echo "$ac_cv_func_shl_load" >&6; } --if test "x$ac_cv_func_shl_load" = x""yes; then -- lt_cv_dlopen="shl_load" --else -- { $as_echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 --$as_echo_n "checking for shl_load in -ldld... " >&6; } --if test "${ac_cv_lib_dld_shl_load+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-ldld $LIBS" --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -- --/* Override any GCC internal prototype to avoid an error. -- Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ --#ifdef __cplusplus --extern "C" --#endif --char shl_load (); --int --main () --{ --return shl_load (); -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (ac_try="$ac_link" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_link") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -- ac_cv_lib_dld_shl_load=yes --else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_cv_lib_dld_shl_load=no -+ ac_cv_lib_dld_shl_load=no - fi -- --rm -rf conftest.dSYM --rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -- conftest$ac_exeext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5 - $as_echo "$ac_cv_lib_dld_shl_load" >&6; } --if test "x$ac_cv_lib_dld_shl_load" = x""yes; then -+if test "x$ac_cv_lib_dld_shl_load" = xyes; then : - lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" - else -- { $as_echo "$as_me:$LINENO: checking for dlopen" >&5 --$as_echo_n "checking for dlopen... " >&6; } --if test "${ac_cv_func_dlopen+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --/* Define dlopen to an innocuous variant, in case declares dlopen. -- For example, HP-UX 11i declares gettimeofday. */ --#define dlopen innocuous_dlopen -- --/* System header to define __stub macros and hopefully few prototypes, -- which can conflict with char dlopen (); below. -- Prefer to if __STDC__ is defined, since -- exists even on freestanding compilers. */ -- --#ifdef __STDC__ --# include --#else --# include --#endif -- --#undef dlopen -- --/* Override any GCC internal prototype to avoid an error. -- Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ --#ifdef __cplusplus --extern "C" --#endif --char dlopen (); --/* The GNU C library defines this for functions which it implements -- to always fail with ENOSYS. Some functions are actually named -- something starting with __ and the normal name is an alias. */ --#if defined __stub_dlopen || defined __stub___dlopen --choke me --#endif -- --int --main () --{ --return dlopen (); -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (ac_try="$ac_link" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_link") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -- ac_cv_func_dlopen=yes --else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_cv_func_dlopen=no --fi -- --rm -rf conftest.dSYM --rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -- conftest$ac_exeext conftest.$ac_ext --fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 --$as_echo "$ac_cv_func_dlopen" >&6; } --if test "x$ac_cv_func_dlopen" = x""yes; then -+ ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen" -+if test "x$ac_cv_func_dlopen" = xyes; then : - lt_cv_dlopen="dlopen" - else -- { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 - $as_echo_n "checking for dlopen in -ldl... " >&6; } --if test "${ac_cv_lib_dl_dlopen+set}" = set; then -+if ${ac_cv_lib_dl_dlopen+:} false; then : - $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS - LIBS="-ldl $LIBS" --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - /* Override any GCC internal prototype to avoid an error. -@@ -12447,57 +12096,28 @@ return dlopen (); - return 0; - } - _ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (ac_try="$ac_link" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_link") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -+if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_dl_dlopen=yes - else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_cv_lib_dl_dlopen=no -+ ac_cv_lib_dl_dlopen=no - fi -- --rm -rf conftest.dSYM --rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -- conftest$ac_exeext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 - $as_echo "$ac_cv_lib_dl_dlopen" >&6; } --if test "x$ac_cv_lib_dl_dlopen" = x""yes; then -+if test "x$ac_cv_lib_dl_dlopen" = xyes; then : - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" - else -- { $as_echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5 - $as_echo_n "checking for dlopen in -lsvld... " >&6; } --if test "${ac_cv_lib_svld_dlopen+set}" = set; then -+if ${ac_cv_lib_svld_dlopen+:} false; then : - $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS - LIBS="-lsvld $LIBS" --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - /* Override any GCC internal prototype to avoid an error. -@@ -12515,57 +12135,28 @@ return dlopen (); - return 0; - } - _ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (ac_try="$ac_link" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_link") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -+if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_svld_dlopen=yes - else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_cv_lib_svld_dlopen=no -+ ac_cv_lib_svld_dlopen=no - fi -- --rm -rf conftest.dSYM --rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -- conftest$ac_exeext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5 - $as_echo "$ac_cv_lib_svld_dlopen" >&6; } --if test "x$ac_cv_lib_svld_dlopen" = x""yes; then -+if test "x$ac_cv_lib_svld_dlopen" = xyes; then : - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" - else -- { $as_echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5 - $as_echo_n "checking for dld_link in -ldld... " >&6; } --if test "${ac_cv_lib_dld_dld_link+set}" = set; then -+if ${ac_cv_lib_dld_dld_link+:} false; then : - $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS - LIBS="-ldld $LIBS" --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - /* Override any GCC internal prototype to avoid an error. -@@ -12583,43 +12174,18 @@ return dld_link (); - return 0; - } - _ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (ac_try="$ac_link" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_link") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -+if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_dld_dld_link=yes - else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_cv_lib_dld_dld_link=no -+ ac_cv_lib_dld_dld_link=no - fi -- --rm -rf conftest.dSYM --rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -- conftest$ac_exeext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5 - $as_echo "$ac_cv_lib_dld_dld_link" >&6; } --if test "x$ac_cv_lib_dld_dld_link" = x""yes; then -+if test "x$ac_cv_lib_dld_dld_link" = xyes; then : - lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" - fi - -@@ -12658,9 +12224,9 @@ fi - save_LIBS="$LIBS" - LIBS="$lt_cv_dlopen_libs $LIBS" - -- { $as_echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5 - $as_echo_n "checking whether a program can dlopen itself... " >&6; } --if test "${lt_cv_dlopen_self+set}" = set; then -+if ${lt_cv_dlopen_self+:} false; then : - $as_echo_n "(cached) " >&6 - else - if test "$cross_compiling" = yes; then : -@@ -12669,7 +12235,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 12672 "configure" -+#line $LINENO "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -12710,7 +12276,13 @@ else - # endif - #endif - --void fnord() { int i=42;} -+/* When -fvisbility=hidden is used, assume the code has been annotated -+ correspondingly for the symbols needed. */ -+#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) -+int fnord () __attribute__((visibility("default"))); -+#endif -+ -+int fnord () { return 42; } - int main () - { - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -12719,7 +12291,11 @@ int main () - if (self) - { - if (dlsym (self,"fnord")) status = $lt_dlno_uscore; -- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; -+ else -+ { -+ if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; -+ else puts (dlerror ()); -+ } - /* dlclose (self); */ - } - else -@@ -12728,11 +12304,11 @@ int main () - return status; - } - _LT_EOF -- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then - (./conftest; exit; ) >&5 2>/dev/null - lt_status=$? - case x$lt_status in -@@ -12749,14 +12325,14 @@ rm -fr conftest* - - - fi --{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5 - $as_echo "$lt_cv_dlopen_self" >&6; } - - if test "x$lt_cv_dlopen_self" = xyes; then - wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" -- { $as_echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5 - $as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; } --if test "${lt_cv_dlopen_self_static+set}" = set; then -+if ${lt_cv_dlopen_self_static+:} false; then : - $as_echo_n "(cached) " >&6 - else - if test "$cross_compiling" = yes; then : -@@ -12765,7 +12341,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 12768 "configure" -+#line $LINENO "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -12806,7 +12382,13 @@ else - # endif - #endif - --void fnord() { int i=42;} -+/* When -fvisbility=hidden is used, assume the code has been annotated -+ correspondingly for the symbols needed. */ -+#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) -+int fnord () __attribute__((visibility("default"))); -+#endif -+ -+int fnord () { return 42; } - int main () - { - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -12815,7 +12397,11 @@ int main () - if (self) - { - if (dlsym (self,"fnord")) status = $lt_dlno_uscore; -- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; -+ else -+ { -+ if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; -+ else puts (dlerror ()); -+ } - /* dlclose (self); */ - } - else -@@ -12824,11 +12410,11 @@ int main () - return status; - } - _LT_EOF -- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then - (./conftest; exit; ) >&5 2>/dev/null - lt_status=$? - case x$lt_status in -@@ -12845,7 +12431,7 @@ rm -fr conftest* - - - fi --{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5 - $as_echo "$lt_cv_dlopen_self_static" >&6; } - fi - -@@ -12884,12 +12470,12 @@ fi - - striplib= - old_striplib= --{ $as_echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5 - $as_echo_n "checking whether stripping libraries is possible... " >&6; } - if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then - test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" - test -z "$striplib" && striplib="$STRIP --strip-unneeded" -- { $as_echo "$as_me:$LINENO: result: yes" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 - $as_echo "yes" >&6; } - else - # FIXME - insert some real tests, host_os isn't really good enough -@@ -12898,15 +12484,15 @@ else - if test -n "$STRIP" ; then - striplib="$STRIP -x" - old_striplib="$STRIP -S" -- { $as_echo "$as_me:$LINENO: result: yes" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 - $as_echo "yes" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } - fi - ;; - *) -- { $as_echo "$as_me:$LINENO: result: no" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } - ;; - esac -@@ -12924,12 +12510,12 @@ fi - - - # Report which library types will actually be built -- { $as_echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5 - $as_echo_n "checking if libtool supports shared libraries... " >&6; } -- { $as_echo "$as_me:$LINENO: result: $can_build_shared" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5 - $as_echo "$can_build_shared" >&6; } - -- { $as_echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5 - $as_echo_n "checking whether to build shared libraries... " >&6; } - test "$can_build_shared" = "no" && enable_shared=no - -@@ -12950,14 +12536,14 @@ $as_echo_n "checking whether to build shared libraries... " >&6; } - fi - ;; - esac -- { $as_echo "$as_me:$LINENO: result: $enable_shared" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5 - $as_echo "$enable_shared" >&6; } - -- { $as_echo "$as_me:$LINENO: checking whether to build static libraries" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5 - $as_echo_n "checking whether to build static libraries... " >&6; } - # Make sure either enable_shared or enable_static is yes. - test "$enable_shared" = yes || enable_static=yes -- { $as_echo "$as_me:$LINENO: result: $enable_static" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5 - $as_echo "$enable_static" >&6; } - - -@@ -12972,68 +12558,208 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - - CC="$lt_save_CC" - -- --ac_ext=cpp -+ if test -n "$CXX" && ( test "X$CXX" != "Xno" && -+ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || -+ (test "X$CXX" != "Xg++"))) ; then -+ ac_ext=cpp - ac_cpp='$CXXCPP $CPPFLAGS' - ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' - ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' - ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5 -+$as_echo_n "checking how to run the C++ preprocessor... " >&6; } -+if test -z "$CXXCPP"; then -+ if ${ac_cv_prog_CXXCPP+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ # Double quotes because CXXCPP needs to be expanded -+ for CXXCPP in "$CXX -E" "/lib/cpp" -+ do -+ ac_preproc_ok=false -+for ac_cxx_preproc_warn_flag in '' yes -+do -+ # Use a header file that comes with gcc, so configuring glibc -+ # with a fresh cross-compiler works. -+ # Prefer to if __STDC__ is defined, since -+ # exists even on freestanding compilers. -+ # On the NeXT, cc -E runs the code through the compiler's parser, -+ # not just through cpp. "Syntax error" is here to catch this case. -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#ifdef __STDC__ -+# include -+#else -+# include -+#endif -+ Syntax error -+_ACEOF -+if ac_fn_cxx_try_cpp "$LINENO"; then : - --archive_cmds_need_lc_CXX=no --allow_undefined_flag_CXX= --always_export_symbols_CXX=no --archive_expsym_cmds_CXX= --compiler_needs_object_CXX=no --export_dynamic_flag_spec_CXX= --hardcode_direct_CXX=no --hardcode_direct_absolute_CXX=no --hardcode_libdir_flag_spec_CXX= --hardcode_libdir_flag_spec_ld_CXX= --hardcode_libdir_separator_CXX= --hardcode_minus_L_CXX=no --hardcode_shlibpath_var_CXX=unsupported --hardcode_automatic_CXX=no --inherit_rpath_CXX=no --module_cmds_CXX= --module_expsym_cmds_CXX= --link_all_deplibs_CXX=unknown --old_archive_cmds_CXX=$old_archive_cmds --no_undefined_flag_CXX= --whole_archive_flag_spec_CXX= --enable_shared_with_static_runtimes_CXX=no -- --# Source file extension for C++ test sources. --ac_ext=cpp -- --# Object file extension for compiled C++ test sources. --objext=o --objext_CXX=$objext -- --# No sense in running all these tests if we already determined that --# the CXX compiler isn't working. Some variables (like enable_shared) --# are currently assumed to apply to all compilers on this platform, --# and will be corrupted by setting them based on a non-working compiler. --if test "$_lt_caught_CXX_error" != yes; then -- # Code to be used in simple compile tests -- lt_simple_compile_test_code="int some_variable = 0;" -- -- # Code to be used in simple link tests -- lt_simple_link_test_code='int main(int, char *[]) { return(0); }' -- -- # ltmain only uses $CC for tagged configurations so make sure $CC is set. -- -- -- -- -+else -+ # Broken: fails on valid input. -+continue -+fi -+rm -f conftest.err conftest.i conftest.$ac_ext - -+ # OK, works on sane cases. Now check whether nonexistent headers -+ # can be detected and how. -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include -+_ACEOF -+if ac_fn_cxx_try_cpp "$LINENO"; then : -+ # Broken: success on invalid input. -+continue -+else -+ # Passes both tests. -+ac_preproc_ok=: -+break -+fi -+rm -f conftest.err conftest.i conftest.$ac_ext - --# If no C compiler was specified, use CC. --LTCC=${LTCC-"$CC"} -+done -+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -+rm -f conftest.i conftest.err conftest.$ac_ext -+if $ac_preproc_ok; then : -+ break -+fi - --# If no C compiler flags were specified, use CFLAGS. --LTCFLAGS=${LTCFLAGS-"$CFLAGS"} -+ done -+ ac_cv_prog_CXXCPP=$CXXCPP - --# Allow CC to be a program name with arguments. -+fi -+ CXXCPP=$ac_cv_prog_CXXCPP -+else -+ ac_cv_prog_CXXCPP=$CXXCPP -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5 -+$as_echo "$CXXCPP" >&6; } -+ac_preproc_ok=false -+for ac_cxx_preproc_warn_flag in '' yes -+do -+ # Use a header file that comes with gcc, so configuring glibc -+ # with a fresh cross-compiler works. -+ # Prefer to if __STDC__ is defined, since -+ # exists even on freestanding compilers. -+ # On the NeXT, cc -E runs the code through the compiler's parser, -+ # not just through cpp. "Syntax error" is here to catch this case. -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#ifdef __STDC__ -+# include -+#else -+# include -+#endif -+ Syntax error -+_ACEOF -+if ac_fn_cxx_try_cpp "$LINENO"; then : -+ -+else -+ # Broken: fails on valid input. -+continue -+fi -+rm -f conftest.err conftest.i conftest.$ac_ext -+ -+ # OK, works on sane cases. Now check whether nonexistent headers -+ # can be detected and how. -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include -+_ACEOF -+if ac_fn_cxx_try_cpp "$LINENO"; then : -+ # Broken: success on invalid input. -+continue -+else -+ # Passes both tests. -+ac_preproc_ok=: -+break -+fi -+rm -f conftest.err conftest.i conftest.$ac_ext -+ -+done -+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -+rm -f conftest.i conftest.err conftest.$ac_ext -+if $ac_preproc_ok; then : -+ -+else -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check -+See \`config.log' for more details" "$LINENO" 5; } -+fi -+ -+ac_ext=c -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_c_compiler_gnu -+ -+else -+ _lt_caught_CXX_error=yes -+fi -+ -+ac_ext=cpp -+ac_cpp='$CXXCPP $CPPFLAGS' -+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -+ -+archive_cmds_need_lc_CXX=no -+allow_undefined_flag_CXX= -+always_export_symbols_CXX=no -+archive_expsym_cmds_CXX= -+compiler_needs_object_CXX=no -+export_dynamic_flag_spec_CXX= -+hardcode_direct_CXX=no -+hardcode_direct_absolute_CXX=no -+hardcode_libdir_flag_spec_CXX= -+hardcode_libdir_separator_CXX= -+hardcode_minus_L_CXX=no -+hardcode_shlibpath_var_CXX=unsupported -+hardcode_automatic_CXX=no -+inherit_rpath_CXX=no -+module_cmds_CXX= -+module_expsym_cmds_CXX= -+link_all_deplibs_CXX=unknown -+old_archive_cmds_CXX=$old_archive_cmds -+reload_flag_CXX=$reload_flag -+reload_cmds_CXX=$reload_cmds -+no_undefined_flag_CXX= -+whole_archive_flag_spec_CXX= -+enable_shared_with_static_runtimes_CXX=no -+ -+# Source file extension for C++ test sources. -+ac_ext=cpp -+ -+# Object file extension for compiled C++ test sources. -+objext=o -+objext_CXX=$objext -+ -+# No sense in running all these tests if we already determined that -+# the CXX compiler isn't working. Some variables (like enable_shared) -+# are currently assumed to apply to all compilers on this platform, -+# and will be corrupted by setting them based on a non-working compiler. -+if test "$_lt_caught_CXX_error" != yes; then -+ # Code to be used in simple compile tests -+ lt_simple_compile_test_code="int some_variable = 0;" -+ -+ # Code to be used in simple link tests -+ lt_simple_link_test_code='int main(int, char *[]) { return(0); }' -+ -+ # ltmain only uses $CC for tagged configurations so make sure $CC is set. -+ -+ -+ -+ -+ -+ -+# If no C compiler was specified, use CC. -+LTCC=${LTCC-"$CC"} -+ -+# If no C compiler flags were specified, use CFLAGS. -+LTCFLAGS=${LTCFLAGS-"$CFLAGS"} -+ -+# Allow CC to be a program name with arguments. - compiler=$CC - - -@@ -13053,6 +12779,7 @@ $RM -r conftest* - - # Allow CC to be a program name with arguments. - lt_save_CC=$CC -+ lt_save_CFLAGS=$CFLAGS - lt_save_LD=$LD - lt_save_GCC=$GCC - GCC=$GXX -@@ -13070,6 +12797,7 @@ $RM -r conftest* - fi - test -z "${LDCXX+set}" || LD=$LDCXX - CC=${CXX-"c++"} -+ CFLAGS=$CXXFLAGS - compiler=$CC - compiler_CXX=$CC - for cc_temp in $compiler""; do -@@ -13080,7 +12808,7 @@ $RM -r conftest* - *) break;; - esac - done --cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` -+cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` - - - if test -n "$compiler"; then -@@ -13098,7 +12826,7 @@ cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` - - - # Check whether --with-gnu-ld was given. --if test "${with_gnu_ld+set}" = set; then -+if test "${with_gnu_ld+set}" = set; then : - withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes - else - with_gnu_ld=no -@@ -13107,7 +12835,7 @@ fi - ac_prog=ld - if test "$GCC" = yes; then - # Check if gcc -print-prog-name=ld gives a path. -- { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 - $as_echo_n "checking for ld used by $CC... " >&6; } - case $host in - *-*-mingw*) -@@ -13137,13 +12865,13 @@ $as_echo_n "checking for ld used by $CC... " >&6; } - ;; - esac - elif test "$with_gnu_ld" = yes; then -- { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 - $as_echo_n "checking for GNU ld... " >&6; } - else -- { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 - $as_echo_n "checking for non-GNU ld... " >&6; } - fi --if test "${lt_cv_path_LD+set}" = set; then -+if ${lt_cv_path_LD+:} false; then : - $as_echo_n "(cached) " >&6 - else - if test -z "$LD"; then -@@ -13174,18 +12902,16 @@ fi - - LD="$lt_cv_path_LD" - if test -n "$LD"; then -- { $as_echo "$as_me:$LINENO: result: $LD" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5 - $as_echo "$LD" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } - fi --test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 --$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} -- { (exit 1); exit 1; }; } --{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 -+test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 - $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } --if test "${lt_cv_prog_gnu_ld+set}" = set; then -+if ${lt_cv_prog_gnu_ld+:} false; then : - $as_echo_n "(cached) " >&6 - else - # I'd rather use --version here, but apparently some GNU lds only accept -v. -@@ -13198,7 +12924,7 @@ case `$LD -v 2>&1 &5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5 - $as_echo "$lt_cv_prog_gnu_ld" >&6; } - with_gnu_ld=$lt_cv_prog_gnu_ld - -@@ -13211,8 +12937,8 @@ with_gnu_ld=$lt_cv_prog_gnu_ld - # Check if GNU C++ uses GNU ld as the underlying linker, since the - # archiving commands below assume that GNU ld is being used. - if test "$with_gnu_ld" = yes; then -- archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - - hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' - export_dynamic_flag_spec_CXX='${wl}--export-dynamic' -@@ -13244,7 +12970,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. -- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' -+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' - - else - GXX=no -@@ -13253,7 +12979,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld - fi - - # PORTME: fill in a description of your system's C++ link characteristics -- { $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5 - $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } - ld_shlibs_CXX=yes - case $host_os in -@@ -13354,11 +13080,13 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie - allow_undefined_flag_CXX='-berok' - # Determine the default libpath from the value encoded in an empty - # executable. -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ if test "${lt_cv_aix_libpath+set}" = set; then -+ aix_libpath=$lt_cv_aix_libpath -+else -+ if ${lt_cv_aix_libpath__CXX+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -13369,55 +13097,35 @@ main () - return 0; - } - _ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (ac_try="$ac_link" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_link") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_cxx_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -- --lt_aix_libpath_sed=' -- /Import File Strings/,/^$/ { -- /^0/ { -- s/^0 *\(.*\)$/\1/ -- p -- } -- }' --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --# Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then -- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --fi --else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -+if ac_fn_cxx_try_link "$LINENO"; then : - -+ lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\([^ ]*\) *$/\1/ -+ p -+ } -+ }' -+ lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ # Check for a 64-bit object if we didn't find anything. -+ if test -z "$lt_cv_aix_libpath__CXX"; then -+ lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ fi -+fi -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+ if test -z "$lt_cv_aix_libpath__CXX"; then -+ lt_cv_aix_libpath__CXX="/usr/lib:/lib" -+ fi - - fi - --rm -rf conftest.dSYM --rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -- conftest$ac_exeext conftest.$ac_ext --if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ aix_libpath=$lt_cv_aix_libpath__CXX -+fi - - hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" - -- archive_expsym_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -+ archive_expsym_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" - else - if test "$host_cpu" = ia64; then - hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib' -@@ -13426,11 +13134,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - else - # Determine the default libpath from the value encoded in an - # empty executable. -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ if test "${lt_cv_aix_libpath+set}" = set; then -+ aix_libpath=$lt_cv_aix_libpath -+else -+ if ${lt_cv_aix_libpath__CXX+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -13441,59 +13151,44 @@ main () - return 0; - } - _ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (ac_try="$ac_link" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_link") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_cxx_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -- --lt_aix_libpath_sed=' -- /Import File Strings/,/^$/ { -- /^0/ { -- s/^0 *\(.*\)$/\1/ -- p -- } -- }' --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --# Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then -- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --fi --else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -+if ac_fn_cxx_try_link "$LINENO"; then : - -+ lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\([^ ]*\) *$/\1/ -+ p -+ } -+ }' -+ lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ # Check for a 64-bit object if we didn't find anything. -+ if test -z "$lt_cv_aix_libpath__CXX"; then -+ lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ fi -+fi -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+ if test -z "$lt_cv_aix_libpath__CXX"; then -+ lt_cv_aix_libpath__CXX="/usr/lib:/lib" -+ fi - - fi - --rm -rf conftest.dSYM --rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -- conftest$ac_exeext conftest.$ac_ext --if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+ aix_libpath=$lt_cv_aix_libpath__CXX -+fi - - hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, - # -berok will link without error, but may produce a broken library. - no_undefined_flag_CXX=' ${wl}-bernotok' - allow_undefined_flag_CXX=' ${wl}-berok' -- # Exported symbols can be pulled into shared objects from archives -- whole_archive_flag_spec_CXX='$convenience' -+ if test "$with_gnu_ld" = yes; then -+ # We only use this code for GNU lds that support --whole-archive. -+ whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive' -+ else -+ # Exported symbols can be pulled into shared objects from archives -+ whole_archive_flag_spec_CXX='$convenience' -+ fi - archive_cmds_need_lc_CXX=yes - # This is similar to how AIX traditionally builds its shared - # libraries. -@@ -13523,28 +13218,75 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - ;; - - cygwin* | mingw* | pw32* | cegcc*) -- # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless, -- # as there is no search path for DLLs. -- hardcode_libdir_flag_spec_CXX='-L$libdir' -- allow_undefined_flag_CXX=unsupported -- always_export_symbols_CXX=no -- enable_shared_with_static_runtimes_CXX=yes -- -- if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then -- archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -- # If the export-symbols file already is a .def file (1st line -- # is EXPORTS), use it as is; otherwise, prepend... -- archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -- cp $export_symbols $output_objdir/$soname.def; -- else -- echo EXPORTS > $output_objdir/$soname.def; -- cat $export_symbols >> $output_objdir/$soname.def; -- fi~ -- $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -- else -- ld_shlibs_CXX=no -- fi -- ;; -+ case $GXX,$cc_basename in -+ ,cl* | no,cl*) -+ # Native MSVC -+ # hardcode_libdir_flag_spec is actually meaningless, as there is -+ # no search path for DLLs. -+ hardcode_libdir_flag_spec_CXX=' ' -+ allow_undefined_flag_CXX=unsupported -+ always_export_symbols_CXX=yes -+ file_list_spec_CXX='@' -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ archive_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' -+ archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -+ $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; -+ else -+ $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; -+ fi~ -+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ -+ linknames=' -+ # The linker will not automatically build a static lib if we build a DLL. -+ # _LT_TAGVAR(old_archive_from_new_cmds, CXX)='true' -+ enable_shared_with_static_runtimes_CXX=yes -+ # Don't use ranlib -+ old_postinstall_cmds_CXX='chmod 644 $oldlib' -+ postlink_cmds_CXX='lt_outputfile="@OUTPUT@"~ -+ lt_tool_outputfile="@TOOL_OUTPUT@"~ -+ case $lt_outputfile in -+ *.exe|*.EXE) ;; -+ *) -+ lt_outputfile="$lt_outputfile.exe" -+ lt_tool_outputfile="$lt_tool_outputfile.exe" -+ ;; -+ esac~ -+ func_to_tool_file "$lt_outputfile"~ -+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then -+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; -+ $RM "$lt_outputfile.manifest"; -+ fi' -+ ;; -+ *) -+ # g++ -+ # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless, -+ # as there is no search path for DLLs. -+ hardcode_libdir_flag_spec_CXX='-L$libdir' -+ export_dynamic_flag_spec_CXX='${wl}--export-all-symbols' -+ allow_undefined_flag_CXX=unsupported -+ always_export_symbols_CXX=no -+ enable_shared_with_static_runtimes_CXX=yes -+ -+ if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then -+ archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -+ # If the export-symbols file already is a .def file (1st line -+ # is EXPORTS), use it as is; otherwise, prepend... -+ archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -+ cp $export_symbols $output_objdir/$soname.def; -+ else -+ echo EXPORTS > $output_objdir/$soname.def; -+ cat $export_symbols >> $output_objdir/$soname.def; -+ fi~ -+ $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -+ else -+ ld_shlibs_CXX=no -+ fi -+ ;; -+ esac -+ ;; - darwin* | rhapsody*) - - -@@ -13552,7 +13294,12 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - hardcode_direct_CXX=no - hardcode_automatic_CXX=yes - hardcode_shlibpath_var_CXX=unsupported -- whole_archive_flag_spec_CXX='' -+ if test "$lt_cv_ld_force_load" = "yes"; then -+ whole_archive_flag_spec_CXX='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' -+ -+ else -+ whole_archive_flag_spec_CXX='' -+ fi - link_all_deplibs_CXX=yes - allow_undefined_flag_CXX="$_lt_dar_allow_undefined" - case $cc_basename in -@@ -13560,7 +13307,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - *) _lt_dar_can_shared=$GCC ;; - esac - if test "$_lt_dar_can_shared" = "yes"; then -- output_verbose_link_cmd=echo -+ output_verbose_link_cmd=func_echo_all - archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" - module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" - archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -@@ -13594,7 +13341,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - esac - ;; - -- freebsd[12]*) -+ freebsd2.*) - # C++ shared libraries reported to be fairly broken before - # switch to ELF - ld_shlibs_CXX=no -@@ -13610,7 +13357,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - ld_shlibs_CXX=yes - ;; - -- gnu*) -+ haiku*) -+ archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ link_all_deplibs_CXX=yes - ;; - - hpux9*) -@@ -13637,11 +13386,11 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. -- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' -+ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' - ;; - *) - if test "$GXX" = yes; then -- archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no -@@ -13702,7 +13451,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. -- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' -+ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' - ;; - *) - if test "$GXX" = yes; then -@@ -13712,10 +13461,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - ia64*) -- archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - *) -- archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - esac - fi -@@ -13745,7 +13494,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - case $cc_basename in - CC*) - # SGI C++ -- archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' -+ archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - - # Archives containing C++ object files must be created using - # "CC -ar", where "CC" is the IRIX C++ compiler. This is -@@ -13756,9 +13505,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - *) - if test "$GXX" = yes; then - if test "$with_gnu_ld" = no; then -- archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else -- archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -o $lib' -+ archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' - fi - fi - link_all_deplibs_CXX=yes -@@ -13769,7 +13518,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - inherit_rpath_CXX=yes - ;; - -- linux* | k*bsd*-gnu) -+ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) - case $cc_basename in - KCC*) - # Kuck and Associates, Inc. (KAI) C++ Compiler -@@ -13787,7 +13536,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. -- output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' -+ output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' - - hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' - export_dynamic_flag_spec_CXX='${wl}--export-dynamic' -@@ -13824,26 +13573,26 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - pgCC* | pgcpp*) - # Portland Group C++ compiler - case `$CC -V` in -- *pgCC\ [1-5]* | *pgcpp\ [1-5]*) -+ *pgCC\ [1-5].* | *pgcpp\ [1-5].*) - prelink_cmds_CXX='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ -- compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"' -+ compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' - old_archive_cmds_CXX='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ -- $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~ -+ $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ - $RANLIB $oldlib' - archive_cmds_CXX='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ -- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' -+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' - archive_expsym_cmds_CXX='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ -- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' -+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' - ;; -- *) # Version 6 will use weak symbols -+ *) # Version 6 and above use weak symbols - archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' - archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' - ;; -@@ -13851,7 +13600,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - - hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir' - export_dynamic_flag_spec_CXX='${wl}--export-dynamic' -- whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' -+ whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' - ;; - cxx*) - # Compaq C++ -@@ -13870,9 +13619,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. -- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' -+ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed' - ;; -- xl*) -+ xl* | mpixl* | bgxl*) - # IBM XL 8.0 on PPC, with GNU ld - hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' - export_dynamic_flag_spec_CXX='${wl}--export-dynamic' -@@ -13892,13 +13641,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - archive_expsym_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' - hardcode_libdir_flag_spec_CXX='-R$libdir' -- whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' -+ whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' - compiler_needs_object_CXX=yes - - # Not sure whether something based on - # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 - # would be better. -- output_verbose_link_cmd='echo' -+ output_verbose_link_cmd='func_echo_all' - - # Archives containing C++ object files must be created using - # "CC -xar", where "CC" is the Sun C++ compiler. This is -@@ -13967,7 +13716,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - export_dynamic_flag_spec_CXX='${wl}-E' - whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - fi -- output_verbose_link_cmd=echo -+ output_verbose_link_cmd=func_echo_all - else - ld_shlibs_CXX=no - fi -@@ -14002,15 +13751,15 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - case $host in - osf3*) - allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' -- archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' -+ archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' - ;; - *) - allow_undefined_flag_CXX=' -expect_unresolved \*' -- archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' -+ archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ - echo "-hidden">> $lib.exp~ -- $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~ -+ $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~ - $RM $lib.exp' - hardcode_libdir_flag_spec_CXX='-rpath $libdir' - ;; -@@ -14026,17 +13775,17 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. -- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' -+ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' - ;; - *) - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' - case $host in - osf3*) -- archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - ;; - *) -- archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ archive_cmds_CXX='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - ;; - esac - -@@ -14046,7 +13795,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. -- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' -+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' - - else - # FIXME: insert proper C++ library support -@@ -14082,7 +13831,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - - solaris*) - case $cc_basename in -- CC*) -+ CC* | sunCC*) - # Sun C++ 4.2, 5.x and Centerline C++ - archive_cmds_need_lc_CXX=yes - no_undefined_flag_CXX=' -zdefs' -@@ -14103,7 +13852,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - esac - link_all_deplibs_CXX=yes - -- output_verbose_link_cmd='echo' -+ output_verbose_link_cmd='func_echo_all' - - # Archives containing C++ object files must be created using - # "CC -xar", where "CC" is the Sun C++ compiler. This is -@@ -14123,14 +13872,14 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - no_undefined_flag_CXX=' ${wl}-z ${wl}defs' - if $CC --version | $GREP -v '^2\.7' > /dev/null; then -- archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' -+ archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' - archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ -- $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' -+ $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. -- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' -+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' - else - # g++ 2.7 appears to require `-G' NOT `-shared' on this - # platform. -@@ -14141,7 +13890,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. -- output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' -+ output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' - fi - - hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir' -@@ -14195,6 +13944,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - CC*) - archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ old_archive_cmds_CXX='$CC -Tprelink_objects $oldobjs~ -+ '"$old_archive_cmds_CXX" -+ reload_cmds_CXX='$CC -Tprelink_objects $reload_objs~ -+ '"$reload_cmds_CXX" - ;; - *) - archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -@@ -14228,7 +13981,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - ;; - esac - -- { $as_echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5 - $as_echo "$ld_shlibs_CXX" >&6; } - test "$ld_shlibs_CXX" = no && can_build_shared=no - -@@ -14256,11 +14009,19 @@ private: - }; - _LT_EOF - --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -+ -+_lt_libdeps_save_CFLAGS=$CFLAGS -+case "$CC $CFLAGS " in #( -+*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; -+*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; -+*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;; -+esac -+ -+if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; then -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; then - # Parse the compiler output and extract the necessary - # objects, libraries and library flags. - -@@ -14269,7 +14030,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - pre_test_object_deps_done=no - - for p in `eval "$output_verbose_link_cmd"`; do -- case $p in -+ case ${prev}${p} in - - -L* | -R* | -l*) - # Some compilers place space between "-{L,R}" and the path. -@@ -14278,13 +14039,22 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - test $p = "-R"; then - prev=$p - continue -- else -- prev= - fi - -+ # Expand the sysroot to ease extracting the directories later. -+ if test -z "$prev"; then -+ case $p in -+ -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;; -+ -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;; -+ -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;; -+ esac -+ fi -+ case $p in -+ =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;; -+ esac - if test "$pre_test_object_deps_done" = no; then -- case $p in -- -L* | -R*) -+ case ${prev} in -+ -L | -R) - # Internal compiler library paths should come after those - # provided the user. The postdeps already come after the - # user supplied libs so there is no need to process them. -@@ -14304,8 +14074,10 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - postdeps_CXX="${postdeps_CXX} ${prev}${p}" - fi - fi -+ prev= - ;; - -+ *.lto.$objext) ;; # Ignore GCC LTO objects - *.$objext) - # This assumes that the test object file only shows up - # once in the compiler output. -@@ -14341,6 +14113,7 @@ else - fi - - $RM -f confest.$objext -+CFLAGS=$_lt_libdeps_save_CFLAGS - - # PORTME: override above test on systems where it is broken - case $host_os in -@@ -14376,7 +14149,7 @@ linux*) - - solaris*) - case $cc_basename in -- CC*) -+ CC* | sunCC*) - # The more standards-conforming stlport4 library is - # incompatible with the Cstd library. Avoid specifying - # it if it's in CXXFLAGS. Ignore libCrun as -@@ -14441,8 +14214,6 @@ fi - lt_prog_compiler_pic_CXX= - lt_prog_compiler_static_CXX= - --{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 --$as_echo_n "checking for $compiler option to produce PIC... " >&6; } - - # C++ specific cases for pic, static, wl, etc. - if test "$GXX" = yes; then -@@ -14492,6 +14263,11 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } - # DJGPP does not support shared libraries at all - lt_prog_compiler_pic_CXX= - ;; -+ haiku*) -+ # PIC is the default for Haiku. -+ # The "-static" flag exists, but is broken. -+ lt_prog_compiler_static_CXX= -+ ;; - interix[3-9]*) - # Interix 3.x gcc -fpic/-fPIC options generate broken code. - # Instead, we relocate shared libraries at runtime. -@@ -14541,6 +14317,11 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } - ;; - esac - ;; -+ mingw* | cygwin* | os2* | pw32* | cegcc*) -+ # This hack is so that the source file can tell whether it is being -+ # built for inclusion in a dll (and should export symbols for example). -+ lt_prog_compiler_pic_CXX='-DDLL_EXPORT' -+ ;; - dgux*) - case $cc_basename in - ec++*) -@@ -14597,7 +14378,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } - ;; - esac - ;; -- linux* | k*bsd*-gnu) -+ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) - case $cc_basename in - KCC*) - # KAI C++ Compiler -@@ -14630,8 +14411,8 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } - lt_prog_compiler_pic_CXX= - lt_prog_compiler_static_CXX='-non_shared' - ;; -- xlc* | xlC*) -- # IBM XL 8.0 on PPC -+ xlc* | xlC* | bgxl[cC]* | mpixl[cC]*) -+ # IBM XL 8.0, 9.0 on PPC and BlueGene - lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_pic_CXX='-qpic' - lt_prog_compiler_static_CXX='-qstaticlink' -@@ -14661,7 +14442,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } - ;; - esac - ;; -- netbsd*) -+ netbsd* | netbsdelf*-gnu) - ;; - *qnx* | *nto*) - # QNX uses GNU C++, but need to define -shared option too, otherwise -@@ -14693,7 +14474,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } - ;; - solaris*) - case $cc_basename in -- CC*) -+ CC* | sunCC*) - # Sun C++ 4.2, 5.x and Centerline C++ - lt_prog_compiler_pic_CXX='-KPIC' - lt_prog_compiler_static_CXX='-Bstatic' -@@ -14758,18 +14539,25 @@ case $host_os in - lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC" - ;; - esac --{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5 --$as_echo "$lt_prog_compiler_pic_CXX" >&6; } -- - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 -+$as_echo_n "checking for $compiler option to produce PIC... " >&6; } -+if ${lt_cv_prog_compiler_pic_CXX+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_prog_compiler_pic_CXX=$lt_prog_compiler_pic_CXX -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_CXX" >&5 -+$as_echo "$lt_cv_prog_compiler_pic_CXX" >&6; } -+lt_prog_compiler_pic_CXX=$lt_cv_prog_compiler_pic_CXX - - # - # Check to make sure the PIC flag actually works. - # - if test -n "$lt_prog_compiler_pic_CXX"; then -- { $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 - $as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... " >&6; } --if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then -+if ${lt_cv_prog_compiler_pic_works_CXX+:} false; then : - $as_echo_n "(cached) " >&6 - else - lt_cv_prog_compiler_pic_works_CXX=no -@@ -14785,15 +14573,15 @@ else - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:14788: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:14792: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. -- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp -+ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then - lt_cv_prog_compiler_pic_works_CXX=yes -@@ -14802,7 +14590,7 @@ else - $RM conftest* - - fi --{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works_CXX" >&5 - $as_echo "$lt_cv_prog_compiler_pic_works_CXX" >&6; } - - if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then -@@ -14819,13 +14607,15 @@ fi - - - -+ -+ - # - # Check to make sure the static flag actually works. - # - wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\" --{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5 - $as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } --if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then -+if ${lt_cv_prog_compiler_static_works_CXX+:} false; then : - $as_echo_n "(cached) " >&6 - else - lt_cv_prog_compiler_static_works_CXX=no -@@ -14838,7 +14628,7 @@ else - if test -s conftest.err; then - # Append any errors to the config.log. - cat conftest.err 1>&5 -- $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp -+ $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if diff conftest.exp conftest.er2 >/dev/null; then - lt_cv_prog_compiler_static_works_CXX=yes -@@ -14851,7 +14641,7 @@ else - LDFLAGS="$save_LDFLAGS" - - fi --{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_CXX" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works_CXX" >&5 - $as_echo "$lt_cv_prog_compiler_static_works_CXX" >&6; } - - if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then -@@ -14863,9 +14653,9 @@ fi - - - -- { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 - $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } --if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then -+if ${lt_cv_prog_compiler_c_o_CXX+:} false; then : - $as_echo_n "(cached) " >&6 - else - lt_cv_prog_compiler_c_o_CXX=no -@@ -14884,16 +14674,16 @@ else - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:14887: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 -- echo "$as_me:14891: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings -- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp -+ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp - $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 - if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then - lt_cv_prog_compiler_c_o_CXX=yes -@@ -14910,14 +14700,14 @@ else - $RM conftest* - - fi --{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5 - $as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; } - - - -- { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 - $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } --if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then -+if ${lt_cv_prog_compiler_c_o_CXX+:} false; then : - $as_echo_n "(cached) " >&6 - else - lt_cv_prog_compiler_c_o_CXX=no -@@ -14936,16 +14726,16 @@ else - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:14939: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 -- echo "$as_me:14943: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings -- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp -+ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp - $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 - if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then - lt_cv_prog_compiler_c_o_CXX=yes -@@ -14962,7 +14752,7 @@ else - $RM conftest* - - fi --{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5 - $as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; } - - -@@ -14971,7 +14761,7 @@ $as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; } - hard_links="nottested" - if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then - # do not overwrite the value of need_locks provided by the user -- { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5 - $as_echo_n "checking if we can lock with hard links... " >&6; } - hard_links=yes - $RM conftest* -@@ -14979,10 +14769,10 @@ $as_echo_n "checking if we can lock with hard links... " >&6; } - touch conftest.a - ln conftest.a conftest.b 2>&5 || hard_links=no - ln conftest.a conftest.b 2>/dev/null && hard_links=no -- { $as_echo "$as_me:$LINENO: result: $hard_links" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5 - $as_echo "$hard_links" >&6; } - if test "$hard_links" = no; then -- { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 - $as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} - need_locks=warn - fi -@@ -14992,33 +14782,46 @@ fi - - - -- { $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5 - $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } - - export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' -+ exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' - case $host_os in - aix[4-9]*) - # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm -+ # Also, AIX nm treats weak defined symbols like other global defined -+ # symbols, whereas GNU nm marks them as "W". - if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then -- export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' -+ export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' - else - export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' - fi - ;; - pw32*) - export_symbols_cmds_CXX="$ltdll_cmds" -- ;; -+ ;; - cygwin* | mingw* | cegcc*) -- export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' -- ;; -+ case $cc_basename in -+ cl*) -+ exclude_expsyms_CXX='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' -+ ;; -+ *) -+ export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' -+ exclude_expsyms_CXX='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' -+ ;; -+ esac -+ ;; -+ linux* | k*bsd*-gnu | gnu*) -+ link_all_deplibs_CXX=no -+ ;; - *) - export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' -- ;; -+ ;; - esac -- exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' - --{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5 - $as_echo "$ld_shlibs_CXX" >&6; } - test "$ld_shlibs_CXX" = no && can_build_shared=no - -@@ -15046,46 +14849,52 @@ x|xyes) - # Test whether the compiler implicitly links with -lc since on some - # systems, -lgcc has to come before -lc. If gcc already passes -lc - # to ld, don't add -lc before -lgcc. -- { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5 - $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } -- $RM conftest* -- echo "$lt_simple_compile_test_code" > conftest.$ac_ext -+if ${lt_cv_archive_cmds_need_lc_CXX+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ $RM conftest* -+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext - -- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } 2>conftest.err; then -- soname=conftest -- lib=conftest -- libobjs=conftest.$ac_objext -- deplibs= -- wl=$lt_prog_compiler_wl_CXX -- pic_flag=$lt_prog_compiler_pic_CXX -- compiler_flags=-v -- linker_flags=-v -- verstring= -- output_objdir=. -- libname=conftest -- lt_save_allow_undefined_flag=$allow_undefined_flag_CXX -- allow_undefined_flag_CXX= -- if { (eval echo "$as_me:$LINENO: \"$archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\"") >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } 2>conftest.err; then -+ soname=conftest -+ lib=conftest -+ libobjs=conftest.$ac_objext -+ deplibs= -+ wl=$lt_prog_compiler_wl_CXX -+ pic_flag=$lt_prog_compiler_pic_CXX -+ compiler_flags=-v -+ linker_flags=-v -+ verstring= -+ output_objdir=. -+ libname=conftest -+ lt_save_allow_undefined_flag=$allow_undefined_flag_CXX -+ allow_undefined_flag_CXX= -+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5 - (eval $archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5 - ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } -- then -- archive_cmds_need_lc_CXX=no -- else -- archive_cmds_need_lc_CXX=yes -- fi -- allow_undefined_flag_CXX=$lt_save_allow_undefined_flag -- else -- cat conftest.err 1>&5 -- fi -- $RM conftest* -- { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5 --$as_echo "$archive_cmds_need_lc_CXX" >&6; } -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+ then -+ lt_cv_archive_cmds_need_lc_CXX=no -+ else -+ lt_cv_archive_cmds_need_lc_CXX=yes -+ fi -+ allow_undefined_flag_CXX=$lt_save_allow_undefined_flag -+ else -+ cat conftest.err 1>&5 -+ fi -+ $RM conftest* -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc_CXX" >&5 -+$as_echo "$lt_cv_archive_cmds_need_lc_CXX" >&6; } -+ archive_cmds_need_lc_CXX=$lt_cv_archive_cmds_need_lc_CXX - ;; - esac - fi -@@ -15153,9 +14962,7 @@ esac - - - -- -- -- { $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 - $as_echo_n "checking dynamic linker characteristics... " >&6; } - - library_names_spec= -@@ -15180,7 +14987,7 @@ need_version=unknown - - case $host_os in - aix3*) -- version_type=linux -+ version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' - shlibpath_var=LIBPATH - -@@ -15189,7 +14996,7 @@ aix3*) - ;; - - aix[4-9]*) -- version_type=linux -+ version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - hardcode_into_libs=yes -@@ -15242,7 +15049,7 @@ amigaos*) - m68k) - library_names_spec='$libname.ixlibrary $libname.a' - # Create ${libname}_ixlibrary.a entries in /sys/libs. -- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' -+ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' - ;; - esac - ;; -@@ -15254,7 +15061,7 @@ beos*) - ;; - - bsdi[45]*) -- version_type=linux -+ version_type=linux # correct to gnu/linux during the next big refactor - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' -@@ -15273,8 +15080,9 @@ cygwin* | mingw* | pw32* | cegcc*) - need_version=no - need_lib_prefix=no - -- case $GCC,$host_os in -- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) -+ case $GCC,$cc_basename in -+ yes,*) -+ # gcc - library_names_spec='$libname.dll.a' - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ -@@ -15295,37 +15103,83 @@ cygwin* | mingw* | pw32* | cegcc*) - cygwin*) - # Cygwin DLLs use 'cyg' prefix rather than 'lib' - soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -- sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" -+ - ;; - mingw* | cegcc*) - # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -- sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` -- if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then -- # It is most probably a Windows format PATH printed by -- # mingw gcc, but we are running on Cygwin. Gcc prints its search -- # path with ; separators, and with drive letters. We can handle the -- # drive letters (cygwin fileutils understands them), so leave them, -- # especially as we might pass files found there to a mingw objdump, -- # which wouldn't understand a cygwinified path. Ahh. -- sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` -- else -- sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -- fi - ;; - pw32*) - # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - ;; - esac -+ dynamic_linker='Win32 ld.exe' - ;; - -- *) -- library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' -- ;; -- esac -- dynamic_linker='Win32 ld.exe' -- # FIXME: first we should search . and the directory the executable is in -+ *,cl*) -+ # Native MSVC -+ libname_spec='$name' -+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -+ library_names_spec='${libname}.dll.lib' -+ -+ case $build_os in -+ mingw*) -+ sys_lib_search_path_spec= -+ lt_save_ifs=$IFS -+ IFS=';' -+ for lt_path in $LIB -+ do -+ IFS=$lt_save_ifs -+ # Let DOS variable expansion print the short 8.3 style file name. -+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` -+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" -+ done -+ IFS=$lt_save_ifs -+ # Convert to MSYS style. -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` -+ ;; -+ cygwin*) -+ # Convert to unix form, then to dos form, then back to unix form -+ # but this time dos style (no spaces!) so that the unix form looks -+ # like /cygdrive/c/PROGRA~1:/cygdr... -+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` -+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` -+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ ;; -+ *) -+ sys_lib_search_path_spec="$LIB" -+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then -+ # It is most probably a Windows format PATH. -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` -+ else -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ fi -+ # FIXME: find the short name or the path components, as spaces are -+ # common. (e.g. "Program Files" -> "PROGRA~1") -+ ;; -+ esac -+ -+ # DLL is installed to $(libdir)/../bin by postinstall_cmds -+ postinstall_cmds='base_file=`basename \${file}`~ -+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ -+ dldir=$destdir/`dirname \$dlpath`~ -+ test -d \$dldir || mkdir -p \$dldir~ -+ $install_prog $dir/$dlname \$dldir/$dlname' -+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ -+ dlpath=$dir/\$dldll~ -+ $RM \$dlpath' -+ shlibpath_overrides_runpath=yes -+ dynamic_linker='Win32 link.exe' -+ ;; -+ -+ *) -+ # Assume MSVC wrapper -+ library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' -+ dynamic_linker='Win32 ld.exe' -+ ;; -+ esac -+ # FIXME: first we should search . and the directory the executable is in - shlibpath_var=PATH - ;; - -@@ -15344,7 +15198,7 @@ darwin* | rhapsody*) - ;; - - dgux*) -- version_type=linux -+ version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' -@@ -15352,10 +15206,6 @@ dgux*) - shlibpath_var=LD_LIBRARY_PATH - ;; - --freebsd1*) -- dynamic_linker=no -- ;; -- - freebsd* | dragonfly*) - # DragonFly does not have aout. When/if they implement a new - # versioning mechanism, adjust this. -@@ -15363,7 +15213,7 @@ freebsd* | dragonfly*) - objformat=`/usr/bin/objformat` - else - case $host_os in -- freebsd[123]*) objformat=aout ;; -+ freebsd[23].*) objformat=aout ;; - *) objformat=elf ;; - esac - fi -@@ -15381,7 +15231,7 @@ freebsd* | dragonfly*) - esac - shlibpath_var=LD_LIBRARY_PATH - case $host_os in -- freebsd2*) -+ freebsd2.*) - shlibpath_overrides_runpath=yes - ;; - freebsd3.[01]* | freebsdelf3.[01]*) -@@ -15400,13 +15250,16 @@ freebsd* | dragonfly*) - esac - ;; - --gnu*) -- version_type=linux -+haiku*) -+ version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no -+ dynamic_linker="$host_os runtime_loader" - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' -- shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_var=LIBRARY_PATH -+ shlibpath_overrides_runpath=yes -+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' - hardcode_into_libs=yes - ;; - -@@ -15452,12 +15305,14 @@ hpux9* | hpux10* | hpux11*) - soname_spec='${libname}${release}${shared_ext}$major' - ;; - esac -- # HP-UX runs *really* slowly unless shared libraries are mode 555. -+ # HP-UX runs *really* slowly unless shared libraries are mode 555, ... - postinstall_cmds='chmod 555 $lib' -+ # or fails outright, so override atomically: -+ install_override_mode=555 - ;; - - interix[3-9]*) -- version_type=linux -+ version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -@@ -15473,7 +15328,7 @@ irix5* | irix6* | nonstopux*) - nonstopux*) version_type=nonstopux ;; - *) - if test "$lt_cv_prog_gnu_ld" = yes; then -- version_type=linux -+ version_type=linux # correct to gnu/linux during the next big refactor - else - version_type=irix - fi ;; -@@ -15487,1321 +15342,311 @@ irix5* | irix6* | nonstopux*) - libsuff= shlibsuff= - ;; - *) -- case $LD in # libtool.m4 will add one of these switches to LD -- *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") -- libsuff= shlibsuff= libmagic=32-bit;; -- *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") -- libsuff=32 shlibsuff=N32 libmagic=N32;; -- *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") -- libsuff=64 shlibsuff=64 libmagic=64-bit;; -- *) libsuff= shlibsuff= libmagic=never-match;; -- esac -- ;; -- esac -- shlibpath_var=LD_LIBRARY${shlibsuff}_PATH -- shlibpath_overrides_runpath=no -- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" -- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" -- hardcode_into_libs=yes -- ;; -- --# No shared lib support for Linux oldld, aout, or coff. --linux*oldld* | linux*aout* | linux*coff*) -- dynamic_linker=no -- ;; -- --# This must be Linux ELF. --linux* | k*bsd*-gnu) -- version_type=linux -- need_lib_prefix=no -- need_version=no -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -- finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' -- shlibpath_var=LD_LIBRARY_PATH -- shlibpath_overrides_runpath=no -- # Some binutils ld are patched to set DT_RUNPATH -- save_LDFLAGS=$LDFLAGS -- save_libdir=$libdir -- eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_CXX\"; \ -- LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_CXX\"" -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -- --int --main () --{ -- -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (ac_try="$ac_link" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_link") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_cxx_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -- if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then -- shlibpath_overrides_runpath=yes --fi -- --else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- --fi -- --rm -rf conftest.dSYM --rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -- conftest$ac_exeext conftest.$ac_ext -- LDFLAGS=$save_LDFLAGS -- libdir=$save_libdir -- -- # This implies no fast_install, which is unacceptable. -- # Some rework will be needed to allow for fast_install -- # before this can be enabled. -- hardcode_into_libs=yes -- -- # Add ABI-specific directories to the system library path. -- sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" -- -- # Append ld.so.conf contents to the search path -- if test -f /etc/ld.so.conf; then -- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` -- sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" -- fi -- -- # We used to test for /lib/ld.so.1 and disable shared libraries on -- # powerpc, because MkLinux only supported shared libraries with the -- # GNU dynamic linker. Since this was broken with cross compilers, -- # most powerpc-linux boxes support dynamic linking these days and -- # people can always --disable-shared, the test was removed, and we -- # assume the GNU/Linux dynamic linker is in use. -- dynamic_linker='GNU/Linux ld.so' -- ;; -- --netbsd*) -- version_type=sunos -- need_lib_prefix=no -- need_version=no -- if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' -- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' -- dynamic_linker='NetBSD (a.out) ld.so' -- else -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -- dynamic_linker='NetBSD ld.elf_so' -- fi -- shlibpath_var=LD_LIBRARY_PATH -- shlibpath_overrides_runpath=yes -- hardcode_into_libs=yes -- ;; -- --newsos6) -- version_type=linux -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -- shlibpath_var=LD_LIBRARY_PATH -- shlibpath_overrides_runpath=yes -- ;; -- --*nto* | *qnx*) -- version_type=qnx -- need_lib_prefix=no -- need_version=no -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -- shlibpath_var=LD_LIBRARY_PATH -- shlibpath_overrides_runpath=no -- hardcode_into_libs=yes -- dynamic_linker='ldqnx.so' -- ;; -- --openbsd*) -- version_type=sunos -- sys_lib_dlsearch_path_spec="/usr/lib" -- need_lib_prefix=no -- # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. -- case $host_os in -- openbsd3.3 | openbsd3.3.*) need_version=yes ;; -- *) need_version=no ;; -- esac -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' -- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' -- shlibpath_var=LD_LIBRARY_PATH -- if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -- case $host_os in -- openbsd2.[89] | openbsd2.[89].*) -- shlibpath_overrides_runpath=no -- ;; -- *) -- shlibpath_overrides_runpath=yes -- ;; -- esac -- else -- shlibpath_overrides_runpath=yes -- fi -- ;; -- --os2*) -- libname_spec='$name' -- shrext_cmds=".dll" -- need_lib_prefix=no -- library_names_spec='$libname${shared_ext} $libname.a' -- dynamic_linker='OS/2 ld.exe' -- shlibpath_var=LIBPATH -- ;; -- --osf3* | osf4* | osf5*) -- version_type=osf -- need_lib_prefix=no -- need_version=no -- soname_spec='${libname}${release}${shared_ext}$major' -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -- shlibpath_var=LD_LIBRARY_PATH -- sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" -- sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" -- ;; -- --rdos*) -- dynamic_linker=no -- ;; -- --solaris*) -- version_type=linux -- need_lib_prefix=no -- need_version=no -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -- shlibpath_var=LD_LIBRARY_PATH -- shlibpath_overrides_runpath=yes -- hardcode_into_libs=yes -- # ldd complains unless libraries are executable -- postinstall_cmds='chmod +x $lib' -- ;; -- --sunos4*) -- version_type=sunos -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' -- finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' -- shlibpath_var=LD_LIBRARY_PATH -- shlibpath_overrides_runpath=yes -- if test "$with_gnu_ld" = yes; then -- need_lib_prefix=no -- fi -- need_version=yes -- ;; -- --sysv4 | sysv4.3*) -- version_type=linux -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -- shlibpath_var=LD_LIBRARY_PATH -- case $host_vendor in -- sni) -- shlibpath_overrides_runpath=no -- need_lib_prefix=no -- runpath_var=LD_RUN_PATH -- ;; -- siemens) -- need_lib_prefix=no -- ;; -- motorola) -- need_lib_prefix=no -- need_version=no -- shlibpath_overrides_runpath=no -- sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' -- ;; -- esac -- ;; -- --sysv4*MP*) -- if test -d /usr/nec ;then -- version_type=linux -- library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' -- soname_spec='$libname${shared_ext}.$major' -- shlibpath_var=LD_LIBRARY_PATH -- fi -- ;; -- --sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) -- version_type=freebsd-elf -- need_lib_prefix=no -- need_version=no -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -- shlibpath_var=LD_LIBRARY_PATH -- shlibpath_overrides_runpath=yes -- hardcode_into_libs=yes -- if test "$with_gnu_ld" = yes; then -- sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' -- else -- sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' -- case $host_os in -- sco3.2v5*) -- sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" -- ;; -- esac -- fi -- sys_lib_dlsearch_path_spec='/usr/lib' -- ;; -- --tpf*) -- # TPF is a cross-target only. Preferred cross-host = GNU/Linux. -- version_type=linux -- need_lib_prefix=no -- need_version=no -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -- shlibpath_var=LD_LIBRARY_PATH -- shlibpath_overrides_runpath=no -- hardcode_into_libs=yes -- ;; -- --uts4*) -- version_type=linux -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -- shlibpath_var=LD_LIBRARY_PATH -- ;; -- --*) -- dynamic_linker=no -- ;; --esac --{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5 --$as_echo "$dynamic_linker" >&6; } --test "$dynamic_linker" = no && can_build_shared=no -- --variables_saved_for_relink="PATH $shlibpath_var $runpath_var" --if test "$GCC" = yes; then -- variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" --fi -- --if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then -- sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" --fi --if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then -- sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" --fi -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- { $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 --$as_echo_n "checking how to hardcode library paths into programs... " >&6; } --hardcode_action_CXX= --if test -n "$hardcode_libdir_flag_spec_CXX" || -- test -n "$runpath_var_CXX" || -- test "X$hardcode_automatic_CXX" = "Xyes" ; then -- -- # We can hardcode non-existent directories. -- if test "$hardcode_direct_CXX" != no && -- # If the only mechanism to avoid hardcoding is shlibpath_var, we -- # have to relink, otherwise we might link with an installed library -- # when we should be linking with a yet-to-be-installed one -- ## test "$_LT_TAGVAR(hardcode_shlibpath_var, CXX)" != no && -- test "$hardcode_minus_L_CXX" != no; then -- # Linking always hardcodes the temporary library directory. -- hardcode_action_CXX=relink -- else -- # We can link without hardcoding, and we can hardcode nonexisting dirs. -- hardcode_action_CXX=immediate -- fi --else -- # We cannot hardcode anything, or else we can only hardcode existing -- # directories. -- hardcode_action_CXX=unsupported --fi --{ $as_echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5 --$as_echo "$hardcode_action_CXX" >&6; } -- --if test "$hardcode_action_CXX" = relink || -- test "$inherit_rpath_CXX" = yes; then -- # Fast installation is not supported -- enable_fast_install=no --elif test "$shlibpath_overrides_runpath" = yes || -- test "$enable_shared" = no; then -- # Fast installation is not necessary -- enable_fast_install=needless --fi -- -- -- -- -- -- -- -- fi # test -n "$compiler" -- -- CC=$lt_save_CC -- LDCXX=$LD -- LD=$lt_save_LD -- GCC=$lt_save_GCC -- with_gnu_ld=$lt_save_with_gnu_ld -- lt_cv_path_LDCXX=$lt_cv_path_LD -- lt_cv_path_LD=$lt_save_path_LD -- lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld -- lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld --fi # test "$_lt_caught_CXX_error" != yes -- --ac_ext=c --ac_cpp='$CPP $CPPFLAGS' --ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' --ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' --ac_compiler_gnu=$ac_cv_c_compiler_gnu -- -- -- -- -- -- -- -- -- -- -- -- -- -- ac_config_commands="$ac_config_commands libtool" -- -- -- -- --# Only expand once: -- -- -- --# Checks for libraries. --{ $as_echo "$as_me:$LINENO: checking for cvGetRows in -lcv" >&5 --$as_echo_n "checking for cvGetRows in -lcv... " >&6; } --if test "${ac_cv_lib_cv_cvGetRows+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-lcv $LIBS" --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -- --/* Override any GCC internal prototype to avoid an error. -- Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ --#ifdef __cplusplus --extern "C" --#endif --char cvGetRows (); --int --main () --{ --return cvGetRows (); -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (ac_try="$ac_link" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_link") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -- ac_cv_lib_cv_cvGetRows=yes --else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_cv_lib_cv_cvGetRows=no --fi -- --rm -rf conftest.dSYM --rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -- conftest$ac_exeext conftest.$ac_ext --LIBS=$ac_check_lib_save_LIBS --fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_cv_cvGetRows" >&5 --$as_echo "$ac_cv_lib_cv_cvGetRows" >&6; } --if test "x$ac_cv_lib_cv_cvGetRows" = x""yes; then -- CVFOUND=1 --fi -- -- --{ $as_echo "$as_me:$LINENO: checking for Set_Mercator_Coordinates in -lgeotrans" >&5 --$as_echo_n "checking for Set_Mercator_Coordinates in -lgeotrans... " >&6; } --if test "${ac_cv_lib_geotrans_Set_Mercator_Coordinates+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-lgeotrans $LIBS" --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -- --/* Override any GCC internal prototype to avoid an error. -- Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ --#ifdef __cplusplus --extern "C" --#endif --char Set_Mercator_Coordinates (); --int --main () --{ --return Set_Mercator_Coordinates (); -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (ac_try="$ac_link" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_link") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -- ac_cv_lib_geotrans_Set_Mercator_Coordinates=yes --else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_cv_lib_geotrans_Set_Mercator_Coordinates=no --fi -- --rm -rf conftest.dSYM --rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -- conftest$ac_exeext conftest.$ac_ext --LIBS=$ac_check_lib_save_LIBS --fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_geotrans_Set_Mercator_Coordinates" >&5 --$as_echo "$ac_cv_lib_geotrans_Set_Mercator_Coordinates" >&6; } --if test "x$ac_cv_lib_geotrans_Set_Mercator_Coordinates" = x""yes; then -- cat >>confdefs.h <<_ACEOF --#define HAVE_LIBGEOTRANS 1 --_ACEOF -- -- LIBS="-lgeotrans $LIBS" -- --fi -- --{ $as_echo "$as_me:$LINENO: checking for fftw_execute in -lfftw3" >&5 --$as_echo_n "checking for fftw_execute in -lfftw3... " >&6; } --if test "${ac_cv_lib_fftw3_fftw_execute+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-lfftw3 $LIBS" --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -- --/* Override any GCC internal prototype to avoid an error. -- Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ --#ifdef __cplusplus --extern "C" --#endif --char fftw_execute (); --int --main () --{ --return fftw_execute (); -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (ac_try="$ac_link" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_link") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -- ac_cv_lib_fftw3_fftw_execute=yes --else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_cv_lib_fftw3_fftw_execute=no --fi -- --rm -rf conftest.dSYM --rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -- conftest$ac_exeext conftest.$ac_ext --LIBS=$ac_check_lib_save_LIBS --fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_fftw3_fftw_execute" >&5 --$as_echo "$ac_cv_lib_fftw3_fftw_execute" >&6; } --if test "x$ac_cv_lib_fftw3_fftw_execute" = x""yes; then -- FFTWFOUND=1 --fi -- --{ $as_echo "$as_me:$LINENO: checking for jas_calloc in -ljasper" >&5 --$as_echo_n "checking for jas_calloc in -ljasper... " >&6; } --if test "${ac_cv_lib_jasper_jas_calloc+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-ljasper $LIBS" --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -- --/* Override any GCC internal prototype to avoid an error. -- Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ --#ifdef __cplusplus --extern "C" --#endif --char jas_calloc (); --int --main () --{ --return jas_calloc (); -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (ac_try="$ac_link" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_link") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -- ac_cv_lib_jasper_jas_calloc=yes --else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_cv_lib_jasper_jas_calloc=no --fi -- --rm -rf conftest.dSYM --rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -- conftest$ac_exeext conftest.$ac_ext --LIBS=$ac_check_lib_save_LIBS --fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_jasper_jas_calloc" >&5 --$as_echo "$ac_cv_lib_jasper_jas_calloc" >&6; } --if test "x$ac_cv_lib_jasper_jas_calloc" = x""yes; then -- JASPERFOUND=1 --fi -- --{ $as_echo "$as_me:$LINENO: checking for LAS_GetVersion in -llas" >&5 --$as_echo_n "checking for LAS_GetVersion in -llas... " >&6; } --if test "${ac_cv_lib_las_LAS_GetVersion+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-llas $LIBS" --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -- --/* Override any GCC internal prototype to avoid an error. -- Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ --#ifdef __cplusplus --extern "C" --#endif --char LAS_GetVersion (); --int --main () --{ --return LAS_GetVersion (); -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (ac_try="$ac_link" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_link") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -- ac_cv_lib_las_LAS_GetVersion=yes --else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_cv_lib_las_LAS_GetVersion=no --fi -- --rm -rf conftest.dSYM --rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -- conftest$ac_exeext conftest.$ac_ext --LIBS=$ac_check_lib_save_LIBS --fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_las_LAS_GetVersion" >&5 --$as_echo "$ac_cv_lib_las_LAS_GetVersion" >&6; } --if test "x$ac_cv_lib_las_LAS_GetVersion" = x""yes; then -- LASFOUND=1 --fi -- --{ $as_echo "$as_me:$LINENO: checking for HPDF_Pages_New in -lhpdf" >&5 --$as_echo_n "checking for HPDF_Pages_New in -lhpdf... " >&6; } --if test "${ac_cv_lib_hpdf_HPDF_Pages_New+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-lhpdf $LIBS" --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -- --/* Override any GCC internal prototype to avoid an error. -- Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ --#ifdef __cplusplus --extern "C" --#endif --char HPDF_Pages_New (); --int --main () --{ --return HPDF_Pages_New (); -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (ac_try="$ac_link" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_link") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -- ac_cv_lib_hpdf_HPDF_Pages_New=yes --else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_cv_lib_hpdf_HPDF_Pages_New=no --fi -- --rm -rf conftest.dSYM --rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -- conftest$ac_exeext conftest.$ac_ext --LIBS=$ac_check_lib_save_LIBS --fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_hpdf_HPDF_Pages_New" >&5 --$as_echo "$ac_cv_lib_hpdf_HPDF_Pages_New" >&6; } --if test "x$ac_cv_lib_hpdf_HPDF_Pages_New" = x""yes; then -- HARUFOUND=1 --fi -- --{ $as_echo "$as_me:$LINENO: checking for SQLFetch in -lodbc" >&5 --$as_echo_n "checking for SQLFetch in -lodbc... " >&6; } --if test "${ac_cv_lib_odbc_SQLFetch+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-lodbc $LIBS" --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -- --/* Override any GCC internal prototype to avoid an error. -- Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ --#ifdef __cplusplus --extern "C" --#endif --char SQLFetch (); --int --main () --{ --return SQLFetch (); -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (ac_try="$ac_link" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_link") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -- ac_cv_lib_odbc_SQLFetch=yes --else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_cv_lib_odbc_SQLFetch=no --fi -- --rm -rf conftest.dSYM --rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -- conftest$ac_exeext conftest.$ac_ext --LIBS=$ac_check_lib_save_LIBS --fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_odbc_SQLFetch" >&5 --$as_echo "$ac_cv_lib_odbc_SQLFetch" >&6; } --if test "x$ac_cv_lib_odbc_SQLFetch" = x""yes; then -- ODBCFOUND=1 --else -- ODBC \(libodbc\) library not found --fi -- --{ $as_echo "$as_me:$LINENO: checking for pj_is_latlong in -lproj" >&5 --$as_echo_n "checking for pj_is_latlong in -lproj... " >&6; } --if test "${ac_cv_lib_proj_pj_is_latlong+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-lproj $LIBS" --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -- --/* Override any GCC internal prototype to avoid an error. -- Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ --#ifdef __cplusplus --extern "C" --#endif --char pj_is_latlong (); --int --main () --{ --return pj_is_latlong (); -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (ac_try="$ac_link" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_link") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -- ac_cv_lib_proj_pj_is_latlong=yes --else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_cv_lib_proj_pj_is_latlong=no --fi -- --rm -rf conftest.dSYM --rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -- conftest$ac_exeext conftest.$ac_ext --LIBS=$ac_check_lib_save_LIBS --fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_proj_pj_is_latlong" >&5 --$as_echo "$ac_cv_lib_proj_pj_is_latlong" >&6; } --if test "x$ac_cv_lib_proj_pj_is_latlong" = x""yes; then -- PROJFOUND=1 --fi -- --{ $as_echo "$as_me:$LINENO: checking for VIGRA_RGBE_ReadPixels_Raw in -lvigraimpex" >&5 --$as_echo_n "checking for VIGRA_RGBE_ReadPixels_Raw in -lvigraimpex... " >&6; } --if test "${ac_cv_lib_vigraimpex_VIGRA_RGBE_ReadPixels_Raw+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-lvigraimpex $LIBS" --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -- --/* Override any GCC internal prototype to avoid an error. -- Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ --#ifdef __cplusplus --extern "C" --#endif --char VIGRA_RGBE_ReadPixels_Raw (); --int --main () --{ --return VIGRA_RGBE_ReadPixels_Raw (); -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (ac_try="$ac_link" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_link") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -- ac_cv_lib_vigraimpex_VIGRA_RGBE_ReadPixels_Raw=yes --else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -+ case $LD in # libtool.m4 will add one of these switches to LD -+ *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") -+ libsuff= shlibsuff= libmagic=32-bit;; -+ *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") -+ libsuff=32 shlibsuff=N32 libmagic=N32;; -+ *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") -+ libsuff=64 shlibsuff=64 libmagic=64-bit;; -+ *) libsuff= shlibsuff= libmagic=never-match;; -+ esac -+ ;; -+ esac -+ shlibpath_var=LD_LIBRARY${shlibsuff}_PATH -+ shlibpath_overrides_runpath=no -+ sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" -+ sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" -+ hardcode_into_libs=yes -+ ;; - -- ac_cv_lib_vigraimpex_VIGRA_RGBE_ReadPixels_Raw=no --fi -+# No shared lib support for Linux oldld, aout, or coff. -+linux*oldld* | linux*aout* | linux*coff*) -+ dynamic_linker=no -+ ;; - --rm -rf conftest.dSYM --rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -- conftest$ac_exeext conftest.$ac_ext --LIBS=$ac_check_lib_save_LIBS --fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_vigraimpex_VIGRA_RGBE_ReadPixels_Raw" >&5 --$as_echo "$ac_cv_lib_vigraimpex_VIGRA_RGBE_ReadPixels_Raw" >&6; } --if test "x$ac_cv_lib_vigraimpex_VIGRA_RGBE_ReadPixels_Raw" = x""yes; then -- VIGRAFOUND=1 --fi -+# This must be glibc/ELF. -+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) -+ version_type=linux # correct to gnu/linux during the next big refactor -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no - --{ $as_echo "$as_me:$LINENO: checking for omp_get_num_threads in -lgomp" >&5 --$as_echo_n "checking for omp_get_num_threads in -lgomp... " >&6; } --if test "${ac_cv_lib_gomp_omp_get_num_threads+set}" = set; then -+ # Some binutils ld are patched to set DT_RUNPATH -+ if ${lt_cv_shlibpath_overrides_runpath+:} false; then : - $as_echo_n "(cached) " >&6 - else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-lgomp $LIBS" --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ lt_cv_shlibpath_overrides_runpath=no -+ save_LDFLAGS=$LDFLAGS -+ save_libdir=$libdir -+ eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_CXX\"; \ -+ LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_CXX\"" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - --/* Override any GCC internal prototype to avoid an error. -- Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ --#ifdef __cplusplus --extern "C" --#endif --char omp_get_num_threads (); - int - main () - { --return omp_get_num_threads (); -+ - ; - return 0; - } - _ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (ac_try="$ac_link" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_link") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -- ac_cv_lib_gomp_omp_get_num_threads=yes --else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_cv_lib_gomp_omp_get_num_threads=no -+if ac_fn_cxx_try_link "$LINENO"; then : -+ if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then : -+ lt_cv_shlibpath_overrides_runpath=yes - fi -- --rm -rf conftest.dSYM --rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -- conftest$ac_exeext conftest.$ac_ext --LIBS=$ac_check_lib_save_LIBS - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_gomp_omp_get_num_threads" >&5 --$as_echo "$ac_cv_lib_gomp_omp_get_num_threads" >&6; } --if test "x$ac_cv_lib_gomp_omp_get_num_threads" = x""yes; then -- GOMPFOUND=1 -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+ LDFLAGS=$save_LDFLAGS -+ libdir=$save_libdir -+ - fi - -+ shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath - --# Checks for header files. --{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5 --$as_echo_n "checking for ANSI C header files... " >&6; } --if test "${ac_cv_header_stdc+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include --#include --#include --#include -+ # This implies no fast_install, which is unacceptable. -+ # Some rework will be needed to allow for fast_install -+ # before this can be enabled. -+ hardcode_into_libs=yes - --int --main () --{ -+ # Append ld.so.conf contents to the search path -+ if test -f /etc/ld.so.conf; then -+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` -+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" -+ fi - -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (ac_try="$ac_compile" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_compile") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest.$ac_objext; then -- ac_cv_header_stdc=yes --else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -+ # We used to test for /lib/ld.so.1 and disable shared libraries on -+ # powerpc, because MkLinux only supported shared libraries with the -+ # GNU dynamic linker. Since this was broken with cross compilers, -+ # most powerpc-linux boxes support dynamic linking these days and -+ # people can always --disable-shared, the test was removed, and we -+ # assume the GNU/Linux dynamic linker is in use. -+ dynamic_linker='GNU/Linux ld.so' -+ ;; - -- ac_cv_header_stdc=no --fi -+netbsdelf*-gnu) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no -+ hardcode_into_libs=yes -+ dynamic_linker='NetBSD ld.elf_so' -+ ;; - --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+netbsd*) -+ version_type=sunos -+ need_lib_prefix=no -+ need_version=no -+ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' -+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' -+ dynamic_linker='NetBSD (a.out) ld.so' -+ else -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ dynamic_linker='NetBSD ld.elf_so' -+ fi -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=yes -+ hardcode_into_libs=yes -+ ;; - --if test $ac_cv_header_stdc = yes; then -- # SunOS 4.x string.h does not declare mem*, contrary to ANSI. -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include -+newsos6) -+ version_type=linux # correct to gnu/linux during the next big refactor -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=yes -+ ;; - --_ACEOF --if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -- $EGREP "memchr" >/dev/null 2>&1; then -- : --else -- ac_cv_header_stdc=no --fi --rm -f conftest* -+*nto* | *qnx*) -+ version_type=qnx -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no -+ hardcode_into_libs=yes -+ dynamic_linker='ldqnx.so' -+ ;; - --fi -+openbsd*) -+ version_type=sunos -+ sys_lib_dlsearch_path_spec="/usr/lib" -+ need_lib_prefix=no -+ # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. -+ case $host_os in -+ openbsd3.3 | openbsd3.3.*) need_version=yes ;; -+ *) need_version=no ;; -+ esac -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' -+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' -+ shlibpath_var=LD_LIBRARY_PATH -+ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -+ case $host_os in -+ openbsd2.[89] | openbsd2.[89].*) -+ shlibpath_overrides_runpath=no -+ ;; -+ *) -+ shlibpath_overrides_runpath=yes -+ ;; -+ esac -+ else -+ shlibpath_overrides_runpath=yes -+ fi -+ ;; -+ -+os2*) -+ libname_spec='$name' -+ shrext_cmds=".dll" -+ need_lib_prefix=no -+ library_names_spec='$libname${shared_ext} $libname.a' -+ dynamic_linker='OS/2 ld.exe' -+ shlibpath_var=LIBPATH -+ ;; -+ -+osf3* | osf4* | osf5*) -+ version_type=osf -+ need_lib_prefix=no -+ need_version=no -+ soname_spec='${libname}${release}${shared_ext}$major' -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ shlibpath_var=LD_LIBRARY_PATH -+ sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" -+ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" -+ ;; -+ -+rdos*) -+ dynamic_linker=no -+ ;; -+ -+solaris*) -+ version_type=linux # correct to gnu/linux during the next big refactor -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=yes -+ hardcode_into_libs=yes -+ # ldd complains unless libraries are executable -+ postinstall_cmds='chmod +x $lib' -+ ;; -+ -+sunos4*) -+ version_type=sunos -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' -+ finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=yes -+ if test "$with_gnu_ld" = yes; then -+ need_lib_prefix=no -+ fi -+ need_version=yes -+ ;; -+ -+sysv4 | sysv4.3*) -+ version_type=linux # correct to gnu/linux during the next big refactor -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ case $host_vendor in -+ sni) -+ shlibpath_overrides_runpath=no -+ need_lib_prefix=no -+ runpath_var=LD_RUN_PATH -+ ;; -+ siemens) -+ need_lib_prefix=no -+ ;; -+ motorola) -+ need_lib_prefix=no -+ need_version=no -+ shlibpath_overrides_runpath=no -+ sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' -+ ;; -+ esac -+ ;; - --if test $ac_cv_header_stdc = yes; then -- # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include -+sysv4*MP*) -+ if test -d /usr/nec ;then -+ version_type=linux # correct to gnu/linux during the next big refactor -+ library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' -+ soname_spec='$libname${shared_ext}.$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ fi -+ ;; - --_ACEOF --if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -- $EGREP "free" >/dev/null 2>&1; then -- : --else -- ac_cv_header_stdc=no --fi --rm -f conftest* -+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) -+ version_type=freebsd-elf -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=yes -+ hardcode_into_libs=yes -+ if test "$with_gnu_ld" = yes; then -+ sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' -+ else -+ sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' -+ case $host_os in -+ sco3.2v5*) -+ sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" -+ ;; -+ esac -+ fi -+ sys_lib_dlsearch_path_spec='/usr/lib' -+ ;; - --fi -+tpf*) -+ # TPF is a cross-target only. Preferred cross-host = GNU/Linux. -+ version_type=linux # correct to gnu/linux during the next big refactor -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no -+ hardcode_into_libs=yes -+ ;; - --if test $ac_cv_header_stdc = yes; then -- # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. -- if test "$cross_compiling" = yes; then -- : --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include --#include --#if ((' ' & 0x0FF) == 0x020) --# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') --# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) --#else --# define ISLOWER(c) \ -- (('a' <= (c) && (c) <= 'i') \ -- || ('j' <= (c) && (c) <= 'r') \ -- || ('s' <= (c) && (c) <= 'z')) --# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) --#endif -+uts4*) -+ version_type=linux # correct to gnu/linux during the next big refactor -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ ;; - --#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) --int --main () --{ -- int i; -- for (i = 0; i < 256; i++) -- if (XOR (islower (i), ISLOWER (i)) -- || toupper (i) != TOUPPER (i)) -- return 2; -- return 0; --} --_ACEOF --rm -f conftest$ac_exeext --if { (ac_try="$ac_link" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_link") 2>&5 -- ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; -+*) -+ dynamic_linker=no -+ ;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_try") 2>&5 -- ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- : --else -- $as_echo "$as_me: program exited with status $ac_status" >&5 --$as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 -+$as_echo "$dynamic_linker" >&6; } -+test "$dynamic_linker" = no && can_build_shared=no - --( exit $ac_status ) --ac_cv_header_stdc=no --fi --rm -rf conftest.dSYM --rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -+variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -+if test "$GCC" = yes; then -+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" - fi - -- -+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then -+ sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" - fi -+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then -+ sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 --$as_echo "$ac_cv_header_stdc" >&6; } --if test $ac_cv_header_stdc = yes; then - --cat >>confdefs.h <<\_ACEOF --#define STDC_HEADERS 1 --_ACEOF - --fi - - - -@@ -16809,2535 +15654,1541 @@ fi - - - --for ac_header in float.h malloc.h memory.h stdlib.h string.h unistd.h --do --as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` --if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 --$as_echo_n "checking for $ac_header... " >&6; } --if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -- $as_echo_n "(cached) " >&6 --fi --ac_res=`eval 'as_val=${'$as_ac_Header'} -- $as_echo "$as_val"'` -- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 --$as_echo "$ac_res" >&6; } --else -- # Is the header compilable? --{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 --$as_echo_n "checking $ac_header usability... " >&6; } --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default --#include <$ac_header> --_ACEOF --rm -f conftest.$ac_objext --if { (ac_try="$ac_compile" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_compile") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest.$ac_objext; then -- ac_header_compiler=yes --else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 - -- ac_header_compiler=no --fi - --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext --{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --$as_echo "$ac_header_compiler" >&6; } - --# Is the header present? --{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 --$as_echo_n "checking $ac_header presence... " >&6; } --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <$ac_header> --_ACEOF --if { (ac_try="$ac_cpp conftest.$ac_ext" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null && { -- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -- test ! -s conftest.err -- }; then -- ac_header_preproc=yes --else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 - -- ac_header_preproc=no --fi - --rm -f conftest.err conftest.$ac_ext --{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --$as_echo "$ac_header_preproc" >&6; } - --# So? What about this header? --case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -- yes:no: ) -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 --$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 --$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -- ac_header_preproc=yes -- ;; -- no:yes:* ) -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 --$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 --$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 --$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 --$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 --$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 --$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -- ( cat <<\_ASBOX --## --------------------------------- ## --## Report this to BUG-REPORT-ADDRESS ## --## --------------------------------- ## --_ASBOX -- ) | sed "s/^/$as_me: WARNING: /" >&2 -- ;; --esac --{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 --$as_echo_n "checking for $ac_header... " >&6; } --if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -- $as_echo_n "(cached) " >&6 --else -- eval "$as_ac_Header=\$ac_header_preproc" --fi --ac_res=`eval 'as_val=${'$as_ac_Header'} -- $as_echo "$as_val"'` -- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 --$as_echo "$ac_res" >&6; } - --fi --as_val=`eval 'as_val=${'$as_ac_Header'} -- $as_echo "$as_val"'` -- if test "x$as_val" = x""yes; then -- cat >>confdefs.h <<_ACEOF --#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 --_ACEOF - --fi - --done - - --for ac_header in wchar.h --do --as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` --if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 --$as_echo_n "checking for $ac_header... " >&6; } --if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -- $as_echo_n "(cached) " >&6 --fi --ac_res=`eval 'as_val=${'$as_ac_Header'} -- $as_echo "$as_val"'` -- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 --$as_echo "$ac_res" >&6; } --else -- # Is the header compilable? --{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 --$as_echo_n "checking $ac_header usability... " >&6; } --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default --#include <$ac_header> --_ACEOF --rm -f conftest.$ac_objext --if { (ac_try="$ac_compile" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_compile") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest.$ac_objext; then -- ac_header_compiler=yes --else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 - -- ac_header_compiler=no --fi - --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext --{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --$as_echo "$ac_header_compiler" >&6; } - --# Is the header present? --{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 --$as_echo_n "checking $ac_header presence... " >&6; } --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <$ac_header> --_ACEOF --if { (ac_try="$ac_cpp conftest.$ac_ext" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null && { -- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -- test ! -s conftest.err -- }; then -- ac_header_preproc=yes --else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 - -- ac_header_preproc=no --fi - --rm -f conftest.err conftest.$ac_ext --{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --$as_echo "$ac_header_preproc" >&6; } - --# So? What about this header? --case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -- yes:no: ) -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 --$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 --$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -- ac_header_preproc=yes -- ;; -- no:yes:* ) -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 --$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 --$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 --$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 --$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 --$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 --$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -- ( cat <<\_ASBOX --## --------------------------------- ## --## Report this to BUG-REPORT-ADDRESS ## --## --------------------------------- ## --_ASBOX -- ) | sed "s/^/$as_me: WARNING: /" >&2 -- ;; --esac --{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 --$as_echo_n "checking for $ac_header... " >&6; } --if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -- $as_echo_n "(cached) " >&6 --else -- eval "$as_ac_Header=\$ac_header_preproc" --fi --ac_res=`eval 'as_val=${'$as_ac_Header'} -- $as_echo "$as_val"'` -- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 --$as_echo "$ac_res" >&6; } - --fi --as_val=`eval 'as_val=${'$as_ac_Header'} -- $as_echo "$as_val"'` -- if test "x$as_val" = x""yes; then -- cat >>confdefs.h <<_ACEOF --#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 --_ACEOF - --fi - --done - --#todo: check for headers of the libraries above - --# Checks for typedefs, structures, and compiler characteristics. --{ $as_echo "$as_me:$LINENO: checking for stdbool.h that conforms to C99" >&5 --$as_echo_n "checking for stdbool.h that conforms to C99... " >&6; } --if test "${ac_cv_header_stdbool_h+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ - --#include --#ifndef bool -- "error: bool is not defined" --#endif --#ifndef false -- "error: false is not defined" --#endif --#if false -- "error: false is not 0" --#endif --#ifndef true -- "error: true is not defined" --#endif --#if true != 1 -- "error: true is not 1" --#endif --#ifndef __bool_true_false_are_defined -- "error: __bool_true_false_are_defined is not defined" --#endif - -- struct s { _Bool s: 1; _Bool t; } s; -- -- char a[true == 1 ? 1 : -1]; -- char b[false == 0 ? 1 : -1]; -- char c[__bool_true_false_are_defined == 1 ? 1 : -1]; -- char d[(bool) 0.5 == true ? 1 : -1]; -- bool e = &s; -- char f[(_Bool) 0.0 == false ? 1 : -1]; -- char g[true]; -- char h[sizeof (_Bool)]; -- char i[sizeof s.t]; -- enum { j = false, k = true, l = false * true, m = true * 256 }; -- /* The following fails for -- HP aC++/ANSI C B3910B A.05.55 [Dec 04 2003]. */ -- _Bool n[m]; -- char o[sizeof n == m * sizeof n[0] ? 1 : -1]; -- char p[-1 - (_Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1]; --# if defined __xlc__ || defined __GNUC__ -- /* Catch a bug in IBM AIX xlc compiler version 6.0.0.0 -- reported by James Lemley on 2005-10-05; see -- http://lists.gnu.org/archive/html/bug-coreutils/2005-10/msg00086.html -- This test is not quite right, since xlc is allowed to -- reject this program, as the initializer for xlcbug is -- not one of the forms that C requires support for. -- However, doing the test right would require a runtime -- test, and that would make cross-compilation harder. -- Let us hope that IBM fixes the xlc bug, and also adds -- support for this kind of constant expression. In the -- meantime, this test will reject xlc, which is OK, since -- our stdbool.h substitute should suffice. We also test -- this with GCC, where it should work, to detect more -- quickly whether someone messes up the test in the -- future. */ -- char digs[] = "0123456789"; -- int xlcbug = 1 / (&(digs + 5)[-2 + (bool) 1] == &digs[4] ? 1 : -1); --# endif -- /* Catch a bug in an HP-UX C compiler. See -- http://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html -- http://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html -- */ -- _Bool q = true; -- _Bool *pq = &q; - --int --main () --{ - -- *pq |= q; -- *pq |= ! q; -- /* Refer to every declared value, to avoid compiler optimizations. */ -- return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !!j + !k + !!l -- + !m + !n + !o + !p + !q + !pq); - -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (ac_try="$ac_compile" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_compile") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest.$ac_objext; then -- ac_cv_header_stdbool_h=yes -+ -+ -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5 -+$as_echo_n "checking how to hardcode library paths into programs... " >&6; } -+hardcode_action_CXX= -+if test -n "$hardcode_libdir_flag_spec_CXX" || -+ test -n "$runpath_var_CXX" || -+ test "X$hardcode_automatic_CXX" = "Xyes" ; then -+ -+ # We can hardcode non-existent directories. -+ if test "$hardcode_direct_CXX" != no && -+ # If the only mechanism to avoid hardcoding is shlibpath_var, we -+ # have to relink, otherwise we might link with an installed library -+ # when we should be linking with a yet-to-be-installed one -+ ## test "$_LT_TAGVAR(hardcode_shlibpath_var, CXX)" != no && -+ test "$hardcode_minus_L_CXX" != no; then -+ # Linking always hardcodes the temporary library directory. -+ hardcode_action_CXX=relink -+ else -+ # We can link without hardcoding, and we can hardcode nonexisting dirs. -+ hardcode_action_CXX=immediate -+ fi - else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_cv_header_stdbool_h=no -+ # We cannot hardcode anything, or else we can only hardcode existing -+ # directories. -+ hardcode_action_CXX=unsupported - fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action_CXX" >&5 -+$as_echo "$hardcode_action_CXX" >&6; } - --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+if test "$hardcode_action_CXX" = relink || -+ test "$inherit_rpath_CXX" = yes; then -+ # Fast installation is not supported -+ enable_fast_install=no -+elif test "$shlibpath_overrides_runpath" = yes || -+ test "$enable_shared" = no; then -+ # Fast installation is not necessary -+ enable_fast_install=needless - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdbool_h" >&5 --$as_echo "$ac_cv_header_stdbool_h" >&6; } --{ $as_echo "$as_me:$LINENO: checking for _Bool" >&5 --$as_echo_n "checking for _Bool... " >&6; } --if test "${ac_cv_type__Bool+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- ac_cv_type__Bool=no --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default --int --main () --{ --if (sizeof (_Bool)) -- return 0; -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (ac_try="$ac_compile" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_compile") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest.$ac_objext; then -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default --int --main () --{ --if (sizeof ((_Bool))) -- return 0; -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (ac_try="$ac_compile" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_compile") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest.$ac_objext; then -- : --else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 - -- ac_cv_type__Bool=yes --fi - --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext --else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 - - --fi - --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext --fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_type__Bool" >&5 --$as_echo "$ac_cv_type__Bool" >&6; } --if test "x$ac_cv_type__Bool" = x""yes; then - --cat >>confdefs.h <<_ACEOF --#define HAVE__BOOL 1 --_ACEOF - -+ fi # test -n "$compiler" - --fi -+ CC=$lt_save_CC -+ CFLAGS=$lt_save_CFLAGS -+ LDCXX=$LD -+ LD=$lt_save_LD -+ GCC=$lt_save_GCC -+ with_gnu_ld=$lt_save_with_gnu_ld -+ lt_cv_path_LDCXX=$lt_cv_path_LD -+ lt_cv_path_LD=$lt_save_path_LD -+ lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld -+ lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld -+fi # test "$_lt_caught_CXX_error" != yes - --if test $ac_cv_header_stdbool_h = yes; then -+ac_ext=c -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_c_compiler_gnu - --cat >>confdefs.h <<\_ACEOF --#define HAVE_STDBOOL_H 1 --_ACEOF - --fi - --{ $as_echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5 --$as_echo_n "checking for an ANSI C-conforming const... " >&6; } --if test "${ac_cv_c_const+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ - --int --main () --{ --/* FIXME: Include the comments suggested by Paul. */ --#ifndef __cplusplus -- /* Ultrix mips cc rejects this. */ -- typedef int charset[2]; -- const charset cs; -- /* SunOS 4.1.1 cc rejects this. */ -- char const *const *pcpcc; -- char **ppc; -- /* NEC SVR4.0.2 mips cc rejects this. */ -- struct point {int x, y;}; -- static struct point const zero = {0,0}; -- /* AIX XL C 1.02.0.0 rejects this. -- It does not let you subtract one const X* pointer from another in -- an arm of an if-expression whose if-part is not a constant -- expression */ -- const char *g = "string"; -- pcpcc = &g + (g ? g-g : 0); -- /* HPUX 7.0 cc rejects these. */ -- ++pcpcc; -- ppc = (char**) pcpcc; -- pcpcc = (char const *const *) ppc; -- { /* SCO 3.2v4 cc rejects this. */ -- char *t; -- char const *s = 0 ? (char *) 0 : (char const *) 0; - -- *t++ = 0; -- if (s) return 0; -- } -- { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */ -- int x[] = {25, 17}; -- const int *foo = &x[0]; -- ++foo; -- } -- { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */ -- typedef const int *iptr; -- iptr p = 0; -- ++p; -- } -- { /* AIX XL C 1.02.0.0 rejects this saying -- "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ -- struct s { int j; const int *ap[3]; }; -- struct s *b; b->j = 5; -- } -- { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ -- const int foo = 10; -- if (!foo) return 0; -- } -- return !cs[0] && !zero.x; --#endif - -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (ac_try="$ac_compile" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_compile") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest.$ac_objext; then -- ac_cv_c_const=yes --else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 - -- ac_cv_c_const=no --fi - --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext --fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5 --$as_echo "$ac_cv_c_const" >&6; } --if test $ac_cv_c_const = no; then - --cat >>confdefs.h <<\_ACEOF --#define const /**/ --_ACEOF - --fi - --{ $as_echo "$as_me:$LINENO: checking for inline" >&5 --$as_echo_n "checking for inline... " >&6; } --if test "${ac_cv_c_inline+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- ac_cv_c_inline=no --for ac_kw in inline __inline__ __inline; do -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#ifndef __cplusplus --typedef int foo_t; --static $ac_kw foo_t static_foo () {return 0; } --$ac_kw foo_t foo () {return 0; } --#endif - --_ACEOF --rm -f conftest.$ac_objext --if { (ac_try="$ac_compile" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_compile") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest.$ac_objext; then -- ac_cv_c_inline=$ac_kw --else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 - - --fi - --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -- test "$ac_cv_c_inline" != no && break --done -+ ac_config_commands="$ac_config_commands libtool" - --fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5 --$as_echo "$ac_cv_c_inline" >&6; } - - --case $ac_cv_c_inline in -- inline | yes) ;; -- *) -- case $ac_cv_c_inline in -- no) ac_val=;; -- *) ac_val=$ac_cv_c_inline;; -- esac -- cat >>confdefs.h <<_ACEOF --#ifndef __cplusplus --#define inline $ac_val --#endif --_ACEOF -- ;; --esac - --{ $as_echo "$as_me:$LINENO: checking for size_t" >&5 --$as_echo_n "checking for size_t... " >&6; } --if test "${ac_cv_type_size_t+set}" = set; then -+# Only expand once: -+ -+ -+ -+# Checks for libraries. -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for cvGetRows in -lcv" >&5 -+$as_echo_n "checking for cvGetRows in -lcv... " >&6; } -+if ${ac_cv_lib_cv_cvGetRows+:} false; then : - $as_echo_n "(cached) " >&6 - else -- ac_cv_type_size_t=no --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-lcv $LIBS" -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ --$ac_includes_default -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char cvGetRows (); - int - main () - { --if (sizeof (size_t)) -- return 0; -+return cvGetRows (); - ; - return 0; - } - _ACEOF --rm -f conftest.$ac_objext --if { (ac_try="$ac_compile" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_compile") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest.$ac_objext; then -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+if ac_fn_c_try_link "$LINENO"; then : -+ ac_cv_lib_cv_cvGetRows=yes -+else -+ ac_cv_lib_cv_cvGetRows=no -+fi -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_cv_cvGetRows" >&5 -+$as_echo "$ac_cv_lib_cv_cvGetRows" >&6; } -+if test "x$ac_cv_lib_cv_cvGetRows" = xyes; then : -+ CVFOUND=1 -+fi -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Set_Mercator_Coordinates in -lgeotrans" >&5 -+$as_echo_n "checking for Set_Mercator_Coordinates in -lgeotrans... " >&6; } -+if ${ac_cv_lib_geotrans_Set_Mercator_Coordinates+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-lgeotrans $LIBS" -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ --$ac_includes_default -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char Set_Mercator_Coordinates (); - int - main () - { --if (sizeof ((size_t))) -- return 0; -+return Set_Mercator_Coordinates (); - ; - return 0; - } - _ACEOF --rm -f conftest.$ac_objext --if { (ac_try="$ac_compile" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_compile") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest.$ac_objext; then -- : --else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_cv_type_size_t=yes --fi -- --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+if ac_fn_c_try_link "$LINENO"; then : -+ ac_cv_lib_geotrans_Set_Mercator_Coordinates=yes - else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- -+ ac_cv_lib_geotrans_Set_Mercator_Coordinates=no - fi -- --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5 --$as_echo "$ac_cv_type_size_t" >&6; } --if test "x$ac_cv_type_size_t" = x""yes; then -- : --else -- --cat >>confdefs.h <<_ACEOF --#define size_t unsigned int -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_geotrans_Set_Mercator_Coordinates" >&5 -+$as_echo "$ac_cv_lib_geotrans_Set_Mercator_Coordinates" >&6; } -+if test "x$ac_cv_lib_geotrans_Set_Mercator_Coordinates" = xyes; then : -+ cat >>confdefs.h <<_ACEOF -+#define HAVE_LIBGEOTRANS 1 - _ACEOF - -+ LIBS="-lgeotrans $LIBS" -+ - fi - --{ $as_echo "$as_me:$LINENO: checking whether struct tm is in sys/time.h or time.h" >&5 --$as_echo_n "checking whether struct tm is in sys/time.h or time.h... " >&6; } --if test "${ac_cv_struct_tm+set}" = set; then -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fftw_execute in -lfftw3" >&5 -+$as_echo_n "checking for fftw_execute in -lfftw3... " >&6; } -+if ${ac_cv_lib_fftw3_fftw_execute+:} false; then : - $as_echo_n "(cached) " >&6 - else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-lfftw3 $LIBS" -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ --#include --#include - -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char fftw_execute (); - int - main () - { --struct tm tm; -- int *p = &tm.tm_sec; -- return !p; -+return fftw_execute (); - ; - return 0; - } - _ACEOF --rm -f conftest.$ac_objext --if { (ac_try="$ac_compile" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_compile") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest.$ac_objext; then -- ac_cv_struct_tm=time.h -+if ac_fn_c_try_link "$LINENO"; then : -+ ac_cv_lib_fftw3_fftw_execute=yes - else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_cv_struct_tm=sys/time.h -+ ac_cv_lib_fftw3_fftw_execute=no - fi -- --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_struct_tm" >&5 --$as_echo "$ac_cv_struct_tm" >&6; } --if test $ac_cv_struct_tm = sys/time.h; then -- --cat >>confdefs.h <<\_ACEOF --#define TM_IN_SYS_TIME 1 --_ACEOF -- -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_fftw3_fftw_execute" >&5 -+$as_echo "$ac_cv_lib_fftw3_fftw_execute" >&6; } -+if test "x$ac_cv_lib_fftw3_fftw_execute" = xyes; then : -+ FFTWFOUND=1 - fi - -- --# Checks for platform characteristics. -- -- { $as_echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5 --$as_echo_n "checking whether byte ordering is bigendian... " >&6; } --if test "${ac_cv_c_bigendian+set}" = set; then -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for jas_calloc in -ljasper" >&5 -+$as_echo_n "checking for jas_calloc in -ljasper... " >&6; } -+if ${ac_cv_lib_jasper_jas_calloc+:} false; then : - $as_echo_n "(cached) " >&6 - else -- ac_cv_c_bigendian=unknown -- # See if we're dealing with a universal compiler. -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-ljasper $LIBS" -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ --#ifndef __APPLE_CC__ -- not a universal capable compiler -- #endif -- typedef int dummy; - -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char jas_calloc (); -+int -+main () -+{ -+return jas_calloc (); -+ ; -+ return 0; -+} - _ACEOF --rm -f conftest.$ac_objext --if { (ac_try="$ac_compile" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_compile") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest.$ac_objext; then -- -- # Check for potential -arch flags. It is not universal unless -- # there are some -arch flags. Note that *ppc* also matches -- # ppc64. This check is also rather less than ideal. -- case "${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}" in #( -- *-arch*ppc*|*-arch*i386*|*-arch*x86_64*) ac_cv_c_bigendian=universal;; -- esac -+if ac_fn_c_try_link "$LINENO"; then : -+ ac_cv_lib_jasper_jas_calloc=yes - else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- -+ ac_cv_lib_jasper_jas_calloc=no -+fi -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jasper_jas_calloc" >&5 -+$as_echo "$ac_cv_lib_jasper_jas_calloc" >&6; } -+if test "x$ac_cv_lib_jasper_jas_calloc" = xyes; then : -+ JASPERFOUND=1 - fi - --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -- if test $ac_cv_c_bigendian = unknown; then -- # See if sys/param.h defines the BYTE_ORDER macro. -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LAS_GetVersion in -llas" >&5 -+$as_echo_n "checking for LAS_GetVersion in -llas... " >&6; } -+if ${ac_cv_lib_las_LAS_GetVersion+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-llas $LIBS" -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ --#include -- #include - -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char LAS_GetVersion (); - int - main () - { --#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \ -- && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \ -- && LITTLE_ENDIAN) -- bogus endian macros -- #endif -- -+return LAS_GetVersion (); - ; - return 0; - } - _ACEOF --rm -f conftest.$ac_objext --if { (ac_try="$ac_compile" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_compile") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest.$ac_objext; then -- # It does; now see whether it defined to BIG_ENDIAN or not. -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+if ac_fn_c_try_link "$LINENO"; then : -+ ac_cv_lib_las_LAS_GetVersion=yes -+else -+ ac_cv_lib_las_LAS_GetVersion=no -+fi -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_las_LAS_GetVersion" >&5 -+$as_echo "$ac_cv_lib_las_LAS_GetVersion" >&6; } -+if test "x$ac_cv_lib_las_LAS_GetVersion" = xyes; then : -+ LASFOUND=1 -+fi -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for HPDF_Pages_New in -lhpdf" >&5 -+$as_echo_n "checking for HPDF_Pages_New in -lhpdf... " >&6; } -+if ${ac_cv_lib_hpdf_HPDF_Pages_New+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-lhpdf $LIBS" -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ --#include -- #include - -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char HPDF_Pages_New (); - int - main () - { --#if BYTE_ORDER != BIG_ENDIAN -- not big endian -- #endif -- -+return HPDF_Pages_New (); - ; - return 0; - } - _ACEOF --rm -f conftest.$ac_objext --if { (ac_try="$ac_compile" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_compile") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest.$ac_objext; then -- ac_cv_c_bigendian=yes -+if ac_fn_c_try_link "$LINENO"; then : -+ ac_cv_lib_hpdf_HPDF_Pages_New=yes - else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_cv_c_bigendian=no -+ ac_cv_lib_hpdf_HPDF_Pages_New=no -+fi -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_hpdf_HPDF_Pages_New" >&5 -+$as_echo "$ac_cv_lib_hpdf_HPDF_Pages_New" >&6; } -+if test "x$ac_cv_lib_hpdf_HPDF_Pages_New" = xyes; then : -+ HARUFOUND=1 - fi - --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SQLFetch in -lodbc" >&5 -+$as_echo_n "checking for SQLFetch in -lodbc... " >&6; } -+if ${ac_cv_lib_odbc_SQLFetch+:} false; then : -+ $as_echo_n "(cached) " >&6 - else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- --fi -- --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -- fi -- if test $ac_cv_c_bigendian = unknown; then -- # See if defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris). -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-lodbc $LIBS" -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ --#include - -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char SQLFetch (); - int - main () - { --#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN) -- bogus endian macros -- #endif -- -+return SQLFetch (); - ; - return 0; - } - _ACEOF --rm -f conftest.$ac_objext --if { (ac_try="$ac_compile" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_compile") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest.$ac_objext; then -- # It does; now see whether it defined to _BIG_ENDIAN or not. -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+if ac_fn_c_try_link "$LINENO"; then : -+ ac_cv_lib_odbc_SQLFetch=yes -+else -+ ac_cv_lib_odbc_SQLFetch=no -+fi -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_odbc_SQLFetch" >&5 -+$as_echo "$ac_cv_lib_odbc_SQLFetch" >&6; } -+if test "x$ac_cv_lib_odbc_SQLFetch" = xyes; then : -+ ODBCFOUND=1 -+else -+ ODBC \(libodbc\) library not found -+fi -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pj_is_latlong in -lproj" >&5 -+$as_echo_n "checking for pj_is_latlong in -lproj... " >&6; } -+if ${ac_cv_lib_proj_pj_is_latlong+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-lproj $LIBS" -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ --#include - -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char pj_is_latlong (); - int - main () - { --#ifndef _BIG_ENDIAN -- not big endian -- #endif -- -+return pj_is_latlong (); - ; - return 0; - } - _ACEOF --rm -f conftest.$ac_objext --if { (ac_try="$ac_compile" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_compile") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest.$ac_objext; then -- ac_cv_c_bigendian=yes -+if ac_fn_c_try_link "$LINENO"; then : -+ ac_cv_lib_proj_pj_is_latlong=yes - else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_cv_c_bigendian=no -+ ac_cv_lib_proj_pj_is_latlong=no - fi -- --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext --else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_proj_pj_is_latlong" >&5 -+$as_echo "$ac_cv_lib_proj_pj_is_latlong" >&6; } -+if test "x$ac_cv_lib_proj_pj_is_latlong" = xyes; then : -+ PROJFOUND=1 - fi - --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -- fi -- if test $ac_cv_c_bigendian = unknown; then -- # Compile a test program. -- if test "$cross_compiling" = yes; then -- # Try to guess by grepping values from an object file. -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for VIGRA_RGBE_ReadPixels_Raw in -lvigraimpex" >&5 -+$as_echo_n "checking for VIGRA_RGBE_ReadPixels_Raw in -lvigraimpex... " >&6; } -+if ${ac_cv_lib_vigraimpex_VIGRA_RGBE_ReadPixels_Raw+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-lvigraimpex $LIBS" -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ --short int ascii_mm[] = -- { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 }; -- short int ascii_ii[] = -- { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 }; -- int use_ascii (int i) { -- return ascii_mm[i] + ascii_ii[i]; -- } -- short int ebcdic_ii[] = -- { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 }; -- short int ebcdic_mm[] = -- { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 }; -- int use_ebcdic (int i) { -- return ebcdic_mm[i] + ebcdic_ii[i]; -- } -- extern int foo; - -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char VIGRA_RGBE_ReadPixels_Raw (); - int - main () - { --return use_ascii (foo) == use_ebcdic (foo); -+return VIGRA_RGBE_ReadPixels_Raw (); - ; - return 0; - } - _ACEOF --rm -f conftest.$ac_objext --if { (ac_try="$ac_compile" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_compile") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest.$ac_objext; then -- if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then -- ac_cv_c_bigendian=yes -- fi -- if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then -- if test "$ac_cv_c_bigendian" = unknown; then -- ac_cv_c_bigendian=no -- else -- # finding both strings is unlikely to happen, but who knows? -- ac_cv_c_bigendian=unknown -- fi -- fi -+if ac_fn_c_try_link "$LINENO"; then : -+ ac_cv_lib_vigraimpex_VIGRA_RGBE_ReadPixels_Raw=yes - else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- -+ ac_cv_lib_vigraimpex_VIGRA_RGBE_ReadPixels_Raw=no -+fi -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_vigraimpex_VIGRA_RGBE_ReadPixels_Raw" >&5 -+$as_echo "$ac_cv_lib_vigraimpex_VIGRA_RGBE_ReadPixels_Raw" >&6; } -+if test "x$ac_cv_lib_vigraimpex_VIGRA_RGBE_ReadPixels_Raw" = xyes; then : -+ VIGRAFOUND=1 - fi - --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for omp_get_num_threads in -lgomp" >&5 -+$as_echo_n "checking for omp_get_num_threads in -lgomp... " >&6; } -+if ${ac_cv_lib_gomp_omp_get_num_threads+:} false; then : -+ $as_echo_n "(cached) " >&6 - else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-lgomp $LIBS" -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ --$ac_includes_default -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char omp_get_num_threads (); - int - main () - { -- -- /* Are we little or big endian? From Harbison&Steele. */ -- union -- { -- long int l; -- char c[sizeof (long int)]; -- } u; -- u.l = 1; -- return u.c[sizeof (long int) - 1] == 1; -- -+return omp_get_num_threads (); - ; - return 0; - } - _ACEOF --rm -f conftest$ac_exeext --if { (ac_try="$ac_link" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_link") 2>&5 -- ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_try") 2>&5 -- ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_c_bigendian=no -+if ac_fn_c_try_link "$LINENO"; then : -+ ac_cv_lib_gomp_omp_get_num_threads=yes - else -- $as_echo "$as_me: program exited with status $ac_status" >&5 --$as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --( exit $ac_status ) --ac_cv_c_bigendian=yes -+ ac_cv_lib_gomp_omp_get_num_threads=no - fi --rm -rf conftest.dSYM --rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS - fi -- -- -- fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gomp_omp_get_num_threads" >&5 -+$as_echo "$ac_cv_lib_gomp_omp_get_num_threads" >&6; } -+if test "x$ac_cv_lib_gomp_omp_get_num_threads" = xyes; then : -+ GOMPFOUND=1 - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5 --$as_echo "$ac_cv_c_bigendian" >&6; } -- case $ac_cv_c_bigendian in #( -- yes) -- cat >>confdefs.h <<\_ACEOF --#define WORDS_BIGENDIAN 1 --_ACEOF --;; #( -- no) -- ;; #( -- universal) -- --cat >>confdefs.h <<\_ACEOF --#define AC_APPLE_UNIVERSAL_BUILD 1 --_ACEOF -- -- ;; #( -- *) -- { { $as_echo "$as_me:$LINENO: error: unknown endianness -- presetting ac_cv_c_bigendian=no (or yes) will help" >&5 --$as_echo "$as_me: error: unknown endianness -- presetting ac_cv_c_bigendian=no (or yes) will help" >&2;} -- { (exit 1); exit 1; }; } ;; -- esac -- - --# Checks for library functions. - --for ac_header in stdlib.h --do --as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` --if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 --$as_echo_n "checking for $ac_header... " >&6; } --if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+# Checks for header files. -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 -+$as_echo_n "checking for ANSI C header files... " >&6; } -+if ${ac_cv_header_stdc+:} false; then : - $as_echo_n "(cached) " >&6 --fi --ac_res=`eval 'as_val=${'$as_ac_Header'} -- $as_echo "$as_val"'` -- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 --$as_echo "$ac_res" >&6; } - else -- # Is the header compilable? --{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 --$as_echo_n "checking $ac_header usability... " >&6; } --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ --$ac_includes_default --#include <$ac_header> -+#include -+#include -+#include -+#include -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} - _ACEOF --rm -f conftest.$ac_objext --if { (ac_try="$ac_compile" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_compile") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest.$ac_objext; then -- ac_header_compiler=yes -+if ac_fn_c_try_compile "$LINENO"; then : -+ ac_cv_header_stdc=yes - else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_header_compiler=no -+ ac_cv_header_stdc=no - fi -- - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext --{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --$as_echo "$ac_header_compiler" >&6; } - --# Is the header present? --{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 --$as_echo_n "checking $ac_header presence... " >&6; } --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+if test $ac_cv_header_stdc = yes; then -+ # SunOS 4.x string.h does not declare mem*, contrary to ANSI. -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ --#include <$ac_header> --_ACEOF --if { (ac_try="$ac_cpp conftest.$ac_ext" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null && { -- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -- test ! -s conftest.err -- }; then -- ac_header_preproc=yes --else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_header_preproc=no --fi -+#include - --rm -f conftest.err conftest.$ac_ext --{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --$as_echo "$ac_header_preproc" >&6; } -+_ACEOF -+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -+ $EGREP "memchr" >/dev/null 2>&1; then : - --# So? What about this header? --case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -- yes:no: ) -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 --$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 --$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -- ac_header_preproc=yes -- ;; -- no:yes:* ) -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 --$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 --$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 --$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 --$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 --$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 --$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -- ( cat <<\_ASBOX --## --------------------------------- ## --## Report this to BUG-REPORT-ADDRESS ## --## --------------------------------- ## --_ASBOX -- ) | sed "s/^/$as_me: WARNING: /" >&2 -- ;; --esac --{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 --$as_echo_n "checking for $ac_header... " >&6; } --if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -- $as_echo_n "(cached) " >&6 - else -- eval "$as_ac_Header=\$ac_header_preproc" -+ ac_cv_header_stdc=no - fi --ac_res=`eval 'as_val=${'$as_ac_Header'} -- $as_echo "$as_val"'` -- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 --$as_echo "$ac_res" >&6; } -+rm -f conftest* - - fi --as_val=`eval 'as_val=${'$as_ac_Header'} -- $as_echo "$as_val"'` -- if test "x$as_val" = x""yes; then -- cat >>confdefs.h <<_ACEOF --#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+ -+if test $ac_cv_header_stdc = yes; then -+ # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include -+ - _ACEOF -+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -+ $EGREP "free" >/dev/null 2>&1; then : - -+else -+ ac_cv_header_stdc=no - fi -+rm -f conftest* - --done -+fi - --{ $as_echo "$as_me:$LINENO: checking for GNU libc compatible malloc" >&5 --$as_echo_n "checking for GNU libc compatible malloc... " >&6; } --if test "${ac_cv_func_malloc_0_nonnull+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- if test "$cross_compiling" = yes; then -- ac_cv_func_malloc_0_nonnull=no -+if test $ac_cv_header_stdc = yes; then -+ # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. -+ if test "$cross_compiling" = yes; then : -+ : - else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ --#if defined STDC_HEADERS || defined HAVE_STDLIB_H --# include -+#include -+#include -+#if ((' ' & 0x0FF) == 0x020) -+# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -+# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) - #else --char *malloc (); -+# define ISLOWER(c) \ -+ (('a' <= (c) && (c) <= 'i') \ -+ || ('j' <= (c) && (c) <= 'r') \ -+ || ('s' <= (c) && (c) <= 'z')) -+# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) - #endif - -+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) - int - main () - { --return ! malloc (0); -- ; -+ int i; -+ for (i = 0; i < 256; i++) -+ if (XOR (islower (i), ISLOWER (i)) -+ || toupper (i) != TOUPPER (i)) -+ return 2; - return 0; - } - _ACEOF --rm -f conftest$ac_exeext --if { (ac_try="$ac_link" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_link") 2>&5 -- ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_try") 2>&5 -- ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_func_malloc_0_nonnull=yes -+if ac_fn_c_try_run "$LINENO"; then : -+ - else -- $as_echo "$as_me: program exited with status $ac_status" >&5 --$as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -+ ac_cv_header_stdc=no -+fi -+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ -+ conftest.$ac_objext conftest.beam conftest.$ac_ext -+fi - --( exit $ac_status ) --ac_cv_func_malloc_0_nonnull=no - fi --rm -rf conftest.dSYM --rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext - fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 -+$as_echo "$ac_cv_header_stdc" >&6; } -+if test $ac_cv_header_stdc = yes; then - -+$as_echo "#define STDC_HEADERS 1" >>confdefs.h - - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_malloc_0_nonnull" >&5 --$as_echo "$ac_cv_func_malloc_0_nonnull" >&6; } --if test $ac_cv_func_malloc_0_nonnull = yes; then - --cat >>confdefs.h <<\_ACEOF --#define HAVE_MALLOC 1 --_ACEOF -- --else -- cat >>confdefs.h <<\_ACEOF --#define HAVE_MALLOC 0 -+for ac_header in float.h malloc.h memory.h stdlib.h string.h unistd.h -+do : -+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : -+ cat >>confdefs.h <<_ACEOF -+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 - _ACEOF - -- case " $LIBOBJS " in -- *" malloc.$ac_objext "* ) ;; -- *) LIBOBJS="$LIBOBJS malloc.$ac_objext" -- ;; --esac -+fi - -+done - --cat >>confdefs.h <<\_ACEOF --#define malloc rpl_malloc -+for ac_header in wchar.h -+do : -+ ac_fn_c_check_header_mongrel "$LINENO" "wchar.h" "ac_cv_header_wchar_h" "$ac_includes_default" -+if test "x$ac_cv_header_wchar_h" = xyes; then : -+ cat >>confdefs.h <<_ACEOF -+#define HAVE_WCHAR_H 1 - _ACEOF - - fi - -+done - -+#todo: check for headers of the libraries above - --{ $as_echo "$as_me:$LINENO: checking for working memcmp" >&5 --$as_echo_n "checking for working memcmp... " >&6; } --if test "${ac_cv_func_memcmp_working+set}" = set; then -+# Checks for typedefs, structures, and compiler characteristics. -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdbool.h that conforms to C99" >&5 -+$as_echo_n "checking for stdbool.h that conforms to C99... " >&6; } -+if ${ac_cv_header_stdbool_h+:} false; then : - $as_echo_n "(cached) " >&6 - else -- if test "$cross_compiling" = yes; then -- ac_cv_func_memcmp_working=no -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+ #include -+ #ifndef bool -+ "error: bool is not defined" -+ #endif -+ #ifndef false -+ "error: false is not defined" -+ #endif -+ #if false -+ "error: false is not 0" -+ #endif -+ #ifndef true -+ "error: true is not defined" -+ #endif -+ #if true != 1 -+ "error: true is not 1" -+ #endif -+ #ifndef __bool_true_false_are_defined -+ "error: __bool_true_false_are_defined is not defined" -+ #endif -+ -+ struct s { _Bool s: 1; _Bool t; } s; -+ -+ char a[true == 1 ? 1 : -1]; -+ char b[false == 0 ? 1 : -1]; -+ char c[__bool_true_false_are_defined == 1 ? 1 : -1]; -+ char d[(bool) 0.5 == true ? 1 : -1]; -+ /* See body of main program for 'e'. */ -+ char f[(_Bool) 0.0 == false ? 1 : -1]; -+ char g[true]; -+ char h[sizeof (_Bool)]; -+ char i[sizeof s.t]; -+ enum { j = false, k = true, l = false * true, m = true * 256 }; -+ /* The following fails for -+ HP aC++/ANSI C B3910B A.05.55 [Dec 04 2003]. */ -+ _Bool n[m]; -+ char o[sizeof n == m * sizeof n[0] ? 1 : -1]; -+ char p[-1 - (_Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1]; -+ /* Catch a bug in an HP-UX C compiler. See -+ http://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html -+ http://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html -+ */ -+ _Bool q = true; -+ _Bool *pq = &q; -+ -+int -+main () -+{ -+ -+ bool e = &s; -+ *pq |= q; -+ *pq |= ! q; -+ /* Refer to every declared value, to avoid compiler optimizations. */ -+ return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !!j + !k + !!l -+ + !m + !n + !o + !p + !q + !pq); -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ ac_cv_header_stdbool_h=yes - else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ -+ ac_cv_header_stdbool_h=no -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdbool_h" >&5 -+$as_echo "$ac_cv_header_stdbool_h" >&6; } -+ ac_fn_c_check_type "$LINENO" "_Bool" "ac_cv_type__Bool" "$ac_includes_default" -+if test "x$ac_cv_type__Bool" = xyes; then : -+ -+cat >>confdefs.h <<_ACEOF -+#define HAVE__BOOL 1 - _ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ -+ -+fi -+ -+ -+if test $ac_cv_header_stdbool_h = yes; then -+ -+$as_echo "#define HAVE_STDBOOL_H 1" >>confdefs.h -+ -+fi -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5 -+$as_echo_n "checking for an ANSI C-conforming const... " >&6; } -+if ${ac_cv_c_const+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ --$ac_includes_default -+ - int - main () - { - -- /* Some versions of memcmp are not 8-bit clean. */ -- char c0 = '\100', c1 = '\200', c2 = '\201'; -- if (memcmp(&c0, &c2, 1) >= 0 || memcmp(&c1, &c2, 1) >= 0) -- return 1; -+#ifndef __cplusplus -+ /* Ultrix mips cc rejects this sort of thing. */ -+ typedef int charset[2]; -+ const charset cs = { 0, 0 }; -+ /* SunOS 4.1.1 cc rejects this. */ -+ char const *const *pcpcc; -+ char **ppc; -+ /* NEC SVR4.0.2 mips cc rejects this. */ -+ struct point {int x, y;}; -+ static struct point const zero = {0,0}; -+ /* AIX XL C 1.02.0.0 rejects this. -+ It does not let you subtract one const X* pointer from another in -+ an arm of an if-expression whose if-part is not a constant -+ expression */ -+ const char *g = "string"; -+ pcpcc = &g + (g ? g-g : 0); -+ /* HPUX 7.0 cc rejects these. */ -+ ++pcpcc; -+ ppc = (char**) pcpcc; -+ pcpcc = (char const *const *) ppc; -+ { /* SCO 3.2v4 cc rejects this sort of thing. */ -+ char tx; -+ char *t = &tx; -+ char const *s = 0 ? (char *) 0 : (char const *) 0; - -- /* The Next x86 OpenStep bug shows up only when comparing 16 bytes -- or more and with at least one buffer not starting on a 4-byte boundary. -- William Lewis provided this test program. */ -- { -- char foo[21]; -- char bar[21]; -- int i; -- for (i = 0; i < 4; i++) -- { -- char *a = foo + i; -- char *b = bar + i; -- strcpy (a, "--------01111111"); -- strcpy (b, "--------10000000"); -- if (memcmp (a, b, 16) >= 0) -- return 1; -- } -- return 0; -+ *t++ = 0; -+ if (s) return 0; -+ } -+ { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */ -+ int x[] = {25, 17}; -+ const int *foo = &x[0]; -+ ++foo; -+ } -+ { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */ -+ typedef const int *iptr; -+ iptr p = 0; -+ ++p; -+ } -+ { /* AIX XL C 1.02.0.0 rejects this sort of thing, saying -+ "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ -+ struct s { int j; const int *ap[3]; } bx; -+ struct s *b = &bx; b->j = 5; -+ } -+ { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ -+ const int foo = 10; -+ if (!foo) return 0; - } -+ return !cs[0] && !zero.x; -+#endif - - ; - return 0; - } - _ACEOF --rm -f conftest$ac_exeext --if { (ac_try="$ac_link" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_link") 2>&5 -- ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_try") 2>&5 -- ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_func_memcmp_working=yes -+if ac_fn_c_try_compile "$LINENO"; then : -+ ac_cv_c_const=yes - else -- $as_echo "$as_me: program exited with status $ac_status" >&5 --$as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -+ ac_cv_c_const=no -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5 -+$as_echo "$ac_cv_c_const" >&6; } -+if test $ac_cv_c_const = no; then -+ -+$as_echo "#define const /**/" >>confdefs.h -+ -+fi -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5 -+$as_echo_n "checking for inline... " >&6; } -+if ${ac_cv_c_inline+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ ac_cv_c_inline=no -+for ac_kw in inline __inline__ __inline; do -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#ifndef __cplusplus -+typedef int foo_t; -+static $ac_kw foo_t static_foo () {return 0; } -+$ac_kw foo_t foo () {return 0; } -+#endif - --( exit $ac_status ) --ac_cv_func_memcmp_working=no --fi --rm -rf conftest.dSYM --rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ ac_cv_c_inline=$ac_kw - fi -- -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ test "$ac_cv_c_inline" != no && break -+done - - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_memcmp_working" >&5 --$as_echo "$ac_cv_func_memcmp_working" >&6; } --test $ac_cv_func_memcmp_working = no && case " $LIBOBJS " in -- *" memcmp.$ac_objext "* ) ;; -- *) LIBOBJS="$LIBOBJS memcmp.$ac_objext" -- ;; -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5 -+$as_echo "$ac_cv_c_inline" >&6; } -+ -+case $ac_cv_c_inline in -+ inline | yes) ;; -+ *) -+ case $ac_cv_c_inline in -+ no) ac_val=;; -+ *) ac_val=$ac_cv_c_inline;; -+ esac -+ cat >>confdefs.h <<_ACEOF -+#ifndef __cplusplus -+#define inline $ac_val -+#endif -+_ACEOF -+ ;; - esac - -+ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default" -+if test "x$ac_cv_type_size_t" = xyes; then : - -+else -+ -+cat >>confdefs.h <<_ACEOF -+#define size_t unsigned int -+_ACEOF - --for ac_header in stdlib.h --do --as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` --if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 --$as_echo_n "checking for $ac_header... " >&6; } --if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -- $as_echo_n "(cached) " >&6 - fi --ac_res=`eval 'as_val=${'$as_ac_Header'} -- $as_echo "$as_val"'` -- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 --$as_echo "$ac_res" >&6; } -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether struct tm is in sys/time.h or time.h" >&5 -+$as_echo_n "checking whether struct tm is in sys/time.h or time.h... " >&6; } -+if ${ac_cv_struct_tm+:} false; then : -+ $as_echo_n "(cached) " >&6 - else -- # Is the header compilable? --{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 --$as_echo_n "checking $ac_header usability... " >&6; } --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ --$ac_includes_default --#include <$ac_header> -+#include -+#include -+ -+int -+main () -+{ -+struct tm tm; -+ int *p = &tm.tm_sec; -+ return !p; -+ ; -+ return 0; -+} - _ACEOF --rm -f conftest.$ac_objext --if { (ac_try="$ac_compile" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_compile") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest.$ac_objext; then -- ac_header_compiler=yes -+if ac_fn_c_try_compile "$LINENO"; then : -+ ac_cv_struct_tm=time.h - else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_header_compiler=no -+ ac_cv_struct_tm=sys/time.h - fi -- - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext --{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --$as_echo "$ac_header_compiler" >&6; } -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_tm" >&5 -+$as_echo "$ac_cv_struct_tm" >&6; } -+if test $ac_cv_struct_tm = sys/time.h; then - --# Is the header present? --{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 --$as_echo_n "checking $ac_header presence... " >&6; } --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <$ac_header> --_ACEOF --if { (ac_try="$ac_cpp conftest.$ac_ext" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null && { -- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -- test ! -s conftest.err -- }; then -- ac_header_preproc=yes --else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -+$as_echo "#define TM_IN_SYS_TIME 1" >>confdefs.h - -- ac_header_preproc=no - fi - --rm -f conftest.err conftest.$ac_ext --{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --$as_echo "$ac_header_preproc" >&6; } - --# So? What about this header? --case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -- yes:no: ) -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 --$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 --$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -- ac_header_preproc=yes -- ;; -- no:yes:* ) -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 --$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 --$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 --$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 --$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 --$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 --$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -- ( cat <<\_ASBOX --## --------------------------------- ## --## Report this to BUG-REPORT-ADDRESS ## --## --------------------------------- ## --_ASBOX -- ) | sed "s/^/$as_me: WARNING: /" >&2 -- ;; --esac --{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 --$as_echo_n "checking for $ac_header... " >&6; } --if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+# Checks for platform characteristics. -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5 -+$as_echo_n "checking whether byte ordering is bigendian... " >&6; } -+if ${ac_cv_c_bigendian+:} false; then : - $as_echo_n "(cached) " >&6 - else -- eval "$as_ac_Header=\$ac_header_preproc" --fi --ac_res=`eval 'as_val=${'$as_ac_Header'} -- $as_echo "$as_val"'` -- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 --$as_echo "$ac_res" >&6; } -+ ac_cv_c_bigendian=unknown -+ # See if we're dealing with a universal compiler. -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#ifndef __APPLE_CC__ -+ not a universal capable compiler -+ #endif -+ typedef int dummy; - --fi --as_val=`eval 'as_val=${'$as_ac_Header'} -- $as_echo "$as_val"'` -- if test "x$as_val" = x""yes; then -- cat >>confdefs.h <<_ACEOF --#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 - _ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : - -+ # Check for potential -arch flags. It is not universal unless -+ # there are at least two -arch flags with different values. -+ ac_arch= -+ ac_prev= -+ for ac_word in $CC $CFLAGS $CPPFLAGS $LDFLAGS; do -+ if test -n "$ac_prev"; then -+ case $ac_word in -+ i?86 | x86_64 | ppc | ppc64) -+ if test -z "$ac_arch" || test "$ac_arch" = "$ac_word"; then -+ ac_arch=$ac_word -+ else -+ ac_cv_c_bigendian=universal -+ break -+ fi -+ ;; -+ esac -+ ac_prev= -+ elif test "x$ac_word" = "x-arch"; then -+ ac_prev=arch -+ fi -+ done - fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ if test $ac_cv_c_bigendian = unknown; then -+ # See if sys/param.h defines the BYTE_ORDER macro. -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include -+ #include - --done -+int -+main () -+{ -+#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \ -+ && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \ -+ && LITTLE_ENDIAN) -+ bogus endian macros -+ #endif - --{ $as_echo "$as_me:$LINENO: checking for GNU libc compatible realloc" >&5 --$as_echo_n "checking for GNU libc compatible realloc... " >&6; } --if test "${ac_cv_func_realloc_0_nonnull+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- if test "$cross_compiling" = yes; then -- ac_cv_func_realloc_0_nonnull=no --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ -+ ; -+ return 0; -+} - _ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ # It does; now see whether it defined to BIG_ENDIAN or not. -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ --#if defined STDC_HEADERS || defined HAVE_STDLIB_H --# include --#else --char *realloc (); --#endif -+#include -+ #include - - int - main () - { --return ! realloc (0, 0); -+#if BYTE_ORDER != BIG_ENDIAN -+ not big endian -+ #endif -+ - ; - return 0; - } - _ACEOF --rm -f conftest$ac_exeext --if { (ac_try="$ac_link" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_link") 2>&5 -- ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_try") 2>&5 -- ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_func_realloc_0_nonnull=yes -+if ac_fn_c_try_compile "$LINENO"; then : -+ ac_cv_c_bigendian=yes - else -- $as_echo "$as_me: program exited with status $ac_status" >&5 --$as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --( exit $ac_status ) --ac_cv_func_realloc_0_nonnull=no --fi --rm -rf conftest.dSYM --rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -+ ac_cv_c_bigendian=no - fi -- -- -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_realloc_0_nonnull" >&5 --$as_echo "$ac_cv_func_realloc_0_nonnull" >&6; } --if test $ac_cv_func_realloc_0_nonnull = yes; then -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ fi -+ if test $ac_cv_c_bigendian = unknown; then -+ # See if defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris). -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include - --cat >>confdefs.h <<\_ACEOF --#define HAVE_REALLOC 1 --_ACEOF -+int -+main () -+{ -+#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN) -+ bogus endian macros -+ #endif - --else -- cat >>confdefs.h <<\_ACEOF --#define HAVE_REALLOC 0 -+ ; -+ return 0; -+} - _ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ # It does; now see whether it defined to _BIG_ENDIAN or not. -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include - -- case " $LIBOBJS " in -- *" realloc.$ac_objext "* ) ;; -- *) LIBOBJS="$LIBOBJS realloc.$ac_objext" -- ;; --esac -- -+int -+main () -+{ -+#ifndef _BIG_ENDIAN -+ not big endian -+ #endif - --cat >>confdefs.h <<\_ACEOF --#define realloc rpl_realloc -+ ; -+ return 0; -+} - _ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ ac_cv_c_bigendian=yes -+else -+ ac_cv_c_bigendian=no -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ fi -+ if test $ac_cv_c_bigendian = unknown; then -+ # Compile a test program. -+ if test "$cross_compiling" = yes; then : -+ # Try to guess by grepping values from an object file. -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+short int ascii_mm[] = -+ { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 }; -+ short int ascii_ii[] = -+ { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 }; -+ int use_ascii (int i) { -+ return ascii_mm[i] + ascii_ii[i]; -+ } -+ short int ebcdic_ii[] = -+ { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 }; -+ short int ebcdic_mm[] = -+ { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 }; -+ int use_ebcdic (int i) { -+ return ebcdic_mm[i] + ebcdic_ii[i]; -+ } -+ extern int foo; - -+int -+main () -+{ -+return use_ascii (foo) == use_ebcdic (foo); -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then -+ ac_cv_c_bigendian=yes -+ fi -+ if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then -+ if test "$ac_cv_c_bigendian" = unknown; then -+ ac_cv_c_bigendian=no -+ else -+ # finding both strings is unlikely to happen, but who knows? -+ ac_cv_c_bigendian=unknown -+ fi -+ fi - fi -- -- -- --{ $as_echo "$as_me:$LINENO: checking whether lstat dereferences a symlink specified with a trailing slash" >&5 --$as_echo_n "checking whether lstat dereferences a symlink specified with a trailing slash... " >&6; } --if test "${ac_cv_func_lstat_dereferences_slashed_symlink+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- rm -f conftest.sym conftest.file --echo >conftest.file --if test "$as_ln_s" = "ln -s" && ln -s conftest.file conftest.sym; then -- if test "$cross_compiling" = yes; then -- ac_cv_func_lstat_dereferences_slashed_symlink=no -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - $ac_includes_default - int - main () - { --struct stat sbuf; -- /* Linux will dereference the symlink and fail. -- That is better in the sense that it means we will not -- have to compile and use the lstat wrapper. */ -- return lstat ("conftest.sym/", &sbuf) == 0; -+ -+ /* Are we little or big endian? From Harbison&Steele. */ -+ union -+ { -+ long int l; -+ char c[sizeof (long int)]; -+ } u; -+ u.l = 1; -+ return u.c[sizeof (long int) - 1] == 1; -+ - ; - return 0; - } - _ACEOF --rm -f conftest$ac_exeext --if { (ac_try="$ac_link" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_link") 2>&5 -- ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_try") 2>&5 -- ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_func_lstat_dereferences_slashed_symlink=yes -+if ac_fn_c_try_run "$LINENO"; then : -+ ac_cv_c_bigendian=no - else -- $as_echo "$as_me: program exited with status $ac_status" >&5 --$as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --( exit $ac_status ) --ac_cv_func_lstat_dereferences_slashed_symlink=no --fi --rm -rf conftest.dSYM --rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -+ ac_cv_c_bigendian=yes - fi -- -- --else -- # If the `ln -s' command failed, then we probably don't even -- # have an lstat function. -- ac_cv_func_lstat_dereferences_slashed_symlink=no -+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ -+ conftest.$ac_objext conftest.beam conftest.$ac_ext - fi --rm -f conftest.sym conftest.file - -+ fi - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_lstat_dereferences_slashed_symlink" >&5 --$as_echo "$ac_cv_func_lstat_dereferences_slashed_symlink" >&6; } -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5 -+$as_echo "$ac_cv_c_bigendian" >&6; } -+ case $ac_cv_c_bigendian in #( -+ yes) -+ $as_echo "#define WORDS_BIGENDIAN 1" >>confdefs.h -+;; #( -+ no) -+ ;; #( -+ universal) - --test $ac_cv_func_lstat_dereferences_slashed_symlink = yes && -+$as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h - --cat >>confdefs.h <<_ACEOF --#define LSTAT_FOLLOWS_SLASHED_SYMLINK 1 --_ACEOF -+ ;; #( -+ *) -+ as_fn_error $? "unknown endianness -+ presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;; -+ esac - - --if test $ac_cv_func_lstat_dereferences_slashed_symlink = no; then -- case " $LIBOBJS " in -- *" lstat.$ac_objext "* ) ;; -- *) LIBOBJS="$LIBOBJS lstat.$ac_objext" -- ;; --esac -+# Checks for library functions. -+for ac_header in stdlib.h -+do : -+ ac_fn_c_check_header_mongrel "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default" -+if test "x$ac_cv_header_stdlib_h" = xyes; then : -+ cat >>confdefs.h <<_ACEOF -+#define HAVE_STDLIB_H 1 -+_ACEOF - - fi - --{ $as_echo "$as_me:$LINENO: checking whether stat accepts an empty string" >&5 --$as_echo_n "checking whether stat accepts an empty string... " >&6; } --if test "${ac_cv_func_stat_empty_string_bug+set}" = set; then -+done -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU libc compatible malloc" >&5 -+$as_echo_n "checking for GNU libc compatible malloc... " >&6; } -+if ${ac_cv_func_malloc_0_nonnull+:} false; then : - $as_echo_n "(cached) " >&6 - else -- if test "$cross_compiling" = yes; then -- ac_cv_func_stat_empty_string_bug=yes -+ if test "$cross_compiling" = yes; then : -+ ac_cv_func_malloc_0_nonnull=no - else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ --$ac_includes_default -+#if defined STDC_HEADERS || defined HAVE_STDLIB_H -+# include -+#else -+char *malloc (); -+#endif -+ - int - main () - { --struct stat sbuf; -- return stat ("", &sbuf) == 0; -+return ! malloc (0); - ; - return 0; - } - _ACEOF --rm -f conftest$ac_exeext --if { (ac_try="$ac_link" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_link") 2>&5 -- ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_try") 2>&5 -- ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_func_stat_empty_string_bug=no -+if ac_fn_c_try_run "$LINENO"; then : -+ ac_cv_func_malloc_0_nonnull=yes - else -- $as_echo "$as_me: program exited with status $ac_status" >&5 --$as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --( exit $ac_status ) --ac_cv_func_stat_empty_string_bug=yes -+ ac_cv_func_malloc_0_nonnull=no - fi --rm -rf conftest.dSYM --rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ -+ conftest.$ac_objext conftest.beam conftest.$ac_ext - fi - -- - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_stat_empty_string_bug" >&5 --$as_echo "$ac_cv_func_stat_empty_string_bug" >&6; } --if test $ac_cv_func_stat_empty_string_bug = yes; then -- case " $LIBOBJS " in -- *" stat.$ac_objext "* ) ;; -- *) LIBOBJS="$LIBOBJS stat.$ac_objext" -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_malloc_0_nonnull" >&5 -+$as_echo "$ac_cv_func_malloc_0_nonnull" >&6; } -+if test $ac_cv_func_malloc_0_nonnull = yes; then : -+ -+$as_echo "#define HAVE_MALLOC 1" >>confdefs.h -+ -+else -+ $as_echo "#define HAVE_MALLOC 0" >>confdefs.h -+ -+ case " $LIBOBJS " in -+ *" malloc.$ac_objext "* ) ;; -+ *) LIBOBJS="$LIBOBJS malloc.$ac_objext" - ;; - esac - - --cat >>confdefs.h <<_ACEOF --#define HAVE_STAT_EMPTY_STRING_BUG 1 --_ACEOF -+$as_echo "#define malloc rpl_malloc" >>confdefs.h - - fi - --{ $as_echo "$as_me:$LINENO: checking for working strtod" >&5 --$as_echo_n "checking for working strtod... " >&6; } --if test "${ac_cv_func_strtod+set}" = set; then -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working memcmp" >&5 -+$as_echo_n "checking for working memcmp... " >&6; } -+if ${ac_cv_func_memcmp_working+:} false; then : - $as_echo_n "(cached) " >&6 - else -- if test "$cross_compiling" = yes; then -- ac_cv_func_strtod=no -+ if test "$cross_compiling" = yes; then : -+ ac_cv_func_memcmp_working=no - else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ -- - $ac_includes_default --#ifndef strtod --double strtod (); --#endif - int --main() -+main () - { -- { -- /* Some versions of Linux strtod mis-parse strings with leading '+'. */ -- char *string = " +69"; -- char *term; -- double value; -- value = strtod (string, &term); -- if (value != 69 || term != (string + 4)) -- return 1; -- } - -+ /* Some versions of memcmp are not 8-bit clean. */ -+ char c0 = '\100', c1 = '\200', c2 = '\201'; -+ if (memcmp(&c0, &c2, 1) >= 0 || memcmp(&c1, &c2, 1) >= 0) -+ return 1; -+ -+ /* The Next x86 OpenStep bug shows up only when comparing 16 bytes -+ or more and with at least one buffer not starting on a 4-byte boundary. -+ William Lewis provided this test program. */ - { -- /* Under Solaris 2.4, strtod returns the wrong value for the -- terminating character under some conditions. */ -- char *string = "NaN"; -- char *term; -- strtod (string, &term); -- if (term != string && *(term - 1) == 0) -- return 1; -+ char foo[21]; -+ char bar[21]; -+ int i; -+ for (i = 0; i < 4; i++) -+ { -+ char *a = foo + i; -+ char *b = bar + i; -+ strcpy (a, "--------01111111"); -+ strcpy (b, "--------10000000"); -+ if (memcmp (a, b, 16) >= 0) -+ return 1; -+ } -+ return 0; - } -- return 0; --} -- --_ACEOF --rm -f conftest$ac_exeext --if { (ac_try="$ac_link" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_link") 2>&5 -- ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_try") 2>&5 -- ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_func_strtod=yes --else -- $as_echo "$as_me: program exited with status $ac_status" >&5 --$as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --( exit $ac_status ) --ac_cv_func_strtod=no --fi --rm -rf conftest.dSYM --rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext --fi -- -- --fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_strtod" >&5 --$as_echo "$ac_cv_func_strtod" >&6; } --if test $ac_cv_func_strtod = no; then -- case " $LIBOBJS " in -- *" strtod.$ac_objext "* ) ;; -- *) LIBOBJS="$LIBOBJS strtod.$ac_objext" -- ;; --esac -- --{ $as_echo "$as_me:$LINENO: checking for pow" >&5 --$as_echo_n "checking for pow... " >&6; } --if test "${ac_cv_func_pow+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --/* Define pow to an innocuous variant, in case declares pow. -- For example, HP-UX 11i declares gettimeofday. */ --#define pow innocuous_pow -- --/* System header to define __stub macros and hopefully few prototypes, -- which can conflict with char pow (); below. -- Prefer to if __STDC__ is defined, since -- exists even on freestanding compilers. */ -- --#ifdef __STDC__ --# include --#else --# include --#endif -- --#undef pow -- --/* Override any GCC internal prototype to avoid an error. -- Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ --#ifdef __cplusplus --extern "C" --#endif --char pow (); --/* The GNU C library defines this for functions which it implements -- to always fail with ENOSYS. Some functions are actually named -- something starting with __ and the normal name is an alias. */ --#if defined __stub_pow || defined __stub___pow --choke me --#endif - --int --main () --{ --return pow (); - ; - return 0; - } - _ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (ac_try="$ac_link" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_link") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -- ac_cv_func_pow=yes -+if ac_fn_c_try_run "$LINENO"; then : -+ ac_cv_func_memcmp_working=yes - else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -+ ac_cv_func_memcmp_working=no -+fi -+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ -+ conftest.$ac_objext conftest.beam conftest.$ac_ext -+fi - -- ac_cv_func_pow=no - fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_memcmp_working" >&5 -+$as_echo "$ac_cv_func_memcmp_working" >&6; } -+test $ac_cv_func_memcmp_working = no && case " $LIBOBJS " in -+ *" memcmp.$ac_objext "* ) ;; -+ *) LIBOBJS="$LIBOBJS memcmp.$ac_objext" -+ ;; -+esac -+ -+ -+for ac_header in stdlib.h -+do : -+ ac_fn_c_check_header_mongrel "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default" -+if test "x$ac_cv_header_stdlib_h" = xyes; then : -+ cat >>confdefs.h <<_ACEOF -+#define HAVE_STDLIB_H 1 -+_ACEOF - --rm -rf conftest.dSYM --rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -- conftest$ac_exeext conftest.$ac_ext - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_pow" >&5 --$as_echo "$ac_cv_func_pow" >&6; } - --if test $ac_cv_func_pow = no; then -- { $as_echo "$as_me:$LINENO: checking for pow in -lm" >&5 --$as_echo_n "checking for pow in -lm... " >&6; } --if test "${ac_cv_lib_m_pow+set}" = set; then -+done -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU libc compatible realloc" >&5 -+$as_echo_n "checking for GNU libc compatible realloc... " >&6; } -+if ${ac_cv_func_realloc_0_nonnull+:} false; then : - $as_echo_n "(cached) " >&6 - else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-lm $LIBS" --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ if test "$cross_compiling" = yes; then : -+ ac_cv_func_realloc_0_nonnull=no -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ -- --/* Override any GCC internal prototype to avoid an error. -- Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ --#ifdef __cplusplus --extern "C" -+#if defined STDC_HEADERS || defined HAVE_STDLIB_H -+# include -+#else -+char *realloc (); - #endif --char pow (); -+ - int - main () - { --return pow (); -+return ! realloc (0, 0); - ; - return 0; - } - _ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (ac_try="$ac_link" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_link") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -- ac_cv_lib_m_pow=yes --else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_cv_lib_m_pow=no --fi -- --rm -rf conftest.dSYM --rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -- conftest$ac_exeext conftest.$ac_ext --LIBS=$ac_check_lib_save_LIBS --fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_m_pow" >&5 --$as_echo "$ac_cv_lib_m_pow" >&6; } --if test "x$ac_cv_lib_m_pow" = x""yes; then -- POW_LIB=-lm -+if ac_fn_c_try_run "$LINENO"; then : -+ ac_cv_func_realloc_0_nonnull=yes - else -- { $as_echo "$as_me:$LINENO: WARNING: cannot find library containing definition of pow" >&5 --$as_echo "$as_me: WARNING: cannot find library containing definition of pow" >&2;} -+ ac_cv_func_realloc_0_nonnull=no - fi -- -+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ -+ conftest.$ac_objext conftest.beam conftest.$ac_ext - fi - - fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_realloc_0_nonnull" >&5 -+$as_echo "$ac_cv_func_realloc_0_nonnull" >&6; } -+if test $ac_cv_func_realloc_0_nonnull = yes; then : - -+$as_echo "#define HAVE_REALLOC 1" >>confdefs.h - --for ac_func in vprintf --do --as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` --{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 --$as_echo_n "checking for $ac_func... " >&6; } --if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then -- $as_echo_n "(cached) " >&6 - else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --/* Define $ac_func to an innocuous variant, in case declares $ac_func. -- For example, HP-UX 11i declares gettimeofday. */ --#define $ac_func innocuous_$ac_func -+ $as_echo "#define HAVE_REALLOC 0" >>confdefs.h - --/* System header to define __stub macros and hopefully few prototypes, -- which can conflict with char $ac_func (); below. -- Prefer to if __STDC__ is defined, since -- exists even on freestanding compilers. */ -+ case " $LIBOBJS " in -+ *" realloc.$ac_objext "* ) ;; -+ *) LIBOBJS="$LIBOBJS realloc.$ac_objext" -+ ;; -+esac - --#ifdef __STDC__ --# include --#else --# include --#endif - --#undef $ac_func -+$as_echo "#define realloc rpl_realloc" >>confdefs.h -+ -+fi - --/* Override any GCC internal prototype to avoid an error. -- Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ --#ifdef __cplusplus --extern "C" --#endif --char $ac_func (); --/* The GNU C library defines this for functions which it implements -- to always fail with ENOSYS. Some functions are actually named -- something starting with __ and the normal name is an alias. */ --#if defined __stub_$ac_func || defined __stub___$ac_func --choke me --#endif - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether lstat correctly handles trailing slash" >&5 -+$as_echo_n "checking whether lstat correctly handles trailing slash... " >&6; } -+if ${ac_cv_func_lstat_dereferences_slashed_symlink+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ rm -f conftest.sym conftest.file -+echo >conftest.file -+if test "$as_ln_s" = "ln -s" && ln -s conftest.file conftest.sym; then -+ if test "$cross_compiling" = yes; then : -+ ac_cv_func_lstat_dereferences_slashed_symlink=no -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+$ac_includes_default - int - main () - { --return $ac_func (); -+struct stat sbuf; -+ /* Linux will dereference the symlink and fail, as required by POSIX. -+ That is better in the sense that it means we will not -+ have to compile and use the lstat wrapper. */ -+ return lstat ("conftest.sym/", &sbuf) == 0; - ; - return 0; - } - _ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (ac_try="$ac_link" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_link") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -- eval "$as_ac_var=yes" -+if ac_fn_c_try_run "$LINENO"; then : -+ ac_cv_func_lstat_dereferences_slashed_symlink=yes - else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -+ ac_cv_func_lstat_dereferences_slashed_symlink=no -+fi -+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ -+ conftest.$ac_objext conftest.beam conftest.$ac_ext -+fi - -- eval "$as_ac_var=no" -+else -+ # If the `ln -s' command failed, then we probably don't even -+ # have an lstat function. -+ ac_cv_func_lstat_dereferences_slashed_symlink=no - fi -+rm -f conftest.sym conftest.file - --rm -rf conftest.dSYM --rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -- conftest$ac_exeext conftest.$ac_ext - fi --ac_res=`eval 'as_val=${'$as_ac_var'} -- $as_echo "$as_val"'` -- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 --$as_echo "$ac_res" >&6; } --as_val=`eval 'as_val=${'$as_ac_var'} -- $as_echo "$as_val"'` -- if test "x$as_val" = x""yes; then -- cat >>confdefs.h <<_ACEOF --#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 --_ACEOF -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_lstat_dereferences_slashed_symlink" >&5 -+$as_echo "$ac_cv_func_lstat_dereferences_slashed_symlink" >&6; } - --{ $as_echo "$as_me:$LINENO: checking for _doprnt" >&5 --$as_echo_n "checking for _doprnt... " >&6; } --if test "${ac_cv_func__doprnt+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --/* Define _doprnt to an innocuous variant, in case declares _doprnt. -- For example, HP-UX 11i declares gettimeofday. */ --#define _doprnt innocuous__doprnt -+test $ac_cv_func_lstat_dereferences_slashed_symlink = yes && - --/* System header to define __stub macros and hopefully few prototypes, -- which can conflict with char _doprnt (); below. -- Prefer to if __STDC__ is defined, since -- exists even on freestanding compilers. */ -+cat >>confdefs.h <<_ACEOF -+#define LSTAT_FOLLOWS_SLASHED_SYMLINK 1 -+_ACEOF - --#ifdef __STDC__ --# include --#else --# include --#endif - --#undef _doprnt -+if test "x$ac_cv_func_lstat_dereferences_slashed_symlink" = xno; then -+ case " $LIBOBJS " in -+ *" lstat.$ac_objext "* ) ;; -+ *) LIBOBJS="$LIBOBJS lstat.$ac_objext" -+ ;; -+esac - --/* Override any GCC internal prototype to avoid an error. -- Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ --#ifdef __cplusplus --extern "C" --#endif --char _doprnt (); --/* The GNU C library defines this for functions which it implements -- to always fail with ENOSYS. Some functions are actually named -- something starting with __ and the normal name is an alias. */ --#if defined __stub__doprnt || defined __stub____doprnt --choke me --#endif -+fi - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stat accepts an empty string" >&5 -+$as_echo_n "checking whether stat accepts an empty string... " >&6; } -+if ${ac_cv_func_stat_empty_string_bug+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test "$cross_compiling" = yes; then : -+ ac_cv_func_stat_empty_string_bug=yes -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+$ac_includes_default - int - main () - { --return _doprnt (); -+struct stat sbuf; -+ return stat ("", &sbuf) == 0; - ; - return 0; - } - _ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (ac_try="$ac_link" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_link") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -- ac_cv_func__doprnt=yes -+if ac_fn_c_try_run "$LINENO"; then : -+ ac_cv_func_stat_empty_string_bug=no - else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_cv_func__doprnt=no --fi -- --rm -rf conftest.dSYM --rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -- conftest$ac_exeext conftest.$ac_ext -+ ac_cv_func_stat_empty_string_bug=yes - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_func__doprnt" >&5 --$as_echo "$ac_cv_func__doprnt" >&6; } --if test "x$ac_cv_func__doprnt" = x""yes; then -- --cat >>confdefs.h <<\_ACEOF --#define HAVE_DOPRNT 1 --_ACEOF -- -+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ -+ conftest.$ac_objext conftest.beam conftest.$ac_ext - fi - - fi --done -- -- -- -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_stat_empty_string_bug" >&5 -+$as_echo "$ac_cv_func_stat_empty_string_bug" >&6; } -+if test $ac_cv_func_stat_empty_string_bug = yes; then -+ case " $LIBOBJS " in -+ *" stat.$ac_objext "* ) ;; -+ *) LIBOBJS="$LIBOBJS stat.$ac_objext" -+ ;; -+esac - - -+cat >>confdefs.h <<_ACEOF -+#define HAVE_STAT_EMPTY_STRING_BUG 1 -+_ACEOF - -+fi - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working strtod" >&5 -+$as_echo_n "checking for working strtod... " >&6; } -+if ${ac_cv_func_strtod+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test "$cross_compiling" = yes; then : -+ ac_cv_func_strtod=no -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ - -+$ac_includes_default -+#ifndef strtod -+double strtod (); -+#endif -+int -+main() -+{ -+ { -+ /* Some versions of Linux strtod mis-parse strings with leading '+'. */ -+ char *string = " +69"; -+ char *term; -+ double value; -+ value = strtod (string, &term); -+ if (value != 69 || term != (string + 4)) -+ return 1; -+ } - -+ { -+ /* Under Solaris 2.4, strtod returns the wrong value for the -+ terminating character under some conditions. */ -+ char *string = "NaN"; -+ char *term; -+ strtod (string, &term); -+ if (term != string && *(term - 1) == 0) -+ return 1; -+ } -+ return 0; -+} - -+_ACEOF -+if ac_fn_c_try_run "$LINENO"; then : -+ ac_cv_func_strtod=yes -+else -+ ac_cv_func_strtod=no -+fi -+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ -+ conftest.$ac_objext conftest.beam conftest.$ac_ext -+fi - -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_strtod" >&5 -+$as_echo "$ac_cv_func_strtod" >&6; } -+if test $ac_cv_func_strtod = no; then -+ case " $LIBOBJS " in -+ *" strtod.$ac_objext "* ) ;; -+ *) LIBOBJS="$LIBOBJS strtod.$ac_objext" -+ ;; -+esac - -+ac_fn_c_check_func "$LINENO" "pow" "ac_cv_func_pow" -+if test "x$ac_cv_func_pow" = xyes; then : - -+fi - --for ac_func in floor memmove memset modf pow sqrt strchr strdup strerror strrchr strstr strtol --do --as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` --{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 --$as_echo_n "checking for $ac_func... " >&6; } --if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then -+if test $ac_cv_func_pow = no; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pow in -lm" >&5 -+$as_echo_n "checking for pow in -lm... " >&6; } -+if ${ac_cv_lib_m_pow+:} false; then : - $as_echo_n "(cached) " >&6 - else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-lm $LIBS" -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ --/* Define $ac_func to an innocuous variant, in case declares $ac_func. -- For example, HP-UX 11i declares gettimeofday. */ --#define $ac_func innocuous_$ac_func -- --/* System header to define __stub macros and hopefully few prototypes, -- which can conflict with char $ac_func (); below. -- Prefer to if __STDC__ is defined, since -- exists even on freestanding compilers. */ -- --#ifdef __STDC__ --# include --#else --# include --#endif -- --#undef $ac_func - - /* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC -@@ -19345,62 +17196,61 @@ cat >>conftest.$ac_ext <<_ACEOF - #ifdef __cplusplus - extern "C" - #endif --char $ac_func (); --/* The GNU C library defines this for functions which it implements -- to always fail with ENOSYS. Some functions are actually named -- something starting with __ and the normal name is an alias. */ --#if defined __stub_$ac_func || defined __stub___$ac_func --choke me --#endif -- -+char pow (); - int - main () - { --return $ac_func (); -+return pow (); - ; - return 0; - } - _ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (ac_try="$ac_link" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_link") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -- eval "$as_ac_var=yes" -+if ac_fn_c_try_link "$LINENO"; then : -+ ac_cv_lib_m_pow=yes - else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -+ ac_cv_lib_m_pow=no -+fi -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_pow" >&5 -+$as_echo "$ac_cv_lib_m_pow" >&6; } -+if test "x$ac_cv_lib_m_pow" = xyes; then : -+ POW_LIB=-lm -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cannot find library containing definition of pow" >&5 -+$as_echo "$as_me: WARNING: cannot find library containing definition of pow" >&2;} -+fi - -- eval "$as_ac_var=no" - fi - --rm -rf conftest.dSYM --rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -- conftest$ac_exeext conftest.$ac_ext - fi --ac_res=`eval 'as_val=${'$as_ac_var'} -- $as_echo "$as_val"'` -- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 --$as_echo "$ac_res" >&6; } --as_val=`eval 'as_val=${'$as_ac_var'} -- $as_echo "$as_val"'` -- if test "x$as_val" = x""yes; then -+ -+for ac_func in vprintf -+do : -+ ac_fn_c_check_func "$LINENO" "vprintf" "ac_cv_func_vprintf" -+if test "x$ac_cv_func_vprintf" = xyes; then : -+ cat >>confdefs.h <<_ACEOF -+#define HAVE_VPRINTF 1 -+_ACEOF -+ -+ac_fn_c_check_func "$LINENO" "_doprnt" "ac_cv_func__doprnt" -+if test "x$ac_cv_func__doprnt" = xyes; then : -+ -+$as_echo "#define HAVE_DOPRNT 1" >>confdefs.h -+ -+fi -+ -+fi -+done -+ -+ -+for ac_func in floor memmove memset modf pow sqrt strchr strdup strerror strrchr strstr strtol -+do : -+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -+if eval test \"x\$"$as_ac_var"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF - #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 - _ACEOF -@@ -19410,12 +17260,12 @@ done - - - # add a local directory as base for libs and include files --{ $as_echo "$as_me:$LINENO: checking for local include/lib path" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for local include/lib path" >&5 - $as_echo_n "checking for local include/lib path... " >&6; } - - - # Check whether --with-local was given. --if test "${with_local+set}" = set; then -+if test "${with_local+set}" = set; then : - withval=$with_local; - fi - -@@ -19428,7 +17278,7 @@ if test "$with_local" != "no" -a "$with_local" != "" ; then - ADD_PREFIX=$with_local - fi - -- { $as_echo "$as_me:$LINENO: result: adding $ADD_PREFIX" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: adding $ADD_PREFIX" >&5 - $as_echo "adding $ADD_PREFIX" >&6; } - - LOCAL_LIBS="-L$ADD_PREFIX/lib" -@@ -19439,7 +17289,7 @@ $as_echo "adding $ADD_PREFIX" >&6; } - LOCAL_INCS=$LOCAL_INCS - - else -- { $as_echo "$as_me:$LINENO: result: none" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5 - $as_echo "none" >&6; } - fi - -@@ -19455,21 +17305,17 @@ else - fi - - else -- { { $as_echo "$as_me:$LINENO: error: SAGA requires a unicode build of wxGTK" >&5 --$as_echo "$as_me: error: SAGA requires a unicode build of wxGTK" >&2;} -- { (exit 1); exit 1; }; } -+ as_fn_error $? "SAGA requires a unicode build of wxGTK" "$LINENO" 5 - exit - fi - - - # Check whether --enable-debug was given. --if test "${enable_debug+set}" = set; then -+if test "${enable_debug+set}" = set; then : - enableval=$enable_debug; case "${enableval}" in - yes) debug=true ;; - no) debug=false ;; -- *) { { $as_echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-debug" >&5 --$as_echo "$as_me: error: bad value ${enableval} for --enable-debug" >&2;} -- { (exit 1); exit 1; }; } ;; -+ *) as_fn_error $? "bad value ${enableval} for --enable-debug" "$LINENO" 5 ;; - esac - else - debug=false -@@ -19485,13 +17331,11 @@ fi - - - # Check whether --enable-gui was given. --if test "${enable_gui+set}" = set; then -+if test "${enable_gui+set}" = set; then : - enableval=$enable_gui; case "${enableval}" in - yes) gui=true ;; - no) gui=false ;; -- *) { { $as_echo "$as_me:$LINENO: error: bad value ${enableval} for --disable-gui" >&5 --$as_echo "$as_me: error: bad value ${enableval} for --disable-gui" >&2;} -- { (exit 1); exit 1; }; } ;; -+ *) as_fn_error $? "bad value ${enableval} for --disable-gui" "$LINENO" 5 ;; - esac - else - gui=true -@@ -19507,26 +17351,22 @@ fi - - - if test $gui = "false" ; then -- { $as_echo "$as_me:$LINENO: result: GUI and interactive modules will NOT be built" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: GUI and interactive modules will NOT be built" >&5 - $as_echo " GUI and interactive modules will NOT be built" >&6; } - else - --cat >>confdefs.h <<\_ACEOF --#define WITH_GUI 1 --_ACEOF -+$as_echo "#define WITH_GUI 1" >>confdefs.h - -- { $as_echo "$as_me:$LINENO: result: GUI and interactive modules will be built" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: GUI and interactive modules will be built" >&5 - $as_echo " GUI and interactive modules will be built" >&6; } - fi - - # Check whether --enable-odbc was given. --if test "${enable_odbc+set}" = set; then -+if test "${enable_odbc+set}" = set; then : - enableval=$enable_odbc; case "${enableval}" in - yes) odbc=true ;; - no) odbc=false ;; -- *) { { $as_echo "$as_me:$LINENO: error: bad value ${enableval} for --disable-odbc" >&5 --$as_echo "$as_me: error: bad value ${enableval} for --disable-odbc" >&2;} -- { (exit 1); exit 1; }; } ;; -+ *) as_fn_error $? "bad value ${enableval} for --disable-odbc" "$LINENO" 5 ;; - esac - else - odbc=true -@@ -19542,26 +17382,22 @@ fi - - - if test $odbc = "false" ; then -- { $as_echo "$as_me:$LINENO: result: ODBC support will NOT be built" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ODBC support will NOT be built" >&5 - $as_echo " ODBC support will NOT be built" >&6; } - else - --cat >>confdefs.h <<\_ACEOF --#define WITH_ODBC 1 --_ACEOF -+$as_echo "#define WITH_ODBC 1" >>confdefs.h - -- { $as_echo "$as_me:$LINENO: result: ODBC support will be built" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ODBC support will be built" >&5 - $as_echo " ODBC support will be built" >&6; } - fi - - # Check whether --enable-openmp was given. --if test "${enable_openmp+set}" = set; then -+if test "${enable_openmp+set}" = set; then : - enableval=$enable_openmp; case "${enableval}" in - yes) openmp=true ;; - no) openmp=false ;; -- *) { { $as_echo "$as_me:$LINENO: error: bad value ${enableval} for --disable-openmp" >&5 --$as_echo "$as_me: error: bad value ${enableval} for --disable-openmp" >&2;} -- { (exit 1); exit 1; }; } ;; -+ *) as_fn_error $? "bad value ${enableval} for --disable-openmp" "$LINENO" 5 ;; - esac - else - openmp=true -@@ -19577,16 +17413,16 @@ fi - - - if test $openmp = "false" ; then -- { $as_echo "$as_me:$LINENO: result: OpenMP support disabled" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: OpenMP support disabled" >&5 - $as_echo " OpenMP support disabled" >&6; } - GOMPFLAGS="" - else - if test -n "$GOMPFOUND" ; then -- { $as_echo "$as_me:$LINENO: result: Building with OpenMP support using libgomp" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Building with OpenMP support using libgomp" >&5 - $as_echo " Building with OpenMP support using libgomp" >&6; } - GOMPFLAGS="-fopenmp" - else -- { $as_echo "$as_me:$LINENO: result: libgomp not found, OpenMP support disabled" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: libgomp not found, OpenMP support disabled" >&5 - $as_echo " libgomp not found, OpenMP support disabled" >&6; } - GOMPFLAGS="" - fi -@@ -19629,12 +17465,12 @@ fi - - - if test -n "$HARUFOUND" ; then -- { $as_echo "$as_me:$LINENO: result: using lhpdf (libharu) from system libs." >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: using lhpdf (libharu) from system libs." >&5 - $as_echo " using lhpdf (libharu) from system libs." >&6; } - DISABLELIBHARU="" - HARU_LIB="-lhpdf" - else -- { $as_echo "$as_me:$LINENO: result: libharu was not found, pdf creation will be disabled" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: libharu was not found, pdf creation will be disabled" >&5 - $as_echo " libharu was not found, pdf creation will be disabled" >&6; } - DISABLELIBHARU="-D_SAGA_DONOTUSE_HARU" - HARU_LIB="" -@@ -19645,13 +17481,11 @@ $as_echo " libharu was not found, pdf creation will be disabled" >&6; } - - - # Check whether --enable-python was given. --if test "${enable_python+set}" = set; then -+if test "${enable_python+set}" = set; then : - enableval=$enable_python; case "${enableval}" in - yes) python=true ;; - no) python=false ;; -- *) { { $as_echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-python" >&5 --$as_echo "$as_me: error: bad value ${enableval} for --enable-python" >&2;} -- { (exit 1); exit 1; }; } ;; -+ *) as_fn_error $? "bad value ${enableval} for --enable-python" "$LINENO" 5 ;; - esac - else - python=false -@@ -19670,15 +17504,17 @@ if test x$python = xtrue; then - - - -+ -+ - # Find any Python interpreter. - if test -z "$PYTHON"; then -- for ac_prog in python python2 python3 python3.0 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 -+ for ac_prog in python python2 python3 python3.3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 - do - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_path_PYTHON+set}" = set; then -+if ${ac_cv_path_PYTHON+:} false; then : - $as_echo_n "(cached) " >&6 - else - case $PYTHON in -@@ -19691,14 +17527,14 @@ 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 -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done - IFS=$as_save_IFS - - ;; -@@ -19706,10 +17542,10 @@ esac - fi - PYTHON=$ac_cv_path_PYTHON - if test -n "$PYTHON"; then -- { $as_echo "$as_me:$LINENO: result: $PYTHON" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON" >&5 - $as_echo "$PYTHON" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } - fi - -@@ -19723,20 +17559,18 @@ test -n "$PYTHON" || PYTHON=":" - - - if test "$PYTHON" = :; then -- { { $as_echo "$as_me:$LINENO: error: no suitable Python interpreter found" >&5 --$as_echo "$as_me: error: no suitable Python interpreter found" >&2;} -- { (exit 1); exit 1; }; } -+ as_fn_error $? "no suitable Python interpreter found" "$LINENO" 5 - else - - -- { $as_echo "$as_me:$LINENO: checking for $am_display_PYTHON version" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON version" >&5 - $as_echo_n "checking for $am_display_PYTHON version... " >&6; } --if test "${am_cv_python_version+set}" = set; then -+if ${am_cv_python_version+:} false; then : - $as_echo_n "(cached) " >&6 - else - am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"` - fi --{ $as_echo "$as_me:$LINENO: result: $am_cv_python_version" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5 - $as_echo "$am_cv_python_version" >&6; } - PYTHON_VERSION=$am_cv_python_version - -@@ -19748,23 +17582,42 @@ $as_echo "$am_cv_python_version" >&6; } - - - -- { $as_echo "$as_me:$LINENO: checking for $am_display_PYTHON platform" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON platform" >&5 - $as_echo_n "checking for $am_display_PYTHON platform... " >&6; } --if test "${am_cv_python_platform+set}" = set; then -+if ${am_cv_python_platform+:} false; then : - $as_echo_n "(cached) " >&6 - else - am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"` - fi --{ $as_echo "$as_me:$LINENO: result: $am_cv_python_platform" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_platform" >&5 - $as_echo "$am_cv_python_platform" >&6; } - PYTHON_PLATFORM=$am_cv_python_platform - - -- -- -- { $as_echo "$as_me:$LINENO: checking for $am_display_PYTHON script directory" >&5 -+ # Just factor out some code duplication. -+ am_python_setup_sysconfig="\ -+import sys -+# Prefer sysconfig over distutils.sysconfig, for better compatibility -+# with python 3.x. See automake bug#10227. -+try: -+ import sysconfig -+except ImportError: -+ can_use_sysconfig = 0 -+else: -+ can_use_sysconfig = 1 -+# Can't use sysconfig in CPython 2.7, since it's broken in virtualenvs: -+# -+try: -+ from platform import python_implementation -+ if python_implementation() == 'CPython' and sys.version[:3] == '2.7': -+ can_use_sysconfig = 0 -+except ImportError: -+ pass" -+ -+ -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON script directory" >&5 - $as_echo_n "checking for $am_display_PYTHON script directory... " >&6; } --if test "${am_cv_python_pythondir+set}" = set; then -+if ${am_cv_python_pythondir+:} false; then : - $as_echo_n "(cached) " >&6 - else - if test "x$prefix" = xNONE -@@ -19773,8 +17626,14 @@ else - else - am_py_prefix=$prefix - fi -- am_cv_python_pythondir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(0,0,prefix='$am_py_prefix'))" 2>/dev/null || -- echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"` -+ am_cv_python_pythondir=`$PYTHON -c " -+$am_python_setup_sysconfig -+if can_use_sysconfig: -+ sitedir = sysconfig.get_path('purelib', vars={'base':'$am_py_prefix'}) -+else: -+ from distutils import sysconfig -+ sitedir = sysconfig.get_python_lib(0, 0, prefix='$am_py_prefix') -+sys.stdout.write(sitedir)"` - case $am_cv_python_pythondir in - $am_py_prefix*) - am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'` -@@ -19791,7 +17650,7 @@ else - esac - - fi --{ $as_echo "$as_me:$LINENO: result: $am_cv_python_pythondir" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pythondir" >&5 - $as_echo "$am_cv_python_pythondir" >&6; } - pythondir=$am_cv_python_pythondir - -@@ -19800,9 +17659,9 @@ $as_echo "$am_cv_python_pythondir" >&6; } - pkgpythondir=\${pythondir}/$PACKAGE - - -- { $as_echo "$as_me:$LINENO: checking for $am_display_PYTHON extension module directory" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON extension module directory" >&5 - $as_echo_n "checking for $am_display_PYTHON extension module directory... " >&6; } --if test "${am_cv_python_pyexecdir+set}" = set; then -+if ${am_cv_python_pyexecdir+:} false; then : - $as_echo_n "(cached) " >&6 - else - if test "x$exec_prefix" = xNONE -@@ -19811,8 +17670,14 @@ else - else - am_py_exec_prefix=$exec_prefix - fi -- am_cv_python_pyexecdir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(1,0,prefix='$am_py_exec_prefix'))" 2>/dev/null || -- echo "$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages"` -+ am_cv_python_pyexecdir=`$PYTHON -c " -+$am_python_setup_sysconfig -+if can_use_sysconfig: -+ sitedir = sysconfig.get_path('platlib', vars={'platbase':'$am_py_prefix'}) -+else: -+ from distutils import sysconfig -+ sitedir = sysconfig.get_python_lib(1, 0, prefix='$am_py_prefix') -+sys.stdout.write(sitedir)"` - case $am_cv_python_pyexecdir in - $am_py_exec_prefix*) - am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'` -@@ -19829,7 +17694,7 @@ else - esac - - fi --{ $as_echo "$as_me:$LINENO: result: $am_cv_python_pyexecdir" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pyexecdir" >&5 - $as_echo "$am_cv_python_pyexecdir" >&6; } - pyexecdir=$am_cv_python_pyexecdir - -@@ -19852,9 +17717,9 @@ $as_echo "$am_cv_python_pyexecdir" >&6; } - - # Extract the first word of "python[$PYTHON_VERSION]", so it can be a program name with args. - set dummy python$PYTHON_VERSION; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_path_PYTHON+set}" = set; then -+if ${ac_cv_path_PYTHON+:} false; then : - $as_echo_n "(cached) " >&6 - else - case $PYTHON in -@@ -19867,14 +17732,14 @@ 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 -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done - IFS=$as_save_IFS - - ;; -@@ -19882,46 +17747,34 @@ esac - fi - PYTHON=$ac_cv_path_PYTHON - if test -n "$PYTHON"; then -- { $as_echo "$as_me:$LINENO: result: $PYTHON" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON" >&5 - $as_echo "$PYTHON" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } - fi - - - if test -z "$PYTHON"; then -- { { $as_echo "$as_me:$LINENO: error: Cannot find python$PYTHON_VERSION in your system path" >&5 --$as_echo "$as_me: error: Cannot find python$PYTHON_VERSION in your system path" >&2;} -- { (exit 1); exit 1; }; } -+ as_fn_error $? "Cannot find python$PYTHON_VERSION in your system path" "$LINENO" 5 - PYTHON_VERSION="" - fi - - # - # Check for a version of Python >= 2.1.0 - # -- { $as_echo "$as_me:$LINENO: checking for a version of Python >= '2.1.0'" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a version of Python >= '2.1.0'" >&5 - $as_echo_n "checking for a version of Python >= '2.1.0'... " >&6; } - ac_supports_python_ver=`$PYTHON -c "import sys; \ - ver = sys.version.split ()[0]; \ - print (ver >= '2.1.0')"` - if test "$ac_supports_python_ver" != "True"; then - if test -z "$PYTHON_NOVERSIONCHECK"; then -- { $as_echo "$as_me:$LINENO: result: no" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } -- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 - $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} --{ { $as_echo "$as_me:$LINENO: error: --This version of the AC_PYTHON_DEVEL macro --doesn't work properly with versions of Python before --2.1.0. You may need to re-run configure, setting the --variables PYTHON_CPPFLAGS, PYTHON_LDFLAGS, PYTHON_SITE_PKG, --PYTHON_EXTRA_LIBS and PYTHON_EXTRA_LDFLAGS by hand. --Moreover, to disable this check, set PYTHON_NOVERSIONCHECK --to something else than an empty string. -- --See \`config.log' for more details." >&5 --$as_echo "$as_me: error: -+as_fn_error $? " - This version of the AC_PYTHON_DEVEL macro - doesn't work properly with versions of Python before - 2.1.0. You may need to re-run configure, setting the -@@ -19930,14 +17783,13 @@ PYTHON_EXTRA_LIBS and PYTHON_EXTRA_LDFLAGS by hand. - Moreover, to disable this check, set PYTHON_NOVERSIONCHECK - to something else than an empty string. - --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; }; } -+See \`config.log' for more details" "$LINENO" 5; } - else -- { $as_echo "$as_me:$LINENO: result: skip at user request" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: skip at user request" >&5 - $as_echo "skip at user request" >&6; } - fi - else -- { $as_echo "$as_me:$LINENO: result: yes" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 - $as_echo "yes" >&6; } - fi - -@@ -19945,28 +17797,22 @@ $as_echo "yes" >&6; } - # if the macro parameter ``version'' is set, honour it - # - if test -n ""; then -- { $as_echo "$as_me:$LINENO: checking for a version of Python " >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a version of Python " >&5 - $as_echo_n "checking for a version of Python ... " >&6; } - ac_supports_python_ver=`$PYTHON -c "import sys; \ - ver = sys.version.split ()[0]; \ - print (ver )"` - if test "$ac_supports_python_ver" = "True"; then -- { $as_echo "$as_me:$LINENO: result: yes" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 - $as_echo "yes" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } -- { { $as_echo "$as_me:$LINENO: error: this package requires Python . --If you have it installed, but it isn't the default Python --interpreter in your system path, please pass the PYTHON_VERSION --variable to configure. See \`\`configure --help'' for reference. --" >&5 --$as_echo "$as_me: error: this package requires Python . -+ as_fn_error $? "this package requires Python . - If you have it installed, but it isn't the default Python - interpreter in your system path, please pass the PYTHON_VERSION - variable to configure. See \`\`configure --help'' for reference. --" >&2;} -- { (exit 1); exit 1; }; } -+" "$LINENO" 5 - PYTHON_VERSION="" - fi - fi -@@ -19974,29 +17820,25 @@ variable to configure. See \`\`configure --help'' for reference. - # - # Check if you have distutils, else fail - # -- { $as_echo "$as_me:$LINENO: checking for the distutils Python package" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the distutils Python package" >&5 - $as_echo_n "checking for the distutils Python package... " >&6; } - ac_distutils_result=`$PYTHON -c "import distutils" 2>&1` - if test -z "$ac_distutils_result"; then -- { $as_echo "$as_me:$LINENO: result: yes" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 - $as_echo "yes" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } -- { { $as_echo "$as_me:$LINENO: error: cannot import Python module \"distutils\". --Please check your Python installation. The error was: --$ac_distutils_result" >&5 --$as_echo "$as_me: error: cannot import Python module \"distutils\". -+ as_fn_error $? "cannot import Python module \"distutils\". - Please check your Python installation. The error was: --$ac_distutils_result" >&2;} -- { (exit 1); exit 1; }; } -+$ac_distutils_result" "$LINENO" 5 - PYTHON_VERSION="" - fi - - # - # Check for Python include path - # -- { $as_echo "$as_me:$LINENO: checking for Python include path" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Python include path" >&5 - $as_echo_n "checking for Python include path... " >&6; } - if test -z "$PYTHON_CPPFLAGS"; then - python_path=`$PYTHON -c "import distutils.sysconfig; \ -@@ -20006,14 +17848,14 @@ $as_echo_n "checking for Python include path... " >&6; } - fi - PYTHON_CPPFLAGS=$python_path - fi -- { $as_echo "$as_me:$LINENO: result: $PYTHON_CPPFLAGS" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON_CPPFLAGS" >&5 - $as_echo "$PYTHON_CPPFLAGS" >&6; } - - - # - # Check for Python library path - # -- { $as_echo "$as_me:$LINENO: checking for Python library path" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Python library path" >&5 - $as_echo_n "checking for Python library path... " >&6; } - if test -z "$PYTHON_LDFLAGS"; then - # (makes two attempts to ensure we've got a version number -@@ -20092,66 +17934,61 @@ EOD` - fi - - if test -z "PYTHON_LDFLAGS"; then -- { { $as_echo "$as_me:$LINENO: error: -- Cannot determine location of your Python DSO. Please check it was installed with -- dynamic libraries enabled, or try setting PYTHON_LDFLAGS by hand. -- " >&5 --$as_echo "$as_me: error: -+ as_fn_error $? " - Cannot determine location of your Python DSO. Please check it was installed with - dynamic libraries enabled, or try setting PYTHON_LDFLAGS by hand. -- " >&2;} -- { (exit 1); exit 1; }; } -+ " "$LINENO" 5 - fi - fi -- { $as_echo "$as_me:$LINENO: result: $PYTHON_LDFLAGS" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON_LDFLAGS" >&5 - $as_echo "$PYTHON_LDFLAGS" >&6; } - - - # - # Check for site packages - # -- { $as_echo "$as_me:$LINENO: checking for Python site-packages path" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Python site-packages path" >&5 - $as_echo_n "checking for Python site-packages path... " >&6; } - if test -z "$PYTHON_SITE_PKG"; then - PYTHON_SITE_PKG=`$PYTHON -c "import distutils.sysconfig; \ - print (distutils.sysconfig.get_python_lib(0,0));"` - fi -- { $as_echo "$as_me:$LINENO: result: $PYTHON_SITE_PKG" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON_SITE_PKG" >&5 - $as_echo "$PYTHON_SITE_PKG" >&6; } - - - # - # libraries which must be linked in when embedding - # -- { $as_echo "$as_me:$LINENO: checking python extra libraries" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking python extra libraries" >&5 - $as_echo_n "checking python extra libraries... " >&6; } - if test -z "$PYTHON_EXTRA_LIBS"; then - PYTHON_EXTRA_LIBS=`$PYTHON -c "import distutils.sysconfig; \ - conf = distutils.sysconfig.get_config_var; \ - print (conf('LOCALMODLIBS') + ' ' + conf('LIBS'))"` - fi -- { $as_echo "$as_me:$LINENO: result: $PYTHON_EXTRA_LIBS" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON_EXTRA_LIBS" >&5 - $as_echo "$PYTHON_EXTRA_LIBS" >&6; } - - - # - # linking flags needed when embedding - # -- { $as_echo "$as_me:$LINENO: checking python extra linking flags" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking python extra linking flags" >&5 - $as_echo_n "checking python extra linking flags... " >&6; } - if test -z "$PYTHON_EXTRA_LDFLAGS"; then - PYTHON_EXTRA_LDFLAGS=`$PYTHON -c "import distutils.sysconfig; \ - conf = distutils.sysconfig.get_config_var; \ - print (conf('LINKFORSHARED'))"` - fi -- { $as_echo "$as_me:$LINENO: result: $PYTHON_EXTRA_LDFLAGS" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON_EXTRA_LDFLAGS" >&5 - $as_echo "$PYTHON_EXTRA_LDFLAGS" >&6; } - - - # - # final check to see if everything compiles alright - # -- { $as_echo "$as_me:$LINENO: checking consistency of all components of python development environment" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking consistency of all components of python development environment" >&5 - $as_echo_n "checking consistency of all components of python development environment... " >&6; } - # save current global flags - ac_save_LIBS="$LIBS" -@@ -20164,14 +18001,10 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' - ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' - ac_compiler_gnu=$ac_cv_c_compiler_gnu - -- cat >conftest.$ac_ext <<_ACEOF -- -- /* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ --#include -+ -+ #include - int - main () - { -@@ -20181,38 +18014,13 @@ Py_Initialize(); - } - - _ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (ac_try="$ac_link" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_link") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -+if ac_fn_c_try_link "$LINENO"; then : - pythonexists=yes - else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- pythonexists=no -+ pythonexists=no - fi -- --rm -rf conftest.dSYM --rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -- conftest$ac_exeext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext - ac_ext=c - ac_cpp='$CPP $CPPFLAGS' - ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -@@ -20223,25 +18031,13 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - CPPFLAGS="$ac_save_CPPFLAGS" - LIBS="$ac_save_LIBS" - -- { $as_echo "$as_me:$LINENO: result: $pythonexists" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pythonexists" >&5 - $as_echo "$pythonexists" >&6; } - - if test ! "x$pythonexists" = "xyes"; then -- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 - $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} --{ { $as_echo "$as_me:$LINENO: error: -- Could not link test program to Python. Maybe the main Python library has been -- installed in some non-standard library path. If so, pass it to configure, -- via the LDFLAGS environment variable. -- Example: ./configure LDFLAGS=\"-L/usr/non-standard-path/python/lib\" -- ============================================================================ -- ERROR! -- You probably have to install the development version of the Python package -- for your distribution. The exact name of this package varies among them. -- ============================================================================ -- --See \`config.log' for more details." >&5 --$as_echo "$as_me: error: -+as_fn_error $? " - Could not link test program to Python. Maybe the main Python library has been - installed in some non-standard library path. If so, pass it to configure, - via the LDFLAGS environment variable. -@@ -20252,8 +18048,7 @@ $as_echo "$as_me: error: - for your distribution. The exact name of this package varies among them. - ============================================================================ - --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; }; } -+See \`config.log' for more details" "$LINENO" 5; } - PYTHON_VERSION="" - fi - -@@ -20265,9 +18060,9 @@ See \`config.log' for more details." >&2;} - - # Extract the first word of "swig", so it can be a program name with args. - set dummy swig; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_path_SWIG+set}" = set; then -+if ${ac_cv_path_SWIG+:} false; then : - $as_echo_n "(cached) " >&6 - else - case $SWIG in -@@ -20280,14 +18075,14 @@ 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 -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_SWIG="$as_dir/$ac_word$ac_exec_ext" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done - IFS=$as_save_IFS - - ;; -@@ -20295,10 +18090,10 @@ esac - fi - SWIG=$ac_cv_path_SWIG - if test -n "$SWIG"; then -- { $as_echo "$as_me:$LINENO: result: $SWIG" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SWIG" >&5 - $as_echo "$SWIG" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } - fi - -@@ -20306,10 +18101,10 @@ fi - if test -z "$SWIG" ; then - : - elif test -n "1.3.17" ; then -- { $as_echo "$as_me:$LINENO: checking SWIG version" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking SWIG version" >&5 - $as_echo_n "checking SWIG version... " >&6; } - swig_version=`$SWIG -version 2>&1 | grep 'SWIG Version' | sed 's/.*\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*/\1/g'` -- { $as_echo "$as_me:$LINENO: result: $swig_version" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $swig_version" >&5 - $as_echo "$swig_version" >&6; } - if test -n "$swig_version" ; then - # Calculate the required version number components -@@ -20353,20 +18148,20 @@ $as_echo "$swig_version" >&6; } - \+ $available_minor \* 100 \+ $available_patch` - - if test $available_swig_vernum -lt $required_swig_vernum; then -- { $as_echo "$as_me:$LINENO: WARNING: SWIG version >= 1.3.17 is required. You have $swig_version." >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: SWIG version >= 1.3.17 is required. You have $swig_version." >&5 - $as_echo "$as_me: WARNING: SWIG version >= 1.3.17 is required. You have $swig_version." >&2;} - SWIG='' - - else -- { $as_echo "$as_me:$LINENO: checking for SWIG library" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SWIG library" >&5 - $as_echo_n "checking for SWIG library... " >&6; } - SWIG_LIB=`$SWIG -swiglib` -- { $as_echo "$as_me:$LINENO: result: $SWIG_LIB" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SWIG_LIB" >&5 - $as_echo "$SWIG_LIB" >&6; } - - fi - else -- { $as_echo "$as_me:$LINENO: WARNING: cannot determine SWIG version" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cannot determine SWIG version" >&5 - $as_echo "$as_me: WARNING: cannot determine SWIG version" >&2;} - SWIG='' - -@@ -20390,7 +18185,7 @@ $as_echo "$as_me: WARNING: cannot determine SWIG version" >&2;} - - fi - #AC_CONFIG_FILES([Makefile]) --ac_config_files="$ac_config_files Makefile src/Makefile src/saga_core/Makefile src/saga_core/saga_api/Makefile src/saga_core/saga_gdi/Makefile src/saga_core/saga_gui/Makefile src/saga_core/saga_gui/man/Makefile src/saga_core/saga_odbc/Makefile src/saga_core/saga_cmd/Makefile src/saga_core/saga_cmd/man/Makefile src/modules/Makefile src/modules/climate/Makefile src/modules/climate/climate_tools/Makefile src/modules/grid/Makefile src/modules/grid/grid_analysis/Makefile src/modules/grid/grid_calculus/Makefile src/modules/grid/grid_calculus_bsl/Makefile src/modules/grid/grid_filter/Makefile src/modules/grid/grid_gridding/Makefile src/modules/grid/grid_spline/Makefile src/modules/grid/grid_tools/Makefile src/modules/grid/grid_visualisation/Makefile src/modules/pointcloud/Makefile src/modules/pointcloud/pointcloud_tools/Makefile src/modules/pointcloud/pointcloud_viewer/Makefile src/modules/shapes/Makefile src/modules/shapes/shapes_grid/Makefile src/modules/shapes/shapes_lines/Makefile src/modules/shapes/shapes_points/Makefile src/modules/shapes/shapes_polygons/Makefile src/modules/shapes/shapes_tools/Makefile src/modules/shapes/shapes_transect/Makefile src/modules/table/Makefile src/modules/table/table_calculus/Makefile src/modules/table/table_tools/Makefile src/modules/tin/Makefile src/modules/tin/tin_tools/Makefile src/modules/tin/tin_viewer/Makefile src/modules_contrib/Makefile src/modules_contrib/contrib_a_perego/Makefile src/modules_contrib/contrib_a_perego/contrib_a_perego/Makefile src/modules_contrib/contrib_s_liersch/Makefile src/modules_contrib/contrib_s_liersch/ihacres/Makefile src/modules_contrib/garden/Makefile src/modules_contrib/garden/garden_3d_viewer/Makefile src/modules_contrib/garden/garden_webservices/Makefile src/modules_geostatistics/Makefile src/modules_geostatistics/geostatistics/Makefile src/modules_geostatistics/geostatistics/geostatistics_points/Makefile src/modules_geostatistics/geostatistics/geostatistics_grid/Makefile src/modules_geostatistics/geostatistics/geostatistics_kriging/Makefile src/modules_geostatistics/geostatistics/geostatistics_regression/Makefile src/modules_images/Makefile src/modules_images/modules_imagery/Makefile src/modules_images/modules_imagery/imagery_classification/Makefile src/modules_images/modules_imagery/imagery_rga/Makefile src/modules_images/modules_imagery/imagery_segmentation/Makefile src/modules_images/modules_imagery/imagery_svm/Makefile src/modules_images/modules_imagery/imagery_tools/Makefile src/modules_images/modules_opencv/Makefile src/modules_images/modules_opencv/opencv/Makefile src/modules_images/modules_vigra/Makefile src/modules_images/modules_vigra/vigra/Makefile src/modules_io/Makefile src/modules_io/esri_e00/Makefile src/modules_io/esri_e00/io_esri_e00/Makefile src/modules_io/db/Makefile src/modules_io/db/io_odbc/Makefile src/modules_io/docs/Makefile src/modules_io/docs/docs_html/Makefile src/modules_io/docs/docs_pdf/Makefile src/modules_io/gdal/Makefile src/modules_io/gdal/io_gdal/Makefile src/modules_io/grid/Makefile src/modules_io/grid/io_grid/Makefile src/modules_io/grid/io_grid_image/Makefile src/modules_io/grid/io_grid_grib2/Makefile src/modules_io/gps/Makefile src/modules_io/gps/io_gps/Makefile src/modules_io/shapes/Makefile src/modules_io/shapes/io_shapes/Makefile src/modules_io/shapes/io_shapes_dxf/Makefile src/modules_io/shapes/io_shapes_las/Makefile src/modules_io/table/Makefile src/modules_io/table/io_table/Makefile src/modules_lectures/Makefile src/modules_lectures/lectures/Makefile src/modules_lectures/lectures/lectures_introduction/Makefile src/modules_projection/Makefile src/modules_projection/pj_georeference/Makefile src/modules_projection/pj_georeference/pj_georeference/Makefile src/modules_projection/pj_proj4/Makefile src/modules_projection/pj_proj4/pj_proj4/Makefile src/modules_recreations/Makefile src/modules_recreations/recreations/Makefile src/modules_recreations/recreations/recreations_fractals/Makefile src/modules_recreations/recreations/recreations_games/Makefile src/modules_simulation/Makefile src/modules_simulation/erosion/Makefile src/modules_simulation/erosion/sim_erosion/Makefile src/modules_simulation/hydrology/Makefile src/modules_simulation/hydrology/sim_hydrology/Makefile src/modules_simulation/cellular_automata/Makefile src/modules_simulation/cellular_automata/sim_cellular_automata/Makefile src/modules_simulation/ecosystems/Makefile src/modules_simulation/ecosystems/sim_ecosystems_hugget/Makefile src/modules_simulation/fire/Makefile src/modules_simulation/fire/sim_fire_spreading/Makefile src/modules_terrain_analysis/Makefile src/modules_terrain_analysis/terrain_analysis/Makefile src/modules_terrain_analysis/terrain_analysis/ta_channels/Makefile src/modules_terrain_analysis/terrain_analysis/ta_compound/Makefile src/modules_terrain_analysis/terrain_analysis/ta_hydrology/Makefile src/modules_terrain_analysis/terrain_analysis/ta_lighting/Makefile src/modules_terrain_analysis/terrain_analysis/ta_morphometry/Makefile src/modules_terrain_analysis/terrain_analysis/ta_preprocessor/Makefile src/modules_terrain_analysis/terrain_analysis/ta_profiles/Makefile" -+ac_config_files="$ac_config_files Makefile src/Makefile src/saga_core/Makefile src/saga_core/saga_api/Makefile src/saga_core/saga_gdi/Makefile src/saga_core/saga_gui/Makefile src/saga_core/saga_gui/man/Makefile src/saga_core/saga_odbc/Makefile src/saga_core/saga_cmd/Makefile src/saga_core/saga_cmd/man/Makefile src/modules/Makefile src/modules/climate/Makefile src/modules/climate/climate_tools/Makefile src/modules/grid/Makefile src/modules/grid/grid_analysis/Makefile src/modules/grid/grid_calculus/Makefile src/modules/grid/grid_calculus_bsl/Makefile src/modules/grid/grid_filter/Makefile src/modules/grid/grid_gridding/Makefile src/modules/grid/grid_spline/Makefile src/modules/grid/grid_tools/Makefile src/modules/grid/grid_visualisation/Makefile src/modules/pointcloud/Makefile src/modules/pointcloud/pointcloud_tools/Makefile src/modules/pointcloud/pointcloud_viewer/Makefile src/modules/shapes/Makefile src/modules/shapes/shapes_grid/Makefile src/modules/shapes/shapes_lines/Makefile src/modules/shapes/shapes_points/Makefile src/modules/shapes/shapes_polygons/Makefile src/modules/shapes/shapes_tools/Makefile src/modules/shapes/shapes_transect/Makefile src/modules/table/Makefile src/modules/table/table_calculus/Makefile src/modules/table/table_tools/Makefile src/modules/tin/Makefile src/modules/tin/tin_tools/Makefile src/modules/tin/tin_viewer/Makefile src/modules_contrib/Makefile src/modules_contrib/contrib_a_perego/Makefile src/modules_contrib/contrib_a_perego/contrib_a_perego/Makefile src/modules_contrib/contrib_s_liersch/Makefile src/modules_contrib/contrib_s_liersch/ihacres/Makefile src/modules_contrib/garden/Makefile src/modules_contrib/garden/garden_3d_viewer/Makefile src/modules_contrib/garden/garden_webservices/Makefile src/modules_geostatistics/Makefile src/modules_geostatistics/geostatistics/Makefile src/modules_geostatistics/geostatistics/geostatistics_points/Makefile src/modules_geostatistics/geostatistics/geostatistics_grid/Makefile src/modules_geostatistics/geostatistics/geostatistics_kriging/Makefile src/modules_geostatistics/geostatistics/geostatistics_regression/Makefile src/modules_images/Makefile src/modules_images/modules_imagery/Makefile src/modules_images/modules_imagery/imagery_classification/Makefile src/modules_images/modules_imagery/imagery_rga/Makefile src/modules_images/modules_imagery/imagery_segmentation/Makefile src/modules_images/modules_imagery/imagery_svm/Makefile src/modules_images/modules_imagery/imagery_tools/Makefile src/modules_images/modules_opencv/Makefile src/modules_images/modules_opencv/opencv/Makefile src/modules_images/modules_vigra/Makefile src/modules_images/modules_vigra/vigra/Makefile src/modules_io/Makefile src/modules_io/esri_e00/Makefile src/modules_io/esri_e00/io_esri_e00/Makefile src/modules_io/db/Makefile src/modules_io/db/io_odbc/Makefile src/modules_io/docs/Makefile src/modules_io/docs/docs_html/Makefile src/modules_io/docs/docs_pdf/Makefile src/modules_io/gdal/Makefile src/modules_io/gdal/io_gdal/Makefile src/modules_io/grid/Makefile src/modules_io/grid/io_grid/Makefile src/modules_io/grid/io_grid_image/Makefile src/modules_io/grid/io_grid_grib2/Makefile src/modules_io/gps/Makefile src/modules_io/gps/io_gps/Makefile src/modules_io/shapes/Makefile src/modules_io/shapes/io_shapes/Makefile src/modules_io/shapes/io_shapes_dxf/Makefile src/modules_io/shapes/io_shapes_las/Makefile src/modules_io/table/Makefile src/modules_io/table/io_table/Makefile src/modules_lectures/Makefile src/modules_lectures/lectures/Makefile src/modules_lectures/lectures/lectures_introduction/Makefile src/modules_projection/Makefile src/modules_projection/pj_georeference/Makefile src/modules_projection/pj_georeference/pj_georeference/Makefile src/modules_projection/pj_proj4/Makefile src/modules_projection/pj_proj4/pj_proj4/Makefile src/modules_recreations/Makefile src/modules_recreations/recreations/Makefile src/modules_recreations/recreations/recreations_fractals/Makefile src/modules_recreations/recreations/recreations_games/Makefile src/modules_simulation/Makefile src/modules_simulation/erosion/Makefile src/modules_simulation/erosion/sim_erosion/Makefile src/modules_simulation/hydrology/Makefile src/modules_simulation/hydrology/sim_hydrology/Makefile src/modules_simulation/cellular_automata/Makefile src/modules_simulation/cellular_automata/sim_cellular_automata/Makefile src/modules_simulation/ecosystems/Makefile src/modules_simulation/ecosystems/sim_ecosystems_hugget/Makefile src/modules_terrain_analysis/Makefile src/modules_terrain_analysis/terrain_analysis/Makefile src/modules_terrain_analysis/terrain_analysis/ta_channels/Makefile src/modules_terrain_analysis/terrain_analysis/ta_compound/Makefile src/modules_terrain_analysis/terrain_analysis/ta_hydrology/Makefile src/modules_terrain_analysis/terrain_analysis/ta_lighting/Makefile src/modules_terrain_analysis/terrain_analysis/ta_morphometry/Makefile src/modules_terrain_analysis/terrain_analysis/ta_preprocessor/Makefile src/modules_terrain_analysis/terrain_analysis/ta_profiles/Makefile" - - cat >confcache <<\_ACEOF - # This file is a shell script that caches the results of configure -@@ -20419,13 +18214,13 @@ _ACEOF - case $ac_val in #( - *${as_nl}*) - case $ac_var in #( -- *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5 -+ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 - $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; - esac - case $ac_var in #( - _ | IFS | as_nl) ;; #( - BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( -- *) $as_unset $ac_var ;; -+ *) { eval $ac_var=; unset $ac_var;} ;; - esac ;; - esac - done -@@ -20433,8 +18228,8 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; - (set) 2>&1 | - case $as_nl`(ac_space=' '; set) 2>&1` in #( - *${as_nl}ac_space=\ *) -- # `set' does not quote correctly, so add quotes (double-quote -- # substitution turns \\\\ into \\, and sed turns \\ into \). -+ # `set' does not quote correctly, so add quotes: double-quote -+ # substitution turns \\\\ into \\, and sed turns \\ into \. - sed -n \ - "s/'/'\\\\''/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" -@@ -20456,12 +18251,23 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; - :end' >>confcache - if diff "$cache_file" confcache >/dev/null 2>&1; then :; else - if test -w "$cache_file"; then -- test "x$cache_file" != "x/dev/null" && -- { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5 -+ if test "x$cache_file" != "x/dev/null"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 - $as_echo "$as_me: updating cache $cache_file" >&6;} -- cat confcache >$cache_file -+ if test ! -f "$cache_file" || test -h "$cache_file"; then -+ cat confcache >"$cache_file" -+ else -+ case $cache_file in #( -+ */* | ?:*) -+ mv -f confcache "$cache_file"$$ && -+ mv -f "$cache_file"$$ "$cache_file" ;; #( -+ *) -+ mv -f confcache "$cache_file" ;; -+ esac -+ fi -+ fi - else -- { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 - $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} - fi - fi -@@ -20475,20 +18281,29 @@ DEFS=-DHAVE_CONFIG_H - - ac_libobjs= - ac_ltlibobjs= -+U= - for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue - # 1. Remove the extension, and $U if already installed. - ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' - ac_i=`$as_echo "$ac_i" | sed "$ac_script"` - # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR - # will be set to the directory where LIBOBJS objects are built. -- ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext" -- ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo' -+ as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext" -+ as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo' - done - LIBOBJS=$ac_libobjs - - LTLIBOBJS=$ac_ltlibobjs - - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5 -+$as_echo_n "checking that generated files are newer than configure... " >&6; } -+ if test -n "$am_sleep_pid"; then -+ # Hide warnings about reused PIDs. -+ wait $am_sleep_pid 2>/dev/null -+ fi -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5 -+$as_echo "done" >&6; } - if test -n "$EXEEXT"; then - am__EXEEXT_TRUE= - am__EXEEXT_FALSE='#' -@@ -20506,133 +18321,75 @@ else - fi - - if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined. --Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"AMDEP\" was never defined. --Usually this means the macro was only invoked conditionally." >&2;} -- { (exit 1); exit 1; }; } -+ as_fn_error $? "conditional \"AMDEP\" was never defined. -+Usually this means the macro was only invoked conditionally." "$LINENO" 5 - fi - if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined. --Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined. --Usually this means the macro was only invoked conditionally." >&2;} -- { (exit 1); exit 1; }; } -+ as_fn_error $? "conditional \"am__fastdepCXX\" was never defined. -+Usually this means the macro was only invoked conditionally." "$LINENO" 5 - fi - if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined. --Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined. --Usually this means the macro was only invoked conditionally." >&2;} -- { (exit 1); exit 1; }; } -+ as_fn_error $? "conditional \"am__fastdepCXX\" was never defined. -+Usually this means the macro was only invoked conditionally." "$LINENO" 5 - fi - if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. --Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. --Usually this means the macro was only invoked conditionally." >&2;} -- { (exit 1); exit 1; }; } -+ as_fn_error $? "conditional \"am__fastdepCC\" was never defined. -+Usually this means the macro was only invoked conditionally." "$LINENO" 5 - fi - if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. --Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. --Usually this means the macro was only invoked conditionally." >&2;} -- { (exit 1); exit 1; }; } --fi --if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined. --Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined. --Usually this means the macro was only invoked conditionally." >&2;} -- { (exit 1); exit 1; }; } --fi --if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined. --Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined. --Usually this means the macro was only invoked conditionally." >&2;} -- { (exit 1); exit 1; }; } -+ as_fn_error $? "conditional \"am__fastdepCC\" was never defined. -+Usually this means the macro was only invoked conditionally." "$LINENO" 5 - fi - - if test -z "${SAGA_UNICODE_TRUE}" && test -z "${SAGA_UNICODE_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"SAGA_UNICODE\" was never defined. --Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"SAGA_UNICODE\" was never defined. --Usually this means the macro was only invoked conditionally." >&2;} -- { (exit 1); exit 1; }; } -+ as_fn_error $? "conditional \"SAGA_UNICODE\" was never defined. -+Usually this means the macro was only invoked conditionally." "$LINENO" 5 - fi - if test -z "${DEBUG_TRUE}" && test -z "${DEBUG_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"DEBUG\" was never defined. --Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"DEBUG\" was never defined. --Usually this means the macro was only invoked conditionally." >&2;} -- { (exit 1); exit 1; }; } -+ as_fn_error $? "conditional \"DEBUG\" was never defined. -+Usually this means the macro was only invoked conditionally." "$LINENO" 5 - fi - if test -z "${WITH_GUI_TRUE}" && test -z "${WITH_GUI_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"WITH_GUI\" was never defined. --Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"WITH_GUI\" was never defined. --Usually this means the macro was only invoked conditionally." >&2;} -- { (exit 1); exit 1; }; } -+ as_fn_error $? "conditional \"WITH_GUI\" was never defined. -+Usually this means the macro was only invoked conditionally." "$LINENO" 5 - fi - if test -z "${WITH_ODBC_TRUE}" && test -z "${WITH_ODBC_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"WITH_ODBC\" was never defined. --Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"WITH_ODBC\" was never defined. --Usually this means the macro was only invoked conditionally." >&2;} -- { (exit 1); exit 1; }; } -+ as_fn_error $? "conditional \"WITH_ODBC\" was never defined. -+Usually this means the macro was only invoked conditionally." "$LINENO" 5 - fi - if test -z "${OPENMP_TRUE}" && test -z "${OPENMP_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"OPENMP\" was never defined. --Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"OPENMP\" was never defined. --Usually this means the macro was only invoked conditionally." >&2;} -- { (exit 1); exit 1; }; } -+ as_fn_error $? "conditional \"OPENMP\" was never defined. -+Usually this means the macro was only invoked conditionally." "$LINENO" 5 - fi - if test -z "${HAVE_CV_TRUE}" && test -z "${HAVE_CV_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_CV\" was never defined. --Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"HAVE_CV\" was never defined. --Usually this means the macro was only invoked conditionally." >&2;} -- { (exit 1); exit 1; }; } -+ as_fn_error $? "conditional \"HAVE_CV\" was never defined. -+Usually this means the macro was only invoked conditionally." "$LINENO" 5 - fi - if test -z "${HAVE_LLAS_TRUE}" && test -z "${HAVE_LLAS_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_LLAS\" was never defined. --Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"HAVE_LLAS\" was never defined. --Usually this means the macro was only invoked conditionally." >&2;} -- { (exit 1); exit 1; }; } -+ as_fn_error $? "conditional \"HAVE_LLAS\" was never defined. -+Usually this means the macro was only invoked conditionally." "$LINENO" 5 - fi - if test -z "${HAVE_VIGRA_TRUE}" && test -z "${HAVE_VIGRA_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_VIGRA\" was never defined. --Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"HAVE_VIGRA\" was never defined. --Usually this means the macro was only invoked conditionally." >&2;} -- { (exit 1); exit 1; }; } -+ as_fn_error $? "conditional \"HAVE_VIGRA\" was never defined. -+Usually this means the macro was only invoked conditionally." "$LINENO" 5 - fi - if test -z "${HAVE_HARU_TRUE}" && test -z "${HAVE_HARU_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_HARU\" was never defined. --Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"HAVE_HARU\" was never defined. --Usually this means the macro was only invoked conditionally." >&2;} -- { (exit 1); exit 1; }; } -+ as_fn_error $? "conditional \"HAVE_HARU\" was never defined. -+Usually this means the macro was only invoked conditionally." "$LINENO" 5 - fi - if test -z "${SAGA_PYTHON_TRUE}" && test -z "${SAGA_PYTHON_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"SAGA_PYTHON\" was never defined. --Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"SAGA_PYTHON\" was never defined. --Usually this means the macro was only invoked conditionally." >&2;} -- { (exit 1); exit 1; }; } -+ as_fn_error $? "conditional \"SAGA_PYTHON\" was never defined. -+Usually this means the macro was only invoked conditionally." "$LINENO" 5 - fi - --: ${CONFIG_STATUS=./config.status} -+: "${CONFIG_STATUS=./config.status}" - ac_write_fail=0 - ac_clean_files_save=$ac_clean_files - ac_clean_files="$ac_clean_files $CONFIG_STATUS" --{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 - $as_echo "$as_me: creating $CONFIG_STATUS" >&6;} --cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -+as_write_fail=0 -+cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1 - #! $SHELL - # Generated by $as_me. - # Run this file to recreate the current configuration. -@@ -20642,17 +18399,18 @@ cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 - debug=false - ac_cs_recheck=false - ac_cs_silent=false --SHELL=\${CONFIG_SHELL-$SHELL} --_ACEOF - --cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 --## --------------------- ## --## M4sh Initialization. ## --## --------------------- ## -+SHELL=\${CONFIG_SHELL-$SHELL} -+export SHELL -+_ASEOF -+cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1 -+## -------------------- ## -+## M4sh Initialization. ## -+## -------------------- ## - - # Be more Bourne compatible - DUALCASE=1; export DUALCASE # for MKS sh --if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then -+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : - emulate sh - NULLCMD=: - # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which -@@ -20660,23 +18418,15 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST - else -- case `(set -o) 2>/dev/null` in -- *posix*) set -o posix ;; -+ case `(set -o) 2>/dev/null` in #( -+ *posix*) : -+ set -o posix ;; #( -+ *) : -+ ;; - esac -- - fi - - -- -- --# PATH needs CR --# Avoid depending upon Character Ranges. --as_cr_letters='abcdefghijklmnopqrstuvwxyz' --as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' --as_cr_Letters=$as_cr_letters$as_cr_LETTERS --as_cr_digits='0123456789' --as_cr_alnum=$as_cr_Letters$as_cr_digits -- - as_nl=' - ' - export as_nl -@@ -20684,7 +18434,13 @@ export as_nl - as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' - as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo - as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo --if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then -+# Prefer a ksh shell builtin over an external printf program on Solaris, -+# but without wasting forks for bash or zsh. -+if test -z "$BASH_VERSION$ZSH_VERSION" \ -+ && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then -+ as_echo='print -r --' -+ as_echo_n='print -rn --' -+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then - as_echo='printf %s\n' - as_echo_n='printf %s' - else -@@ -20695,7 +18451,7 @@ else - as_echo_body='eval expr "X$1" : "X\\(.*\\)"' - as_echo_n_body='eval - arg=$1; -- case $arg in -+ case $arg in #( - *"$as_nl"*) - expr "X$arg" : "X\\(.*\\)$as_nl"; - arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; -@@ -20718,13 +18474,6 @@ if test "${PATH_SEPARATOR+set}" != set; then - } - fi - --# Support unset when possible. --if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then -- as_unset=unset --else -- as_unset=false --fi -- - - # IFS - # We need space, tab and new line, in precisely that order. Quoting is -@@ -20734,15 +18483,16 @@ fi - IFS=" "" $as_nl" - - # Find who we are. Look in the path if we contain no directory separator. --case $0 in -+as_myself= -+case $0 in #(( - *[\\/]* ) as_myself=$0 ;; - *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR - for as_dir in $PATH - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break --done -+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -+ done - IFS=$as_save_IFS - - ;; -@@ -20754,12 +18504,16 @@ if test "x$as_myself" = x; then - fi - if test ! -f "$as_myself"; then - $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 -- { (exit 1); exit 1; } -+ exit 1 - fi - --# Work around bugs in pre-3.0 UWIN ksh. --for as_var in ENV MAIL MAILPATH --do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var -+# Unset variables that we do not need and which cause bugs (e.g. in -+# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" -+# suppresses any "Segmentation fault" message there. '((' could -+# trigger a bug in pdksh 5.2.14. -+for as_var in BASH_ENV ENV MAIL MAILPATH -+do eval test x\${$as_var+set} = xset \ -+ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : - done - PS1='$ ' - PS2='> ' -@@ -20771,7 +18525,89 @@ export LC_ALL - LANGUAGE=C - export LANGUAGE - --# Required to use basename. -+# CDPATH. -+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH -+ -+ -+# as_fn_error STATUS ERROR [LINENO LOG_FD] -+# ---------------------------------------- -+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are -+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the -+# script with STATUS, using 1 if that was 0. -+as_fn_error () -+{ -+ as_status=$1; test $as_status -eq 0 && as_status=1 -+ if test "$4"; then -+ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 -+ fi -+ $as_echo "$as_me: error: $2" >&2 -+ as_fn_exit $as_status -+} # as_fn_error -+ -+ -+# as_fn_set_status STATUS -+# ----------------------- -+# Set $? to STATUS, without forking. -+as_fn_set_status () -+{ -+ return $1 -+} # as_fn_set_status -+ -+# as_fn_exit STATUS -+# ----------------- -+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. -+as_fn_exit () -+{ -+ set +e -+ as_fn_set_status $1 -+ exit $1 -+} # as_fn_exit -+ -+# as_fn_unset VAR -+# --------------- -+# Portably unset VAR. -+as_fn_unset () -+{ -+ { eval $1=; unset $1;} -+} -+as_unset=as_fn_unset -+# as_fn_append VAR VALUE -+# ---------------------- -+# Append the text in VALUE to the end of the definition contained in VAR. Take -+# advantage of any shell optimizations that allow amortized linear growth over -+# repeated appends, instead of the typical quadratic growth present in naive -+# implementations. -+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : -+ eval 'as_fn_append () -+ { -+ eval $1+=\$2 -+ }' -+else -+ as_fn_append () -+ { -+ eval $1=\$$1\$2 -+ } -+fi # as_fn_append -+ -+# as_fn_arith ARG... -+# ------------------ -+# Perform arithmetic evaluation on the ARGs, and store the result in the -+# global $as_val. Take advantage of shells that can avoid forks. The arguments -+# must be portable across $(()) and expr. -+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : -+ eval 'as_fn_arith () -+ { -+ as_val=$(( $* )) -+ }' -+else -+ as_fn_arith () -+ { -+ as_val=`expr "$@" || test $? -eq 1` -+ } -+fi # as_fn_arith -+ -+ - if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr -@@ -20785,8 +18621,12 @@ else - as_basename=false - fi - -+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then -+ as_dirname=dirname -+else -+ as_dirname=false -+fi - --# Name of the executable. - as_me=`$as_basename -- "$0" || - $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ - X"$0" : 'X\(//\)$' \| \ -@@ -20806,76 +18646,25 @@ $as_echo X/"$0" | - } - s/.*/./; q'` - --# CDPATH. --$as_unset CDPATH -- -- -- -- as_lineno_1=$LINENO -- as_lineno_2=$LINENO -- test "x$as_lineno_1" != "x$as_lineno_2" && -- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { -- -- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO -- # uniformly replaced by the line number. The first 'sed' inserts a -- # line-number line after each line using $LINENO; the second 'sed' -- # does the real work. The second script uses 'N' to pair each -- # line-number line with the line containing $LINENO, and appends -- # trailing '-' during substitution so that $LINENO is not a special -- # case at line end. -- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the -- # scripts with optimization help from Paolo Bonzini. Blame Lee -- # E. McMahon (1931-1989) for sed's syntax. :-) -- sed -n ' -- p -- /[$]LINENO/= -- ' <$as_myself | -- sed ' -- s/[$]LINENO.*/&-/ -- t lineno -- b -- :lineno -- N -- :loop -- s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ -- t loop -- s/-\n.*// -- ' >$as_me.lineno && -- chmod +x "$as_me.lineno" || -- { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 -- { (exit 1); exit 1; }; } -- -- # Don't try to exec as it changes $[0], causing all sort of problems -- # (the dirname of $[0] is not the place where we might find the -- # original and so on. Autoconf is especially sensitive to this). -- . "./$as_me.lineno" -- # Exit status is that of the last command. -- exit --} -- -- --if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then -- as_dirname=dirname --else -- as_dirname=false --fi -+# Avoid depending upon Character Ranges. -+as_cr_letters='abcdefghijklmnopqrstuvwxyz' -+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -+as_cr_Letters=$as_cr_letters$as_cr_LETTERS -+as_cr_digits='0123456789' -+as_cr_alnum=$as_cr_Letters$as_cr_digits - - ECHO_C= ECHO_N= ECHO_T= --case `echo -n x` in -+case `echo -n x` in #((((( - -n*) -- case `echo 'x\c'` in -+ case `echo 'xy\c'` in - *c*) ECHO_T=' ';; # ECHO_T is single tab character. -- *) ECHO_C='\c';; -+ xy) ECHO_C='\c';; -+ *) echo `echo ksh88 bug on AIX 6.1` > /dev/null -+ ECHO_T=' ';; - esac;; - *) - ECHO_N='-n';; - esac --if expr a : '\(a\)' >/dev/null 2>&1 && -- test "X`expr 00001 : '.*\(...\)'`" = X001; then -- as_expr=expr --else -- as_expr=false --fi - - rm -f conf$$ conf$$.exe conf$$.file - if test -d conf$$.dir; then -@@ -20890,49 +18679,85 @@ if (echo >conf$$.file) 2>/dev/null; then - # ... but there are two gotchas: - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. -- # In both cases, we have to default to `cp -p'. -+ # In both cases, we have to default to `cp -pR'. - ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || -- as_ln_s='cp -p' -+ as_ln_s='cp -pR' - elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln - else -- as_ln_s='cp -p' -+ as_ln_s='cp -pR' - fi - else -- as_ln_s='cp -p' -+ as_ln_s='cp -pR' - fi - rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file - rmdir conf$$.dir 2>/dev/null - -+ -+# as_fn_mkdir_p -+# ------------- -+# Create "$as_dir" as a directory, including parents if necessary. -+as_fn_mkdir_p () -+{ -+ -+ case $as_dir in #( -+ -*) as_dir=./$as_dir;; -+ esac -+ test -d "$as_dir" || eval $as_mkdir_p || { -+ as_dirs= -+ while :; do -+ case $as_dir in #( -+ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( -+ *) as_qdir=$as_dir;; -+ esac -+ as_dirs="'$as_qdir' $as_dirs" -+ as_dir=`$as_dirname -- "$as_dir" || -+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -+ X"$as_dir" : 'X\(//\)[^/]' \| \ -+ X"$as_dir" : 'X\(//\)$' \| \ -+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -+$as_echo X"$as_dir" | -+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)[^/].*/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` -+ test -d "$as_dir" && break -+ done -+ test -z "$as_dirs" || eval "mkdir $as_dirs" -+ } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" -+ -+ -+} # as_fn_mkdir_p - if mkdir -p . 2>/dev/null; then -- as_mkdir_p=: -+ as_mkdir_p='mkdir -p "$as_dir"' - else - test -d ./-p && rmdir ./-p - as_mkdir_p=false - fi - --if test -x / >/dev/null 2>&1; then -- as_test_x='test -x' --else -- if ls -dL / >/dev/null 2>&1; then -- as_ls_L_option=L -- else -- as_ls_L_option= -- fi -- as_test_x=' -- eval sh -c '\'' -- if test -d "$1"; then -- test -d "$1/."; -- else -- case $1 in -- -*)set "./$1";; -- esac; -- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in -- ???[sx]*):;;*)false;;esac;fi -- '\'' sh -- ' --fi --as_executable_p=$as_test_x -+ -+# as_fn_executable_p FILE -+# ----------------------- -+# Test if FILE is an executable regular file. -+as_fn_executable_p () -+{ -+ test -f "$1" && test -x "$1" -+} # as_fn_executable_p -+as_test_x='test -x' -+as_executable_p=as_fn_executable_p - - # Sed expression to map a string onto a valid CPP name. - as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" -@@ -20942,13 +18767,19 @@ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" - - - exec 6>&1 -+## ----------------------------------- ## -+## Main body of $CONFIG_STATUS script. ## -+## ----------------------------------- ## -+_ASEOF -+test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1 - --# Save the log message, to keep $[0] and so on meaningful, and to -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -+# Save the log message, to keep $0 and so on meaningful, and to - # report actual input values of CONFIG_FILES etc. instead of their - # values after options handling. - ac_log=" - This file was extended by saga $as_me 2.1.0, which was --generated by GNU Autoconf 2.63. Invocation command line was -+generated by GNU Autoconf 2.69. Invocation command line was - - CONFIG_FILES = $CONFIG_FILES - CONFIG_HEADERS = $CONFIG_HEADERS -@@ -20980,13 +18811,15 @@ _ACEOF - - cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 - ac_cs_usage="\ --\`$as_me' instantiates files from templates according to the --current configuration. -+\`$as_me' instantiates files and other configuration actions -+from templates according to the current configuration. Unless the files -+and actions are specified as TAGs, all are instantiated by default. - --Usage: $0 [OPTION]... [FILE]... -+Usage: $0 [OPTION]... [TAG]... - - -h, --help print this help, then exit - -V, --version print version number and configuration settings, then exit -+ --config print configuration, then exit - -q, --quiet, --silent - do not print progress messages - -d, --debug don't remove temporary files -@@ -21005,16 +18838,17 @@ $config_headers - Configuration commands: - $config_commands - --Report bugs to ." -+Report bugs to ." - - _ACEOF - cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" - ac_cs_version="\\ - saga config.status 2.1.0 --configured by $0, generated by GNU Autoconf 2.63, -- with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" -+configured by $0, generated by GNU Autoconf 2.69, -+ with options \\"\$ac_cs_config\\" - --Copyright (C) 2008 Free Software Foundation, Inc. -+Copyright (C) 2012 Free Software Foundation, Inc. - This config.status script is free software; the Free Software Foundation - gives unlimited permission to copy, distribute and modify it." - -@@ -21032,11 +18866,16 @@ ac_need_defaults=: - while test $# != 0 - do - case $1 in -- --*=*) -+ --*=?*) - ac_option=`expr "X$1" : 'X\([^=]*\)='` - ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` - ac_shift=: - ;; -+ --*=) -+ ac_option=`expr "X$1" : 'X\([^=]*\)='` -+ ac_optarg= -+ ac_shift=: -+ ;; - *) - ac_option=$1 - ac_optarg=$2 -@@ -21050,27 +18889,29 @@ do - ac_cs_recheck=: ;; - --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) - $as_echo "$ac_cs_version"; exit ;; -+ --config | --confi | --conf | --con | --co | --c ) -+ $as_echo "$ac_cs_config"; exit ;; - --debug | --debu | --deb | --de | --d | -d ) - debug=: ;; - --file | --fil | --fi | --f ) - $ac_shift - case $ac_optarg in - *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; -+ '') as_fn_error $? "missing file argument" ;; - esac -- CONFIG_FILES="$CONFIG_FILES '$ac_optarg'" -+ as_fn_append CONFIG_FILES " '$ac_optarg'" - ac_need_defaults=false;; - --header | --heade | --head | --hea ) - $ac_shift - case $ac_optarg in - *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; - esac -- CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'" -+ as_fn_append CONFIG_HEADERS " '$ac_optarg'" - ac_need_defaults=false;; - --he | --h) - # Conflict between --help and --header -- { $as_echo "$as_me: error: ambiguous option: $1 --Try \`$0 --help' for more information." >&2 -- { (exit 1); exit 1; }; };; -+ as_fn_error $? "ambiguous option: \`$1' -+Try \`$0 --help' for more information.";; - --help | --hel | -h ) - $as_echo "$ac_cs_usage"; exit ;; - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ -@@ -21078,11 +18919,10 @@ Try \`$0 --help' for more information." >&2 - ac_cs_silent=: ;; - - # This is an error. -- -*) { $as_echo "$as_me: error: unrecognized option: $1 --Try \`$0 --help' for more information." >&2 -- { (exit 1); exit 1; }; } ;; -+ -*) as_fn_error $? "unrecognized option: \`$1' -+Try \`$0 --help' for more information." ;; - -- *) ac_config_targets="$ac_config_targets $1" -+ *) as_fn_append ac_config_targets " $1" - ac_need_defaults=false ;; - - esac -@@ -21099,7 +18939,7 @@ fi - _ACEOF - cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 - if \$ac_cs_recheck; then -- set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion -+ set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion - shift - \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 - CONFIG_SHELL='$SHELL' -@@ -21133,184 +18973,208 @@ AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" - sed_quote_subst='$sed_quote_subst' - double_quote_subst='$double_quote_subst' - delay_variable_subst='$delay_variable_subst' --macro_version='`$ECHO "X$macro_version" | $Xsed -e "$delay_single_quote_subst"`' --macro_revision='`$ECHO "X$macro_revision" | $Xsed -e "$delay_single_quote_subst"`' --enable_shared='`$ECHO "X$enable_shared" | $Xsed -e "$delay_single_quote_subst"`' --enable_static='`$ECHO "X$enable_static" | $Xsed -e "$delay_single_quote_subst"`' --pic_mode='`$ECHO "X$pic_mode" | $Xsed -e "$delay_single_quote_subst"`' --enable_fast_install='`$ECHO "X$enable_fast_install" | $Xsed -e "$delay_single_quote_subst"`' --host_alias='`$ECHO "X$host_alias" | $Xsed -e "$delay_single_quote_subst"`' --host='`$ECHO "X$host" | $Xsed -e "$delay_single_quote_subst"`' --host_os='`$ECHO "X$host_os" | $Xsed -e "$delay_single_quote_subst"`' --build_alias='`$ECHO "X$build_alias" | $Xsed -e "$delay_single_quote_subst"`' --build='`$ECHO "X$build" | $Xsed -e "$delay_single_quote_subst"`' --build_os='`$ECHO "X$build_os" | $Xsed -e "$delay_single_quote_subst"`' --SED='`$ECHO "X$SED" | $Xsed -e "$delay_single_quote_subst"`' --Xsed='`$ECHO "X$Xsed" | $Xsed -e "$delay_single_quote_subst"`' --GREP='`$ECHO "X$GREP" | $Xsed -e "$delay_single_quote_subst"`' --EGREP='`$ECHO "X$EGREP" | $Xsed -e "$delay_single_quote_subst"`' --FGREP='`$ECHO "X$FGREP" | $Xsed -e "$delay_single_quote_subst"`' --LD='`$ECHO "X$LD" | $Xsed -e "$delay_single_quote_subst"`' --NM='`$ECHO "X$NM" | $Xsed -e "$delay_single_quote_subst"`' --LN_S='`$ECHO "X$LN_S" | $Xsed -e "$delay_single_quote_subst"`' --max_cmd_len='`$ECHO "X$max_cmd_len" | $Xsed -e "$delay_single_quote_subst"`' --ac_objext='`$ECHO "X$ac_objext" | $Xsed -e "$delay_single_quote_subst"`' --exeext='`$ECHO "X$exeext" | $Xsed -e "$delay_single_quote_subst"`' --lt_unset='`$ECHO "X$lt_unset" | $Xsed -e "$delay_single_quote_subst"`' --lt_SP2NL='`$ECHO "X$lt_SP2NL" | $Xsed -e "$delay_single_quote_subst"`' --lt_NL2SP='`$ECHO "X$lt_NL2SP" | $Xsed -e "$delay_single_quote_subst"`' --reload_flag='`$ECHO "X$reload_flag" | $Xsed -e "$delay_single_quote_subst"`' --reload_cmds='`$ECHO "X$reload_cmds" | $Xsed -e "$delay_single_quote_subst"`' --OBJDUMP='`$ECHO "X$OBJDUMP" | $Xsed -e "$delay_single_quote_subst"`' --deplibs_check_method='`$ECHO "X$deplibs_check_method" | $Xsed -e "$delay_single_quote_subst"`' --file_magic_cmd='`$ECHO "X$file_magic_cmd" | $Xsed -e "$delay_single_quote_subst"`' --AR='`$ECHO "X$AR" | $Xsed -e "$delay_single_quote_subst"`' --AR_FLAGS='`$ECHO "X$AR_FLAGS" | $Xsed -e "$delay_single_quote_subst"`' --STRIP='`$ECHO "X$STRIP" | $Xsed -e "$delay_single_quote_subst"`' --RANLIB='`$ECHO "X$RANLIB" | $Xsed -e "$delay_single_quote_subst"`' --old_postinstall_cmds='`$ECHO "X$old_postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`' --old_postuninstall_cmds='`$ECHO "X$old_postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`' --old_archive_cmds='`$ECHO "X$old_archive_cmds" | $Xsed -e "$delay_single_quote_subst"`' --CC='`$ECHO "X$CC" | $Xsed -e "$delay_single_quote_subst"`' --CFLAGS='`$ECHO "X$CFLAGS" | $Xsed -e "$delay_single_quote_subst"`' --compiler='`$ECHO "X$compiler" | $Xsed -e "$delay_single_quote_subst"`' --GCC='`$ECHO "X$GCC" | $Xsed -e "$delay_single_quote_subst"`' --lt_cv_sys_global_symbol_pipe='`$ECHO "X$lt_cv_sys_global_symbol_pipe" | $Xsed -e "$delay_single_quote_subst"`' --lt_cv_sys_global_symbol_to_cdecl='`$ECHO "X$lt_cv_sys_global_symbol_to_cdecl" | $Xsed -e "$delay_single_quote_subst"`' --lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address" | $Xsed -e "$delay_single_quote_subst"`' --lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`' --objdir='`$ECHO "X$objdir" | $Xsed -e "$delay_single_quote_subst"`' --SHELL='`$ECHO "X$SHELL" | $Xsed -e "$delay_single_quote_subst"`' --ECHO='`$ECHO "X$ECHO" | $Xsed -e "$delay_single_quote_subst"`' --MAGIC_CMD='`$ECHO "X$MAGIC_CMD" | $Xsed -e "$delay_single_quote_subst"`' --lt_prog_compiler_no_builtin_flag='`$ECHO "X$lt_prog_compiler_no_builtin_flag" | $Xsed -e "$delay_single_quote_subst"`' --lt_prog_compiler_wl='`$ECHO "X$lt_prog_compiler_wl" | $Xsed -e "$delay_single_quote_subst"`' --lt_prog_compiler_pic='`$ECHO "X$lt_prog_compiler_pic" | $Xsed -e "$delay_single_quote_subst"`' --lt_prog_compiler_static='`$ECHO "X$lt_prog_compiler_static" | $Xsed -e "$delay_single_quote_subst"`' --lt_cv_prog_compiler_c_o='`$ECHO "X$lt_cv_prog_compiler_c_o" | $Xsed -e "$delay_single_quote_subst"`' --need_locks='`$ECHO "X$need_locks" | $Xsed -e "$delay_single_quote_subst"`' --DSYMUTIL='`$ECHO "X$DSYMUTIL" | $Xsed -e "$delay_single_quote_subst"`' --NMEDIT='`$ECHO "X$NMEDIT" | $Xsed -e "$delay_single_quote_subst"`' --LIPO='`$ECHO "X$LIPO" | $Xsed -e "$delay_single_quote_subst"`' --OTOOL='`$ECHO "X$OTOOL" | $Xsed -e "$delay_single_quote_subst"`' --OTOOL64='`$ECHO "X$OTOOL64" | $Xsed -e "$delay_single_quote_subst"`' --libext='`$ECHO "X$libext" | $Xsed -e "$delay_single_quote_subst"`' --shrext_cmds='`$ECHO "X$shrext_cmds" | $Xsed -e "$delay_single_quote_subst"`' --extract_expsyms_cmds='`$ECHO "X$extract_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`' --archive_cmds_need_lc='`$ECHO "X$archive_cmds_need_lc" | $Xsed -e "$delay_single_quote_subst"`' --enable_shared_with_static_runtimes='`$ECHO "X$enable_shared_with_static_runtimes" | $Xsed -e "$delay_single_quote_subst"`' --export_dynamic_flag_spec='`$ECHO "X$export_dynamic_flag_spec" | $Xsed -e "$delay_single_quote_subst"`' --whole_archive_flag_spec='`$ECHO "X$whole_archive_flag_spec" | $Xsed -e "$delay_single_quote_subst"`' --compiler_needs_object='`$ECHO "X$compiler_needs_object" | $Xsed -e "$delay_single_quote_subst"`' --old_archive_from_new_cmds='`$ECHO "X$old_archive_from_new_cmds" | $Xsed -e "$delay_single_quote_subst"`' --old_archive_from_expsyms_cmds='`$ECHO "X$old_archive_from_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`' --archive_cmds='`$ECHO "X$archive_cmds" | $Xsed -e "$delay_single_quote_subst"`' --archive_expsym_cmds='`$ECHO "X$archive_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`' --module_cmds='`$ECHO "X$module_cmds" | $Xsed -e "$delay_single_quote_subst"`' --module_expsym_cmds='`$ECHO "X$module_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`' --with_gnu_ld='`$ECHO "X$with_gnu_ld" | $Xsed -e "$delay_single_quote_subst"`' --allow_undefined_flag='`$ECHO "X$allow_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`' --no_undefined_flag='`$ECHO "X$no_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`' --hardcode_libdir_flag_spec='`$ECHO "X$hardcode_libdir_flag_spec" | $Xsed -e "$delay_single_quote_subst"`' --hardcode_libdir_flag_spec_ld='`$ECHO "X$hardcode_libdir_flag_spec_ld" | $Xsed -e "$delay_single_quote_subst"`' --hardcode_libdir_separator='`$ECHO "X$hardcode_libdir_separator" | $Xsed -e "$delay_single_quote_subst"`' --hardcode_direct='`$ECHO "X$hardcode_direct" | $Xsed -e "$delay_single_quote_subst"`' --hardcode_direct_absolute='`$ECHO "X$hardcode_direct_absolute" | $Xsed -e "$delay_single_quote_subst"`' --hardcode_minus_L='`$ECHO "X$hardcode_minus_L" | $Xsed -e "$delay_single_quote_subst"`' --hardcode_shlibpath_var='`$ECHO "X$hardcode_shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`' --hardcode_automatic='`$ECHO "X$hardcode_automatic" | $Xsed -e "$delay_single_quote_subst"`' --inherit_rpath='`$ECHO "X$inherit_rpath" | $Xsed -e "$delay_single_quote_subst"`' --link_all_deplibs='`$ECHO "X$link_all_deplibs" | $Xsed -e "$delay_single_quote_subst"`' --fix_srcfile_path='`$ECHO "X$fix_srcfile_path" | $Xsed -e "$delay_single_quote_subst"`' --always_export_symbols='`$ECHO "X$always_export_symbols" | $Xsed -e "$delay_single_quote_subst"`' --export_symbols_cmds='`$ECHO "X$export_symbols_cmds" | $Xsed -e "$delay_single_quote_subst"`' --exclude_expsyms='`$ECHO "X$exclude_expsyms" | $Xsed -e "$delay_single_quote_subst"`' --include_expsyms='`$ECHO "X$include_expsyms" | $Xsed -e "$delay_single_quote_subst"`' --prelink_cmds='`$ECHO "X$prelink_cmds" | $Xsed -e "$delay_single_quote_subst"`' --file_list_spec='`$ECHO "X$file_list_spec" | $Xsed -e "$delay_single_quote_subst"`' --variables_saved_for_relink='`$ECHO "X$variables_saved_for_relink" | $Xsed -e "$delay_single_quote_subst"`' --need_lib_prefix='`$ECHO "X$need_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`' --need_version='`$ECHO "X$need_version" | $Xsed -e "$delay_single_quote_subst"`' --version_type='`$ECHO "X$version_type" | $Xsed -e "$delay_single_quote_subst"`' --runpath_var='`$ECHO "X$runpath_var" | $Xsed -e "$delay_single_quote_subst"`' --shlibpath_var='`$ECHO "X$shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`' --shlibpath_overrides_runpath='`$ECHO "X$shlibpath_overrides_runpath" | $Xsed -e "$delay_single_quote_subst"`' --libname_spec='`$ECHO "X$libname_spec" | $Xsed -e "$delay_single_quote_subst"`' --library_names_spec='`$ECHO "X$library_names_spec" | $Xsed -e "$delay_single_quote_subst"`' --soname_spec='`$ECHO "X$soname_spec" | $Xsed -e "$delay_single_quote_subst"`' --postinstall_cmds='`$ECHO "X$postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`' --postuninstall_cmds='`$ECHO "X$postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`' --finish_cmds='`$ECHO "X$finish_cmds" | $Xsed -e "$delay_single_quote_subst"`' --finish_eval='`$ECHO "X$finish_eval" | $Xsed -e "$delay_single_quote_subst"`' --hardcode_into_libs='`$ECHO "X$hardcode_into_libs" | $Xsed -e "$delay_single_quote_subst"`' --sys_lib_search_path_spec='`$ECHO "X$sys_lib_search_path_spec" | $Xsed -e "$delay_single_quote_subst"`' --sys_lib_dlsearch_path_spec='`$ECHO "X$sys_lib_dlsearch_path_spec" | $Xsed -e "$delay_single_quote_subst"`' --hardcode_action='`$ECHO "X$hardcode_action" | $Xsed -e "$delay_single_quote_subst"`' --enable_dlopen='`$ECHO "X$enable_dlopen" | $Xsed -e "$delay_single_quote_subst"`' --enable_dlopen_self='`$ECHO "X$enable_dlopen_self" | $Xsed -e "$delay_single_quote_subst"`' --enable_dlopen_self_static='`$ECHO "X$enable_dlopen_self_static" | $Xsed -e "$delay_single_quote_subst"`' --old_striplib='`$ECHO "X$old_striplib" | $Xsed -e "$delay_single_quote_subst"`' --striplib='`$ECHO "X$striplib" | $Xsed -e "$delay_single_quote_subst"`' --compiler_lib_search_dirs='`$ECHO "X$compiler_lib_search_dirs" | $Xsed -e "$delay_single_quote_subst"`' --predep_objects='`$ECHO "X$predep_objects" | $Xsed -e "$delay_single_quote_subst"`' --postdep_objects='`$ECHO "X$postdep_objects" | $Xsed -e "$delay_single_quote_subst"`' --predeps='`$ECHO "X$predeps" | $Xsed -e "$delay_single_quote_subst"`' --postdeps='`$ECHO "X$postdeps" | $Xsed -e "$delay_single_quote_subst"`' --compiler_lib_search_path='`$ECHO "X$compiler_lib_search_path" | $Xsed -e "$delay_single_quote_subst"`' --LD_CXX='`$ECHO "X$LD_CXX" | $Xsed -e "$delay_single_quote_subst"`' --old_archive_cmds_CXX='`$ECHO "X$old_archive_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' --compiler_CXX='`$ECHO "X$compiler_CXX" | $Xsed -e "$delay_single_quote_subst"`' --GCC_CXX='`$ECHO "X$GCC_CXX" | $Xsed -e "$delay_single_quote_subst"`' --lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "X$lt_prog_compiler_no_builtin_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`' --lt_prog_compiler_wl_CXX='`$ECHO "X$lt_prog_compiler_wl_CXX" | $Xsed -e "$delay_single_quote_subst"`' --lt_prog_compiler_pic_CXX='`$ECHO "X$lt_prog_compiler_pic_CXX" | $Xsed -e "$delay_single_quote_subst"`' --lt_prog_compiler_static_CXX='`$ECHO "X$lt_prog_compiler_static_CXX" | $Xsed -e "$delay_single_quote_subst"`' --lt_cv_prog_compiler_c_o_CXX='`$ECHO "X$lt_cv_prog_compiler_c_o_CXX" | $Xsed -e "$delay_single_quote_subst"`' --archive_cmds_need_lc_CXX='`$ECHO "X$archive_cmds_need_lc_CXX" | $Xsed -e "$delay_single_quote_subst"`' --enable_shared_with_static_runtimes_CXX='`$ECHO "X$enable_shared_with_static_runtimes_CXX" | $Xsed -e "$delay_single_quote_subst"`' --export_dynamic_flag_spec_CXX='`$ECHO "X$export_dynamic_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`' --whole_archive_flag_spec_CXX='`$ECHO "X$whole_archive_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`' --compiler_needs_object_CXX='`$ECHO "X$compiler_needs_object_CXX" | $Xsed -e "$delay_single_quote_subst"`' --old_archive_from_new_cmds_CXX='`$ECHO "X$old_archive_from_new_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' --old_archive_from_expsyms_cmds_CXX='`$ECHO "X$old_archive_from_expsyms_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' --archive_cmds_CXX='`$ECHO "X$archive_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' --archive_expsym_cmds_CXX='`$ECHO "X$archive_expsym_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' --module_cmds_CXX='`$ECHO "X$module_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' --module_expsym_cmds_CXX='`$ECHO "X$module_expsym_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' --with_gnu_ld_CXX='`$ECHO "X$with_gnu_ld_CXX" | $Xsed -e "$delay_single_quote_subst"`' --allow_undefined_flag_CXX='`$ECHO "X$allow_undefined_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`' --no_undefined_flag_CXX='`$ECHO "X$no_undefined_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`' --hardcode_libdir_flag_spec_CXX='`$ECHO "X$hardcode_libdir_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`' --hardcode_libdir_flag_spec_ld_CXX='`$ECHO "X$hardcode_libdir_flag_spec_ld_CXX" | $Xsed -e "$delay_single_quote_subst"`' --hardcode_libdir_separator_CXX='`$ECHO "X$hardcode_libdir_separator_CXX" | $Xsed -e "$delay_single_quote_subst"`' --hardcode_direct_CXX='`$ECHO "X$hardcode_direct_CXX" | $Xsed -e "$delay_single_quote_subst"`' --hardcode_direct_absolute_CXX='`$ECHO "X$hardcode_direct_absolute_CXX" | $Xsed -e "$delay_single_quote_subst"`' --hardcode_minus_L_CXX='`$ECHO "X$hardcode_minus_L_CXX" | $Xsed -e "$delay_single_quote_subst"`' --hardcode_shlibpath_var_CXX='`$ECHO "X$hardcode_shlibpath_var_CXX" | $Xsed -e "$delay_single_quote_subst"`' --hardcode_automatic_CXX='`$ECHO "X$hardcode_automatic_CXX" | $Xsed -e "$delay_single_quote_subst"`' --inherit_rpath_CXX='`$ECHO "X$inherit_rpath_CXX" | $Xsed -e "$delay_single_quote_subst"`' --link_all_deplibs_CXX='`$ECHO "X$link_all_deplibs_CXX" | $Xsed -e "$delay_single_quote_subst"`' --fix_srcfile_path_CXX='`$ECHO "X$fix_srcfile_path_CXX" | $Xsed -e "$delay_single_quote_subst"`' --always_export_symbols_CXX='`$ECHO "X$always_export_symbols_CXX" | $Xsed -e "$delay_single_quote_subst"`' --export_symbols_cmds_CXX='`$ECHO "X$export_symbols_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' --exclude_expsyms_CXX='`$ECHO "X$exclude_expsyms_CXX" | $Xsed -e "$delay_single_quote_subst"`' --include_expsyms_CXX='`$ECHO "X$include_expsyms_CXX" | $Xsed -e "$delay_single_quote_subst"`' --prelink_cmds_CXX='`$ECHO "X$prelink_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' --file_list_spec_CXX='`$ECHO "X$file_list_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`' --hardcode_action_CXX='`$ECHO "X$hardcode_action_CXX" | $Xsed -e "$delay_single_quote_subst"`' --compiler_lib_search_dirs_CXX='`$ECHO "X$compiler_lib_search_dirs_CXX" | $Xsed -e "$delay_single_quote_subst"`' --predep_objects_CXX='`$ECHO "X$predep_objects_CXX" | $Xsed -e "$delay_single_quote_subst"`' --postdep_objects_CXX='`$ECHO "X$postdep_objects_CXX" | $Xsed -e "$delay_single_quote_subst"`' --predeps_CXX='`$ECHO "X$predeps_CXX" | $Xsed -e "$delay_single_quote_subst"`' --postdeps_CXX='`$ECHO "X$postdeps_CXX" | $Xsed -e "$delay_single_quote_subst"`' --compiler_lib_search_path_CXX='`$ECHO "X$compiler_lib_search_path_CXX" | $Xsed -e "$delay_single_quote_subst"`' -+macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`' -+macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`' -+enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`' -+enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`' -+pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`' -+enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`' -+SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`' -+ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`' -+PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`' -+host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`' -+host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`' -+host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`' -+build_alias='`$ECHO "$build_alias" | $SED "$delay_single_quote_subst"`' -+build='`$ECHO "$build" | $SED "$delay_single_quote_subst"`' -+build_os='`$ECHO "$build_os" | $SED "$delay_single_quote_subst"`' -+SED='`$ECHO "$SED" | $SED "$delay_single_quote_subst"`' -+Xsed='`$ECHO "$Xsed" | $SED "$delay_single_quote_subst"`' -+GREP='`$ECHO "$GREP" | $SED "$delay_single_quote_subst"`' -+EGREP='`$ECHO "$EGREP" | $SED "$delay_single_quote_subst"`' -+FGREP='`$ECHO "$FGREP" | $SED "$delay_single_quote_subst"`' -+LD='`$ECHO "$LD" | $SED "$delay_single_quote_subst"`' -+NM='`$ECHO "$NM" | $SED "$delay_single_quote_subst"`' -+LN_S='`$ECHO "$LN_S" | $SED "$delay_single_quote_subst"`' -+max_cmd_len='`$ECHO "$max_cmd_len" | $SED "$delay_single_quote_subst"`' -+ac_objext='`$ECHO "$ac_objext" | $SED "$delay_single_quote_subst"`' -+exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' -+lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' -+lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' -+lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' -+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' -+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' -+reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' -+reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' -+OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' -+deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' -+file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' -+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' -+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' -+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' -+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' -+AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' -+AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' -+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' -+STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' -+RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' -+old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' -+old_postuninstall_cmds='`$ECHO "$old_postuninstall_cmds" | $SED "$delay_single_quote_subst"`' -+old_archive_cmds='`$ECHO "$old_archive_cmds" | $SED "$delay_single_quote_subst"`' -+lock_old_archive_extraction='`$ECHO "$lock_old_archive_extraction" | $SED "$delay_single_quote_subst"`' -+CC='`$ECHO "$CC" | $SED "$delay_single_quote_subst"`' -+CFLAGS='`$ECHO "$CFLAGS" | $SED "$delay_single_quote_subst"`' -+compiler='`$ECHO "$compiler" | $SED "$delay_single_quote_subst"`' -+GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`' -+lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`' -+lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' -+lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' -+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' -+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' -+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' -+objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' -+MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' -+lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' -+lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' -+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' -+lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' -+lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' -+need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' -+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' -+DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' -+NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' -+LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' -+OTOOL='`$ECHO "$OTOOL" | $SED "$delay_single_quote_subst"`' -+OTOOL64='`$ECHO "$OTOOL64" | $SED "$delay_single_quote_subst"`' -+libext='`$ECHO "$libext" | $SED "$delay_single_quote_subst"`' -+shrext_cmds='`$ECHO "$shrext_cmds" | $SED "$delay_single_quote_subst"`' -+extract_expsyms_cmds='`$ECHO "$extract_expsyms_cmds" | $SED "$delay_single_quote_subst"`' -+archive_cmds_need_lc='`$ECHO "$archive_cmds_need_lc" | $SED "$delay_single_quote_subst"`' -+enable_shared_with_static_runtimes='`$ECHO "$enable_shared_with_static_runtimes" | $SED "$delay_single_quote_subst"`' -+export_dynamic_flag_spec='`$ECHO "$export_dynamic_flag_spec" | $SED "$delay_single_quote_subst"`' -+whole_archive_flag_spec='`$ECHO "$whole_archive_flag_spec" | $SED "$delay_single_quote_subst"`' -+compiler_needs_object='`$ECHO "$compiler_needs_object" | $SED "$delay_single_quote_subst"`' -+old_archive_from_new_cmds='`$ECHO "$old_archive_from_new_cmds" | $SED "$delay_single_quote_subst"`' -+old_archive_from_expsyms_cmds='`$ECHO "$old_archive_from_expsyms_cmds" | $SED "$delay_single_quote_subst"`' -+archive_cmds='`$ECHO "$archive_cmds" | $SED "$delay_single_quote_subst"`' -+archive_expsym_cmds='`$ECHO "$archive_expsym_cmds" | $SED "$delay_single_quote_subst"`' -+module_cmds='`$ECHO "$module_cmds" | $SED "$delay_single_quote_subst"`' -+module_expsym_cmds='`$ECHO "$module_expsym_cmds" | $SED "$delay_single_quote_subst"`' -+with_gnu_ld='`$ECHO "$with_gnu_ld" | $SED "$delay_single_quote_subst"`' -+allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`' -+no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`' -+hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`' -+hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`' -+hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`' -+hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`' -+hardcode_minus_L='`$ECHO "$hardcode_minus_L" | $SED "$delay_single_quote_subst"`' -+hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_quote_subst"`' -+hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' -+inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' -+link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' -+always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' -+export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' -+exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' -+include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' -+prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' -+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' -+file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' -+variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' -+need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' -+need_version='`$ECHO "$need_version" | $SED "$delay_single_quote_subst"`' -+version_type='`$ECHO "$version_type" | $SED "$delay_single_quote_subst"`' -+runpath_var='`$ECHO "$runpath_var" | $SED "$delay_single_quote_subst"`' -+shlibpath_var='`$ECHO "$shlibpath_var" | $SED "$delay_single_quote_subst"`' -+shlibpath_overrides_runpath='`$ECHO "$shlibpath_overrides_runpath" | $SED "$delay_single_quote_subst"`' -+libname_spec='`$ECHO "$libname_spec" | $SED "$delay_single_quote_subst"`' -+library_names_spec='`$ECHO "$library_names_spec" | $SED "$delay_single_quote_subst"`' -+soname_spec='`$ECHO "$soname_spec" | $SED "$delay_single_quote_subst"`' -+install_override_mode='`$ECHO "$install_override_mode" | $SED "$delay_single_quote_subst"`' -+postinstall_cmds='`$ECHO "$postinstall_cmds" | $SED "$delay_single_quote_subst"`' -+postuninstall_cmds='`$ECHO "$postuninstall_cmds" | $SED "$delay_single_quote_subst"`' -+finish_cmds='`$ECHO "$finish_cmds" | $SED "$delay_single_quote_subst"`' -+finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`' -+hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`' -+sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`' -+sys_lib_dlsearch_path_spec='`$ECHO "$sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`' -+hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`' -+enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`' -+enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`' -+enable_dlopen_self_static='`$ECHO "$enable_dlopen_self_static" | $SED "$delay_single_quote_subst"`' -+old_striplib='`$ECHO "$old_striplib" | $SED "$delay_single_quote_subst"`' -+striplib='`$ECHO "$striplib" | $SED "$delay_single_quote_subst"`' -+compiler_lib_search_dirs='`$ECHO "$compiler_lib_search_dirs" | $SED "$delay_single_quote_subst"`' -+predep_objects='`$ECHO "$predep_objects" | $SED "$delay_single_quote_subst"`' -+postdep_objects='`$ECHO "$postdep_objects" | $SED "$delay_single_quote_subst"`' -+predeps='`$ECHO "$predeps" | $SED "$delay_single_quote_subst"`' -+postdeps='`$ECHO "$postdeps" | $SED "$delay_single_quote_subst"`' -+compiler_lib_search_path='`$ECHO "$compiler_lib_search_path" | $SED "$delay_single_quote_subst"`' -+LD_CXX='`$ECHO "$LD_CXX" | $SED "$delay_single_quote_subst"`' -+reload_flag_CXX='`$ECHO "$reload_flag_CXX" | $SED "$delay_single_quote_subst"`' -+reload_cmds_CXX='`$ECHO "$reload_cmds_CXX" | $SED "$delay_single_quote_subst"`' -+old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote_subst"`' -+compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`' -+GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`' -+lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`' -+lt_prog_compiler_pic_CXX='`$ECHO "$lt_prog_compiler_pic_CXX" | $SED "$delay_single_quote_subst"`' -+lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`' -+lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`' -+lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`' -+archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`' -+enable_shared_with_static_runtimes_CXX='`$ECHO "$enable_shared_with_static_runtimes_CXX" | $SED "$delay_single_quote_subst"`' -+export_dynamic_flag_spec_CXX='`$ECHO "$export_dynamic_flag_spec_CXX" | $SED "$delay_single_quote_subst"`' -+whole_archive_flag_spec_CXX='`$ECHO "$whole_archive_flag_spec_CXX" | $SED "$delay_single_quote_subst"`' -+compiler_needs_object_CXX='`$ECHO "$compiler_needs_object_CXX" | $SED "$delay_single_quote_subst"`' -+old_archive_from_new_cmds_CXX='`$ECHO "$old_archive_from_new_cmds_CXX" | $SED "$delay_single_quote_subst"`' -+old_archive_from_expsyms_cmds_CXX='`$ECHO "$old_archive_from_expsyms_cmds_CXX" | $SED "$delay_single_quote_subst"`' -+archive_cmds_CXX='`$ECHO "$archive_cmds_CXX" | $SED "$delay_single_quote_subst"`' -+archive_expsym_cmds_CXX='`$ECHO "$archive_expsym_cmds_CXX" | $SED "$delay_single_quote_subst"`' -+module_cmds_CXX='`$ECHO "$module_cmds_CXX" | $SED "$delay_single_quote_subst"`' -+module_expsym_cmds_CXX='`$ECHO "$module_expsym_cmds_CXX" | $SED "$delay_single_quote_subst"`' -+with_gnu_ld_CXX='`$ECHO "$with_gnu_ld_CXX" | $SED "$delay_single_quote_subst"`' -+allow_undefined_flag_CXX='`$ECHO "$allow_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`' -+no_undefined_flag_CXX='`$ECHO "$no_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`' -+hardcode_libdir_flag_spec_CXX='`$ECHO "$hardcode_libdir_flag_spec_CXX" | $SED "$delay_single_quote_subst"`' -+hardcode_libdir_separator_CXX='`$ECHO "$hardcode_libdir_separator_CXX" | $SED "$delay_single_quote_subst"`' -+hardcode_direct_CXX='`$ECHO "$hardcode_direct_CXX" | $SED "$delay_single_quote_subst"`' -+hardcode_direct_absolute_CXX='`$ECHO "$hardcode_direct_absolute_CXX" | $SED "$delay_single_quote_subst"`' -+hardcode_minus_L_CXX='`$ECHO "$hardcode_minus_L_CXX" | $SED "$delay_single_quote_subst"`' -+hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_single_quote_subst"`' -+hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`' -+inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`' -+link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`' -+always_export_symbols_CXX='`$ECHO "$always_export_symbols_CXX" | $SED "$delay_single_quote_subst"`' -+export_symbols_cmds_CXX='`$ECHO "$export_symbols_cmds_CXX" | $SED "$delay_single_quote_subst"`' -+exclude_expsyms_CXX='`$ECHO "$exclude_expsyms_CXX" | $SED "$delay_single_quote_subst"`' -+include_expsyms_CXX='`$ECHO "$include_expsyms_CXX" | $SED "$delay_single_quote_subst"`' -+prelink_cmds_CXX='`$ECHO "$prelink_cmds_CXX" | $SED "$delay_single_quote_subst"`' -+postlink_cmds_CXX='`$ECHO "$postlink_cmds_CXX" | $SED "$delay_single_quote_subst"`' -+file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`' -+hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`' -+compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`' -+predep_objects_CXX='`$ECHO "$predep_objects_CXX" | $SED "$delay_single_quote_subst"`' -+postdep_objects_CXX='`$ECHO "$postdep_objects_CXX" | $SED "$delay_single_quote_subst"`' -+predeps_CXX='`$ECHO "$predeps_CXX" | $SED "$delay_single_quote_subst"`' -+postdeps_CXX='`$ECHO "$postdeps_CXX" | $SED "$delay_single_quote_subst"`' -+compiler_lib_search_path_CXX='`$ECHO "$compiler_lib_search_path_CXX" | $SED "$delay_single_quote_subst"`' - - LTCC='$LTCC' - LTCFLAGS='$LTCFLAGS' - compiler='$compiler_DEFAULT' - -+# A function that is used when there is no print builtin or printf. -+func_fallback_echo () -+{ -+ eval 'cat <<_LTECHO_EOF -+\$1 -+_LTECHO_EOF' -+} -+ - # Quote evaled strings. --for var in SED \ -+for var in SHELL \ -+ECHO \ -+PATH_SEPARATOR \ -+SED \ - GREP \ - EGREP \ - FGREP \ -@@ -21323,8 +19187,13 @@ reload_flag \ - OBJDUMP \ - deplibs_check_method \ - file_magic_cmd \ -+file_magic_glob \ -+want_nocaseglob \ -+DLLTOOL \ -+sharedlib_from_linklib_cmd \ - AR \ - AR_FLAGS \ -+archiver_list_spec \ - STRIP \ - RANLIB \ - CC \ -@@ -21334,14 +19203,14 @@ lt_cv_sys_global_symbol_pipe \ - lt_cv_sys_global_symbol_to_cdecl \ - lt_cv_sys_global_symbol_to_c_name_address \ - lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ --SHELL \ --ECHO \ -+nm_file_list_spec \ - lt_prog_compiler_no_builtin_flag \ --lt_prog_compiler_wl \ - lt_prog_compiler_pic \ -+lt_prog_compiler_wl \ - lt_prog_compiler_static \ - lt_cv_prog_compiler_c_o \ - need_locks \ -+MANIFEST_TOOL \ - DSYMUTIL \ - NMEDIT \ - LIPO \ -@@ -21355,9 +19224,7 @@ with_gnu_ld \ - allow_undefined_flag \ - no_undefined_flag \ - hardcode_libdir_flag_spec \ --hardcode_libdir_flag_spec_ld \ - hardcode_libdir_separator \ --fix_srcfile_path \ - exclude_expsyms \ - include_expsyms \ - file_list_spec \ -@@ -21365,6 +19232,7 @@ variables_saved_for_relink \ - libname_spec \ - library_names_spec \ - soname_spec \ -+install_override_mode \ - finish_eval \ - old_striplib \ - striplib \ -@@ -21375,10 +19243,11 @@ predeps \ - postdeps \ - compiler_lib_search_path \ - LD_CXX \ -+reload_flag_CXX \ - compiler_CXX \ - lt_prog_compiler_no_builtin_flag_CXX \ --lt_prog_compiler_wl_CXX \ - lt_prog_compiler_pic_CXX \ -+lt_prog_compiler_wl_CXX \ - lt_prog_compiler_static_CXX \ - lt_cv_prog_compiler_c_o_CXX \ - export_dynamic_flag_spec_CXX \ -@@ -21388,9 +19257,7 @@ with_gnu_ld_CXX \ - allow_undefined_flag_CXX \ - no_undefined_flag_CXX \ - hardcode_libdir_flag_spec_CXX \ --hardcode_libdir_flag_spec_ld_CXX \ - hardcode_libdir_separator_CXX \ --fix_srcfile_path_CXX \ - exclude_expsyms_CXX \ - include_expsyms_CXX \ - file_list_spec_CXX \ -@@ -21400,9 +19267,9 @@ postdep_objects_CXX \ - predeps_CXX \ - postdeps_CXX \ - compiler_lib_search_path_CXX; do -- case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in -+ case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in - *[\\\\\\\`\\"\\\$]*) -- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" -+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" - ;; - *) - eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" -@@ -21424,11 +19291,13 @@ module_cmds \ - module_expsym_cmds \ - export_symbols_cmds \ - prelink_cmds \ -+postlink_cmds \ - postinstall_cmds \ - postuninstall_cmds \ - finish_cmds \ - sys_lib_search_path_spec \ - sys_lib_dlsearch_path_spec \ -+reload_cmds_CXX \ - old_archive_cmds_CXX \ - old_archive_from_new_cmds_CXX \ - old_archive_from_expsyms_cmds_CXX \ -@@ -21437,10 +19306,11 @@ archive_expsym_cmds_CXX \ - module_cmds_CXX \ - module_expsym_cmds_CXX \ - export_symbols_cmds_CXX \ --prelink_cmds_CXX; do -- case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in -+prelink_cmds_CXX \ -+postlink_cmds_CXX; do -+ case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in - *[\\\\\\\`\\"\\\$]*) -- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" -+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" - ;; - *) - eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" -@@ -21448,12 +19318,6 @@ prelink_cmds_CXX; do - esac - done - --# Fix-up fallback echo if it was mangled by the above quoting rules. --case \$lt_ECHO in --*'\\\$0 --fallback-echo"') lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\$0 --fallback-echo"\$/\$0 --fallback-echo"/'\` -- ;; --esac -- - ac_aux_dir='$ac_aux_dir' - xsi_shell='$xsi_shell' - lt_shell_append='$lt_shell_append' -@@ -21593,8 +19457,6 @@ do - "src/modules_simulation/cellular_automata/sim_cellular_automata/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules_simulation/cellular_automata/sim_cellular_automata/Makefile" ;; - "src/modules_simulation/ecosystems/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules_simulation/ecosystems/Makefile" ;; - "src/modules_simulation/ecosystems/sim_ecosystems_hugget/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules_simulation/ecosystems/sim_ecosystems_hugget/Makefile" ;; -- "src/modules_simulation/fire/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules_simulation/fire/Makefile" ;; -- "src/modules_simulation/fire/sim_fire_spreading/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules_simulation/fire/sim_fire_spreading/Makefile" ;; - "src/modules_terrain_analysis/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules_terrain_analysis/Makefile" ;; - "src/modules_terrain_analysis/terrain_analysis/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules_terrain_analysis/terrain_analysis/Makefile" ;; - "src/modules_terrain_analysis/terrain_analysis/ta_channels/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules_terrain_analysis/terrain_analysis/ta_channels/Makefile" ;; -@@ -21605,9 +19467,7 @@ do - "src/modules_terrain_analysis/terrain_analysis/ta_preprocessor/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules_terrain_analysis/terrain_analysis/ta_preprocessor/Makefile" ;; - "src/modules_terrain_analysis/terrain_analysis/ta_profiles/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules_terrain_analysis/terrain_analysis/ta_profiles/Makefile" ;; - -- *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 --$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;} -- { (exit 1); exit 1; }; };; -+ *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; - esac - done - -@@ -21630,26 +19490,24 @@ fi - # after its creation but before its name has been assigned to `$tmp'. - $debug || - { -- tmp= -+ tmp= ac_tmp= - trap 'exit_status=$? -- { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status -+ : "${ac_tmp:=$tmp}" -+ { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status - ' 0 -- trap '{ (exit 1); exit 1; }' 1 2 13 15 -+ trap 'as_fn_exit 1' 1 2 13 15 - } - # Create a (secure) tmp directory for tmp files. - - { - tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && -- test -n "$tmp" && test -d "$tmp" -+ test -d "$tmp" - } || - { - tmp=./conf$$-$RANDOM - (umask 077 && mkdir "$tmp") --} || --{ -- $as_echo "$as_me: cannot create a temporary directory in ." >&2 -- { (exit 1); exit 1; } --} -+} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 -+ac_tmp=$tmp - - # Set up the scripts for CONFIG_FILES section. - # No need to generate them if there are no CONFIG_FILES. -@@ -21657,7 +19515,13 @@ $debug || - if test -n "$CONFIG_FILES"; then - - --ac_cr=' ' -+ac_cr=`echo X | tr X '\015'` -+# On cygwin, bash can eat \r inside `` if the user requested igncr. -+# But we know of no other shell where ac_cr would be empty at this -+# point, so we can use a bashism as a fallback. -+if test "x$ac_cr" = x; then -+ eval ac_cr=\$\'\\r\' -+fi - ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /dev/null` - if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then - ac_cs_awk_cr='\\r' -@@ -21665,7 +19529,7 @@ else - ac_cs_awk_cr=$ac_cr - fi - --echo 'BEGIN {' >"$tmp/subs1.awk" && -+echo 'BEGIN {' >"$ac_tmp/subs1.awk" && - _ACEOF - - -@@ -21674,24 +19538,18 @@ _ACEOF - echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && - echo "_ACEOF" - } >conf$$subs.sh || -- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 --$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} -- { (exit 1); exit 1; }; } --ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` -+ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 -+ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'` - ac_delim='%!_!# ' - for ac_last_try in false false false false false :; do - . ./conf$$subs.sh || -- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 --$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} -- { (exit 1); exit 1; }; } -+ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 - - ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` - if test $ac_delim_n = $ac_delim_num; then - break - elif $ac_last_try; then -- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 --$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} -- { (exit 1); exit 1; }; } -+ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 - else - ac_delim="$ac_delim!$ac_delim _$ac_delim!! " - fi -@@ -21699,7 +19557,7 @@ done - rm -f conf$$subs.sh - - cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 --cat >>"\$tmp/subs1.awk" <<\\_ACAWK && -+cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK && - _ACEOF - sed -n ' - h -@@ -21713,7 +19571,7 @@ s/'"$ac_delim"'$// - t delim - :nl - h --s/\(.\{148\}\).*/\1/ -+s/\(.\{148\}\)..*/\1/ - t more1 - s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ - p -@@ -21727,7 +19585,7 @@ s/.\{148\}// - t nl - :delim - h --s/\(.\{148\}\).*/\1/ -+s/\(.\{148\}\)..*/\1/ - t more2 - s/["\\]/\\&/g; s/^/"/; s/$/"/ - p -@@ -21747,7 +19605,7 @@ t delim - rm -f conf$$subs.awk - cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 - _ACAWK --cat >>"\$tmp/subs1.awk" <<_ACAWK && -+cat >>"\$ac_tmp/subs1.awk" <<_ACAWK && - for (key in S) S_is_set[key] = 1 - FS = "" - -@@ -21779,23 +19637,29 @@ if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then - sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" - else - cat --fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ -- || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5 --$as_echo "$as_me: error: could not setup config files machinery" >&2;} -- { (exit 1); exit 1; }; } -+fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \ -+ || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 - _ACEOF - --# VPATH may cause trouble with some makes, so we remove $(srcdir), --# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and -+# VPATH may cause trouble with some makes, so we remove sole $(srcdir), -+# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and - # trailing colons and then remove the whole line if VPATH becomes empty - # (actually we leave an empty line to preserve line numbers). - if test "x$srcdir" = x.; then -- ac_vpsub='/^[ ]*VPATH[ ]*=/{ --s/:*\$(srcdir):*/:/ --s/:*\${srcdir}:*/:/ --s/:*@srcdir@:*/:/ --s/^\([^=]*=[ ]*\):*/\1/ -+ ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{ -+h -+s/// -+s/^/:/ -+s/[ ]*$/:/ -+s/:\$(srcdir):/:/g -+s/:\${srcdir}:/:/g -+s/:@srcdir@:/:/g -+s/^:*// - s/:*$// -+x -+s/\(=[ ]*\).*/\1/ -+G -+s/\n// - s/^[^=]*=[ ]*$// - }' - fi -@@ -21807,7 +19671,7 @@ fi # test -n "$CONFIG_FILES" - # No need to generate them if there are no CONFIG_HEADERS. - # This happens for instance with `./config.status Makefile'. - if test -n "$CONFIG_HEADERS"; then --cat >"$tmp/defines.awk" <<\_ACAWK || -+cat >"$ac_tmp/defines.awk" <<\_ACAWK || - BEGIN { - _ACEOF - -@@ -21819,13 +19683,11 @@ _ACEOF - # handling of long lines. - ac_delim='%!_!# ' - for ac_last_try in false false :; do -- ac_t=`sed -n "/$ac_delim/p" confdefs.h` -- if test -z "$ac_t"; then -+ ac_tt=`sed -n "/$ac_delim/p" confdefs.h` -+ if test -z "$ac_tt"; then - break - elif $ac_last_try; then -- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_HEADERS" >&5 --$as_echo "$as_me: error: could not make $CONFIG_HEADERS" >&2;} -- { (exit 1); exit 1; }; } -+ as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5 - else - ac_delim="$ac_delim!$ac_delim _$ac_delim!! " - fi -@@ -21910,9 +19772,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 - _ACAWK - _ACEOF - cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -- { { $as_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&5 --$as_echo "$as_me: error: could not setup config headers machinery" >&2;} -- { (exit 1); exit 1; }; } -+ as_fn_error $? "could not setup config headers machinery" "$LINENO" 5 - fi # test -n "$CONFIG_HEADERS" - - -@@ -21925,9 +19785,7 @@ do - esac - case $ac_mode$ac_tag in - :[FHL]*:*);; -- :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5 --$as_echo "$as_me: error: invalid tag $ac_tag" >&2;} -- { (exit 1); exit 1; }; };; -+ :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; - :[FH]-) ac_tag=-:-;; - :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; - esac -@@ -21946,7 +19804,7 @@ $as_echo "$as_me: error: invalid tag $ac_tag" >&2;} - for ac_f - do - case $ac_f in -- -) ac_f="$tmp/stdin";; -+ -) ac_f="$ac_tmp/stdin";; - *) # Look for the file first in the build tree, then in the source tree - # (if the path is not absolute). The absolute path cannot be DOS-style, - # because $ac_f cannot contain `:'. -@@ -21955,12 +19813,10 @@ $as_echo "$as_me: error: invalid tag $ac_tag" >&2;} - [\\/$]*) false;; - *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; - esac || -- { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5 --$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;} -- { (exit 1); exit 1; }; };; -+ as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; - esac - case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac -- ac_file_inputs="$ac_file_inputs '$ac_f'" -+ as_fn_append ac_file_inputs " '$ac_f'" - done - - # Let's still pretend it is `configure' which instantiates (i.e., don't -@@ -21971,7 +19827,7 @@ $as_echo "$as_me: error: cannot find input file: $ac_f" >&2;} - `' by configure.' - if test x"$ac_file" != x-; then - configure_input="$ac_file. $configure_input" -- { $as_echo "$as_me:$LINENO: creating $ac_file" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 - $as_echo "$as_me: creating $ac_file" >&6;} - fi - # Neutralize special characters interpreted by sed in replacement strings. -@@ -21983,10 +19839,8 @@ $as_echo "$as_me: creating $ac_file" >&6;} - esac - - case $ac_tag in -- *:-:* | *:-) cat >"$tmp/stdin" \ -- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 --$as_echo "$as_me: error: could not create $ac_file" >&2;} -- { (exit 1); exit 1; }; } ;; -+ *:-:* | *:-) cat >"$ac_tmp/stdin" \ -+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; - esac - ;; - esac -@@ -22014,47 +19868,7 @@ $as_echo X"$ac_file" | - q - } - s/.*/./; q'` -- { as_dir="$ac_dir" -- case $as_dir in #( -- -*) as_dir=./$as_dir;; -- esac -- test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { -- as_dirs= -- while :; do -- case $as_dir in #( -- *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( -- *) as_qdir=$as_dir;; -- esac -- as_dirs="'$as_qdir' $as_dirs" -- as_dir=`$as_dirname -- "$as_dir" || --$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -- X"$as_dir" : 'X\(//\)[^/]' \| \ -- X"$as_dir" : 'X\(//\)$' \| \ -- X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || --$as_echo X"$as_dir" | -- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ -- s//\1/ -- q -- } -- /^X\(\/\/\)[^/].*/{ -- s//\1/ -- q -- } -- /^X\(\/\/\)$/{ -- s//\1/ -- q -- } -- /^X\(\/\).*/{ -- s//\1/ -- q -- } -- s/.*/./; q'` -- test -d "$as_dir" && break -- done -- test -z "$as_dirs" || eval "mkdir $as_dirs" -- } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 --$as_echo "$as_me: error: cannot create directory $as_dir" >&2;} -- { (exit 1); exit 1; }; }; } -+ as_dir="$ac_dir"; as_fn_mkdir_p - ac_builddir=. - - case "$ac_dir" in -@@ -22111,7 +19925,6 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 - # If the template does not know about datarootdir, expand it. - # FIXME: This hack should be removed a few years after 2.60. - ac_datarootdir_hack=; ac_datarootdir_seen= -- - ac_sed_dataroot=' - /datarootdir/ { - p -@@ -22121,12 +19934,11 @@ ac_sed_dataroot=' - /@docdir@/p - /@infodir@/p - /@localedir@/p --/@mandir@/p --' -+/@mandir@/p' - case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in - *datarootdir*) ac_datarootdir_seen=yes;; - *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) -- { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 - $as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} - _ACEOF - cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -@@ -22136,7 +19948,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 - s&@infodir@&$infodir&g - s&@localedir@&$localedir&g - s&@mandir@&$mandir&g -- s&\\\${datarootdir}&$datarootdir&g' ;; -+ s&\\\${datarootdir}&$datarootdir&g' ;; - esac - _ACEOF - -@@ -22164,27 +19976,24 @@ s&@INSTALL@&$ac_INSTALL&;t t - s&@MKDIR_P@&$ac_MKDIR_P&;t t - $ac_datarootdir_hack - " --eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ -- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 --$as_echo "$as_me: error: could not create $ac_file" >&2;} -- { (exit 1); exit 1; }; } -+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \ -+ >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5 - - test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && -- { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && -- { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && -- { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir' --which seems to be undefined. Please make sure it is defined." >&5 -+ { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && -+ { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ -+ "$ac_tmp/out"`; test -z "$ac_out"; } && -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' -+which seems to be undefined. Please make sure it is defined" >&5 - $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' --which seems to be undefined. Please make sure it is defined." >&2;} -+which seems to be undefined. Please make sure it is defined" >&2;} - -- rm -f "$tmp/stdin" -+ rm -f "$ac_tmp/stdin" - case $ac_file in -- -) cat "$tmp/out" && rm -f "$tmp/out";; -- *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; -+ -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";; -+ *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";; - esac \ -- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 --$as_echo "$as_me: error: could not create $ac_file" >&2;} -- { (exit 1); exit 1; }; } -+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 - ;; - :H) - # -@@ -22193,27 +20002,21 @@ $as_echo "$as_me: error: could not create $ac_file" >&2;} - if test x"$ac_file" != x-; then - { - $as_echo "/* $configure_input */" \ -- && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" -- } >"$tmp/config.h" \ -- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 --$as_echo "$as_me: error: could not create $ac_file" >&2;} -- { (exit 1); exit 1; }; } -- if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then -- { $as_echo "$as_me:$LINENO: $ac_file is unchanged" >&5 -+ && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" -+ } >"$ac_tmp/config.h" \ -+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 -+ if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 - $as_echo "$as_me: $ac_file is unchanged" >&6;} - else - rm -f "$ac_file" -- mv "$tmp/config.h" "$ac_file" \ -- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 --$as_echo "$as_me: error: could not create $ac_file" >&2;} -- { (exit 1); exit 1; }; } -+ mv "$ac_tmp/config.h" "$ac_file" \ -+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 - fi - else - $as_echo "/* $configure_input */" \ -- && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ -- || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5 --$as_echo "$as_me: error: could not create -" >&2;} -- { (exit 1); exit 1; }; } -+ && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \ -+ || as_fn_error $? "could not create -" "$LINENO" 5 - fi - # Compute "$ac_file"'s index in $config_headers. - _am_arg="$ac_file" -@@ -22251,7 +20054,7 @@ $as_echo X"$_am_arg" | - s/.*/./; q'`/stamp-h$_am_stamp_count - ;; - -- :C) { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5 -+ :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5 - $as_echo "$as_me: executing $ac_file commands" >&6;} - ;; - esac -@@ -22259,7 +20062,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;} - - case $ac_file$ac_mode in - "depfiles":C) test x"$AMDEP_TRUE" != x"" || { -- # Autoconf 2.62 quotes --file arguments for eval, but not when files -+ # Older Autoconf quotes --file arguments for eval, but not when files - # are listed without --file. Let's play safe and only enable the eval - # if we detect the quoting. - case $CONFIG_FILES in -@@ -22272,7 +20075,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;} - # Strip MF so we end up with the name of the file. - mf=`echo "$mf" | sed -e 's/:.*$//'` - # Check whether this is an Automake generated Makefile or not. -- # We used to match only the files named `Makefile.in', but -+ # We used to match only the files named 'Makefile.in', but - # some people rename them; so instead we look at the file content. - # Grep'ing the first line is not enough: some people post-process - # each Makefile.in and add a new line on top of each file to say so. -@@ -22306,21 +20109,19 @@ $as_echo X"$mf" | - continue - fi - # Extract the definition of DEPDIR, am__include, and am__quote -- # from the Makefile without running `make'. -+ # from the Makefile without running 'make'. - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` - test -z "$DEPDIR" && continue - am__include=`sed -n 's/^am__include = //p' < "$mf"` -- test -z "am__include" && continue -+ test -z "$am__include" && continue - am__quote=`sed -n 's/^am__quote = //p' < "$mf"` -- # When using ansi2knr, U may be empty or an underscore; expand it -- U=`sed -n 's/^U = //p' < "$mf"` - # Find all dependency output files, they are included files with - # $(DEPDIR) in their names. We invoke sed twice because it is the - # simplest approach to changing $(DEPDIR) to its actual value in the - # expansion. - for file in `sed -n " - s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ -- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do -+ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do - # Make sure the directory exists. - test -f "$dirpart/$file" && continue - fdir=`$as_dirname -- "$file" || -@@ -22346,47 +20147,7 @@ $as_echo X"$file" | - q - } - s/.*/./; q'` -- { as_dir=$dirpart/$fdir -- case $as_dir in #( -- -*) as_dir=./$as_dir;; -- esac -- test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { -- as_dirs= -- while :; do -- case $as_dir in #( -- *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( -- *) as_qdir=$as_dir;; -- esac -- as_dirs="'$as_qdir' $as_dirs" -- as_dir=`$as_dirname -- "$as_dir" || --$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -- X"$as_dir" : 'X\(//\)[^/]' \| \ -- X"$as_dir" : 'X\(//\)$' \| \ -- X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || --$as_echo X"$as_dir" | -- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ -- s//\1/ -- q -- } -- /^X\(\/\/\)[^/].*/{ -- s//\1/ -- q -- } -- /^X\(\/\/\)$/{ -- s//\1/ -- q -- } -- /^X\(\/\).*/{ -- s//\1/ -- q -- } -- s/.*/./; q'` -- test -d "$as_dir" && break -- done -- test -z "$as_dirs" || eval "mkdir $as_dirs" -- } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 --$as_echo "$as_me: error: cannot create directory $as_dir" >&2;} -- { (exit 1); exit 1; }; }; } -+ as_dir=$dirpart/$fdir; as_fn_mkdir_p - # echo "creating $dirpart/$file" - echo '# dummy' > "$dirpart/$file" - done -@@ -22414,7 +20175,8 @@ $as_echo "$as_me: error: cannot create directory $as_dir" >&2;} - # NOTE: Changes made to this file will be lost: look at ltmain.sh. - # - # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, --# 2006, 2007, 2008 Free Software Foundation, Inc. -+# 2006, 2007, 2008, 2009, 2010, 2011 Free Software -+# Foundation, Inc. - # Written by Gordon Matzigkeit, 1996 - # - # This file is part of GNU Libtool. -@@ -22462,6 +20224,15 @@ pic_mode=$pic_mode - # Whether or not to optimize for fast installation. - fast_install=$enable_fast_install - -+# Shell to use when invoking shell scripts. -+SHELL=$lt_SHELL -+ -+# An echo program that protects backslashes. -+ECHO=$lt_ECHO -+ -+# The PATH separator for the build system. -+PATH_SEPARATOR=$lt_PATH_SEPARATOR -+ - # The host system. - host_alias=$host_alias - host=$host -@@ -22511,9 +20282,11 @@ SP2NL=$lt_lt_SP2NL - # turn newlines into spaces. - NL2SP=$lt_lt_NL2SP - --# How to create reloadable object files. --reload_flag=$lt_reload_flag --reload_cmds=$lt_reload_cmds -+# convert \$build file names to \$host format. -+to_host_file_cmd=$lt_cv_to_host_file_cmd -+ -+# convert \$build files to toolchain format. -+to_tool_file_cmd=$lt_cv_to_tool_file_cmd - - # An object symbol dumper. - OBJDUMP=$lt_OBJDUMP -@@ -22521,13 +20294,30 @@ OBJDUMP=$lt_OBJDUMP - # Method to check whether dependent libraries are shared objects. - deplibs_check_method=$lt_deplibs_check_method - --# Command to use when deplibs_check_method == "file_magic". -+# Command to use when deplibs_check_method = "file_magic". - file_magic_cmd=$lt_file_magic_cmd - -+# How to find potential files when deplibs_check_method = "file_magic". -+file_magic_glob=$lt_file_magic_glob -+ -+# Find potential files using nocaseglob when deplibs_check_method = "file_magic". -+want_nocaseglob=$lt_want_nocaseglob -+ -+# DLL creation program. -+DLLTOOL=$lt_DLLTOOL -+ -+# Command to associate shared and link libraries. -+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd -+ - # The archiver. - AR=$lt_AR -+ -+# Flags to create an archive. - AR_FLAGS=$lt_AR_FLAGS - -+# How to feed a file listing to the archiver. -+archiver_list_spec=$lt_archiver_list_spec -+ - # A symbol stripping program. - STRIP=$lt_STRIP - -@@ -22536,6 +20326,9 @@ RANLIB=$lt_RANLIB - old_postinstall_cmds=$lt_old_postinstall_cmds - old_postuninstall_cmds=$lt_old_postuninstall_cmds - -+# Whether to use a lock for old archive extraction. -+lock_old_archive_extraction=$lock_old_archive_extraction -+ - # A C compiler. - LTCC=$lt_CC - -@@ -22554,14 +20347,14 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address - # Transform the output of nm in a C name address pair when lib prefix is needed. - global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix - --# The name of the directory that contains temporary libtool files. --objdir=$objdir -+# Specify filename containing input files for \$NM. -+nm_file_list_spec=$lt_nm_file_list_spec - --# Shell to use when invoking shell scripts. --SHELL=$lt_SHELL -+# The root where to search for dependent libraries,and in which our libraries should be installed. -+lt_sysroot=$lt_sysroot - --# An echo program that does not interpret backslashes. --ECHO=$lt_ECHO -+# The name of the directory that contains temporary libtool files. -+objdir=$objdir - - # Used to examine libraries when file_magic_cmd begins with "file". - MAGIC_CMD=$MAGIC_CMD -@@ -22569,6 +20362,9 @@ MAGIC_CMD=$MAGIC_CMD - # Must we lock files when doing compilation? - need_locks=$lt_need_locks - -+# Manifest tool. -+MANIFEST_TOOL=$lt_MANIFEST_TOOL -+ - # Tool to manipulate archived DWARF debug symbol files on Mac OS X. - DSYMUTIL=$lt_DSYMUTIL - -@@ -22625,6 +20421,9 @@ library_names_spec=$lt_library_names_spec - # The coded name of the library, if different from the real name. - soname_spec=$lt_soname_spec - -+# Permission mode override for installation of shared libraries. -+install_override_mode=$lt_install_override_mode -+ - # Command to use after installation of a shared archive. - postinstall_cmds=$lt_postinstall_cmds - -@@ -22664,6 +20463,10 @@ striplib=$lt_striplib - # The linker used to build libraries. - LD=$lt_LD - -+# How to create reloadable object files. -+reload_flag=$lt_reload_flag -+reload_cmds=$lt_reload_cmds -+ - # Commands used to build an old-style archive. - old_archive_cmds=$lt_old_archive_cmds - -@@ -22676,12 +20479,12 @@ with_gcc=$GCC - # Compiler flag to turn off builtin functions. - no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag - --# How to pass a linker flag through the compiler. --wl=$lt_lt_prog_compiler_wl -- - # Additional compiler flags for building library objects. - pic_flag=$lt_lt_prog_compiler_pic - -+# How to pass a linker flag through the compiler. -+wl=$lt_lt_prog_compiler_wl -+ - # Compiler flag to prevent dynamic linking. - link_static_flag=$lt_lt_prog_compiler_static - -@@ -22731,10 +20534,6 @@ no_undefined_flag=$lt_no_undefined_flag - # This must work even if \$libdir does not exist - hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec - --# If ld is used when linking, flag to hardcode \$libdir into a binary --# during linking. This must work even if \$libdir does not exist. --hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld -- - # Whether we need a single "-rpath" flag with a separated argument. - hardcode_libdir_separator=$lt_hardcode_libdir_separator - -@@ -22768,9 +20567,6 @@ inherit_rpath=$inherit_rpath - # Whether libtool must link a program against all its dependency libraries. - link_all_deplibs=$link_all_deplibs - --# Fix the shell variable \$srcfile for the compiler. --fix_srcfile_path=$lt_fix_srcfile_path -- - # Set to "yes" if exported symbols are required. - always_export_symbols=$always_export_symbols - -@@ -22786,6 +20582,9 @@ include_expsyms=$lt_include_expsyms - # Commands necessary for linking programs (against libraries) with templates. - prelink_cmds=$lt_prelink_cmds - -+# Commands necessary for finishing linking programs. -+postlink_cmds=$lt_postlink_cmds -+ - # Specify filename containing input files. - file_list_spec=$lt_file_list_spec - -@@ -22832,212 +20631,169 @@ ltmain="$ac_aux_dir/ltmain.sh" - # if finds mixed CR/LF and LF-only lines. Since sed operates in - # text mode, it properly converts lines to CR/LF. This bash problem - # is reportedly fixed, but why not run on old versions too? -- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) -- -- case $xsi_shell in -- yes) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_dirname file append nondir_replacement --# Compute the dirname of FILE. If nonempty, add APPEND to the result, --# otherwise set result to NONDIR_REPLACEMENT. --func_dirname () --{ -- case ${1} in -- */*) func_dirname_result="${1%/*}${2}" ;; -- * ) func_dirname_result="${3}" ;; -- esac --} -- --# func_basename file --func_basename () --{ -- func_basename_result="${1##*/}" --} -- --# func_dirname_and_basename file append nondir_replacement --# perform func_basename and func_dirname in a single function --# call: --# dirname: Compute the dirname of FILE. If nonempty, --# add APPEND to the result, otherwise set result --# to NONDIR_REPLACEMENT. --# value returned in "$func_dirname_result" --# basename: Compute filename of FILE. --# value retuned in "$func_basename_result" --# Implementation must be kept synchronized with func_dirname --# and func_basename. For efficiency, we do not delegate to --# those functions but instead duplicate the functionality here. --func_dirname_and_basename () --{ -- case ${1} in -- */*) func_dirname_result="${1%/*}${2}" ;; -- * ) func_dirname_result="${3}" ;; -- esac -- func_basename_result="${1##*/}" --} -- --# func_stripname prefix suffix name --# strip PREFIX and SUFFIX off of NAME. --# PREFIX and SUFFIX must not contain globbing or regex special --# characters, hashes, percent signs, but SUFFIX may contain a leading --# dot (in which case that matches only a dot). --func_stripname () --{ -- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are -- # positional parameters, so assign one to ordinary parameter first. -- func_stripname_result=${3} -- func_stripname_result=${func_stripname_result#"${1}"} -- func_stripname_result=${func_stripname_result%"${2}"} --} -- --# func_opt_split --func_opt_split () --{ -- func_opt_split_opt=${1%%=*} -- func_opt_split_arg=${1#*=} --} -- --# func_lo2o object --func_lo2o () --{ -- case ${1} in -- *.lo) func_lo2o_result=${1%.lo}.${objext} ;; -- *) func_lo2o_result=${1} ;; -- esac --} -- --# func_xform libobj-or-source --func_xform () --{ -- func_xform_result=${1%.*}.lo --} -- --# func_arith arithmetic-term... --func_arith () --{ -- func_arith_result=$(( $* )) --} -- --# func_len string --# STRING may not start with a hyphen. --func_len () --{ -- func_len_result=${#1} --} -- --_LT_EOF -- ;; -- *) # Bourne compatible functions. -- cat << \_LT_EOF >> "$cfgfile" -- --# func_dirname file append nondir_replacement --# Compute the dirname of FILE. If nonempty, add APPEND to the result, --# otherwise set result to NONDIR_REPLACEMENT. --func_dirname () --{ -- # Extract subdirectory from the argument. -- func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"` -- if test "X$func_dirname_result" = "X${1}"; then -- func_dirname_result="${3}" -- else -- func_dirname_result="$func_dirname_result${2}" -- fi --} -- --# func_basename file --func_basename () --{ -- func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"` --} -- -- --# func_stripname prefix suffix name --# strip PREFIX and SUFFIX off of NAME. --# PREFIX and SUFFIX must not contain globbing or regex special --# characters, hashes, percent signs, but SUFFIX may contain a leading --# dot (in which case that matches only a dot). --# func_strip_suffix prefix name --func_stripname () --{ -- case ${2} in -- .*) func_stripname_result=`$ECHO "X${3}" \ -- | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;; -- *) func_stripname_result=`$ECHO "X${3}" \ -- | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;; -- esac --} -- --# sed scripts: --my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' --my_sed_long_arg='1s/^-[^=]*=//' -- --# func_opt_split --func_opt_split () --{ -- func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"` -- func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"` --} -- --# func_lo2o object --func_lo2o () --{ -- func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"` --} -- --# func_xform libobj-or-source --func_xform () --{ -- func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[^.]*$/.lo/'` --} -- --# func_arith arithmetic-term... --func_arith () --{ -- func_arith_result=`expr "$@"` --} -- --# func_len string --# STRING may not start with a hyphen. --func_len () --{ -- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` --} -- --_LT_EOF --esac -- --case $lt_shell_append in -- yes) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_append var value --# Append VALUE to the end of shell variable VAR. --func_append () --{ -- eval "$1+=\$2" --} --_LT_EOF -- ;; -- *) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_append var value --# Append VALUE to the end of shell variable VAR. --func_append () --{ -- eval "$1=\$$1\$2" --} -- --_LT_EOF -- ;; -- esac -- -- -- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) -- -- mv -f "$cfgfile" "$ofile" || -+ sed '$q' "$ltmain" >> "$cfgfile" \ -+ || (rm -f "$cfgfile"; exit 1) -+ -+ if test x"$xsi_shell" = xyes; then -+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ -+func_dirname ()\ -+{\ -+\ case ${1} in\ -+\ */*) func_dirname_result="${1%/*}${2}" ;;\ -+\ * ) func_dirname_result="${3}" ;;\ -+\ esac\ -+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_basename ()$/,/^} # func_basename /c\ -+func_basename ()\ -+{\ -+\ func_basename_result="${1##*/}"\ -+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ -+func_dirname_and_basename ()\ -+{\ -+\ case ${1} in\ -+\ */*) func_dirname_result="${1%/*}${2}" ;;\ -+\ * ) func_dirname_result="${3}" ;;\ -+\ esac\ -+\ func_basename_result="${1##*/}"\ -+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ -+func_stripname ()\ -+{\ -+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ -+\ # positional parameters, so assign one to ordinary parameter first.\ -+\ func_stripname_result=${3}\ -+\ func_stripname_result=${func_stripname_result#"${1}"}\ -+\ func_stripname_result=${func_stripname_result%"${2}"}\ -+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ -+func_split_long_opt ()\ -+{\ -+\ func_split_long_opt_name=${1%%=*}\ -+\ func_split_long_opt_arg=${1#*=}\ -+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ -+func_split_short_opt ()\ -+{\ -+\ func_split_short_opt_arg=${1#??}\ -+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ -+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ -+func_lo2o ()\ -+{\ -+\ case ${1} in\ -+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ -+\ *) func_lo2o_result=${1} ;;\ -+\ esac\ -+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_xform ()$/,/^} # func_xform /c\ -+func_xform ()\ -+{\ -+ func_xform_result=${1%.*}.lo\ -+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_arith ()$/,/^} # func_arith /c\ -+func_arith ()\ -+{\ -+ func_arith_result=$(( $* ))\ -+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_len ()$/,/^} # func_len /c\ -+func_len ()\ -+{\ -+ func_len_result=${#1}\ -+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+fi -+ -+if test x"$lt_shell_append" = xyes; then -+ sed -e '/^func_append ()$/,/^} # func_append /c\ -+func_append ()\ -+{\ -+ eval "${1}+=\\${2}"\ -+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ -+func_append_quoted ()\ -+{\ -+\ func_quote_for_eval "${2}"\ -+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ -+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ # Save a `func_append' function call where possible by direct use of '+=' -+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+ test 0 -eq $? || _lt_function_replace_fail=: -+else -+ # Save a `func_append' function call even when '+=' is not available -+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+ test 0 -eq $? || _lt_function_replace_fail=: -+fi -+ -+if test x"$_lt_function_replace_fail" = x":"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 -+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} -+fi -+ -+ -+ mv -f "$cfgfile" "$ofile" || - (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") - chmod +x "$ofile" - -@@ -23049,6 +20805,10 @@ _LT_EOF - # The linker used to build libraries. - LD=$lt_LD_CXX - -+# How to create reloadable object files. -+reload_flag=$lt_reload_flag_CXX -+reload_cmds=$lt_reload_cmds_CXX -+ - # Commands used to build an old-style archive. - old_archive_cmds=$lt_old_archive_cmds_CXX - -@@ -23061,12 +20821,12 @@ with_gcc=$GCC_CXX - # Compiler flag to turn off builtin functions. - no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX - --# How to pass a linker flag through the compiler. --wl=$lt_lt_prog_compiler_wl_CXX -- - # Additional compiler flags for building library objects. - pic_flag=$lt_lt_prog_compiler_pic_CXX - -+# How to pass a linker flag through the compiler. -+wl=$lt_lt_prog_compiler_wl_CXX -+ - # Compiler flag to prevent dynamic linking. - link_static_flag=$lt_lt_prog_compiler_static_CXX - -@@ -23116,10 +20876,6 @@ no_undefined_flag=$lt_no_undefined_flag_CXX - # This must work even if \$libdir does not exist - hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX - --# If ld is used when linking, flag to hardcode \$libdir into a binary --# during linking. This must work even if \$libdir does not exist. --hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX -- - # Whether we need a single "-rpath" flag with a separated argument. - hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX - -@@ -23153,9 +20909,6 @@ inherit_rpath=$inherit_rpath_CXX - # Whether libtool must link a program against all its dependency libraries. - link_all_deplibs=$link_all_deplibs_CXX - --# Fix the shell variable \$srcfile for the compiler. --fix_srcfile_path=$lt_fix_srcfile_path_CXX -- - # Set to "yes" if exported symbols are required. - always_export_symbols=$always_export_symbols_CXX - -@@ -23171,6 +20924,9 @@ include_expsyms=$lt_include_expsyms_CXX - # Commands necessary for linking programs (against libraries) with templates. - prelink_cmds=$lt_prelink_cmds_CXX - -+# Commands necessary for finishing linking programs. -+postlink_cmds=$lt_postlink_cmds_CXX -+ - # Specify filename containing input files. - file_list_spec=$lt_file_list_spec_CXX - -@@ -23200,15 +20956,12 @@ _LT_EOF - done # for ac_tag - - --{ (exit 0); exit 0; } -+as_fn_exit 0 - _ACEOF --chmod +x $CONFIG_STATUS - ac_clean_files=$ac_clean_files_save - - test $ac_write_fail = 0 || -- { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5 --$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;} -- { (exit 1); exit 1; }; } -+ as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5 - - - # configure is writing to config.log, and then calls config.status. -@@ -23229,10 +20982,10 @@ if test "$no_create" != yes; then - exec 5>>config.log - # Use ||, not &&, to avoid exiting from the if with $? = 1, which - # would make configure fail if this is the last instruction. -- $ac_cs_success || { (exit 1); exit 1; } -+ $ac_cs_success || as_fn_exit 1 - fi - if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then -- { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 - $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} - fi - -diff --git a/depcomp b/depcomp -index df8eea7..4ebd5b3 100755 ---- a/depcomp -+++ b/depcomp -@@ -1,10 +1,9 @@ - #! /bin/sh - # depcomp - compile a program generating dependencies as side-effects - --scriptversion=2009-04-28.21; # UTC -+scriptversion=2013-05-30.07; # UTC - --# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free --# Software Foundation, Inc. -+# Copyright (C) 1999-2013 Free Software Foundation, Inc. - - # This program is free software; you can redistribute it and/or modify - # it under the terms of the GNU General Public License as published by -@@ -28,9 +27,9 @@ scriptversion=2009-04-28.21; # UTC - - case $1 in - '') -- echo "$0: No command. Try \`$0 --help' for more information." 1>&2 -- exit 1; -- ;; -+ echo "$0: No command. Try '$0 --help' for more information." 1>&2 -+ exit 1; -+ ;; - -h | --h*) - cat <<\EOF - Usage: depcomp [--help] [--version] PROGRAM [ARGS] -@@ -40,11 +39,11 @@ as side-effects. - - Environment variables: - depmode Dependency tracking mode. -- source Source file read by `PROGRAMS ARGS'. -- object Object file output by `PROGRAMS ARGS'. -+ source Source file read by 'PROGRAMS ARGS'. -+ object Object file output by 'PROGRAMS ARGS'. - DEPDIR directory where to store dependencies. - depfile Dependency file to output. -- tmpdepfile Temporary file to use when outputing dependencies. -+ tmpdepfile Temporary file to use when outputting dependencies. - libtool Whether libtool is used (yes/no). - - Report bugs to . -@@ -57,6 +56,66 @@ EOF - ;; - esac - -+# Get the directory component of the given path, and save it in the -+# global variables '$dir'. Note that this directory component will -+# be either empty or ending with a '/' character. This is deliberate. -+set_dir_from () -+{ -+ case $1 in -+ */*) dir=`echo "$1" | sed -e 's|/[^/]*$|/|'`;; -+ *) dir=;; -+ esac -+} -+ -+# Get the suffix-stripped basename of the given path, and save it the -+# global variable '$base'. -+set_base_from () -+{ -+ base=`echo "$1" | sed -e 's|^.*/||' -e 's/\.[^.]*$//'` -+} -+ -+# If no dependency file was actually created by the compiler invocation, -+# we still have to create a dummy depfile, to avoid errors with the -+# Makefile "include basename.Plo" scheme. -+make_dummy_depfile () -+{ -+ echo "#dummy" > "$depfile" -+} -+ -+# Factor out some common post-processing of the generated depfile. -+# Requires the auxiliary global variable '$tmpdepfile' to be set. -+aix_post_process_depfile () -+{ -+ # If the compiler actually managed to produce a dependency file, -+ # post-process it. -+ if test -f "$tmpdepfile"; then -+ # Each line is of the form 'foo.o: dependency.h'. -+ # Do two passes, one to just change these to -+ # $object: dependency.h -+ # and one to simply output -+ # dependency.h: -+ # which is needed to avoid the deleted-header problem. -+ { sed -e "s,^.*\.[$lower]*:,$object:," < "$tmpdepfile" -+ sed -e "s,^.*\.[$lower]*:[$tab ]*,," -e 's,$,:,' < "$tmpdepfile" -+ } > "$depfile" -+ rm -f "$tmpdepfile" -+ else -+ make_dummy_depfile -+ fi -+} -+ -+# A tabulation character. -+tab=' ' -+# A newline character. -+nl=' -+' -+# Character ranges might be problematic outside the C locale. -+# These definitions help. -+upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ -+lower=abcdefghijklmnopqrstuvwxyz -+digits=0123456789 -+alpha=${upper}${lower} -+ - if test -z "$depmode" || test -z "$source" || test -z "$object"; then - echo "depcomp: Variables source, object and depmode must be set" 1>&2 - exit 1 -@@ -69,6 +128,9 @@ tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`} - - rm -f "$tmpdepfile" - -+# Avoid interferences from the environment. -+gccflag= dashmflag= -+ - # Some modes work just like other modes, but use different flags. We - # parameterize here, but still list the modes in the big case below, - # to make depend.m4 easier to write. Note that we *cannot* use a case -@@ -80,18 +142,32 @@ if test "$depmode" = hp; then - fi - - if test "$depmode" = dashXmstdout; then -- # This is just like dashmstdout with a different argument. -- dashmflag=-xM -- depmode=dashmstdout -+ # This is just like dashmstdout with a different argument. -+ dashmflag=-xM -+ depmode=dashmstdout - fi - - cygpath_u="cygpath -u -f -" - if test "$depmode" = msvcmsys; then -- # This is just like msvisualcpp but w/o cygpath translation. -- # Just convert the backslash-escaped backslashes to single forward -- # slashes to satisfy depend.m4 -- cygpath_u="sed s,\\\\\\\\,/,g" -- depmode=msvisualcpp -+ # This is just like msvisualcpp but w/o cygpath translation. -+ # Just convert the backslash-escaped backslashes to single forward -+ # slashes to satisfy depend.m4 -+ cygpath_u='sed s,\\\\,/,g' -+ depmode=msvisualcpp -+fi -+ -+if test "$depmode" = msvc7msys; then -+ # This is just like msvc7 but w/o cygpath translation. -+ # Just convert the backslash-escaped backslashes to single forward -+ # slashes to satisfy depend.m4 -+ cygpath_u='sed s,\\\\,/,g' -+ depmode=msvc7 -+fi -+ -+if test "$depmode" = xlc; then -+ # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information. -+ gccflag=-qmakedep=gcc,-MF -+ depmode=gcc - fi - - case "$depmode" in -@@ -114,8 +190,7 @@ gcc3) - done - "$@" - stat=$? -- if test $stat -eq 0; then : -- else -+ if test $stat -ne 0; then - rm -f "$tmpdepfile" - exit $stat - fi -@@ -123,13 +198,17 @@ gcc3) - ;; - - gcc) -+## Note that this doesn't just cater to obsosete pre-3.x GCC compilers. -+## but also to in-use compilers like IMB xlc/xlC and the HP C compiler. -+## (see the conditional assignment to $gccflag above). - ## There are various ways to get dependency output from gcc. Here's - ## why we pick this rather obscure method: - ## - Don't want to use -MD because we'd like the dependencies to end - ## up in a subdir. Having to rename by hand is ugly. - ## (We might end up doing this anyway to support other compilers.) - ## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like --## -MM, not -M (despite what the docs say). -+## -MM, not -M (despite what the docs say). Also, it might not be -+## supported by the other compilers which use the 'gcc' depmode. - ## - Using -M directly means running the compiler twice (even worse - ## than renaming). - if test -z "$gccflag"; then -@@ -137,31 +216,31 @@ gcc) - fi - "$@" -Wp,"$gccflag$tmpdepfile" - stat=$? -- if test $stat -eq 0; then : -- else -+ if test $stat -ne 0; then - rm -f "$tmpdepfile" - exit $stat - fi - rm -f "$depfile" - echo "$object : \\" > "$depfile" -- alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz --## The second -e expression handles DOS-style file names with drive letters. -+ # The second -e expression handles DOS-style file names with drive -+ # letters. - sed -e 's/^[^:]*: / /' \ - -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile" --## This next piece of magic avoids the `deleted header file' problem. -+## This next piece of magic avoids the "deleted header file" problem. - ## The problem is that when a header file which appears in a .P file - ## is deleted, the dependency causes make to die (because there is - ## typically no way to rebuild the header). We avoid this by adding - ## dummy dependencies for each header file. Too bad gcc doesn't do - ## this for us directly. -- tr ' ' ' --' < "$tmpdepfile" | --## Some versions of gcc put a space before the `:'. On the theory -+## Some versions of gcc put a space before the ':'. On the theory - ## that the space means something, we add a space to the output as --## well. -+## well. hp depmode also adds that space, but also prefixes the VPATH -+## to the object. Take care to not repeat it in the output. - ## Some versions of the HPUX 10.20 sed can't process this invocation - ## correctly. Breaking it into two sed invocations is a workaround. -- sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" -+ tr ' ' "$nl" < "$tmpdepfile" \ -+ | sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \ -+ | sed -e 's/$/ :/' >> "$depfile" - rm -f "$tmpdepfile" - ;; - -@@ -179,8 +258,7 @@ sgi) - "$@" -MDupdate "$tmpdepfile" - fi - stat=$? -- if test $stat -eq 0; then : -- else -+ if test $stat -ne 0; then - rm -f "$tmpdepfile" - exit $stat - fi -@@ -188,43 +266,41 @@ sgi) - - if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files - echo "$object : \\" > "$depfile" -- - # Clip off the initial element (the dependent). Don't try to be - # clever and replace this with sed code, as IRIX sed won't handle - # lines with more than a fixed number of characters (4096 in - # IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines; -- # the IRIX cc adds comments like `#:fec' to the end of the -+ # the IRIX cc adds comments like '#:fec' to the end of the - # dependency line. -- tr ' ' ' --' < "$tmpdepfile" \ -- | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \ -- tr ' --' ' ' >> "$depfile" -+ tr ' ' "$nl" < "$tmpdepfile" \ -+ | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' \ -+ | tr "$nl" ' ' >> "$depfile" - echo >> "$depfile" -- - # The second pass generates a dummy entry for each header file. -- tr ' ' ' --' < "$tmpdepfile" \ -- | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ -- >> "$depfile" -+ tr ' ' "$nl" < "$tmpdepfile" \ -+ | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ -+ >> "$depfile" - else -- # The sourcefile does not contain any dependencies, so just -- # store a dummy comment line, to avoid errors with the Makefile -- # "include basename.Plo" scheme. -- echo "#dummy" > "$depfile" -+ make_dummy_depfile - fi - rm -f "$tmpdepfile" - ;; - -+xlc) -+ # This case exists only to let depend.m4 do its work. It works by -+ # looking at the text of this script. This case will never be run, -+ # since it is checked for above. -+ exit 1 -+ ;; -+ - aix) - # The C for AIX Compiler uses -M and outputs the dependencies - # in a .u file. In older versions, this file always lives in the -- # current directory. Also, the AIX compiler puts `$object:' at the -+ # current directory. Also, the AIX compiler puts '$object:' at the - # start of each line; $object doesn't have directory information. - # Version 6 uses the directory in both cases. -- dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` -- test "x$dir" = "x$object" && dir= -- base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` -+ set_dir_from "$object" -+ set_base_from "$object" - if test "$libtool" = yes; then - tmpdepfile1=$dir$base.u - tmpdepfile2=$base.u -@@ -237,9 +313,7 @@ aix) - "$@" -M - fi - stat=$? -- -- if test $stat -eq 0; then : -- else -+ if test $stat -ne 0; then - rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" - exit $stat - fi -@@ -248,44 +322,100 @@ aix) - do - test -f "$tmpdepfile" && break - done -- if test -f "$tmpdepfile"; then -- # Each line is of the form `foo.o: dependent.h'. -- # Do two passes, one to just change these to -- # `$object: dependent.h' and one to simply `dependent.h:'. -- sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" -- # That's a tab and a space in the []. -- sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" -- else -- # The sourcefile does not contain any dependencies, so just -- # store a dummy comment line, to avoid errors with the Makefile -- # "include basename.Plo" scheme. -- echo "#dummy" > "$depfile" -+ aix_post_process_depfile -+ ;; -+ -+tcc) -+ # tcc (Tiny C Compiler) understand '-MD -MF file' since version 0.9.26 -+ # FIXME: That version still under development at the moment of writing. -+ # Make that this statement remains true also for stable, released -+ # versions. -+ # It will wrap lines (doesn't matter whether long or short) with a -+ # trailing '\', as in: -+ # -+ # foo.o : \ -+ # foo.c \ -+ # foo.h \ -+ # -+ # It will put a trailing '\' even on the last line, and will use leading -+ # spaces rather than leading tabs (at least since its commit 0394caf7 -+ # "Emit spaces for -MD"). -+ "$@" -MD -MF "$tmpdepfile" -+ stat=$? -+ if test $stat -ne 0; then -+ rm -f "$tmpdepfile" -+ exit $stat - fi -+ rm -f "$depfile" -+ # Each non-empty line is of the form 'foo.o : \' or ' dep.h \'. -+ # We have to change lines of the first kind to '$object: \'. -+ sed -e "s|.*:|$object :|" < "$tmpdepfile" > "$depfile" -+ # And for each line of the second kind, we have to emit a 'dep.h:' -+ # dummy dependency, to avoid the deleted-header problem. -+ sed -n -e 's|^ *\(.*\) *\\$|\1:|p' < "$tmpdepfile" >> "$depfile" - rm -f "$tmpdepfile" - ;; - --icc) -- # Intel's C compiler understands `-MD -MF file'. However on -- # icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c -- # ICC 7.0 will fill foo.d with something like -- # foo.o: sub/foo.c -- # foo.o: sub/foo.h -- # which is wrong. We want: -- # sub/foo.o: sub/foo.c -- # sub/foo.o: sub/foo.h -- # sub/foo.c: -- # sub/foo.h: -- # ICC 7.1 will output -+## The order of this option in the case statement is important, since the -+## shell code in configure will try each of these formats in the order -+## listed in this file. A plain '-MD' option would be understood by many -+## compilers, so we must ensure this comes after the gcc and icc options. -+pgcc) -+ # Portland's C compiler understands '-MD'. -+ # Will always output deps to 'file.d' where file is the root name of the -+ # source file under compilation, even if file resides in a subdirectory. -+ # The object file name does not affect the name of the '.d' file. -+ # pgcc 10.2 will output - # foo.o: sub/foo.c sub/foo.h -- # and will wrap long lines using \ : -+ # and will wrap long lines using '\' : - # foo.o: sub/foo.c ... \ - # sub/foo.h ... \ - # ... -+ set_dir_from "$object" -+ # Use the source, not the object, to determine the base name, since -+ # that's sadly what pgcc will do too. -+ set_base_from "$source" -+ tmpdepfile=$base.d -+ -+ # For projects that build the same source file twice into different object -+ # files, the pgcc approach of using the *source* file root name can cause -+ # problems in parallel builds. Use a locking strategy to avoid stomping on -+ # the same $tmpdepfile. -+ lockdir=$base.d-lock -+ trap " -+ echo '$0: caught signal, cleaning up...' >&2 -+ rmdir '$lockdir' -+ exit 1 -+ " 1 2 13 15 -+ numtries=100 -+ i=$numtries -+ while test $i -gt 0; do -+ # mkdir is a portable test-and-set. -+ if mkdir "$lockdir" 2>/dev/null; then -+ # This process acquired the lock. -+ "$@" -MD -+ stat=$? -+ # Release the lock. -+ rmdir "$lockdir" -+ break -+ else -+ # If the lock is being held by a different process, wait -+ # until the winning process is done or we timeout. -+ while test -d "$lockdir" && test $i -gt 0; do -+ sleep 1 -+ i=`expr $i - 1` -+ done -+ fi -+ i=`expr $i - 1` -+ done -+ trap - 1 2 13 15 -+ if test $i -le 0; then -+ echo "$0: failed to acquire lock after $numtries attempts" >&2 -+ echo "$0: check lockdir '$lockdir'" >&2 -+ exit 1 -+ fi - -- "$@" -MD -MF "$tmpdepfile" -- stat=$? -- if test $stat -eq 0; then : -- else -+ if test $stat -ne 0; then - rm -f "$tmpdepfile" - exit $stat - fi -@@ -297,8 +427,8 @@ icc) - sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile" - # Some versions of the HPUX 10.20 sed can't process this invocation - # correctly. Breaking it into two sed invocations is a workaround. -- sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" | -- sed -e 's/$/ :/' >> "$depfile" -+ sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" \ -+ | sed -e 's/$/ :/' >> "$depfile" - rm -f "$tmpdepfile" - ;; - -@@ -309,9 +439,8 @@ hp2) - # 'foo.d', which lands next to the object file, wherever that - # happens to be. - # Much of this is similar to the tru64 case; see comments there. -- dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` -- test "x$dir" = "x$object" && dir= -- base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` -+ set_dir_from "$object" -+ set_base_from "$object" - if test "$libtool" = yes; then - tmpdepfile1=$dir$base.d - tmpdepfile2=$dir.libs/$base.d -@@ -322,8 +451,7 @@ hp2) - "$@" +Maked - fi - stat=$? -- if test $stat -eq 0; then : -- else -+ if test $stat -ne 0; then - rm -f "$tmpdepfile1" "$tmpdepfile2" - exit $stat - fi -@@ -333,77 +461,107 @@ hp2) - test -f "$tmpdepfile" && break - done - if test -f "$tmpdepfile"; then -- sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile" -- # Add `dependent.h:' lines. -+ sed -e "s,^.*\.[$lower]*:,$object:," "$tmpdepfile" > "$depfile" -+ # Add 'dependent.h:' lines. - sed -ne '2,${ -- s/^ *// -- s/ \\*$// -- s/$/:/ -- p -- }' "$tmpdepfile" >> "$depfile" -+ s/^ *// -+ s/ \\*$// -+ s/$/:/ -+ p -+ }' "$tmpdepfile" >> "$depfile" - else -- echo "#dummy" > "$depfile" -+ make_dummy_depfile - fi - rm -f "$tmpdepfile" "$tmpdepfile2" - ;; - - tru64) -- # The Tru64 compiler uses -MD to generate dependencies as a side -- # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'. -- # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put -- # dependencies in `foo.d' instead, so we check for that too. -- # Subdirectories are respected. -- dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` -- test "x$dir" = "x$object" && dir= -- base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` -- -- if test "$libtool" = yes; then -- # With Tru64 cc, shared objects can also be used to make a -- # static library. This mechanism is used in libtool 1.4 series to -- # handle both shared and static libraries in a single compilation. -- # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d. -- # -- # With libtool 1.5 this exception was removed, and libtool now -- # generates 2 separate objects for the 2 libraries. These two -- # compilations output dependencies in $dir.libs/$base.o.d and -- # in $dir$base.o.d. We have to check for both files, because -- # one of the two compilations can be disabled. We should prefer -- # $dir$base.o.d over $dir.libs/$base.o.d because the latter is -- # automatically cleaned when .libs/ is deleted, while ignoring -- # the former would cause a distcleancheck panic. -- tmpdepfile1=$dir.libs/$base.lo.d # libtool 1.4 -- tmpdepfile2=$dir$base.o.d # libtool 1.5 -- tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5 -- tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504 -- "$@" -Wc,-MD -- else -- tmpdepfile1=$dir$base.o.d -- tmpdepfile2=$dir$base.d -- tmpdepfile3=$dir$base.d -- tmpdepfile4=$dir$base.d -- "$@" -MD -- fi -- -- stat=$? -- if test $stat -eq 0; then : -- else -- rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" -- exit $stat -- fi -- -- for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" -- do -- test -f "$tmpdepfile" && break -- done -- if test -f "$tmpdepfile"; then -- sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" -- # That's a tab and a space in the []. -- sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" -- else -- echo "#dummy" > "$depfile" -- fi -- rm -f "$tmpdepfile" -- ;; -+ # The Tru64 compiler uses -MD to generate dependencies as a side -+ # effect. 'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'. -+ # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put -+ # dependencies in 'foo.d' instead, so we check for that too. -+ # Subdirectories are respected. -+ set_dir_from "$object" -+ set_base_from "$object" -+ -+ if test "$libtool" = yes; then -+ # Libtool generates 2 separate objects for the 2 libraries. These -+ # two compilations output dependencies in $dir.libs/$base.o.d and -+ # in $dir$base.o.d. We have to check for both files, because -+ # one of the two compilations can be disabled. We should prefer -+ # $dir$base.o.d over $dir.libs/$base.o.d because the latter is -+ # automatically cleaned when .libs/ is deleted, while ignoring -+ # the former would cause a distcleancheck panic. -+ tmpdepfile1=$dir$base.o.d # libtool 1.5 -+ tmpdepfile2=$dir.libs/$base.o.d # Likewise. -+ tmpdepfile3=$dir.libs/$base.d # Compaq CCC V6.2-504 -+ "$@" -Wc,-MD -+ else -+ tmpdepfile1=$dir$base.d -+ tmpdepfile2=$dir$base.d -+ tmpdepfile3=$dir$base.d -+ "$@" -MD -+ fi -+ -+ stat=$? -+ if test $stat -ne 0; then -+ rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" -+ exit $stat -+ fi -+ -+ for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" -+ do -+ test -f "$tmpdepfile" && break -+ done -+ # Same post-processing that is required for AIX mode. -+ aix_post_process_depfile -+ ;; -+ -+msvc7) -+ if test "$libtool" = yes; then -+ showIncludes=-Wc,-showIncludes -+ else -+ showIncludes=-showIncludes -+ fi -+ "$@" $showIncludes > "$tmpdepfile" -+ stat=$? -+ grep -v '^Note: including file: ' "$tmpdepfile" -+ if test $stat -ne 0; then -+ rm -f "$tmpdepfile" -+ exit $stat -+ fi -+ rm -f "$depfile" -+ echo "$object : \\" > "$depfile" -+ # The first sed program below extracts the file names and escapes -+ # backslashes for cygpath. The second sed program outputs the file -+ # name when reading, but also accumulates all include files in the -+ # hold buffer in order to output them again at the end. This only -+ # works with sed implementations that can handle large buffers. -+ sed < "$tmpdepfile" -n ' -+/^Note: including file: *\(.*\)/ { -+ s//\1/ -+ s/\\/\\\\/g -+ p -+}' | $cygpath_u | sort -u | sed -n ' -+s/ /\\ /g -+s/\(.*\)/'"$tab"'\1 \\/p -+s/.\(.*\) \\/\1:/ -+H -+$ { -+ s/.*/'"$tab"'/ -+ G -+ p -+}' >> "$depfile" -+ echo >> "$depfile" # make sure the fragment doesn't end with a backslash -+ rm -f "$tmpdepfile" -+ ;; -+ -+msvc7msys) -+ # This case exists only to let depend.m4 do its work. It works by -+ # looking at the text of this script. This case will never be run, -+ # since it is checked for above. -+ exit 1 -+ ;; - - #nosideeffect) - # This comment above is used by automake to tell side-effect -@@ -422,7 +580,7 @@ dashmstdout) - shift - fi - -- # Remove `-o $object'. -+ # Remove '-o $object'. - IFS=" " - for arg - do -@@ -442,18 +600,18 @@ dashmstdout) - done - - test -z "$dashmflag" && dashmflag=-M -- # Require at least two characters before searching for `:' -+ # Require at least two characters before searching for ':' - # in the target name. This is to cope with DOS-style filenames: -- # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise. -+ # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise. - "$@" $dashmflag | -- sed 's:^[ ]*[^: ][^:][^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile" -+ sed "s|^[$tab ]*[^:$tab ][^:][^:]*:[$tab ]*|$object: |" > "$tmpdepfile" - rm -f "$depfile" - cat < "$tmpdepfile" > "$depfile" -- tr ' ' ' --' < "$tmpdepfile" | \ --## Some versions of the HPUX 10.20 sed can't process this invocation --## correctly. Breaking it into two sed invocations is a workaround. -- sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" -+ # Some versions of the HPUX 10.20 sed can't process this sed invocation -+ # correctly. Breaking it into two sed invocations is a workaround. -+ tr ' ' "$nl" < "$tmpdepfile" \ -+ | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \ -+ | sed -e 's/$/ :/' >> "$depfile" - rm -f "$tmpdepfile" - ;; - -@@ -503,12 +661,15 @@ makedepend) - touch "$tmpdepfile" - ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@" - rm -f "$depfile" -- cat < "$tmpdepfile" > "$depfile" -- sed '1,2d' "$tmpdepfile" | tr ' ' ' --' | \ --## Some versions of the HPUX 10.20 sed can't process this invocation --## correctly. Breaking it into two sed invocations is a workaround. -- sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" -+ # makedepend may prepend the VPATH from the source file name to the object. -+ # No need to regex-escape $object, excess matching of '.' is harmless. -+ sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile" -+ # Some versions of the HPUX 10.20 sed can't process the last invocation -+ # correctly. Breaking it into two sed invocations is a workaround. -+ sed '1,2d' "$tmpdepfile" \ -+ | tr ' ' "$nl" \ -+ | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \ -+ | sed -e 's/$/ :/' >> "$depfile" - rm -f "$tmpdepfile" "$tmpdepfile".bak - ;; - -@@ -525,7 +686,7 @@ cpp) - shift - fi - -- # Remove `-o $object'. -+ # Remove '-o $object'. - IFS=" " - for arg - do -@@ -544,10 +705,10 @@ cpp) - esac - done - -- "$@" -E | -- sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ -- -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' | -- sed '$ s: \\$::' > "$tmpdepfile" -+ "$@" -E \ -+ | sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ -+ -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ -+ | sed '$ s: \\$::' > "$tmpdepfile" - rm -f "$depfile" - echo "$object : \\" > "$depfile" - cat < "$tmpdepfile" >> "$depfile" -@@ -579,23 +740,23 @@ msvisualcpp) - shift - ;; - "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI") -- set fnord "$@" -- shift -- shift -- ;; -+ set fnord "$@" -+ shift -+ shift -+ ;; - *) -- set fnord "$@" "$arg" -- shift -- shift -- ;; -+ set fnord "$@" "$arg" -+ shift -+ shift -+ ;; - esac - done - "$@" -E 2>/dev/null | - sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile" - rm -f "$depfile" - echo "$object : \\" > "$depfile" -- sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile" -- echo " " >> "$depfile" -+ sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::'"$tab"'\1 \\:p' >> "$depfile" -+ echo "$tab" >> "$depfile" - sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile" - rm -f "$tmpdepfile" - ;; -diff --git a/install-sh b/install-sh -index 6781b98..377bb86 100755 ---- a/install-sh -+++ b/install-sh -@@ -1,7 +1,7 @@ - #!/bin/sh - # install - install a program, script, or datafile - --scriptversion=2009-04-28.21; # UTC -+scriptversion=2011-11-20.07; # UTC - - # This originates from X11R5 (mit/util/scripts/install.sh), which was - # later released in X11R6 (xc/config/util/install.sh) with the -@@ -35,7 +35,7 @@ scriptversion=2009-04-28.21; # UTC - # FSF changes to this file are in the public domain. - # - # Calling this script install-sh is preferred over install.sh, to prevent --# `make' implicit rules from creating a file called install from it -+# 'make' implicit rules from creating a file called install from it - # when there is no Makefile. - # - # This script is compatible with the BSD install script, but was written -@@ -156,6 +156,10 @@ while test $# -ne 0; do - -s) stripcmd=$stripprog;; - - -t) dst_arg=$2 -+ # Protect names problematic for 'test' and other utilities. -+ case $dst_arg in -+ -* | [=\(\)!]) dst_arg=./$dst_arg;; -+ esac - shift;; - - -T) no_target_directory=true;; -@@ -186,6 +190,10 @@ if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then - fi - shift # arg - dst_arg=$arg -+ # Protect names problematic for 'test' and other utilities. -+ case $dst_arg in -+ -* | [=\(\)!]) dst_arg=./$dst_arg;; -+ esac - done - fi - -@@ -194,13 +202,17 @@ if test $# -eq 0; then - echo "$0: no input file specified." >&2 - exit 1 - fi -- # It's OK to call `install-sh -d' without argument. -+ # It's OK to call 'install-sh -d' without argument. - # This can happen when creating conditional directories. - exit 0 - fi - - if test -z "$dir_arg"; then -- trap '(exit $?); exit' 1 2 13 15 -+ do_exit='(exit $ret); exit $ret' -+ trap "ret=129; $do_exit" 1 -+ trap "ret=130; $do_exit" 2 -+ trap "ret=141; $do_exit" 13 -+ trap "ret=143; $do_exit" 15 - - # Set umask so as not to create temps with too-generous modes. - # However, 'strip' requires both read and write access to temps. -@@ -228,9 +240,9 @@ fi - - for src - do -- # Protect names starting with `-'. -+ # Protect names problematic for 'test' and other utilities. - case $src in -- -*) src=./$src;; -+ -* | [=\(\)!]) src=./$src;; - esac - - if test -n "$dir_arg"; then -@@ -252,12 +264,7 @@ do - echo "$0: no destination specified." >&2 - exit 1 - fi -- - dst=$dst_arg -- # Protect names starting with `-'. -- case $dst in -- -*) dst=./$dst;; -- esac - - # If destination is a directory, append the input filename; won't work - # if double slashes aren't ignored. -@@ -347,7 +354,7 @@ do - if test -z "$dir_arg" || { - # Check for POSIX incompatibilities with -m. - # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or -- # other-writeable bit of parent directory when it shouldn't. -+ # other-writable bit of parent directory when it shouldn't. - # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. - ls_ld_tmpdir=`ls -ld "$tmpdir"` - case $ls_ld_tmpdir in -@@ -385,7 +392,7 @@ do - - case $dstdir in - /*) prefix='/';; -- -*) prefix='./';; -+ [-=\(\)!]*) prefix='./';; - *) prefix='';; - esac - -@@ -403,7 +410,7 @@ do - - for d - do -- test -z "$d" && continue -+ test X"$d" = X && continue - - prefix=$prefix$d - if test -d "$prefix"; then -diff --git a/ltmain.sh b/ltmain.sh -old mode 100755 -new mode 100644 -index a72f2fd..68c6d96 ---- a/ltmain.sh -+++ b/ltmain.sh -@@ -1,9 +1,9 @@ --# Generated from ltmain.m4sh. - --# ltmain.sh (GNU libtool) 2.2.6b -+# libtool (GNU libtool) 2.4.2 - # Written by Gordon Matzigkeit , 1996 - --# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc. -+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, -+# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. - # This is free software; see the source for copying conditions. There is NO - # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -@@ -32,50 +32,57 @@ - # - # Provide generalized library-building support services. - # --# --config show all configuration variables --# --debug enable verbose shell tracing --# -n, --dry-run display commands without modifying any files --# --features display basic configuration information and exit --# --mode=MODE use operation mode MODE --# --preserve-dup-deps don't remove duplicate dependency libraries --# --quiet, --silent don't print informational messages --# --tag=TAG use configuration variables from tag TAG --# -v, --verbose print informational messages (default) --# --version print version information --# -h, --help print short or long help message -+# --config show all configuration variables -+# --debug enable verbose shell tracing -+# -n, --dry-run display commands without modifying any files -+# --features display basic configuration information and exit -+# --mode=MODE use operation mode MODE -+# --preserve-dup-deps don't remove duplicate dependency libraries -+# --quiet, --silent don't print informational messages -+# --no-quiet, --no-silent -+# print informational messages (default) -+# --no-warn don't display warning messages -+# --tag=TAG use configuration variables from tag TAG -+# -v, --verbose print more informational messages than default -+# --no-verbose don't print the extra informational messages -+# --version print version information -+# -h, --help, --help-all print short, long, or detailed help message - # - # MODE must be one of the following: - # --# clean remove files from the build directory --# compile compile a source file into a libtool object --# execute automatically set library path, then run a program --# finish complete the installation of libtool libraries --# install install libraries or executables --# link create a library or an executable --# uninstall remove libraries from an installed directory -+# clean remove files from the build directory -+# compile compile a source file into a libtool object -+# execute automatically set library path, then run a program -+# finish complete the installation of libtool libraries -+# install install libraries or executables -+# link create a library or an executable -+# uninstall remove libraries from an installed directory - # --# MODE-ARGS vary depending on the MODE. -+# MODE-ARGS vary depending on the MODE. When passed as first option, -+# `--mode=MODE' may be abbreviated as `MODE' or a unique abbreviation of that. - # Try `$progname --help --mode=MODE' for a more detailed description of MODE. - # - # When reporting a bug, please describe a test case to reproduce it and - # include the following information: - # --# host-triplet: $host --# shell: $SHELL --# compiler: $LTCC --# compiler flags: $LTCFLAGS --# linker: $LD (gnu? $with_gnu_ld) --# $progname: (GNU libtool) 2.2.6b --# automake: $automake_version --# autoconf: $autoconf_version -+# host-triplet: $host -+# shell: $SHELL -+# compiler: $LTCC -+# compiler flags: $LTCFLAGS -+# linker: $LD (gnu? $with_gnu_ld) -+# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1.3 -+# automake: $automake_version -+# autoconf: $autoconf_version - # - # Report bugs to . -+# GNU libtool home page: . -+# General help using GNU software: . - --PROGRAM=ltmain.sh -+PROGRAM=libtool - PACKAGE=libtool --VERSION=2.2.6b -+VERSION="2.4.2 Debian-2.4.2-1.3" - TIMESTAMP="" --package_revision=1.3017 -+package_revision=1.3337 - - # Be Bourne compatible - if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then -@@ -91,10 +98,15 @@ fi - BIN_SH=xpg4; export BIN_SH # for Tru64 - DUALCASE=1; export DUALCASE # for MKS sh - -+# A function that is used when there is no print builtin or printf. -+func_fallback_echo () -+{ -+ eval 'cat <<_LTECHO_EOF -+$1 -+_LTECHO_EOF' -+} -+ - # NLS nuisances: We save the old values to restore during execute mode. --# Only set LANG and LC_ALL to C if already set. --# These must not be set unconditionally because not all systems understand --# e.g. LANG=C (notably SCO). - lt_user_locale= - lt_safe_locale= - for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES -@@ -107,24 +119,28 @@ do - lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\" - fi" - done -+LC_ALL=C -+LANGUAGE=C -+export LANGUAGE LC_ALL - - $lt_unset CDPATH - - -+# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh -+# is ksh but when the shell is invoked as "sh" and the current value of -+# the _XPG environment variable is not equal to 1 (one), the special -+# positional parameter $0, within a function call, is the name of the -+# function. -+progpath="$0" - - - - : ${CP="cp -f"} --: ${ECHO="echo"} --: ${EGREP="/bin/grep -E"} --: ${FGREP="/bin/grep -F"} --: ${GREP="/bin/grep"} --: ${LN_S="ln -s"} -+test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'} - : ${MAKE="make"} - : ${MKDIR="mkdir"} - : ${MV="mv -f"} - : ${RM="rm -f"} --: ${SED="/bin/sed"} - : ${SHELL="${CONFIG_SHELL-/bin/sh}"} - : ${Xsed="$SED -e 1s/^X//"} - -@@ -144,6 +160,27 @@ IFS=" $lt_nl" - dirname="s,/[^/]*$,," - basename="s,^.*/,," - -+# func_dirname file append nondir_replacement -+# Compute the dirname of FILE. If nonempty, add APPEND to the result, -+# otherwise set result to NONDIR_REPLACEMENT. -+func_dirname () -+{ -+ func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` -+ if test "X$func_dirname_result" = "X${1}"; then -+ func_dirname_result="${3}" -+ else -+ func_dirname_result="$func_dirname_result${2}" -+ fi -+} # func_dirname may be replaced by extended shell implementation -+ -+ -+# func_basename file -+func_basename () -+{ -+ func_basename_result=`$ECHO "${1}" | $SED "$basename"` -+} # func_basename may be replaced by extended shell implementation -+ -+ - # func_dirname_and_basename file append nondir_replacement - # perform func_basename and func_dirname in a single function - # call: -@@ -158,33 +195,183 @@ basename="s,^.*/,," - # those functions but instead duplicate the functionality here. - func_dirname_and_basename () - { -- # Extract subdirectory from the argument. -- func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"` -- if test "X$func_dirname_result" = "X${1}"; then -- func_dirname_result="${3}" -- else -- func_dirname_result="$func_dirname_result${2}" -- fi -- func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"` -+ # Extract subdirectory from the argument. -+ func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"` -+ if test "X$func_dirname_result" = "X${1}"; then -+ func_dirname_result="${3}" -+ else -+ func_dirname_result="$func_dirname_result${2}" -+ fi -+ func_basename_result=`$ECHO "${1}" | $SED -e "$basename"` -+} # func_dirname_and_basename may be replaced by extended shell implementation -+ -+ -+# func_stripname prefix suffix name -+# strip PREFIX and SUFFIX off of NAME. -+# PREFIX and SUFFIX must not contain globbing or regex special -+# characters, hashes, percent signs, but SUFFIX may contain a leading -+# dot (in which case that matches only a dot). -+# func_strip_suffix prefix name -+func_stripname () -+{ -+ case ${2} in -+ .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; -+ *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; -+ esac -+} # func_stripname may be replaced by extended shell implementation -+ -+ -+# These SED scripts presuppose an absolute path with a trailing slash. -+pathcar='s,^/\([^/]*\).*$,\1,' -+pathcdr='s,^/[^/]*,,' -+removedotparts=':dotsl -+ s@/\./@/@g -+ t dotsl -+ s,/\.$,/,' -+collapseslashes='s@/\{1,\}@/@g' -+finalslash='s,/*$,/,' -+ -+# func_normal_abspath PATH -+# Remove doubled-up and trailing slashes, "." path components, -+# and cancel out any ".." path components in PATH after making -+# it an absolute path. -+# value returned in "$func_normal_abspath_result" -+func_normal_abspath () -+{ -+ # Start from root dir and reassemble the path. -+ func_normal_abspath_result= -+ func_normal_abspath_tpath=$1 -+ func_normal_abspath_altnamespace= -+ case $func_normal_abspath_tpath in -+ "") -+ # Empty path, that just means $cwd. -+ func_stripname '' '/' "`pwd`" -+ func_normal_abspath_result=$func_stripname_result -+ return -+ ;; -+ # The next three entries are used to spot a run of precisely -+ # two leading slashes without using negated character classes; -+ # we take advantage of case's first-match behaviour. -+ ///*) -+ # Unusual form of absolute path, do nothing. -+ ;; -+ //*) -+ # Not necessarily an ordinary path; POSIX reserves leading '//' -+ # and for example Cygwin uses it to access remote file shares -+ # over CIFS/SMB, so we conserve a leading double slash if found. -+ func_normal_abspath_altnamespace=/ -+ ;; -+ /*) -+ # Absolute path, do nothing. -+ ;; -+ *) -+ # Relative path, prepend $cwd. -+ func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath -+ ;; -+ esac -+ # Cancel out all the simple stuff to save iterations. We also want -+ # the path to end with a slash for ease of parsing, so make sure -+ # there is one (and only one) here. -+ func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ -+ -e "$removedotparts" -e "$collapseslashes" -e "$finalslash"` -+ while :; do -+ # Processed it all yet? -+ if test "$func_normal_abspath_tpath" = / ; then -+ # If we ascended to the root using ".." the result may be empty now. -+ if test -z "$func_normal_abspath_result" ; then -+ func_normal_abspath_result=/ -+ fi -+ break -+ fi -+ func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \ -+ -e "$pathcar"` -+ func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ -+ -e "$pathcdr"` -+ # Figure out what to do with it -+ case $func_normal_abspath_tcomponent in -+ "") -+ # Trailing empty path component, ignore it. -+ ;; -+ ..) -+ # Parent dir; strip last assembled component from result. -+ func_dirname "$func_normal_abspath_result" -+ func_normal_abspath_result=$func_dirname_result -+ ;; -+ *) -+ # Actual path component, append it. -+ func_normal_abspath_result=$func_normal_abspath_result/$func_normal_abspath_tcomponent -+ ;; -+ esac -+ done -+ # Restore leading double-slash if one was found on entry. -+ func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result - } - --# Generated shell functions inserted here. -+# func_relative_path SRCDIR DSTDIR -+# generates a relative path from SRCDIR to DSTDIR, with a trailing -+# slash if non-empty, suitable for immediately appending a filename -+# without needing to append a separator. -+# value returned in "$func_relative_path_result" -+func_relative_path () -+{ -+ func_relative_path_result= -+ func_normal_abspath "$1" -+ func_relative_path_tlibdir=$func_normal_abspath_result -+ func_normal_abspath "$2" -+ func_relative_path_tbindir=$func_normal_abspath_result -+ -+ # Ascend the tree starting from libdir -+ while :; do -+ # check if we have found a prefix of bindir -+ case $func_relative_path_tbindir in -+ $func_relative_path_tlibdir) -+ # found an exact match -+ func_relative_path_tcancelled= -+ break -+ ;; -+ $func_relative_path_tlibdir*) -+ # found a matching prefix -+ func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir" -+ func_relative_path_tcancelled=$func_stripname_result -+ if test -z "$func_relative_path_result"; then -+ func_relative_path_result=. -+ fi -+ break -+ ;; -+ *) -+ func_dirname $func_relative_path_tlibdir -+ func_relative_path_tlibdir=${func_dirname_result} -+ if test "x$func_relative_path_tlibdir" = x ; then -+ # Have to descend all the way to the root! -+ func_relative_path_result=../$func_relative_path_result -+ func_relative_path_tcancelled=$func_relative_path_tbindir -+ break -+ fi -+ func_relative_path_result=../$func_relative_path_result -+ ;; -+ esac -+ done - --# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh --# is ksh but when the shell is invoked as "sh" and the current value of --# the _XPG environment variable is not equal to 1 (one), the special --# positional parameter $0, within a function call, is the name of the --# function. --progpath="$0" -+ # Now calculate path; take care to avoid doubling-up slashes. -+ func_stripname '' '/' "$func_relative_path_result" -+ func_relative_path_result=$func_stripname_result -+ func_stripname '/' '/' "$func_relative_path_tcancelled" -+ if test "x$func_stripname_result" != x ; then -+ func_relative_path_result=${func_relative_path_result}/${func_stripname_result} -+ fi -+ -+ # Normalisation. If bindir is libdir, return empty string, -+ # else relative path ending with a slash; either way, target -+ # file name can be directly appended. -+ if test ! -z "$func_relative_path_result"; then -+ func_stripname './' '' "$func_relative_path_result/" -+ func_relative_path_result=$func_stripname_result -+ fi -+} - - # The name of this program: --# In the unlikely event $progname began with a '-', it would play havoc with --# func_echo (imagine progname=-n), so we prepend ./ in that case: - func_dirname_and_basename "$progpath" - progname=$func_basename_result --case $progname in -- -*) progname=./$progname ;; --esac - - # Make sure we have an absolute path for reexecution: - case $progpath in -@@ -196,7 +383,7 @@ case $progpath in - ;; - *) - save_IFS="$IFS" -- IFS=: -+ IFS=${PATH_SEPARATOR-:} - for progdir in $PATH; do - IFS="$save_IFS" - test -x "$progdir/$progname" && break -@@ -215,6 +402,15 @@ sed_quote_subst='s/\([`"$\\]\)/\\\1/g' - # Same as above, but do not quote variable references. - double_quote_subst='s/\(["`\\]\)/\\\1/g' - -+# Sed substitution that turns a string into a regex matching for the -+# string literally. -+sed_make_literal_regex='s,[].[^$\\*\/],\\&,g' -+ -+# Sed substitution that converts a w32 file name or path -+# which contains forward slashes, into one that contains -+# (escaped) backslashes. A very naive implementation. -+lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' -+ - # Re-`\' parameter expansions in output of double_quote_subst that were - # `\'-ed in input to the same. If an odd number of `\' preceded a '$' - # in input to double_quote_subst, that '$' was protected from expansion. -@@ -243,7 +439,7 @@ opt_warning=: - # name if it has been set yet. - func_echo () - { -- $ECHO "$progname${mode+: }$mode: $*" -+ $ECHO "$progname: ${opt_mode+$opt_mode: }$*" - } - - # func_verbose arg... -@@ -258,18 +454,25 @@ func_verbose () - : - } - -+# func_echo_all arg... -+# Invoke $ECHO with all args, space-separated. -+func_echo_all () -+{ -+ $ECHO "$*" -+} -+ - # func_error arg... - # Echo program name prefixed message to standard error. - func_error () - { -- $ECHO "$progname${mode+: }$mode: "${1+"$@"} 1>&2 -+ $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2 - } - - # func_warning arg... - # Echo program name prefixed warning message to standard error. - func_warning () - { -- $opt_warning && $ECHO "$progname${mode+: }$mode: warning: "${1+"$@"} 1>&2 -+ $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2 - - # bash bug again: - : -@@ -326,9 +529,9 @@ func_mkdir_p () - case $my_directory_path in */*) ;; *) break ;; esac - - # ...otherwise throw away the child directory and loop -- my_directory_path=`$ECHO "X$my_directory_path" | $Xsed -e "$dirname"` -+ my_directory_path=`$ECHO "$my_directory_path" | $SED -e "$dirname"` - done -- my_dir_list=`$ECHO "X$my_dir_list" | $Xsed -e 's,:*$,,'` -+ my_dir_list=`$ECHO "$my_dir_list" | $SED 's,:*$,,'` - - save_mkdir_p_IFS="$IFS"; IFS=':' - for my_dir in $my_dir_list; do -@@ -378,7 +581,7 @@ func_mktempdir () - func_fatal_error "cannot create temporary directory \`$my_tmpdir'" - fi - -- $ECHO "X$my_tmpdir" | $Xsed -+ $ECHO "$my_tmpdir" - } - - -@@ -392,7 +595,7 @@ func_quote_for_eval () - { - case $1 in - *[\\\`\"\$]*) -- func_quote_for_eval_unquoted_result=`$ECHO "X$1" | $Xsed -e "$sed_quote_subst"` ;; -+ func_quote_for_eval_unquoted_result=`$ECHO "$1" | $SED "$sed_quote_subst"` ;; - *) - func_quote_for_eval_unquoted_result="$1" ;; - esac -@@ -419,7 +622,7 @@ func_quote_for_expand () - { - case $1 in - *[\\\`\"]*) -- my_arg=`$ECHO "X$1" | $Xsed \ -+ my_arg=`$ECHO "$1" | $SED \ - -e "$double_quote_subst" -e "$sed_double_backslash"` ;; - *) - my_arg="$1" ;; -@@ -488,15 +691,39 @@ func_show_eval_locale () - fi - } - -- -- -+# func_tr_sh -+# Turn $1 into a string suitable for a shell variable name. -+# Result is stored in $func_tr_sh_result. All characters -+# not in the set a-zA-Z0-9_ are replaced with '_'. Further, -+# if $1 begins with a digit, a '_' is prepended as well. -+func_tr_sh () -+{ -+ case $1 in -+ [0-9]* | *[!a-zA-Z0-9_]*) -+ func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'` -+ ;; -+ * ) -+ func_tr_sh_result=$1 -+ ;; -+ esac -+} - - - # func_version - # Echo version message to standard output and exit. - func_version () - { -- $SED -n '/^# '$PROGRAM' (GNU /,/# warranty; / { -+ $opt_debug -+ -+ $SED -n '/(C)/!b go -+ :more -+ /\./!{ -+ N -+ s/\n# / / -+ b more -+ } -+ :go -+ /^# '$PROGRAM' (GNU /,/# warranty; / { - s/^# // - s/^# *$// - s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/ -@@ -509,22 +736,28 @@ func_version () - # Echo short help message to standard output and exit. - func_usage () - { -- $SED -n '/^# Usage:/,/# -h/ { -+ $opt_debug -+ -+ $SED -n '/^# Usage:/,/^# *.*--help/ { - s/^# // - s/^# *$// - s/\$progname/'$progname'/ - p - }' < "$progpath" -- $ECHO -+ echo - $ECHO "run \`$progname --help | more' for full usage" - exit $? - } - --# func_help --# Echo long help message to standard output and exit. -+# func_help [NOEXIT] -+# Echo long help message to standard output and exit, -+# unless 'noexit' is passed as argument. - func_help () - { -+ $opt_debug -+ - $SED -n '/^# Usage:/,/# Report bugs to/ { -+ :print - s/^# // - s/^# *$// - s*\$progname*'$progname'* -@@ -534,11 +767,18 @@ func_help () - s*\$LTCFLAGS*'"$LTCFLAGS"'* - s*\$LD*'"$LD"'* - s/\$with_gnu_ld/'"$with_gnu_ld"'/ -- s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/ -- s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/ -+ s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/ -+ s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/ - p -- }' < "$progpath" -- exit $? -+ d -+ } -+ /^# .* home page:/b print -+ /^# General help using/b print -+ ' < "$progpath" -+ ret=$? -+ if test -z "$1"; then -+ exit $ret -+ fi - } - - # func_missing_arg argname -@@ -546,63 +786,106 @@ func_help () - # exit_cmd. - func_missing_arg () - { -- func_error "missing argument for $1" -+ $opt_debug -+ -+ func_error "missing argument for $1." - exit_cmd=exit - } - --exit_cmd=: - -+# func_split_short_opt shortopt -+# Set func_split_short_opt_name and func_split_short_opt_arg shell -+# variables after splitting SHORTOPT after the 2nd character. -+func_split_short_opt () -+{ -+ my_sed_short_opt='1s/^\(..\).*$/\1/;q' -+ my_sed_short_rest='1s/^..\(.*\)$/\1/;q' -+ -+ func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"` -+ func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"` -+} # func_split_short_opt may be replaced by extended shell implementation - - -+# func_split_long_opt longopt -+# Set func_split_long_opt_name and func_split_long_opt_arg shell -+# variables after splitting LONGOPT at the `=' sign. -+func_split_long_opt () -+{ -+ my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q' -+ my_sed_long_arg='1s/^--[^=]*=//' -+ -+ func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"` -+ func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"` -+} # func_split_long_opt may be replaced by extended shell implementation -+ -+exit_cmd=: -+ - - --# Check that we have a working $ECHO. --if test "X$1" = X--no-reexec; then -- # Discard the --no-reexec flag, and continue. -- shift --elif test "X$1" = X--fallback-echo; then -- # Avoid inline document here, it may be left over -- : --elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t'; then -- # Yippee, $ECHO works! -- : --else -- # Restart under the correct shell, and then maybe $ECHO will work. -- exec $SHELL "$progpath" --no-reexec ${1+"$@"} --fi - --if test "X$1" = X--fallback-echo; then -- # used as fallback echo -- shift -- cat </dev/null || echo $max_cmd_len` -+} # func_len may be replaced by extended shell implementation -+ -+ -+# func_lo2o object -+func_lo2o () -+{ -+ func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` -+} # func_lo2o may be replaced by extended shell implementation -+ -+ -+# func_xform libobj-or-source -+func_xform () -+{ -+ func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` -+} # func_xform may be replaced by extended shell implementation -+ -+ - # func_fatal_configuration arg... - # Echo program name prefixed message to standard error, followed by - # a configuration failure hint, and exit. -@@ -636,16 +919,16 @@ func_config () - # Display the features supported by this script. - func_features () - { -- $ECHO "host: $host" -+ echo "host: $host" - if test "$build_libtool_libs" = yes; then -- $ECHO "enable shared libraries" -+ echo "enable shared libraries" - else -- $ECHO "disable shared libraries" -+ echo "disable shared libraries" - fi - if test "$build_old_libs" = yes; then -- $ECHO "enable static libraries" -+ echo "enable static libraries" - else -- $ECHO "disable static libraries" -+ echo "disable static libraries" - fi - - exit $? -@@ -692,117 +975,209 @@ func_enable_tag () - esac - } - --# Parse options once, thoroughly. This comes as soon as possible in --# the script to make things like `libtool --version' happen quickly. -+# func_check_version_match -+# Ensure that we are using m4 macros, and libtool script from the same -+# release of libtool. -+func_check_version_match () - { -+ if test "$package_revision" != "$macro_revision"; then -+ if test "$VERSION" != "$macro_version"; then -+ if test -z "$macro_version"; then -+ cat >&2 <<_LT_EOF -+$progname: Version mismatch error. This is $PACKAGE $VERSION, but the -+$progname: definition of this LT_INIT comes from an older release. -+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION -+$progname: and run autoconf again. -+_LT_EOF -+ else -+ cat >&2 <<_LT_EOF -+$progname: Version mismatch error. This is $PACKAGE $VERSION, but the -+$progname: definition of this LT_INIT comes from $PACKAGE $macro_version. -+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION -+$progname: and run autoconf again. -+_LT_EOF -+ fi -+ else -+ cat >&2 <<_LT_EOF -+$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision, -+$progname: but the definition of this LT_INIT comes from revision $macro_revision. -+$progname: You should recreate aclocal.m4 with macros from revision $package_revision -+$progname: of $PACKAGE $VERSION and run autoconf again. -+_LT_EOF -+ fi -+ -+ exit $EXIT_MISMATCH -+ fi -+} -+ -+ -+# Shorthand for --mode=foo, only valid as the first argument -+case $1 in -+clean|clea|cle|cl) -+ shift; set dummy --mode clean ${1+"$@"}; shift -+ ;; -+compile|compil|compi|comp|com|co|c) -+ shift; set dummy --mode compile ${1+"$@"}; shift -+ ;; -+execute|execut|execu|exec|exe|ex|e) -+ shift; set dummy --mode execute ${1+"$@"}; shift -+ ;; -+finish|finis|fini|fin|fi|f) -+ shift; set dummy --mode finish ${1+"$@"}; shift -+ ;; -+install|instal|insta|inst|ins|in|i) -+ shift; set dummy --mode install ${1+"$@"}; shift -+ ;; -+link|lin|li|l) -+ shift; set dummy --mode link ${1+"$@"}; shift -+ ;; -+uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) -+ shift; set dummy --mode uninstall ${1+"$@"}; shift -+ ;; -+esac - -- # Shorthand for --mode=foo, only valid as the first argument -- case $1 in -- clean|clea|cle|cl) -- shift; set dummy --mode clean ${1+"$@"}; shift -- ;; -- compile|compil|compi|comp|com|co|c) -- shift; set dummy --mode compile ${1+"$@"}; shift -- ;; -- execute|execut|execu|exec|exe|ex|e) -- shift; set dummy --mode execute ${1+"$@"}; shift -- ;; -- finish|finis|fini|fin|fi|f) -- shift; set dummy --mode finish ${1+"$@"}; shift -- ;; -- install|instal|insta|inst|ins|in|i) -- shift; set dummy --mode install ${1+"$@"}; shift -- ;; -- link|lin|li|l) -- shift; set dummy --mode link ${1+"$@"}; shift -- ;; -- uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) -- shift; set dummy --mode uninstall ${1+"$@"}; shift -- ;; -- esac - -- # Parse non-mode specific arguments: -- while test "$#" -gt 0; do -+ -+# Option defaults: -+opt_debug=: -+opt_dry_run=false -+opt_config=false -+opt_preserve_dup_deps=false -+opt_features=false -+opt_finish=false -+opt_help=false -+opt_help_all=false -+opt_silent=: -+opt_warning=: -+opt_verbose=: -+opt_silent=false -+opt_verbose=false -+ -+ -+# Parse options once, thoroughly. This comes as soon as possible in the -+# script to make things like `--version' happen as quickly as we can. -+{ -+ # this just eases exit handling -+ while test $# -gt 0; do - opt="$1" - shift -- - case $opt in -- --config) func_config ;; -- -- --debug) preserve_args="$preserve_args $opt" -+ --debug|-x) opt_debug='set -x' - func_echo "enabling shell trace mode" -- opt_debug='set -x' - $opt_debug - ;; -- -- -dlopen) test "$#" -eq 0 && func_missing_arg "$opt" && break -- execute_dlfiles="$execute_dlfiles $1" -- shift -+ --dry-run|--dryrun|-n) -+ opt_dry_run=: - ;; -- -- --dry-run | -n) opt_dry_run=: ;; -- --features) func_features ;; -- --finish) mode="finish" ;; -- -- --mode) test "$#" -eq 0 && func_missing_arg "$opt" && break -- case $1 in -- # Valid mode arguments: -- clean) ;; -- compile) ;; -- execute) ;; -- finish) ;; -- install) ;; -- link) ;; -- relink) ;; -- uninstall) ;; -- -- # Catch anything else as an error -- *) func_error "invalid argument for $opt" -- exit_cmd=exit -- break -- ;; -- esac -- -- mode="$1" -+ --config) -+ opt_config=: -+func_config -+ ;; -+ --dlopen|-dlopen) -+ optarg="$1" -+ opt_dlopen="${opt_dlopen+$opt_dlopen -+}$optarg" - shift - ;; -- - --preserve-dup-deps) -- opt_duplicate_deps=: ;; -- -- --quiet|--silent) preserve_args="$preserve_args $opt" -- opt_silent=: -+ opt_preserve_dup_deps=: - ;; -- -- --verbose| -v) preserve_args="$preserve_args $opt" -+ --features) -+ opt_features=: -+func_features -+ ;; -+ --finish) -+ opt_finish=: -+set dummy --mode finish ${1+"$@"}; shift -+ ;; -+ --help) -+ opt_help=: -+ ;; -+ --help-all) -+ opt_help_all=: -+opt_help=': help-all' -+ ;; -+ --mode) -+ test $# = 0 && func_missing_arg $opt && break -+ optarg="$1" -+ opt_mode="$optarg" -+case $optarg in -+ # Valid mode arguments: -+ clean|compile|execute|finish|install|link|relink|uninstall) ;; -+ -+ # Catch anything else as an error -+ *) func_error "invalid argument for $opt" -+ exit_cmd=exit -+ break -+ ;; -+esac -+ shift -+ ;; -+ --no-silent|--no-quiet) - opt_silent=false -+func_append preserve_args " $opt" - ;; -- -- --tag) test "$#" -eq 0 && func_missing_arg "$opt" && break -- preserve_args="$preserve_args $opt $1" -- func_enable_tag "$1" # tagname is set here -+ --no-warning|--no-warn) -+ opt_warning=false -+func_append preserve_args " $opt" -+ ;; -+ --no-verbose) -+ opt_verbose=false -+func_append preserve_args " $opt" -+ ;; -+ --silent|--quiet) -+ opt_silent=: -+func_append preserve_args " $opt" -+ opt_verbose=false -+ ;; -+ --verbose|-v) -+ opt_verbose=: -+func_append preserve_args " $opt" -+opt_silent=false -+ ;; -+ --tag) -+ test $# = 0 && func_missing_arg $opt && break -+ optarg="$1" -+ opt_tag="$optarg" -+func_append preserve_args " $opt $optarg" -+func_enable_tag "$optarg" - shift - ;; - -+ -\?|-h) func_usage ;; -+ --help) func_help ;; -+ --version) func_version ;; -+ - # Separate optargs to long options: -- -dlopen=*|--mode=*|--tag=*) -- func_opt_split "$opt" -- set dummy "$func_opt_split_opt" "$func_opt_split_arg" ${1+"$@"} -+ --*=*) -+ func_split_long_opt "$opt" -+ set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"} - shift - ;; - -- -\?|-h) func_usage ;; -- --help) opt_help=: ;; -- --version) func_version ;; -- -- -*) func_fatal_help "unrecognized option \`$opt'" ;; -- -- *) nonopt="$opt" -- break -+ # Separate non-argument short options: -+ -\?*|-h*|-n*|-v*) -+ func_split_short_opt "$opt" -+ set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"} -+ shift - ;; -+ -+ --) break ;; -+ -*) func_fatal_help "unrecognized option \`$opt'" ;; -+ *) set dummy "$opt" ${1+"$@"}; shift; break ;; - esac - done - -+ # Validate options: -+ -+ # save first non-option argument -+ if test "$#" -gt 0; then -+ nonopt="$opt" -+ shift -+ fi -+ -+ # preserve --debug -+ test "$opt_debug" = : || func_append preserve_args " --debug" - - case $host in - *cygwin* | *mingw* | *pw32* | *cegcc*) -@@ -810,82 +1185,44 @@ func_enable_tag () - opt_duplicate_compiler_generated_deps=: - ;; - *) -- opt_duplicate_compiler_generated_deps=$opt_duplicate_deps -+ opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps - ;; - esac - -- # Having warned about all mis-specified options, bail out if -- # anything was wrong. -- $exit_cmd $EXIT_FAILURE --} -+ $opt_help || { -+ # Sanity checks first: -+ func_check_version_match - --# func_check_version_match --# Ensure that we are using m4 macros, and libtool script from the same --# release of libtool. --func_check_version_match () --{ -- if test "$package_revision" != "$macro_revision"; then -- if test "$VERSION" != "$macro_version"; then -- if test -z "$macro_version"; then -- cat >&2 <<_LT_EOF --$progname: Version mismatch error. This is $PACKAGE $VERSION, but the --$progname: definition of this LT_INIT comes from an older release. --$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION --$progname: and run autoconf again. --_LT_EOF -- else -- cat >&2 <<_LT_EOF --$progname: Version mismatch error. This is $PACKAGE $VERSION, but the --$progname: definition of this LT_INIT comes from $PACKAGE $macro_version. --$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION --$progname: and run autoconf again. --_LT_EOF -- fi -- else -- cat >&2 <<_LT_EOF --$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision, --$progname: but the definition of this LT_INIT comes from revision $macro_revision. --$progname: You should recreate aclocal.m4 with macros from revision $package_revision --$progname: of $PACKAGE $VERSION and run autoconf again. --_LT_EOF -+ if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then -+ func_fatal_configuration "not configured to build any kind of library" - fi - -- exit $EXIT_MISMATCH -- fi --} -- -+ # Darwin sucks -+ eval std_shrext=\"$shrext_cmds\" - --## ----------- ## --## Main. ## --## ----------- ## -- --$opt_help || { -- # Sanity checks first: -- func_check_version_match -- -- if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then -- func_fatal_configuration "not configured to build any kind of library" -- fi -+ # Only execute mode is allowed to have -dlopen flags. -+ if test -n "$opt_dlopen" && test "$opt_mode" != execute; then -+ func_error "unrecognized option \`-dlopen'" -+ $ECHO "$help" 1>&2 -+ exit $EXIT_FAILURE -+ fi - -- test -z "$mode" && func_fatal_error "error: you must specify a MODE." -+ # Change the help message to a mode-specific one. -+ generic_help="$help" -+ help="Try \`$progname --help --mode=$opt_mode' for more information." -+ } - - -- # Darwin sucks -- eval std_shrext=\"$shrext_cmds\" -+ # Bail if the options were screwed -+ $exit_cmd $EXIT_FAILURE -+} - - -- # Only execute mode is allowed to have -dlopen flags. -- if test -n "$execute_dlfiles" && test "$mode" != execute; then -- func_error "unrecognized option \`-dlopen'" -- $ECHO "$help" 1>&2 -- exit $EXIT_FAILURE -- fi - -- # Change the help message to a mode-specific one. -- generic_help="$help" -- help="Try \`$progname --help --mode=$mode' for more information." --} - -+## ----------- ## -+## Main. ## -+## ----------- ## - - # func_lalib_p file - # True iff FILE is a libtool `.la' library or `.lo' object file. -@@ -950,12 +1287,9 @@ func_ltwrapper_executable_p () - # temporary ltwrapper_script. - func_ltwrapper_scriptname () - { -- func_ltwrapper_scriptname_result="" -- if func_ltwrapper_executable_p "$1"; then -- func_dirname_and_basename "$1" "" "." -- func_stripname '' '.exe' "$func_basename_result" -- func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper" -- fi -+ func_dirname_and_basename "$1" "" "." -+ func_stripname '' '.exe' "$func_basename_result" -+ func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper" - } - - # func_ltwrapper_p file -@@ -1001,6 +1335,37 @@ func_source () - } - - -+# func_resolve_sysroot PATH -+# Replace a leading = in PATH with a sysroot. Store the result into -+# func_resolve_sysroot_result -+func_resolve_sysroot () -+{ -+ func_resolve_sysroot_result=$1 -+ case $func_resolve_sysroot_result in -+ =*) -+ func_stripname '=' '' "$func_resolve_sysroot_result" -+ func_resolve_sysroot_result=$lt_sysroot$func_stripname_result -+ ;; -+ esac -+} -+ -+# func_replace_sysroot PATH -+# If PATH begins with the sysroot, replace it with = and -+# store the result into func_replace_sysroot_result. -+func_replace_sysroot () -+{ -+ case "$lt_sysroot:$1" in -+ ?*:"$lt_sysroot"*) -+ func_stripname "$lt_sysroot" '' "$1" -+ func_replace_sysroot_result="=$func_stripname_result" -+ ;; -+ *) -+ # Including no sysroot. -+ func_replace_sysroot_result=$1 -+ ;; -+ esac -+} -+ - # func_infer_tag arg - # Infer tagged configuration to use if any are available and - # if one wasn't chosen via the "--tag" command line option. -@@ -1013,13 +1378,15 @@ func_infer_tag () - if test -n "$available_tags" && test -z "$tagname"; then - CC_quoted= - for arg in $CC; do -- func_quote_for_eval "$arg" -- CC_quoted="$CC_quoted $func_quote_for_eval_result" -+ func_append_quoted CC_quoted "$arg" - done -+ CC_expanded=`func_echo_all $CC` -+ CC_quoted_expanded=`func_echo_all $CC_quoted` - case $@ in - # Blanks in the command may have been stripped by the calling shell, - # but not from the CC environment variable when configure was run. -- " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*) ;; -+ " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \ -+ " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) ;; - # Blanks at the start of $base_compile will cause this to fail - # if we don't check for them as well. - *) -@@ -1030,11 +1397,13 @@ func_infer_tag () - CC_quoted= - for arg in $CC; do - # Double-quote args containing other shell metacharacters. -- func_quote_for_eval "$arg" -- CC_quoted="$CC_quoted $func_quote_for_eval_result" -+ func_append_quoted CC_quoted "$arg" - done -+ CC_expanded=`func_echo_all $CC` -+ CC_quoted_expanded=`func_echo_all $CC_quoted` - case "$@ " in -- " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*) -+ " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \ -+ " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) - # The compiler in the base compile command matches - # the one in the tagged configuration. - # Assume this is the tagged configuration we want. -@@ -1097,6 +1466,486 @@ EOF - } - } - -+ -+################################################## -+# FILE NAME AND PATH CONVERSION HELPER FUNCTIONS # -+################################################## -+ -+# func_convert_core_file_wine_to_w32 ARG -+# Helper function used by file name conversion functions when $build is *nix, -+# and $host is mingw, cygwin, or some other w32 environment. Relies on a -+# correctly configured wine environment available, with the winepath program -+# in $build's $PATH. -+# -+# ARG is the $build file name to be converted to w32 format. -+# Result is available in $func_convert_core_file_wine_to_w32_result, and will -+# be empty on error (or when ARG is empty) -+func_convert_core_file_wine_to_w32 () -+{ -+ $opt_debug -+ func_convert_core_file_wine_to_w32_result="$1" -+ if test -n "$1"; then -+ # Unfortunately, winepath does not exit with a non-zero error code, so we -+ # are forced to check the contents of stdout. On the other hand, if the -+ # command is not found, the shell will set an exit code of 127 and print -+ # *an error message* to stdout. So we must check for both error code of -+ # zero AND non-empty stdout, which explains the odd construction: -+ func_convert_core_file_wine_to_w32_tmp=`winepath -w "$1" 2>/dev/null` -+ if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then -+ func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" | -+ $SED -e "$lt_sed_naive_backslashify"` -+ else -+ func_convert_core_file_wine_to_w32_result= -+ fi -+ fi -+} -+# end: func_convert_core_file_wine_to_w32 -+ -+ -+# func_convert_core_path_wine_to_w32 ARG -+# Helper function used by path conversion functions when $build is *nix, and -+# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly -+# configured wine environment available, with the winepath program in $build's -+# $PATH. Assumes ARG has no leading or trailing path separator characters. -+# -+# ARG is path to be converted from $build format to win32. -+# Result is available in $func_convert_core_path_wine_to_w32_result. -+# Unconvertible file (directory) names in ARG are skipped; if no directory names -+# are convertible, then the result may be empty. -+func_convert_core_path_wine_to_w32 () -+{ -+ $opt_debug -+ # unfortunately, winepath doesn't convert paths, only file names -+ func_convert_core_path_wine_to_w32_result="" -+ if test -n "$1"; then -+ oldIFS=$IFS -+ IFS=: -+ for func_convert_core_path_wine_to_w32_f in $1; do -+ IFS=$oldIFS -+ func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f" -+ if test -n "$func_convert_core_file_wine_to_w32_result" ; then -+ if test -z "$func_convert_core_path_wine_to_w32_result"; then -+ func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result" -+ else -+ func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result" -+ fi -+ fi -+ done -+ IFS=$oldIFS -+ fi -+} -+# end: func_convert_core_path_wine_to_w32 -+ -+ -+# func_cygpath ARGS... -+# Wrapper around calling the cygpath program via LT_CYGPATH. This is used when -+# when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2) -+# $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or -+# (2), returns the Cygwin file name or path in func_cygpath_result (input -+# file name or path is assumed to be in w32 format, as previously converted -+# from $build's *nix or MSYS format). In case (3), returns the w32 file name -+# or path in func_cygpath_result (input file name or path is assumed to be in -+# Cygwin format). Returns an empty string on error. -+# -+# ARGS are passed to cygpath, with the last one being the file name or path to -+# be converted. -+# -+# Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH -+# environment variable; do not put it in $PATH. -+func_cygpath () -+{ -+ $opt_debug -+ if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then -+ func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null` -+ if test "$?" -ne 0; then -+ # on failure, ensure result is empty -+ func_cygpath_result= -+ fi -+ else -+ func_cygpath_result= -+ func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'" -+ fi -+} -+#end: func_cygpath -+ -+ -+# func_convert_core_msys_to_w32 ARG -+# Convert file name or path ARG from MSYS format to w32 format. Return -+# result in func_convert_core_msys_to_w32_result. -+func_convert_core_msys_to_w32 () -+{ -+ $opt_debug -+ # awkward: cmd appends spaces to result -+ func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null | -+ $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` -+} -+#end: func_convert_core_msys_to_w32 -+ -+ -+# func_convert_file_check ARG1 ARG2 -+# Verify that ARG1 (a file name in $build format) was converted to $host -+# format in ARG2. Otherwise, emit an error message, but continue (resetting -+# func_to_host_file_result to ARG1). -+func_convert_file_check () -+{ -+ $opt_debug -+ if test -z "$2" && test -n "$1" ; then -+ func_error "Could not determine host file name corresponding to" -+ func_error " \`$1'" -+ func_error "Continuing, but uninstalled executables may not work." -+ # Fallback: -+ func_to_host_file_result="$1" -+ fi -+} -+# end func_convert_file_check -+ -+ -+# func_convert_path_check FROM_PATHSEP TO_PATHSEP FROM_PATH TO_PATH -+# Verify that FROM_PATH (a path in $build format) was converted to $host -+# format in TO_PATH. Otherwise, emit an error message, but continue, resetting -+# func_to_host_file_result to a simplistic fallback value (see below). -+func_convert_path_check () -+{ -+ $opt_debug -+ if test -z "$4" && test -n "$3"; then -+ func_error "Could not determine the host path corresponding to" -+ func_error " \`$3'" -+ func_error "Continuing, but uninstalled executables may not work." -+ # Fallback. This is a deliberately simplistic "conversion" and -+ # should not be "improved". See libtool.info. -+ if test "x$1" != "x$2"; then -+ lt_replace_pathsep_chars="s|$1|$2|g" -+ func_to_host_path_result=`echo "$3" | -+ $SED -e "$lt_replace_pathsep_chars"` -+ else -+ func_to_host_path_result="$3" -+ fi -+ fi -+} -+# end func_convert_path_check -+ -+ -+# func_convert_path_front_back_pathsep FRONTPAT BACKPAT REPL ORIG -+# Modifies func_to_host_path_result by prepending REPL if ORIG matches FRONTPAT -+# and appending REPL if ORIG matches BACKPAT. -+func_convert_path_front_back_pathsep () -+{ -+ $opt_debug -+ case $4 in -+ $1 ) func_to_host_path_result="$3$func_to_host_path_result" -+ ;; -+ esac -+ case $4 in -+ $2 ) func_append func_to_host_path_result "$3" -+ ;; -+ esac -+} -+# end func_convert_path_front_back_pathsep -+ -+ -+################################################## -+# $build to $host FILE NAME CONVERSION FUNCTIONS # -+################################################## -+# invoked via `$to_host_file_cmd ARG' -+# -+# In each case, ARG is the path to be converted from $build to $host format. -+# Result will be available in $func_to_host_file_result. -+ -+ -+# func_to_host_file ARG -+# Converts the file name ARG from $build format to $host format. Return result -+# in func_to_host_file_result. -+func_to_host_file () -+{ -+ $opt_debug -+ $to_host_file_cmd "$1" -+} -+# end func_to_host_file -+ -+ -+# func_to_tool_file ARG LAZY -+# converts the file name ARG from $build format to toolchain format. Return -+# result in func_to_tool_file_result. If the conversion in use is listed -+# in (the comma separated) LAZY, no conversion takes place. -+func_to_tool_file () -+{ -+ $opt_debug -+ case ,$2, in -+ *,"$to_tool_file_cmd",*) -+ func_to_tool_file_result=$1 -+ ;; -+ *) -+ $to_tool_file_cmd "$1" -+ func_to_tool_file_result=$func_to_host_file_result -+ ;; -+ esac -+} -+# end func_to_tool_file -+ -+ -+# func_convert_file_noop ARG -+# Copy ARG to func_to_host_file_result. -+func_convert_file_noop () -+{ -+ func_to_host_file_result="$1" -+} -+# end func_convert_file_noop -+ -+ -+# func_convert_file_msys_to_w32 ARG -+# Convert file name ARG from (mingw) MSYS to (mingw) w32 format; automatic -+# conversion to w32 is not available inside the cwrapper. Returns result in -+# func_to_host_file_result. -+func_convert_file_msys_to_w32 () -+{ -+ $opt_debug -+ func_to_host_file_result="$1" -+ if test -n "$1"; then -+ func_convert_core_msys_to_w32 "$1" -+ func_to_host_file_result="$func_convert_core_msys_to_w32_result" -+ fi -+ func_convert_file_check "$1" "$func_to_host_file_result" -+} -+# end func_convert_file_msys_to_w32 -+ -+ -+# func_convert_file_cygwin_to_w32 ARG -+# Convert file name ARG from Cygwin to w32 format. Returns result in -+# func_to_host_file_result. -+func_convert_file_cygwin_to_w32 () -+{ -+ $opt_debug -+ func_to_host_file_result="$1" -+ if test -n "$1"; then -+ # because $build is cygwin, we call "the" cygpath in $PATH; no need to use -+ # LT_CYGPATH in this case. -+ func_to_host_file_result=`cygpath -m "$1"` -+ fi -+ func_convert_file_check "$1" "$func_to_host_file_result" -+} -+# end func_convert_file_cygwin_to_w32 -+ -+ -+# func_convert_file_nix_to_w32 ARG -+# Convert file name ARG from *nix to w32 format. Requires a wine environment -+# and a working winepath. Returns result in func_to_host_file_result. -+func_convert_file_nix_to_w32 () -+{ -+ $opt_debug -+ func_to_host_file_result="$1" -+ if test -n "$1"; then -+ func_convert_core_file_wine_to_w32 "$1" -+ func_to_host_file_result="$func_convert_core_file_wine_to_w32_result" -+ fi -+ func_convert_file_check "$1" "$func_to_host_file_result" -+} -+# end func_convert_file_nix_to_w32 -+ -+ -+# func_convert_file_msys_to_cygwin ARG -+# Convert file name ARG from MSYS to Cygwin format. Requires LT_CYGPATH set. -+# Returns result in func_to_host_file_result. -+func_convert_file_msys_to_cygwin () -+{ -+ $opt_debug -+ func_to_host_file_result="$1" -+ if test -n "$1"; then -+ func_convert_core_msys_to_w32 "$1" -+ func_cygpath -u "$func_convert_core_msys_to_w32_result" -+ func_to_host_file_result="$func_cygpath_result" -+ fi -+ func_convert_file_check "$1" "$func_to_host_file_result" -+} -+# end func_convert_file_msys_to_cygwin -+ -+ -+# func_convert_file_nix_to_cygwin ARG -+# Convert file name ARG from *nix to Cygwin format. Requires Cygwin installed -+# in a wine environment, working winepath, and LT_CYGPATH set. Returns result -+# in func_to_host_file_result. -+func_convert_file_nix_to_cygwin () -+{ -+ $opt_debug -+ func_to_host_file_result="$1" -+ if test -n "$1"; then -+ # convert from *nix to w32, then use cygpath to convert from w32 to cygwin. -+ func_convert_core_file_wine_to_w32 "$1" -+ func_cygpath -u "$func_convert_core_file_wine_to_w32_result" -+ func_to_host_file_result="$func_cygpath_result" -+ fi -+ func_convert_file_check "$1" "$func_to_host_file_result" -+} -+# end func_convert_file_nix_to_cygwin -+ -+ -+############################################# -+# $build to $host PATH CONVERSION FUNCTIONS # -+############################################# -+# invoked via `$to_host_path_cmd ARG' -+# -+# In each case, ARG is the path to be converted from $build to $host format. -+# The result will be available in $func_to_host_path_result. -+# -+# Path separators are also converted from $build format to $host format. If -+# ARG begins or ends with a path separator character, it is preserved (but -+# converted to $host format) on output. -+# -+# All path conversion functions are named using the following convention: -+# file name conversion function : func_convert_file_X_to_Y () -+# path conversion function : func_convert_path_X_to_Y () -+# where, for any given $build/$host combination the 'X_to_Y' value is the -+# same. If conversion functions are added for new $build/$host combinations, -+# the two new functions must follow this pattern, or func_init_to_host_path_cmd -+# will break. -+ -+ -+# func_init_to_host_path_cmd -+# Ensures that function "pointer" variable $to_host_path_cmd is set to the -+# appropriate value, based on the value of $to_host_file_cmd. -+to_host_path_cmd= -+func_init_to_host_path_cmd () -+{ -+ $opt_debug -+ if test -z "$to_host_path_cmd"; then -+ func_stripname 'func_convert_file_' '' "$to_host_file_cmd" -+ to_host_path_cmd="func_convert_path_${func_stripname_result}" -+ fi -+} -+ -+ -+# func_to_host_path ARG -+# Converts the path ARG from $build format to $host format. Return result -+# in func_to_host_path_result. -+func_to_host_path () -+{ -+ $opt_debug -+ func_init_to_host_path_cmd -+ $to_host_path_cmd "$1" -+} -+# end func_to_host_path -+ -+ -+# func_convert_path_noop ARG -+# Copy ARG to func_to_host_path_result. -+func_convert_path_noop () -+{ -+ func_to_host_path_result="$1" -+} -+# end func_convert_path_noop -+ -+ -+# func_convert_path_msys_to_w32 ARG -+# Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic -+# conversion to w32 is not available inside the cwrapper. Returns result in -+# func_to_host_path_result. -+func_convert_path_msys_to_w32 () -+{ -+ $opt_debug -+ func_to_host_path_result="$1" -+ if test -n "$1"; then -+ # Remove leading and trailing path separator characters from ARG. MSYS -+ # behavior is inconsistent here; cygpath turns them into '.;' and ';.'; -+ # and winepath ignores them completely. -+ func_stripname : : "$1" -+ func_to_host_path_tmp1=$func_stripname_result -+ func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" -+ func_to_host_path_result="$func_convert_core_msys_to_w32_result" -+ func_convert_path_check : ";" \ -+ "$func_to_host_path_tmp1" "$func_to_host_path_result" -+ func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" -+ fi -+} -+# end func_convert_path_msys_to_w32 -+ -+ -+# func_convert_path_cygwin_to_w32 ARG -+# Convert path ARG from Cygwin to w32 format. Returns result in -+# func_to_host_file_result. -+func_convert_path_cygwin_to_w32 () -+{ -+ $opt_debug -+ func_to_host_path_result="$1" -+ if test -n "$1"; then -+ # See func_convert_path_msys_to_w32: -+ func_stripname : : "$1" -+ func_to_host_path_tmp1=$func_stripname_result -+ func_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"` -+ func_convert_path_check : ";" \ -+ "$func_to_host_path_tmp1" "$func_to_host_path_result" -+ func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" -+ fi -+} -+# end func_convert_path_cygwin_to_w32 -+ -+ -+# func_convert_path_nix_to_w32 ARG -+# Convert path ARG from *nix to w32 format. Requires a wine environment and -+# a working winepath. Returns result in func_to_host_file_result. -+func_convert_path_nix_to_w32 () -+{ -+ $opt_debug -+ func_to_host_path_result="$1" -+ if test -n "$1"; then -+ # See func_convert_path_msys_to_w32: -+ func_stripname : : "$1" -+ func_to_host_path_tmp1=$func_stripname_result -+ func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" -+ func_to_host_path_result="$func_convert_core_path_wine_to_w32_result" -+ func_convert_path_check : ";" \ -+ "$func_to_host_path_tmp1" "$func_to_host_path_result" -+ func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" -+ fi -+} -+# end func_convert_path_nix_to_w32 -+ -+ -+# func_convert_path_msys_to_cygwin ARG -+# Convert path ARG from MSYS to Cygwin format. Requires LT_CYGPATH set. -+# Returns result in func_to_host_file_result. -+func_convert_path_msys_to_cygwin () -+{ -+ $opt_debug -+ func_to_host_path_result="$1" -+ if test -n "$1"; then -+ # See func_convert_path_msys_to_w32: -+ func_stripname : : "$1" -+ func_to_host_path_tmp1=$func_stripname_result -+ func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" -+ func_cygpath -u -p "$func_convert_core_msys_to_w32_result" -+ func_to_host_path_result="$func_cygpath_result" -+ func_convert_path_check : : \ -+ "$func_to_host_path_tmp1" "$func_to_host_path_result" -+ func_convert_path_front_back_pathsep ":*" "*:" : "$1" -+ fi -+} -+# end func_convert_path_msys_to_cygwin -+ -+ -+# func_convert_path_nix_to_cygwin ARG -+# Convert path ARG from *nix to Cygwin format. Requires Cygwin installed in a -+# a wine environment, working winepath, and LT_CYGPATH set. Returns result in -+# func_to_host_file_result. -+func_convert_path_nix_to_cygwin () -+{ -+ $opt_debug -+ func_to_host_path_result="$1" -+ if test -n "$1"; then -+ # Remove leading and trailing path separator characters from -+ # ARG. msys behavior is inconsistent here, cygpath turns them -+ # into '.;' and ';.', and winepath ignores them completely. -+ func_stripname : : "$1" -+ func_to_host_path_tmp1=$func_stripname_result -+ func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" -+ func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result" -+ func_to_host_path_result="$func_cygpath_result" -+ func_convert_path_check : : \ -+ "$func_to_host_path_tmp1" "$func_to_host_path_result" -+ func_convert_path_front_back_pathsep ":*" "*:" : "$1" -+ fi -+} -+# end func_convert_path_nix_to_cygwin -+ -+ - # func_mode_compile arg... - func_mode_compile () - { -@@ -1137,12 +1986,12 @@ func_mode_compile () - ;; - - -pie | -fpie | -fPIE) -- pie_flag="$pie_flag $arg" -+ func_append pie_flag " $arg" - continue - ;; - - -shared | -static | -prefer-pic | -prefer-non-pic) -- later="$later $arg" -+ func_append later " $arg" - continue - ;; - -@@ -1163,15 +2012,14 @@ func_mode_compile () - save_ifs="$IFS"; IFS=',' - for arg in $args; do - IFS="$save_ifs" -- func_quote_for_eval "$arg" -- lastarg="$lastarg $func_quote_for_eval_result" -+ func_append_quoted lastarg "$arg" - done - IFS="$save_ifs" - func_stripname ' ' '' "$lastarg" - lastarg=$func_stripname_result - - # Add the arguments to base_compile. -- base_compile="$base_compile $lastarg" -+ func_append base_compile " $lastarg" - continue - ;; - -@@ -1187,8 +2035,7 @@ func_mode_compile () - esac # case $arg_mode - - # Aesthetically quote the previous argument. -- func_quote_for_eval "$lastarg" -- base_compile="$base_compile $func_quote_for_eval_result" -+ func_append_quoted base_compile "$lastarg" - done # for arg - - case $arg_mode in -@@ -1213,7 +2060,7 @@ func_mode_compile () - *.[cCFSifmso] | \ - *.ada | *.adb | *.ads | *.asm | \ - *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \ -- *.[fF][09]? | *.for | *.java | *.obj | *.sx) -+ *.[fF][09]? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup) - func_xform "$libobj" - libobj=$func_xform_result - ;; -@@ -1288,7 +2135,7 @@ func_mode_compile () - # Calculate the filename of the output object if compiler does - # not support -o with -c - if test "$compiler_c_o" = no; then -- output_obj=`$ECHO "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext} -+ output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.${objext} - lockfile="$output_obj.lock" - else - output_obj= -@@ -1319,17 +2166,16 @@ compiler." - $opt_dry_run || $RM $removelist - exit $EXIT_FAILURE - fi -- removelist="$removelist $output_obj" -+ func_append removelist " $output_obj" - $ECHO "$srcfile" > "$lockfile" - fi - - $opt_dry_run || $RM $removelist -- removelist="$removelist $lockfile" -+ func_append removelist " $lockfile" - trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15 - -- if test -n "$fix_srcfile_path"; then -- eval srcfile=\"$fix_srcfile_path\" -- fi -+ func_to_tool_file "$srcfile" func_convert_file_msys_to_w32 -+ srcfile=$func_to_tool_file_result - func_quote_for_eval "$srcfile" - qsrcfile=$func_quote_for_eval_result - -@@ -1349,7 +2195,7 @@ compiler." - - if test -z "$output_obj"; then - # Place PIC objects in $objdir -- command="$command -o $lobj" -+ func_append command " -o $lobj" - fi - - func_show_eval_locale "$command" \ -@@ -1396,11 +2242,11 @@ compiler." - command="$base_compile $qsrcfile $pic_flag" - fi - if test "$compiler_c_o" = yes; then -- command="$command -o $obj" -+ func_append command " -o $obj" - fi - - # Suppress compiler output if we already did a PIC compilation. -- command="$command$suppress_output" -+ func_append command "$suppress_output" - func_show_eval_locale "$command" \ - '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' - -@@ -1445,13 +2291,13 @@ compiler." - } - - $opt_help || { --test "$mode" = compile && func_mode_compile ${1+"$@"} -+ test "$opt_mode" = compile && func_mode_compile ${1+"$@"} - } - - func_mode_help () - { - # We need to display help for each of the modes. -- case $mode in -+ case $opt_mode in - "") - # Generic help is extracted from the usage comments - # at the start of this file. -@@ -1482,10 +2328,11 @@ This mode accepts the following additional options: - - -o OUTPUT-FILE set the output file name to OUTPUT-FILE - -no-suppress do not suppress compiler output for multiple passes -- -prefer-pic try to building PIC objects only -- -prefer-non-pic try to building non-PIC objects only -+ -prefer-pic try to build PIC objects only -+ -prefer-non-pic try to build non-PIC objects only - -shared do not build a \`.o' file suitable for static linking - -static only build a \`.o' file suitable for static linking -+ -Wc,FLAG pass FLAG directly to the compiler - - COMPILE-COMMAND is a command to be used in creating a \`standard' object file - from the given SOURCEFILE. -@@ -1538,7 +2385,7 @@ either the \`install' or \`cp' program. - - The following components of INSTALL-COMMAND are treated specially: - -- -inst-prefix PREFIX-DIR Use PREFIX-DIR as a staging area for installation -+ -inst-prefix-dir PREFIX-DIR Use PREFIX-DIR as a staging area for installation - - The rest of the components are interpreted as arguments to that command (only - BSD-compatible install options are recognized)." -@@ -1558,6 +2405,8 @@ The following components of LINK-COMMAND are treated specially: - - -all-static do not do any dynamic linking at all - -avoid-version do not add a version suffix if possible -+ -bindir BINDIR specify path to binaries directory (for systems where -+ libraries must be found in the PATH setting at runtime) - -dlopen FILE \`-dlpreopen' FILE if it cannot be dlopened at runtime - -dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols - -export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3) -@@ -1586,6 +2435,11 @@ The following components of LINK-COMMAND are treated specially: - -version-info CURRENT[:REVISION[:AGE]] - specify library version info [each variable defaults to 0] - -weak LIBNAME declare that the target provides the LIBNAME interface -+ -Wc,FLAG -+ -Xcompiler FLAG pass linker-specific FLAG directly to the compiler -+ -Wl,FLAG -+ -Xlinker FLAG pass linker-specific FLAG directly to the linker -+ -XCClinker FLAG pass link-specific FLAG to the compiler driver (CC) - - All other options (arguments beginning with \`-') are ignored. - -@@ -1619,18 +2473,44 @@ Otherwise, only FILE itself is deleted using RM." - ;; - - *) -- func_fatal_help "invalid operation mode \`$mode'" -+ func_fatal_help "invalid operation mode \`$opt_mode'" - ;; - esac - -- $ECHO -+ echo - $ECHO "Try \`$progname --help' for more information about other modes." -- -- exit $? - } - -- # Now that we've collected a possible --mode arg, show help if necessary -- $opt_help && func_mode_help -+# Now that we've collected a possible --mode arg, show help if necessary -+if $opt_help; then -+ if test "$opt_help" = :; then -+ func_mode_help -+ else -+ { -+ func_help noexit -+ for opt_mode in compile link execute install finish uninstall clean; do -+ func_mode_help -+ done -+ } | sed -n '1p; 2,$s/^Usage:/ or: /p' -+ { -+ func_help noexit -+ for opt_mode in compile link execute install finish uninstall clean; do -+ echo -+ func_mode_help -+ done -+ } | -+ sed '1d -+ /^When reporting/,/^Report/{ -+ H -+ d -+ } -+ $x -+ /information about other modes/d -+ /more detailed .*MODE/d -+ s/^Usage:.*--mode=\([^ ]*\) .*/Description of \1 mode:/' -+ fi -+ exit $? -+fi - - - # func_mode_execute arg... -@@ -1643,13 +2523,16 @@ func_mode_execute () - func_fatal_help "you must specify a COMMAND" - - # Handle -dlopen flags immediately. -- for file in $execute_dlfiles; do -+ for file in $opt_dlopen; do - test -f "$file" \ - || func_fatal_help "\`$file' is not a file" - - dir= - case $file in - *.la) -+ func_resolve_sysroot "$file" -+ file=$func_resolve_sysroot_result -+ - # Check to see that this really is a libtool archive. - func_lalib_unsafe_p "$file" \ - || func_fatal_help "\`$lib' is not a valid libtool archive" -@@ -1671,7 +2554,7 @@ func_mode_execute () - dir="$func_dirname_result" - - if test -f "$dir/$objdir/$dlname"; then -- dir="$dir/$objdir" -+ func_append dir "/$objdir" - else - if test ! -f "$dir/$dlname"; then - func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" -@@ -1712,7 +2595,7 @@ func_mode_execute () - for file - do - case $file in -- -*) ;; -+ -* | *.la | *.lo ) ;; - *) - # Do a test to see if this is really a libtool program. - if func_ltwrapper_script_p "$file"; then -@@ -1728,8 +2611,7 @@ func_mode_execute () - ;; - esac - # Quote arguments (to preserve shell metacharacters). -- func_quote_for_eval "$file" -- args="$args $func_quote_for_eval_result" -+ func_append_quoted args "$file" - done - - if test "X$opt_dry_run" = Xfalse; then -@@ -1754,29 +2636,66 @@ func_mode_execute () - # Display what would be done. - if test -n "$shlibpath_var"; then - eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\"" -- $ECHO "export $shlibpath_var" -+ echo "export $shlibpath_var" - fi - $ECHO "$cmd$args" - exit $EXIT_SUCCESS - fi - } - --test "$mode" = execute && func_mode_execute ${1+"$@"} -+test "$opt_mode" = execute && func_mode_execute ${1+"$@"} - - - # func_mode_finish arg... - func_mode_finish () - { - $opt_debug -- libdirs="$nonopt" -+ libs= -+ libdirs= - admincmds= - -- if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then -- for dir -- do -- libdirs="$libdirs $dir" -- done -+ for opt in "$nonopt" ${1+"$@"} -+ do -+ if test -d "$opt"; then -+ func_append libdirs " $opt" -+ -+ elif test -f "$opt"; then -+ if func_lalib_unsafe_p "$opt"; then -+ func_append libs " $opt" -+ else -+ func_warning "\`$opt' is not a valid libtool archive" -+ fi -+ -+ else -+ func_fatal_error "invalid argument \`$opt'" -+ fi -+ done -+ -+ if test -n "$libs"; then -+ if test -n "$lt_sysroot"; then -+ sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"` -+ sysroot_cmd="s/\([ ']\)$sysroot_regex/\1/g;" -+ else -+ sysroot_cmd= -+ fi -+ -+ # Remove sysroot references -+ if $opt_dry_run; then -+ for lib in $libs; do -+ echo "removing references to $lt_sysroot and \`=' prefixes from $lib" -+ done -+ else -+ tmpdir=`func_mktempdir` -+ for lib in $libs; do -+ sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \ -+ > $tmpdir/tmp-la -+ mv -f $tmpdir/tmp-la $lib -+ done -+ ${RM}r "$tmpdir" -+ fi -+ fi - -+ if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then - for libdir in $libdirs; do - if test -n "$finish_cmds"; then - # Do each command in the finish commands. -@@ -1786,7 +2705,7 @@ func_mode_finish () - if test -n "$finish_eval"; then - # Do the single finish_eval. - eval cmds=\"$finish_eval\" -- $opt_dry_run || eval "$cmds" || admincmds="$admincmds -+ $opt_dry_run || eval "$cmds" || func_append admincmds " - $cmds" - fi - done -@@ -1795,53 +2714,55 @@ func_mode_finish () - # Exit here if they wanted silent mode. - $opt_silent && exit $EXIT_SUCCESS - -- $ECHO "X----------------------------------------------------------------------" | $Xsed -- $ECHO "Libraries have been installed in:" -- for libdir in $libdirs; do -- $ECHO " $libdir" -- done -- $ECHO -- $ECHO "If you ever happen to want to link against installed libraries" -- $ECHO "in a given directory, LIBDIR, you must either use libtool, and" -- $ECHO "specify the full pathname of the library, or use the \`-LLIBDIR'" -- $ECHO "flag during linking and do at least one of the following:" -- if test -n "$shlibpath_var"; then -- $ECHO " - add LIBDIR to the \`$shlibpath_var' environment variable" -- $ECHO " during execution" -- fi -- if test -n "$runpath_var"; then -- $ECHO " - add LIBDIR to the \`$runpath_var' environment variable" -- $ECHO " during linking" -- fi -- if test -n "$hardcode_libdir_flag_spec"; then -- libdir=LIBDIR -- eval flag=\"$hardcode_libdir_flag_spec\" -+ if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then -+ echo "----------------------------------------------------------------------" -+ echo "Libraries have been installed in:" -+ for libdir in $libdirs; do -+ $ECHO " $libdir" -+ done -+ echo -+ echo "If you ever happen to want to link against installed libraries" -+ echo "in a given directory, LIBDIR, you must either use libtool, and" -+ echo "specify the full pathname of the library, or use the \`-LLIBDIR'" -+ echo "flag during linking and do at least one of the following:" -+ if test -n "$shlibpath_var"; then -+ echo " - add LIBDIR to the \`$shlibpath_var' environment variable" -+ echo " during execution" -+ fi -+ if test -n "$runpath_var"; then -+ echo " - add LIBDIR to the \`$runpath_var' environment variable" -+ echo " during linking" -+ fi -+ if test -n "$hardcode_libdir_flag_spec"; then -+ libdir=LIBDIR -+ eval flag=\"$hardcode_libdir_flag_spec\" -+ -+ $ECHO " - use the \`$flag' linker flag" -+ fi -+ if test -n "$admincmds"; then -+ $ECHO " - have your system administrator run these commands:$admincmds" -+ fi -+ if test -f /etc/ld.so.conf; then -+ echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" -+ fi -+ echo - -- $ECHO " - use the \`$flag' linker flag" -- fi -- if test -n "$admincmds"; then -- $ECHO " - have your system administrator run these commands:$admincmds" -- fi -- if test -f /etc/ld.so.conf; then -- $ECHO " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" -+ echo "See any operating system documentation about shared libraries for" -+ case $host in -+ solaris2.[6789]|solaris2.1[0-9]) -+ echo "more information, such as the ld(1), crle(1) and ld.so(8) manual" -+ echo "pages." -+ ;; -+ *) -+ echo "more information, such as the ld(1) and ld.so(8) manual pages." -+ ;; -+ esac -+ echo "----------------------------------------------------------------------" - fi -- $ECHO -- -- $ECHO "See any operating system documentation about shared libraries for" -- case $host in -- solaris2.[6789]|solaris2.1[0-9]) -- $ECHO "more information, such as the ld(1), crle(1) and ld.so(8) manual" -- $ECHO "pages." -- ;; -- *) -- $ECHO "more information, such as the ld(1) and ld.so(8) manual pages." -- ;; -- esac -- $ECHO "X----------------------------------------------------------------------" | $Xsed - exit $EXIT_SUCCESS - } - --test "$mode" = finish && func_mode_finish ${1+"$@"} -+test "$opt_mode" = finish && func_mode_finish ${1+"$@"} - - - # func_mode_install arg... -@@ -1852,7 +2773,7 @@ func_mode_install () - # install_prog (especially on Windows NT). - if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh || - # Allow the use of GNU shtool's install command. -- $ECHO "X$nonopt" | $GREP shtool >/dev/null; then -+ case $nonopt in *shtool*) :;; *) false;; esac; then - # Aesthetically quote it. - func_quote_for_eval "$nonopt" - install_prog="$func_quote_for_eval_result " -@@ -1866,7 +2787,12 @@ func_mode_install () - # The real first argument should be the name of the installation program. - # Aesthetically quote it. - func_quote_for_eval "$arg" -- install_prog="$install_prog$func_quote_for_eval_result" -+ func_append install_prog "$func_quote_for_eval_result" -+ install_shared_prog=$install_prog -+ case " $install_prog " in -+ *[\\\ /]cp\ *) install_cp=: ;; -+ *) install_cp=false ;; -+ esac - - # We need to accept at least all the BSD install flags. - dest= -@@ -1876,10 +2802,12 @@ func_mode_install () - install_type= - isdir=no - stripme= -+ no_mode=: - for arg - do -+ arg2= - if test -n "$dest"; then -- files="$files $dest" -+ func_append files " $dest" - dest=$arg - continue - fi -@@ -1887,10 +2815,9 @@ func_mode_install () - case $arg in - -d) isdir=yes ;; - -f) -- case " $install_prog " in -- *[\\\ /]cp\ *) ;; -- *) prev=$arg ;; -- esac -+ if $install_cp; then :; else -+ prev=$arg -+ fi - ;; - -g | -m | -o) - prev=$arg -@@ -1904,6 +2831,10 @@ func_mode_install () - *) - # If the previous option needed an argument, then skip it. - if test -n "$prev"; then -+ if test "x$prev" = x-m && test -n "$install_override_mode"; then -+ arg2=$install_override_mode -+ no_mode=false -+ fi - prev= - else - dest=$arg -@@ -1914,7 +2845,11 @@ func_mode_install () - - # Aesthetically quote the argument. - func_quote_for_eval "$arg" -- install_prog="$install_prog $func_quote_for_eval_result" -+ func_append install_prog " $func_quote_for_eval_result" -+ if test -n "$arg2"; then -+ func_quote_for_eval "$arg2" -+ fi -+ func_append install_shared_prog " $func_quote_for_eval_result" - done - - test -z "$install_prog" && \ -@@ -1923,6 +2858,13 @@ func_mode_install () - test -n "$prev" && \ - func_fatal_help "the \`$prev' option requires an argument" - -+ if test -n "$install_override_mode" && $no_mode; then -+ if $install_cp; then :; else -+ func_quote_for_eval "$install_override_mode" -+ func_append install_shared_prog " -m $func_quote_for_eval_result" -+ fi -+ fi -+ - if test -z "$files"; then - if test -z "$dest"; then - func_fatal_help "no file or destination specified" -@@ -1977,10 +2919,13 @@ func_mode_install () - case $file in - *.$libext) - # Do the static libraries later. -- staticlibs="$staticlibs $file" -+ func_append staticlibs " $file" - ;; - - *.la) -+ func_resolve_sysroot "$file" -+ file=$func_resolve_sysroot_result -+ - # Check to see that this really is a libtool archive. - func_lalib_unsafe_p "$file" \ - || func_fatal_help "\`$file' is not a valid libtool archive" -@@ -1994,23 +2939,23 @@ func_mode_install () - if test "X$destdir" = "X$libdir"; then - case "$current_libdirs " in - *" $libdir "*) ;; -- *) current_libdirs="$current_libdirs $libdir" ;; -+ *) func_append current_libdirs " $libdir" ;; - esac - else - # Note the libdir as a future libdir. - case "$future_libdirs " in - *" $libdir "*) ;; -- *) future_libdirs="$future_libdirs $libdir" ;; -+ *) func_append future_libdirs " $libdir" ;; - esac - fi - - func_dirname "$file" "/" "" - dir="$func_dirname_result" -- dir="$dir$objdir" -+ func_append dir "$objdir" - - if test -n "$relink_command"; then - # Determine the prefix the user has applied to our future dir. -- inst_prefix_dir=`$ECHO "X$destdir" | $Xsed -e "s%$libdir\$%%"` -+ inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"` - - # Don't allow the user to place us outside of our expected - # location b/c this prevents finding dependent libraries that -@@ -2023,9 +2968,9 @@ func_mode_install () - - if test -n "$inst_prefix_dir"; then - # Stick the inst_prefix_dir data into the link command. -- relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"` -+ relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"` - else -- relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%%"` -+ relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"` - fi - - func_warning "relinking \`$file'" -@@ -2043,7 +2988,7 @@ func_mode_install () - test -n "$relink_command" && srcname="$realname"T - - # Install the shared library and build the symlinks. -- func_show_eval "$install_prog $dir/$srcname $destdir/$realname" \ -+ func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \ - 'exit $?' - tstripme="$stripme" - case $host_os in -@@ -2083,7 +3028,7 @@ func_mode_install () - func_show_eval "$install_prog $instname $destdir/$name" 'exit $?' - - # Maybe install the static library, too. -- test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" -+ test -n "$old_library" && func_append staticlibs " $dir/$old_library" - ;; - - *.lo) -@@ -2183,7 +3128,7 @@ func_mode_install () - if test -f "$lib"; then - func_source "$lib" - fi -- libfile="$libdir/"`$ECHO "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test -+ libfile="$libdir/"`$ECHO "$lib" | $SED 's%^.*/%%g'` ### testsuite: skip nested quoting test - if test -n "$libdir" && test ! -f "$libfile"; then - func_warning "\`$lib' has not been installed in \`$libdir'" - finalize=no -@@ -2202,7 +3147,7 @@ func_mode_install () - file="$func_basename_result" - outputname="$tmpdir/$file" - # Replace the output file specification. -- relink_command=`$ECHO "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'` -+ relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'` - - $opt_silent || { - func_quote_for_expand "$relink_command" -@@ -2221,7 +3166,7 @@ func_mode_install () - } - else - # Install the binary that we compiled earlier. -- file=`$ECHO "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"` -+ file=`$ECHO "$file$stripped_ext" | $SED "s%\([^/]*\)$%$objdir/\1%"` - fi - fi - -@@ -2257,11 +3202,13 @@ func_mode_install () - - # Set up the ranlib parameters. - oldlib="$destdir/$name" -+ func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 -+ tool_oldlib=$func_to_tool_file_result - - func_show_eval "$install_prog \$file \$oldlib" 'exit $?' - - if test -n "$stripme" && test -n "$old_striplib"; then -- func_show_eval "$old_striplib $oldlib" 'exit $?' -+ func_show_eval "$old_striplib $tool_oldlib" 'exit $?' - fi - - # Do each command in the postinstall commands. -@@ -2280,7 +3227,7 @@ func_mode_install () - fi - } - --test "$mode" = install && func_mode_install ${1+"$@"} -+test "$opt_mode" = install && func_mode_install ${1+"$@"} - - - # func_generate_dlsyms outputname originator pic_p -@@ -2323,6 +3270,22 @@ func_generate_dlsyms () - extern \"C\" { - #endif - -+#if defined(__GNUC__) && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4)) -+#pragma GCC diagnostic ignored \"-Wstrict-prototypes\" -+#endif -+ -+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -+/* DATA imports from DLLs on WIN32 con't be const, because runtime -+ relocations are performed -- see ld's documentation on pseudo-relocs. */ -+# define LT_DLSYM_CONST -+#elif defined(__osf__) -+/* This system does not cope well with relocations in const data. */ -+# define LT_DLSYM_CONST -+#else -+# define LT_DLSYM_CONST const -+#endif -+ - /* External symbol declarations for the compiler. */\ - " - -@@ -2332,10 +3295,11 @@ extern \"C\" { - $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist" - - # Add our own program objects to the symbol list. -- progfiles=`$ECHO "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` -+ progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP` - for progfile in $progfiles; do -- func_verbose "extracting global C symbols from \`$progfile'" -- $opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'" -+ func_to_tool_file "$progfile" func_convert_file_msys_to_w32 -+ func_verbose "extracting global C symbols from \`$func_to_tool_file_result'" -+ $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'" - done - - if test -n "$exclude_expsyms"; then -@@ -2371,7 +3335,7 @@ extern \"C\" { - eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' - eval '$MV "$nlist"T "$nlist"' - case $host in -- *cygwin | *mingw* | *cegcc* ) -+ *cygwin* | *mingw* | *cegcc* ) - eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' - eval 'cat "$nlist" >> "$output_objdir/$outputname.def"' - ;; -@@ -2384,10 +3348,52 @@ extern \"C\" { - func_verbose "extracting global C symbols from \`$dlprefile'" - func_basename "$dlprefile" - name="$func_basename_result" -- $opt_dry_run || { -- eval '$ECHO ": $name " >> "$nlist"' -- eval "$NM $dlprefile 2>/dev/null | $global_symbol_pipe >> '$nlist'" -- } -+ case $host in -+ *cygwin* | *mingw* | *cegcc* ) -+ # if an import library, we need to obtain dlname -+ if func_win32_import_lib_p "$dlprefile"; then -+ func_tr_sh "$dlprefile" -+ eval "curr_lafile=\$libfile_$func_tr_sh_result" -+ dlprefile_dlbasename="" -+ if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then -+ # Use subshell, to avoid clobbering current variable values -+ dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"` -+ if test -n "$dlprefile_dlname" ; then -+ func_basename "$dlprefile_dlname" -+ dlprefile_dlbasename="$func_basename_result" -+ else -+ # no lafile. user explicitly requested -dlpreopen . -+ $sharedlib_from_linklib_cmd "$dlprefile" -+ dlprefile_dlbasename=$sharedlib_from_linklib_result -+ fi -+ fi -+ $opt_dry_run || { -+ if test -n "$dlprefile_dlbasename" ; then -+ eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"' -+ else -+ func_warning "Could not compute DLL name from $name" -+ eval '$ECHO ": $name " >> "$nlist"' -+ fi -+ func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 -+ eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe | -+ $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'" -+ } -+ else # not an import lib -+ $opt_dry_run || { -+ eval '$ECHO ": $name " >> "$nlist"' -+ func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 -+ eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'" -+ } -+ fi -+ ;; -+ *) -+ $opt_dry_run || { -+ eval '$ECHO ": $name " >> "$nlist"' -+ func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 -+ eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'" -+ } -+ ;; -+ esac - done - - $opt_dry_run || { -@@ -2415,36 +3421,19 @@ extern \"C\" { - if test -f "$nlist"S; then - eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"' - else -- $ECHO '/* NONE */' >> "$output_objdir/$my_dlsyms" -+ echo '/* NONE */' >> "$output_objdir/$my_dlsyms" - fi - -- $ECHO >> "$output_objdir/$my_dlsyms" "\ -+ echo >> "$output_objdir/$my_dlsyms" "\ - - /* The mapping between symbol names and symbols. */ - typedef struct { - const char *name; - void *address; - } lt_dlsymlist; --" -- case $host in -- *cygwin* | *mingw* | *cegcc* ) -- $ECHO >> "$output_objdir/$my_dlsyms" "\ --/* DATA imports from DLLs on WIN32 con't be const, because -- runtime relocations are performed -- see ld's documentation -- on pseudo-relocs. */" -- lt_dlsym_const= ;; -- *osf5*) -- echo >> "$output_objdir/$my_dlsyms" "\ --/* This system does not cope well with relocations in const data */" -- lt_dlsym_const= ;; -- *) -- lt_dlsym_const=const ;; -- esac -- -- $ECHO >> "$output_objdir/$my_dlsyms" "\ --extern $lt_dlsym_const lt_dlsymlist -+extern LT_DLSYM_CONST lt_dlsymlist - lt_${my_prefix}_LTX_preloaded_symbols[]; --$lt_dlsym_const lt_dlsymlist -+LT_DLSYM_CONST lt_dlsymlist - lt_${my_prefix}_LTX_preloaded_symbols[] = - {\ - { \"$my_originator\", (void *) 0 }," -@@ -2457,7 +3446,7 @@ lt_${my_prefix}_LTX_preloaded_symbols[] = - eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms" - ;; - esac -- $ECHO >> "$output_objdir/$my_dlsyms" "\ -+ echo >> "$output_objdir/$my_dlsyms" "\ - {0, (void *) 0} - }; - -@@ -2484,7 +3473,7 @@ static const void *lt_preloaded_setup() { - # linked before any other PIC object. But we must not use - # pic_flag when linking with -static. The problem exists in - # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1. -- *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) -+ *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) - pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;; - *-*-hpux*) - pic_flag_for_symtable=" $pic_flag" ;; -@@ -2500,7 +3489,7 @@ static const void *lt_preloaded_setup() { - for arg in $LTCFLAGS; do - case $arg in - -pie | -fpie | -fPIE) ;; -- *) symtab_cflags="$symtab_cflags $arg" ;; -+ *) func_append symtab_cflags " $arg" ;; - esac - done - -@@ -2515,16 +3504,16 @@ static const void *lt_preloaded_setup() { - case $host in - *cygwin* | *mingw* | *cegcc* ) - if test -f "$output_objdir/$my_outputname.def"; then -- compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` -- finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` -+ compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` -+ finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` - else -- compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"` -- finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"` -+ compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"` -+ finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"` - fi - ;; - *) -- compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"` -- finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"` -+ compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"` -+ finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"` - ;; - esac - ;; -@@ -2538,8 +3527,8 @@ static const void *lt_preloaded_setup() { - # really was required. - - # Nullify the symbol file. -- compile_command=`$ECHO "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"` -- finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"` -+ compile_command=`$ECHO "$compile_command" | $SED "s% @SYMFILE@%%"` -+ finalize_command=`$ECHO "$finalize_command" | $SED "s% @SYMFILE@%%"` - fi - } - -@@ -2549,6 +3538,7 @@ static const void *lt_preloaded_setup() { - # Need a lot of goo to handle *both* DLLs and import libs - # Has to be a shell function in order to 'eat' the argument - # that is supplied when $file_magic_command is called. -+# Despite the name, also deal with 64 bit binaries. - func_win32_libid () - { - $opt_debug -@@ -2559,9 +3549,11 @@ func_win32_libid () - win32_libid_type="x86 archive import" - ;; - *ar\ archive*) # could be an import, or static -+ # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD. - if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | -- $EGREP 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then -- win32_nmres=`eval $NM -f posix -A $1 | -+ $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then -+ func_to_tool_file "$1" func_convert_file_msys_to_w32 -+ win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" | - $SED -n -e ' - 1,100{ - / I /{ -@@ -2590,6 +3582,131 @@ func_win32_libid () - $ECHO "$win32_libid_type" - } - -+# func_cygming_dll_for_implib ARG -+# -+# Platform-specific function to extract the -+# name of the DLL associated with the specified -+# import library ARG. -+# Invoked by eval'ing the libtool variable -+# $sharedlib_from_linklib_cmd -+# Result is available in the variable -+# $sharedlib_from_linklib_result -+func_cygming_dll_for_implib () -+{ -+ $opt_debug -+ sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"` -+} -+ -+# func_cygming_dll_for_implib_fallback_core SECTION_NAME LIBNAMEs -+# -+# The is the core of a fallback implementation of a -+# platform-specific function to extract the name of the -+# DLL associated with the specified import library LIBNAME. -+# -+# SECTION_NAME is either .idata$6 or .idata$7, depending -+# on the platform and compiler that created the implib. -+# -+# Echos the name of the DLL associated with the -+# specified import library. -+func_cygming_dll_for_implib_fallback_core () -+{ -+ $opt_debug -+ match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"` -+ $OBJDUMP -s --section "$1" "$2" 2>/dev/null | -+ $SED '/^Contents of section '"$match_literal"':/{ -+ # Place marker at beginning of archive member dllname section -+ s/.*/====MARK====/ -+ p -+ d -+ } -+ # These lines can sometimes be longer than 43 characters, but -+ # are always uninteresting -+ /:[ ]*file format pe[i]\{,1\}-/d -+ /^In archive [^:]*:/d -+ # Ensure marker is printed -+ /^====MARK====/p -+ # Remove all lines with less than 43 characters -+ /^.\{43\}/!d -+ # From remaining lines, remove first 43 characters -+ s/^.\{43\}//' | -+ $SED -n ' -+ # Join marker and all lines until next marker into a single line -+ /^====MARK====/ b para -+ H -+ $ b para -+ b -+ :para -+ x -+ s/\n//g -+ # Remove the marker -+ s/^====MARK====// -+ # Remove trailing dots and whitespace -+ s/[\. \t]*$// -+ # Print -+ /./p' | -+ # we now have a list, one entry per line, of the stringified -+ # contents of the appropriate section of all members of the -+ # archive which possess that section. Heuristic: eliminate -+ # all those which have a first or second character that is -+ # a '.' (that is, objdump's representation of an unprintable -+ # character.) This should work for all archives with less than -+ # 0x302f exports -- but will fail for DLLs whose name actually -+ # begins with a literal '.' or a single character followed by -+ # a '.'. -+ # -+ # Of those that remain, print the first one. -+ $SED -e '/^\./d;/^.\./d;q' -+} -+ -+# func_cygming_gnu_implib_p ARG -+# This predicate returns with zero status (TRUE) if -+# ARG is a GNU/binutils-style import library. Returns -+# with nonzero status (FALSE) otherwise. -+func_cygming_gnu_implib_p () -+{ -+ $opt_debug -+ func_to_tool_file "$1" func_convert_file_msys_to_w32 -+ func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'` -+ test -n "$func_cygming_gnu_implib_tmp" -+} -+ -+# func_cygming_ms_implib_p ARG -+# This predicate returns with zero status (TRUE) if -+# ARG is an MS-style import library. Returns -+# with nonzero status (FALSE) otherwise. -+func_cygming_ms_implib_p () -+{ -+ $opt_debug -+ func_to_tool_file "$1" func_convert_file_msys_to_w32 -+ func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'` -+ test -n "$func_cygming_ms_implib_tmp" -+} -+ -+# func_cygming_dll_for_implib_fallback ARG -+# Platform-specific function to extract the -+# name of the DLL associated with the specified -+# import library ARG. -+# -+# This fallback implementation is for use when $DLLTOOL -+# does not support the --identify-strict option. -+# Invoked by eval'ing the libtool variable -+# $sharedlib_from_linklib_cmd -+# Result is available in the variable -+# $sharedlib_from_linklib_result -+func_cygming_dll_for_implib_fallback () -+{ -+ $opt_debug -+ if func_cygming_gnu_implib_p "$1" ; then -+ # binutils import library -+ sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"` -+ elif func_cygming_ms_implib_p "$1" ; then -+ # ms-generated import library -+ sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"` -+ else -+ # unknown -+ sharedlib_from_linklib_result="" -+ fi -+} - - - # func_extract_an_archive dir oldlib -@@ -2598,7 +3715,18 @@ func_extract_an_archive () - $opt_debug - f_ex_an_ar_dir="$1"; shift - f_ex_an_ar_oldlib="$1" -- func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" 'exit $?' -+ if test "$lock_old_archive_extraction" = yes; then -+ lockfile=$f_ex_an_ar_oldlib.lock -+ until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do -+ func_echo "Waiting for $lockfile to be removed" -+ sleep 2 -+ done -+ fi -+ func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" \ -+ 'stat=$?; rm -f "$lockfile"; exit $stat' -+ if test "$lock_old_archive_extraction" = yes; then -+ $opt_dry_run || rm -f "$lockfile" -+ fi - if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then - : - else -@@ -2669,7 +3797,7 @@ func_extract_archives () - darwin_file= - darwin_files= - for darwin_file in $darwin_filelist; do -- darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP` -+ darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP` - $LIPO -create -output "$darwin_file" $darwin_files - done # $darwin_filelist - $RM -rf unfat-$$ -@@ -2684,25 +3812,30 @@ func_extract_archives () - func_extract_an_archive "$my_xdir" "$my_xabs" - ;; - esac -- my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP` -+ my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP` - done - - func_extract_archives_result="$my_oldobjs" - } - - -- --# func_emit_wrapper_part1 [arg=no] -+# func_emit_wrapper [arg=no] -+# -+# Emit a libtool wrapper script on stdout. -+# Don't directly open a file because we may want to -+# incorporate the script contents within a cygwin/mingw -+# wrapper executable. Must ONLY be called from within -+# func_mode_link because it depends on a number of variables -+# set therein. - # --# Emit the first part of a libtool wrapper script on stdout. --# For more information, see the description associated with --# func_emit_wrapper(), below. --func_emit_wrapper_part1 () -+# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR -+# variable will take. If 'yes', then the emitted script -+# will assume that the directory in which it is stored is -+# the $objdir directory. This is a cygwin/mingw-specific -+# behavior. -+func_emit_wrapper () - { -- func_emit_wrapper_part1_arg1=no -- if test -n "$1" ; then -- func_emit_wrapper_part1_arg1=$1 -- fi -+ func_emit_wrapper_arg1=${1-no} - - $ECHO "\ - #! $SHELL -@@ -2718,7 +3851,6 @@ func_emit_wrapper_part1 () - - # Sed substitution that helps us do robust quoting. It backslashifies - # metacharacters that are still active within double-quoted strings. --Xsed='${SED} -e 1s/^X//' - sed_quote_subst='$sed_quote_subst' - - # Be Bourne compatible -@@ -2749,31 +3881,135 @@ if test \"\$libtool_install_magic\" = \"$magic\"; then - else - # When we are sourced in execute mode, \$file and \$ECHO are already set. - if test \"\$libtool_execute_magic\" != \"$magic\"; then -- ECHO=\"$qecho\" -- file=\"\$0\" -- # Make sure echo works. -- if test \"X\$1\" = X--no-reexec; then -- # Discard the --no-reexec flag, and continue. -- shift -- elif test \"X\`{ \$ECHO '\t'; } 2>/dev/null\`\" = 'X\t'; then -- # Yippee, \$ECHO works! -- : -- else -- # Restart under the correct shell, and then maybe \$ECHO will work. -- exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"} -- fi -- fi\ -+ file=\"\$0\"" -+ -+ qECHO=`$ECHO "$ECHO" | $SED "$sed_quote_subst"` -+ $ECHO "\ -+ -+# A function that is used when there is no print builtin or printf. -+func_fallback_echo () -+{ -+ eval 'cat <<_LTECHO_EOF -+\$1 -+_LTECHO_EOF' -+} -+ ECHO=\"$qECHO\" -+ fi -+ -+# Very basic option parsing. These options are (a) specific to -+# the libtool wrapper, (b) are identical between the wrapper -+# /script/ and the wrapper /executable/ which is used only on -+# windows platforms, and (c) all begin with the string "--lt-" -+# (application programs are unlikely to have options which match -+# this pattern). -+# -+# There are only two supported options: --lt-debug and -+# --lt-dump-script. There is, deliberately, no --lt-help. -+# -+# The first argument to this parsing function should be the -+# script's $0 value, followed by "$@". -+lt_option_debug= -+func_parse_lt_options () -+{ -+ lt_script_arg0=\$0 -+ shift -+ for lt_opt -+ do -+ case \"\$lt_opt\" in -+ --lt-debug) lt_option_debug=1 ;; -+ --lt-dump-script) -+ lt_dump_D=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%/[^/]*$%%'\` -+ test \"X\$lt_dump_D\" = \"X\$lt_script_arg0\" && lt_dump_D=. -+ lt_dump_F=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%^.*/%%'\` -+ cat \"\$lt_dump_D/\$lt_dump_F\" -+ exit 0 -+ ;; -+ --lt-*) -+ \$ECHO \"Unrecognized --lt- option: '\$lt_opt'\" 1>&2 -+ exit 1 -+ ;; -+ esac -+ done -+ -+ # Print the debug banner immediately: -+ if test -n \"\$lt_option_debug\"; then -+ echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2 -+ fi -+} -+ -+# Used when --lt-debug. Prints its arguments to stdout -+# (redirection is the responsibility of the caller) -+func_lt_dump_args () -+{ -+ lt_dump_args_N=1; -+ for lt_arg -+ do -+ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\" -+ lt_dump_args_N=\`expr \$lt_dump_args_N + 1\` -+ done -+} -+ -+# Core function for launching the target application -+func_exec_program_core () -+{ - " -- $ECHO "\ -+ case $host in -+ # Backslashes separate directories on plain windows -+ *-*-mingw | *-*-os2* | *-cegcc*) -+ $ECHO "\ -+ if test -n \"\$lt_option_debug\"; then -+ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2 -+ func_lt_dump_args \${1+\"\$@\"} 1>&2 -+ fi -+ exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} -+" -+ ;; -+ -+ *) -+ $ECHO "\ -+ if test -n \"\$lt_option_debug\"; then -+ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2 -+ func_lt_dump_args \${1+\"\$@\"} 1>&2 -+ fi -+ exec \"\$progdir/\$program\" \${1+\"\$@\"} -+" -+ ;; -+ esac -+ $ECHO "\ -+ \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2 -+ exit 1 -+} -+ -+# A function to encapsulate launching the target application -+# Strips options in the --lt-* namespace from \$@ and -+# launches target application with the remaining arguments. -+func_exec_program () -+{ -+ case \" \$* \" in -+ *\\ --lt-*) -+ for lt_wr_arg -+ do -+ case \$lt_wr_arg in -+ --lt-*) ;; -+ *) set x \"\$@\" \"\$lt_wr_arg\"; shift;; -+ esac -+ shift -+ done ;; -+ esac -+ func_exec_program_core \${1+\"\$@\"} -+} -+ -+ # Parse options -+ func_parse_lt_options \"\$0\" \${1+\"\$@\"} - - # Find the directory that this script lives in. -- thisdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\` -+ thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\` - test \"x\$thisdir\" = \"x\$file\" && thisdir=. - - # Follow symbolic links until we get to the real thisdir. -- file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\` -+ file=\`ls -ld \"\$file\" | $SED -n 's/.*-> //p'\` - while test -n \"\$file\"; do -- destdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\` -+ destdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*\$%%'\` - - # If there was a directory component, then change thisdir. - if test \"x\$destdir\" != \"x\$file\"; then -@@ -2783,30 +4019,13 @@ else - esac - fi - -- file=\`\$ECHO \"X\$file\" | \$Xsed -e 's%^.*/%%'\` -- file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\` -+ file=\`\$ECHO \"\$file\" | $SED 's%^.*/%%'\` -+ file=\`ls -ld \"\$thisdir/\$file\" | $SED -n 's/.*-> //p'\` - done --" --} --# end: func_emit_wrapper_part1 -- --# func_emit_wrapper_part2 [arg=no] --# --# Emit the second part of a libtool wrapper script on stdout. --# For more information, see the description associated with --# func_emit_wrapper(), below. --func_emit_wrapper_part2 () --{ -- func_emit_wrapper_part2_arg1=no -- if test -n "$1" ; then -- func_emit_wrapper_part2_arg1=$1 -- fi -- -- $ECHO "\ - - # Usually 'no', except on cygwin/mingw when embedded into - # the cwrapper. -- WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_part2_arg1 -+ WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_arg1 - if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then - # special case for '.' - if test \"\$thisdir\" = \".\"; then -@@ -2814,7 +4033,7 @@ func_emit_wrapper_part2 () - fi - # remove .libs from thisdir - case \"\$thisdir\" in -- *[\\\\/]$objdir ) thisdir=\`\$ECHO \"X\$thisdir\" | \$Xsed -e 's%[\\\\/][^\\\\/]*$%%'\` ;; -+ *[\\\\/]$objdir ) thisdir=\`\$ECHO \"\$thisdir\" | $SED 's%[\\\\/][^\\\\/]*$%%'\` ;; - $objdir ) thisdir=. ;; - esac - fi -@@ -2869,6 +4088,18 @@ func_emit_wrapper_part2 () - - if test -f \"\$progdir/\$program\"; then" - -+ # fixup the dll searchpath if we need to. -+ # -+ # Fix the DLL searchpath if we need to. Do this before prepending -+ # to shlibpath, because on Windows, both are PATH and uninstalled -+ # libraries must come first. -+ if test -n "$dllsearchpath"; then -+ $ECHO "\ -+ # Add the dll search path components to the executable PATH -+ PATH=$dllsearchpath:\$PATH -+" -+ fi -+ - # Export our shlibpath_var if we have one. - if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then - $ECHO "\ -@@ -2877,253 +4108,28 @@ func_emit_wrapper_part2 () - - # Some systems cannot cope with colon-terminated $shlibpath_var - # The second colon is a workaround for a bug in BeOS R4 sed -- $shlibpath_var=\`\$ECHO \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\` -+ $shlibpath_var=\`\$ECHO \"\$$shlibpath_var\" | $SED 's/::*\$//'\` - - export $shlibpath_var - " - fi - -- # fixup the dll searchpath if we need to. -- if test -n "$dllsearchpath"; then -- $ECHO "\ -- # Add the dll search path components to the executable PATH -- PATH=$dllsearchpath:\$PATH --" -- fi -- - $ECHO "\ - if test \"\$libtool_execute_magic\" != \"$magic\"; then - # Run the actual program with our arguments. --" -- case $host in -- # Backslashes separate directories on plain windows -- *-*-mingw | *-*-os2* | *-cegcc*) -- $ECHO "\ -- exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} --" -- ;; -- -- *) -- $ECHO "\ -- exec \"\$progdir/\$program\" \${1+\"\$@\"} --" -- ;; -- esac -- $ECHO "\ -- \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2 -- exit 1 -+ func_exec_program \${1+\"\$@\"} - fi - else - # The program doesn't exist. - \$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2 - \$ECHO \"This script is just a wrapper for \$program.\" 1>&2 -- $ECHO \"See the $PACKAGE documentation for more information.\" 1>&2 -+ \$ECHO \"See the $PACKAGE documentation for more information.\" 1>&2 - exit 1 - fi - fi\ - " - } --# end: func_emit_wrapper_part2 -- -- --# func_emit_wrapper [arg=no] --# --# Emit a libtool wrapper script on stdout. --# Don't directly open a file because we may want to --# incorporate the script contents within a cygwin/mingw --# wrapper executable. Must ONLY be called from within --# func_mode_link because it depends on a number of variables --# set therein. --# --# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR --# variable will take. If 'yes', then the emitted script --# will assume that the directory in which it is stored is --# the $objdir directory. This is a cygwin/mingw-specific --# behavior. --func_emit_wrapper () --{ -- func_emit_wrapper_arg1=no -- if test -n "$1" ; then -- func_emit_wrapper_arg1=$1 -- fi -- -- # split this up so that func_emit_cwrapperexe_src -- # can call each part independently. -- func_emit_wrapper_part1 "${func_emit_wrapper_arg1}" -- func_emit_wrapper_part2 "${func_emit_wrapper_arg1}" --} -- -- --# func_to_host_path arg --# --# Convert paths to host format when used with build tools. --# Intended for use with "native" mingw (where libtool itself --# is running under the msys shell), or in the following cross- --# build environments: --# $build $host --# mingw (msys) mingw [e.g. native] --# cygwin mingw --# *nix + wine mingw --# where wine is equipped with the `winepath' executable. --# In the native mingw case, the (msys) shell automatically --# converts paths for any non-msys applications it launches, --# but that facility isn't available from inside the cwrapper. --# Similar accommodations are necessary for $host mingw and --# $build cygwin. Calling this function does no harm for other --# $host/$build combinations not listed above. --# --# ARG is the path (on $build) that should be converted to --# the proper representation for $host. The result is stored --# in $func_to_host_path_result. --func_to_host_path () --{ -- func_to_host_path_result="$1" -- if test -n "$1" ; then -- case $host in -- *mingw* ) -- lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' -- case $build in -- *mingw* ) # actually, msys -- # awkward: cmd appends spaces to result -- lt_sed_strip_trailing_spaces="s/[ ]*\$//" -- func_to_host_path_tmp1=`( cmd //c echo "$1" |\ -- $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""` -- func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\ -- $SED -e "$lt_sed_naive_backslashify"` -- ;; -- *cygwin* ) -- func_to_host_path_tmp1=`cygpath -w "$1"` -- func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\ -- $SED -e "$lt_sed_naive_backslashify"` -- ;; -- * ) -- # Unfortunately, winepath does not exit with a non-zero -- # error code, so we are forced to check the contents of -- # stdout. On the other hand, if the command is not -- # found, the shell will set an exit code of 127 and print -- # *an error message* to stdout. So we must check for both -- # error code of zero AND non-empty stdout, which explains -- # the odd construction: -- func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null` -- if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then -- func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\ -- $SED -e "$lt_sed_naive_backslashify"` -- else -- # Allow warning below. -- func_to_host_path_result="" -- fi -- ;; -- esac -- if test -z "$func_to_host_path_result" ; then -- func_error "Could not determine host path corresponding to" -- func_error " '$1'" -- func_error "Continuing, but uninstalled executables may not work." -- # Fallback: -- func_to_host_path_result="$1" -- fi -- ;; -- esac -- fi --} --# end: func_to_host_path - --# func_to_host_pathlist arg --# --# Convert pathlists to host format when used with build tools. --# See func_to_host_path(), above. This function supports the --# following $build/$host combinations (but does no harm for --# combinations not listed here): --# $build $host --# mingw (msys) mingw [e.g. native] --# cygwin mingw --# *nix + wine mingw --# --# Path separators are also converted from $build format to --# $host format. If ARG begins or ends with a path separator --# character, it is preserved (but converted to $host format) --# on output. --# --# ARG is a pathlist (on $build) that should be converted to --# the proper representation on $host. The result is stored --# in $func_to_host_pathlist_result. --func_to_host_pathlist () --{ -- func_to_host_pathlist_result="$1" -- if test -n "$1" ; then -- case $host in -- *mingw* ) -- lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' -- # Remove leading and trailing path separator characters from -- # ARG. msys behavior is inconsistent here, cygpath turns them -- # into '.;' and ';.', and winepath ignores them completely. -- func_to_host_pathlist_tmp2="$1" -- # Once set for this call, this variable should not be -- # reassigned. It is used in tha fallback case. -- func_to_host_pathlist_tmp1=`echo "$func_to_host_pathlist_tmp2" |\ -- $SED -e 's|^:*||' -e 's|:*$||'` -- case $build in -- *mingw* ) # Actually, msys. -- # Awkward: cmd appends spaces to result. -- lt_sed_strip_trailing_spaces="s/[ ]*\$//" -- func_to_host_pathlist_tmp2=`( cmd //c echo "$func_to_host_pathlist_tmp1" |\ -- $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""` -- func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\ -- $SED -e "$lt_sed_naive_backslashify"` -- ;; -- *cygwin* ) -- func_to_host_pathlist_tmp2=`cygpath -w -p "$func_to_host_pathlist_tmp1"` -- func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\ -- $SED -e "$lt_sed_naive_backslashify"` -- ;; -- * ) -- # unfortunately, winepath doesn't convert pathlists -- func_to_host_pathlist_result="" -- func_to_host_pathlist_oldIFS=$IFS -- IFS=: -- for func_to_host_pathlist_f in $func_to_host_pathlist_tmp1 ; do -- IFS=$func_to_host_pathlist_oldIFS -- if test -n "$func_to_host_pathlist_f" ; then -- func_to_host_path "$func_to_host_pathlist_f" -- if test -n "$func_to_host_path_result" ; then -- if test -z "$func_to_host_pathlist_result" ; then -- func_to_host_pathlist_result="$func_to_host_path_result" -- else -- func_to_host_pathlist_result="$func_to_host_pathlist_result;$func_to_host_path_result" -- fi -- fi -- fi -- IFS=: -- done -- IFS=$func_to_host_pathlist_oldIFS -- ;; -- esac -- if test -z "$func_to_host_pathlist_result" ; then -- func_error "Could not determine the host path(s) corresponding to" -- func_error " '$1'" -- func_error "Continuing, but uninstalled executables may not work." -- # Fallback. This may break if $1 contains DOS-style drive -- # specifications. The fix is not to complicate the expression -- # below, but for the user to provide a working wine installation -- # with winepath so that path translation in the cross-to-mingw -- # case works properly. -- lt_replace_pathsep_nix_to_dos="s|:|;|g" -- func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp1" |\ -- $SED -e "$lt_replace_pathsep_nix_to_dos"` -- fi -- # Now, add the leading and trailing path separators back -- case "$1" in -- :* ) func_to_host_pathlist_result=";$func_to_host_pathlist_result" -- ;; -- esac -- case "$1" in -- *: ) func_to_host_pathlist_result="$func_to_host_pathlist_result;" -- ;; -- esac -- ;; -- esac -- fi --} --# end: func_to_host_pathlist - - # func_emit_cwrapperexe_src - # emit the source code for a wrapper executable on stdout -@@ -3141,31 +4147,23 @@ func_emit_cwrapperexe_src () - - This wrapper executable should never be moved out of the build directory. - If it is, it will not operate correctly. -- -- Currently, it simply execs the wrapper *script* "$SHELL $output", -- but could eventually absorb all of the scripts functionality and -- exec $objdir/$outputname directly. - */ - EOF - cat <<"EOF" -+#ifdef _MSC_VER -+# define _CRT_SECURE_NO_DEPRECATE 1 -+#endif - #include - #include - #ifdef _MSC_VER - # include - # include - # include --# define setmode _setmode - #else - # include - # include - # ifdef __CYGWIN__ - # include --# define HAVE_SETENV --# ifdef __STRICT_ANSI__ --char *realpath (const char *, char *); --int putenv (char *); --int setenv (const char *, const char *, int); --# endif - # endif - #endif - #include -@@ -3177,6 +4175,44 @@ int setenv (const char *, const char *, int); - #include - #include - -+/* declarations of non-ANSI functions */ -+#if defined(__MINGW32__) -+# ifdef __STRICT_ANSI__ -+int _putenv (const char *); -+# endif -+#elif defined(__CYGWIN__) -+# ifdef __STRICT_ANSI__ -+char *realpath (const char *, char *); -+int putenv (char *); -+int setenv (const char *, const char *, int); -+# endif -+/* #elif defined (other platforms) ... */ -+#endif -+ -+/* portability defines, excluding path handling macros */ -+#if defined(_MSC_VER) -+# define setmode _setmode -+# define stat _stat -+# define chmod _chmod -+# define getcwd _getcwd -+# define putenv _putenv -+# define S_IXUSR _S_IEXEC -+# ifndef _INTPTR_T_DEFINED -+# define _INTPTR_T_DEFINED -+# define intptr_t int -+# endif -+#elif defined(__MINGW32__) -+# define setmode _setmode -+# define stat _stat -+# define chmod _chmod -+# define getcwd _getcwd -+# define putenv _putenv -+#elif defined(__CYGWIN__) -+# define HAVE_SETENV -+# define FOPEN_WB "wb" -+/* #elif defined (other platforms) ... */ -+#endif -+ - #if defined(PATH_MAX) - # define LT_PATHMAX PATH_MAX - #elif defined(MAXPATHLEN) -@@ -3192,14 +4228,7 @@ int setenv (const char *, const char *, int); - # define S_IXGRP 0 - #endif - --#ifdef _MSC_VER --# define S_IXUSR _S_IEXEC --# define stat _stat --# ifndef _INTPTR_T_DEFINED --# define intptr_t int --# endif --#endif -- -+/* path handling portability macros */ - #ifndef DIR_SEPARATOR - # define DIR_SEPARATOR '/' - # define PATH_SEPARATOR ':' -@@ -3230,10 +4259,6 @@ int setenv (const char *, const char *, int); - # define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2) - #endif /* PATH_SEPARATOR_2 */ - --#ifdef __CYGWIN__ --# define FOPEN_WB "wb" --#endif -- - #ifndef FOPEN_WB - # define FOPEN_WB "w" - #endif -@@ -3246,22 +4271,13 @@ int setenv (const char *, const char *, int); - if (stale) { free ((void *) stale); stale = 0; } \ - } while (0) - --#undef LTWRAPPER_DEBUGPRINTF --#if defined DEBUGWRAPPER --# define LTWRAPPER_DEBUGPRINTF(args) ltwrapper_debugprintf args --static void --ltwrapper_debugprintf (const char *fmt, ...) --{ -- va_list args; -- va_start (args, fmt); -- (void) vfprintf (stderr, fmt, args); -- va_end (args); --} -+#if defined(LT_DEBUGWRAPPER) -+static int lt_debug = 1; - #else --# define LTWRAPPER_DEBUGPRINTF(args) -+static int lt_debug = 0; - #endif - --const char *program_name = NULL; -+const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */ - - void *xmalloc (size_t num); - char *xstrdup (const char *string); -@@ -3271,41 +4287,27 @@ char *chase_symlinks (const char *pathspec); - int make_executable (const char *path); - int check_executable (const char *path); - char *strendzap (char *str, const char *pat); --void lt_fatal (const char *message, ...); -+void lt_debugprintf (const char *file, int line, const char *fmt, ...); -+void lt_fatal (const char *file, int line, const char *message, ...); -+static const char *nonnull (const char *s); -+static const char *nonempty (const char *s); - void lt_setenv (const char *name, const char *value); - char *lt_extend_str (const char *orig_value, const char *add, int to_end); --void lt_opt_process_env_set (const char *arg); --void lt_opt_process_env_prepend (const char *arg); --void lt_opt_process_env_append (const char *arg); --int lt_split_name_value (const char *arg, char** name, char** value); - void lt_update_exe_path (const char *name, const char *value); - void lt_update_lib_path (const char *name, const char *value); -- --static const char *script_text_part1 = --EOF -- -- func_emit_wrapper_part1 yes | -- $SED -e 's/\([\\"]\)/\\\1/g' \ -- -e 's/^/ "/' -e 's/$/\\n"/' -- echo ";" -- cat <"))); -+ lt_debugprintf (__FILE__, __LINE__, "(main) lt_argv_zero: %s\n", -+ nonnull (lt_argv_zero)); - for (i = 0; i < newargc; i++) - { -- LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d] : %s\n", i, (newargz[i] ? newargz[i] : ""))); -+ lt_debugprintf (__FILE__, __LINE__, "(main) newargz[%d]: %s\n", -+ i, nonnull (newargz[i])); - } - - EOF -@@ -3560,11 +4523,14 @@ EOF - mingw*) - cat <<"EOF" - /* execv doesn't actually work on mingw as expected on unix */ -+ newargz = prepare_spawn (newargz); - rval = _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz); - if (rval == -1) - { - /* failed to start process */ -- LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target \"%s\": errno = %d\n", lt_argv_zero, errno)); -+ lt_debugprintf (__FILE__, __LINE__, -+ "(main) failed to launch target \"%s\": %s\n", -+ lt_argv_zero, nonnull (strerror (errno))); - return 127; - } - return rval; -@@ -3586,7 +4552,7 @@ xmalloc (size_t num) - { - void *p = (void *) malloc (num); - if (!p) -- lt_fatal ("Memory exhausted"); -+ lt_fatal (__FILE__, __LINE__, "memory exhausted"); - - return p; - } -@@ -3620,8 +4586,8 @@ check_executable (const char *path) - { - struct stat st; - -- LTWRAPPER_DEBUGPRINTF (("(check_executable) : %s\n", -- path ? (*path ? path : "EMPTY!") : "NULL!")); -+ lt_debugprintf (__FILE__, __LINE__, "(check_executable): %s\n", -+ nonempty (path)); - if ((!path) || (!*path)) - return 0; - -@@ -3638,8 +4604,8 @@ make_executable (const char *path) - int rval = 0; - struct stat st; - -- LTWRAPPER_DEBUGPRINTF (("(make_executable) : %s\n", -- path ? (*path ? path : "EMPTY!") : "NULL!")); -+ lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n", -+ nonempty (path)); - if ((!path) || (!*path)) - return 0; - -@@ -3665,8 +4631,8 @@ find_executable (const char *wrapper) - int tmp_len; - char *concat_name; - -- LTWRAPPER_DEBUGPRINTF (("(find_executable) : %s\n", -- wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!")); -+ lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n", -+ nonempty (wrapper)); - - if ((wrapper == NULL) || (*wrapper == '\0')) - return NULL; -@@ -3719,7 +4685,8 @@ find_executable (const char *wrapper) - { - /* empty path: current directory */ - if (getcwd (tmp, LT_PATHMAX) == NULL) -- lt_fatal ("getcwd failed"); -+ lt_fatal (__FILE__, __LINE__, "getcwd failed: %s", -+ nonnull (strerror (errno))); - tmp_len = strlen (tmp); - concat_name = - XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); -@@ -3744,7 +4711,8 @@ find_executable (const char *wrapper) - } - /* Relative path | not found in path: prepend cwd */ - if (getcwd (tmp, LT_PATHMAX) == NULL) -- lt_fatal ("getcwd failed"); -+ lt_fatal (__FILE__, __LINE__, "getcwd failed: %s", -+ nonnull (strerror (errno))); - tmp_len = strlen (tmp); - concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); - memcpy (concat_name, tmp, tmp_len); -@@ -3770,8 +4738,9 @@ chase_symlinks (const char *pathspec) - int has_symlinks = 0; - while (strlen (tmp_pathspec) && !has_symlinks) - { -- LTWRAPPER_DEBUGPRINTF (("checking path component for symlinks: %s\n", -- tmp_pathspec)); -+ lt_debugprintf (__FILE__, __LINE__, -+ "checking path component for symlinks: %s\n", -+ tmp_pathspec); - if (lstat (tmp_pathspec, &s) == 0) - { - if (S_ISLNK (s.st_mode) != 0) -@@ -3793,8 +4762,9 @@ chase_symlinks (const char *pathspec) - } - else - { -- char *errstr = strerror (errno); -- lt_fatal ("Error accessing file %s (%s)", tmp_pathspec, errstr); -+ lt_fatal (__FILE__, __LINE__, -+ "error accessing file \"%s\": %s", -+ tmp_pathspec, nonnull (strerror (errno))); - } - } - XFREE (tmp_pathspec); -@@ -3807,7 +4777,8 @@ chase_symlinks (const char *pathspec) - tmp_pathspec = realpath (pathspec, buf); - if (tmp_pathspec == 0) - { -- lt_fatal ("Could not follow symlinks for %s", pathspec); -+ lt_fatal (__FILE__, __LINE__, -+ "could not follow symlinks for %s", pathspec); - } - return xstrdup (tmp_pathspec); - #endif -@@ -3833,11 +4804,25 @@ strendzap (char *str, const char *pat) - return str; - } - -+void -+lt_debugprintf (const char *file, int line, const char *fmt, ...) -+{ -+ va_list args; -+ if (lt_debug) -+ { -+ (void) fprintf (stderr, "%s:%s:%d: ", program_name, file, line); -+ va_start (args, fmt); -+ (void) vfprintf (stderr, fmt, args); -+ va_end (args); -+ } -+} -+ - static void --lt_error_core (int exit_status, const char *mode, -+lt_error_core (int exit_status, const char *file, -+ int line, const char *mode, - const char *message, va_list ap) - { -- fprintf (stderr, "%s: %s: ", program_name, mode); -+ fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode); - vfprintf (stderr, message, ap); - fprintf (stderr, ".\n"); - -@@ -3846,20 +4831,32 @@ lt_error_core (int exit_status, const char *mode, - } - - void --lt_fatal (const char *message, ...) -+lt_fatal (const char *file, int line, const char *message, ...) - { - va_list ap; - va_start (ap, message); -- lt_error_core (EXIT_FAILURE, "FATAL", message, ap); -+ lt_error_core (EXIT_FAILURE, file, line, "FATAL", message, ap); - va_end (ap); - } - -+static const char * -+nonnull (const char *s) -+{ -+ return s ? s : "(null)"; -+} -+ -+static const char * -+nonempty (const char *s) -+{ -+ return (s && !*s) ? "(empty)" : nonnull (s); -+} -+ - void - lt_setenv (const char *name, const char *value) - { -- LTWRAPPER_DEBUGPRINTF (("(lt_setenv) setting '%s' to '%s'\n", -- (name ? name : ""), -- (value ? value : ""))); -+ lt_debugprintf (__FILE__, __LINE__, -+ "(lt_setenv) setting '%s' to '%s'\n", -+ nonnull (name), nonnull (value)); - { - #ifdef HAVE_SETENV - /* always make a copy, for consistency with !HAVE_SETENV */ -@@ -3904,95 +4901,12 @@ lt_extend_str (const char *orig_value, const char *add, int to_end) - return new_value; - } - --int --lt_split_name_value (const char *arg, char** name, char** value) --{ -- const char *p; -- int len; -- if (!arg || !*arg) -- return 1; -- -- p = strchr (arg, (int)'='); -- -- if (!p) -- return 1; -- -- *value = xstrdup (++p); -- -- len = strlen (arg) - strlen (*value); -- *name = XMALLOC (char, len); -- strncpy (*name, arg, len-1); -- (*name)[len - 1] = '\0'; -- -- return 0; --} -- --void --lt_opt_process_env_set (const char *arg) --{ -- char *name = NULL; -- char *value = NULL; -- -- if (lt_split_name_value (arg, &name, &value) != 0) -- { -- XFREE (name); -- XFREE (value); -- lt_fatal ("bad argument for %s: '%s'", env_set_opt, arg); -- } -- -- lt_setenv (name, value); -- XFREE (name); -- XFREE (value); --} -- --void --lt_opt_process_env_prepend (const char *arg) --{ -- char *name = NULL; -- char *value = NULL; -- char *new_value = NULL; -- -- if (lt_split_name_value (arg, &name, &value) != 0) -- { -- XFREE (name); -- XFREE (value); -- lt_fatal ("bad argument for %s: '%s'", env_prepend_opt, arg); -- } -- -- new_value = lt_extend_str (getenv (name), value, 0); -- lt_setenv (name, new_value); -- XFREE (new_value); -- XFREE (name); -- XFREE (value); --} -- --void --lt_opt_process_env_append (const char *arg) --{ -- char *name = NULL; -- char *value = NULL; -- char *new_value = NULL; -- -- if (lt_split_name_value (arg, &name, &value) != 0) -- { -- XFREE (name); -- XFREE (value); -- lt_fatal ("bad argument for %s: '%s'", env_append_opt, arg); -- } -- -- new_value = lt_extend_str (getenv (name), value, 1); -- lt_setenv (name, new_value); -- XFREE (new_value); -- XFREE (name); -- XFREE (value); --} -- - void - lt_update_exe_path (const char *name, const char *value) - { -- LTWRAPPER_DEBUGPRINTF (("(lt_update_exe_path) modifying '%s' by prepending '%s'\n", -- (name ? name : ""), -- (value ? value : ""))); -+ lt_debugprintf (__FILE__, __LINE__, -+ "(lt_update_exe_path) modifying '%s' by prepending '%s'\n", -+ nonnull (name), nonnull (value)); - - if (name && *name && value && *value) - { -@@ -4011,9 +4925,9 @@ lt_update_exe_path (const char *name, const char *value) - void - lt_update_lib_path (const char *name, const char *value) - { -- LTWRAPPER_DEBUGPRINTF (("(lt_update_lib_path) modifying '%s' by prepending '%s'\n", -- (name ? name : ""), -- (value ? value : ""))); -+ lt_debugprintf (__FILE__, __LINE__, -+ "(lt_update_lib_path) modifying '%s' by prepending '%s'\n", -+ nonnull (name), nonnull (value)); - - if (name && *name && value && *value) - { -@@ -4023,11 +4937,158 @@ lt_update_lib_path (const char *name, const char *value) - } - } - -+EOF -+ case $host_os in -+ mingw*) -+ cat <<"EOF" -+ -+/* Prepares an argument vector before calling spawn(). -+ Note that spawn() does not by itself call the command interpreter -+ (getenv ("COMSPEC") != NULL ? getenv ("COMSPEC") : -+ ({ OSVERSIONINFO v; v.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); -+ GetVersionEx(&v); -+ v.dwPlatformId == VER_PLATFORM_WIN32_NT; -+ }) ? "cmd.exe" : "command.com"). -+ Instead it simply concatenates the arguments, separated by ' ', and calls -+ CreateProcess(). We must quote the arguments since Win32 CreateProcess() -+ interprets characters like ' ', '\t', '\\', '"' (but not '<' and '>') in a -+ special way: -+ - Space and tab are interpreted as delimiters. They are not treated as -+ delimiters if they are surrounded by double quotes: "...". -+ - Unescaped double quotes are removed from the input. Their only effect is -+ that within double quotes, space and tab are treated like normal -+ characters. -+ - Backslashes not followed by double quotes are not special. -+ - But 2*n+1 backslashes followed by a double quote become -+ n backslashes followed by a double quote (n >= 0): -+ \" -> " -+ \\\" -> \" -+ \\\\\" -> \\" -+ */ -+#define SHELL_SPECIAL_CHARS "\"\\ \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037" -+#define SHELL_SPACE_CHARS " \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037" -+char ** -+prepare_spawn (char **argv) -+{ -+ size_t argc; -+ char **new_argv; -+ size_t i; -+ -+ /* Count number of arguments. */ -+ for (argc = 0; argv[argc] != NULL; argc++) -+ ; -+ -+ /* Allocate new argument vector. */ -+ new_argv = XMALLOC (char *, argc + 1); -+ -+ /* Put quoted arguments into the new argument vector. */ -+ for (i = 0; i < argc; i++) -+ { -+ const char *string = argv[i]; -+ -+ if (string[0] == '\0') -+ new_argv[i] = xstrdup ("\"\""); -+ else if (strpbrk (string, SHELL_SPECIAL_CHARS) != NULL) -+ { -+ int quote_around = (strpbrk (string, SHELL_SPACE_CHARS) != NULL); -+ size_t length; -+ unsigned int backslashes; -+ const char *s; -+ char *quoted_string; -+ char *p; -+ -+ length = 0; -+ backslashes = 0; -+ if (quote_around) -+ length++; -+ for (s = string; *s != '\0'; s++) -+ { -+ char c = *s; -+ if (c == '"') -+ length += backslashes + 1; -+ length++; -+ if (c == '\\') -+ backslashes++; -+ else -+ backslashes = 0; -+ } -+ if (quote_around) -+ length += backslashes + 1; -+ -+ quoted_string = XMALLOC (char, length + 1); -+ -+ p = quoted_string; -+ backslashes = 0; -+ if (quote_around) -+ *p++ = '"'; -+ for (s = string; *s != '\0'; s++) -+ { -+ char c = *s; -+ if (c == '"') -+ { -+ unsigned int j; -+ for (j = backslashes + 1; j > 0; j--) -+ *p++ = '\\'; -+ } -+ *p++ = c; -+ if (c == '\\') -+ backslashes++; -+ else -+ backslashes = 0; -+ } -+ if (quote_around) -+ { -+ unsigned int j; -+ for (j = backslashes; j > 0; j--) -+ *p++ = '\\'; -+ *p++ = '"'; -+ } -+ *p = '\0'; -+ -+ new_argv[i] = quoted_string; -+ } -+ else -+ new_argv[i] = (char *) string; -+ } -+ new_argv[argc] = NULL; -+ -+ return new_argv; -+} -+EOF -+ ;; -+ esac - -+ cat <<"EOF" -+void lt_dump_script (FILE* f) -+{ -+EOF -+ func_emit_wrapper yes | -+ $SED -n -e ' -+s/^\(.\{79\}\)\(..*\)/\1\ -+\2/ -+h -+s/\([\\"]\)/\\\1/g -+s/$/\\n/ -+s/\([^\n]*\).*/ fputs ("\1", f);/p -+g -+D' -+ cat <<"EOF" -+} - EOF - } - # end: func_emit_cwrapperexe_src - -+# func_win32_import_lib_p ARG -+# True if ARG is an import lib, as indicated by $file_magic_cmd -+func_win32_import_lib_p () -+{ -+ $opt_debug -+ case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in -+ *import*) : ;; -+ *) false ;; -+ esac -+} -+ - # func_mode_link arg... - func_mode_link () - { -@@ -4072,6 +5133,7 @@ func_mode_link () - new_inherited_linker_flags= - - avoid_version=no -+ bindir= - dlfiles= - dlprefiles= - dlself=no -@@ -4164,6 +5226,11 @@ func_mode_link () - esac - - case $prev in -+ bindir) -+ bindir="$arg" -+ prev= -+ continue -+ ;; - dlfiles|dlprefiles) - if test "$preload" = no; then - # Add the symbol object into the linking commands. -@@ -4195,9 +5262,9 @@ func_mode_link () - ;; - *) - if test "$prev" = dlfiles; then -- dlfiles="$dlfiles $arg" -+ func_append dlfiles " $arg" - else -- dlprefiles="$dlprefiles $arg" -+ func_append dlprefiles " $arg" - fi - prev= - continue -@@ -4221,7 +5288,7 @@ func_mode_link () - *-*-darwin*) - case "$deplibs " in - *" $qarg.ltframework "*) ;; -- *) deplibs="$deplibs $qarg.ltframework" # this is fixed later -+ *) func_append deplibs " $qarg.ltframework" # this is fixed later - ;; - esac - ;; -@@ -4240,7 +5307,7 @@ func_mode_link () - moreargs= - for fil in `cat "$save_arg"` - do --# moreargs="$moreargs $fil" -+# func_append moreargs " $fil" - arg=$fil - # A libtool-controlled object. - -@@ -4269,7 +5336,7 @@ func_mode_link () - - if test "$prev" = dlfiles; then - if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then -- dlfiles="$dlfiles $pic_object" -+ func_append dlfiles " $pic_object" - prev= - continue - else -@@ -4281,7 +5348,7 @@ func_mode_link () - # CHECK ME: I think I busted this. -Ossama - if test "$prev" = dlprefiles; then - # Preload the old-style object. -- dlprefiles="$dlprefiles $pic_object" -+ func_append dlprefiles " $pic_object" - prev= - fi - -@@ -4351,12 +5418,12 @@ func_mode_link () - if test "$prev" = rpath; then - case "$rpath " in - *" $arg "*) ;; -- *) rpath="$rpath $arg" ;; -+ *) func_append rpath " $arg" ;; - esac - else - case "$xrpath " in - *" $arg "*) ;; -- *) xrpath="$xrpath $arg" ;; -+ *) func_append xrpath " $arg" ;; - esac - fi - prev= -@@ -4368,28 +5435,28 @@ func_mode_link () - continue - ;; - weak) -- weak_libs="$weak_libs $arg" -+ func_append weak_libs " $arg" - prev= - continue - ;; - xcclinker) -- linker_flags="$linker_flags $qarg" -- compiler_flags="$compiler_flags $qarg" -+ func_append linker_flags " $qarg" -+ func_append compiler_flags " $qarg" - prev= - func_append compile_command " $qarg" - func_append finalize_command " $qarg" - continue - ;; - xcompiler) -- compiler_flags="$compiler_flags $qarg" -+ func_append compiler_flags " $qarg" - prev= - func_append compile_command " $qarg" - func_append finalize_command " $qarg" - continue - ;; - xlinker) -- linker_flags="$linker_flags $qarg" -- compiler_flags="$compiler_flags $wl$qarg" -+ func_append linker_flags " $qarg" -+ func_append compiler_flags " $wl$qarg" - prev= - func_append compile_command " $wl$qarg" - func_append finalize_command " $wl$qarg" -@@ -4425,6 +5492,11 @@ func_mode_link () - continue - ;; - -+ -bindir) -+ prev=bindir -+ continue -+ ;; -+ - -dlopen) - prev=dlfiles - continue -@@ -4475,15 +5547,16 @@ func_mode_link () - ;; - - -L*) -- func_stripname '-L' '' "$arg" -- dir=$func_stripname_result -- if test -z "$dir"; then -+ func_stripname "-L" '' "$arg" -+ if test -z "$func_stripname_result"; then - if test "$#" -gt 0; then - func_fatal_error "require no space between \`-L' and \`$1'" - else - func_fatal_error "need path for \`-L' option" - fi - fi -+ func_resolve_sysroot "$func_stripname_result" -+ dir=$func_resolve_sysroot_result - # We need an absolute path. - case $dir in - [\\/]* | [A-Za-z]:[\\/]*) ;; -@@ -4495,24 +5568,30 @@ func_mode_link () - ;; - esac - case "$deplibs " in -- *" -L$dir "*) ;; -+ *" -L$dir "* | *" $arg "*) -+ # Will only happen for absolute or sysroot arguments -+ ;; - *) -- deplibs="$deplibs -L$dir" -- lib_search_path="$lib_search_path $dir" -+ # Preserve sysroot, but never include relative directories -+ case $dir in -+ [\\/]* | [A-Za-z]:[\\/]* | =*) func_append deplibs " $arg" ;; -+ *) func_append deplibs " -L$dir" ;; -+ esac -+ func_append lib_search_path " $dir" - ;; - esac - case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) -- testbindir=`$ECHO "X$dir" | $Xsed -e 's*/lib$*/bin*'` -+ testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'` - case :$dllsearchpath: in - *":$dir:"*) ;; - ::) dllsearchpath=$dir;; -- *) dllsearchpath="$dllsearchpath:$dir";; -+ *) func_append dllsearchpath ":$dir";; - esac - case :$dllsearchpath: in - *":$testbindir:"*) ;; - ::) dllsearchpath=$testbindir;; -- *) dllsearchpath="$dllsearchpath:$testbindir";; -+ *) func_append dllsearchpath ":$testbindir";; - esac - ;; - esac -@@ -4522,7 +5601,7 @@ func_mode_link () - -l*) - if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then - case $host in -- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc*) -+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*) - # These systems don't actually have a C or math library (as such) - continue - ;; -@@ -4536,7 +5615,7 @@ func_mode_link () - ;; - *-*-rhapsody* | *-*-darwin1.[012]) - # Rhapsody C and math libraries are in the System framework -- deplibs="$deplibs System.ltframework" -+ func_append deplibs " System.ltframework" - continue - ;; - *-*-sco3.2v5* | *-*-sco5v6*) -@@ -4556,7 +5635,7 @@ func_mode_link () - ;; - esac - fi -- deplibs="$deplibs $arg" -+ func_append deplibs " $arg" - continue - ;; - -@@ -4568,21 +5647,22 @@ func_mode_link () - # Tru64 UNIX uses -model [arg] to determine the layout of C++ - # classes, name mangling, and exception handling. - # Darwin uses the -arch flag to determine output architecture. -- -model|-arch|-isysroot) -- compiler_flags="$compiler_flags $arg" -+ -model|-arch|-isysroot|--sysroot) -+ func_append compiler_flags " $arg" - func_append compile_command " $arg" - func_append finalize_command " $arg" - prev=xcompiler - continue - ;; - -- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) -- compiler_flags="$compiler_flags $arg" -+ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ -+ |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) -+ func_append compiler_flags " $arg" - func_append compile_command " $arg" - func_append finalize_command " $arg" - case "$new_inherited_linker_flags " in - *" $arg "*) ;; -- * ) new_inherited_linker_flags="$new_inherited_linker_flags $arg" ;; -+ * ) func_append new_inherited_linker_flags " $arg" ;; - esac - continue - ;; -@@ -4649,13 +5729,17 @@ func_mode_link () - # We need an absolute path. - case $dir in - [\\/]* | [A-Za-z]:[\\/]*) ;; -+ =*) -+ func_stripname '=' '' "$dir" -+ dir=$lt_sysroot$func_stripname_result -+ ;; - *) - func_fatal_error "only absolute run-paths are allowed" - ;; - esac - case "$xrpath " in - *" $dir "*) ;; -- *) xrpath="$xrpath $dir" ;; -+ *) func_append xrpath " $dir" ;; - esac - continue - ;; -@@ -4708,8 +5792,8 @@ func_mode_link () - for flag in $args; do - IFS="$save_ifs" - func_quote_for_eval "$flag" -- arg="$arg $wl$func_quote_for_eval_result" -- compiler_flags="$compiler_flags $func_quote_for_eval_result" -+ func_append arg " $func_quote_for_eval_result" -+ func_append compiler_flags " $func_quote_for_eval_result" - done - IFS="$save_ifs" - func_stripname ' ' '' "$arg" -@@ -4724,9 +5808,9 @@ func_mode_link () - for flag in $args; do - IFS="$save_ifs" - func_quote_for_eval "$flag" -- arg="$arg $wl$func_quote_for_eval_result" -- compiler_flags="$compiler_flags $wl$func_quote_for_eval_result" -- linker_flags="$linker_flags $func_quote_for_eval_result" -+ func_append arg " $wl$func_quote_for_eval_result" -+ func_append compiler_flags " $wl$func_quote_for_eval_result" -+ func_append linker_flags " $func_quote_for_eval_result" - done - IFS="$save_ifs" - func_stripname ' ' '' "$arg" -@@ -4754,23 +5838,27 @@ func_mode_link () - arg="$func_quote_for_eval_result" - ;; - -- # -64, -mips[0-9] enable 64-bit mode on the SGI compiler -- # -r[0-9][0-9]* specifies the processor on the SGI compiler -- # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler -- # +DA*, +DD* enable 64-bit mode on the HP compiler -- # -q* pass through compiler args for the IBM compiler -- # -m*, -t[45]*, -txscale* pass through architecture-specific -- # compiler args for GCC -- # -F/path gives path to uninstalled frameworks, gcc on darwin -- # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC -- # @file GCC response files -+ # Flags to be passed through unchanged, with rationale: -+ # -64, -mips[0-9] enable 64-bit mode for the SGI compiler -+ # -r[0-9][0-9]* specify processor for the SGI compiler -+ # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler -+ # +DA*, +DD* enable 64-bit mode for the HP compiler -+ # -q* compiler args for the IBM compiler -+ # -m*, -t[45]*, -txscale* architecture-specific flags for GCC -+ # -F/path path to uninstalled frameworks, gcc on darwin -+ # -p, -pg, --coverage, -fprofile-* profiling flags for GCC -+ # @file GCC response files -+ # -tp=* Portland pgcc target processor selection -+ # --sysroot=* for sysroot support -+ # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization - -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*) -+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ -+ -O*|-flto*|-fwhopr*|-fuse-linker-plugin) - func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" - func_append compile_command " $arg" - func_append finalize_command " $arg" -- compiler_flags="$compiler_flags $arg" -+ func_append compiler_flags " $arg" - continue - ;; - -@@ -4782,7 +5870,7 @@ func_mode_link () - - *.$objext) - # A standard object. -- objs="$objs $arg" -+ func_append objs " $arg" - ;; - - *.lo) -@@ -4813,7 +5901,7 @@ func_mode_link () - - if test "$prev" = dlfiles; then - if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then -- dlfiles="$dlfiles $pic_object" -+ func_append dlfiles " $pic_object" - prev= - continue - else -@@ -4825,7 +5913,7 @@ func_mode_link () - # CHECK ME: I think I busted this. -Ossama - if test "$prev" = dlprefiles; then - # Preload the old-style object. -- dlprefiles="$dlprefiles $pic_object" -+ func_append dlprefiles " $pic_object" - prev= - fi - -@@ -4870,24 +5958,25 @@ func_mode_link () - - *.$libext) - # An archive. -- deplibs="$deplibs $arg" -- old_deplibs="$old_deplibs $arg" -+ func_append deplibs " $arg" -+ func_append old_deplibs " $arg" - continue - ;; - - *.la) - # A libtool-controlled library. - -+ func_resolve_sysroot "$arg" - if test "$prev" = dlfiles; then - # This library was specified with -dlopen. -- dlfiles="$dlfiles $arg" -+ func_append dlfiles " $func_resolve_sysroot_result" - prev= - elif test "$prev" = dlprefiles; then - # The library was specified with -dlpreopen. -- dlprefiles="$dlprefiles $arg" -+ func_append dlprefiles " $func_resolve_sysroot_result" - prev= - else -- deplibs="$deplibs $arg" -+ func_append deplibs " $func_resolve_sysroot_result" - fi - continue - ;; -@@ -4925,7 +6014,7 @@ func_mode_link () - - if test -n "$shlibpath_var"; then - # get the directories listed in $shlibpath_var -- eval shlib_search_path=\`\$ECHO \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\` -+ eval shlib_search_path=\`\$ECHO \"\${$shlibpath_var}\" \| \$SED \'s/:/ /g\'\` - else - shlib_search_path= - fi -@@ -4934,6 +6023,8 @@ func_mode_link () - - func_dirname "$output" "/" "" - output_objdir="$func_dirname_result$objdir" -+ func_to_tool_file "$output_objdir/" -+ tool_output_objdir=$func_to_tool_file_result - # Create the object directory. - func_mkdir_p "$output_objdir" - -@@ -4954,12 +6045,12 @@ func_mode_link () - # Find all interdependent deplibs by searching for libraries - # that are linked more than once (e.g. -la -lb -la) - for deplib in $deplibs; do -- if $opt_duplicate_deps ; then -+ if $opt_preserve_dup_deps ; then - case "$libs " in -- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; -+ *" $deplib "*) func_append specialdeplibs " $deplib" ;; - esac - fi -- libs="$libs $deplib" -+ func_append libs " $deplib" - done - - if test "$linkmode" = lib; then -@@ -4972,9 +6063,9 @@ func_mode_link () - if $opt_duplicate_compiler_generated_deps; then - for pre_post_dep in $predeps $postdeps; do - case "$pre_post_deps " in -- *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;; -+ *" $pre_post_dep "*) func_append specialdeplibs " $pre_post_deps" ;; - esac -- pre_post_deps="$pre_post_deps $pre_post_dep" -+ func_append pre_post_deps " $pre_post_dep" - done - fi - pre_post_deps= -@@ -5033,7 +6124,10 @@ func_mode_link () - case $pass in - dlopen) libs="$dlfiles" ;; - dlpreopen) libs="$dlprefiles" ;; -- link) libs="$deplibs %DEPLIBS% $dependency_libs" ;; -+ link) -+ libs="$deplibs %DEPLIBS%" -+ test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs" -+ ;; - esac - fi - if test "$linkmode,$pass" = "lib,dlpreopen"; then -@@ -5041,17 +6135,19 @@ func_mode_link () - for lib in $dlprefiles; do - # Ignore non-libtool-libs - dependency_libs= -+ func_resolve_sysroot "$lib" - case $lib in -- *.la) func_source "$lib" ;; -+ *.la) func_source "$func_resolve_sysroot_result" ;; - esac - - # Collect preopened libtool deplibs, except any this library - # has declared as weak libs - for deplib in $dependency_libs; do -- deplib_base=`$ECHO "X$deplib" | $Xsed -e "$basename"` -+ func_basename "$deplib" -+ deplib_base=$func_basename_result - case " $weak_libs " in - *" $deplib_base "*) ;; -- *) deplibs="$deplibs $deplib" ;; -+ *) func_append deplibs " $deplib" ;; - esac - done - done -@@ -5067,16 +6163,17 @@ func_mode_link () - lib= - found=no - case $deplib in -- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) -+ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ -+ |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) - if test "$linkmode,$pass" = "prog,link"; then - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else -- compiler_flags="$compiler_flags $deplib" -+ func_append compiler_flags " $deplib" - if test "$linkmode" = lib ; then - case "$new_inherited_linker_flags " in - *" $deplib "*) ;; -- * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;; -+ * ) func_append new_inherited_linker_flags " $deplib" ;; - esac - fi - fi -@@ -5161,7 +6258,7 @@ func_mode_link () - if test "$linkmode" = lib ; then - case "$new_inherited_linker_flags " in - *" $deplib "*) ;; -- * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;; -+ * ) func_append new_inherited_linker_flags " $deplib" ;; - esac - fi - fi -@@ -5174,7 +6271,8 @@ func_mode_link () - test "$pass" = conv && continue - newdependency_libs="$deplib $newdependency_libs" - func_stripname '-L' '' "$deplib" -- newlib_search_path="$newlib_search_path $func_stripname_result" -+ func_resolve_sysroot "$func_stripname_result" -+ func_append newlib_search_path " $func_resolve_sysroot_result" - ;; - prog) - if test "$pass" = conv; then -@@ -5188,7 +6286,8 @@ func_mode_link () - finalize_deplibs="$deplib $finalize_deplibs" - fi - func_stripname '-L' '' "$deplib" -- newlib_search_path="$newlib_search_path $func_stripname_result" -+ func_resolve_sysroot "$func_stripname_result" -+ func_append newlib_search_path " $func_resolve_sysroot_result" - ;; - *) - func_warning "\`-L' is ignored for archives/objects" -@@ -5199,17 +6298,21 @@ func_mode_link () - -R*) - if test "$pass" = link; then - func_stripname '-R' '' "$deplib" -- dir=$func_stripname_result -+ func_resolve_sysroot "$func_stripname_result" -+ dir=$func_resolve_sysroot_result - # Make sure the xrpath contains only unique directories. - case "$xrpath " in - *" $dir "*) ;; -- *) xrpath="$xrpath $dir" ;; -+ *) func_append xrpath " $dir" ;; - esac - fi - deplibs="$deplib $deplibs" - continue - ;; -- *.la) lib="$deplib" ;; -+ *.la) -+ func_resolve_sysroot "$deplib" -+ lib=$func_resolve_sysroot_result -+ ;; - *.$libext) - if test "$pass" = conv; then - deplibs="$deplib $deplibs" -@@ -5227,7 +6330,7 @@ func_mode_link () - match_pattern*) - set dummy $deplibs_check_method; shift - match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"` -- if eval "\$ECHO \"X$deplib\"" 2>/dev/null | $Xsed -e 10q \ -+ if eval "\$ECHO \"$deplib\"" 2>/dev/null | $SED 10q \ - | $EGREP "$match_pattern_regex" > /dev/null; then - valid_a_lib=yes - fi -@@ -5237,15 +6340,15 @@ func_mode_link () - ;; - esac - if test "$valid_a_lib" != yes; then -- $ECHO -+ echo - $ECHO "*** Warning: Trying to link with static lib archive $deplib." -- $ECHO "*** I have the capability to make that library automatically link in when" -- $ECHO "*** you link to this library. But I can only do this if you have a" -- $ECHO "*** shared version of the library, which you do not appear to have" -- $ECHO "*** because the file extensions .$libext of this argument makes me believe" -- $ECHO "*** that it is just a static archive that I should not use here." -+ echo "*** I have the capability to make that library automatically link in when" -+ echo "*** you link to this library. But I can only do this if you have a" -+ echo "*** shared version of the library, which you do not appear to have" -+ echo "*** because the file extensions .$libext of this argument makes me believe" -+ echo "*** that it is just a static archive that I should not use here." - else -- $ECHO -+ echo - $ECHO "*** Warning: Linking the shared library $output against the" - $ECHO "*** static library $deplib is not portable!" - deplibs="$deplib $deplibs" -@@ -5272,11 +6375,11 @@ func_mode_link () - if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then - # If there is no dlopen support or we're linking statically, - # we need to preload. -- newdlprefiles="$newdlprefiles $deplib" -+ func_append newdlprefiles " $deplib" - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else -- newdlfiles="$newdlfiles $deplib" -+ func_append newdlfiles " $deplib" - fi - fi - continue -@@ -5318,20 +6421,20 @@ func_mode_link () - - # Convert "-framework foo" to "foo.ltframework" - if test -n "$inherited_linker_flags"; then -- tmp_inherited_linker_flags=`$ECHO "X$inherited_linker_flags" | $Xsed -e 's/-framework \([^ $]*\)/\1.ltframework/g'` -+ tmp_inherited_linker_flags=`$ECHO "$inherited_linker_flags" | $SED 's/-framework \([^ $]*\)/\1.ltframework/g'` - for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do - case " $new_inherited_linker_flags " in - *" $tmp_inherited_linker_flag "*) ;; -- *) new_inherited_linker_flags="$new_inherited_linker_flags $tmp_inherited_linker_flag";; -+ *) func_append new_inherited_linker_flags " $tmp_inherited_linker_flag";; - esac - done - fi -- dependency_libs=`$ECHO "X $dependency_libs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` -+ dependency_libs=`$ECHO " $dependency_libs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` - if test "$linkmode,$pass" = "lib,link" || - test "$linkmode,$pass" = "prog,scan" || - { test "$linkmode" != prog && test "$linkmode" != lib; }; then -- test -n "$dlopen" && dlfiles="$dlfiles $dlopen" -- test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen" -+ test -n "$dlopen" && func_append dlfiles " $dlopen" -+ test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen" - fi - - if test "$pass" = conv; then -@@ -5342,30 +6445,36 @@ func_mode_link () - func_fatal_error "cannot find name of link library for \`$lib'" - fi - # It is a libtool convenience library, so add in its objects. -- convenience="$convenience $ladir/$objdir/$old_library" -- old_convenience="$old_convenience $ladir/$objdir/$old_library" -+ func_append convenience " $ladir/$objdir/$old_library" -+ func_append old_convenience " $ladir/$objdir/$old_library" -+ tmp_libs= -+ for deplib in $dependency_libs; do -+ deplibs="$deplib $deplibs" -+ if $opt_preserve_dup_deps ; then -+ case "$tmp_libs " in -+ *" $deplib "*) func_append specialdeplibs " $deplib" ;; -+ esac -+ fi -+ func_append tmp_libs " $deplib" -+ done - elif test "$linkmode" != prog && test "$linkmode" != lib; then - func_fatal_error "\`$lib' is not a convenience library" - fi -- tmp_libs= -- for deplib in $dependency_libs; do -- deplibs="$deplib $deplibs" -- if $opt_duplicate_deps ; then -- case "$tmp_libs " in -- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; -- esac -- fi -- tmp_libs="$tmp_libs $deplib" -- done - continue - fi # $pass = conv - - - # Get the name of the library we link against. - linklib= -- for l in $old_library $library_names; do -- linklib="$l" -- done -+ if test -n "$old_library" && -+ { test "$prefer_static_libs" = yes || -+ test "$prefer_static_libs,$installed" = "built,no"; }; then -+ linklib=$old_library -+ else -+ for l in $old_library $library_names; do -+ linklib="$l" -+ done -+ fi - if test -z "$linklib"; then - func_fatal_error "cannot find name of link library for \`$lib'" - fi -@@ -5382,9 +6491,9 @@ func_mode_link () - # statically, we need to preload. We also need to preload any - # dependent libraries so libltdl's deplib preloader doesn't - # bomb out in the load deplibs phase. -- dlprefiles="$dlprefiles $lib $dependency_libs" -+ func_append dlprefiles " $lib $dependency_libs" - else -- newdlfiles="$newdlfiles $lib" -+ func_append newdlfiles " $lib" - fi - continue - fi # $pass = dlopen -@@ -5406,14 +6515,14 @@ func_mode_link () - - # Find the relevant object directory and library name. - if test "X$installed" = Xyes; then -- if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then -+ if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then - func_warning "library \`$lib' was moved." - dir="$ladir" - absdir="$abs_ladir" - libdir="$abs_ladir" - else -- dir="$libdir" -- absdir="$libdir" -+ dir="$lt_sysroot$libdir" -+ absdir="$lt_sysroot$libdir" - fi - test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes - else -@@ -5421,12 +6530,12 @@ func_mode_link () - dir="$ladir" - absdir="$abs_ladir" - # Remove this search path later -- notinst_path="$notinst_path $abs_ladir" -+ func_append notinst_path " $abs_ladir" - else - dir="$ladir/$objdir" - absdir="$abs_ladir/$objdir" - # Remove this search path later -- notinst_path="$notinst_path $abs_ladir" -+ func_append notinst_path " $abs_ladir" - fi - fi # $installed = yes - func_stripname 'lib' '.la' "$laname" -@@ -5437,20 +6546,46 @@ func_mode_link () - if test -z "$libdir" && test "$linkmode" = prog; then - func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'" - fi -- # Prefer using a static library (so that no silly _DYNAMIC symbols -- # are required to link). -- if test -n "$old_library"; then -- newdlprefiles="$newdlprefiles $dir/$old_library" -- # Keep a list of preopened convenience libraries to check -- # that they are being used correctly in the link pass. -- test -z "$libdir" && \ -- dlpreconveniencelibs="$dlpreconveniencelibs $dir/$old_library" -- # Otherwise, use the dlname, so that lt_dlopen finds it. -- elif test -n "$dlname"; then -- newdlprefiles="$newdlprefiles $dir/$dlname" -- else -- newdlprefiles="$newdlprefiles $dir/$linklib" -- fi -+ case "$host" in -+ # special handling for platforms with PE-DLLs. -+ *cygwin* | *mingw* | *cegcc* ) -+ # Linker will automatically link against shared library if both -+ # static and shared are present. Therefore, ensure we extract -+ # symbols from the import library if a shared library is present -+ # (otherwise, the dlopen module name will be incorrect). We do -+ # this by putting the import library name into $newdlprefiles. -+ # We recover the dlopen module name by 'saving' the la file -+ # name in a special purpose variable, and (later) extracting the -+ # dlname from the la file. -+ if test -n "$dlname"; then -+ func_tr_sh "$dir/$linklib" -+ eval "libfile_$func_tr_sh_result=\$abs_ladir/\$laname" -+ func_append newdlprefiles " $dir/$linklib" -+ else -+ func_append newdlprefiles " $dir/$old_library" -+ # Keep a list of preopened convenience libraries to check -+ # that they are being used correctly in the link pass. -+ test -z "$libdir" && \ -+ func_append dlpreconveniencelibs " $dir/$old_library" -+ fi -+ ;; -+ * ) -+ # Prefer using a static library (so that no silly _DYNAMIC symbols -+ # are required to link). -+ if test -n "$old_library"; then -+ func_append newdlprefiles " $dir/$old_library" -+ # Keep a list of preopened convenience libraries to check -+ # that they are being used correctly in the link pass. -+ test -z "$libdir" && \ -+ func_append dlpreconveniencelibs " $dir/$old_library" -+ # Otherwise, use the dlname, so that lt_dlopen finds it. -+ elif test -n "$dlname"; then -+ func_append newdlprefiles " $dir/$dlname" -+ else -+ func_append newdlprefiles " $dir/$linklib" -+ fi -+ ;; -+ esac - fi # $pass = dlpreopen - - if test -z "$libdir"; then -@@ -5468,7 +6603,7 @@ func_mode_link () - - - if test "$linkmode" = prog && test "$pass" != link; then -- newlib_search_path="$newlib_search_path $ladir" -+ func_append newlib_search_path " $ladir" - deplibs="$lib $deplibs" - - linkalldeplibs=no -@@ -5481,7 +6616,8 @@ func_mode_link () - for deplib in $dependency_libs; do - case $deplib in - -L*) func_stripname '-L' '' "$deplib" -- newlib_search_path="$newlib_search_path $func_stripname_result" -+ func_resolve_sysroot "$func_stripname_result" -+ func_append newlib_search_path " $func_resolve_sysroot_result" - ;; - esac - # Need to link against all dependency_libs? -@@ -5492,12 +6628,12 @@ func_mode_link () - # or/and link against static libraries - newdependency_libs="$deplib $newdependency_libs" - fi -- if $opt_duplicate_deps ; then -+ if $opt_preserve_dup_deps ; then - case "$tmp_libs " in -- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; -+ *" $deplib "*) func_append specialdeplibs " $deplib" ;; - esac - fi -- tmp_libs="$tmp_libs $deplib" -+ func_append tmp_libs " $deplib" - done # for deplib - continue - fi # $linkmode = prog... -@@ -5512,7 +6648,7 @@ func_mode_link () - # Make sure the rpath contains only unique directories. - case "$temp_rpath:" in - *"$absdir:"*) ;; -- *) temp_rpath="$temp_rpath$absdir:" ;; -+ *) func_append temp_rpath "$absdir:" ;; - esac - fi - -@@ -5524,7 +6660,7 @@ func_mode_link () - *) - case "$compile_rpath " in - *" $absdir "*) ;; -- *) compile_rpath="$compile_rpath $absdir" -+ *) func_append compile_rpath " $absdir" ;; - esac - ;; - esac -@@ -5533,7 +6669,7 @@ func_mode_link () - *) - case "$finalize_rpath " in - *" $libdir "*) ;; -- *) finalize_rpath="$finalize_rpath $libdir" -+ *) func_append finalize_rpath " $libdir" ;; - esac - ;; - esac -@@ -5558,12 +6694,12 @@ func_mode_link () - case $host in - *cygwin* | *mingw* | *cegcc*) - # No point in relinking DLLs because paths are not encoded -- notinst_deplibs="$notinst_deplibs $lib" -+ func_append notinst_deplibs " $lib" - need_relink=no - ;; - *) - if test "$installed" = no; then -- notinst_deplibs="$notinst_deplibs $lib" -+ func_append notinst_deplibs " $lib" - need_relink=yes - fi - ;; -@@ -5580,7 +6716,7 @@ func_mode_link () - fi - done - if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then -- $ECHO -+ echo - if test "$linkmode" = prog; then - $ECHO "*** Warning: Linking the executable $output against the loadable module" - else -@@ -5598,7 +6734,7 @@ func_mode_link () - *) - case "$compile_rpath " in - *" $absdir "*) ;; -- *) compile_rpath="$compile_rpath $absdir" -+ *) func_append compile_rpath " $absdir" ;; - esac - ;; - esac -@@ -5607,7 +6743,7 @@ func_mode_link () - *) - case "$finalize_rpath " in - *" $libdir "*) ;; -- *) finalize_rpath="$finalize_rpath $libdir" -+ *) func_append finalize_rpath " $libdir" ;; - esac - ;; - esac -@@ -5661,7 +6797,7 @@ func_mode_link () - linklib=$newlib - fi # test -n "$old_archive_from_expsyms_cmds" - -- if test "$linkmode" = prog || test "$mode" != relink; then -+ if test "$linkmode" = prog || test "$opt_mode" != relink; then - add_shlibpath= - add_dir= - add= -@@ -5683,9 +6819,9 @@ func_mode_link () - if test "X$dlopenmodule" != "X$lib"; then - $ECHO "*** Warning: lib $linklib is a module, not a shared library" - if test -z "$old_library" ; then -- $ECHO -- $ECHO "*** And there doesn't seem to be a static archive available" -- $ECHO "*** The link will probably fail, sorry" -+ echo -+ echo "*** And there doesn't seem to be a static archive available" -+ echo "*** The link will probably fail, sorry" - else - add="$dir/$old_library" - fi -@@ -5712,12 +6848,12 @@ func_mode_link () - test "$hardcode_direct_absolute" = no; then - add="$dir/$linklib" - elif test "$hardcode_minus_L" = yes; then -- add_dir="-L$dir" -+ add_dir="-L$absdir" - # Try looking first in the location we're being installed to. - if test -n "$inst_prefix_dir"; then - case $libdir in - [\\/]*) -- add_dir="$add_dir -L$inst_prefix_dir$libdir" -+ func_append add_dir " -L$inst_prefix_dir$libdir" - ;; - esac - fi -@@ -5739,7 +6875,7 @@ func_mode_link () - if test -n "$add_shlibpath"; then - case :$compile_shlibpath: in - *":$add_shlibpath:"*) ;; -- *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;; -+ *) func_append compile_shlibpath "$add_shlibpath:" ;; - esac - fi - if test "$linkmode" = prog; then -@@ -5753,13 +6889,13 @@ func_mode_link () - test "$hardcode_shlibpath_var" = yes; then - case :$finalize_shlibpath: in - *":$libdir:"*) ;; -- *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;; -+ *) func_append finalize_shlibpath "$libdir:" ;; - esac - fi - fi - fi - -- if test "$linkmode" = prog || test "$mode" = relink; then -+ if test "$linkmode" = prog || test "$opt_mode" = relink; then - add_shlibpath= - add_dir= - add= -@@ -5773,7 +6909,7 @@ func_mode_link () - elif test "$hardcode_shlibpath_var" = yes; then - case :$finalize_shlibpath: in - *":$libdir:"*) ;; -- *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;; -+ *) func_append finalize_shlibpath "$libdir:" ;; - esac - add="-l$name" - elif test "$hardcode_automatic" = yes; then -@@ -5790,7 +6926,7 @@ func_mode_link () - if test -n "$inst_prefix_dir"; then - case $libdir in - [\\/]*) -- add_dir="$add_dir -L$inst_prefix_dir$libdir" -+ func_append add_dir " -L$inst_prefix_dir$libdir" - ;; - esac - fi -@@ -5825,21 +6961,21 @@ func_mode_link () - - # Just print a warning and add the library to dependency_libs so - # that the program can be linked against the static library. -- $ECHO -+ echo - $ECHO "*** Warning: This system can not link to static lib archive $lib." -- $ECHO "*** I have the capability to make that library automatically link in when" -- $ECHO "*** you link to this library. But I can only do this if you have a" -- $ECHO "*** shared version of the library, which you do not appear to have." -+ echo "*** I have the capability to make that library automatically link in when" -+ echo "*** you link to this library. But I can only do this if you have a" -+ echo "*** shared version of the library, which you do not appear to have." - if test "$module" = yes; then -- $ECHO "*** But as you try to build a module library, libtool will still create " -- $ECHO "*** a static module, that should work as long as the dlopening application" -- $ECHO "*** is linked with the -dlopen flag to resolve symbols at runtime." -+ echo "*** But as you try to build a module library, libtool will still create " -+ echo "*** a static module, that should work as long as the dlopening application" -+ echo "*** is linked with the -dlopen flag to resolve symbols at runtime." - if test -z "$global_symbol_pipe"; then -- $ECHO -- $ECHO "*** However, this would only work if libtool was able to extract symbol" -- $ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could" -- $ECHO "*** not find such a program. So, this module is probably useless." -- $ECHO "*** \`nm' from GNU binutils and a full rebuild may help." -+ echo -+ echo "*** However, this would only work if libtool was able to extract symbol" -+ echo "*** lists from a program, using \`nm' or equivalent, but libtool could" -+ echo "*** not find such a program. So, this module is probably useless." -+ echo "*** \`nm' from GNU binutils and a full rebuild may help." - fi - if test "$build_old_libs" = no; then - build_libtool_libs=module -@@ -5867,37 +7003,46 @@ func_mode_link () - temp_xrpath=$func_stripname_result - case " $xrpath " in - *" $temp_xrpath "*) ;; -- *) xrpath="$xrpath $temp_xrpath";; -+ *) func_append xrpath " $temp_xrpath";; - esac;; -- *) temp_deplibs="$temp_deplibs $libdir";; -+ *) func_append temp_deplibs " $libdir";; - esac - done - dependency_libs="$temp_deplibs" - fi - -- newlib_search_path="$newlib_search_path $absdir" -+ func_append newlib_search_path " $absdir" - # Link against this library - test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs" - # ... and its dependency_libs - tmp_libs= - for deplib in $dependency_libs; do - newdependency_libs="$deplib $newdependency_libs" -- if $opt_duplicate_deps ; then -+ case $deplib in -+ -L*) func_stripname '-L' '' "$deplib" -+ func_resolve_sysroot "$func_stripname_result";; -+ *) func_resolve_sysroot "$deplib" ;; -+ esac -+ if $opt_preserve_dup_deps ; then - case "$tmp_libs " in -- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; -+ *" $func_resolve_sysroot_result "*) -+ func_append specialdeplibs " $func_resolve_sysroot_result" ;; - esac - fi -- tmp_libs="$tmp_libs $deplib" -+ func_append tmp_libs " $func_resolve_sysroot_result" - done - - if test "$link_all_deplibs" != no; then - # Add the search paths of all dependency libraries - for deplib in $dependency_libs; do -+ path= - case $deplib in - -L*) path="$deplib" ;; - *.la) -+ func_resolve_sysroot "$deplib" -+ deplib=$func_resolve_sysroot_result - func_dirname "$deplib" "" "." -- dir="$func_dirname_result" -+ dir=$func_dirname_result - # We need an absolute path. - case $dir in - [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;; -@@ -5924,8 +7069,8 @@ func_mode_link () - if test -z "$darwin_install_name"; then - darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` - fi -- compiler_flags="$compiler_flags ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}" -- linker_flags="$linker_flags -dylib_file ${darwin_install_name}:${depdepl}" -+ func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}" -+ func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}" - path= - fi - fi -@@ -5958,7 +7103,7 @@ func_mode_link () - compile_deplibs="$new_inherited_linker_flags $compile_deplibs" - finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs" - else -- compiler_flags="$compiler_flags "`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` -+ compiler_flags="$compiler_flags "`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` - fi - fi - dependency_libs="$newdependency_libs" -@@ -5975,7 +7120,7 @@ func_mode_link () - for dir in $newlib_search_path; do - case "$lib_search_path " in - *" $dir "*) ;; -- *) lib_search_path="$lib_search_path $dir" ;; -+ *) func_append lib_search_path " $dir" ;; - esac - done - newlib_search_path= -@@ -6033,10 +7178,10 @@ func_mode_link () - -L*) - case " $tmp_libs " in - *" $deplib "*) ;; -- *) tmp_libs="$tmp_libs $deplib" ;; -+ *) func_append tmp_libs " $deplib" ;; - esac - ;; -- *) tmp_libs="$tmp_libs $deplib" ;; -+ *) func_append tmp_libs " $deplib" ;; - esac - done - eval $var=\"$tmp_libs\" -@@ -6052,7 +7197,7 @@ func_mode_link () - ;; - esac - if test -n "$i" ; then -- tmp_libs="$tmp_libs $i" -+ func_append tmp_libs " $i" - fi - done - dependency_libs=$tmp_libs -@@ -6093,7 +7238,7 @@ func_mode_link () - # Now set the variables for building old libraries. - build_libtool_libs=no - oldlibs="$output" -- objs="$objs$old_deplibs" -+ func_append objs "$old_deplibs" - ;; - - lib) -@@ -6126,10 +7271,10 @@ func_mode_link () - if test "$deplibs_check_method" != pass_all; then - func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs" - else -- $ECHO -+ echo - $ECHO "*** Warning: Linking the shared library $output against the non-libtool" - $ECHO "*** objects $objs is not portable!" -- libobjs="$libobjs $objs" -+ func_append libobjs " $objs" - fi - fi - -@@ -6188,13 +7333,14 @@ func_mode_link () - # which has an extra 1 added just for fun - # - case $version_type in -+ # correct linux to gnu/linux during the next big refactor - darwin|linux|osf|windows|none) - func_arith $number_major + $number_minor - current=$func_arith_result - age="$number_minor" - revision="$number_revision" - ;; -- freebsd-aout|freebsd-elf|sunos) -+ freebsd-aout|freebsd-elf|qnx|sunos) - current="$number_major" - revision="$number_minor" - age="0" -@@ -6206,6 +7352,9 @@ func_mode_link () - revision="$number_minor" - lt_irix_increment=no - ;; -+ *) -+ func_fatal_configuration "$modename: unknown library version type \`$version_type'" -+ ;; - esac - ;; - no) -@@ -6304,7 +7453,7 @@ func_mode_link () - versuffix="$major.$revision" - ;; - -- linux) -+ linux) # correct to gnu/linux during the next big refactor - func_arith $current - $age - major=.$func_arith_result - versuffix="$major.$age.$revision" -@@ -6327,7 +7476,7 @@ func_mode_link () - done - - # Make executables depend on our current version. -- verstring="$verstring:${current}.0" -+ func_append verstring ":${current}.0" - ;; - - qnx) -@@ -6395,10 +7544,10 @@ func_mode_link () - fi - - func_generate_dlsyms "$libname" "$libname" "yes" -- libobjs="$libobjs $symfileobj" -+ func_append libobjs " $symfileobj" - test "X$libobjs" = "X " && libobjs= - -- if test "$mode" != relink; then -+ if test "$opt_mode" != relink; then - # Remove our outputs, but don't remove object files since they - # may have been created when compiling PIC objects. - removelist= -@@ -6414,7 +7563,7 @@ func_mode_link () - continue - fi - fi -- removelist="$removelist $p" -+ func_append removelist " $p" - ;; - *) ;; - esac -@@ -6425,27 +7574,28 @@ func_mode_link () - - # Now set the variables for building old libraries. - if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then -- oldlibs="$oldlibs $output_objdir/$libname.$libext" -+ func_append oldlibs " $output_objdir/$libname.$libext" - - # Transform .lo files to .o files. -- oldobjs="$objs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP` -+ oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP` - fi - - # Eliminate all temporary directories. - #for path in $notinst_path; do -- # lib_search_path=`$ECHO "X$lib_search_path " | $Xsed -e "s% $path % %g"` -- # deplibs=`$ECHO "X$deplibs " | $Xsed -e "s% -L$path % %g"` -- # dependency_libs=`$ECHO "X$dependency_libs " | $Xsed -e "s% -L$path % %g"` -+ # lib_search_path=`$ECHO "$lib_search_path " | $SED "s% $path % %g"` -+ # deplibs=`$ECHO "$deplibs " | $SED "s% -L$path % %g"` -+ # dependency_libs=`$ECHO "$dependency_libs " | $SED "s% -L$path % %g"` - #done - - if test -n "$xrpath"; then - # If the user specified any rpath flags, then add them. - temp_xrpath= - for libdir in $xrpath; do -- temp_xrpath="$temp_xrpath -R$libdir" -+ func_replace_sysroot "$libdir" -+ func_append temp_xrpath " -R$func_replace_sysroot_result" - case "$finalize_rpath " in - *" $libdir "*) ;; -- *) finalize_rpath="$finalize_rpath $libdir" ;; -+ *) func_append finalize_rpath " $libdir" ;; - esac - done - if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then -@@ -6459,7 +7609,7 @@ func_mode_link () - for lib in $old_dlfiles; do - case " $dlprefiles $dlfiles " in - *" $lib "*) ;; -- *) dlfiles="$dlfiles $lib" ;; -+ *) func_append dlfiles " $lib" ;; - esac - done - -@@ -6469,19 +7619,19 @@ func_mode_link () - for lib in $old_dlprefiles; do - case "$dlprefiles " in - *" $lib "*) ;; -- *) dlprefiles="$dlprefiles $lib" ;; -+ *) func_append dlprefiles " $lib" ;; - esac - done - - if test "$build_libtool_libs" = yes; then - if test -n "$rpath"; then - case $host in -- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc*) -+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*) - # these systems don't actually have a c library (as such)! - ;; - *-*-rhapsody* | *-*-darwin1.[012]) - # Rhapsody C library is in the System framework -- deplibs="$deplibs System.ltframework" -+ func_append deplibs " System.ltframework" - ;; - *-*-netbsd*) - # Don't link with libc until the a.out ld.so is fixed. -@@ -6498,7 +7648,7 @@ func_mode_link () - *) - # Add libc to deplibs on all other systems if necessary. - if test "$build_libtool_need_lc" = "yes"; then -- deplibs="$deplibs -lc" -+ func_append deplibs " -lc" - fi - ;; - esac -@@ -6547,7 +7697,7 @@ EOF - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then - case " $predeps $postdeps " in - *" $i "*) -- newdeplibs="$newdeplibs $i" -+ func_append newdeplibs " $i" - i="" - ;; - esac -@@ -6558,21 +7708,21 @@ EOF - set dummy $deplib_matches; shift - deplib_match=$1 - if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then -- newdeplibs="$newdeplibs $i" -+ func_append newdeplibs " $i" - else - droppeddeps=yes -- $ECHO -+ echo - $ECHO "*** Warning: dynamic linker does not accept needed library $i." -- $ECHO "*** I have the capability to make that library automatically link in when" -- $ECHO "*** you link to this library. But I can only do this if you have a" -- $ECHO "*** shared version of the library, which I believe you do not have" -- $ECHO "*** because a test_compile did reveal that the linker did not use it for" -- $ECHO "*** its dynamic dependency list that programs get resolved with at runtime." -+ echo "*** I have the capability to make that library automatically link in when" -+ echo "*** you link to this library. But I can only do this if you have a" -+ echo "*** shared version of the library, which I believe you do not have" -+ echo "*** because a test_compile did reveal that the linker did not use it for" -+ echo "*** its dynamic dependency list that programs get resolved with at runtime." - fi - fi - ;; - *) -- newdeplibs="$newdeplibs $i" -+ func_append newdeplibs " $i" - ;; - esac - done -@@ -6590,7 +7740,7 @@ EOF - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then - case " $predeps $postdeps " in - *" $i "*) -- newdeplibs="$newdeplibs $i" -+ func_append newdeplibs " $i" - i="" - ;; - esac -@@ -6601,29 +7751,29 @@ EOF - set dummy $deplib_matches; shift - deplib_match=$1 - if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then -- newdeplibs="$newdeplibs $i" -+ func_append newdeplibs " $i" - else - droppeddeps=yes -- $ECHO -+ echo - $ECHO "*** Warning: dynamic linker does not accept needed library $i." -- $ECHO "*** I have the capability to make that library automatically link in when" -- $ECHO "*** you link to this library. But I can only do this if you have a" -- $ECHO "*** shared version of the library, which you do not appear to have" -- $ECHO "*** because a test_compile did reveal that the linker did not use this one" -- $ECHO "*** as a dynamic dependency that programs can get resolved with at runtime." -+ echo "*** I have the capability to make that library automatically link in when" -+ echo "*** you link to this library. But I can only do this if you have a" -+ echo "*** shared version of the library, which you do not appear to have" -+ echo "*** because a test_compile did reveal that the linker did not use this one" -+ echo "*** as a dynamic dependency that programs can get resolved with at runtime." - fi - fi - else - droppeddeps=yes -- $ECHO -+ echo - $ECHO "*** Warning! Library $i is needed by this library but I was not able to" -- $ECHO "*** make it link in! You will probably need to install it or some" -- $ECHO "*** library that it depends on before this library will be fully" -- $ECHO "*** functional. Installing it before continuing would be even better." -+ echo "*** make it link in! You will probably need to install it or some" -+ echo "*** library that it depends on before this library will be fully" -+ echo "*** functional. Installing it before continuing would be even better." - fi - ;; - *) -- newdeplibs="$newdeplibs $i" -+ func_append newdeplibs " $i" - ;; - esac - done -@@ -6640,15 +7790,27 @@ EOF - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then - case " $predeps $postdeps " in - *" $a_deplib "*) -- newdeplibs="$newdeplibs $a_deplib" -+ func_append newdeplibs " $a_deplib" - a_deplib="" - ;; - esac - fi - if test -n "$a_deplib" ; then - libname=`eval "\\$ECHO \"$libname_spec\""` -+ if test -n "$file_magic_glob"; then -+ libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob` -+ else -+ libnameglob=$libname -+ fi -+ test "$want_nocaseglob" = yes && nocaseglob=`shopt -p nocaseglob` - for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do -- potential_libs=`ls $i/$libname[.-]* 2>/dev/null` -+ if test "$want_nocaseglob" = yes; then -+ shopt -s nocaseglob -+ potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null` -+ $nocaseglob -+ else -+ potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null` -+ fi - for potent_lib in $potential_libs; do - # Follow soft links. - if ls -lLd "$potent_lib" 2>/dev/null | -@@ -6665,13 +7827,13 @@ EOF - potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'` - case $potliblink in - [\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";; -- *) potlib=`$ECHO "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";; -+ *) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";; - esac - done - if eval $file_magic_cmd \"\$potlib\" 2>/dev/null | - $SED -e 10q | - $EGREP "$file_magic_regex" > /dev/null; then -- newdeplibs="$newdeplibs $a_deplib" -+ func_append newdeplibs " $a_deplib" - a_deplib="" - break 2 - fi -@@ -6680,12 +7842,12 @@ EOF - fi - if test -n "$a_deplib" ; then - droppeddeps=yes -- $ECHO -+ echo - $ECHO "*** Warning: linker path does not have real file for library $a_deplib." -- $ECHO "*** I have the capability to make that library automatically link in when" -- $ECHO "*** you link to this library. But I can only do this if you have a" -- $ECHO "*** shared version of the library, which you do not appear to have" -- $ECHO "*** because I did check the linker path looking for a file starting" -+ echo "*** I have the capability to make that library automatically link in when" -+ echo "*** you link to this library. But I can only do this if you have a" -+ echo "*** shared version of the library, which you do not appear to have" -+ echo "*** because I did check the linker path looking for a file starting" - if test -z "$potlib" ; then - $ECHO "*** with $libname but no candidates were found. (...for file magic test)" - else -@@ -6696,7 +7858,7 @@ EOF - ;; - *) - # Add a -L argument. -- newdeplibs="$newdeplibs $a_deplib" -+ func_append newdeplibs " $a_deplib" - ;; - esac - done # Gone through all deplibs. -@@ -6712,7 +7874,7 @@ EOF - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then - case " $predeps $postdeps " in - *" $a_deplib "*) -- newdeplibs="$newdeplibs $a_deplib" -+ func_append newdeplibs " $a_deplib" - a_deplib="" - ;; - esac -@@ -6723,9 +7885,9 @@ EOF - potential_libs=`ls $i/$libname[.-]* 2>/dev/null` - for potent_lib in $potential_libs; do - potlib="$potent_lib" # see symlink-check above in file_magic test -- if eval "\$ECHO \"X$potent_lib\"" 2>/dev/null | $Xsed -e 10q | \ -+ if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \ - $EGREP "$match_pattern_regex" > /dev/null; then -- newdeplibs="$newdeplibs $a_deplib" -+ func_append newdeplibs " $a_deplib" - a_deplib="" - break 2 - fi -@@ -6734,12 +7896,12 @@ EOF - fi - if test -n "$a_deplib" ; then - droppeddeps=yes -- $ECHO -+ echo - $ECHO "*** Warning: linker path does not have real file for library $a_deplib." -- $ECHO "*** I have the capability to make that library automatically link in when" -- $ECHO "*** you link to this library. But I can only do this if you have a" -- $ECHO "*** shared version of the library, which you do not appear to have" -- $ECHO "*** because I did check the linker path looking for a file starting" -+ echo "*** I have the capability to make that library automatically link in when" -+ echo "*** you link to this library. But I can only do this if you have a" -+ echo "*** shared version of the library, which you do not appear to have" -+ echo "*** because I did check the linker path looking for a file starting" - if test -z "$potlib" ; then - $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)" - else -@@ -6750,32 +7912,32 @@ EOF - ;; - *) - # Add a -L argument. -- newdeplibs="$newdeplibs $a_deplib" -+ func_append newdeplibs " $a_deplib" - ;; - esac - done # Gone through all deplibs. - ;; - none | unknown | *) - newdeplibs="" -- tmp_deplibs=`$ECHO "X $deplibs" | $Xsed \ -- -e 's/ -lc$//' -e 's/ -[LR][^ ]*//g'` -+ tmp_deplibs=`$ECHO " $deplibs" | $SED 's/ -lc$//; s/ -[LR][^ ]*//g'` - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then - for i in $predeps $postdeps ; do - # can't use Xsed below, because $i might contain '/' -- tmp_deplibs=`$ECHO "X $tmp_deplibs" | $Xsed -e "s,$i,,"` -+ tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s,$i,,"` - done - fi -- if $ECHO "X $tmp_deplibs" | $Xsed -e 's/[ ]//g' | -- $GREP . >/dev/null; then -- $ECHO -+ case $tmp_deplibs in -+ *[!\ \ ]*) -+ echo - if test "X$deplibs_check_method" = "Xnone"; then -- $ECHO "*** Warning: inter-library dependencies are not supported in this platform." -+ echo "*** Warning: inter-library dependencies are not supported in this platform." - else -- $ECHO "*** Warning: inter-library dependencies are not known to be supported." -+ echo "*** Warning: inter-library dependencies are not known to be supported." - fi -- $ECHO "*** All declared inter-library dependencies are being dropped." -+ echo "*** All declared inter-library dependencies are being dropped." - droppeddeps=yes -- fi -+ ;; -+ esac - ;; - esac - versuffix=$versuffix_save -@@ -6787,23 +7949,23 @@ EOF - case $host in - *-*-rhapsody* | *-*-darwin1.[012]) - # On Rhapsody replace the C library with the System framework -- newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's/ -lc / System.ltframework /'` -+ newdeplibs=`$ECHO " $newdeplibs" | $SED 's/ -lc / System.ltframework /'` - ;; - esac - - if test "$droppeddeps" = yes; then - if test "$module" = yes; then -- $ECHO -- $ECHO "*** Warning: libtool could not satisfy all declared inter-library" -+ echo -+ echo "*** Warning: libtool could not satisfy all declared inter-library" - $ECHO "*** dependencies of module $libname. Therefore, libtool will create" -- $ECHO "*** a static module, that should work as long as the dlopening" -- $ECHO "*** application is linked with the -dlopen flag." -+ echo "*** a static module, that should work as long as the dlopening" -+ echo "*** application is linked with the -dlopen flag." - if test -z "$global_symbol_pipe"; then -- $ECHO -- $ECHO "*** However, this would only work if libtool was able to extract symbol" -- $ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could" -- $ECHO "*** not find such a program. So, this module is probably useless." -- $ECHO "*** \`nm' from GNU binutils and a full rebuild may help." -+ echo -+ echo "*** However, this would only work if libtool was able to extract symbol" -+ echo "*** lists from a program, using \`nm' or equivalent, but libtool could" -+ echo "*** not find such a program. So, this module is probably useless." -+ echo "*** \`nm' from GNU binutils and a full rebuild may help." - fi - if test "$build_old_libs" = no; then - oldlibs="$output_objdir/$libname.$libext" -@@ -6813,16 +7975,16 @@ EOF - build_libtool_libs=no - fi - else -- $ECHO "*** The inter-library dependencies that have been dropped here will be" -- $ECHO "*** automatically added whenever a program is linked with this library" -- $ECHO "*** or is declared to -dlopen it." -+ echo "*** The inter-library dependencies that have been dropped here will be" -+ echo "*** automatically added whenever a program is linked with this library" -+ echo "*** or is declared to -dlopen it." - - if test "$allow_undefined" = no; then -- $ECHO -- $ECHO "*** Since this library must not contain undefined symbols," -- $ECHO "*** because either the platform does not support them or" -- $ECHO "*** it was explicitly requested with -no-undefined," -- $ECHO "*** libtool will only create a static version of it." -+ echo -+ echo "*** Since this library must not contain undefined symbols," -+ echo "*** because either the platform does not support them or" -+ echo "*** it was explicitly requested with -no-undefined," -+ echo "*** libtool will only create a static version of it." - if test "$build_old_libs" = no; then - oldlibs="$output_objdir/$libname.$libext" - build_libtool_libs=module -@@ -6839,9 +8001,9 @@ EOF - # Time to change all our "foo.ltframework" stuff back to "-framework foo" - case $host in - *-*-darwin*) -- newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` -- new_inherited_linker_flags=`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` -- deplibs=`$ECHO "X $deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` -+ newdeplibs=`$ECHO " $newdeplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` -+ new_inherited_linker_flags=`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` -+ deplibs=`$ECHO " $deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` - ;; - esac - -@@ -6854,7 +8016,7 @@ EOF - *) - case " $deplibs " in - *" -L$path/$objdir "*) -- new_libs="$new_libs -L$path/$objdir" ;; -+ func_append new_libs " -L$path/$objdir" ;; - esac - ;; - esac -@@ -6864,10 +8026,10 @@ EOF - -L*) - case " $new_libs " in - *" $deplib "*) ;; -- *) new_libs="$new_libs $deplib" ;; -+ *) func_append new_libs " $deplib" ;; - esac - ;; -- *) new_libs="$new_libs $deplib" ;; -+ *) func_append new_libs " $deplib" ;; - esac - done - deplibs="$new_libs" -@@ -6879,15 +8041,22 @@ EOF - - # Test again, we may have decided not to build it any more - if test "$build_libtool_libs" = yes; then -+ # Remove ${wl} instances when linking with ld. -+ # FIXME: should test the right _cmds variable. -+ case $archive_cmds in -+ *\$LD\ *) wl= ;; -+ esac - if test "$hardcode_into_libs" = yes; then - # Hardcode the library paths - hardcode_libdirs= - dep_rpath= - rpath="$finalize_rpath" -- test "$mode" != relink && rpath="$compile_rpath$rpath" -+ test "$opt_mode" != relink && rpath="$compile_rpath$rpath" - for libdir in $rpath; do - if test -n "$hardcode_libdir_flag_spec"; then - if test -n "$hardcode_libdir_separator"; then -+ func_replace_sysroot "$libdir" -+ libdir=$func_replace_sysroot_result - if test -z "$hardcode_libdirs"; then - hardcode_libdirs="$libdir" - else -@@ -6896,18 +8065,18 @@ EOF - *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) - ;; - *) -- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" -+ func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" - ;; - esac - fi - else - eval flag=\"$hardcode_libdir_flag_spec\" -- dep_rpath="$dep_rpath $flag" -+ func_append dep_rpath " $flag" - fi - elif test -n "$runpath_var"; then - case "$perm_rpath " in - *" $libdir "*) ;; -- *) perm_rpath="$perm_rpath $libdir" ;; -+ *) func_append perm_rpath " $libdir" ;; - esac - fi - done -@@ -6915,17 +8084,13 @@ EOF - if test -n "$hardcode_libdir_separator" && - test -n "$hardcode_libdirs"; then - libdir="$hardcode_libdirs" -- if test -n "$hardcode_libdir_flag_spec_ld"; then -- eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" -- else -- eval dep_rpath=\"$hardcode_libdir_flag_spec\" -- fi -+ eval "dep_rpath=\"$hardcode_libdir_flag_spec\"" - fi - if test -n "$runpath_var" && test -n "$perm_rpath"; then - # We should set the runpath_var. - rpath= - for dir in $perm_rpath; do -- rpath="$rpath$dir:" -+ func_append rpath "$dir:" - done - eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var" - fi -@@ -6933,7 +8098,7 @@ EOF - fi - - shlibpath="$finalize_shlibpath" -- test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath" -+ test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath" - if test -n "$shlibpath"; then - eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var" - fi -@@ -6959,18 +8124,18 @@ EOF - linknames= - for link - do -- linknames="$linknames $link" -+ func_append linknames " $link" - done - - # Use standard objects if they are pic -- test -z "$pic_flag" && libobjs=`$ECHO "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` -+ test -z "$pic_flag" && libobjs=`$ECHO "$libobjs" | $SP2NL | $SED "$lo2o" | $NL2SP` - test "X$libobjs" = "X " && libobjs= - - delfiles= - if test -n "$export_symbols" && test -n "$include_expsyms"; then - $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp" - export_symbols="$output_objdir/$libname.uexp" -- delfiles="$delfiles $export_symbols" -+ func_append delfiles " $export_symbols" - fi - - orig_export_symbols= -@@ -7001,13 +8166,45 @@ EOF - $opt_dry_run || $RM $export_symbols - cmds=$export_symbols_cmds - save_ifs="$IFS"; IFS='~' -- for cmd in $cmds; do -+ for cmd1 in $cmds; do - IFS="$save_ifs" -- eval cmd=\"$cmd\" -- func_len " $cmd" -- len=$func_len_result -- if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then -+ # Take the normal branch if the nm_file_list_spec branch -+ # doesn't work or if tool conversion is not needed. -+ case $nm_file_list_spec~$to_tool_file_cmd in -+ *~func_convert_file_noop | *~func_convert_file_msys_to_w32 | ~*) -+ try_normal_branch=yes -+ eval cmd=\"$cmd1\" -+ func_len " $cmd" -+ len=$func_len_result -+ ;; -+ *) -+ try_normal_branch=no -+ ;; -+ esac -+ if test "$try_normal_branch" = yes \ -+ && { test "$len" -lt "$max_cmd_len" \ -+ || test "$max_cmd_len" -le -1; } -+ then -+ func_show_eval "$cmd" 'exit $?' -+ skipped_export=false -+ elif test -n "$nm_file_list_spec"; then -+ func_basename "$output" -+ output_la=$func_basename_result -+ save_libobjs=$libobjs -+ save_output=$output -+ output=${output_objdir}/${output_la}.nm -+ func_to_tool_file "$output" -+ libobjs=$nm_file_list_spec$func_to_tool_file_result -+ func_append delfiles " $output" -+ func_verbose "creating $NM input file list: $output" -+ for obj in $save_libobjs; do -+ func_to_tool_file "$obj" -+ $ECHO "$func_to_tool_file_result" -+ done > "$output" -+ eval cmd=\"$cmd1\" - func_show_eval "$cmd" 'exit $?' -+ output=$save_output -+ libobjs=$save_libobjs - skipped_export=false - else - # The command line is too long to execute in one step. -@@ -7029,7 +8226,7 @@ EOF - if test -n "$export_symbols" && test -n "$include_expsyms"; then - tmp_export_symbols="$export_symbols" - test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" -- $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"' -+ $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' - fi - - if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then -@@ -7041,7 +8238,7 @@ EOF - # global variables. join(1) would be nice here, but unfortunately - # isn't a blessed tool. - $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter -- delfiles="$delfiles $export_symbols $output_objdir/$libname.filter" -+ func_append delfiles " $export_symbols $output_objdir/$libname.filter" - export_symbols=$output_objdir/$libname.def - $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols - fi -@@ -7051,7 +8248,7 @@ EOF - case " $convenience " in - *" $test_deplib "*) ;; - *) -- tmp_deplibs="$tmp_deplibs $test_deplib" -+ func_append tmp_deplibs " $test_deplib" - ;; - esac - done -@@ -7071,21 +8268,21 @@ EOF - test "X$libobjs" = "X " && libobjs= - else - gentop="$output_objdir/${outputname}x" -- generated="$generated $gentop" -+ func_append generated " $gentop" - - func_extract_archives $gentop $convenience -- libobjs="$libobjs $func_extract_archives_result" -+ func_append libobjs " $func_extract_archives_result" - test "X$libobjs" = "X " && libobjs= - fi - fi - - if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then - eval flag=\"$thread_safe_flag_spec\" -- linker_flags="$linker_flags $flag" -+ func_append linker_flags " $flag" - fi - - # Make a backup of the uninstalled library when relinking -- if test "$mode" = relink; then -+ if test "$opt_mode" = relink; then - $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $? - fi - -@@ -7130,7 +8327,8 @@ EOF - save_libobjs=$libobjs - fi - save_output=$output -- output_la=`$ECHO "X$output" | $Xsed -e "$basename"` -+ func_basename "$output" -+ output_la=$func_basename_result - - # Clear the reloadable object creation command queue and - # initialize k to one. -@@ -7143,13 +8341,16 @@ EOF - if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then - output=${output_objdir}/${output_la}.lnkscript - func_verbose "creating GNU ld script: $output" -- $ECHO 'INPUT (' > $output -+ echo 'INPUT (' > $output - for obj in $save_libobjs - do -- $ECHO "$obj" >> $output -+ func_to_tool_file "$obj" -+ $ECHO "$func_to_tool_file_result" >> $output - done -- $ECHO ')' >> $output -- delfiles="$delfiles $output" -+ echo ')' >> $output -+ func_append delfiles " $output" -+ func_to_tool_file "$output" -+ output=$func_to_tool_file_result - elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then - output=${output_objdir}/${output_la}.lnk - func_verbose "creating linker input file list: $output" -@@ -7163,10 +8364,12 @@ EOF - fi - for obj - do -- $ECHO "$obj" >> $output -+ func_to_tool_file "$obj" -+ $ECHO "$func_to_tool_file_result" >> $output - done -- delfiles="$delfiles $output" -- output=$firstobj\"$file_list_spec$output\" -+ func_append delfiles " $output" -+ func_to_tool_file "$output" -+ output=$firstobj\"$file_list_spec$func_to_tool_file_result\" - else - if test -n "$save_libobjs"; then - func_verbose "creating reloadable object files..." -@@ -7190,17 +8393,19 @@ EOF - # command to the queue. - if test "$k" -eq 1 ; then - # The first file doesn't have a previous command to add. -- eval concat_cmds=\"$reload_cmds $objlist $last_robj\" -+ reload_objs=$objlist -+ eval concat_cmds=\"$reload_cmds\" - else - # All subsequent reloadable object files will link in - # the last one created. -- eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj~\$RM $last_robj\" -+ reload_objs="$objlist $last_robj" -+ eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\" - fi - last_robj=$output_objdir/$output_la-${k}.$objext - func_arith $k + 1 - k=$func_arith_result - output=$output_objdir/$output_la-${k}.$objext -- objlist=$obj -+ objlist=" $obj" - func_len " $last_robj" - func_arith $len0 + $func_len_result - len=$func_arith_result -@@ -7210,11 +8415,12 @@ EOF - # reloadable object file. All subsequent reloadable object - # files will link in the last one created. - test -z "$concat_cmds" || concat_cmds=$concat_cmds~ -- eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\" -+ reload_objs="$objlist $last_robj" -+ eval concat_cmds=\"\${concat_cmds}$reload_cmds\" - if test -n "$last_robj"; then - eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\" - fi -- delfiles="$delfiles $output" -+ func_append delfiles " $output" - - else - output= -@@ -7248,7 +8454,7 @@ EOF - lt_exit=$? - - # Restore the uninstalled library and exit -- if test "$mode" = relink; then -+ if test "$opt_mode" = relink; then - ( cd "$output_objdir" && \ - $RM "${realname}T" && \ - $MV "${realname}U" "$realname" ) -@@ -7269,7 +8475,7 @@ EOF - if test -n "$export_symbols" && test -n "$include_expsyms"; then - tmp_export_symbols="$export_symbols" - test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" -- $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"' -+ $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' - fi - - if test -n "$orig_export_symbols"; then -@@ -7281,7 +8487,7 @@ EOF - # global variables. join(1) would be nice here, but unfortunately - # isn't a blessed tool. - $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter -- delfiles="$delfiles $export_symbols $output_objdir/$libname.filter" -+ func_append delfiles " $export_symbols $output_objdir/$libname.filter" - export_symbols=$output_objdir/$libname.def - $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols - fi -@@ -7322,10 +8528,10 @@ EOF - # Add any objects from preloaded convenience libraries - if test -n "$dlprefiles"; then - gentop="$output_objdir/${outputname}x" -- generated="$generated $gentop" -+ func_append generated " $gentop" - - func_extract_archives $gentop $dlprefiles -- libobjs="$libobjs $func_extract_archives_result" -+ func_append libobjs " $func_extract_archives_result" - test "X$libobjs" = "X " && libobjs= - fi - -@@ -7341,7 +8547,7 @@ EOF - lt_exit=$? - - # Restore the uninstalled library and exit -- if test "$mode" = relink; then -+ if test "$opt_mode" = relink; then - ( cd "$output_objdir" && \ - $RM "${realname}T" && \ - $MV "${realname}U" "$realname" ) -@@ -7353,7 +8559,7 @@ EOF - IFS="$save_ifs" - - # Restore the uninstalled library and exit -- if test "$mode" = relink; then -+ if test "$opt_mode" = relink; then - $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $? - - if test -n "$convenience"; then -@@ -7434,18 +8640,21 @@ EOF - if test -n "$convenience"; then - if test -n "$whole_archive_flag_spec"; then - eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\" -- reload_conv_objs=$reload_objs\ `$ECHO "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'` -+ reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'` - else - gentop="$output_objdir/${obj}x" -- generated="$generated $gentop" -+ func_append generated " $gentop" - - func_extract_archives $gentop $convenience - reload_conv_objs="$reload_objs $func_extract_archives_result" - fi - fi - -+ # If we're not building shared, we need to use non_pic_objs -+ test "$build_libtool_libs" != yes && libobjs="$non_pic_objects" -+ - # Create the old-style object. -- reload_objs="$objs$old_deplibs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test -+ reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test - - output="$obj" - func_execute_cmds "$reload_cmds" 'exit $?' -@@ -7505,8 +8714,8 @@ EOF - case $host in - *-*-rhapsody* | *-*-darwin1.[012]) - # On Rhapsody replace the C library is the System framework -- compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'` -- finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'` -+ compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's/ -lc / System.ltframework /'` -+ finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's/ -lc / System.ltframework /'` - ;; - esac - -@@ -7517,14 +8726,14 @@ EOF - if test "$tagname" = CXX ; then - case ${MACOSX_DEPLOYMENT_TARGET-10.0} in - 10.[0123]) -- compile_command="$compile_command ${wl}-bind_at_load" -- finalize_command="$finalize_command ${wl}-bind_at_load" -+ func_append compile_command " ${wl}-bind_at_load" -+ func_append finalize_command " ${wl}-bind_at_load" - ;; - esac - fi - # Time to change all our "foo.ltframework" stuff back to "-framework foo" -- compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` -- finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` -+ compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` -+ finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` - ;; - esac - -@@ -7538,7 +8747,7 @@ EOF - *) - case " $compile_deplibs " in - *" -L$path/$objdir "*) -- new_libs="$new_libs -L$path/$objdir" ;; -+ func_append new_libs " -L$path/$objdir" ;; - esac - ;; - esac -@@ -7548,17 +8757,17 @@ EOF - -L*) - case " $new_libs " in - *" $deplib "*) ;; -- *) new_libs="$new_libs $deplib" ;; -+ *) func_append new_libs " $deplib" ;; - esac - ;; -- *) new_libs="$new_libs $deplib" ;; -+ *) func_append new_libs " $deplib" ;; - esac - done - compile_deplibs="$new_libs" - - -- compile_command="$compile_command $compile_deplibs" -- finalize_command="$finalize_command $finalize_deplibs" -+ func_append compile_command " $compile_deplibs" -+ func_append finalize_command " $finalize_deplibs" - - if test -n "$rpath$xrpath"; then - # If the user specified any rpath flags, then add them. -@@ -7566,7 +8775,7 @@ EOF - # This is the magic to use -rpath. - case "$finalize_rpath " in - *" $libdir "*) ;; -- *) finalize_rpath="$finalize_rpath $libdir" ;; -+ *) func_append finalize_rpath " $libdir" ;; - esac - done - fi -@@ -7585,18 +8794,18 @@ EOF - *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) - ;; - *) -- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" -+ func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" - ;; - esac - fi - else - eval flag=\"$hardcode_libdir_flag_spec\" -- rpath="$rpath $flag" -+ func_append rpath " $flag" - fi - elif test -n "$runpath_var"; then - case "$perm_rpath " in - *" $libdir "*) ;; -- *) perm_rpath="$perm_rpath $libdir" ;; -+ *) func_append perm_rpath " $libdir" ;; - esac - fi - case $host in -@@ -7605,12 +8814,12 @@ EOF - case :$dllsearchpath: in - *":$libdir:"*) ;; - ::) dllsearchpath=$libdir;; -- *) dllsearchpath="$dllsearchpath:$libdir";; -+ *) func_append dllsearchpath ":$libdir";; - esac - case :$dllsearchpath: in - *":$testbindir:"*) ;; - ::) dllsearchpath=$testbindir;; -- *) dllsearchpath="$dllsearchpath:$testbindir";; -+ *) func_append dllsearchpath ":$testbindir";; - esac - ;; - esac -@@ -7636,18 +8845,18 @@ EOF - *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) - ;; - *) -- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" -+ func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" - ;; - esac - fi - else - eval flag=\"$hardcode_libdir_flag_spec\" -- rpath="$rpath $flag" -+ func_append rpath " $flag" - fi - elif test -n "$runpath_var"; then - case "$finalize_perm_rpath " in - *" $libdir "*) ;; -- *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;; -+ *) func_append finalize_perm_rpath " $libdir" ;; - esac - fi - done -@@ -7661,8 +8870,8 @@ EOF - - if test -n "$libobjs" && test "$build_old_libs" = yes; then - # Transform all the library objects into standard objects. -- compile_command=`$ECHO "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` -- finalize_command=`$ECHO "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` -+ compile_command=`$ECHO "$compile_command" | $SP2NL | $SED "$lo2o" | $NL2SP` -+ finalize_command=`$ECHO "$finalize_command" | $SP2NL | $SED "$lo2o" | $NL2SP` - fi - - func_generate_dlsyms "$outputname" "@PROGRAM@" "no" -@@ -7674,15 +8883,15 @@ EOF - - wrappers_required=yes - case $host in -+ *cegcc* | *mingw32ce*) -+ # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway. -+ wrappers_required=no -+ ;; - *cygwin* | *mingw* ) - if test "$build_libtool_libs" != yes; then - wrappers_required=no - fi - ;; -- *cegcc) -- # Disable wrappers for cegcc, we are cross compiling anyway. -- wrappers_required=no -- ;; - *) - if test "$need_relink" = no || test "$build_libtool_libs" != yes; then - wrappers_required=no -@@ -7691,13 +8900,19 @@ EOF - esac - if test "$wrappers_required" = no; then - # Replace the output file specification. -- compile_command=`$ECHO "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'` -+ compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'` - link_command="$compile_command$compile_rpath" - - # We have no uninstalled library dependencies, so finalize right now. - exit_status=0 - func_show_eval "$link_command" 'exit_status=$?' - -+ if test -n "$postlink_cmds"; then -+ func_to_tool_file "$output" -+ postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` -+ func_execute_cmds "$postlink_cmds" 'exit $?' -+ fi -+ - # Delete the generated files. - if test -f "$output_objdir/${outputname}S.${objext}"; then - func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"' -@@ -7720,7 +8935,7 @@ EOF - # We should set the runpath_var. - rpath= - for dir in $perm_rpath; do -- rpath="$rpath$dir:" -+ func_append rpath "$dir:" - done - compile_var="$runpath_var=\"$rpath\$$runpath_var\" " - fi -@@ -7728,7 +8943,7 @@ EOF - # We should set the runpath_var. - rpath= - for dir in $finalize_perm_rpath; do -- rpath="$rpath$dir:" -+ func_append rpath "$dir:" - done - finalize_var="$runpath_var=\"$rpath\$$runpath_var\" " - fi -@@ -7738,11 +8953,18 @@ EOF - # We don't need to create a wrapper script. - link_command="$compile_var$compile_command$compile_rpath" - # Replace the output file specification. -- link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'` -+ link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output"'%g'` - # Delete the old output file. - $opt_dry_run || $RM $output - # Link the executable and exit - func_show_eval "$link_command" 'exit $?' -+ -+ if test -n "$postlink_cmds"; then -+ func_to_tool_file "$output" -+ postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` -+ func_execute_cmds "$postlink_cmds" 'exit $?' -+ fi -+ - exit $EXIT_SUCCESS - fi - -@@ -7757,7 +8979,7 @@ EOF - if test "$fast_install" != no; then - link_command="$finalize_var$compile_command$finalize_rpath" - if test "$fast_install" = yes; then -- relink_command=`$ECHO "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'` -+ relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'` - else - # fast_install is set to needless - relink_command= -@@ -7769,13 +8991,19 @@ EOF - fi - - # Replace the output file specification. -- link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'` -+ link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'` - - # Delete the old output files. - $opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname - - func_show_eval "$link_command" 'exit $?' - -+ if test -n "$postlink_cmds"; then -+ func_to_tool_file "$output_objdir/$outputname" -+ postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` -+ func_execute_cmds "$postlink_cmds" 'exit $?' -+ fi -+ - # Now create the wrapper script. - func_verbose "creating $output" - -@@ -7793,18 +9021,7 @@ EOF - fi - done - relink_command="(cd `pwd`; $relink_command)" -- relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"` -- fi -- -- # Quote $ECHO for shipping. -- if test "X$ECHO" = "X$SHELL $progpath --fallback-echo"; then -- case $progpath in -- [\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";; -- *) qecho="$SHELL `pwd`/$progpath --fallback-echo";; -- esac -- qecho=`$ECHO "X$qecho" | $Xsed -e "$sed_quote_subst"` -- else -- qecho=`$ECHO "X$ECHO" | $Xsed -e "$sed_quote_subst"` -+ relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"` - fi - - # Only actually do things if not in dry run mode. -@@ -7884,7 +9101,7 @@ EOF - else - oldobjs="$old_deplibs $non_pic_objects" - if test "$preload" = yes && test -f "$symfileobj"; then -- oldobjs="$oldobjs $symfileobj" -+ func_append oldobjs " $symfileobj" - fi - fi - addlibs="$old_convenience" -@@ -7892,10 +9109,10 @@ EOF - - if test -n "$addlibs"; then - gentop="$output_objdir/${outputname}x" -- generated="$generated $gentop" -+ func_append generated " $gentop" - - func_extract_archives $gentop $addlibs -- oldobjs="$oldobjs $func_extract_archives_result" -+ func_append oldobjs " $func_extract_archives_result" - fi - - # Do each command in the archive commands. -@@ -7906,10 +9123,10 @@ EOF - # Add any objects from preloaded convenience libraries - if test -n "$dlprefiles"; then - gentop="$output_objdir/${outputname}x" -- generated="$generated $gentop" -+ func_append generated " $gentop" - - func_extract_archives $gentop $dlprefiles -- oldobjs="$oldobjs $func_extract_archives_result" -+ func_append oldobjs " $func_extract_archives_result" - fi - - # POSIX demands no paths to be encoded in archives. We have -@@ -7925,9 +9142,9 @@ EOF - done | sort | sort -uc >/dev/null 2>&1); then - : - else -- $ECHO "copying selected object files to avoid basename conflicts..." -+ echo "copying selected object files to avoid basename conflicts..." - gentop="$output_objdir/${outputname}x" -- generated="$generated $gentop" -+ func_append generated " $gentop" - func_mkdir_p "$gentop" - save_oldobjs=$oldobjs - oldobjs= -@@ -7951,18 +9168,30 @@ EOF - esac - done - func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj" -- oldobjs="$oldobjs $gentop/$newobj" -+ func_append oldobjs " $gentop/$newobj" - ;; -- *) oldobjs="$oldobjs $obj" ;; -+ *) func_append oldobjs " $obj" ;; - esac - done - fi -+ func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 -+ tool_oldlib=$func_to_tool_file_result - eval cmds=\"$old_archive_cmds\" - - func_len " $cmds" - len=$func_len_result - if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then - cmds=$old_archive_cmds -+ elif test -n "$archiver_list_spec"; then -+ func_verbose "using command file archive linking..." -+ for obj in $oldobjs -+ do -+ func_to_tool_file "$obj" -+ $ECHO "$func_to_tool_file_result" -+ done > $output_objdir/$libname.libcmd -+ func_to_tool_file "$output_objdir/$libname.libcmd" -+ oldobjs=" $archiver_list_spec$func_to_tool_file_result" -+ cmds=$old_archive_cmds - else - # the command line is too long to link in one step, link in parts - func_verbose "using piecewise archive linking..." -@@ -8036,7 +9265,7 @@ EOF - done - # Quote the link command for shipping. - relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)" -- relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"` -+ relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"` - if test "$hardcode_automatic" = yes ; then - relink_command= - fi -@@ -8056,12 +9285,23 @@ EOF - *.la) - func_basename "$deplib" - name="$func_basename_result" -- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` -+ func_resolve_sysroot "$deplib" -+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` - test -z "$libdir" && \ - func_fatal_error "\`$deplib' is not a valid libtool archive" -- newdependency_libs="$newdependency_libs $libdir/$name" -+ func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name" -+ ;; -+ -L*) -+ func_stripname -L '' "$deplib" -+ func_replace_sysroot "$func_stripname_result" -+ func_append newdependency_libs " -L$func_replace_sysroot_result" - ;; -- *) newdependency_libs="$newdependency_libs $deplib" ;; -+ -R*) -+ func_stripname -R '' "$deplib" -+ func_replace_sysroot "$func_stripname_result" -+ func_append newdependency_libs " -R$func_replace_sysroot_result" -+ ;; -+ *) func_append newdependency_libs " $deplib" ;; - esac - done - dependency_libs="$newdependency_libs" -@@ -8075,9 +9315,9 @@ EOF - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` - test -z "$libdir" && \ - func_fatal_error "\`$lib' is not a valid libtool archive" -- newdlfiles="$newdlfiles $libdir/$name" -+ func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name" - ;; -- *) newdlfiles="$newdlfiles $lib" ;; -+ *) func_append newdlfiles " $lib" ;; - esac - done - dlfiles="$newdlfiles" -@@ -8094,7 +9334,7 @@ EOF - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` - test -z "$libdir" && \ - func_fatal_error "\`$lib' is not a valid libtool archive" -- newdlprefiles="$newdlprefiles $libdir/$name" -+ func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name" - ;; - esac - done -@@ -8106,7 +9346,7 @@ EOF - [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; - *) abs=`pwd`"/$lib" ;; - esac -- newdlfiles="$newdlfiles $abs" -+ func_append newdlfiles " $abs" - done - dlfiles="$newdlfiles" - newdlprefiles= -@@ -8115,15 +9355,33 @@ EOF - [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; - *) abs=`pwd`"/$lib" ;; - esac -- newdlprefiles="$newdlprefiles $abs" -+ func_append newdlprefiles " $abs" - done - dlprefiles="$newdlprefiles" - fi - $RM $output - # place dlname in correct position for cygwin -+ # In fact, it would be nice if we could use this code for all target -+ # systems that can't hard-code library paths into their executables -+ # and that have no shared library path variable independent of PATH, -+ # but it turns out we can't easily determine that from inspecting -+ # libtool variables, so we have to hard-code the OSs to which it -+ # applies here; at the moment, that means platforms that use the PE -+ # object format with DLL files. See the long comment at the top of -+ # tests/bindir.at for full details. - tdlname=$dlname - case $host,$output,$installed,$module,$dlname in -- *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;; -+ *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) -+ # If a -bindir argument was supplied, place the dll there. -+ if test "x$bindir" != x ; -+ then -+ func_relative_path "$install_libdir" "$bindir" -+ tdlname=$func_relative_path_result$dlname -+ else -+ # Otherwise fall back on heuristic. -+ tdlname=../bin/$dlname -+ fi -+ ;; - esac - $ECHO > $output "\ - # $outputname - a libtool library file -@@ -8182,7 +9440,7 @@ relink_command=\"$relink_command\"" - exit $EXIT_SUCCESS - } - --{ test "$mode" = link || test "$mode" = relink; } && -+{ test "$opt_mode" = link || test "$opt_mode" = relink; } && - func_mode_link ${1+"$@"} - - -@@ -8202,9 +9460,9 @@ func_mode_uninstall () - for arg - do - case $arg in -- -f) RM="$RM $arg"; rmforce=yes ;; -- -*) RM="$RM $arg" ;; -- *) files="$files $arg" ;; -+ -f) func_append RM " $arg"; rmforce=yes ;; -+ -*) func_append RM " $arg" ;; -+ *) func_append files " $arg" ;; - esac - done - -@@ -8213,24 +9471,23 @@ func_mode_uninstall () - - rmdirs= - -- origobjdir="$objdir" - for file in $files; do - func_dirname "$file" "" "." - dir="$func_dirname_result" - if test "X$dir" = X.; then -- objdir="$origobjdir" -+ odir="$objdir" - else -- objdir="$dir/$origobjdir" -+ odir="$dir/$objdir" - fi - func_basename "$file" - name="$func_basename_result" -- test "$mode" = uninstall && objdir="$dir" -+ test "$opt_mode" = uninstall && odir="$dir" - -- # Remember objdir for removal later, being careful to avoid duplicates -- if test "$mode" = clean; then -+ # Remember odir for removal later, being careful to avoid duplicates -+ if test "$opt_mode" = clean; then - case " $rmdirs " in -- *" $objdir "*) ;; -- *) rmdirs="$rmdirs $objdir" ;; -+ *" $odir "*) ;; -+ *) func_append rmdirs " $odir" ;; - esac - fi - -@@ -8256,18 +9513,17 @@ func_mode_uninstall () - - # Delete the libtool libraries and symlinks. - for n in $library_names; do -- rmfiles="$rmfiles $objdir/$n" -+ func_append rmfiles " $odir/$n" - done -- test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library" -+ test -n "$old_library" && func_append rmfiles " $odir/$old_library" - -- case "$mode" in -+ case "$opt_mode" in - clean) -- case " $library_names " in -- # " " in the beginning catches empty $dlname -+ case " $library_names " in - *" $dlname "*) ;; -- *) rmfiles="$rmfiles $objdir/$dlname" ;; -+ *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;; - esac -- test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i" -+ test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i" - ;; - uninstall) - if test -n "$library_names"; then -@@ -8295,19 +9551,19 @@ func_mode_uninstall () - # Add PIC object to the list of files to remove. - if test -n "$pic_object" && - test "$pic_object" != none; then -- rmfiles="$rmfiles $dir/$pic_object" -+ func_append rmfiles " $dir/$pic_object" - fi - - # Add non-PIC object to the list of files to remove. - if test -n "$non_pic_object" && - test "$non_pic_object" != none; then -- rmfiles="$rmfiles $dir/$non_pic_object" -+ func_append rmfiles " $dir/$non_pic_object" - fi - fi - ;; - - *) -- if test "$mode" = clean ; then -+ if test "$opt_mode" = clean ; then - noexename=$name - case $file in - *.exe) -@@ -8317,7 +9573,7 @@ func_mode_uninstall () - noexename=$func_stripname_result - # $file with .exe has already been added to rmfiles, - # add $file without .exe -- rmfiles="$rmfiles $file" -+ func_append rmfiles " $file" - ;; - esac - # Do a test to see if this is a libtool program. -@@ -8326,7 +9582,7 @@ func_mode_uninstall () - func_ltwrapper_scriptname "$file" - relink_command= - func_source $func_ltwrapper_scriptname_result -- rmfiles="$rmfiles $func_ltwrapper_scriptname_result" -+ func_append rmfiles " $func_ltwrapper_scriptname_result" - else - relink_command= - func_source $dir/$noexename -@@ -8334,12 +9590,12 @@ func_mode_uninstall () - - # note $name still contains .exe if it was in $file originally - # as does the version of $file that was added into $rmfiles -- rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}" -+ func_append rmfiles " $odir/$name $odir/${name}S.${objext}" - if test "$fast_install" = yes && test -n "$relink_command"; then -- rmfiles="$rmfiles $objdir/lt-$name" -+ func_append rmfiles " $odir/lt-$name" - fi - if test "X$noexename" != "X$name" ; then -- rmfiles="$rmfiles $objdir/lt-${noexename}.c" -+ func_append rmfiles " $odir/lt-${noexename}.c" - fi - fi - fi -@@ -8347,7 +9603,6 @@ func_mode_uninstall () - esac - func_show_eval "$RM $rmfiles" 'exit_status=1' - done -- objdir="$origobjdir" - - # Try to remove the ${objdir}s in the directories where we deleted files - for dir in $rmdirs; do -@@ -8359,16 +9614,16 @@ func_mode_uninstall () - exit $exit_status - } - --{ test "$mode" = uninstall || test "$mode" = clean; } && -+{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } && - func_mode_uninstall ${1+"$@"} - --test -z "$mode" && { -+test -z "$opt_mode" && { - help="$generic_help" - func_fatal_help "you must specify a MODE" - } - - test -z "$exec_cmd" && \ -- func_fatal_help "invalid operation mode \`$mode'" -+ func_fatal_help "invalid operation mode \`$opt_mode'" - - if test -n "$exec_cmd"; then - eval exec "$exec_cmd" -diff --git a/m4/libtool.m4 b/m4/libtool.m4 -index 671cde1..02b4bbe 100644 ---- a/m4/libtool.m4 -+++ b/m4/libtool.m4 -@@ -1,7 +1,8 @@ - # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- - # - # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, --# 2006, 2007, 2008 Free Software Foundation, Inc. -+# 2006, 2007, 2008, 2009, 2010, 2011 Free Software -+# Foundation, Inc. - # Written by Gordon Matzigkeit, 1996 - # - # This file is free software; the Free Software Foundation gives -@@ -10,7 +11,8 @@ - - m4_define([_LT_COPYING], [dnl - # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, --# 2006, 2007, 2008 Free Software Foundation, Inc. -+# 2006, 2007, 2008, 2009, 2010, 2011 Free Software -+# Foundation, Inc. - # Written by Gordon Matzigkeit, 1996 - # - # This file is part of GNU Libtool. -@@ -37,7 +39,7 @@ m4_define([_LT_COPYING], [dnl - # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - ]) - --# serial 56 LT_INIT -+# serial 57 LT_INIT - - - # LT_PREREQ(VERSION) -@@ -66,6 +68,7 @@ esac - # ------------------ - AC_DEFUN([LT_INIT], - [AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT -+AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl - AC_BEFORE([$0], [LT_LANG])dnl - AC_BEFORE([$0], [LT_OUTPUT])dnl - AC_BEFORE([$0], [LTDL_INIT])dnl -@@ -82,6 +85,8 @@ AC_REQUIRE([LTVERSION_VERSION])dnl - AC_REQUIRE([LTOBSOLETE_VERSION])dnl - m4_require([_LT_PROG_LTMAIN])dnl - -+_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}]) -+ - dnl Parse OPTIONS - _LT_SET_OPTIONS([$0], [$1]) - -@@ -118,7 +123,7 @@ m4_defun([_LT_CC_BASENAME], - *) break;; - esac - done --cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` -+cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` - ]) - - -@@ -138,6 +143,11 @@ m4_defun([_LT_FILEUTILS_DEFAULTS], - m4_defun([_LT_SETUP], - [AC_REQUIRE([AC_CANONICAL_HOST])dnl - AC_REQUIRE([AC_CANONICAL_BUILD])dnl -+AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl -+AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl -+ -+_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl -+dnl - _LT_DECL([], [host_alias], [0], [The host system])dnl - _LT_DECL([], [host], [0])dnl - _LT_DECL([], [host_os], [0])dnl -@@ -160,10 +170,13 @@ _LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl - dnl - m4_require([_LT_FILEUTILS_DEFAULTS])dnl - m4_require([_LT_CHECK_SHELL_FEATURES])dnl -+m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl - m4_require([_LT_CMD_RELOAD])dnl - m4_require([_LT_CHECK_MAGIC_METHOD])dnl -+m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl - m4_require([_LT_CMD_OLD_ARCHIVE])dnl - m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl -+m4_require([_LT_WITH_SYSROOT])dnl - - _LT_CONFIG_LIBTOOL_INIT([ - # See if we are running on zsh, and set the options which allow our -@@ -179,7 +192,6 @@ fi - _LT_CHECK_OBJDIR - - m4_require([_LT_TAG_COMPILER])dnl --_LT_PROG_ECHO_BACKSLASH - - case $host_os in - aix3*) -@@ -193,23 +205,6 @@ aix3*) - ;; - esac - --# Sed substitution that helps us do robust quoting. It backslashifies --# metacharacters that are still active within double-quoted strings. --sed_quote_subst='s/\([["`$\\]]\)/\\\1/g' -- --# Same as above, but do not quote variable references. --double_quote_subst='s/\([["`\\]]\)/\\\1/g' -- --# Sed substitution to delay expansion of an escaped shell variable in a --# double_quote_subst'ed string. --delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' -- --# Sed substitution to delay expansion of an escaped single quote. --delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' -- --# Sed substitution to avoid accidental globbing in evaled expressions --no_glob_subst='s/\*/\\\*/g' -- - # Global variables: - ofile=libtool - can_build_shared=yes -@@ -250,6 +245,28 @@ _LT_CONFIG_COMMANDS - ])# _LT_SETUP - - -+# _LT_PREPARE_SED_QUOTE_VARS -+# -------------------------- -+# Define a few sed substitution that help us do robust quoting. -+m4_defun([_LT_PREPARE_SED_QUOTE_VARS], -+[# Backslashify metacharacters that are still active within -+# double-quoted strings. -+sed_quote_subst='s/\([["`$\\]]\)/\\\1/g' -+ -+# Same as above, but do not quote variable references. -+double_quote_subst='s/\([["`\\]]\)/\\\1/g' -+ -+# Sed substitution to delay expansion of an escaped shell variable in a -+# double_quote_subst'ed string. -+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' -+ -+# Sed substitution to delay expansion of an escaped single quote. -+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' -+ -+# Sed substitution to avoid accidental globbing in evaled expressions -+no_glob_subst='s/\*/\\\*/g' -+]) -+ - # _LT_PROG_LTMAIN - # --------------- - # Note that this code is called both from `configure', and `config.status' -@@ -408,7 +425,7 @@ m4_define([_lt_decl_all_varnames], - # declaration there will have the same value as in `configure'. VARNAME - # must have a single quote delimited value for this to work. - m4_define([_LT_CONFIG_STATUS_DECLARE], --[$1='`$ECHO "X$][$1" | $Xsed -e "$delay_single_quote_subst"`']) -+[$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`']) - - - # _LT_CONFIG_STATUS_DECLARATIONS -@@ -418,7 +435,7 @@ m4_define([_LT_CONFIG_STATUS_DECLARE], - # embedded single quotes properly. In configure, this macro expands - # each variable declared with _LT_DECL (and _LT_TAGDECL) into: - # --# ='`$ECHO "X$" | $Xsed -e "$delay_single_quote_subst"`' -+# ='`$ECHO "$" | $SED "$delay_single_quote_subst"`' - m4_defun([_LT_CONFIG_STATUS_DECLARATIONS], - [m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames), - [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])]) -@@ -517,12 +534,20 @@ LTCC='$LTCC' - LTCFLAGS='$LTCFLAGS' - compiler='$compiler_DEFAULT' - -+# A function that is used when there is no print builtin or printf. -+func_fallback_echo () -+{ -+ eval 'cat <<_LTECHO_EOF -+\$[]1 -+_LTECHO_EOF' -+} -+ - # Quote evaled strings. - for var in lt_decl_all_varnames([[ \ - ]], lt_decl_quote_varnames); do -- case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in -+ case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in - *[[\\\\\\\`\\"\\\$]]*) -- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" -+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" - ;; - *) - eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" -@@ -533,9 +558,9 @@ done - # Double-quote double-evaled strings. - for var in lt_decl_all_varnames([[ \ - ]], lt_decl_dquote_varnames); do -- case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in -+ case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in - *[[\\\\\\\`\\"\\\$]]*) -- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" -+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" - ;; - *) - eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" -@@ -543,16 +568,38 @@ for var in lt_decl_all_varnames([[ \ - esac - done - --# Fix-up fallback echo if it was mangled by the above quoting rules. --case \$lt_ECHO in --*'\\\[$]0 --fallback-echo"')dnl " -- lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\[$]0 --fallback-echo"\[$]/\[$]0 --fallback-echo"/'\` -- ;; --esac -- - _LT_OUTPUT_LIBTOOL_INIT - ]) - -+# _LT_GENERATED_FILE_INIT(FILE, [COMMENT]) -+# ------------------------------------ -+# Generate a child script FILE with all initialization necessary to -+# reuse the environment learned by the parent script, and make the -+# file executable. If COMMENT is supplied, it is inserted after the -+# `#!' sequence but before initialization text begins. After this -+# macro, additional text can be appended to FILE to form the body of -+# the child script. The macro ends with non-zero status if the -+# file could not be fully written (such as if the disk is full). -+m4_ifdef([AS_INIT_GENERATED], -+[m4_defun([_LT_GENERATED_FILE_INIT],[AS_INIT_GENERATED($@)])], -+[m4_defun([_LT_GENERATED_FILE_INIT], -+[m4_require([AS_PREPARE])]dnl -+[m4_pushdef([AS_MESSAGE_LOG_FD])]dnl -+[lt_write_fail=0 -+cat >$1 <<_ASEOF || lt_write_fail=1 -+#! $SHELL -+# Generated by $as_me. -+$2 -+SHELL=\${CONFIG_SHELL-$SHELL} -+export SHELL -+_ASEOF -+cat >>$1 <<\_ASEOF || lt_write_fail=1 -+AS_SHELL_SANITIZE -+_AS_PREPARE -+exec AS_MESSAGE_FD>&1 -+_ASEOF -+test $lt_write_fail = 0 && chmod +x $1[]dnl -+m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT - - # LT_OUTPUT - # --------- -@@ -562,20 +609,11 @@ _LT_OUTPUT_LIBTOOL_INIT - AC_DEFUN([LT_OUTPUT], - [: ${CONFIG_LT=./config.lt} - AC_MSG_NOTICE([creating $CONFIG_LT]) --cat >"$CONFIG_LT" <<_LTEOF --#! $SHELL --# Generated by $as_me. --# Run this file to recreate a libtool stub with the current configuration. -- --lt_cl_silent=false --SHELL=\${CONFIG_SHELL-$SHELL} --_LTEOF -+_LT_GENERATED_FILE_INIT(["$CONFIG_LT"], -+[# Run this file to recreate a libtool stub with the current configuration.]) - - cat >>"$CONFIG_LT" <<\_LTEOF --AS_SHELL_SANITIZE --_AS_PREPARE -- --exec AS_MESSAGE_FD>&1 -+lt_cl_silent=false - exec AS_MESSAGE_LOG_FD>>config.log - { - echo -@@ -601,7 +639,7 @@ m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl - m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) - configured by $[0], generated by m4_PACKAGE_STRING. - --Copyright (C) 2008 Free Software Foundation, Inc. -+Copyright (C) 2011 Free Software Foundation, Inc. - This config.lt script is free software; the Free Software Foundation - gives unlimited permision to copy, distribute and modify it." - -@@ -646,15 +684,13 @@ chmod +x "$CONFIG_LT" - # appending to config.log, which fails on DOS, as config.log is still kept - # open by configure. Here we exec the FD to /dev/null, effectively closing - # config.log, so it can be properly (re)opened and appended to by config.lt. --if test "$no_create" != yes; then -- lt_cl_success=: -- test "$silent" = yes && -- lt_config_lt_args="$lt_config_lt_args --quiet" -- exec AS_MESSAGE_LOG_FD>/dev/null -- $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false -- exec AS_MESSAGE_LOG_FD>>config.log -- $lt_cl_success || AS_EXIT(1) --fi -+lt_cl_success=: -+test "$silent" = yes && -+ lt_config_lt_args="$lt_config_lt_args --quiet" -+exec AS_MESSAGE_LOG_FD>/dev/null -+$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false -+exec AS_MESSAGE_LOG_FD>>config.log -+$lt_cl_success || AS_EXIT(1) - ])# LT_OUTPUT - - -@@ -717,15 +753,12 @@ _LT_EOF - # if finds mixed CR/LF and LF-only lines. Since sed operates in - # text mode, it properly converts lines to CR/LF. This bash problem - # is reportedly fixed, but why not run on old versions too? -- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) -- -- _LT_PROG_XSI_SHELLFNS -+ sed '$q' "$ltmain" >> "$cfgfile" \ -+ || (rm -f "$cfgfile"; exit 1) - -- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) -+ _LT_PROG_REPLACE_SHELLFNS - -- mv -f "$cfgfile" "$ofile" || -+ mv -f "$cfgfile" "$ofile" || - (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") - chmod +x "$ofile" - ], -@@ -770,6 +803,7 @@ AC_DEFUN([LT_LANG], - m4_case([$1], - [C], [_LT_LANG(C)], - [C++], [_LT_LANG(CXX)], -+ [Go], [_LT_LANG(GO)], - [Java], [_LT_LANG(GCJ)], - [Fortran 77], [_LT_LANG(F77)], - [Fortran], [_LT_LANG(FC)], -@@ -791,6 +825,31 @@ m4_defun([_LT_LANG], - ])# _LT_LANG - - -+m4_ifndef([AC_PROG_GO], [ -+############################################################ -+# NOTE: This macro has been submitted for inclusion into # -+# GNU Autoconf as AC_PROG_GO. When it is available in # -+# a released version of Autoconf we should remove this # -+# macro and use it instead. # -+############################################################ -+m4_defun([AC_PROG_GO], -+[AC_LANG_PUSH(Go)dnl -+AC_ARG_VAR([GOC], [Go compiler command])dnl -+AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl -+_AC_ARG_VAR_LDFLAGS()dnl -+AC_CHECK_TOOL(GOC, gccgo) -+if test -z "$GOC"; then -+ if test -n "$ac_tool_prefix"; then -+ AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo]) -+ fi -+fi -+if test -z "$GOC"; then -+ AC_CHECK_PROG(GOC, gccgo, gccgo, false) -+fi -+])#m4_defun -+])#m4_ifndef -+ -+ - # _LT_LANG_DEFAULT_CONFIG - # ----------------------- - m4_defun([_LT_LANG_DEFAULT_CONFIG], -@@ -821,6 +880,10 @@ AC_PROVIDE_IFELSE([AC_PROG_GCJ], - m4_ifdef([LT_PROG_GCJ], - [m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])]) - -+AC_PROVIDE_IFELSE([AC_PROG_GO], -+ [LT_LANG(GO)], -+ [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])]) -+ - AC_PROVIDE_IFELSE([LT_PROG_RC], - [LT_LANG(RC)], - [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])]) -@@ -831,11 +894,13 @@ AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)]) - AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)]) - AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)]) - AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)]) -+AU_DEFUN([AC_LIBTOOL_RC], [LT_LANG(Windows Resource)]) - dnl aclocal-1.4 backwards compatibility: - dnl AC_DEFUN([AC_LIBTOOL_CXX], []) - dnl AC_DEFUN([AC_LIBTOOL_F77], []) - dnl AC_DEFUN([AC_LIBTOOL_FC], []) - dnl AC_DEFUN([AC_LIBTOOL_GCJ], []) -+dnl AC_DEFUN([AC_LIBTOOL_RC], []) - - - # _LT_TAG_COMPILER -@@ -921,7 +986,13 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[ - $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ - -dynamiclib -Wl,-single_module conftest.c 2>conftest.err - _lt_result=$? -- if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then -+ # If there is a non-empty error log, and "single_module" -+ # appears in it, assume the flag caused a linker warning -+ if test -s conftest.err && $GREP single_module conftest.err; then -+ cat conftest.err >&AS_MESSAGE_LOG_FD -+ # Otherwise, if the output was created with a 0 exit code from -+ # the compiler, it worked. -+ elif test -f libconftest.dylib && test $_lt_result -eq 0; then - lt_cv_apple_cc_single_mod=yes - else - cat conftest.err >&AS_MESSAGE_LOG_FD -@@ -929,6 +1000,7 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[ - rm -rf libconftest.dylib* - rm -f conftest.* - fi]) -+ - AC_CACHE_CHECK([for -exported_symbols_list linker flag], - [lt_cv_ld_exported_symbols_list], - [lt_cv_ld_exported_symbols_list=no -@@ -940,6 +1012,34 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[ - [lt_cv_ld_exported_symbols_list=no]) - LDFLAGS="$save_LDFLAGS" - ]) -+ -+ AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load], -+ [lt_cv_ld_force_load=no -+ cat > conftest.c << _LT_EOF -+int forced_loaded() { return 2;} -+_LT_EOF -+ echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD -+ $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD -+ echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD -+ $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD -+ echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD -+ $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD -+ cat > conftest.c << _LT_EOF -+int main() { return 0;} -+_LT_EOF -+ echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD -+ $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err -+ _lt_result=$? -+ if test -s conftest.err && $GREP force_load conftest.err; then -+ cat conftest.err >&AS_MESSAGE_LOG_FD -+ elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then -+ lt_cv_ld_force_load=yes -+ else -+ cat conftest.err >&AS_MESSAGE_LOG_FD -+ fi -+ rm -f conftest.err libconftest.a conftest conftest.c -+ rm -rf conftest.dSYM -+ ]) - case $host_os in - rhapsody* | darwin1.[[012]]) - _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; -@@ -967,7 +1067,7 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[ - else - _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' - fi -- if test "$DSYMUTIL" != ":"; then -+ if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then - _lt_dsymutil='~$DSYMUTIL $lib || :' - else - _lt_dsymutil= -@@ -977,8 +1077,8 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[ - ]) - - --# _LT_DARWIN_LINKER_FEATURES --# -------------------------- -+# _LT_DARWIN_LINKER_FEATURES([TAG]) -+# --------------------------------- - # Checks for linker and compiler features on darwin - m4_defun([_LT_DARWIN_LINKER_FEATURES], - [ -@@ -987,7 +1087,13 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES], - _LT_TAGVAR(hardcode_direct, $1)=no - _LT_TAGVAR(hardcode_automatic, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported -- _LT_TAGVAR(whole_archive_flag_spec, $1)='' -+ if test "$lt_cv_ld_force_load" = "yes"; then -+ _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' -+ m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes], -+ [FC], [_LT_TAGVAR(compiler_needs_object, $1)=yes]) -+ else -+ _LT_TAGVAR(whole_archive_flag_spec, $1)='' -+ fi - _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined" - case $cc_basename in -@@ -995,7 +1101,7 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES], - *) _lt_dar_can_shared=$GCC ;; - esac - if test "$_lt_dar_can_shared" = "yes"; then -- output_verbose_link_cmd=echo -+ output_verbose_link_cmd=func_echo_all - _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" - _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" - _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -@@ -1011,203 +1117,142 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES], - fi - ]) - --# _LT_SYS_MODULE_PATH_AIX --# ----------------------- -+# _LT_SYS_MODULE_PATH_AIX([TAGNAME]) -+# ---------------------------------- - # Links a minimal program and checks the executable - # for the system default hardcoded library path. In most cases, - # this is /usr/lib:/lib, but when the MPI compilers are used - # the location of the communication and MPI libs are included too. - # If we don't find anything, use the default library path according - # to the aix ld manual. -+# Store the results from the different compilers for each TAGNAME. -+# Allow to override them for all tags through lt_cv_aix_libpath. - m4_defun([_LT_SYS_MODULE_PATH_AIX], - [m4_require([_LT_DECL_SED])dnl --AC_LINK_IFELSE(AC_LANG_PROGRAM,[ --lt_aix_libpath_sed=' -- /Import File Strings/,/^$/ { -- /^0/ { -- s/^0 *\(.*\)$/\1/ -- p -- } -- }' --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --# Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then -- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` --fi],[]) --if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+if test "${lt_cv_aix_libpath+set}" = set; then -+ aix_libpath=$lt_cv_aix_libpath -+else -+ AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])], -+ [AC_LINK_IFELSE([AC_LANG_PROGRAM],[ -+ lt_aix_libpath_sed='[ -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\([^ ]*\) *$/\1/ -+ p -+ } -+ }]' -+ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ # Check for a 64-bit object if we didn't find anything. -+ if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then -+ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+ fi],[]) -+ if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then -+ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib" -+ fi -+ ]) -+ aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1]) -+fi - ])# _LT_SYS_MODULE_PATH_AIX - - - # _LT_SHELL_INIT(ARG) - # ------------------- - m4_define([_LT_SHELL_INIT], --[ifdef([AC_DIVERSION_NOTICE], -- [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)], -- [AC_DIVERT_PUSH(NOTICE)]) --$1 --AC_DIVERT_POP --])# _LT_SHELL_INIT -+[m4_divert_text([M4SH-INIT], [$1 -+])])# _LT_SHELL_INIT -+ - - - # _LT_PROG_ECHO_BACKSLASH - # ----------------------- --# Add some code to the start of the generated configure script which --# will find an echo command which doesn't interpret backslashes. -+# Find how we can fake an echo command that does not interpret backslash. -+# In particular, with Autoconf 2.60 or later we add some code to the start -+# of the generated configure script which will find a shell with a builtin -+# printf (which we can use as an echo command). - m4_defun([_LT_PROG_ECHO_BACKSLASH], --[_LT_SHELL_INIT([ --# Check that we are running under the correct shell. --SHELL=${CONFIG_SHELL-/bin/sh} -- --case X$lt_ECHO in --X*--fallback-echo) -- # Remove one level of quotation (which was required for Make). -- ECHO=`echo "$lt_ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','` -- ;; --esac -- --ECHO=${lt_ECHO-echo} --if test "X[$]1" = X--no-reexec; then -- # Discard the --no-reexec flag, and continue. -- shift --elif test "X[$]1" = X--fallback-echo; then -- # Avoid inline document here, it may be left over -- : --elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then -- # Yippee, $ECHO works! -- : -+[ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' -+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO -+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO -+ -+AC_MSG_CHECKING([how to print strings]) -+# Test print first, because it will be a builtin if present. -+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ -+ test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then -+ ECHO='print -r --' -+elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then -+ ECHO='printf %s\n' - else -- # Restart under the correct shell. -- exec $SHELL "[$]0" --no-reexec ${1+"[$]@"} --fi -- --if test "X[$]1" = X--fallback-echo; then -- # used as fallback echo -- shift -- cat <<_LT_EOF --[$]* --_LT_EOF -- exit 0 -+ # Use this function as a fallback that always works. -+ func_fallback_echo () -+ { -+ eval 'cat <<_LTECHO_EOF -+$[]1 -+_LTECHO_EOF' -+ } -+ ECHO='func_fallback_echo' - fi - --# The HP-UX ksh and POSIX shell print the target directory to stdout --# if CDPATH is set. --(unset CDPATH) >/dev/null 2>&1 && unset CDPATH -- --if test -z "$lt_ECHO"; then -- if test "X${echo_test_string+set}" != Xset; then -- # find a string as large as possible, as long as the shell can cope with it -- for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do -- # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... -- if { echo_test_string=`eval $cmd`; } 2>/dev/null && -- { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null -- then -- break -- fi -- done -- fi -- -- if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && -- echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && -- test "X$echo_testing_string" = "X$echo_test_string"; then -- : -- else -- # The Solaris, AIX, and Digital Unix default echo programs unquote -- # backslashes. This makes it impossible to quote backslashes using -- # echo "$something" | sed 's/\\/\\\\/g' -- # -- # So, first we look for a working echo in the user's PATH. -- -- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR -- for dir in $PATH /usr/ucb; do -- IFS="$lt_save_ifs" -- if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && -- test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && -- echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && -- test "X$echo_testing_string" = "X$echo_test_string"; then -- ECHO="$dir/echo" -- break -- fi -- done -- IFS="$lt_save_ifs" -- -- if test "X$ECHO" = Xecho; then -- # We didn't find a better echo, so look for alternatives. -- if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' && -- echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` && -- test "X$echo_testing_string" = "X$echo_test_string"; then -- # This shell has a builtin print -r that does the trick. -- ECHO='print -r' -- elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } && -- test "X$CONFIG_SHELL" != X/bin/ksh; then -- # If we have ksh, try running configure again with it. -- ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} -- export ORIGINAL_CONFIG_SHELL -- CONFIG_SHELL=/bin/ksh -- export CONFIG_SHELL -- exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"} -- else -- # Try using printf. -- ECHO='printf %s\n' -- if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && -- echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && -- test "X$echo_testing_string" = "X$echo_test_string"; then -- # Cool, printf works -- : -- elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && -- test "X$echo_testing_string" = 'X\t' && -- echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && -- test "X$echo_testing_string" = "X$echo_test_string"; then -- CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL -- export CONFIG_SHELL -- SHELL="$CONFIG_SHELL" -- export SHELL -- ECHO="$CONFIG_SHELL [$]0 --fallback-echo" -- elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && -- test "X$echo_testing_string" = 'X\t' && -- echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && -- test "X$echo_testing_string" = "X$echo_test_string"; then -- ECHO="$CONFIG_SHELL [$]0 --fallback-echo" -- else -- # maybe with a smaller string... -- prev=: -- -- for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do -- if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null -- then -- break -- fi -- prev="$cmd" -- done -+# func_echo_all arg... -+# Invoke $ECHO with all args, space-separated. -+func_echo_all () -+{ -+ $ECHO "$*" -+} - -- if test "$prev" != 'sed 50q "[$]0"'; then -- echo_test_string=`eval $prev` -- export echo_test_string -- exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"} -- else -- # Oops. We lost completely, so just stick with echo. -- ECHO=echo -- fi -- fi -- fi -- fi -- fi --fi -+case "$ECHO" in -+ printf*) AC_MSG_RESULT([printf]) ;; -+ print*) AC_MSG_RESULT([print -r]) ;; -+ *) AC_MSG_RESULT([cat]) ;; -+esac - --# Copy echo and quote the copy suitably for passing to libtool from --# the Makefile, instead of quoting the original, which is used later. --lt_ECHO=$ECHO --if test "X$lt_ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then -- lt_ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo" --fi -+m4_ifdef([_AS_DETECT_SUGGESTED], -+[_AS_DETECT_SUGGESTED([ -+ test -n "${ZSH_VERSION+set}${BASH_VERSION+set}" || ( -+ ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' -+ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO -+ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO -+ PATH=/empty FPATH=/empty; export PATH FPATH -+ test "X`printf %s $ECHO`" = "X$ECHO" \ -+ || test "X`print -r -- $ECHO`" = "X$ECHO" )])]) - --AC_SUBST(lt_ECHO) --]) - _LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts]) --_LT_DECL([], [ECHO], [1], -- [An echo program that does not interpret backslashes]) -+_LT_DECL([], [ECHO], [1], [An echo program that protects backslashes]) - ])# _LT_PROG_ECHO_BACKSLASH - - -+# _LT_WITH_SYSROOT -+# ---------------- -+AC_DEFUN([_LT_WITH_SYSROOT], -+[AC_MSG_CHECKING([for sysroot]) -+AC_ARG_WITH([sysroot], -+[ --with-sysroot[=DIR] Search for dependent libraries within DIR -+ (or the compiler's sysroot if not specified).], -+[], [with_sysroot=no]) -+ -+dnl lt_sysroot will always be passed unquoted. We quote it here -+dnl in case the user passed a directory name. -+lt_sysroot= -+case ${with_sysroot} in #( -+ yes) -+ if test "$GCC" = yes; then -+ lt_sysroot=`$CC --print-sysroot 2>/dev/null` -+ fi -+ ;; #( -+ /*) -+ lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` -+ ;; #( -+ no|'') -+ ;; #( -+ *) -+ AC_MSG_RESULT([${with_sysroot}]) -+ AC_MSG_ERROR([The sysroot must be an absolute path.]) -+ ;; -+esac -+ -+ AC_MSG_RESULT([${lt_sysroot:-no}]) -+_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl -+[dependent libraries, and in which our libraries should be installed.])]) -+ - # _LT_ENABLE_LOCK - # --------------- - m4_defun([_LT_ENABLE_LOCK], -@@ -1236,7 +1281,7 @@ ia64-*-hpux*) - ;; - *-*-irix6*) - # Find out which ABI we are using. -- echo '[#]line __oline__ "configure"' > conftest.$ac_ext -+ echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext - if AC_TRY_EVAL(ac_compile); then - if test "$lt_cv_prog_gnu_ld" = yes; then - case `/usr/bin/file conftest.$ac_objext` in -@@ -1279,7 +1324,14 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) - LD="${LD-ld} -m elf_i386_fbsd" - ;; - x86_64-*linux*) -- LD="${LD-ld} -m elf_i386" -+ case `/usr/bin/file conftest.o` in -+ *x86-64*) -+ LD="${LD-ld} -m elf32_x86_64" -+ ;; -+ *) -+ LD="${LD-ld} -m elf_i386" -+ ;; -+ esac - ;; - ppc64-*linux*|powerpc64-*linux*) - LD="${LD-ld} -m elf32ppclinux" -@@ -1329,14 +1381,27 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) - CFLAGS="$SAVE_CFLAGS" - fi - ;; --sparc*-*solaris*) -+*-*solaris*) - # Find out which ABI we are using. - echo 'int i;' > conftest.$ac_ext - if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.o` in - *64-bit*) - case $lt_cv_prog_gnu_ld in -- yes*) LD="${LD-ld} -m elf64_sparc" ;; -+ yes*) -+ case $host in -+ i?86-*-solaris*) -+ LD="${LD-ld} -m elf_x86_64" -+ ;; -+ sparc*-*-solaris*) -+ LD="${LD-ld} -m elf64_sparc" -+ ;; -+ esac -+ # GNU ld 2.21 introduced _sol2 emulations. Use them if available. -+ if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then -+ LD="${LD-ld}_sol2" -+ fi -+ ;; - *) - if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then - LD="${LD-ld} -64" -@@ -1354,14 +1419,47 @@ need_locks="$enable_libtool_lock" - ])# _LT_ENABLE_LOCK - - -+# _LT_PROG_AR -+# ----------- -+m4_defun([_LT_PROG_AR], -+[AC_CHECK_TOOLS(AR, [ar], false) -+: ${AR=ar} -+: ${AR_FLAGS=cru} -+_LT_DECL([], [AR], [1], [The archiver]) -+_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive]) -+ -+AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file], -+ [lt_cv_ar_at_file=no -+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM], -+ [echo conftest.$ac_objext > conftest.lst -+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD' -+ AC_TRY_EVAL([lt_ar_try]) -+ if test "$ac_status" -eq 0; then -+ # Ensure the archiver fails upon bogus file names. -+ rm -f conftest.$ac_objext libconftest.a -+ AC_TRY_EVAL([lt_ar_try]) -+ if test "$ac_status" -ne 0; then -+ lt_cv_ar_at_file=@ -+ fi -+ fi -+ rm -f conftest.* libconftest.a -+ ]) -+ ]) -+ -+if test "x$lt_cv_ar_at_file" = xno; then -+ archiver_list_spec= -+else -+ archiver_list_spec=$lt_cv_ar_at_file -+fi -+_LT_DECL([], [archiver_list_spec], [1], -+ [How to feed a file listing to the archiver]) -+])# _LT_PROG_AR -+ -+ - # _LT_CMD_OLD_ARCHIVE - # ------------------- - m4_defun([_LT_CMD_OLD_ARCHIVE], --[AC_CHECK_TOOL(AR, ar, false) --test -z "$AR" && AR=ar --test -z "$AR_FLAGS" && AR_FLAGS=cru --_LT_DECL([], [AR], [1], [The archiver]) --_LT_DECL([], [AR_FLAGS], [1]) -+[_LT_PROG_AR - - AC_CHECK_TOOL(STRIP, strip, :) - test -z "$STRIP" && STRIP=: -@@ -1380,18 +1478,27 @@ old_postuninstall_cmds= - if test -n "$RANLIB"; then - case $host_os in - openbsd*) -- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" -+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" - ;; - *) -- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" -+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" - ;; - esac -- old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" -+ old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" - fi -+ -+case $host_os in -+ darwin*) -+ lock_old_archive_extraction=yes ;; -+ *) -+ lock_old_archive_extraction=no ;; -+esac - _LT_DECL([], [old_postinstall_cmds], [2]) - _LT_DECL([], [old_postuninstall_cmds], [2]) - _LT_TAGDECL([], [old_archive_cmds], [2], - [Commands used to build an old-style archive]) -+_LT_DECL([], [lock_old_archive_extraction], [0], -+ [Whether to use a lock for old archive extraction]) - ])# _LT_CMD_OLD_ARCHIVE - - -@@ -1416,15 +1523,15 @@ AC_CACHE_CHECK([$1], [$2], - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) -+ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&AS_MESSAGE_LOG_FD -- echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD -+ echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. -- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp -+ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then - $2=yes -@@ -1464,7 +1571,7 @@ AC_CACHE_CHECK([$1], [$2], - if test -s conftest.err; then - # Append any errors to the config.log. - cat conftest.err 1>&AS_MESSAGE_LOG_FD -- $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp -+ $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if diff conftest.exp conftest.er2 >/dev/null; then - $2=yes -@@ -1527,6 +1634,11 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl - lt_cv_sys_max_cmd_len=8192; - ;; - -+ mint*) -+ # On MiNT this can take a long time and run out of memory. -+ lt_cv_sys_max_cmd_len=8192; -+ ;; -+ - amigaos*) - # On AmigaOS with pdksh, this test takes hours, literally. - # So we just punt and use a minimum line length of 8192. -@@ -1552,6 +1664,11 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl - lt_cv_sys_max_cmd_len=196608 - ;; - -+ os2*) -+ # The test takes a long time on OS/2. -+ lt_cv_sys_max_cmd_len=8192 -+ ;; -+ - osf*) - # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure - # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not -@@ -1578,7 +1695,8 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl - ;; - *) - lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` -- if test -n "$lt_cv_sys_max_cmd_len"; then -+ if test -n "$lt_cv_sys_max_cmd_len" && \ -+ test undefined != "$lt_cv_sys_max_cmd_len"; then - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` - else -@@ -1591,8 +1709,8 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl - # If test is not a shell built-in, we'll probably end up computing a - # maximum length that is only half of the actual maximum length, but - # we can't tell. -- while { test "X"`$SHELL [$]0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \ -- = "XX$teststring$teststring"; } >/dev/null 2>&1 && -+ while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ -+ = "X$teststring$teststring"; } >/dev/null 2>&1 && - test $i != 17 # 1/2 MB should be enough - do - i=`expr $i + 1` -@@ -1643,7 +1761,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --[#line __oline__ "configure" -+[#line $LINENO "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -1684,7 +1802,13 @@ else - # endif - #endif - --void fnord() { int i=42;} -+/* When -fvisbility=hidden is used, assume the code has been annotated -+ correspondingly for the symbols needed. */ -+#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) -+int fnord () __attribute__((visibility("default"))); -+#endif -+ -+int fnord () { return 42; } - int main () - { - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -1693,7 +1817,11 @@ int main () - if (self) - { - if (dlsym (self,"fnord")) status = $lt_dlno_uscore; -- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; -+ else -+ { -+ if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; -+ else puts (dlerror ()); -+ } - /* dlclose (self); */ - } - else -@@ -1869,16 +1997,16 @@ AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext], - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) -+ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&AS_MESSAGE_LOG_FD -- echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD -+ echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings -- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp -+ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp - $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 - if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then - _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes -@@ -2037,6 +2165,7 @@ m4_require([_LT_DECL_EGREP])dnl - m4_require([_LT_FILEUTILS_DEFAULTS])dnl - m4_require([_LT_DECL_OBJDUMP])dnl - m4_require([_LT_DECL_SED])dnl -+m4_require([_LT_CHECK_SHELL_FEATURES])dnl - AC_MSG_CHECKING([dynamic linker characteristics]) - m4_if([$1], - [], [ -@@ -2045,16 +2174,23 @@ if test "$GCC" = yes; then - darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; - *) lt_awk_arg="/^libraries:/" ;; - esac -- lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"` -- if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then -+ case $host_os in -+ mingw* | cegcc*) lt_sed_strip_eq="s,=\([[A-Za-z]]:\),\1,g" ;; -+ *) lt_sed_strip_eq="s,=/,/,g" ;; -+ esac -+ lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq` -+ case $lt_search_path_spec in -+ *\;*) - # if the path contains ";" then we assume it to be the separator - # otherwise default to the standard path separator (i.e. ":") - it is - # assumed that no part of a normal pathname contains ";" but that should - # okay in the real world where ";" in dirpaths is itself problematic. -- lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'` -- else -- lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -- fi -+ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'` -+ ;; -+ *) -+ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"` -+ ;; -+ esac - # Ok, now we have the path, separated by spaces, we can step through it - # and add multilib dir if necessary. - lt_tmp_lt_search_path_spec= -@@ -2067,7 +2203,7 @@ if test "$GCC" = yes; then - lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" - fi - done -- lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk ' -+ lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' - BEGIN {RS=" "; FS="/|\n";} { - lt_foo=""; - lt_count=0; -@@ -2087,7 +2223,13 @@ BEGIN {RS=" "; FS="/|\n";} { - if (lt_foo != "") { lt_freq[[lt_foo]]++; } - if (lt_freq[[lt_foo]] == 1) { print lt_foo; } - }'` -- sys_lib_search_path_spec=`$ECHO $lt_search_path_spec` -+ # AWK program above erroneously prepends '/' to C:/dos/paths -+ # for these hosts. -+ case $host_os in -+ mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\ -+ $SED 's,/\([[A-Za-z]]:\),\1,g'` ;; -+ esac -+ sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP` - else - sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" - fi]) -@@ -2113,7 +2255,7 @@ need_version=unknown - - case $host_os in - aix3*) -- version_type=linux -+ version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' - shlibpath_var=LIBPATH - -@@ -2122,7 +2264,7 @@ aix3*) - ;; - - aix[[4-9]]*) -- version_type=linux -+ version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - hardcode_into_libs=yes -@@ -2175,7 +2317,7 @@ amigaos*) - m68k) - library_names_spec='$libname.ixlibrary $libname.a' - # Create ${libname}_ixlibrary.a entries in /sys/libs. -- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' -+ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' - ;; - esac - ;; -@@ -2187,7 +2329,7 @@ beos*) - ;; - - bsdi[[45]]*) -- version_type=linux -+ version_type=linux # correct to gnu/linux during the next big refactor - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' -@@ -2206,8 +2348,9 @@ cygwin* | mingw* | pw32* | cegcc*) - need_version=no - need_lib_prefix=no - -- case $GCC,$host_os in -- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) -+ case $GCC,$cc_basename in -+ yes,*) -+ # gcc - library_names_spec='$libname.dll.a' - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ -@@ -2228,36 +2371,83 @@ cygwin* | mingw* | pw32* | cegcc*) - cygwin*) - # Cygwin DLLs use 'cyg' prefix rather than 'lib' - soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' -- sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" -+m4_if([$1], [],[ -+ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"]) - ;; - mingw* | cegcc*) - # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' -- sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` -- if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then -- # It is most probably a Windows format PATH printed by -- # mingw gcc, but we are running on Cygwin. Gcc prints its search -- # path with ; separators, and with drive letters. We can handle the -- # drive letters (cygwin fileutils understands them), so leave them, -- # especially as we might pass files found there to a mingw objdump, -- # which wouldn't understand a cygwinified path. Ahh. -- sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` -- else -- sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -- fi - ;; - pw32*) - # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' - ;; - esac -+ dynamic_linker='Win32 ld.exe' -+ ;; -+ -+ *,cl*) -+ # Native MSVC -+ libname_spec='$name' -+ soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' -+ library_names_spec='${libname}.dll.lib' -+ -+ case $build_os in -+ mingw*) -+ sys_lib_search_path_spec= -+ lt_save_ifs=$IFS -+ IFS=';' -+ for lt_path in $LIB -+ do -+ IFS=$lt_save_ifs -+ # Let DOS variable expansion print the short 8.3 style file name. -+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` -+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" -+ done -+ IFS=$lt_save_ifs -+ # Convert to MSYS style. -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'` -+ ;; -+ cygwin*) -+ # Convert to unix form, then to dos form, then back to unix form -+ # but this time dos style (no spaces!) so that the unix form looks -+ # like /cygdrive/c/PROGRA~1:/cygdr... -+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` -+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` -+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ ;; -+ *) -+ sys_lib_search_path_spec="$LIB" -+ if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then -+ # It is most probably a Windows format PATH. -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` -+ else -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ fi -+ # FIXME: find the short name or the path components, as spaces are -+ # common. (e.g. "Program Files" -> "PROGRA~1") -+ ;; -+ esac -+ -+ # DLL is installed to $(libdir)/../bin by postinstall_cmds -+ postinstall_cmds='base_file=`basename \${file}`~ -+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ -+ dldir=$destdir/`dirname \$dlpath`~ -+ test -d \$dldir || mkdir -p \$dldir~ -+ $install_prog $dir/$dlname \$dldir/$dlname' -+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ -+ dlpath=$dir/\$dldll~ -+ $RM \$dlpath' -+ shlibpath_overrides_runpath=yes -+ dynamic_linker='Win32 link.exe' - ;; - - *) -+ # Assume MSVC wrapper - library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' -+ dynamic_linker='Win32 ld.exe' - ;; - esac -- dynamic_linker='Win32 ld.exe' - # FIXME: first we should search . and the directory the executable is in - shlibpath_var=PATH - ;; -@@ -2278,7 +2468,7 @@ m4_if([$1], [],[ - ;; - - dgux*) -- version_type=linux -+ version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' -@@ -2286,10 +2476,6 @@ dgux*) - shlibpath_var=LD_LIBRARY_PATH - ;; - --freebsd1*) -- dynamic_linker=no -- ;; -- - freebsd* | dragonfly*) - # DragonFly does not have aout. When/if they implement a new - # versioning mechanism, adjust this. -@@ -2297,7 +2483,7 @@ freebsd* | dragonfly*) - objformat=`/usr/bin/objformat` - else - case $host_os in -- freebsd[[123]]*) objformat=aout ;; -+ freebsd[[23]].*) objformat=aout ;; - *) objformat=elf ;; - esac - fi -@@ -2315,7 +2501,7 @@ freebsd* | dragonfly*) - esac - shlibpath_var=LD_LIBRARY_PATH - case $host_os in -- freebsd2*) -+ freebsd2.*) - shlibpath_overrides_runpath=yes - ;; - freebsd3.[[01]]* | freebsdelf3.[[01]]*) -@@ -2334,13 +2520,16 @@ freebsd* | dragonfly*) - esac - ;; - --gnu*) -- version_type=linux -+haiku*) -+ version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no -+ dynamic_linker="$host_os runtime_loader" - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' -- shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_var=LIBRARY_PATH -+ shlibpath_overrides_runpath=yes -+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' - hardcode_into_libs=yes - ;; - -@@ -2386,12 +2575,14 @@ hpux9* | hpux10* | hpux11*) - soname_spec='${libname}${release}${shared_ext}$major' - ;; - esac -- # HP-UX runs *really* slowly unless shared libraries are mode 555. -+ # HP-UX runs *really* slowly unless shared libraries are mode 555, ... - postinstall_cmds='chmod 555 $lib' -+ # or fails outright, so override atomically: -+ install_override_mode=555 - ;; - - interix[[3-9]]*) -- version_type=linux -+ version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -@@ -2407,7 +2598,7 @@ irix5* | irix6* | nonstopux*) - nonstopux*) version_type=nonstopux ;; - *) - if test "$lt_cv_prog_gnu_ld" = yes; then -- version_type=linux -+ version_type=linux # correct to gnu/linux during the next big refactor - else - version_type=irix - fi ;; -@@ -2444,9 +2635,9 @@ linux*oldld* | linux*aout* | linux*coff*) - dynamic_linker=no - ;; - --# This must be Linux ELF. --linux* | k*bsd*-gnu) -- version_type=linux -+# This must be glibc/ELF. -+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) -+ version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -@@ -2454,29 +2645,31 @@ linux* | k*bsd*-gnu) - finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no -+ - # Some binutils ld are patched to set DT_RUNPATH -- save_LDFLAGS=$LDFLAGS -- save_libdir=$libdir -- eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \ -- LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\"" -- AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], -- [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null], -- [shlibpath_overrides_runpath=yes])]) -- LDFLAGS=$save_LDFLAGS -- libdir=$save_libdir -+ AC_CACHE_VAL([lt_cv_shlibpath_overrides_runpath], -+ [lt_cv_shlibpath_overrides_runpath=no -+ save_LDFLAGS=$LDFLAGS -+ save_libdir=$libdir -+ eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \ -+ LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\"" -+ AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], -+ [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null], -+ [lt_cv_shlibpath_overrides_runpath=yes])]) -+ LDFLAGS=$save_LDFLAGS -+ libdir=$save_libdir -+ ]) -+ shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath - - # This implies no fast_install, which is unacceptable. - # Some rework will be needed to allow for fast_install - # before this can be enabled. - hardcode_into_libs=yes - -- # Add ABI-specific directories to the system library path. -- sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" -- - # Append ld.so.conf contents to the search path - if test -f /etc/ld.so.conf; then -- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` -- sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" -+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` -+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" - fi - - # We used to test for /lib/ld.so.1 and disable shared libraries on -@@ -2488,6 +2681,18 @@ linux* | k*bsd*-gnu) - dynamic_linker='GNU/Linux ld.so' - ;; - -+netbsdelf*-gnu) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no -+ hardcode_into_libs=yes -+ dynamic_linker='NetBSD ld.elf_so' -+ ;; -+ - netbsd*) - version_type=sunos - need_lib_prefix=no -@@ -2507,7 +2712,7 @@ netbsd*) - ;; - - newsos6) -- version_type=linux -+ version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes -@@ -2576,7 +2781,7 @@ rdos*) - ;; - - solaris*) -- version_type=linux -+ version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -@@ -2601,7 +2806,7 @@ sunos4*) - ;; - - sysv4 | sysv4.3*) -- version_type=linux -+ version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH -@@ -2625,7 +2830,7 @@ sysv4 | sysv4.3*) - - sysv4*MP*) - if test -d /usr/nec ;then -- version_type=linux -+ version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' - soname_spec='$libname${shared_ext}.$major' - shlibpath_var=LD_LIBRARY_PATH -@@ -2656,7 +2861,7 @@ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - - tpf*) - # TPF is a cross-target only. Preferred cross-host = GNU/Linux. -- version_type=linux -+ version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -@@ -2666,7 +2871,7 @@ tpf*) - ;; - - uts4*) -- version_type=linux -+ version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH -@@ -2708,6 +2913,8 @@ _LT_DECL([], [library_names_spec], [1], - The last name is the one that the linker finds with -lNAME]]) - _LT_DECL([], [soname_spec], [1], - [[The coded name of the library, if different from the real name]]) -+_LT_DECL([], [install_override_mode], [1], -+ [Permission mode override for installation of shared libraries]) - _LT_DECL([], [postinstall_cmds], [2], - [Command to use after installation of a shared archive]) - _LT_DECL([], [postuninstall_cmds], [2], -@@ -2820,6 +3027,7 @@ AC_REQUIRE([AC_CANONICAL_HOST])dnl - AC_REQUIRE([AC_CANONICAL_BUILD])dnl - m4_require([_LT_DECL_SED])dnl - m4_require([_LT_DECL_EGREP])dnl -+m4_require([_LT_PROG_ECHO_BACKSLASH])dnl - - AC_ARG_WITH([gnu-ld], - [AS_HELP_STRING([--with-gnu-ld], -@@ -2941,6 +3149,11 @@ case $reload_flag in - esac - reload_cmds='$LD$reload_flag -o $output$reload_objs' - case $host_os in -+ cygwin* | mingw* | pw32* | cegcc*) -+ if test "$GCC" != yes; then -+ reload_cmds=false -+ fi -+ ;; - darwin*) - if test "$GCC" = yes; then - reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' -@@ -2949,8 +3162,8 @@ case $host_os in - fi - ;; - esac --_LT_DECL([], [reload_flag], [1], [How to create reloadable object files])dnl --_LT_DECL([], [reload_cmds], [2])dnl -+_LT_TAGDECL([], [reload_flag], [1], [How to create reloadable object files])dnl -+_LT_TAGDECL([], [reload_cmds], [2])dnl - ])# _LT_CMD_RELOAD - - -@@ -3002,16 +3215,18 @@ mingw* | pw32*) - # Base MSYS/MinGW do not provide the 'file' command needed by - # func_win32_libid shell function, so use a weaker test based on 'objdump', - # unless we find 'file', for example because we are cross-compiling. -- if ( file / ) >/dev/null 2>&1; then -+ # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin. -+ if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' - lt_cv_file_magic_cmd='func_win32_libid' - else -- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' -+ # Keep this pattern in sync with the one in func_win32_libid. -+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' - lt_cv_file_magic_cmd='$OBJDUMP -f' - fi - ;; - --cegcc) -+cegcc*) - # use the weaker test based on 'objdump'. See mingw*. - lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?' - lt_cv_file_magic_cmd='$OBJDUMP -f' -@@ -3037,7 +3252,7 @@ freebsd* | dragonfly*) - fi - ;; - --gnu*) -+haiku*) - lt_cv_deplibs_check_method=pass_all - ;; - -@@ -3049,11 +3264,11 @@ hpux10.20* | hpux11*) - lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so - ;; - hppa*64*) -- [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'] -+ [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]'] - lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl - ;; - *) -- lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library' -+ lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]]\.[[0-9]]) shared library' - lt_cv_file_magic_test_file=/usr/lib/libc.sl - ;; - esac -@@ -3074,12 +3289,12 @@ irix5* | irix6* | nonstopux*) - lt_cv_deplibs_check_method=pass_all - ;; - --# This must be Linux ELF. --linux* | k*bsd*-gnu) -+# This must be glibc/ELF. -+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) - lt_cv_deplibs_check_method=pass_all - ;; - --netbsd*) -+netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' - else -@@ -3153,14 +3368,33 @@ tpf*) - ;; - esac - ]) --file_magic_cmd=$lt_cv_file_magic_cmd --deplibs_check_method=$lt_cv_deplibs_check_method --test -z "$deplibs_check_method" && deplibs_check_method=unknown -+ -+file_magic_glob= -+want_nocaseglob=no -+if test "$build" = "$host"; then -+ case $host_os in -+ mingw* | pw32*) -+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then -+ want_nocaseglob=yes -+ else -+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"` -+ fi -+ ;; -+ esac -+fi -+ -+file_magic_cmd=$lt_cv_file_magic_cmd -+deplibs_check_method=$lt_cv_deplibs_check_method -+test -z "$deplibs_check_method" && deplibs_check_method=unknown - - _LT_DECL([], [deplibs_check_method], [1], - [Method to check whether dependent libraries are shared objects]) - _LT_DECL([], [file_magic_cmd], [1], -- [Command to use when deplibs_check_method == "file_magic"]) -+ [Command to use when deplibs_check_method = "file_magic"]) -+_LT_DECL([], [file_magic_glob], [1], -+ [How to find potential files when deplibs_check_method = "file_magic"]) -+_LT_DECL([], [want_nocaseglob], [1], -+ [Find potential files using nocaseglob when deplibs_check_method = "file_magic"]) - ])# _LT_CHECK_MAGIC_METHOD - - -@@ -3217,7 +3451,19 @@ if test "$lt_cv_path_NM" != "no"; then - NM="$lt_cv_path_NM" - else - # Didn't find any BSD compatible name lister, look for dumpbin. -- AC_CHECK_TOOLS(DUMPBIN, ["dumpbin -symbols" "link -dump -symbols"], :) -+ if test -n "$DUMPBIN"; then : -+ # Let the user override the test. -+ else -+ AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :) -+ case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in -+ *COFF*) -+ DUMPBIN="$DUMPBIN -symbols" -+ ;; -+ *) -+ DUMPBIN=: -+ ;; -+ esac -+ fi - AC_SUBST([DUMPBIN]) - if test "$DUMPBIN" != ":"; then - NM="$DUMPBIN" -@@ -3230,13 +3476,13 @@ _LT_DECL([], [NM], [1], [A BSD- or MS-compatible name lister])dnl - AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface], - [lt_cv_nm_interface="BSD nm" - echo "int some_variable = 0;" > conftest.$ac_ext -- (eval echo "\"\$as_me:__oline__: $ac_compile\"" >&AS_MESSAGE_LOG_FD) -+ (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&AS_MESSAGE_LOG_FD) - (eval "$ac_compile" 2>conftest.err) - cat conftest.err >&AS_MESSAGE_LOG_FD -- (eval echo "\"\$as_me:__oline__: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD) -+ (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD) - (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) - cat conftest.err >&AS_MESSAGE_LOG_FD -- (eval echo "\"\$as_me:__oline__: output\"" >&AS_MESSAGE_LOG_FD) -+ (eval echo "\"\$as_me:$LINENO: output\"" >&AS_MESSAGE_LOG_FD) - cat conftest.out >&AS_MESSAGE_LOG_FD - if $GREP 'External.*some_variable' conftest.out > /dev/null; then - lt_cv_nm_interface="MS dumpbin" -@@ -3251,6 +3497,67 @@ dnl aclocal-1.4 backwards compatibility: - dnl AC_DEFUN([AM_PROG_NM], []) - dnl AC_DEFUN([AC_PROG_NM], []) - -+# _LT_CHECK_SHAREDLIB_FROM_LINKLIB -+# -------------------------------- -+# how to determine the name of the shared library -+# associated with a specific link library. -+# -- PORTME fill in with the dynamic library characteristics -+m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB], -+[m4_require([_LT_DECL_EGREP]) -+m4_require([_LT_DECL_OBJDUMP]) -+m4_require([_LT_DECL_DLLTOOL]) -+AC_CACHE_CHECK([how to associate runtime and link libraries], -+lt_cv_sharedlib_from_linklib_cmd, -+[lt_cv_sharedlib_from_linklib_cmd='unknown' -+ -+case $host_os in -+cygwin* | mingw* | pw32* | cegcc*) -+ # two different shell functions defined in ltmain.sh -+ # decide which to use based on capabilities of $DLLTOOL -+ case `$DLLTOOL --help 2>&1` in -+ *--identify-strict*) -+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib -+ ;; -+ *) -+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback -+ ;; -+ esac -+ ;; -+*) -+ # fallback: assume linklib IS sharedlib -+ lt_cv_sharedlib_from_linklib_cmd="$ECHO" -+ ;; -+esac -+]) -+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd -+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO -+ -+_LT_DECL([], [sharedlib_from_linklib_cmd], [1], -+ [Command to associate shared and link libraries]) -+])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB -+ -+ -+# _LT_PATH_MANIFEST_TOOL -+# ---------------------- -+# locate the manifest tool -+m4_defun([_LT_PATH_MANIFEST_TOOL], -+[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :) -+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt -+AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool], -+ [lt_cv_path_mainfest_tool=no -+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD -+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out -+ cat conftest.err >&AS_MESSAGE_LOG_FD -+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then -+ lt_cv_path_mainfest_tool=yes -+ fi -+ rm -f conftest*]) -+if test "x$lt_cv_path_mainfest_tool" != xyes; then -+ MANIFEST_TOOL=: -+fi -+_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl -+])# _LT_PATH_MANIFEST_TOOL -+ - - # LT_LIB_M - # -------- -@@ -3259,7 +3566,7 @@ AC_DEFUN([LT_LIB_M], - [AC_REQUIRE([AC_CANONICAL_HOST])dnl - LIBM= - case $host in --*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*) -+*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*) - # These system don't have libm, or don't need it - ;; - *-ncr-sysv4.3*) -@@ -3287,7 +3594,12 @@ m4_defun([_LT_COMPILER_NO_RTTI], - _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= - - if test "$GCC" = yes; then -- _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' -+ case $cc_basename in -+ nvcc*) -+ _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;; -+ *) -+ _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ;; -+ esac - - _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions], - lt_cv_prog_compiler_rtti_exceptions, -@@ -3304,6 +3616,7 @@ _LT_TAGDECL([no_builtin_flag], [lt_prog_compiler_no_builtin_flag], [1], - m4_defun([_LT_CMD_GLOBAL_SYMBOLS], - [AC_REQUIRE([AC_CANONICAL_HOST])dnl - AC_REQUIRE([AC_PROG_CC])dnl -+AC_REQUIRE([AC_PROG_AWK])dnl - AC_REQUIRE([LT_PATH_NM])dnl - AC_REQUIRE([LT_PATH_LD])dnl - m4_require([_LT_DECL_SED])dnl -@@ -3371,8 +3684,8 @@ esac - lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" - - # Transform an extracted symbol line into symbol name and symbol address --lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" --lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'" -+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" -+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'" - - # Handle CRLF in mingw tool chain - opt_cr= -@@ -3396,6 +3709,7 @@ for ac_symprfx in "" "_"; do - # which start with @ or ?. - lt_cv_sys_global_symbol_pipe="$AWK ['"\ - " {last_section=section; section=\$ 3};"\ -+" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ - " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ - " \$ 0!~/External *\|/{next};"\ - " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ -@@ -3408,6 +3722,7 @@ for ac_symprfx in "" "_"; do - else - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" - fi -+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" - - # Check to see that the pipe works correctly. - pipe_works=no -@@ -3429,7 +3744,7 @@ _LT_EOF - if AC_TRY_EVAL(ac_compile); then - # Now try to grab the symbols. - nlist=conftest.nm -- if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then -+ if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then - # Try sorting and uniquifying the output. - if sort "$nlist" | uniq > "$nlist"T; then - mv -f "$nlist"T "$nlist" -@@ -3441,6 +3756,18 @@ _LT_EOF - if $GREP ' nm_test_var$' "$nlist" >/dev/null; then - if $GREP ' nm_test_func$' "$nlist" >/dev/null; then - cat <<_LT_EOF > conftest.$ac_ext -+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -+/* DATA imports from DLLs on WIN32 con't be const, because runtime -+ relocations are performed -- see ld's documentation on pseudo-relocs. */ -+# define LT@&t@_DLSYM_CONST -+#elif defined(__osf__) -+/* This system does not cope well with relocations in const data. */ -+# define LT@&t@_DLSYM_CONST -+#else -+# define LT@&t@_DLSYM_CONST const -+#endif -+ - #ifdef __cplusplus - extern "C" { - #endif -@@ -3452,7 +3779,7 @@ _LT_EOF - cat <<_LT_EOF >> conftest.$ac_ext - - /* The mapping between symbol names and symbols. */ --const struct { -+LT@&t@_DLSYM_CONST struct { - const char *name; - void *address; - } -@@ -3478,15 +3805,15 @@ static const void *lt_preloaded_setup() { - _LT_EOF - # Now try linking the two files. - mv conftest.$ac_objext conftstm.$ac_objext -- lt_save_LIBS="$LIBS" -- lt_save_CFLAGS="$CFLAGS" -+ lt_globsym_save_LIBS=$LIBS -+ lt_globsym_save_CFLAGS=$CFLAGS - LIBS="conftstm.$ac_objext" - CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)" - if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then - pipe_works=yes - fi -- LIBS="$lt_save_LIBS" -- CFLAGS="$lt_save_CFLAGS" -+ LIBS=$lt_globsym_save_LIBS -+ CFLAGS=$lt_globsym_save_CFLAGS - else - echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD - fi -@@ -3519,6 +3846,13 @@ else - AC_MSG_RESULT(ok) - fi - -+# Response file support. -+if test "$lt_cv_nm_interface" = "MS dumpbin"; then -+ nm_file_list_spec='@' -+elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then -+ nm_file_list_spec='@' -+fi -+ - _LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1], - [Take the output of nm and produce a listing of raw symbols and C names]) - _LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1], -@@ -3529,6 +3863,8 @@ _LT_DECL([global_symbol_to_c_name_address], - _LT_DECL([global_symbol_to_c_name_address_lib_prefix], - [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1], - [Transform the output of nm in a C name address pair when lib prefix is needed]) -+_LT_DECL([], [nm_file_list_spec], [1], -+ [Specify filename containing input files for $NM]) - ]) # _LT_CMD_GLOBAL_SYMBOLS - - -@@ -3540,7 +3876,6 @@ _LT_TAGVAR(lt_prog_compiler_wl, $1)= - _LT_TAGVAR(lt_prog_compiler_pic, $1)= - _LT_TAGVAR(lt_prog_compiler_static, $1)= - --AC_MSG_CHECKING([for $compiler option to produce PIC]) - m4_if([$1], [CXX], [ - # C++ specific cases for pic, static, wl, etc. - if test "$GXX" = yes; then -@@ -3591,6 +3926,11 @@ m4_if([$1], [CXX], [ - # DJGPP does not support shared libraries at all - _LT_TAGVAR(lt_prog_compiler_pic, $1)= - ;; -+ haiku*) -+ # PIC is the default for Haiku. -+ # The "-static" flag exists, but is broken. -+ _LT_TAGVAR(lt_prog_compiler_static, $1)= -+ ;; - interix[[3-9]]*) - # Interix 3.x gcc -fpic/-fPIC options generate broken code. - # Instead, we relocate shared libraries at runtime. -@@ -3640,6 +3980,12 @@ m4_if([$1], [CXX], [ - ;; - esac - ;; -+ mingw* | cygwin* | os2* | pw32* | cegcc*) -+ # This hack is so that the source file can tell whether it is being -+ # built for inclusion in a dll (and should export symbols for example). -+ m4_if([$1], [GCJ], [], -+ [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) -+ ;; - dgux*) - case $cc_basename in - ec++*) -@@ -3696,7 +4042,7 @@ m4_if([$1], [CXX], [ - ;; - esac - ;; -- linux* | k*bsd*-gnu) -+ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) - case $cc_basename in - KCC*) - # KAI C++ Compiler -@@ -3729,8 +4075,8 @@ m4_if([$1], [CXX], [ - _LT_TAGVAR(lt_prog_compiler_pic, $1)= - _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; -- xlc* | xlC*) -- # IBM XL 8.0 on PPC -+ xlc* | xlC* | bgxl[[cC]]* | mpixl[[cC]]*) -+ # IBM XL 8.0, 9.0 on PPC and BlueGene - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' -@@ -3760,7 +4106,7 @@ m4_if([$1], [CXX], [ - ;; - esac - ;; -- netbsd*) -+ netbsd* | netbsdelf*-gnu) - ;; - *qnx* | *nto*) - # QNX uses GNU C++, but need to define -shared option too, otherwise -@@ -3792,7 +4138,7 @@ m4_if([$1], [CXX], [ - ;; - solaris*) - case $cc_basename in -- CC*) -+ CC* | sunCC*) - # Sun C++ 4.2, 5.x and Centerline C++ - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -@@ -3896,6 +4242,12 @@ m4_if([$1], [CXX], [ - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' - ;; - -+ haiku*) -+ # PIC is the default for Haiku. -+ # The "-static" flag exists, but is broken. -+ _LT_TAGVAR(lt_prog_compiler_static, $1)= -+ ;; -+ - hpux*) - # PIC is the default for 64-bit PA HP-UX, but not for 32-bit - # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag -@@ -3938,6 +4290,15 @@ m4_if([$1], [CXX], [ - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - esac -+ -+ case $cc_basename in -+ nvcc*) # Cuda Compiler Driver 2.2 -+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker ' -+ if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)" -+ fi -+ ;; -+ esac - else - # PORTME Check for flag to pass linker flags through the system compiler. - case $host_os in -@@ -3980,7 +4341,7 @@ m4_if([$1], [CXX], [ - _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - -- linux* | k*bsd*-gnu) -+ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) - case $cc_basename in - # old Intel for x86_64 which still supported -KPIC. - ecc*) -@@ -4001,7 +4362,13 @@ m4_if([$1], [CXX], [ - _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared' - _LT_TAGVAR(lt_prog_compiler_static, $1)='--static' - ;; -- pgcc* | pgf77* | pgf90* | pgf95*) -+ nagfor*) -+ # NAG Fortran compiler -+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,' -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ ;; -+ pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) - # Portland Group compilers (*not* the Pentium gcc compiler, - # which looks to be a dead project) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -@@ -4013,25 +4380,40 @@ m4_if([$1], [CXX], [ - # All Alpha code is PIC. - _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; -- xl*) -- # IBM XL C 8.0/Fortran 10.1 on PPC -+ xl* | bgxl* | bgf* | mpixl*) -+ # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' - ;; - *) - case `$CC -V 2>&1 | sed 5q` in -+ *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*) -+ # Sun Fortran 8.3 passes all unrecognized flags to the linker -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='' -+ ;; -+ *Sun\ F* | *Sun*Fortran*) -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' -+ ;; - *Sun\ C*) - # Sun C 5.9 - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - ;; -- *Sun\ F*) -- # Sun Fortran 8.3 passes all unrecognized flags to the linker -- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -+ *Intel*\ [[CF]]*Compiler*) -+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' -+ ;; -+ *Portland\ Group*) -+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -- _LT_TAGVAR(lt_prog_compiler_wl, $1)='' - ;; - esac - ;; -@@ -4063,7 +4445,7 @@ m4_if([$1], [CXX], [ - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - case $cc_basename in -- f77* | f90* | f95*) -+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; - *) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; -@@ -4120,9 +4502,11 @@ case $host_os in - _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])" - ;; - esac --AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)]) --_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1], -- [How to pass a linker flag through the compiler]) -+ -+AC_CACHE_CHECK([for $compiler option to produce PIC], -+ [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)], -+ [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)]) -+_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1) - - # - # Check to make sure the PIC flag actually works. -@@ -4141,6 +4525,8 @@ fi - _LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1], - [Additional compiler flags for building library objects]) - -+_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1], -+ [How to pass a linker flag through the compiler]) - # - # Check to make sure the static flag actually works. - # -@@ -4161,6 +4547,7 @@ _LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1], - m4_defun([_LT_LINKER_SHLIBS], - [AC_REQUIRE([LT_PATH_LD])dnl - AC_REQUIRE([LT_PATH_NM])dnl -+m4_require([_LT_PATH_MANIFEST_TOOL])dnl - m4_require([_LT_FILEUTILS_DEFAULTS])dnl - m4_require([_LT_DECL_EGREP])dnl - m4_require([_LT_DECL_SED])dnl -@@ -4169,27 +4556,40 @@ m4_require([_LT_TAG_COMPILER])dnl - AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) - m4_if([$1], [CXX], [ - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' -+ _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] - case $host_os in - aix[[4-9]]*) - # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm -+ # Also, AIX nm treats weak defined symbols like other global defined -+ # symbols, whereas GNU nm marks them as "W". - if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then -- _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' -+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' - else - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' - fi - ;; - pw32*) - _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" -- ;; -+ ;; - cygwin* | mingw* | cegcc*) -- _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' -- ;; -+ case $cc_basename in -+ cl*) -+ _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' -+ ;; -+ *) -+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' -+ _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] -+ ;; -+ esac -+ ;; -+ linux* | k*bsd*-gnu | gnu*) -+ _LT_TAGVAR(link_all_deplibs, $1)=no -+ ;; - *) - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' -- ;; -+ ;; - esac -- _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] - ], [ - runpath_var= - _LT_TAGVAR(allow_undefined_flag, $1)= -@@ -4204,7 +4604,6 @@ m4_if([$1], [CXX], [ - _LT_TAGVAR(hardcode_direct, $1)=no - _LT_TAGVAR(hardcode_direct_absolute, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -- _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= - _LT_TAGVAR(hardcode_libdir_separator, $1)= - _LT_TAGVAR(hardcode_minus_L, $1)=no - _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported -@@ -4249,10 +4648,39 @@ dnl Note also adjust exclude_expsyms for C++ above. - openbsd*) - with_gnu_ld=no - ;; -+ linux* | k*bsd*-gnu | gnu*) -+ _LT_TAGVAR(link_all_deplibs, $1)=no -+ ;; - esac - - _LT_TAGVAR(ld_shlibs, $1)=yes -+ -+ # On some targets, GNU ld is compatible enough with the native linker -+ # that we're better off using the native interface for both. -+ lt_use_gnu_ld_interface=no - if test "$with_gnu_ld" = yes; then -+ case $host_os in -+ aix*) -+ # The AIX port of GNU ld has always aspired to compatibility -+ # with the native linker. However, as the warning in the GNU ld -+ # block says, versions before 2.19.5* couldn't really create working -+ # shared libraries, regardless of the interface used. -+ case `$LD -v 2>&1` in -+ *\ \(GNU\ Binutils\)\ 2.19.5*) ;; -+ *\ \(GNU\ Binutils\)\ 2.[[2-9]]*) ;; -+ *\ \(GNU\ Binutils\)\ [[3-9]]*) ;; -+ *) -+ lt_use_gnu_ld_interface=yes -+ ;; -+ esac -+ ;; -+ *) -+ lt_use_gnu_ld_interface=yes -+ ;; -+ esac -+ fi -+ -+ if test "$lt_use_gnu_ld_interface" = yes; then - # If archive_cmds runs LD, not CC, wlarc should be empty - wlarc='${wl}' - -@@ -4270,6 +4698,7 @@ dnl Note also adjust exclude_expsyms for C++ above. - fi - supports_anon_versioning=no - case `$LD -v 2>&1` in -+ *GNU\ gold*) supports_anon_versioning=yes ;; - *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 - *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... - *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... -@@ -4285,11 +4714,12 @@ dnl Note also adjust exclude_expsyms for C++ above. - _LT_TAGVAR(ld_shlibs, $1)=no - cat <<_LT_EOF 1>&2 - --*** Warning: the GNU linker, at least up to release 2.9.1, is reported -+*** Warning: the GNU linker, at least up to release 2.19, is reported - *** to be unable to reliably create shared libraries on AIX. - *** Therefore, libtool is disabling shared libraries support. If you --*** really care for shared libraries, you may want to modify your PATH --*** so that a non-GNU linker is found, and then restart. -+*** really care for shared libraries, you may want to install binutils -+*** 2.20 or above, or modify your PATH so that a non-GNU linker is found. -+*** You will then need to restart the configuration process. - - _LT_EOF - fi -@@ -4325,10 +4755,12 @@ _LT_EOF - # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, - # as there is no search path for DLLs. - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_TAGVAR(always_export_symbols, $1)=no - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes -- _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' -+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' -+ _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] - - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -@@ -4346,6 +4778,11 @@ _LT_EOF - fi - ;; - -+ haiku*) -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ _LT_TAGVAR(link_all_deplibs, $1)=yes -+ ;; -+ - interix[[3-9]]*) - _LT_TAGVAR(hardcode_direct, $1)=no - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no -@@ -4361,7 +4798,7 @@ _LT_EOF - _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - ;; - -- gnu* | linux* | tpf* | k*bsd*-gnu) -+ gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) - tmp_diet=no - if test "$host_os" = linux-dietlibc; then - case $cc_basename in -@@ -4371,15 +4808,16 @@ _LT_EOF - if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ - && test "$tmp_diet" = no - then -- tmp_addflag= -+ tmp_addflag=' $pic_flag' - tmp_sharedflag='-shared' - case $cc_basename,$host_cpu in - pgcc*) # Portland Group C compiler -- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' -+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' - tmp_addflag=' $pic_flag' - ;; -- pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers -- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' -+ pgf77* | pgf90* | pgf95* | pgfortran*) -+ # Portland Group f77 and f90 compilers -+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' - tmp_addflag=' $pic_flag -Mnomain' ;; - ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 - tmp_addflag=' -i_dynamic' ;; -@@ -4390,13 +4828,17 @@ _LT_EOF - lf95*) # Lahey Fortran 8.1 - _LT_TAGVAR(whole_archive_flag_spec, $1)= - tmp_sharedflag='--shared' ;; -- xl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below) -+ xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below) - tmp_sharedflag='-qmkshrobj' - tmp_addflag= ;; -+ nvcc*) # Cuda Compiler Driver 2.2 -+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' -+ _LT_TAGVAR(compiler_needs_object, $1)=yes -+ ;; - esac - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) # Sun C 5.9 -- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' -+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' - _LT_TAGVAR(compiler_needs_object, $1)=yes - tmp_sharedflag='-G' ;; - *Sun\ F*) # Sun Fortran 8.3 -@@ -4412,17 +4854,16 @@ _LT_EOF - fi - - case $cc_basename in -- xlf*) -+ xlf* | bgf* | bgxlf* | mpixlf*) - # IBM XL Fortran 10.1 on PPC cannot create shared libs itself - _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' -- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -- _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' -- _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -+ _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ -- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' -+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' - fi - ;; - esac -@@ -4431,13 +4872,13 @@ _LT_EOF - fi - ;; - -- netbsd*) -+ netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= - else -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - fi - ;; - -@@ -4455,8 +4896,8 @@ _LT_EOF - - _LT_EOF - elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi -@@ -4502,8 +4943,8 @@ _LT_EOF - - *) - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi -@@ -4543,8 +4984,10 @@ _LT_EOF - else - # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm -+ # Also, AIX nm treats weak defined symbols like other global -+ # defined symbols, whereas GNU nm marks them as "W". - if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then -- _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' -+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' - else - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' - fi -@@ -4606,6 +5049,7 @@ _LT_EOF - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' - fi -+ _LT_TAGVAR(link_all_deplibs, $1)=no - else - # not using gcc - if test "$host_cpu" = ia64; then -@@ -4631,9 +5075,9 @@ _LT_EOF - _LT_TAGVAR(allow_undefined_flag, $1)='-berok' - # Determine the default libpath from the value encoded in an - # empty executable. -- _LT_SYS_MODULE_PATH_AIX -+ _LT_SYS_MODULE_PATH_AIX([$1]) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" -- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" - else - if test "$host_cpu" = ia64; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' -@@ -4642,14 +5086,19 @@ _LT_EOF - else - # Determine the default libpath from the value encoded in an - # empty executable. -- _LT_SYS_MODULE_PATH_AIX -+ _LT_SYS_MODULE_PATH_AIX([$1]) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, - # -berok will link without error, but may produce a broken library. - _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' -- # Exported symbols can be pulled into shared objects from archives -- _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' -+ if test "$with_gnu_ld" = yes; then -+ # We only use this code for GNU lds that support --whole-archive. -+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' -+ else -+ # Exported symbols can be pulled into shared objects from archives -+ _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' -+ fi - _LT_TAGVAR(archive_cmds_need_lc, $1)=yes - # This is similar to how AIX traditionally builds its shared libraries. - _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' -@@ -4681,20 +5130,64 @@ _LT_EOF - # Microsoft Visual C++. - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. -- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' -- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported -- # Tell ltmain to make .lib files, not .a files. -- libext=lib -- # Tell ltmain to make .dll files, not .so files. -- shrext_cmds=".dll" -- # FIXME: Setting linknames here is a bad hack. -- _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames=' -- # The linker will automatically build a .lib file if we build a DLL. -- _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' -- # FIXME: Should let the user specify the lib program. -- _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' -- _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`' -- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes -+ case $cc_basename in -+ cl*) -+ # Native MSVC -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' -+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported -+ _LT_TAGVAR(always_export_symbols, $1)=yes -+ _LT_TAGVAR(file_list_spec, $1)='@' -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; -+ else -+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; -+ fi~ -+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ -+ linknames=' -+ # The linker will not automatically build a static lib if we build a DLL. -+ # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' -+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes -+ _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' -+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' -+ # Don't use ranlib -+ _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' -+ _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ -+ lt_tool_outputfile="@TOOL_OUTPUT@"~ -+ case $lt_outputfile in -+ *.exe|*.EXE) ;; -+ *) -+ lt_outputfile="$lt_outputfile.exe" -+ lt_tool_outputfile="$lt_tool_outputfile.exe" -+ ;; -+ esac~ -+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then -+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; -+ $RM "$lt_outputfile.manifest"; -+ fi' -+ ;; -+ *) -+ # Assume MSVC wrapper -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' -+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' -+ # The linker will automatically build a .lib file if we build a DLL. -+ _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' -+ # FIXME: Should let the user specify the lib program. -+ _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' -+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes -+ ;; -+ esac - ;; - - darwin* | rhapsody*) -@@ -4707,10 +5200,6 @@ _LT_EOF - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - -- freebsd1*) -- _LT_TAGVAR(ld_shlibs, $1)=no -- ;; -- - # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor - # support. Future versions do this automatically, but an explicit c++rt0.o - # does not break anything, and helps significantly (at the cost of a little -@@ -4723,7 +5212,7 @@ _LT_EOF - ;; - - # Unfortunately, older versions of FreeBSD 2 do not have this feature. -- freebsd2*) -+ freebsd2.*) - _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_minus_L, $1)=yes -@@ -4732,7 +5221,7 @@ _LT_EOF - - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly*) -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no -@@ -4740,7 +5229,7 @@ _LT_EOF - - hpux9*) - if test "$GCC" = yes; then -- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - fi -@@ -4755,14 +5244,13 @@ _LT_EOF - ;; - - hpux10*) -- if test "$GCC" = yes -a "$with_gnu_ld" = no; then -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ if test "$GCC" = yes && test "$with_gnu_ld" = no; then -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - else - _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' - fi - if test "$with_gnu_ld" = no; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' -- _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_direct_absolute, $1)=yes -@@ -4774,16 +5262,16 @@ _LT_EOF - ;; - - hpux11*) -- if test "$GCC" = yes -a "$with_gnu_ld" = no; then -+ if test "$GCC" = yes && test "$with_gnu_ld" = no; then - case $host_cpu in - hppa*64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - else -@@ -4795,7 +5283,14 @@ _LT_EOF - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) -- _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ m4_if($1, [], [ -+ # Older versions of the 11.00 compiler do not understand -b yet -+ # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does) -+ _LT_LINKER_OPTION([if $CC understands -b], -+ _LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b], -+ [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'], -+ [_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])], -+ [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags']) - ;; - esac - fi -@@ -4823,19 +5318,34 @@ _LT_EOF - - irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - # Try to use the -exported_symbol ld option, if it does not - # work, assume that -exports_file does not work either and - # implicitly export all symbols. -- save_LDFLAGS="$LDFLAGS" -- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" -- AC_LINK_IFELSE(int foo(void) {}, -- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' -- ) -- LDFLAGS="$save_LDFLAGS" -+ # This should be the same for all languages, so no per-tag cache variable. -+ AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol], -+ [lt_cv_irix_exported_symbol], -+ [save_LDFLAGS="$LDFLAGS" -+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" -+ AC_LINK_IFELSE( -+ [AC_LANG_SOURCE( -+ [AC_LANG_CASE([C], [[int foo (void) { return 0; }]], -+ [C++], [[int foo (void) { return 0; }]], -+ [Fortran 77], [[ -+ subroutine foo -+ end]], -+ [Fortran], [[ -+ subroutine foo -+ end]])])], -+ [lt_cv_irix_exported_symbol=yes], -+ [lt_cv_irix_exported_symbol=no]) -+ LDFLAGS="$save_LDFLAGS"]) -+ if test "$lt_cv_irix_exported_symbol" = yes; then -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' -+ fi - else -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' -- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' - fi - _LT_TAGVAR(archive_cmds_need_lc, $1)='no' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -@@ -4844,7 +5354,7 @@ _LT_EOF - _LT_TAGVAR(link_all_deplibs, $1)=yes - ;; - -- netbsd*) -+ netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out - else -@@ -4897,17 +5407,17 @@ _LT_EOF - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(hardcode_minus_L, $1)=yes - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported -- _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' -+ _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' - _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' - ;; - - osf3*) - if test "$GCC" = yes; then - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else - _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - fi - _LT_TAGVAR(archive_cmds_need_lc, $1)='no' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -@@ -4917,13 +5427,13 @@ _LT_EOF - osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - else - _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ -- $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' -+ $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' - - # Both c and cxx compiler support -rpath directly - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' -@@ -4936,9 +5446,9 @@ _LT_EOF - _LT_TAGVAR(no_undefined_flag, $1)=' -z defs' - if test "$GCC" = yes; then - wlarc='${wl}' -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ -- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' -+ $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' - else - case `$CC -V 2>&1` in - *"Compilers 5.0"*) -@@ -5114,36 +5624,38 @@ x|xyes) - # Test whether the compiler implicitly links with -lc since on some - # systems, -lgcc has to come before -lc. If gcc already passes -lc - # to ld, don't add -lc before -lgcc. -- AC_MSG_CHECKING([whether -lc should be explicitly linked in]) -- $RM conftest* -- echo "$lt_simple_compile_test_code" > conftest.$ac_ext -- -- if AC_TRY_EVAL(ac_compile) 2>conftest.err; then -- soname=conftest -- lib=conftest -- libobjs=conftest.$ac_objext -- deplibs= -- wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) -- pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1) -- compiler_flags=-v -- linker_flags=-v -- verstring= -- output_objdir=. -- libname=conftest -- lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1) -- _LT_TAGVAR(allow_undefined_flag, $1)= -- if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) -- then -- _LT_TAGVAR(archive_cmds_need_lc, $1)=no -- else -- _LT_TAGVAR(archive_cmds_need_lc, $1)=yes -- fi -- _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag -- else -- cat conftest.err 1>&5 -- fi -- $RM conftest* -- AC_MSG_RESULT([$_LT_TAGVAR(archive_cmds_need_lc, $1)]) -+ AC_CACHE_CHECK([whether -lc should be explicitly linked in], -+ [lt_cv_]_LT_TAGVAR(archive_cmds_need_lc, $1), -+ [$RM conftest* -+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext -+ -+ if AC_TRY_EVAL(ac_compile) 2>conftest.err; then -+ soname=conftest -+ lib=conftest -+ libobjs=conftest.$ac_objext -+ deplibs= -+ wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) -+ pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1) -+ compiler_flags=-v -+ linker_flags=-v -+ verstring= -+ output_objdir=. -+ libname=conftest -+ lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1) -+ _LT_TAGVAR(allow_undefined_flag, $1)= -+ if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) -+ then -+ lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=no -+ else -+ lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=yes -+ fi -+ _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag -+ else -+ cat conftest.err 1>&5 -+ fi -+ $RM conftest* -+ ]) -+ _LT_TAGVAR(archive_cmds_need_lc, $1)=$lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1) - ;; - esac - fi -@@ -5180,9 +5692,6 @@ _LT_TAGDECL([], [no_undefined_flag], [1], - _LT_TAGDECL([], [hardcode_libdir_flag_spec], [1], - [Flag to hardcode $libdir into a binary during linking. - This must work even if $libdir does not exist]) --_LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [1], -- [[If ld is used when linking, flag to hardcode $libdir into a binary -- during linking. This must work even if $libdir does not exist]]) - _LT_TAGDECL([], [hardcode_libdir_separator], [1], - [Whether we need a single "-rpath" flag with a separated argument]) - _LT_TAGDECL([], [hardcode_direct], [0], -@@ -5208,8 +5717,6 @@ _LT_TAGDECL([], [inherit_rpath], [0], - to runtime path list]) - _LT_TAGDECL([], [link_all_deplibs], [0], - [Whether libtool must link a program against all its dependency libraries]) --_LT_TAGDECL([], [fix_srcfile_path], [1], -- [Fix the shell variable $srcfile for the compiler]) - _LT_TAGDECL([], [always_export_symbols], [0], - [Set to "yes" if exported symbols are required]) - _LT_TAGDECL([], [export_symbols_cmds], [2], -@@ -5220,6 +5727,8 @@ _LT_TAGDECL([], [include_expsyms], [1], - [Symbols that must always be exported]) - _LT_TAGDECL([], [prelink_cmds], [2], - [Commands necessary for linking programs (against libraries) with templates]) -+_LT_TAGDECL([], [postlink_cmds], [2], -+ [Commands necessary for finishing linking programs]) - _LT_TAGDECL([], [file_list_spec], [1], - [Specify filename containing input files]) - dnl FIXME: Not yet implemented -@@ -5313,37 +5822,22 @@ CC="$lt_save_CC" - ])# _LT_LANG_C_CONFIG - - --# _LT_PROG_CXX --# ------------ --# Since AC_PROG_CXX is broken, in that it returns g++ if there is no c++ --# compiler, we have our own version here. --m4_defun([_LT_PROG_CXX], --[ --pushdef([AC_MSG_ERROR], [_lt_caught_CXX_error=yes]) --AC_PROG_CXX --if test -n "$CXX" && ( test "X$CXX" != "Xno" && -- ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || -- (test "X$CXX" != "Xg++"))) ; then -- AC_PROG_CXXCPP --else -- _lt_caught_CXX_error=yes --fi --popdef([AC_MSG_ERROR]) --])# _LT_PROG_CXX -- --dnl aclocal-1.4 backwards compatibility: --dnl AC_DEFUN([_LT_PROG_CXX], []) -- -- - # _LT_LANG_CXX_CONFIG([TAG]) - # -------------------------- - # Ensure that the configuration variables for a C++ compiler are suitably - # defined. These variables are subsequently used by _LT_CONFIG to write - # the compiler configuration to `libtool'. - m4_defun([_LT_LANG_CXX_CONFIG], --[AC_REQUIRE([_LT_PROG_CXX])dnl --m4_require([_LT_FILEUTILS_DEFAULTS])dnl -+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl - m4_require([_LT_DECL_EGREP])dnl -+m4_require([_LT_PATH_MANIFEST_TOOL])dnl -+if test -n "$CXX" && ( test "X$CXX" != "Xno" && -+ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || -+ (test "X$CXX" != "Xg++"))) ; then -+ AC_PROG_CXXCPP -+else -+ _lt_caught_CXX_error=yes -+fi - - AC_LANG_PUSH(C++) - _LT_TAGVAR(archive_cmds_need_lc, $1)=no -@@ -5355,7 +5849,6 @@ _LT_TAGVAR(export_dynamic_flag_spec, $1)= - _LT_TAGVAR(hardcode_direct, $1)=no - _LT_TAGVAR(hardcode_direct_absolute, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= --_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= - _LT_TAGVAR(hardcode_libdir_separator, $1)= - _LT_TAGVAR(hardcode_minus_L, $1)=no - _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported -@@ -5365,6 +5858,8 @@ _LT_TAGVAR(module_cmds, $1)= - _LT_TAGVAR(module_expsym_cmds, $1)= - _LT_TAGVAR(link_all_deplibs, $1)=unknown - _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds -+_LT_TAGVAR(reload_flag, $1)=$reload_flag -+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds - _LT_TAGVAR(no_undefined_flag, $1)= - _LT_TAGVAR(whole_archive_flag_spec, $1)= - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no -@@ -5396,6 +5891,7 @@ if test "$_lt_caught_CXX_error" != yes; then - - # Allow CC to be a program name with arguments. - lt_save_CC=$CC -+ lt_save_CFLAGS=$CFLAGS - lt_save_LD=$LD - lt_save_GCC=$GCC - GCC=$GXX -@@ -5413,6 +5909,7 @@ if test "$_lt_caught_CXX_error" != yes; then - fi - test -z "${LDCXX+set}" || LD=$LDCXX - CC=${CXX-"c++"} -+ CFLAGS=$CXXFLAGS - compiler=$CC - _LT_TAGVAR(compiler, $1)=$CC - _LT_CC_BASENAME([$compiler]) -@@ -5434,8 +5931,8 @@ if test "$_lt_caught_CXX_error" != yes; then - # Check if GNU C++ uses GNU ld as the underlying linker, since the - # archiving commands below assume that GNU ld is being used. - if test "$with_gnu_ld" = yes; then -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' -- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' -@@ -5467,7 +5964,7 @@ if test "$_lt_caught_CXX_error" != yes; then - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. -- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' -+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' - - else - GXX=no -@@ -5576,10 +6073,10 @@ if test "$_lt_caught_CXX_error" != yes; then - _LT_TAGVAR(allow_undefined_flag, $1)='-berok' - # Determine the default libpath from the value encoded in an empty - # executable. -- _LT_SYS_MODULE_PATH_AIX -+ _LT_SYS_MODULE_PATH_AIX([$1]) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - -- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" - else - if test "$host_cpu" = ia64; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' -@@ -5588,14 +6085,19 @@ if test "$_lt_caught_CXX_error" != yes; then - else - # Determine the default libpath from the value encoded in an - # empty executable. -- _LT_SYS_MODULE_PATH_AIX -+ _LT_SYS_MODULE_PATH_AIX([$1]) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, - # -berok will link without error, but may produce a broken library. - _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' -- # Exported symbols can be pulled into shared objects from archives -- _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' -+ if test "$with_gnu_ld" = yes; then -+ # We only use this code for GNU lds that support --whole-archive. -+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' -+ else -+ # Exported symbols can be pulled into shared objects from archives -+ _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' -+ fi - _LT_TAGVAR(archive_cmds_need_lc, $1)=yes - # This is similar to how AIX traditionally builds its shared - # libraries. -@@ -5625,28 +6127,75 @@ if test "$_lt_caught_CXX_error" != yes; then - ;; - - cygwin* | mingw* | pw32* | cegcc*) -- # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, -- # as there is no search path for DLLs. -- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported -- _LT_TAGVAR(always_export_symbols, $1)=no -- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes -- -- if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -- # If the export-symbols file already is a .def file (1st line -- # is EXPORTS), use it as is; otherwise, prepend... -- _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -- cp $export_symbols $output_objdir/$soname.def; -- else -- echo EXPORTS > $output_objdir/$soname.def; -- cat $export_symbols >> $output_objdir/$soname.def; -- fi~ -- $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -- else -- _LT_TAGVAR(ld_shlibs, $1)=no -- fi -- ;; -+ case $GXX,$cc_basename in -+ ,cl* | no,cl*) -+ # Native MSVC -+ # hardcode_libdir_flag_spec is actually meaningless, as there is -+ # no search path for DLLs. -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' -+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported -+ _LT_TAGVAR(always_export_symbols, $1)=yes -+ _LT_TAGVAR(file_list_spec, $1)='@' -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -+ $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; -+ else -+ $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; -+ fi~ -+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ -+ linknames=' -+ # The linker will not automatically build a static lib if we build a DLL. -+ # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' -+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes -+ # Don't use ranlib -+ _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' -+ _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ -+ lt_tool_outputfile="@TOOL_OUTPUT@"~ -+ case $lt_outputfile in -+ *.exe|*.EXE) ;; -+ *) -+ lt_outputfile="$lt_outputfile.exe" -+ lt_tool_outputfile="$lt_tool_outputfile.exe" -+ ;; -+ esac~ -+ func_to_tool_file "$lt_outputfile"~ -+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then -+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; -+ $RM "$lt_outputfile.manifest"; -+ fi' -+ ;; -+ *) -+ # g++ -+ # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, -+ # as there is no search path for DLLs. -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' -+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported -+ _LT_TAGVAR(always_export_symbols, $1)=no -+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes -+ -+ if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -+ # If the export-symbols file already is a .def file (1st line -+ # is EXPORTS), use it as is; otherwise, prepend... -+ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -+ cp $export_symbols $output_objdir/$soname.def; -+ else -+ echo EXPORTS > $output_objdir/$soname.def; -+ cat $export_symbols >> $output_objdir/$soname.def; -+ fi~ -+ $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -+ else -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ fi -+ ;; -+ esac -+ ;; - darwin* | rhapsody*) - _LT_DARWIN_LINKER_FEATURES($1) - ;; -@@ -5669,7 +6218,7 @@ if test "$_lt_caught_CXX_error" != yes; then - esac - ;; - -- freebsd[[12]]*) -+ freebsd2.*) - # C++ shared libraries reported to be fairly broken before - # switch to ELF - _LT_TAGVAR(ld_shlibs, $1)=no -@@ -5685,7 +6234,9 @@ if test "$_lt_caught_CXX_error" != yes; then - _LT_TAGVAR(ld_shlibs, $1)=yes - ;; - -- gnu*) -+ haiku*) -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ _LT_TAGVAR(link_all_deplibs, $1)=yes - ;; - - hpux9*) -@@ -5712,11 +6263,11 @@ if test "$_lt_caught_CXX_error" != yes; then - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. -- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' -+ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' - ;; - *) - if test "$GXX" = yes; then -- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no -@@ -5777,7 +6328,7 @@ if test "$_lt_caught_CXX_error" != yes; then - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. -- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' -+ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' - ;; - *) - if test "$GXX" = yes; then -@@ -5787,10 +6338,10 @@ if test "$_lt_caught_CXX_error" != yes; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - ia64*) -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - *) -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - esac - fi -@@ -5820,7 +6371,7 @@ if test "$_lt_caught_CXX_error" != yes; then - case $cc_basename in - CC*) - # SGI C++ -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - - # Archives containing C++ object files must be created using - # "CC -ar", where "CC" is the IRIX C++ compiler. This is -@@ -5831,9 +6382,9 @@ if test "$_lt_caught_CXX_error" != yes; then - *) - if test "$GXX" = yes; then - if test "$with_gnu_ld" = no; then -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -o $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' - fi - fi - _LT_TAGVAR(link_all_deplibs, $1)=yes -@@ -5844,7 +6395,7 @@ if test "$_lt_caught_CXX_error" != yes; then - _LT_TAGVAR(inherit_rpath, $1)=yes - ;; - -- linux* | k*bsd*-gnu) -+ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) - case $cc_basename in - KCC*) - # Kuck and Associates, Inc. (KAI) C++ Compiler -@@ -5862,7 +6413,7 @@ if test "$_lt_caught_CXX_error" != yes; then - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. -- output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' -+ output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' - - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' -@@ -5899,26 +6450,26 @@ if test "$_lt_caught_CXX_error" != yes; then - pgCC* | pgcpp*) - # Portland Group C++ compiler - case `$CC -V` in -- *pgCC\ [[1-5]]* | *pgcpp\ [[1-5]]*) -+ *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*) - _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ -- compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"' -+ compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' - _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ -- $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~ -+ $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ - $RANLIB $oldlib' - _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ -- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' -+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ -- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' -+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' - ;; -- *) # Version 6 will use weak symbols -+ *) # Version 6 and above use weak symbols - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' - ;; -@@ -5926,7 +6477,7 @@ if test "$_lt_caught_CXX_error" != yes; then - - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' -- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' -+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' - ;; - cxx*) - # Compaq C++ -@@ -5945,9 +6496,9 @@ if test "$_lt_caught_CXX_error" != yes; then - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. -- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' -+ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed' - ;; -- xl*) -+ xl* | mpixl* | bgxl*) - # IBM XL 8.0 on PPC, with GNU ld - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' -@@ -5967,13 +6518,13 @@ if test "$_lt_caught_CXX_error" != yes; then - _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' -- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' -+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' - _LT_TAGVAR(compiler_needs_object, $1)=yes - - # Not sure whether something based on - # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 - # would be better. -- output_verbose_link_cmd='echo' -+ output_verbose_link_cmd='func_echo_all' - - # Archives containing C++ object files must be created using - # "CC -xar", where "CC" is the Sun C++ compiler. This is -@@ -6042,7 +6593,7 @@ if test "$_lt_caught_CXX_error" != yes; then - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - fi -- output_verbose_link_cmd=echo -+ output_verbose_link_cmd=func_echo_all - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi -@@ -6077,15 +6628,15 @@ if test "$_lt_caught_CXX_error" != yes; then - case $host in - osf3*) - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - ;; - *) - _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ - echo "-hidden">> $lib.exp~ -- $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~ -+ $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~ - $RM $lib.exp' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' - ;; -@@ -6101,17 +6652,17 @@ if test "$_lt_caught_CXX_error" != yes; then - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. -- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' -+ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' - ;; - *) - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - case $host in - osf3*) -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - ;; - *) -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - ;; - esac - -@@ -6121,7 +6672,7 @@ if test "$_lt_caught_CXX_error" != yes; then - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. -- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' -+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' - - else - # FIXME: insert proper C++ library support -@@ -6157,7 +6708,7 @@ if test "$_lt_caught_CXX_error" != yes; then - - solaris*) - case $cc_basename in -- CC*) -+ CC* | sunCC*) - # Sun C++ 4.2, 5.x and Centerline C++ - _LT_TAGVAR(archive_cmds_need_lc,$1)=yes - _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' -@@ -6178,7 +6729,7 @@ if test "$_lt_caught_CXX_error" != yes; then - esac - _LT_TAGVAR(link_all_deplibs, $1)=yes - -- output_verbose_link_cmd='echo' -+ output_verbose_link_cmd='func_echo_all' - - # Archives containing C++ object files must be created using - # "CC -xar", where "CC" is the Sun C++ compiler. This is -@@ -6198,14 +6749,14 @@ if test "$_lt_caught_CXX_error" != yes; then - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' - if $CC --version | $GREP -v '^2\.7' > /dev/null; then -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ -- $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' -+ $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. -- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' -+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' - else - # g++ 2.7 appears to require `-G' NOT `-shared' on this - # platform. -@@ -6216,7 +6767,7 @@ if test "$_lt_caught_CXX_error" != yes; then - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. -- output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' -+ output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' - fi - - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir' -@@ -6270,6 +6821,10 @@ if test "$_lt_caught_CXX_error" != yes; then - CC*) - _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~ -+ '"$_LT_TAGVAR(old_archive_cmds, $1)" -+ _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~ -+ '"$_LT_TAGVAR(reload_cmds, $1)" - ;; - *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -@@ -6325,6 +6880,7 @@ if test "$_lt_caught_CXX_error" != yes; then - fi # test -n "$compiler" - - CC=$lt_save_CC -+ CFLAGS=$lt_save_CFLAGS - LDCXX=$LD - LD=$lt_save_LD - GCC=$lt_save_GCC -@@ -6339,6 +6895,29 @@ AC_LANG_POP - ])# _LT_LANG_CXX_CONFIG - - -+# _LT_FUNC_STRIPNAME_CNF -+# ---------------------- -+# func_stripname_cnf prefix suffix name -+# strip PREFIX and SUFFIX off of NAME. -+# PREFIX and SUFFIX must not contain globbing or regex special -+# characters, hashes, percent signs, but SUFFIX may contain a leading -+# dot (in which case that matches only a dot). -+# -+# This function is identical to the (non-XSI) version of func_stripname, -+# except this one can be used by m4 code that may be executed by configure, -+# rather than the libtool script. -+m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl -+AC_REQUIRE([_LT_DECL_SED]) -+AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH]) -+func_stripname_cnf () -+{ -+ case ${2} in -+ .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; -+ *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; -+ esac -+} # func_stripname_cnf -+])# _LT_FUNC_STRIPNAME_CNF -+ - # _LT_SYS_HIDDEN_LIBDEPS([TAGNAME]) - # --------------------------------- - # Figure out "hidden" library dependencies from verbose -@@ -6347,6 +6926,7 @@ AC_LANG_POP - # objects, libraries and library flags. - m4_defun([_LT_SYS_HIDDEN_LIBDEPS], - [m4_require([_LT_FILEUTILS_DEFAULTS])dnl -+AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl - # Dependencies to place before and after the object being linked: - _LT_TAGVAR(predep_objects, $1)= - _LT_TAGVAR(postdep_objects, $1)= -@@ -6396,7 +6976,20 @@ public class foo { - } - }; - _LT_EOF -+], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF -+package foo -+func foo() { -+} -+_LT_EOF - ]) -+ -+_lt_libdeps_save_CFLAGS=$CFLAGS -+case "$CC $CFLAGS " in #( -+*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; -+*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; -+*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;; -+esac -+ - dnl Parse the compiler output and extract the necessary - dnl objects, libraries and library flags. - if AC_TRY_EVAL(ac_compile); then -@@ -6408,7 +7001,7 @@ if AC_TRY_EVAL(ac_compile); then - pre_test_object_deps_done=no - - for p in `eval "$output_verbose_link_cmd"`; do -- case $p in -+ case ${prev}${p} in - - -L* | -R* | -l*) - # Some compilers place space between "-{L,R}" and the path. -@@ -6417,13 +7010,22 @@ if AC_TRY_EVAL(ac_compile); then - test $p = "-R"; then - prev=$p - continue -- else -- prev= - fi - -+ # Expand the sysroot to ease extracting the directories later. -+ if test -z "$prev"; then -+ case $p in -+ -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;; -+ -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;; -+ -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;; -+ esac -+ fi -+ case $p in -+ =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;; -+ esac - if test "$pre_test_object_deps_done" = no; then -- case $p in -- -L* | -R*) -+ case ${prev} in -+ -L | -R) - # Internal compiler library paths should come after those - # provided the user. The postdeps already come after the - # user supplied libs so there is no need to process them. -@@ -6443,8 +7045,10 @@ if AC_TRY_EVAL(ac_compile); then - _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}" - fi - fi -+ prev= - ;; - -+ *.lto.$objext) ;; # Ignore GCC LTO objects - *.$objext) - # This assumes that the test object file only shows up - # once in the compiler output. -@@ -6480,6 +7084,7 @@ else - fi - - $RM -f confest.$objext -+CFLAGS=$_lt_libdeps_save_CFLAGS - - # PORTME: override above test on systems where it is broken - m4_if([$1], [CXX], -@@ -6516,7 +7121,7 @@ linux*) - - solaris*) - case $cc_basename in -- CC*) -+ CC* | sunCC*) - # The more standards-conforming stlport4 library is - # incompatible with the Cstd library. Avoid specifying - # it if it's in CXXFLAGS. Ignore libCrun as -@@ -6560,32 +7165,16 @@ _LT_TAGDECL([], [compiler_lib_search_path], [1], - ])# _LT_SYS_HIDDEN_LIBDEPS - - --# _LT_PROG_F77 --# ------------ --# Since AC_PROG_F77 is broken, in that it returns the empty string --# if there is no fortran compiler, we have our own version here. --m4_defun([_LT_PROG_F77], --[ --pushdef([AC_MSG_ERROR], [_lt_disable_F77=yes]) --AC_PROG_F77 --if test -z "$F77" || test "X$F77" = "Xno"; then -- _lt_disable_F77=yes --fi --popdef([AC_MSG_ERROR]) --])# _LT_PROG_F77 -- --dnl aclocal-1.4 backwards compatibility: --dnl AC_DEFUN([_LT_PROG_F77], []) -- -- - # _LT_LANG_F77_CONFIG([TAG]) - # -------------------------- - # Ensure that the configuration variables for a Fortran 77 compiler are - # suitably defined. These variables are subsequently used by _LT_CONFIG - # to write the compiler configuration to `libtool'. - m4_defun([_LT_LANG_F77_CONFIG], --[AC_REQUIRE([_LT_PROG_F77])dnl --AC_LANG_PUSH(Fortran 77) -+[AC_LANG_PUSH(Fortran 77) -+if test -z "$F77" || test "X$F77" = "Xno"; then -+ _lt_disable_F77=yes -+fi - - _LT_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_TAGVAR(allow_undefined_flag, $1)= -@@ -6595,7 +7184,6 @@ _LT_TAGVAR(export_dynamic_flag_spec, $1)= - _LT_TAGVAR(hardcode_direct, $1)=no - _LT_TAGVAR(hardcode_direct_absolute, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= --_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= - _LT_TAGVAR(hardcode_libdir_separator, $1)= - _LT_TAGVAR(hardcode_minus_L, $1)=no - _LT_TAGVAR(hardcode_automatic, $1)=no -@@ -6604,6 +7192,8 @@ _LT_TAGVAR(module_cmds, $1)= - _LT_TAGVAR(module_expsym_cmds, $1)= - _LT_TAGVAR(link_all_deplibs, $1)=unknown - _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds -+_LT_TAGVAR(reload_flag, $1)=$reload_flag -+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds - _LT_TAGVAR(no_undefined_flag, $1)= - _LT_TAGVAR(whole_archive_flag_spec, $1)= - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no -@@ -6643,7 +7233,9 @@ if test "$_lt_disable_F77" != yes; then - # Allow CC to be a program name with arguments. - lt_save_CC="$CC" - lt_save_GCC=$GCC -+ lt_save_CFLAGS=$CFLAGS - CC=${F77-"f77"} -+ CFLAGS=$FFLAGS - compiler=$CC - _LT_TAGVAR(compiler, $1)=$CC - _LT_CC_BASENAME([$compiler]) -@@ -6697,38 +7289,24 @@ if test "$_lt_disable_F77" != yes; then - - GCC=$lt_save_GCC - CC="$lt_save_CC" -+ CFLAGS="$lt_save_CFLAGS" - fi # test "$_lt_disable_F77" != yes - - AC_LANG_POP - ])# _LT_LANG_F77_CONFIG - - --# _LT_PROG_FC --# ----------- --# Since AC_PROG_FC is broken, in that it returns the empty string --# if there is no fortran compiler, we have our own version here. --m4_defun([_LT_PROG_FC], --[ --pushdef([AC_MSG_ERROR], [_lt_disable_FC=yes]) --AC_PROG_FC --if test -z "$FC" || test "X$FC" = "Xno"; then -- _lt_disable_FC=yes --fi --popdef([AC_MSG_ERROR]) --])# _LT_PROG_FC -- --dnl aclocal-1.4 backwards compatibility: --dnl AC_DEFUN([_LT_PROG_FC], []) -- -- - # _LT_LANG_FC_CONFIG([TAG]) - # ------------------------- - # Ensure that the configuration variables for a Fortran compiler are - # suitably defined. These variables are subsequently used by _LT_CONFIG - # to write the compiler configuration to `libtool'. - m4_defun([_LT_LANG_FC_CONFIG], --[AC_REQUIRE([_LT_PROG_FC])dnl --AC_LANG_PUSH(Fortran) -+[AC_LANG_PUSH(Fortran) -+ -+if test -z "$FC" || test "X$FC" = "Xno"; then -+ _lt_disable_FC=yes -+fi - - _LT_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_TAGVAR(allow_undefined_flag, $1)= -@@ -6738,7 +7316,6 @@ _LT_TAGVAR(export_dynamic_flag_spec, $1)= - _LT_TAGVAR(hardcode_direct, $1)=no - _LT_TAGVAR(hardcode_direct_absolute, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= --_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= - _LT_TAGVAR(hardcode_libdir_separator, $1)= - _LT_TAGVAR(hardcode_minus_L, $1)=no - _LT_TAGVAR(hardcode_automatic, $1)=no -@@ -6747,6 +7324,8 @@ _LT_TAGVAR(module_cmds, $1)= - _LT_TAGVAR(module_expsym_cmds, $1)= - _LT_TAGVAR(link_all_deplibs, $1)=unknown - _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds -+_LT_TAGVAR(reload_flag, $1)=$reload_flag -+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds - _LT_TAGVAR(no_undefined_flag, $1)= - _LT_TAGVAR(whole_archive_flag_spec, $1)= - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no -@@ -6786,7 +7365,9 @@ if test "$_lt_disable_FC" != yes; then - # Allow CC to be a program name with arguments. - lt_save_CC="$CC" - lt_save_GCC=$GCC -+ lt_save_CFLAGS=$CFLAGS - CC=${FC-"f95"} -+ CFLAGS=$FCFLAGS - compiler=$CC - GCC=$ac_cv_fc_compiler_gnu - -@@ -6842,7 +7423,8 @@ if test "$_lt_disable_FC" != yes; then - fi # test -n "$compiler" - - GCC=$lt_save_GCC -- CC="$lt_save_CC" -+ CC=$lt_save_CC -+ CFLAGS=$lt_save_CFLAGS - fi # test "$_lt_disable_FC" != yes - - AC_LANG_POP -@@ -6879,10 +7461,12 @@ _LT_COMPILER_BOILERPLATE - _LT_LINKER_BOILERPLATE - - # Allow CC to be a program name with arguments. --lt_save_CC="$CC" -+lt_save_CC=$CC -+lt_save_CFLAGS=$CFLAGS - lt_save_GCC=$GCC - GCC=yes - CC=${GCJ-"gcj"} -+CFLAGS=$GCJFLAGS - compiler=$CC - _LT_TAGVAR(compiler, $1)=$CC - _LT_TAGVAR(LD, $1)="$LD" -@@ -6892,6 +7476,8 @@ _LT_CC_BASENAME([$compiler]) - _LT_TAGVAR(archive_cmds_need_lc, $1)=no - - _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds -+_LT_TAGVAR(reload_flag, $1)=$reload_flag -+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds - - ## CAVEAT EMPTOR: - ## There is no encapsulation within the following macros, do not change -@@ -6911,10 +7497,82 @@ fi - AC_LANG_RESTORE - - GCC=$lt_save_GCC --CC="$lt_save_CC" -+CC=$lt_save_CC -+CFLAGS=$lt_save_CFLAGS - ])# _LT_LANG_GCJ_CONFIG - - -+# _LT_LANG_GO_CONFIG([TAG]) -+# -------------------------- -+# Ensure that the configuration variables for the GNU Go compiler -+# are suitably defined. These variables are subsequently used by _LT_CONFIG -+# to write the compiler configuration to `libtool'. -+m4_defun([_LT_LANG_GO_CONFIG], -+[AC_REQUIRE([LT_PROG_GO])dnl -+AC_LANG_SAVE -+ -+# Source file extension for Go test sources. -+ac_ext=go -+ -+# Object file extension for compiled Go test sources. -+objext=o -+_LT_TAGVAR(objext, $1)=$objext -+ -+# Code to be used in simple compile tests -+lt_simple_compile_test_code="package main; func main() { }" -+ -+# Code to be used in simple link tests -+lt_simple_link_test_code='package main; func main() { }' -+ -+# ltmain only uses $CC for tagged configurations so make sure $CC is set. -+_LT_TAG_COMPILER -+ -+# save warnings/boilerplate of simple test code -+_LT_COMPILER_BOILERPLATE -+_LT_LINKER_BOILERPLATE -+ -+# Allow CC to be a program name with arguments. -+lt_save_CC=$CC -+lt_save_CFLAGS=$CFLAGS -+lt_save_GCC=$GCC -+GCC=yes -+CC=${GOC-"gccgo"} -+CFLAGS=$GOFLAGS -+compiler=$CC -+_LT_TAGVAR(compiler, $1)=$CC -+_LT_TAGVAR(LD, $1)="$LD" -+_LT_CC_BASENAME([$compiler]) -+ -+# Go did not exist at the time GCC didn't implicitly link libc in. -+_LT_TAGVAR(archive_cmds_need_lc, $1)=no -+ -+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds -+_LT_TAGVAR(reload_flag, $1)=$reload_flag -+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds -+ -+## CAVEAT EMPTOR: -+## There is no encapsulation within the following macros, do not change -+## the running order or otherwise move them around unless you know exactly -+## what you are doing... -+if test -n "$compiler"; then -+ _LT_COMPILER_NO_RTTI($1) -+ _LT_COMPILER_PIC($1) -+ _LT_COMPILER_C_O($1) -+ _LT_COMPILER_FILE_LOCKS($1) -+ _LT_LINKER_SHLIBS($1) -+ _LT_LINKER_HARDCODE_LIBPATH($1) -+ -+ _LT_CONFIG($1) -+fi -+ -+AC_LANG_RESTORE -+ -+GCC=$lt_save_GCC -+CC=$lt_save_CC -+CFLAGS=$lt_save_CFLAGS -+])# _LT_LANG_GO_CONFIG -+ -+ - # _LT_LANG_RC_CONFIG([TAG]) - # ------------------------- - # Ensure that the configuration variables for the Windows resource compiler -@@ -6946,9 +7604,11 @@ _LT_LINKER_BOILERPLATE - - # Allow CC to be a program name with arguments. - lt_save_CC="$CC" -+lt_save_CFLAGS=$CFLAGS - lt_save_GCC=$GCC - GCC= - CC=${RC-"windres"} -+CFLAGS= - compiler=$CC - _LT_TAGVAR(compiler, $1)=$CC - _LT_CC_BASENAME([$compiler]) -@@ -6961,7 +7621,8 @@ fi - - GCC=$lt_save_GCC - AC_LANG_RESTORE --CC="$lt_save_CC" -+CC=$lt_save_CC -+CFLAGS=$lt_save_CFLAGS - ])# _LT_LANG_RC_CONFIG - - -@@ -6981,6 +7642,13 @@ dnl aclocal-1.4 backwards compatibility: - dnl AC_DEFUN([LT_AC_PROG_GCJ], []) - - -+# LT_PROG_GO -+# ---------- -+AC_DEFUN([LT_PROG_GO], -+[AC_CHECK_TOOL(GOC, gccgo,) -+]) -+ -+ - # LT_PROG_RC - # ---------- - AC_DEFUN([LT_PROG_RC], -@@ -7020,6 +7688,15 @@ _LT_DECL([], [OBJDUMP], [1], [An object symbol dumper]) - AC_SUBST([OBJDUMP]) - ]) - -+# _LT_DECL_DLLTOOL -+# ---------------- -+# Ensure DLLTOOL variable is set. -+m4_defun([_LT_DECL_DLLTOOL], -+[AC_CHECK_TOOL(DLLTOOL, dlltool, false) -+test -z "$DLLTOOL" && DLLTOOL=dlltool -+_LT_DECL([], [DLLTOOL], [1], [DLL creation program]) -+AC_SUBST([DLLTOOL]) -+]) - - # _LT_DECL_SED - # ------------ -@@ -7113,8 +7790,8 @@ m4_defun([_LT_CHECK_SHELL_FEATURES], - # Try some XSI features - xsi_shell=no - ( _lt_dummy="a/b/c" -- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ -- = c,a/b,, \ -+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ -+ = c,a/b,b/c, \ - && eval 'test $(( 1 + 1 )) -eq 2 \ - && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ - && xsi_shell=yes -@@ -7153,208 +7830,162 @@ _LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl - ])# _LT_CHECK_SHELL_FEATURES - - --# _LT_PROG_XSI_SHELLFNS --# --------------------- --# Bourne and XSI compatible variants of some useful shell functions. --m4_defun([_LT_PROG_XSI_SHELLFNS], --[case $xsi_shell in -- yes) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_dirname file append nondir_replacement --# Compute the dirname of FILE. If nonempty, add APPEND to the result, --# otherwise set result to NONDIR_REPLACEMENT. --func_dirname () --{ -- case ${1} in -- */*) func_dirname_result="${1%/*}${2}" ;; -- * ) func_dirname_result="${3}" ;; -- esac --} -- --# func_basename file --func_basename () --{ -- func_basename_result="${1##*/}" --} -- --# func_dirname_and_basename file append nondir_replacement --# perform func_basename and func_dirname in a single function --# call: --# dirname: Compute the dirname of FILE. If nonempty, --# add APPEND to the result, otherwise set result --# to NONDIR_REPLACEMENT. --# value returned in "$func_dirname_result" --# basename: Compute filename of FILE. --# value retuned in "$func_basename_result" --# Implementation must be kept synchronized with func_dirname --# and func_basename. For efficiency, we do not delegate to --# those functions but instead duplicate the functionality here. --func_dirname_and_basename () --{ -- case ${1} in -- */*) func_dirname_result="${1%/*}${2}" ;; -- * ) func_dirname_result="${3}" ;; -- esac -- func_basename_result="${1##*/}" --} -- --# func_stripname prefix suffix name --# strip PREFIX and SUFFIX off of NAME. --# PREFIX and SUFFIX must not contain globbing or regex special --# characters, hashes, percent signs, but SUFFIX may contain a leading --# dot (in which case that matches only a dot). --func_stripname () --{ -- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are -- # positional parameters, so assign one to ordinary parameter first. -- func_stripname_result=${3} -- func_stripname_result=${func_stripname_result#"${1}"} -- func_stripname_result=${func_stripname_result%"${2}"} --} -- --# func_opt_split --func_opt_split () --{ -- func_opt_split_opt=${1%%=*} -- func_opt_split_arg=${1#*=} --} -- --# func_lo2o object --func_lo2o () --{ -- case ${1} in -- *.lo) func_lo2o_result=${1%.lo}.${objext} ;; -- *) func_lo2o_result=${1} ;; -- esac --} -+# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY) -+# ------------------------------------------------------ -+# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and -+# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY. -+m4_defun([_LT_PROG_FUNCTION_REPLACE], -+[dnl { -+sed -e '/^$1 ()$/,/^} # $1 /c\ -+$1 ()\ -+{\ -+m4_bpatsubsts([$2], [$], [\\], [^\([ ]\)], [\\\1]) -+} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+]) - --# func_xform libobj-or-source --func_xform () --{ -- func_xform_result=${1%.*}.lo --} - --# func_arith arithmetic-term... --func_arith () --{ -- func_arith_result=$(( $[*] )) --} -+# _LT_PROG_REPLACE_SHELLFNS -+# ------------------------- -+# Replace existing portable implementations of several shell functions with -+# equivalent extended shell implementations where those features are available.. -+m4_defun([_LT_PROG_REPLACE_SHELLFNS], -+[if test x"$xsi_shell" = xyes; then -+ _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl -+ case ${1} in -+ */*) func_dirname_result="${1%/*}${2}" ;; -+ * ) func_dirname_result="${3}" ;; -+ esac]) -+ -+ _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl -+ func_basename_result="${1##*/}"]) -+ -+ _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl -+ case ${1} in -+ */*) func_dirname_result="${1%/*}${2}" ;; -+ * ) func_dirname_result="${3}" ;; -+ esac -+ func_basename_result="${1##*/}"]) - --# func_len string --# STRING may not start with a hyphen. --func_len () --{ -- func_len_result=${#1} --} -+ _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl -+ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are -+ # positional parameters, so assign one to ordinary parameter first. -+ func_stripname_result=${3} -+ func_stripname_result=${func_stripname_result#"${1}"} -+ func_stripname_result=${func_stripname_result%"${2}"}]) - --_LT_EOF -- ;; -- *) # Bourne compatible functions. -- cat << \_LT_EOF >> "$cfgfile" -+ _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl -+ func_split_long_opt_name=${1%%=*} -+ func_split_long_opt_arg=${1#*=}]) - --# func_dirname file append nondir_replacement --# Compute the dirname of FILE. If nonempty, add APPEND to the result, --# otherwise set result to NONDIR_REPLACEMENT. --func_dirname () --{ -- # Extract subdirectory from the argument. -- func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"` -- if test "X$func_dirname_result" = "X${1}"; then -- func_dirname_result="${3}" -- else -- func_dirname_result="$func_dirname_result${2}" -- fi --} -+ _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl -+ func_split_short_opt_arg=${1#??} -+ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}]) - --# func_basename file --func_basename () --{ -- func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"` --} -+ _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl -+ case ${1} in -+ *.lo) func_lo2o_result=${1%.lo}.${objext} ;; -+ *) func_lo2o_result=${1} ;; -+ esac]) - --dnl func_dirname_and_basename --dnl A portable version of this function is already defined in general.m4sh --dnl so there is no need for it here. -+ _LT_PROG_FUNCTION_REPLACE([func_xform], [ func_xform_result=${1%.*}.lo]) - --# func_stripname prefix suffix name --# strip PREFIX and SUFFIX off of NAME. --# PREFIX and SUFFIX must not contain globbing or regex special --# characters, hashes, percent signs, but SUFFIX may contain a leading --# dot (in which case that matches only a dot). --# func_strip_suffix prefix name --func_stripname () --{ -- case ${2} in -- .*) func_stripname_result=`$ECHO "X${3}" \ -- | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;; -- *) func_stripname_result=`$ECHO "X${3}" \ -- | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;; -- esac --} -+ _LT_PROG_FUNCTION_REPLACE([func_arith], [ func_arith_result=$(( $[*] ))]) - --# sed scripts: --my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q' --my_sed_long_arg='1s/^-[[^=]]*=//' -+ _LT_PROG_FUNCTION_REPLACE([func_len], [ func_len_result=${#1}]) -+fi - --# func_opt_split --func_opt_split () --{ -- func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"` -- func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"` --} -+if test x"$lt_shell_append" = xyes; then -+ _LT_PROG_FUNCTION_REPLACE([func_append], [ eval "${1}+=\\${2}"]) - --# func_lo2o object --func_lo2o () --{ -- func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"` --} -+ _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl -+ func_quote_for_eval "${2}" -+dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \ -+ eval "${1}+=\\\\ \\$func_quote_for_eval_result"]) - --# func_xform libobj-or-source --func_xform () --{ -- func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[[^.]]*$/.lo/'` --} -- --# func_arith arithmetic-term... --func_arith () --{ -- func_arith_result=`expr "$[@]"` --} -- --# func_len string --# STRING may not start with a hyphen. --func_len () --{ -- func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len` --} -- --_LT_EOF --esac -+ # Save a `func_append' function call where possible by direct use of '+=' -+ sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+ test 0 -eq $? || _lt_function_replace_fail=: -+else -+ # Save a `func_append' function call even when '+=' is not available -+ sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+ test 0 -eq $? || _lt_function_replace_fail=: -+fi - --case $lt_shell_append in -- yes) -- cat << \_LT_EOF >> "$cfgfile" -+if test x"$_lt_function_replace_fail" = x":"; then -+ AC_MSG_WARN([Unable to substitute extended shell functions in $ofile]) -+fi -+]) - --# func_append var value --# Append VALUE to the end of shell variable VAR. --func_append () --{ -- eval "$[1]+=\$[2]" --} --_LT_EOF -+# _LT_PATH_CONVERSION_FUNCTIONS -+# ----------------------------- -+# Determine which file name conversion functions should be used by -+# func_to_host_file (and, implicitly, by func_to_host_path). These are needed -+# for certain cross-compile configurations and native mingw. -+m4_defun([_LT_PATH_CONVERSION_FUNCTIONS], -+[AC_REQUIRE([AC_CANONICAL_HOST])dnl -+AC_REQUIRE([AC_CANONICAL_BUILD])dnl -+AC_MSG_CHECKING([how to convert $build file names to $host format]) -+AC_CACHE_VAL(lt_cv_to_host_file_cmd, -+[case $host in -+ *-*-mingw* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 -+ ;; -+ *-*-cygwin* ) -+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 -+ ;; -+ * ) # otherwise, assume *nix -+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 -+ ;; -+ esac - ;; -- *) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_append var value --# Append VALUE to the end of shell variable VAR. --func_append () --{ -- eval "$[1]=\$$[1]\$[2]" --} -- --_LT_EOF -+ *-*-cygwin* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin -+ ;; -+ *-*-cygwin* ) -+ lt_cv_to_host_file_cmd=func_convert_file_noop -+ ;; -+ * ) # otherwise, assume *nix -+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin -+ ;; -+ esac - ;; -- esac -+ * ) # unhandled hosts (and "normal" native builds) -+ lt_cv_to_host_file_cmd=func_convert_file_noop -+ ;; -+esac -+]) -+to_host_file_cmd=$lt_cv_to_host_file_cmd -+AC_MSG_RESULT([$lt_cv_to_host_file_cmd]) -+_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd], -+ [0], [convert $build file names to $host format])dnl -+ -+AC_MSG_CHECKING([how to convert $build file names to toolchain format]) -+AC_CACHE_VAL(lt_cv_to_tool_file_cmd, -+[#assume ordinary cross tools, or native build. -+lt_cv_to_tool_file_cmd=func_convert_file_noop -+case $host in -+ *-*-mingw* ) -+ case $build in -+ *-*-mingw* ) # actually msys -+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 -+ ;; -+ esac -+ ;; -+esac - ]) -+to_tool_file_cmd=$lt_cv_to_tool_file_cmd -+AC_MSG_RESULT([$lt_cv_to_tool_file_cmd]) -+_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd], -+ [0], [convert $build files to toolchain format])dnl -+])# _LT_PATH_CONVERSION_FUNCTIONS -diff --git a/m4/ltoptions.m4 b/m4/ltoptions.m4 -index 34151a3..5d9acd8 100644 ---- a/m4/ltoptions.m4 -+++ b/m4/ltoptions.m4 -@@ -1,13 +1,14 @@ - # Helper functions for option handling. -*- Autoconf -*- - # --# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc. -+# Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation, -+# Inc. - # Written by Gary V. Vaughan, 2004 - # - # This file is free software; the Free Software Foundation gives - # unlimited permission to copy and/or distribute it, with or without - # modifications, as long as this notice is preserved. - --# serial 6 ltoptions.m4 -+# serial 7 ltoptions.m4 - - # This is to help aclocal find these macros, as it can't see m4_define. - AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])]) -@@ -125,7 +126,7 @@ LT_OPTION_DEFINE([LT_INIT], [win32-dll], - [enable_win32_dll=yes - - case $host in --*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*) -+*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*) - AC_CHECK_TOOL(AS, as, false) - AC_CHECK_TOOL(DLLTOOL, dlltool, false) - AC_CHECK_TOOL(OBJDUMP, objdump, false) -@@ -133,13 +134,13 @@ case $host in - esac - - test -z "$AS" && AS=as --_LT_DECL([], [AS], [0], [Assembler program])dnl -+_LT_DECL([], [AS], [1], [Assembler program])dnl - - test -z "$DLLTOOL" && DLLTOOL=dlltool --_LT_DECL([], [DLLTOOL], [0], [DLL creation program])dnl -+_LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl - - test -z "$OBJDUMP" && OBJDUMP=objdump --_LT_DECL([], [OBJDUMP], [0], [Object dumper program])dnl -+_LT_DECL([], [OBJDUMP], [1], [Object dumper program])dnl - ])# win32-dll - - AU_DEFUN([AC_LIBTOOL_WIN32_DLL], -@@ -325,9 +326,24 @@ dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], []) - # MODE is either `yes' or `no'. If omitted, it defaults to `both'. - m4_define([_LT_WITH_PIC], - [AC_ARG_WITH([pic], -- [AS_HELP_STRING([--with-pic], -+ [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@], - [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], -- [pic_mode="$withval"], -+ [lt_p=${PACKAGE-default} -+ case $withval in -+ yes|no) pic_mode=$withval ;; -+ *) -+ pic_mode=default -+ # Look at the argument we got. We use all the common list separators. -+ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," -+ for lt_pkg in $withval; do -+ IFS="$lt_save_ifs" -+ if test "X$lt_pkg" = "X$lt_p"; then -+ pic_mode=yes -+ fi -+ done -+ IFS="$lt_save_ifs" -+ ;; -+ esac], - [pic_mode=default]) - - test -z "$pic_mode" && pic_mode=m4_default([$1], [default]) -diff --git a/m4/ltversion.m4 b/m4/ltversion.m4 -index f3c5309..07a8602 100644 ---- a/m4/ltversion.m4 -+++ b/m4/ltversion.m4 -@@ -7,17 +7,17 @@ - # unlimited permission to copy and/or distribute it, with or without - # modifications, as long as this notice is preserved. - --# Generated from ltversion.in. -+# @configure_input@ - --# serial 3017 ltversion.m4 -+# serial 3337 ltversion.m4 - # This file is part of GNU Libtool - --m4_define([LT_PACKAGE_VERSION], [2.2.6b]) --m4_define([LT_PACKAGE_REVISION], [1.3017]) -+m4_define([LT_PACKAGE_VERSION], [2.4.2]) -+m4_define([LT_PACKAGE_REVISION], [1.3337]) - - AC_DEFUN([LTVERSION_VERSION], --[macro_version='2.2.6b' --macro_revision='1.3017' -+[macro_version='2.4.2' -+macro_revision='1.3337' - _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) - _LT_DECL(, macro_revision, 0) - ]) -diff --git a/m4/lt~obsolete.m4 b/m4/lt~obsolete.m4 -index 637bb20..c573da9 100644 ---- a/m4/lt~obsolete.m4 -+++ b/m4/lt~obsolete.m4 -@@ -1,13 +1,13 @@ - # lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*- - # --# Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc. -+# Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc. - # Written by Scott James Remnant, 2004. - # - # This file is free software; the Free Software Foundation gives - # unlimited permission to copy and/or distribute it, with or without - # modifications, as long as this notice is preserved. - --# serial 4 lt~obsolete.m4 -+# serial 5 lt~obsolete.m4 - - # These exist entirely to fool aclocal when bootstrapping libtool. - # -@@ -77,7 +77,6 @@ m4_ifndef([AC_DISABLE_FAST_INSTALL], [AC_DEFUN([AC_DISABLE_FAST_INSTALL])]) - m4_ifndef([_LT_AC_LANG_CXX], [AC_DEFUN([_LT_AC_LANG_CXX])]) - m4_ifndef([_LT_AC_LANG_F77], [AC_DEFUN([_LT_AC_LANG_F77])]) - m4_ifndef([_LT_AC_LANG_GCJ], [AC_DEFUN([_LT_AC_LANG_GCJ])]) --m4_ifndef([AC_LIBTOOL_RC], [AC_DEFUN([AC_LIBTOOL_RC])]) - m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])]) - m4_ifndef([_LT_AC_LANG_C_CONFIG], [AC_DEFUN([_LT_AC_LANG_C_CONFIG])]) - m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])]) -@@ -90,3 +89,10 @@ m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])]) - m4_ifndef([_LT_AC_LANG_RC_CONFIG], [AC_DEFUN([_LT_AC_LANG_RC_CONFIG])]) - m4_ifndef([AC_LIBTOOL_CONFIG], [AC_DEFUN([AC_LIBTOOL_CONFIG])]) - m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])]) -+m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS], [AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])]) -+m4_ifndef([_LT_AC_PROG_CXXCPP], [AC_DEFUN([_LT_AC_PROG_CXXCPP])]) -+m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS], [AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])]) -+m4_ifndef([_LT_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])]) -+m4_ifndef([_LT_PROG_F77], [AC_DEFUN([_LT_PROG_F77])]) -+m4_ifndef([_LT_PROG_FC], [AC_DEFUN([_LT_PROG_FC])]) -+m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])]) -diff --git a/missing b/missing -index 28055d2..cdea514 100755 ---- a/missing -+++ b/missing -@@ -1,11 +1,10 @@ - #! /bin/sh --# Common stub for a few missing GNU programs while installing. -+# Common wrapper for a few potentially missing GNU programs. - --scriptversion=2009-04-28.21; # UTC -+scriptversion=2012-06-26.16; # UTC - --# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, --# 2008, 2009 Free Software Foundation, Inc. --# Originally by Fran,cois Pinard , 1996. -+# Copyright (C) 1996-2013 Free Software Foundation, Inc. -+# Originally written by Fran,cois Pinard , 1996. - - # This program is free software; you can redistribute it and/or modify - # it under the terms of the GNU General Public License as published by -@@ -26,69 +25,40 @@ scriptversion=2009-04-28.21; # UTC - # the same distribution terms that you use for the rest of that program. - - if test $# -eq 0; then -- echo 1>&2 "Try \`$0 --help' for more information" -+ echo 1>&2 "Try '$0 --help' for more information" - exit 1 - fi - --run=: --sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' --sed_minuso='s/.* -o \([^ ]*\).*/\1/p' -- --# In the cases where this matters, `missing' is being run in the --# srcdir already. --if test -f configure.ac; then -- configure_ac=configure.ac --else -- configure_ac=configure.in --fi -+case $1 in - --msg="missing on your system" -+ --is-lightweight) -+ # Used by our autoconf macros to check whether the available missing -+ # script is modern enough. -+ exit 0 -+ ;; - --case $1 in ----run) -- # Try to run requested program, and just exit if it succeeds. -- run= -- shift -- "$@" && exit 0 -- # Exit code 63 means version mismatch. This often happens -- # when the user try to use an ancient version of a tool on -- # a file that requires a minimum version. In this case we -- # we should proceed has if the program had been absent, or -- # if --run hadn't been passed. -- if test $? = 63; then -- run=: -- msg="probably too old" -- fi -- ;; -+ --run) -+ # Back-compat with the calling convention used by older automake. -+ shift -+ ;; - - -h|--h|--he|--hel|--help) - echo "\ - $0 [OPTION]... PROGRAM [ARGUMENT]... - --Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an --error status if there is no known handling for PROGRAM. -+Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due -+to PROGRAM being missing or too old. - - Options: - -h, --help display this help and exit - -v, --version output version information and exit -- --run try to run the given command, and emulate it if it fails - - Supported PROGRAM values: -- aclocal touch file \`aclocal.m4' -- autoconf touch file \`configure' -- autoheader touch file \`config.h.in' -- autom4te touch the output file, or create a stub one -- automake touch all \`Makefile.in' files -- bison create \`y.tab.[ch]', if possible, from existing .[ch] -- flex create \`lex.yy.c', if possible, from existing .c -- help2man touch the output file -- lex create \`lex.yy.c', if possible, from existing .c -- makeinfo touch the output file -- tar try tar, gnutar, gtar, then tar without non-portable flags -- yacc create \`y.tab.[ch]', if possible, from existing .[ch] -+ aclocal autoconf autoheader autom4te automake makeinfo -+ bison yacc flex lex help2man - --Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and --\`g' are ignored when checking the name. -+Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and -+'g' are ignored when checking the name. - - Send bug reports to ." - exit $? -@@ -100,272 +70,141 @@ Send bug reports to ." - ;; - - -*) -- echo 1>&2 "$0: Unknown \`$1' option" -- echo 1>&2 "Try \`$0 --help' for more information" -+ echo 1>&2 "$0: unknown '$1' option" -+ echo 1>&2 "Try '$0 --help' for more information" - exit 1 - ;; - - esac - --# normalize program name to check for. --program=`echo "$1" | sed ' -- s/^gnu-//; t -- s/^gnu//; t -- s/^g//; t'` -- --# Now exit if we have it, but it failed. Also exit now if we --# don't have it and --version was passed (most likely to detect --# the program). This is about non-GNU programs, so use $1 not --# $program. --case $1 in -- lex*|yacc*) -- # Not GNU programs, they don't have --version. -- ;; -- -- tar*) -- if test -n "$run"; then -- echo 1>&2 "ERROR: \`tar' requires --run" -- exit 1 -- elif test "x$2" = "x--version" || test "x$2" = "x--help"; then -- exit 1 -- fi -- ;; -- -- *) -- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then -- # We have it, but it failed. -- exit 1 -- elif test "x$2" = "x--version" || test "x$2" = "x--help"; then -- # Could not run --version or --help. This is probably someone -- # running `$TOOL --version' or `$TOOL --help' to check whether -- # $TOOL exists and not knowing $TOOL uses missing. -- exit 1 -- fi -- ;; --esac -- --# If it does not exist, or fails to run (possibly an outdated version), --# try to emulate it. --case $program in -- aclocal*) -- echo 1>&2 "\ --WARNING: \`$1' is $msg. You should only need it if -- you modified \`acinclude.m4' or \`${configure_ac}'. You might want -- to install the \`Automake' and \`Perl' packages. Grab them from -- any GNU archive site." -- touch aclocal.m4 -- ;; -- -- autoconf*) -- echo 1>&2 "\ --WARNING: \`$1' is $msg. You should only need it if -- you modified \`${configure_ac}'. You might want to install the -- \`Autoconf' and \`GNU m4' packages. Grab them from any GNU -- archive site." -- touch configure -- ;; -- -- autoheader*) -- echo 1>&2 "\ --WARNING: \`$1' is $msg. You should only need it if -- you modified \`acconfig.h' or \`${configure_ac}'. You might want -- to install the \`Autoconf' and \`GNU m4' packages. Grab them -- from any GNU archive site." -- files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}` -- test -z "$files" && files="config.h" -- touch_files= -- for f in $files; do -- case $f in -- *:*) touch_files="$touch_files "`echo "$f" | -- sed -e 's/^[^:]*://' -e 's/:.*//'`;; -- *) touch_files="$touch_files $f.in";; -- esac -- done -- touch $touch_files -- ;; -- -- automake*) -- echo 1>&2 "\ --WARNING: \`$1' is $msg. You should only need it if -- you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. -- You might want to install the \`Automake' and \`Perl' packages. -- Grab them from any GNU archive site." -- find . -type f -name Makefile.am -print | -- sed 's/\.am$/.in/' | -- while read f; do touch "$f"; done -- ;; -- -- autom4te*) -- echo 1>&2 "\ --WARNING: \`$1' is needed, but is $msg. -- You might have modified some files without having the -- proper tools for further handling them. -- You can get \`$1' as part of \`Autoconf' from any GNU -- archive site." -- -- file=`echo "$*" | sed -n "$sed_output"` -- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` -- if test -f "$file"; then -- touch $file -- else -- test -z "$file" || exec >$file -- echo "#! /bin/sh" -- echo "# Created by GNU Automake missing as a replacement of" -- echo "# $ $@" -- echo "exit 0" -- chmod +x $file -- exit 1 -- fi -- ;; -- -- bison*|yacc*) -- echo 1>&2 "\ --WARNING: \`$1' $msg. You should only need it if -- you modified a \`.y' file. You may need the \`Bison' package -- in order for those modifications to take effect. You can get -- \`Bison' from any GNU archive site." -- rm -f y.tab.c y.tab.h -- if test $# -ne 1; then -- eval LASTARG="\${$#}" -- case $LASTARG in -- *.y) -- SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` -- if test -f "$SRCFILE"; then -- cp "$SRCFILE" y.tab.c -- fi -- SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` -- if test -f "$SRCFILE"; then -- cp "$SRCFILE" y.tab.h -- fi -- ;; -- esac -- fi -- if test ! -f y.tab.h; then -- echo >y.tab.h -- fi -- if test ! -f y.tab.c; then -- echo 'main() { return 0; }' >y.tab.c -- fi -- ;; -- -- lex*|flex*) -- echo 1>&2 "\ --WARNING: \`$1' is $msg. You should only need it if -- you modified a \`.l' file. You may need the \`Flex' package -- in order for those modifications to take effect. You can get -- \`Flex' from any GNU archive site." -- rm -f lex.yy.c -- if test $# -ne 1; then -- eval LASTARG="\${$#}" -- case $LASTARG in -- *.l) -- SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` -- if test -f "$SRCFILE"; then -- cp "$SRCFILE" lex.yy.c -- fi -- ;; -- esac -- fi -- if test ! -f lex.yy.c; then -- echo 'main() { return 0; }' >lex.yy.c -- fi -- ;; -- -- help2man*) -- echo 1>&2 "\ --WARNING: \`$1' is $msg. You should only need it if -- you modified a dependency of a manual page. You may need the -- \`Help2man' package in order for those modifications to take -- effect. You can get \`Help2man' from any GNU archive site." -- -- file=`echo "$*" | sed -n "$sed_output"` -- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` -- if test -f "$file"; then -- touch $file -- else -- test -z "$file" || exec >$file -- echo ".ab help2man is required to generate this page" -- exit $? -- fi -- ;; -- -- makeinfo*) -- echo 1>&2 "\ --WARNING: \`$1' is $msg. You should only need it if -- you modified a \`.texi' or \`.texinfo' file, or any other file -- indirectly affecting the aspect of the manual. The spurious -- call might also be the consequence of using a buggy \`make' (AIX, -- DU, IRIX). You might want to install the \`Texinfo' package or -- the \`GNU make' package. Grab either from any GNU archive site." -- # The file to touch is that specified with -o ... -- file=`echo "$*" | sed -n "$sed_output"` -- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` -- if test -z "$file"; then -- # ... or it is the one specified with @setfilename ... -- infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` -- file=`sed -n ' -- /^@setfilename/{ -- s/.* \([^ ]*\) *$/\1/ -- p -- q -- }' $infile` -- # ... or it is derived from the source name (dir/f.texi becomes f.info) -- test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info -- fi -- # If the file does not exist, the user really needs makeinfo; -- # let's fail without touching anything. -- test -f $file || exit 1 -- touch $file -- ;; -- -- tar*) -- shift -- -- # We have already tried tar in the generic part. -- # Look for gnutar/gtar before invocation to avoid ugly error -- # messages. -- if (gnutar --version > /dev/null 2>&1); then -- gnutar "$@" && exit 0 -- fi -- if (gtar --version > /dev/null 2>&1); then -- gtar "$@" && exit 0 -- fi -- firstarg="$1" -- if shift; then -- case $firstarg in -- *o*) -- firstarg=`echo "$firstarg" | sed s/o//` -- tar "$firstarg" "$@" && exit 0 -- ;; -- esac -- case $firstarg in -- *h*) -- firstarg=`echo "$firstarg" | sed s/h//` -- tar "$firstarg" "$@" && exit 0 -- ;; -- esac -- fi -- -- echo 1>&2 "\ --WARNING: I can't seem to be able to run \`tar' with the given arguments. -- You may want to install GNU tar or Free paxutils, or check the -- command line arguments." -- exit 1 -- ;; -- -- *) -- echo 1>&2 "\ --WARNING: \`$1' is needed, and is $msg. -- You might have modified some files without having the -- proper tools for further handling them. Check the \`README' file, -- it often tells you about the needed prerequisites for installing -- this package. You may also peek at any GNU archive site, in case -- some other package would contain this missing \`$1' program." -- exit 1 -- ;; --esac -+# Run the given program, remember its exit status. -+"$@"; st=$? -+ -+# If it succeeded, we are done. -+test $st -eq 0 && exit 0 -+ -+# Also exit now if we it failed (or wasn't found), and '--version' was -+# passed; such an option is passed most likely to detect whether the -+# program is present and works. -+case $2 in --version|--help) exit $st;; esac -+ -+# Exit code 63 means version mismatch. This often happens when the user -+# tries to use an ancient version of a tool on a file that requires a -+# minimum version. -+if test $st -eq 63; then -+ msg="probably too old" -+elif test $st -eq 127; then -+ # Program was missing. -+ msg="missing on your system" -+else -+ # Program was found and executed, but failed. Give up. -+ exit $st -+fi - --exit 0 -+perl_URL=http://www.perl.org/ -+flex_URL=http://flex.sourceforge.net/ -+gnu_software_URL=http://www.gnu.org/software -+ -+program_details () -+{ -+ case $1 in -+ aclocal|automake) -+ echo "The '$1' program is part of the GNU Automake package:" -+ echo "<$gnu_software_URL/automake>" -+ echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:" -+ echo "<$gnu_software_URL/autoconf>" -+ echo "<$gnu_software_URL/m4/>" -+ echo "<$perl_URL>" -+ ;; -+ autoconf|autom4te|autoheader) -+ echo "The '$1' program is part of the GNU Autoconf package:" -+ echo "<$gnu_software_URL/autoconf/>" -+ echo "It also requires GNU m4 and Perl in order to run:" -+ echo "<$gnu_software_URL/m4/>" -+ echo "<$perl_URL>" -+ ;; -+ esac -+} -+ -+give_advice () -+{ -+ # Normalize program name to check for. -+ normalized_program=`echo "$1" | sed ' -+ s/^gnu-//; t -+ s/^gnu//; t -+ s/^g//; t'` -+ -+ printf '%s\n' "'$1' is $msg." -+ -+ configure_deps="'configure.ac' or m4 files included by 'configure.ac'" -+ case $normalized_program in -+ autoconf*) -+ echo "You should only need it if you modified 'configure.ac'," -+ echo "or m4 files included by it." -+ program_details 'autoconf' -+ ;; -+ autoheader*) -+ echo "You should only need it if you modified 'acconfig.h' or" -+ echo "$configure_deps." -+ program_details 'autoheader' -+ ;; -+ automake*) -+ echo "You should only need it if you modified 'Makefile.am' or" -+ echo "$configure_deps." -+ program_details 'automake' -+ ;; -+ aclocal*) -+ echo "You should only need it if you modified 'acinclude.m4' or" -+ echo "$configure_deps." -+ program_details 'aclocal' -+ ;; -+ autom4te*) -+ echo "You might have modified some maintainer files that require" -+ echo "the 'automa4te' program to be rebuilt." -+ program_details 'autom4te' -+ ;; -+ bison*|yacc*) -+ echo "You should only need it if you modified a '.y' file." -+ echo "You may want to install the GNU Bison package:" -+ echo "<$gnu_software_URL/bison/>" -+ ;; -+ lex*|flex*) -+ echo "You should only need it if you modified a '.l' file." -+ echo "You may want to install the Fast Lexical Analyzer package:" -+ echo "<$flex_URL>" -+ ;; -+ help2man*) -+ echo "You should only need it if you modified a dependency" \ -+ "of a man page." -+ echo "You may want to install the GNU Help2man package:" -+ echo "<$gnu_software_URL/help2man/>" -+ ;; -+ makeinfo*) -+ echo "You should only need it if you modified a '.texi' file, or" -+ echo "any other file indirectly affecting the aspect of the manual." -+ echo "You might want to install the Texinfo package:" -+ echo "<$gnu_software_URL/texinfo/>" -+ echo "The spurious makeinfo call might also be the consequence of" -+ echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might" -+ echo "want to install GNU make:" -+ echo "<$gnu_software_URL/make/>" -+ ;; -+ *) -+ echo "You might have modified some files without having the proper" -+ echo "tools for further handling them. Check the 'README' file, it" -+ echo "often tells you about the needed prerequisites for installing" -+ echo "this package. You may also peek at any GNU archive site, in" -+ echo "case some other package contains this missing '$1' program." -+ ;; -+ esac -+} -+ -+give_advice "$1" | sed -e '1s/^/WARNING: /' \ -+ -e '2,$s/^/ /' >&2 -+ -+# Propagate the correct exit status (expected to be 127 for a program -+# not found, 63 for a program that failed due to version mismatch). -+exit $st - - # Local variables: - # eval: (add-hook 'write-file-hooks 'time-stamp) -diff --git a/py-compile b/py-compile -index 3f9d05b..46ea866 100755 ---- a/py-compile -+++ b/py-compile -@@ -1,10 +1,9 @@ - #!/bin/sh - # py-compile - Compile a Python program - --scriptversion=2009-04-28.21; # UTC -+scriptversion=2011-06-08.12; # UTC - --# Copyright (C) 2000, 2001, 2003, 2004, 2005, 2008, 2009 Free Software --# Foundation, Inc. -+# Copyright (C) 2000-2013 Free Software Foundation, Inc. - - # This program is free software; you can redistribute it and/or modify - # it under the terms of the GNU General Public License as published by -@@ -32,28 +31,36 @@ if [ -z "$PYTHON" ]; then - PYTHON=python - fi - -+me=py-compile -+ -+usage_error () -+{ -+ echo "$me: $*" >&2 -+ echo "Try '$me --help' for more information." >&2 -+ exit 1 -+} -+ - basedir= - destdir= --files= - while test $# -ne 0; do - case "$1" in - --basedir) -- basedir=$2 -- if test -z "$basedir"; then -- echo "$0: Missing argument to --basedir." 1>&2 -- exit 1 -+ if test $# -lt 2; then -+ usage_error "option '--basedir' requires an argument" -+ else -+ basedir=$2 - fi - shift - ;; - --destdir) -- destdir=$2 -- if test -z "$destdir"; then -- echo "$0: Missing argument to --destdir." 1>&2 -- exit 1 -+ if test $# -lt 2; then -+ usage_error "option '--destdir' requires an argument" -+ else -+ destdir=$2 - fi - shift - ;; -- -h|--h*) -+ -h|--help) - cat <<\EOF - Usage: py-compile [--help] [--version] [--basedir DIR] [--destdir DIR] FILES..." - -@@ -69,20 +76,27 @@ Report bugs to . - EOF - exit $? - ;; -- -v|--v*) -- echo "py-compile $scriptversion" -+ -v|--version) -+ echo "$me $scriptversion" - exit $? - ;; -+ --) -+ shift -+ break -+ ;; -+ -*) -+ usage_error "unrecognized option '$1'" -+ ;; - *) -- files="$files $1" -+ break - ;; - esac - shift - done - -+files=$* - if test -z "$files"; then -- echo "$0: No files given. Try \`$0 --help' for more information." 1>&2 -- exit 1 -+ usage_error "no files given" - fi - - # if basedir was given, then it should be prepended to filenames before -@@ -102,7 +116,7 @@ else - fi - - $PYTHON -c " --import sys, os, py_compile -+import sys, os, py_compile, imp - - files = '''$files''' - -@@ -115,12 +129,19 @@ for file in files.split(): - continue - sys.stdout.write(file) - sys.stdout.flush() -- py_compile.compile(filepath, filepath + 'c', path) -+ if hasattr(imp, 'get_tag'): -+ py_compile.compile(filepath, imp.cache_from_source(filepath), path) -+ else: -+ py_compile.compile(filepath, filepath + 'c', path) - sys.stdout.write('\n')" || exit $? - - # this will fail for python < 1.5, but that doesn't matter ... - $PYTHON -O -c " --import sys, os, py_compile -+import sys, os, py_compile, imp -+ -+# pypy does not use .pyo optimization -+if hasattr(sys, 'pypy_translation_info'): -+ sys.exit(0) - - files = '''$files''' - sys.stdout.write('Byte-compiling python modules (optimized versions) ...\n') -@@ -132,7 +153,10 @@ for file in files.split(): - continue - sys.stdout.write(file) - sys.stdout.flush() -- py_compile.compile(filepath, filepath + 'o', path) -+ if hasattr(imp, 'get_tag'): -+ py_compile.compile(filepath, imp.cache_from_source(filepath, False), path) -+ else: -+ py_compile.compile(filepath, filepath + 'o', path) - sys.stdout.write('\n')" 2>/dev/null || : - - # Local Variables: -diff --git a/src/Makefile.in b/src/Makefile.in -index 20e2b8f..44cadaf 100644 ---- a/src/Makefile.in -+++ b/src/Makefile.in -@@ -1,9 +1,8 @@ --# Makefile.in generated by automake 1.11.1 from Makefile.am. -+# Makefile.in generated by automake 1.14 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, --# Inc. -+# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+ - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -15,6 +14,51 @@ - - @SET_MAKE@ - VPATH = @srcdir@ -+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -+am__make_running_with_option = \ -+ case $${target_option-} in \ -+ ?) ;; \ -+ *) echo "am__make_running_with_option: internal error: invalid" \ -+ "target option '$${target_option-}' specified" >&2; \ -+ exit 1;; \ -+ esac; \ -+ has_opt=no; \ -+ sane_makeflags=$$MAKEFLAGS; \ -+ if $(am__is_gnu_make); then \ -+ sane_makeflags=$$MFLAGS; \ -+ else \ -+ case $$MAKEFLAGS in \ -+ *\\[\ \ ]*) \ -+ bs=\\; \ -+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -+ esac; \ -+ fi; \ -+ skip_next=no; \ -+ strip_trailopt () \ -+ { \ -+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -+ }; \ -+ for flg in $$sane_makeflags; do \ -+ test $$skip_next = yes && { skip_next=no; continue; }; \ -+ case $$flg in \ -+ *=*|--*) continue;; \ -+ -*I) strip_trailopt 'I'; skip_next=yes;; \ -+ -*I?*) strip_trailopt 'I';; \ -+ -*O) strip_trailopt 'O'; skip_next=yes;; \ -+ -*O?*) strip_trailopt 'O';; \ -+ -*l) strip_trailopt 'l'; skip_next=yes;; \ -+ -*l?*) strip_trailopt 'l';; \ -+ -[dEDm]) skip_next=yes;; \ -+ -[JT]) skip_next=yes;; \ -+ esac; \ -+ case $$flg in \ -+ *$$target_option*) has_opt=yes; break;; \ -+ esac; \ -+ done; \ -+ test $$has_opt = yes -+am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -+am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -34,7 +78,7 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - subdir = src --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ - $(top_srcdir)/m4/ax_python_devel.m4 \ -@@ -49,20 +93,58 @@ mkinstalldirs = $(install_sh) -d - CONFIG_HEADER = $(top_builddir)/config.h - CONFIG_CLEAN_FILES = - CONFIG_CLEAN_VPATH_FILES = -+AM_V_P = $(am__v_P_@AM_V@) -+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -+am__v_P_0 = false -+am__v_P_1 = : -+AM_V_GEN = $(am__v_GEN_@AM_V@) -+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+am__v_GEN_0 = @echo " GEN " $@; -+am__v_GEN_1 = -+AM_V_at = $(am__v_at_@AM_V@) -+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+am__v_at_0 = @ -+am__v_at_1 = - SOURCES = - DIST_SOURCES = --RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ -- html-recursive info-recursive install-data-recursive \ -- install-dvi-recursive install-exec-recursive \ -- install-html-recursive install-info-recursive \ -- install-pdf-recursive install-ps-recursive install-recursive \ -- installcheck-recursive installdirs-recursive pdf-recursive \ -- ps-recursive uninstall-recursive -+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ -+ ctags-recursive dvi-recursive html-recursive info-recursive \ -+ install-data-recursive install-dvi-recursive \ -+ install-exec-recursive install-html-recursive \ -+ install-info-recursive install-pdf-recursive \ -+ install-ps-recursive install-recursive installcheck-recursive \ -+ installdirs-recursive pdf-recursive ps-recursive \ -+ tags-recursive uninstall-recursive -+am__can_run_installinfo = \ -+ case $$AM_UPDATE_INFO_DIR in \ -+ n|no|NO) false;; \ -+ *) (install-info --version) >/dev/null 2>&1;; \ -+ esac - RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ - distclean-recursive maintainer-clean-recursive --AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ -- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ -+am__recursive_targets = \ -+ $(RECURSIVE_TARGETS) \ -+ $(RECURSIVE_CLEAN_TARGETS) \ -+ $(am__extra_recursive_targets) -+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ - distdir -+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -+# Read a list of newline-separated strings from the standard input, -+# and print each of them once, without duplicates. Input order is -+# *not* preserved. -+am__uniquify_input = $(AWK) '\ -+ BEGIN { nonempty = 0; } \ -+ { items[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in items) print i; }; } \ -+' -+# Make sure the list of sources is unique. This is necessary because, -+# e.g., the same source file might be shared among _SOURCES variables -+# for different programs/libraries. -+am__define_uniq_tagged_files = \ -+ list='$(am__tagged_files)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | $(am__uniquify_input)` - ETAGS = etags - CTAGS = ctags - DIST_SUBDIRS = $(SUBDIRS) -@@ -94,6 +176,7 @@ am__relativize = \ - reldir="$$dir2" - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ -+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ -@@ -114,6 +197,7 @@ CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DISABLELIBHARU = @DISABLELIBHARU@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -141,6 +225,7 @@ LOCAL_INCS = @LOCAL_INCS@ - LOCAL_LIBS = @LOCAL_LIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - NM = @NM@ - NMEDIT = @NMEDIT@ -@@ -153,6 +238,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - POW_LIB = @POW_LIB@ -@@ -178,6 +264,7 @@ abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -@@ -211,7 +298,6 @@ libdir = @libdir@ - libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -@@ -273,22 +359,25 @@ clean-libtool: - -rm -rf .libs _libs - - # This directory's subdirectories are mostly independent; you can cd --# into them and run `make' without going through this Makefile. --# To change the values of `make' variables: instead of editing Makefiles, --# (1) if the variable is set in `config.status', edit `config.status' --# (which will cause the Makefiles to be regenerated when you run `make'); --# (2) otherwise, pass the desired values on the `make' command line. --$(RECURSIVE_TARGETS): -- @fail= failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -+# into them and run 'make' without going through this Makefile. -+# To change the values of 'make' variables: instead of editing Makefiles, -+# (1) if the variable is set in 'config.status', edit 'config.status' -+# (which will cause the Makefiles to be regenerated when you run 'make'); -+# (2) otherwise, pass the desired values on the 'make' command line. -+$(am__recursive_targets): -+ @fail=; \ -+ if $(am__make_keepgoing); then \ -+ failcom='fail=yes'; \ -+ else \ -+ failcom='exit 1'; \ -+ fi; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ -- list='$(SUBDIRS)'; for subdir in $$list; do \ -+ case "$@" in \ -+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -+ *) list='$(SUBDIRS)' ;; \ -+ esac; \ -+ for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ -@@ -303,57 +392,12 @@ $(RECURSIVE_TARGETS): - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - --$(RECURSIVE_CLEAN_TARGETS): -- @fail= failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -- dot_seen=no; \ -- case "$@" in \ -- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -- *) list='$(SUBDIRS)' ;; \ -- esac; \ -- rev=''; for subdir in $$list; do \ -- if test "$$subdir" = "."; then :; else \ -- rev="$$subdir $$rev"; \ -- fi; \ -- done; \ -- rev="$$rev ."; \ -- target=`echo $@ | sed s/-recursive//`; \ -- for subdir in $$rev; do \ -- echo "Making $$target in $$subdir"; \ -- if test "$$subdir" = "."; then \ -- local_target="$$target-am"; \ -- else \ -- local_target="$$target"; \ -- fi; \ -- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || eval $$failcom; \ -- done && test -z "$$fail" --tags-recursive: -- list='$(SUBDIRS)'; for subdir in $$list; do \ -- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ -- done --ctags-recursive: -- list='$(SUBDIRS)'; for subdir in $$list; do \ -- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ -- done -+ID: $(am__tagged_files) -+ $(am__define_uniq_tagged_files); mkid -fID $$unique -+tags: tags-recursive -+TAGS: tags - --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ - if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ -@@ -369,12 +413,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ -@@ -386,15 +425,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $$unique; \ - fi; \ - fi --ctags: CTAGS --CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ctags: ctags-recursive -+ -+CTAGS: ctags -+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) -+ $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique -@@ -403,6 +438,21 @@ GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -+cscopelist: cscopelist-recursive -+ -+cscopelist-am: $(am__tagged_files) -+ list='$(am__tagged_files)'; \ -+ case "$(srcdir)" in \ -+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ -+ *) sdir=$(subdir)/$(srcdir) ;; \ -+ esac; \ -+ for i in $$list; do \ -+ if test -f "$$i"; then \ -+ echo "$(subdir)/$$i"; \ -+ else \ -+ echo "$$sdir/$$i"; \ -+ fi; \ -+ done >> $(top_builddir)/cscope.files - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -@@ -439,13 +489,10 @@ distdir: $(DISTFILES) - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test -d "$(distdir)/$$subdir" \ -- || $(MKDIR_P) "$(distdir)/$$subdir" \ -- || exit 1; \ -- fi; \ -- done -- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ -- if test "$$subdir" = .; then :; else \ -+ $(am__make_dryrun) \ -+ || test -d "$(distdir)/$$subdir" \ -+ || $(MKDIR_P) "$(distdir)/$$subdir" \ -+ || exit 1; \ - dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ - $(am__relativize); \ - new_distdir=$$reldir; \ -@@ -480,10 +527,15 @@ install-am: all-am - - installcheck: installcheck-recursive - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+ if test -z '$(STRIP)'; then \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ install; \ -+ else \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -+ fi - mostlyclean-generic: - - clean-generic: -@@ -561,22 +613,20 @@ ps-am: - - uninstall-am: - --.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ -- install-am install-strip tags-recursive -- --.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ -- all all-am check check-am clean clean-generic clean-libtool \ -- ctags ctags-recursive distclean distclean-generic \ -- distclean-libtool distclean-tags distdir dvi dvi-am html \ -- html-am info info-am install install-am install-data \ -- install-data-am install-dvi install-dvi-am install-exec \ -- install-exec-am install-html install-html-am install-info \ -- install-info-am install-man install-pdf install-pdf-am \ -- install-ps install-ps-am install-strip installcheck \ -- installcheck-am installdirs installdirs-am maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-generic \ -- mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ -- uninstall uninstall-am -+.MAKE: $(am__recursive_targets) install-am install-strip -+ -+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ -+ check-am clean clean-generic clean-libtool cscopelist-am ctags \ -+ ctags-am distclean distclean-generic distclean-libtool \ -+ distclean-tags distdir dvi dvi-am html html-am info info-am \ -+ install install-am install-data install-data-am install-dvi \ -+ install-dvi-am install-exec install-exec-am install-html \ -+ install-html-am install-info install-info-am install-man \ -+ install-pdf install-pdf-am install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ installdirs-am maintainer-clean maintainer-clean-generic \ -+ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ -+ ps ps-am tags tags-am uninstall uninstall-am - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff --git a/src/modules/Makefile.in b/src/modules/Makefile.in -index fbbdeb4..8ea0b08 100644 ---- a/src/modules/Makefile.in -+++ b/src/modules/Makefile.in -@@ -1,9 +1,8 @@ --# Makefile.in generated by automake 1.11.1 from Makefile.am. -+# Makefile.in generated by automake 1.14 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, --# Inc. -+# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+ - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -15,6 +14,51 @@ - - @SET_MAKE@ - VPATH = @srcdir@ -+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -+am__make_running_with_option = \ -+ case $${target_option-} in \ -+ ?) ;; \ -+ *) echo "am__make_running_with_option: internal error: invalid" \ -+ "target option '$${target_option-}' specified" >&2; \ -+ exit 1;; \ -+ esac; \ -+ has_opt=no; \ -+ sane_makeflags=$$MAKEFLAGS; \ -+ if $(am__is_gnu_make); then \ -+ sane_makeflags=$$MFLAGS; \ -+ else \ -+ case $$MAKEFLAGS in \ -+ *\\[\ \ ]*) \ -+ bs=\\; \ -+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -+ esac; \ -+ fi; \ -+ skip_next=no; \ -+ strip_trailopt () \ -+ { \ -+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -+ }; \ -+ for flg in $$sane_makeflags; do \ -+ test $$skip_next = yes && { skip_next=no; continue; }; \ -+ case $$flg in \ -+ *=*|--*) continue;; \ -+ -*I) strip_trailopt 'I'; skip_next=yes;; \ -+ -*I?*) strip_trailopt 'I';; \ -+ -*O) strip_trailopt 'O'; skip_next=yes;; \ -+ -*O?*) strip_trailopt 'O';; \ -+ -*l) strip_trailopt 'l'; skip_next=yes;; \ -+ -*l?*) strip_trailopt 'l';; \ -+ -[dEDm]) skip_next=yes;; \ -+ -[JT]) skip_next=yes;; \ -+ esac; \ -+ case $$flg in \ -+ *$$target_option*) has_opt=yes; break;; \ -+ esac; \ -+ done; \ -+ test $$has_opt = yes -+am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -+am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -34,7 +78,7 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - subdir = src/modules --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ - $(top_srcdir)/m4/ax_python_devel.m4 \ -@@ -49,20 +93,58 @@ mkinstalldirs = $(install_sh) -d - CONFIG_HEADER = $(top_builddir)/config.h - CONFIG_CLEAN_FILES = - CONFIG_CLEAN_VPATH_FILES = -+AM_V_P = $(am__v_P_@AM_V@) -+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -+am__v_P_0 = false -+am__v_P_1 = : -+AM_V_GEN = $(am__v_GEN_@AM_V@) -+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+am__v_GEN_0 = @echo " GEN " $@; -+am__v_GEN_1 = -+AM_V_at = $(am__v_at_@AM_V@) -+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+am__v_at_0 = @ -+am__v_at_1 = - SOURCES = - DIST_SOURCES = --RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ -- html-recursive info-recursive install-data-recursive \ -- install-dvi-recursive install-exec-recursive \ -- install-html-recursive install-info-recursive \ -- install-pdf-recursive install-ps-recursive install-recursive \ -- installcheck-recursive installdirs-recursive pdf-recursive \ -- ps-recursive uninstall-recursive -+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ -+ ctags-recursive dvi-recursive html-recursive info-recursive \ -+ install-data-recursive install-dvi-recursive \ -+ install-exec-recursive install-html-recursive \ -+ install-info-recursive install-pdf-recursive \ -+ install-ps-recursive install-recursive installcheck-recursive \ -+ installdirs-recursive pdf-recursive ps-recursive \ -+ tags-recursive uninstall-recursive -+am__can_run_installinfo = \ -+ case $$AM_UPDATE_INFO_DIR in \ -+ n|no|NO) false;; \ -+ *) (install-info --version) >/dev/null 2>&1;; \ -+ esac - RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ - distclean-recursive maintainer-clean-recursive --AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ -- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ -+am__recursive_targets = \ -+ $(RECURSIVE_TARGETS) \ -+ $(RECURSIVE_CLEAN_TARGETS) \ -+ $(am__extra_recursive_targets) -+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ - distdir -+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -+# Read a list of newline-separated strings from the standard input, -+# and print each of them once, without duplicates. Input order is -+# *not* preserved. -+am__uniquify_input = $(AWK) '\ -+ BEGIN { nonempty = 0; } \ -+ { items[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in items) print i; }; } \ -+' -+# Make sure the list of sources is unique. This is necessary because, -+# e.g., the same source file might be shared among _SOURCES variables -+# for different programs/libraries. -+am__define_uniq_tagged_files = \ -+ list='$(am__tagged_files)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | $(am__uniquify_input)` - ETAGS = etags - CTAGS = ctags - DIST_SUBDIRS = $(SUBDIRS) -@@ -94,6 +176,7 @@ am__relativize = \ - reldir="$$dir2" - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ -+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ -@@ -114,6 +197,7 @@ CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DISABLELIBHARU = @DISABLELIBHARU@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -141,6 +225,7 @@ LOCAL_INCS = @LOCAL_INCS@ - LOCAL_LIBS = @LOCAL_LIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - NM = @NM@ - NMEDIT = @NMEDIT@ -@@ -153,6 +238,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - POW_LIB = @POW_LIB@ -@@ -178,6 +264,7 @@ abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -@@ -211,7 +298,6 @@ libdir = @libdir@ - libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -@@ -273,22 +359,25 @@ clean-libtool: - -rm -rf .libs _libs - - # This directory's subdirectories are mostly independent; you can cd --# into them and run `make' without going through this Makefile. --# To change the values of `make' variables: instead of editing Makefiles, --# (1) if the variable is set in `config.status', edit `config.status' --# (which will cause the Makefiles to be regenerated when you run `make'); --# (2) otherwise, pass the desired values on the `make' command line. --$(RECURSIVE_TARGETS): -- @fail= failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -+# into them and run 'make' without going through this Makefile. -+# To change the values of 'make' variables: instead of editing Makefiles, -+# (1) if the variable is set in 'config.status', edit 'config.status' -+# (which will cause the Makefiles to be regenerated when you run 'make'); -+# (2) otherwise, pass the desired values on the 'make' command line. -+$(am__recursive_targets): -+ @fail=; \ -+ if $(am__make_keepgoing); then \ -+ failcom='fail=yes'; \ -+ else \ -+ failcom='exit 1'; \ -+ fi; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ -- list='$(SUBDIRS)'; for subdir in $$list; do \ -+ case "$@" in \ -+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -+ *) list='$(SUBDIRS)' ;; \ -+ esac; \ -+ for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ -@@ -303,57 +392,12 @@ $(RECURSIVE_TARGETS): - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - --$(RECURSIVE_CLEAN_TARGETS): -- @fail= failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -- dot_seen=no; \ -- case "$@" in \ -- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -- *) list='$(SUBDIRS)' ;; \ -- esac; \ -- rev=''; for subdir in $$list; do \ -- if test "$$subdir" = "."; then :; else \ -- rev="$$subdir $$rev"; \ -- fi; \ -- done; \ -- rev="$$rev ."; \ -- target=`echo $@ | sed s/-recursive//`; \ -- for subdir in $$rev; do \ -- echo "Making $$target in $$subdir"; \ -- if test "$$subdir" = "."; then \ -- local_target="$$target-am"; \ -- else \ -- local_target="$$target"; \ -- fi; \ -- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || eval $$failcom; \ -- done && test -z "$$fail" --tags-recursive: -- list='$(SUBDIRS)'; for subdir in $$list; do \ -- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ -- done --ctags-recursive: -- list='$(SUBDIRS)'; for subdir in $$list; do \ -- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ -- done -+ID: $(am__tagged_files) -+ $(am__define_uniq_tagged_files); mkid -fID $$unique -+tags: tags-recursive -+TAGS: tags - --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ - if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ -@@ -369,12 +413,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ -@@ -386,15 +425,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $$unique; \ - fi; \ - fi --ctags: CTAGS --CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ctags: ctags-recursive -+ -+CTAGS: ctags -+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) -+ $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique -@@ -403,6 +438,21 @@ GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -+cscopelist: cscopelist-recursive -+ -+cscopelist-am: $(am__tagged_files) -+ list='$(am__tagged_files)'; \ -+ case "$(srcdir)" in \ -+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ -+ *) sdir=$(subdir)/$(srcdir) ;; \ -+ esac; \ -+ for i in $$list; do \ -+ if test -f "$$i"; then \ -+ echo "$(subdir)/$$i"; \ -+ else \ -+ echo "$$sdir/$$i"; \ -+ fi; \ -+ done >> $(top_builddir)/cscope.files - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -@@ -439,13 +489,10 @@ distdir: $(DISTFILES) - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test -d "$(distdir)/$$subdir" \ -- || $(MKDIR_P) "$(distdir)/$$subdir" \ -- || exit 1; \ -- fi; \ -- done -- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ -- if test "$$subdir" = .; then :; else \ -+ $(am__make_dryrun) \ -+ || test -d "$(distdir)/$$subdir" \ -+ || $(MKDIR_P) "$(distdir)/$$subdir" \ -+ || exit 1; \ - dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ - $(am__relativize); \ - new_distdir=$$reldir; \ -@@ -480,10 +527,15 @@ install-am: all-am - - installcheck: installcheck-recursive - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+ if test -z '$(STRIP)'; then \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ install; \ -+ else \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -+ fi - mostlyclean-generic: - - clean-generic: -@@ -561,22 +613,20 @@ ps-am: - - uninstall-am: - --.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ -- install-am install-strip tags-recursive -- --.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ -- all all-am check check-am clean clean-generic clean-libtool \ -- ctags ctags-recursive distclean distclean-generic \ -- distclean-libtool distclean-tags distdir dvi dvi-am html \ -- html-am info info-am install install-am install-data \ -- install-data-am install-dvi install-dvi-am install-exec \ -- install-exec-am install-html install-html-am install-info \ -- install-info-am install-man install-pdf install-pdf-am \ -- install-ps install-ps-am install-strip installcheck \ -- installcheck-am installdirs installdirs-am maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-generic \ -- mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ -- uninstall uninstall-am -+.MAKE: $(am__recursive_targets) install-am install-strip -+ -+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ -+ check-am clean clean-generic clean-libtool cscopelist-am ctags \ -+ ctags-am distclean distclean-generic distclean-libtool \ -+ distclean-tags distdir dvi dvi-am html html-am info info-am \ -+ install install-am install-data install-data-am install-dvi \ -+ install-dvi-am install-exec install-exec-am install-html \ -+ install-html-am install-info install-info-am install-man \ -+ install-pdf install-pdf-am install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ installdirs-am maintainer-clean maintainer-clean-generic \ -+ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ -+ ps ps-am tags tags-am uninstall uninstall-am - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff --git a/src/modules/climate/Makefile.in b/src/modules/climate/Makefile.in -index ec8c52f..78bca3e 100644 ---- a/src/modules/climate/Makefile.in -+++ b/src/modules/climate/Makefile.in -@@ -1,9 +1,8 @@ --# Makefile.in generated by automake 1.11.1 from Makefile.am. -+# Makefile.in generated by automake 1.14 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, --# Inc. -+# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+ - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -15,6 +14,51 @@ - - @SET_MAKE@ - VPATH = @srcdir@ -+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -+am__make_running_with_option = \ -+ case $${target_option-} in \ -+ ?) ;; \ -+ *) echo "am__make_running_with_option: internal error: invalid" \ -+ "target option '$${target_option-}' specified" >&2; \ -+ exit 1;; \ -+ esac; \ -+ has_opt=no; \ -+ sane_makeflags=$$MAKEFLAGS; \ -+ if $(am__is_gnu_make); then \ -+ sane_makeflags=$$MFLAGS; \ -+ else \ -+ case $$MAKEFLAGS in \ -+ *\\[\ \ ]*) \ -+ bs=\\; \ -+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -+ esac; \ -+ fi; \ -+ skip_next=no; \ -+ strip_trailopt () \ -+ { \ -+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -+ }; \ -+ for flg in $$sane_makeflags; do \ -+ test $$skip_next = yes && { skip_next=no; continue; }; \ -+ case $$flg in \ -+ *=*|--*) continue;; \ -+ -*I) strip_trailopt 'I'; skip_next=yes;; \ -+ -*I?*) strip_trailopt 'I';; \ -+ -*O) strip_trailopt 'O'; skip_next=yes;; \ -+ -*O?*) strip_trailopt 'O';; \ -+ -*l) strip_trailopt 'l'; skip_next=yes;; \ -+ -*l?*) strip_trailopt 'l';; \ -+ -[dEDm]) skip_next=yes;; \ -+ -[JT]) skip_next=yes;; \ -+ esac; \ -+ case $$flg in \ -+ *$$target_option*) has_opt=yes; break;; \ -+ esac; \ -+ done; \ -+ test $$has_opt = yes -+am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -+am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -34,7 +78,7 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - subdir = src/modules/climate --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ - $(top_srcdir)/m4/ax_python_devel.m4 \ -@@ -49,20 +93,58 @@ mkinstalldirs = $(install_sh) -d - CONFIG_HEADER = $(top_builddir)/config.h - CONFIG_CLEAN_FILES = - CONFIG_CLEAN_VPATH_FILES = -+AM_V_P = $(am__v_P_@AM_V@) -+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -+am__v_P_0 = false -+am__v_P_1 = : -+AM_V_GEN = $(am__v_GEN_@AM_V@) -+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+am__v_GEN_0 = @echo " GEN " $@; -+am__v_GEN_1 = -+AM_V_at = $(am__v_at_@AM_V@) -+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+am__v_at_0 = @ -+am__v_at_1 = - SOURCES = - DIST_SOURCES = --RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ -- html-recursive info-recursive install-data-recursive \ -- install-dvi-recursive install-exec-recursive \ -- install-html-recursive install-info-recursive \ -- install-pdf-recursive install-ps-recursive install-recursive \ -- installcheck-recursive installdirs-recursive pdf-recursive \ -- ps-recursive uninstall-recursive -+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ -+ ctags-recursive dvi-recursive html-recursive info-recursive \ -+ install-data-recursive install-dvi-recursive \ -+ install-exec-recursive install-html-recursive \ -+ install-info-recursive install-pdf-recursive \ -+ install-ps-recursive install-recursive installcheck-recursive \ -+ installdirs-recursive pdf-recursive ps-recursive \ -+ tags-recursive uninstall-recursive -+am__can_run_installinfo = \ -+ case $$AM_UPDATE_INFO_DIR in \ -+ n|no|NO) false;; \ -+ *) (install-info --version) >/dev/null 2>&1;; \ -+ esac - RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ - distclean-recursive maintainer-clean-recursive --AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ -- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ -+am__recursive_targets = \ -+ $(RECURSIVE_TARGETS) \ -+ $(RECURSIVE_CLEAN_TARGETS) \ -+ $(am__extra_recursive_targets) -+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ - distdir -+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -+# Read a list of newline-separated strings from the standard input, -+# and print each of them once, without duplicates. Input order is -+# *not* preserved. -+am__uniquify_input = $(AWK) '\ -+ BEGIN { nonempty = 0; } \ -+ { items[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in items) print i; }; } \ -+' -+# Make sure the list of sources is unique. This is necessary because, -+# e.g., the same source file might be shared among _SOURCES variables -+# for different programs/libraries. -+am__define_uniq_tagged_files = \ -+ list='$(am__tagged_files)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | $(am__uniquify_input)` - ETAGS = etags - CTAGS = ctags - DIST_SUBDIRS = $(SUBDIRS) -@@ -94,6 +176,7 @@ am__relativize = \ - reldir="$$dir2" - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ -+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ -@@ -114,6 +197,7 @@ CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DISABLELIBHARU = @DISABLELIBHARU@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -141,6 +225,7 @@ LOCAL_INCS = @LOCAL_INCS@ - LOCAL_LIBS = @LOCAL_LIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - NM = @NM@ - NMEDIT = @NMEDIT@ -@@ -153,6 +238,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - POW_LIB = @POW_LIB@ -@@ -178,6 +264,7 @@ abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -@@ -211,7 +298,6 @@ libdir = @libdir@ - libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -@@ -273,22 +359,25 @@ clean-libtool: - -rm -rf .libs _libs - - # This directory's subdirectories are mostly independent; you can cd --# into them and run `make' without going through this Makefile. --# To change the values of `make' variables: instead of editing Makefiles, --# (1) if the variable is set in `config.status', edit `config.status' --# (which will cause the Makefiles to be regenerated when you run `make'); --# (2) otherwise, pass the desired values on the `make' command line. --$(RECURSIVE_TARGETS): -- @fail= failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -+# into them and run 'make' without going through this Makefile. -+# To change the values of 'make' variables: instead of editing Makefiles, -+# (1) if the variable is set in 'config.status', edit 'config.status' -+# (which will cause the Makefiles to be regenerated when you run 'make'); -+# (2) otherwise, pass the desired values on the 'make' command line. -+$(am__recursive_targets): -+ @fail=; \ -+ if $(am__make_keepgoing); then \ -+ failcom='fail=yes'; \ -+ else \ -+ failcom='exit 1'; \ -+ fi; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ -- list='$(SUBDIRS)'; for subdir in $$list; do \ -+ case "$@" in \ -+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -+ *) list='$(SUBDIRS)' ;; \ -+ esac; \ -+ for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ -@@ -303,57 +392,12 @@ $(RECURSIVE_TARGETS): - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - --$(RECURSIVE_CLEAN_TARGETS): -- @fail= failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -- dot_seen=no; \ -- case "$@" in \ -- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -- *) list='$(SUBDIRS)' ;; \ -- esac; \ -- rev=''; for subdir in $$list; do \ -- if test "$$subdir" = "."; then :; else \ -- rev="$$subdir $$rev"; \ -- fi; \ -- done; \ -- rev="$$rev ."; \ -- target=`echo $@ | sed s/-recursive//`; \ -- for subdir in $$rev; do \ -- echo "Making $$target in $$subdir"; \ -- if test "$$subdir" = "."; then \ -- local_target="$$target-am"; \ -- else \ -- local_target="$$target"; \ -- fi; \ -- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || eval $$failcom; \ -- done && test -z "$$fail" --tags-recursive: -- list='$(SUBDIRS)'; for subdir in $$list; do \ -- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ -- done --ctags-recursive: -- list='$(SUBDIRS)'; for subdir in $$list; do \ -- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ -- done -+ID: $(am__tagged_files) -+ $(am__define_uniq_tagged_files); mkid -fID $$unique -+tags: tags-recursive -+TAGS: tags - --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ - if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ -@@ -369,12 +413,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ -@@ -386,15 +425,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $$unique; \ - fi; \ - fi --ctags: CTAGS --CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ctags: ctags-recursive -+ -+CTAGS: ctags -+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) -+ $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique -@@ -403,6 +438,21 @@ GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -+cscopelist: cscopelist-recursive -+ -+cscopelist-am: $(am__tagged_files) -+ list='$(am__tagged_files)'; \ -+ case "$(srcdir)" in \ -+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ -+ *) sdir=$(subdir)/$(srcdir) ;; \ -+ esac; \ -+ for i in $$list; do \ -+ if test -f "$$i"; then \ -+ echo "$(subdir)/$$i"; \ -+ else \ -+ echo "$$sdir/$$i"; \ -+ fi; \ -+ done >> $(top_builddir)/cscope.files - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -@@ -439,13 +489,10 @@ distdir: $(DISTFILES) - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test -d "$(distdir)/$$subdir" \ -- || $(MKDIR_P) "$(distdir)/$$subdir" \ -- || exit 1; \ -- fi; \ -- done -- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ -- if test "$$subdir" = .; then :; else \ -+ $(am__make_dryrun) \ -+ || test -d "$(distdir)/$$subdir" \ -+ || $(MKDIR_P) "$(distdir)/$$subdir" \ -+ || exit 1; \ - dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ - $(am__relativize); \ - new_distdir=$$reldir; \ -@@ -480,10 +527,15 @@ install-am: all-am - - installcheck: installcheck-recursive - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+ if test -z '$(STRIP)'; then \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ install; \ -+ else \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -+ fi - mostlyclean-generic: - - clean-generic: -@@ -561,22 +613,20 @@ ps-am: - - uninstall-am: - --.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ -- install-am install-strip tags-recursive -- --.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ -- all all-am check check-am clean clean-generic clean-libtool \ -- ctags ctags-recursive distclean distclean-generic \ -- distclean-libtool distclean-tags distdir dvi dvi-am html \ -- html-am info info-am install install-am install-data \ -- install-data-am install-dvi install-dvi-am install-exec \ -- install-exec-am install-html install-html-am install-info \ -- install-info-am install-man install-pdf install-pdf-am \ -- install-ps install-ps-am install-strip installcheck \ -- installcheck-am installdirs installdirs-am maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-generic \ -- mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ -- uninstall uninstall-am -+.MAKE: $(am__recursive_targets) install-am install-strip -+ -+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ -+ check-am clean clean-generic clean-libtool cscopelist-am ctags \ -+ ctags-am distclean distclean-generic distclean-libtool \ -+ distclean-tags distdir dvi dvi-am html html-am info info-am \ -+ install install-am install-data install-data-am install-dvi \ -+ install-dvi-am install-exec install-exec-am install-html \ -+ install-html-am install-info install-info-am install-man \ -+ install-pdf install-pdf-am install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ installdirs-am maintainer-clean maintainer-clean-generic \ -+ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ -+ ps ps-am tags tags-am uninstall uninstall-am - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff --git a/src/modules/climate/climate_tools/Makefile.in b/src/modules/climate/climate_tools/Makefile.in -index a5a2bb7..32026e9 100644 ---- a/src/modules/climate/climate_tools/Makefile.in -+++ b/src/modules/climate/climate_tools/Makefile.in -@@ -1,9 +1,8 @@ --# Makefile.in generated by automake 1.11.1 from Makefile.am. -+# Makefile.in generated by automake 1.14 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, --# Inc. -+# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+ - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -16,6 +15,51 @@ - @SET_MAKE@ - - VPATH = @srcdir@ -+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -+am__make_running_with_option = \ -+ case $${target_option-} in \ -+ ?) ;; \ -+ *) echo "am__make_running_with_option: internal error: invalid" \ -+ "target option '$${target_option-}' specified" >&2; \ -+ exit 1;; \ -+ esac; \ -+ has_opt=no; \ -+ sane_makeflags=$$MAKEFLAGS; \ -+ if $(am__is_gnu_make); then \ -+ sane_makeflags=$$MFLAGS; \ -+ else \ -+ case $$MAKEFLAGS in \ -+ *\\[\ \ ]*) \ -+ bs=\\; \ -+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -+ esac; \ -+ fi; \ -+ skip_next=no; \ -+ strip_trailopt () \ -+ { \ -+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -+ }; \ -+ for flg in $$sane_makeflags; do \ -+ test $$skip_next = yes && { skip_next=no; continue; }; \ -+ case $$flg in \ -+ *=*|--*) continue;; \ -+ -*I) strip_trailopt 'I'; skip_next=yes;; \ -+ -*I?*) strip_trailopt 'I';; \ -+ -*O) strip_trailopt 'O'; skip_next=yes;; \ -+ -*O?*) strip_trailopt 'O';; \ -+ -*l) strip_trailopt 'l'; skip_next=yes;; \ -+ -*l?*) strip_trailopt 'l';; \ -+ -[dEDm]) skip_next=yes;; \ -+ -[JT]) skip_next=yes;; \ -+ esac; \ -+ case $$flg in \ -+ *$$target_option*) has_opt=yes; break;; \ -+ esac; \ -+ done; \ -+ test $$has_opt = yes -+am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -+am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -35,7 +79,8 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - subdir = src/modules/climate/climate_tools --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ -+ $(top_srcdir)/depcomp - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ - $(top_srcdir)/m4/ax_python_devel.m4 \ -@@ -71,6 +116,12 @@ am__nobase_list = $(am__nobase_strip_setup); \ - am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -+am__uninstall_files_from_dir = { \ -+ test -z "$$files" \ -+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ -+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ -+ $(am__cd) "$$dir" && rm -f $$files; }; \ -+ } - am__installdirs = "$(DESTDIR)$(pkglibdir)" - LTLIBRARIES = $(pkglib_LTLIBRARIES) - libclimate_tools_la_DEPENDENCIES = \ -@@ -78,35 +129,92 @@ libclimate_tools_la_DEPENDENCIES = \ - am_libclimate_tools_la_OBJECTS = etp_hargreave.lo \ - grid_levels_interpolation.lo milankovic.lo MLB_Interface.lo - libclimate_tools_la_OBJECTS = $(am_libclimate_tools_la_OBJECTS) -+AM_V_lt = $(am__v_lt_@AM_V@) -+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -+am__v_lt_0 = --silent -+am__v_lt_1 = -+AM_V_P = $(am__v_P_@AM_V@) -+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -+am__v_P_0 = false -+am__v_P_1 = : -+AM_V_GEN = $(am__v_GEN_@AM_V@) -+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+am__v_GEN_0 = @echo " GEN " $@; -+am__v_GEN_1 = -+AM_V_at = $(am__v_at_@AM_V@) -+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+am__v_at_0 = @ -+am__v_at_1 = - DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - am__mv = mv -f - CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) --LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CXXFLAGS) $(CXXFLAGS) -+AM_V_CXX = $(am__v_CXX_@AM_V@) -+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) -+am__v_CXX_0 = @echo " CXX " $@; -+am__v_CXX_1 = - CXXLD = $(CXX) --CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ -+ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) -+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) -+am__v_CXXLD_0 = @echo " CXXLD " $@; -+am__v_CXXLD_1 = - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CFLAGS) $(CFLAGS) -+AM_V_CC = $(am__v_CC_@AM_V@) -+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -+am__v_CC_0 = @echo " CC " $@; -+am__v_CC_1 = - CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CCLD = $(am__v_CCLD_@AM_V@) -+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -+am__v_CCLD_0 = @echo " CCLD " $@; -+am__v_CCLD_1 = - SOURCES = $(libclimate_tools_la_SOURCES) - DIST_SOURCES = $(libclimate_tools_la_SOURCES) -+am__can_run_installinfo = \ -+ case $$AM_UPDATE_INFO_DIR in \ -+ n|no|NO) false;; \ -+ *) (install-info --version) >/dev/null 2>&1;; \ -+ esac -+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -+# Read a list of newline-separated strings from the standard input, -+# and print each of them once, without duplicates. Input order is -+# *not* preserved. -+am__uniquify_input = $(AWK) '\ -+ BEGIN { nonempty = 0; } \ -+ { items[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in items) print i; }; } \ -+' -+# Make sure the list of sources is unique. This is necessary because, -+# e.g., the same source file might be shared among _SOURCES variables -+# for different programs/libraries. -+am__define_uniq_tagged_files = \ -+ list='$(am__tagged_files)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | $(am__uniquify_input)` - ETAGS = etags - CTAGS = ctags - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ -+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ -@@ -127,6 +235,7 @@ CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DISABLELIBHARU = @DISABLELIBHARU@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -154,6 +263,7 @@ LOCAL_INCS = @LOCAL_INCS@ - LOCAL_LIBS = @LOCAL_LIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - NM = @NM@ - NMEDIT = @NMEDIT@ -@@ -166,6 +276,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - POW_LIB = @POW_LIB@ -@@ -191,6 +302,7 @@ abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -@@ -224,7 +336,6 @@ libdir = @libdir@ - libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -@@ -300,9 +411,9 @@ $(top_srcdir)/configure: $(am__configure_deps) - $(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - $(am__aclocal_m4_deps): -+ - install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" - @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ - list2=; for p in $$list; do \ - if test -f $$p; then \ -@@ -310,6 +421,8 @@ install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - else :; fi; \ - done; \ - test -z "$$list2" || { \ -+ echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \ -+ $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \ - } -@@ -325,14 +438,17 @@ uninstall-pkglibLTLIBRARIES: - - clean-pkglibLTLIBRARIES: - -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES) -- @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \ -- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -- echo "rm -f \"$${dir}/so_locations\""; \ -- rm -f "$${dir}/so_locations"; \ -- done --libclimate_tools.la: $(libclimate_tools_la_OBJECTS) $(libclimate_tools_la_DEPENDENCIES) -- $(CXXLINK) -rpath $(pkglibdir) $(libclimate_tools_la_OBJECTS) $(libclimate_tools_la_LIBADD) $(LIBS) -+ @list='$(pkglib_LTLIBRARIES)'; \ -+ locs=`for p in $$list; do echo $$p; done | \ -+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ -+ sort -u`; \ -+ test -z "$$locs" || { \ -+ echo rm -f $${locs}; \ -+ rm -f $${locs}; \ -+ } -+ -+libclimate_tools.la: $(libclimate_tools_la_OBJECTS) $(libclimate_tools_la_DEPENDENCIES) $(EXTRA_libclimate_tools_la_DEPENDENCIES) -+ $(AM_V_CXXLD)$(CXXLINK) -rpath $(pkglibdir) $(libclimate_tools_la_OBJECTS) $(libclimate_tools_la_LIBADD) $(LIBS) - - mostlyclean-compile: - -rm -f *.$(OBJEXT) -@@ -346,25 +462,25 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/milankovic.Plo@am__quote@ - - .cpp.o: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< - - .cpp.obj: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - - .cpp.lo: --@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< - - mostlyclean-libtool: - -rm -f *.lo -@@ -372,26 +488,15 @@ mostlyclean-libtool: - clean-libtool: - -rm -rf .libs _libs - --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -+ID: $(am__tagged_files) -+ $(am__define_uniq_tagged_files); mkid -fID $$unique -+tags: tags-am -+TAGS: tags -+ -+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ -@@ -403,15 +508,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $$unique; \ - fi; \ - fi --ctags: CTAGS --CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ctags: ctags-am -+ -+CTAGS: ctags -+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) -+ $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique -@@ -420,6 +521,21 @@ GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -+cscopelist: cscopelist-am -+ -+cscopelist-am: $(am__tagged_files) -+ list='$(am__tagged_files)'; \ -+ case "$(srcdir)" in \ -+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ -+ *) sdir=$(subdir)/$(srcdir) ;; \ -+ esac; \ -+ for i in $$list; do \ -+ if test -f "$$i"; then \ -+ echo "$(subdir)/$$i"; \ -+ else \ -+ echo "$$sdir/$$i"; \ -+ fi; \ -+ done >> $(top_builddir)/cscope.files - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -@@ -471,10 +587,15 @@ install-am: all-am - - installcheck: installcheck-am - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+ if test -z '$(STRIP)'; then \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ install; \ -+ else \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -+ fi - mostlyclean-generic: - - clean-generic: -@@ -559,19 +680,20 @@ uninstall-am: uninstall-pkglibLTLIBRARIES - - .MAKE: install-am install-strip - --.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ -- clean-libtool clean-pkglibLTLIBRARIES ctags distclean \ -- distclean-compile distclean-generic distclean-libtool \ -- distclean-tags distdir dvi dvi-am html html-am info info-am \ -- install install-am install-data install-data-am install-dvi \ -- install-dvi-am install-exec install-exec-am install-html \ -- install-html-am install-info install-info-am install-man \ -- install-pdf install-pdf-am install-pkglibLTLIBRARIES \ -- install-ps install-ps-am install-strip installcheck \ -- installcheck-am installdirs maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-compile \ -- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -- tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES -+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ -+ clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \ -+ ctags-am distclean distclean-compile distclean-generic \ -+ distclean-libtool distclean-tags distdir dvi dvi-am html \ -+ html-am info info-am install install-am install-data \ -+ install-data-am install-dvi install-dvi-am install-exec \ -+ install-exec-am install-html install-html-am install-info \ -+ install-info-am install-man install-pdf install-pdf-am \ -+ install-pkglibLTLIBRARIES install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ maintainer-clean maintainer-clean-generic mostlyclean \ -+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ -+ pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ -+ uninstall-pkglibLTLIBRARIES - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff --git a/src/modules/grid/Makefile.in b/src/modules/grid/Makefile.in -index d8934fc..3528fa0 100644 ---- a/src/modules/grid/Makefile.in -+++ b/src/modules/grid/Makefile.in -@@ -1,9 +1,8 @@ --# Makefile.in generated by automake 1.11.1 from Makefile.am. -+# Makefile.in generated by automake 1.14 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, --# Inc. -+# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+ - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -15,6 +14,51 @@ - - @SET_MAKE@ - VPATH = @srcdir@ -+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -+am__make_running_with_option = \ -+ case $${target_option-} in \ -+ ?) ;; \ -+ *) echo "am__make_running_with_option: internal error: invalid" \ -+ "target option '$${target_option-}' specified" >&2; \ -+ exit 1;; \ -+ esac; \ -+ has_opt=no; \ -+ sane_makeflags=$$MAKEFLAGS; \ -+ if $(am__is_gnu_make); then \ -+ sane_makeflags=$$MFLAGS; \ -+ else \ -+ case $$MAKEFLAGS in \ -+ *\\[\ \ ]*) \ -+ bs=\\; \ -+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -+ esac; \ -+ fi; \ -+ skip_next=no; \ -+ strip_trailopt () \ -+ { \ -+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -+ }; \ -+ for flg in $$sane_makeflags; do \ -+ test $$skip_next = yes && { skip_next=no; continue; }; \ -+ case $$flg in \ -+ *=*|--*) continue;; \ -+ -*I) strip_trailopt 'I'; skip_next=yes;; \ -+ -*I?*) strip_trailopt 'I';; \ -+ -*O) strip_trailopt 'O'; skip_next=yes;; \ -+ -*O?*) strip_trailopt 'O';; \ -+ -*l) strip_trailopt 'l'; skip_next=yes;; \ -+ -*l?*) strip_trailopt 'l';; \ -+ -[dEDm]) skip_next=yes;; \ -+ -[JT]) skip_next=yes;; \ -+ esac; \ -+ case $$flg in \ -+ *$$target_option*) has_opt=yes; break;; \ -+ esac; \ -+ done; \ -+ test $$has_opt = yes -+am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -+am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -34,7 +78,7 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - subdir = src/modules/grid --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ - $(top_srcdir)/m4/ax_python_devel.m4 \ -@@ -49,20 +93,58 @@ mkinstalldirs = $(install_sh) -d - CONFIG_HEADER = $(top_builddir)/config.h - CONFIG_CLEAN_FILES = - CONFIG_CLEAN_VPATH_FILES = -+AM_V_P = $(am__v_P_@AM_V@) -+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -+am__v_P_0 = false -+am__v_P_1 = : -+AM_V_GEN = $(am__v_GEN_@AM_V@) -+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+am__v_GEN_0 = @echo " GEN " $@; -+am__v_GEN_1 = -+AM_V_at = $(am__v_at_@AM_V@) -+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+am__v_at_0 = @ -+am__v_at_1 = - SOURCES = - DIST_SOURCES = --RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ -- html-recursive info-recursive install-data-recursive \ -- install-dvi-recursive install-exec-recursive \ -- install-html-recursive install-info-recursive \ -- install-pdf-recursive install-ps-recursive install-recursive \ -- installcheck-recursive installdirs-recursive pdf-recursive \ -- ps-recursive uninstall-recursive -+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ -+ ctags-recursive dvi-recursive html-recursive info-recursive \ -+ install-data-recursive install-dvi-recursive \ -+ install-exec-recursive install-html-recursive \ -+ install-info-recursive install-pdf-recursive \ -+ install-ps-recursive install-recursive installcheck-recursive \ -+ installdirs-recursive pdf-recursive ps-recursive \ -+ tags-recursive uninstall-recursive -+am__can_run_installinfo = \ -+ case $$AM_UPDATE_INFO_DIR in \ -+ n|no|NO) false;; \ -+ *) (install-info --version) >/dev/null 2>&1;; \ -+ esac - RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ - distclean-recursive maintainer-clean-recursive --AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ -- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ -+am__recursive_targets = \ -+ $(RECURSIVE_TARGETS) \ -+ $(RECURSIVE_CLEAN_TARGETS) \ -+ $(am__extra_recursive_targets) -+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ - distdir -+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -+# Read a list of newline-separated strings from the standard input, -+# and print each of them once, without duplicates. Input order is -+# *not* preserved. -+am__uniquify_input = $(AWK) '\ -+ BEGIN { nonempty = 0; } \ -+ { items[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in items) print i; }; } \ -+' -+# Make sure the list of sources is unique. This is necessary because, -+# e.g., the same source file might be shared among _SOURCES variables -+# for different programs/libraries. -+am__define_uniq_tagged_files = \ -+ list='$(am__tagged_files)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | $(am__uniquify_input)` - ETAGS = etags - CTAGS = ctags - DIST_SUBDIRS = $(SUBDIRS) -@@ -94,6 +176,7 @@ am__relativize = \ - reldir="$$dir2" - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ -+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ -@@ -114,6 +197,7 @@ CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DISABLELIBHARU = @DISABLELIBHARU@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -141,6 +225,7 @@ LOCAL_INCS = @LOCAL_INCS@ - LOCAL_LIBS = @LOCAL_LIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - NM = @NM@ - NMEDIT = @NMEDIT@ -@@ -153,6 +238,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - POW_LIB = @POW_LIB@ -@@ -178,6 +264,7 @@ abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -@@ -211,7 +298,6 @@ libdir = @libdir@ - libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -@@ -273,22 +359,25 @@ clean-libtool: - -rm -rf .libs _libs - - # This directory's subdirectories are mostly independent; you can cd --# into them and run `make' without going through this Makefile. --# To change the values of `make' variables: instead of editing Makefiles, --# (1) if the variable is set in `config.status', edit `config.status' --# (which will cause the Makefiles to be regenerated when you run `make'); --# (2) otherwise, pass the desired values on the `make' command line. --$(RECURSIVE_TARGETS): -- @fail= failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -+# into them and run 'make' without going through this Makefile. -+# To change the values of 'make' variables: instead of editing Makefiles, -+# (1) if the variable is set in 'config.status', edit 'config.status' -+# (which will cause the Makefiles to be regenerated when you run 'make'); -+# (2) otherwise, pass the desired values on the 'make' command line. -+$(am__recursive_targets): -+ @fail=; \ -+ if $(am__make_keepgoing); then \ -+ failcom='fail=yes'; \ -+ else \ -+ failcom='exit 1'; \ -+ fi; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ -- list='$(SUBDIRS)'; for subdir in $$list; do \ -+ case "$@" in \ -+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -+ *) list='$(SUBDIRS)' ;; \ -+ esac; \ -+ for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ -@@ -303,57 +392,12 @@ $(RECURSIVE_TARGETS): - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - --$(RECURSIVE_CLEAN_TARGETS): -- @fail= failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -- dot_seen=no; \ -- case "$@" in \ -- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -- *) list='$(SUBDIRS)' ;; \ -- esac; \ -- rev=''; for subdir in $$list; do \ -- if test "$$subdir" = "."; then :; else \ -- rev="$$subdir $$rev"; \ -- fi; \ -- done; \ -- rev="$$rev ."; \ -- target=`echo $@ | sed s/-recursive//`; \ -- for subdir in $$rev; do \ -- echo "Making $$target in $$subdir"; \ -- if test "$$subdir" = "."; then \ -- local_target="$$target-am"; \ -- else \ -- local_target="$$target"; \ -- fi; \ -- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || eval $$failcom; \ -- done && test -z "$$fail" --tags-recursive: -- list='$(SUBDIRS)'; for subdir in $$list; do \ -- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ -- done --ctags-recursive: -- list='$(SUBDIRS)'; for subdir in $$list; do \ -- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ -- done -+ID: $(am__tagged_files) -+ $(am__define_uniq_tagged_files); mkid -fID $$unique -+tags: tags-recursive -+TAGS: tags - --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ - if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ -@@ -369,12 +413,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ -@@ -386,15 +425,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $$unique; \ - fi; \ - fi --ctags: CTAGS --CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ctags: ctags-recursive -+ -+CTAGS: ctags -+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) -+ $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique -@@ -403,6 +438,21 @@ GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -+cscopelist: cscopelist-recursive -+ -+cscopelist-am: $(am__tagged_files) -+ list='$(am__tagged_files)'; \ -+ case "$(srcdir)" in \ -+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ -+ *) sdir=$(subdir)/$(srcdir) ;; \ -+ esac; \ -+ for i in $$list; do \ -+ if test -f "$$i"; then \ -+ echo "$(subdir)/$$i"; \ -+ else \ -+ echo "$$sdir/$$i"; \ -+ fi; \ -+ done >> $(top_builddir)/cscope.files - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -@@ -439,13 +489,10 @@ distdir: $(DISTFILES) - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test -d "$(distdir)/$$subdir" \ -- || $(MKDIR_P) "$(distdir)/$$subdir" \ -- || exit 1; \ -- fi; \ -- done -- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ -- if test "$$subdir" = .; then :; else \ -+ $(am__make_dryrun) \ -+ || test -d "$(distdir)/$$subdir" \ -+ || $(MKDIR_P) "$(distdir)/$$subdir" \ -+ || exit 1; \ - dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ - $(am__relativize); \ - new_distdir=$$reldir; \ -@@ -480,10 +527,15 @@ install-am: all-am - - installcheck: installcheck-recursive - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+ if test -z '$(STRIP)'; then \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ install; \ -+ else \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -+ fi - mostlyclean-generic: - - clean-generic: -@@ -561,22 +613,20 @@ ps-am: - - uninstall-am: - --.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ -- install-am install-strip tags-recursive -- --.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ -- all all-am check check-am clean clean-generic clean-libtool \ -- ctags ctags-recursive distclean distclean-generic \ -- distclean-libtool distclean-tags distdir dvi dvi-am html \ -- html-am info info-am install install-am install-data \ -- install-data-am install-dvi install-dvi-am install-exec \ -- install-exec-am install-html install-html-am install-info \ -- install-info-am install-man install-pdf install-pdf-am \ -- install-ps install-ps-am install-strip installcheck \ -- installcheck-am installdirs installdirs-am maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-generic \ -- mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ -- uninstall uninstall-am -+.MAKE: $(am__recursive_targets) install-am install-strip -+ -+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ -+ check-am clean clean-generic clean-libtool cscopelist-am ctags \ -+ ctags-am distclean distclean-generic distclean-libtool \ -+ distclean-tags distdir dvi dvi-am html html-am info info-am \ -+ install install-am install-data install-data-am install-dvi \ -+ install-dvi-am install-exec install-exec-am install-html \ -+ install-html-am install-info install-info-am install-man \ -+ install-pdf install-pdf-am install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ installdirs-am maintainer-clean maintainer-clean-generic \ -+ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ -+ ps ps-am tags tags-am uninstall uninstall-am - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff --git a/src/modules/grid/grid_analysis/Makefile.in b/src/modules/grid/grid_analysis/Makefile.in -index 02a9d55..0e010fa 100644 ---- a/src/modules/grid/grid_analysis/Makefile.in -+++ b/src/modules/grid/grid_analysis/Makefile.in -@@ -1,9 +1,8 @@ --# Makefile.in generated by automake 1.11.1 from Makefile.am. -+# Makefile.in generated by automake 1.14 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, --# Inc. -+# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+ - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -16,6 +15,51 @@ - @SET_MAKE@ - - VPATH = @srcdir@ -+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -+am__make_running_with_option = \ -+ case $${target_option-} in \ -+ ?) ;; \ -+ *) echo "am__make_running_with_option: internal error: invalid" \ -+ "target option '$${target_option-}' specified" >&2; \ -+ exit 1;; \ -+ esac; \ -+ has_opt=no; \ -+ sane_makeflags=$$MAKEFLAGS; \ -+ if $(am__is_gnu_make); then \ -+ sane_makeflags=$$MFLAGS; \ -+ else \ -+ case $$MAKEFLAGS in \ -+ *\\[\ \ ]*) \ -+ bs=\\; \ -+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -+ esac; \ -+ fi; \ -+ skip_next=no; \ -+ strip_trailopt () \ -+ { \ -+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -+ }; \ -+ for flg in $$sane_makeflags; do \ -+ test $$skip_next = yes && { skip_next=no; continue; }; \ -+ case $$flg in \ -+ *=*|--*) continue;; \ -+ -*I) strip_trailopt 'I'; skip_next=yes;; \ -+ -*I?*) strip_trailopt 'I';; \ -+ -*O) strip_trailopt 'O'; skip_next=yes;; \ -+ -*O?*) strip_trailopt 'O';; \ -+ -*l) strip_trailopt 'l'; skip_next=yes;; \ -+ -*l?*) strip_trailopt 'l';; \ -+ -[dEDm]) skip_next=yes;; \ -+ -[JT]) skip_next=yes;; \ -+ esac; \ -+ case $$flg in \ -+ *$$target_option*) has_opt=yes; break;; \ -+ esac; \ -+ done; \ -+ test $$has_opt = yes -+am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -+am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -35,7 +79,8 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - subdir = src/modules/grid/grid_analysis --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ -+ $(top_srcdir)/depcomp - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ - $(top_srcdir)/m4/ax_python_devel.m4 \ -@@ -71,6 +116,12 @@ am__nobase_list = $(am__nobase_strip_setup); \ - am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -+am__uninstall_files_from_dir = { \ -+ test -z "$$files" \ -+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ -+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ -+ $(am__cd) "$$dir" && rm -f $$files; }; \ -+ } - am__installdirs = "$(DESTDIR)$(pkglibdir)" - LTLIBRARIES = $(pkglib_LTLIBRARIES) - libgrid_analysis_la_DEPENDENCIES = \ -@@ -85,35 +136,92 @@ am_libgrid_analysis_la_OBJECTS = Cost_Anisotropic.lo Cost_Isotropic.lo \ - LeastCostPathProfile.lo LeastCostPathProfile_Points.lo \ - MLB_Interface.lo owa.lo PointsEx.lo Soil_Texture.lo - libgrid_analysis_la_OBJECTS = $(am_libgrid_analysis_la_OBJECTS) -+AM_V_lt = $(am__v_lt_@AM_V@) -+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -+am__v_lt_0 = --silent -+am__v_lt_1 = -+AM_V_P = $(am__v_P_@AM_V@) -+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -+am__v_P_0 = false -+am__v_P_1 = : -+AM_V_GEN = $(am__v_GEN_@AM_V@) -+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+am__v_GEN_0 = @echo " GEN " $@; -+am__v_GEN_1 = -+AM_V_at = $(am__v_at_@AM_V@) -+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+am__v_at_0 = @ -+am__v_at_1 = - DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - am__mv = mv -f - CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) --LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CXXFLAGS) $(CXXFLAGS) -+AM_V_CXX = $(am__v_CXX_@AM_V@) -+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) -+am__v_CXX_0 = @echo " CXX " $@; -+am__v_CXX_1 = - CXXLD = $(CXX) --CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ -+ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) -+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) -+am__v_CXXLD_0 = @echo " CXXLD " $@; -+am__v_CXXLD_1 = - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CFLAGS) $(CFLAGS) -+AM_V_CC = $(am__v_CC_@AM_V@) -+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -+am__v_CC_0 = @echo " CC " $@; -+am__v_CC_1 = - CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CCLD = $(am__v_CCLD_@AM_V@) -+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -+am__v_CCLD_0 = @echo " CCLD " $@; -+am__v_CCLD_1 = - SOURCES = $(libgrid_analysis_la_SOURCES) - DIST_SOURCES = $(libgrid_analysis_la_SOURCES) -+am__can_run_installinfo = \ -+ case $$AM_UPDATE_INFO_DIR in \ -+ n|no|NO) false;; \ -+ *) (install-info --version) >/dev/null 2>&1;; \ -+ esac -+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -+# Read a list of newline-separated strings from the standard input, -+# and print each of them once, without duplicates. Input order is -+# *not* preserved. -+am__uniquify_input = $(AWK) '\ -+ BEGIN { nonempty = 0; } \ -+ { items[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in items) print i; }; } \ -+' -+# Make sure the list of sources is unique. This is necessary because, -+# e.g., the same source file might be shared among _SOURCES variables -+# for different programs/libraries. -+am__define_uniq_tagged_files = \ -+ list='$(am__tagged_files)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | $(am__uniquify_input)` - ETAGS = etags - CTAGS = ctags - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ -+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ -@@ -134,6 +242,7 @@ CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DISABLELIBHARU = @DISABLELIBHARU@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -161,6 +270,7 @@ LOCAL_INCS = @LOCAL_INCS@ - LOCAL_LIBS = @LOCAL_LIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - NM = @NM@ - NMEDIT = @NMEDIT@ -@@ -173,6 +283,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - POW_LIB = @POW_LIB@ -@@ -198,6 +309,7 @@ abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -@@ -231,7 +343,6 @@ libdir = @libdir@ - libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -@@ -341,9 +452,9 @@ $(top_srcdir)/configure: $(am__configure_deps) - $(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - $(am__aclocal_m4_deps): -+ - install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" - @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ - list2=; for p in $$list; do \ - if test -f $$p; then \ -@@ -351,6 +462,8 @@ install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - else :; fi; \ - done; \ - test -z "$$list2" || { \ -+ echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \ -+ $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \ - } -@@ -366,14 +479,17 @@ uninstall-pkglibLTLIBRARIES: - - clean-pkglibLTLIBRARIES: - -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES) -- @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \ -- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -- echo "rm -f \"$${dir}/so_locations\""; \ -- rm -f "$${dir}/so_locations"; \ -- done --libgrid_analysis.la: $(libgrid_analysis_la_OBJECTS) $(libgrid_analysis_la_DEPENDENCIES) -- $(CXXLINK) -rpath $(pkglibdir) $(libgrid_analysis_la_OBJECTS) $(libgrid_analysis_la_LIBADD) $(LIBS) -+ @list='$(pkglib_LTLIBRARIES)'; \ -+ locs=`for p in $$list; do echo $$p; done | \ -+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ -+ sort -u`; \ -+ test -z "$$locs" || { \ -+ echo rm -f $${locs}; \ -+ rm -f $${locs}; \ -+ } -+ -+libgrid_analysis.la: $(libgrid_analysis_la_OBJECTS) $(libgrid_analysis_la_DEPENDENCIES) $(EXTRA_libgrid_analysis_la_DEPENDENCIES) -+ $(AM_V_CXXLD)$(CXXLINK) -rpath $(pkglibdir) $(libgrid_analysis_la_OBJECTS) $(libgrid_analysis_la_LIBADD) $(LIBS) - - mostlyclean-compile: - -rm -f *.$(OBJEXT) -@@ -404,25 +520,25 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/owa.Plo@am__quote@ - - .cpp.o: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< - - .cpp.obj: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - - .cpp.lo: --@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< - - mostlyclean-libtool: - -rm -f *.lo -@@ -430,26 +546,15 @@ mostlyclean-libtool: - clean-libtool: - -rm -rf .libs _libs - --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -+ID: $(am__tagged_files) -+ $(am__define_uniq_tagged_files); mkid -fID $$unique -+tags: tags-am -+TAGS: tags -+ -+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ -@@ -461,15 +566,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $$unique; \ - fi; \ - fi --ctags: CTAGS --CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ctags: ctags-am -+ -+CTAGS: ctags -+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) -+ $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique -@@ -478,6 +579,21 @@ GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -+cscopelist: cscopelist-am -+ -+cscopelist-am: $(am__tagged_files) -+ list='$(am__tagged_files)'; \ -+ case "$(srcdir)" in \ -+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ -+ *) sdir=$(subdir)/$(srcdir) ;; \ -+ esac; \ -+ for i in $$list; do \ -+ if test -f "$$i"; then \ -+ echo "$(subdir)/$$i"; \ -+ else \ -+ echo "$$sdir/$$i"; \ -+ fi; \ -+ done >> $(top_builddir)/cscope.files - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -@@ -529,10 +645,15 @@ install-am: all-am - - installcheck: installcheck-am - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+ if test -z '$(STRIP)'; then \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ install; \ -+ else \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -+ fi - mostlyclean-generic: - - clean-generic: -@@ -617,19 +738,20 @@ uninstall-am: uninstall-pkglibLTLIBRARIES - - .MAKE: install-am install-strip - --.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ -- clean-libtool clean-pkglibLTLIBRARIES ctags distclean \ -- distclean-compile distclean-generic distclean-libtool \ -- distclean-tags distdir dvi dvi-am html html-am info info-am \ -- install install-am install-data install-data-am install-dvi \ -- install-dvi-am install-exec install-exec-am install-html \ -- install-html-am install-info install-info-am install-man \ -- install-pdf install-pdf-am install-pkglibLTLIBRARIES \ -- install-ps install-ps-am install-strip installcheck \ -- installcheck-am installdirs maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-compile \ -- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -- tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES -+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ -+ clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \ -+ ctags-am distclean distclean-compile distclean-generic \ -+ distclean-libtool distclean-tags distdir dvi dvi-am html \ -+ html-am info info-am install install-am install-data \ -+ install-data-am install-dvi install-dvi-am install-exec \ -+ install-exec-am install-html install-html-am install-info \ -+ install-info-am install-man install-pdf install-pdf-am \ -+ install-pkglibLTLIBRARIES install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ maintainer-clean maintainer-clean-generic mostlyclean \ -+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ -+ pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ -+ uninstall-pkglibLTLIBRARIES - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff --git a/src/modules/grid/grid_calculus/Makefile.in b/src/modules/grid/grid_calculus/Makefile.in -index ed191a0..d335520 100644 ---- a/src/modules/grid/grid_calculus/Makefile.in -+++ b/src/modules/grid/grid_calculus/Makefile.in -@@ -1,9 +1,8 @@ --# Makefile.in generated by automake 1.11.1 from Makefile.am. -+# Makefile.in generated by automake 1.14 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, --# Inc. -+# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+ - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -16,6 +15,51 @@ - @SET_MAKE@ - - VPATH = @srcdir@ -+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -+am__make_running_with_option = \ -+ case $${target_option-} in \ -+ ?) ;; \ -+ *) echo "am__make_running_with_option: internal error: invalid" \ -+ "target option '$${target_option-}' specified" >&2; \ -+ exit 1;; \ -+ esac; \ -+ has_opt=no; \ -+ sane_makeflags=$$MAKEFLAGS; \ -+ if $(am__is_gnu_make); then \ -+ sane_makeflags=$$MFLAGS; \ -+ else \ -+ case $$MAKEFLAGS in \ -+ *\\[\ \ ]*) \ -+ bs=\\; \ -+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -+ esac; \ -+ fi; \ -+ skip_next=no; \ -+ strip_trailopt () \ -+ { \ -+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -+ }; \ -+ for flg in $$sane_makeflags; do \ -+ test $$skip_next = yes && { skip_next=no; continue; }; \ -+ case $$flg in \ -+ *=*|--*) continue;; \ -+ -*I) strip_trailopt 'I'; skip_next=yes;; \ -+ -*I?*) strip_trailopt 'I';; \ -+ -*O) strip_trailopt 'O'; skip_next=yes;; \ -+ -*O?*) strip_trailopt 'O';; \ -+ -*l) strip_trailopt 'l'; skip_next=yes;; \ -+ -*l?*) strip_trailopt 'l';; \ -+ -[dEDm]) skip_next=yes;; \ -+ -[JT]) skip_next=yes;; \ -+ esac; \ -+ case $$flg in \ -+ *$$target_option*) has_opt=yes; break;; \ -+ esac; \ -+ done; \ -+ test $$has_opt = yes -+am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -+am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -35,7 +79,8 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - subdir = src/modules/grid/grid_calculus --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ -+ $(top_srcdir)/depcomp - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ - $(top_srcdir)/m4/ax_python_devel.m4 \ -@@ -71,6 +116,12 @@ am__nobase_list = $(am__nobase_strip_setup); \ - am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -+am__uninstall_files_from_dir = { \ -+ test -z "$$files" \ -+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ -+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ -+ $(am__cd) "$$dir" && rm -f $$files; }; \ -+ } - am__installdirs = "$(DESTDIR)$(pkglibdir)" - LTLIBRARIES = $(pkglib_LTLIBRARIES) - libgrid_calculus_la_DEPENDENCIES = \ -@@ -82,35 +133,92 @@ am_libgrid_calculus_la_OBJECTS = Fuzzify.lo FuzzyAND.lo FuzzyOR.lo \ - Grid_Random_Field.lo Grid_Random_Terrain.lo Grid_Volume.lo \ - MLB_Interface.lo - libgrid_calculus_la_OBJECTS = $(am_libgrid_calculus_la_OBJECTS) -+AM_V_lt = $(am__v_lt_@AM_V@) -+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -+am__v_lt_0 = --silent -+am__v_lt_1 = -+AM_V_P = $(am__v_P_@AM_V@) -+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -+am__v_P_0 = false -+am__v_P_1 = : -+AM_V_GEN = $(am__v_GEN_@AM_V@) -+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+am__v_GEN_0 = @echo " GEN " $@; -+am__v_GEN_1 = -+AM_V_at = $(am__v_at_@AM_V@) -+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+am__v_at_0 = @ -+am__v_at_1 = - DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - am__mv = mv -f - CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) --LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CXXFLAGS) $(CXXFLAGS) -+AM_V_CXX = $(am__v_CXX_@AM_V@) -+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) -+am__v_CXX_0 = @echo " CXX " $@; -+am__v_CXX_1 = - CXXLD = $(CXX) --CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ -+ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) -+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) -+am__v_CXXLD_0 = @echo " CXXLD " $@; -+am__v_CXXLD_1 = - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CFLAGS) $(CFLAGS) -+AM_V_CC = $(am__v_CC_@AM_V@) -+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -+am__v_CC_0 = @echo " CC " $@; -+am__v_CC_1 = - CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CCLD = $(am__v_CCLD_@AM_V@) -+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -+am__v_CCLD_0 = @echo " CCLD " $@; -+am__v_CCLD_1 = - SOURCES = $(libgrid_calculus_la_SOURCES) - DIST_SOURCES = $(libgrid_calculus_la_SOURCES) -+am__can_run_installinfo = \ -+ case $$AM_UPDATE_INFO_DIR in \ -+ n|no|NO) false;; \ -+ *) (install-info --version) >/dev/null 2>&1;; \ -+ esac -+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -+# Read a list of newline-separated strings from the standard input, -+# and print each of them once, without duplicates. Input order is -+# *not* preserved. -+am__uniquify_input = $(AWK) '\ -+ BEGIN { nonempty = 0; } \ -+ { items[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in items) print i; }; } \ -+' -+# Make sure the list of sources is unique. This is necessary because, -+# e.g., the same source file might be shared among _SOURCES variables -+# for different programs/libraries. -+am__define_uniq_tagged_files = \ -+ list='$(am__tagged_files)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | $(am__uniquify_input)` - ETAGS = etags - CTAGS = ctags - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ -+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ -@@ -131,6 +239,7 @@ CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DISABLELIBHARU = @DISABLELIBHARU@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -158,6 +267,7 @@ LOCAL_INCS = @LOCAL_INCS@ - LOCAL_LIBS = @LOCAL_LIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - NM = @NM@ - NMEDIT = @NMEDIT@ -@@ -170,6 +280,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - POW_LIB = @POW_LIB@ -@@ -195,6 +306,7 @@ abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -@@ -228,7 +340,6 @@ libdir = @libdir@ - libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -@@ -324,9 +435,9 @@ $(top_srcdir)/configure: $(am__configure_deps) - $(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - $(am__aclocal_m4_deps): -+ - install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" - @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ - list2=; for p in $$list; do \ - if test -f $$p; then \ -@@ -334,6 +445,8 @@ install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - else :; fi; \ - done; \ - test -z "$$list2" || { \ -+ echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \ -+ $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \ - } -@@ -349,14 +462,17 @@ uninstall-pkglibLTLIBRARIES: - - clean-pkglibLTLIBRARIES: - -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES) -- @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \ -- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -- echo "rm -f \"$${dir}/so_locations\""; \ -- rm -f "$${dir}/so_locations"; \ -- done --libgrid_calculus.la: $(libgrid_calculus_la_OBJECTS) $(libgrid_calculus_la_DEPENDENCIES) -- $(CXXLINK) -rpath $(pkglibdir) $(libgrid_calculus_la_OBJECTS) $(libgrid_calculus_la_LIBADD) $(LIBS) -+ @list='$(pkglib_LTLIBRARIES)'; \ -+ locs=`for p in $$list; do echo $$p; done | \ -+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ -+ sort -u`; \ -+ test -z "$$locs" || { \ -+ echo rm -f $${locs}; \ -+ rm -f $${locs}; \ -+ } -+ -+libgrid_calculus.la: $(libgrid_calculus_la_OBJECTS) $(libgrid_calculus_la_DEPENDENCIES) $(EXTRA_libgrid_calculus_la_DEPENDENCIES) -+ $(AM_V_CXXLD)$(CXXLINK) -rpath $(pkglibdir) $(libgrid_calculus_la_OBJECTS) $(libgrid_calculus_la_LIBADD) $(LIBS) - - mostlyclean-compile: - -rm -f *.$(OBJEXT) -@@ -380,25 +496,25 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/grid_metric_conversion.Plo@am__quote@ - - .cpp.o: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< - - .cpp.obj: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - - .cpp.lo: --@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< - - mostlyclean-libtool: - -rm -f *.lo -@@ -406,26 +522,15 @@ mostlyclean-libtool: - clean-libtool: - -rm -rf .libs _libs - --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -+ID: $(am__tagged_files) -+ $(am__define_uniq_tagged_files); mkid -fID $$unique -+tags: tags-am -+TAGS: tags -+ -+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ -@@ -437,15 +542,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $$unique; \ - fi; \ - fi --ctags: CTAGS --CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ctags: ctags-am -+ -+CTAGS: ctags -+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) -+ $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique -@@ -454,6 +555,21 @@ GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -+cscopelist: cscopelist-am -+ -+cscopelist-am: $(am__tagged_files) -+ list='$(am__tagged_files)'; \ -+ case "$(srcdir)" in \ -+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ -+ *) sdir=$(subdir)/$(srcdir) ;; \ -+ esac; \ -+ for i in $$list; do \ -+ if test -f "$$i"; then \ -+ echo "$(subdir)/$$i"; \ -+ else \ -+ echo "$$sdir/$$i"; \ -+ fi; \ -+ done >> $(top_builddir)/cscope.files - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -@@ -505,10 +621,15 @@ install-am: all-am - - installcheck: installcheck-am - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+ if test -z '$(STRIP)'; then \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ install; \ -+ else \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -+ fi - mostlyclean-generic: - - clean-generic: -@@ -593,19 +714,20 @@ uninstall-am: uninstall-pkglibLTLIBRARIES - - .MAKE: install-am install-strip - --.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ -- clean-libtool clean-pkglibLTLIBRARIES ctags distclean \ -- distclean-compile distclean-generic distclean-libtool \ -- distclean-tags distdir dvi dvi-am html html-am info info-am \ -- install install-am install-data install-data-am install-dvi \ -- install-dvi-am install-exec install-exec-am install-html \ -- install-html-am install-info install-info-am install-man \ -- install-pdf install-pdf-am install-pkglibLTLIBRARIES \ -- install-ps install-ps-am install-strip installcheck \ -- installcheck-am installdirs maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-compile \ -- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -- tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES -+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ -+ clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \ -+ ctags-am distclean distclean-compile distclean-generic \ -+ distclean-libtool distclean-tags distdir dvi dvi-am html \ -+ html-am info info-am install install-am install-data \ -+ install-data-am install-dvi install-dvi-am install-exec \ -+ install-exec-am install-html install-html-am install-info \ -+ install-info-am install-man install-pdf install-pdf-am \ -+ install-pkglibLTLIBRARIES install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ maintainer-clean maintainer-clean-generic mostlyclean \ -+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ -+ pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ -+ uninstall-pkglibLTLIBRARIES - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff --git a/src/modules/grid/grid_calculus_bsl/Makefile.in b/src/modules/grid/grid_calculus_bsl/Makefile.in -index e1a5263..a9e9af2 100644 ---- a/src/modules/grid/grid_calculus_bsl/Makefile.in -+++ b/src/modules/grid/grid_calculus_bsl/Makefile.in -@@ -1,9 +1,8 @@ --# Makefile.in generated by automake 1.11.1 from Makefile.am. -+# Makefile.in generated by automake 1.14 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, --# Inc. -+# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+ - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -16,6 +15,51 @@ - @SET_MAKE@ - - VPATH = @srcdir@ -+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -+am__make_running_with_option = \ -+ case $${target_option-} in \ -+ ?) ;; \ -+ *) echo "am__make_running_with_option: internal error: invalid" \ -+ "target option '$${target_option-}' specified" >&2; \ -+ exit 1;; \ -+ esac; \ -+ has_opt=no; \ -+ sane_makeflags=$$MAKEFLAGS; \ -+ if $(am__is_gnu_make); then \ -+ sane_makeflags=$$MFLAGS; \ -+ else \ -+ case $$MAKEFLAGS in \ -+ *\\[\ \ ]*) \ -+ bs=\\; \ -+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -+ esac; \ -+ fi; \ -+ skip_next=no; \ -+ strip_trailopt () \ -+ { \ -+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -+ }; \ -+ for flg in $$sane_makeflags; do \ -+ test $$skip_next = yes && { skip_next=no; continue; }; \ -+ case $$flg in \ -+ *=*|--*) continue;; \ -+ -*I) strip_trailopt 'I'; skip_next=yes;; \ -+ -*I?*) strip_trailopt 'I';; \ -+ -*O) strip_trailopt 'O'; skip_next=yes;; \ -+ -*O?*) strip_trailopt 'O';; \ -+ -*l) strip_trailopt 'l'; skip_next=yes;; \ -+ -*l?*) strip_trailopt 'l';; \ -+ -[dEDm]) skip_next=yes;; \ -+ -[JT]) skip_next=yes;; \ -+ esac; \ -+ case $$flg in \ -+ *$$target_option*) has_opt=yes; break;; \ -+ esac; \ -+ done; \ -+ test $$has_opt = yes -+am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -+am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -35,7 +79,8 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - subdir = src/modules/grid/grid_calculus_bsl --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ -+ $(top_srcdir)/depcomp - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ - $(top_srcdir)/m4/ax_python_devel.m4 \ -@@ -71,6 +116,12 @@ am__nobase_list = $(am__nobase_strip_setup); \ - am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -+am__uninstall_files_from_dir = { \ -+ test -z "$$files" \ -+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ -+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ -+ $(am__cd) "$$dir" && rm -f $$files; }; \ -+ } - am__installdirs = "$(DESTDIR)$(pkglibdir)" - LTLIBRARIES = $(pkglib_LTLIBRARIES) - libgrid_calculus_bsl_la_DEPENDENCIES = \ -@@ -82,35 +133,92 @@ am_libgrid_calculus_bsl_la_OBJECTS = ausdruck.lo auswert_anweisung.lo \ - MLB_Interface.lo pars_all.lo vector.lo zuweisung.lo - libgrid_calculus_bsl_la_OBJECTS = \ - $(am_libgrid_calculus_bsl_la_OBJECTS) -+AM_V_lt = $(am__v_lt_@AM_V@) -+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -+am__v_lt_0 = --silent -+am__v_lt_1 = -+AM_V_P = $(am__v_P_@AM_V@) -+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -+am__v_P_0 = false -+am__v_P_1 = : -+AM_V_GEN = $(am__v_GEN_@AM_V@) -+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+am__v_GEN_0 = @echo " GEN " $@; -+am__v_GEN_1 = -+AM_V_at = $(am__v_at_@AM_V@) -+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+am__v_at_0 = @ -+am__v_at_1 = - DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - am__mv = mv -f - CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) --LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CXXFLAGS) $(CXXFLAGS) -+AM_V_CXX = $(am__v_CXX_@AM_V@) -+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) -+am__v_CXX_0 = @echo " CXX " $@; -+am__v_CXX_1 = - CXXLD = $(CXX) --CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ -+ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) -+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) -+am__v_CXXLD_0 = @echo " CXXLD " $@; -+am__v_CXXLD_1 = - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CFLAGS) $(CFLAGS) -+AM_V_CC = $(am__v_CC_@AM_V@) -+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -+am__v_CC_0 = @echo " CC " $@; -+am__v_CC_1 = - CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CCLD = $(am__v_CCLD_@AM_V@) -+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -+am__v_CCLD_0 = @echo " CCLD " $@; -+am__v_CCLD_1 = - SOURCES = $(libgrid_calculus_bsl_la_SOURCES) - DIST_SOURCES = $(libgrid_calculus_bsl_la_SOURCES) -+am__can_run_installinfo = \ -+ case $$AM_UPDATE_INFO_DIR in \ -+ n|no|NO) false;; \ -+ *) (install-info --version) >/dev/null 2>&1;; \ -+ esac -+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -+# Read a list of newline-separated strings from the standard input, -+# and print each of them once, without duplicates. Input order is -+# *not* preserved. -+am__uniquify_input = $(AWK) '\ -+ BEGIN { nonempty = 0; } \ -+ { items[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in items) print i; }; } \ -+' -+# Make sure the list of sources is unique. This is necessary because, -+# e.g., the same source file might be shared among _SOURCES variables -+# for different programs/libraries. -+am__define_uniq_tagged_files = \ -+ list='$(am__tagged_files)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | $(am__uniquify_input)` - ETAGS = etags - CTAGS = ctags - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ -+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ -@@ -131,6 +239,7 @@ CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DISABLELIBHARU = @DISABLELIBHARU@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -158,6 +267,7 @@ LOCAL_INCS = @LOCAL_INCS@ - LOCAL_LIBS = @LOCAL_LIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - NM = @NM@ - NMEDIT = @NMEDIT@ -@@ -170,6 +280,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - POW_LIB = @POW_LIB@ -@@ -195,6 +306,7 @@ abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -@@ -228,7 +340,6 @@ libdir = @libdir@ - libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -@@ -334,9 +445,9 @@ $(top_srcdir)/configure: $(am__configure_deps) - $(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - $(am__aclocal_m4_deps): -+ - install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" - @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ - list2=; for p in $$list; do \ - if test -f $$p; then \ -@@ -344,6 +455,8 @@ install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - else :; fi; \ - done; \ - test -z "$$list2" || { \ -+ echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \ -+ $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \ - } -@@ -359,14 +472,17 @@ uninstall-pkglibLTLIBRARIES: - - clean-pkglibLTLIBRARIES: - -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES) -- @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \ -- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -- echo "rm -f \"$${dir}/so_locations\""; \ -- rm -f "$${dir}/so_locations"; \ -- done --libgrid_calculus_bsl.la: $(libgrid_calculus_bsl_la_OBJECTS) $(libgrid_calculus_bsl_la_DEPENDENCIES) -- $(CXXLINK) -rpath $(pkglibdir) $(libgrid_calculus_bsl_la_OBJECTS) $(libgrid_calculus_bsl_la_LIBADD) $(LIBS) -+ @list='$(pkglib_LTLIBRARIES)'; \ -+ locs=`for p in $$list; do echo $$p; done | \ -+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ -+ sort -u`; \ -+ test -z "$$locs" || { \ -+ echo rm -f $${locs}; \ -+ rm -f $${locs}; \ -+ } -+ -+libgrid_calculus_bsl.la: $(libgrid_calculus_bsl_la_OBJECTS) $(libgrid_calculus_bsl_la_DEPENDENCIES) $(EXTRA_libgrid_calculus_bsl_la_DEPENDENCIES) -+ $(AM_V_CXXLD)$(CXXLINK) -rpath $(pkglibdir) $(libgrid_calculus_bsl_la_OBJECTS) $(libgrid_calculus_bsl_la_LIBADD) $(LIBS) - - mostlyclean-compile: - -rm -f *.$(OBJEXT) -@@ -393,25 +509,25 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zuweisung.Plo@am__quote@ - - .cpp.o: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< - - .cpp.obj: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - - .cpp.lo: --@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< - - mostlyclean-libtool: - -rm -f *.lo -@@ -419,26 +535,15 @@ mostlyclean-libtool: - clean-libtool: - -rm -rf .libs _libs - --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -+ID: $(am__tagged_files) -+ $(am__define_uniq_tagged_files); mkid -fID $$unique -+tags: tags-am -+TAGS: tags -+ -+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ -@@ -450,15 +555,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $$unique; \ - fi; \ - fi --ctags: CTAGS --CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ctags: ctags-am -+ -+CTAGS: ctags -+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) -+ $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique -@@ -467,6 +568,21 @@ GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -+cscopelist: cscopelist-am -+ -+cscopelist-am: $(am__tagged_files) -+ list='$(am__tagged_files)'; \ -+ case "$(srcdir)" in \ -+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ -+ *) sdir=$(subdir)/$(srcdir) ;; \ -+ esac; \ -+ for i in $$list; do \ -+ if test -f "$$i"; then \ -+ echo "$(subdir)/$$i"; \ -+ else \ -+ echo "$$sdir/$$i"; \ -+ fi; \ -+ done >> $(top_builddir)/cscope.files - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -@@ -518,10 +634,15 @@ install-am: all-am - - installcheck: installcheck-am - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+ if test -z '$(STRIP)'; then \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ install; \ -+ else \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -+ fi - mostlyclean-generic: - - clean-generic: -@@ -606,19 +727,20 @@ uninstall-am: uninstall-pkglibLTLIBRARIES - - .MAKE: install-am install-strip - --.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ -- clean-libtool clean-pkglibLTLIBRARIES ctags distclean \ -- distclean-compile distclean-generic distclean-libtool \ -- distclean-tags distdir dvi dvi-am html html-am info info-am \ -- install install-am install-data install-data-am install-dvi \ -- install-dvi-am install-exec install-exec-am install-html \ -- install-html-am install-info install-info-am install-man \ -- install-pdf install-pdf-am install-pkglibLTLIBRARIES \ -- install-ps install-ps-am install-strip installcheck \ -- installcheck-am installdirs maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-compile \ -- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -- tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES -+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ -+ clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \ -+ ctags-am distclean distclean-compile distclean-generic \ -+ distclean-libtool distclean-tags distdir dvi dvi-am html \ -+ html-am info info-am install install-am install-data \ -+ install-data-am install-dvi install-dvi-am install-exec \ -+ install-exec-am install-html install-html-am install-info \ -+ install-info-am install-man install-pdf install-pdf-am \ -+ install-pkglibLTLIBRARIES install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ maintainer-clean maintainer-clean-generic mostlyclean \ -+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ -+ pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ -+ uninstall-pkglibLTLIBRARIES - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff --git a/src/modules/grid/grid_filter/Makefile.in b/src/modules/grid/grid_filter/Makefile.in -index 6e031e9..dcdeed7 100644 ---- a/src/modules/grid/grid_filter/Makefile.in -+++ b/src/modules/grid/grid_filter/Makefile.in -@@ -1,9 +1,8 @@ --# Makefile.in generated by automake 1.11.1 from Makefile.am. -+# Makefile.in generated by automake 1.14 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, --# Inc. -+# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+ - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -16,6 +15,51 @@ - @SET_MAKE@ - - VPATH = @srcdir@ -+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -+am__make_running_with_option = \ -+ case $${target_option-} in \ -+ ?) ;; \ -+ *) echo "am__make_running_with_option: internal error: invalid" \ -+ "target option '$${target_option-}' specified" >&2; \ -+ exit 1;; \ -+ esac; \ -+ has_opt=no; \ -+ sane_makeflags=$$MAKEFLAGS; \ -+ if $(am__is_gnu_make); then \ -+ sane_makeflags=$$MFLAGS; \ -+ else \ -+ case $$MAKEFLAGS in \ -+ *\\[\ \ ]*) \ -+ bs=\\; \ -+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -+ esac; \ -+ fi; \ -+ skip_next=no; \ -+ strip_trailopt () \ -+ { \ -+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -+ }; \ -+ for flg in $$sane_makeflags; do \ -+ test $$skip_next = yes && { skip_next=no; continue; }; \ -+ case $$flg in \ -+ *=*|--*) continue;; \ -+ -*I) strip_trailopt 'I'; skip_next=yes;; \ -+ -*I?*) strip_trailopt 'I';; \ -+ -*O) strip_trailopt 'O'; skip_next=yes;; \ -+ -*O?*) strip_trailopt 'O';; \ -+ -*l) strip_trailopt 'l'; skip_next=yes;; \ -+ -*l?*) strip_trailopt 'l';; \ -+ -[dEDm]) skip_next=yes;; \ -+ -[JT]) skip_next=yes;; \ -+ esac; \ -+ case $$flg in \ -+ *$$target_option*) has_opt=yes; break;; \ -+ esac; \ -+ done; \ -+ test $$has_opt = yes -+am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -+am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -35,7 +79,8 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - subdir = src/modules/grid/grid_filter --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ -+ $(top_srcdir)/depcomp - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ - $(top_srcdir)/m4/ax_python_devel.m4 \ -@@ -71,6 +116,12 @@ am__nobase_list = $(am__nobase_strip_setup); \ - am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -+am__uninstall_files_from_dir = { \ -+ test -z "$$files" \ -+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ -+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ -+ $(am__cd) "$$dir" && rm -f $$files; }; \ -+ } - am__installdirs = "$(DESTDIR)$(pkglibdir)" - LTLIBRARIES = $(pkglib_LTLIBRARIES) - libgrid_filter_la_DEPENDENCIES = \ -@@ -81,35 +132,92 @@ am_libgrid_filter_la_OBJECTS = Filter.lo Filter_3x3.lo Filter_Gauss.lo \ - Filter_Terrain_SlopeBased.lo FilterClumps.lo mesh_denoise.lo \ - MLB_Interface.lo - libgrid_filter_la_OBJECTS = $(am_libgrid_filter_la_OBJECTS) -+AM_V_lt = $(am__v_lt_@AM_V@) -+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -+am__v_lt_0 = --silent -+am__v_lt_1 = -+AM_V_P = $(am__v_P_@AM_V@) -+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -+am__v_P_0 = false -+am__v_P_1 = : -+AM_V_GEN = $(am__v_GEN_@AM_V@) -+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+am__v_GEN_0 = @echo " GEN " $@; -+am__v_GEN_1 = -+AM_V_at = $(am__v_at_@AM_V@) -+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+am__v_at_0 = @ -+am__v_at_1 = - DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - am__mv = mv -f - CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) --LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CXXFLAGS) $(CXXFLAGS) -+AM_V_CXX = $(am__v_CXX_@AM_V@) -+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) -+am__v_CXX_0 = @echo " CXX " $@; -+am__v_CXX_1 = - CXXLD = $(CXX) --CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ -+ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) -+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) -+am__v_CXXLD_0 = @echo " CXXLD " $@; -+am__v_CXXLD_1 = - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CFLAGS) $(CFLAGS) -+AM_V_CC = $(am__v_CC_@AM_V@) -+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -+am__v_CC_0 = @echo " CC " $@; -+am__v_CC_1 = - CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CCLD = $(am__v_CCLD_@AM_V@) -+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -+am__v_CCLD_0 = @echo " CCLD " $@; -+am__v_CCLD_1 = - SOURCES = $(libgrid_filter_la_SOURCES) - DIST_SOURCES = $(libgrid_filter_la_SOURCES) -+am__can_run_installinfo = \ -+ case $$AM_UPDATE_INFO_DIR in \ -+ n|no|NO) false;; \ -+ *) (install-info --version) >/dev/null 2>&1;; \ -+ esac -+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -+# Read a list of newline-separated strings from the standard input, -+# and print each of them once, without duplicates. Input order is -+# *not* preserved. -+am__uniquify_input = $(AWK) '\ -+ BEGIN { nonempty = 0; } \ -+ { items[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in items) print i; }; } \ -+' -+# Make sure the list of sources is unique. This is necessary because, -+# e.g., the same source file might be shared among _SOURCES variables -+# for different programs/libraries. -+am__define_uniq_tagged_files = \ -+ list='$(am__tagged_files)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | $(am__uniquify_input)` - ETAGS = etags - CTAGS = ctags - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ -+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ -@@ -130,6 +238,7 @@ CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DISABLELIBHARU = @DISABLELIBHARU@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -157,6 +266,7 @@ LOCAL_INCS = @LOCAL_INCS@ - LOCAL_LIBS = @LOCAL_LIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - NM = @NM@ - NMEDIT = @NMEDIT@ -@@ -169,6 +279,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - POW_LIB = @POW_LIB@ -@@ -194,6 +305,7 @@ abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -@@ -227,7 +339,6 @@ libdir = @libdir@ - libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -@@ -321,9 +432,9 @@ $(top_srcdir)/configure: $(am__configure_deps) - $(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - $(am__aclocal_m4_deps): -+ - install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" - @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ - list2=; for p in $$list; do \ - if test -f $$p; then \ -@@ -331,6 +442,8 @@ install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - else :; fi; \ - done; \ - test -z "$$list2" || { \ -+ echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \ -+ $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \ - } -@@ -346,14 +459,17 @@ uninstall-pkglibLTLIBRARIES: - - clean-pkglibLTLIBRARIES: - -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES) -- @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \ -- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -- echo "rm -f \"$${dir}/so_locations\""; \ -- rm -f "$${dir}/so_locations"; \ -- done --libgrid_filter.la: $(libgrid_filter_la_OBJECTS) $(libgrid_filter_la_DEPENDENCIES) -- $(CXXLINK) -rpath $(pkglibdir) $(libgrid_filter_la_OBJECTS) $(libgrid_filter_la_LIBADD) $(LIBS) -+ @list='$(pkglib_LTLIBRARIES)'; \ -+ locs=`for p in $$list; do echo $$p; done | \ -+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ -+ sort -u`; \ -+ test -z "$$locs" || { \ -+ echo rm -f $${locs}; \ -+ rm -f $${locs}; \ -+ } -+ -+libgrid_filter.la: $(libgrid_filter_la_OBJECTS) $(libgrid_filter_la_DEPENDENCIES) $(EXTRA_libgrid_filter_la_DEPENDENCIES) -+ $(AM_V_CXXLD)$(CXXLINK) -rpath $(pkglibdir) $(libgrid_filter_la_OBJECTS) $(libgrid_filter_la_LIBADD) $(LIBS) - - mostlyclean-compile: - -rm -f *.$(OBJEXT) -@@ -376,25 +492,25 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mesh_denoise.Plo@am__quote@ - - .cpp.o: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< - - .cpp.obj: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - - .cpp.lo: --@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< - - mostlyclean-libtool: - -rm -f *.lo -@@ -402,26 +518,15 @@ mostlyclean-libtool: - clean-libtool: - -rm -rf .libs _libs - --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -+ID: $(am__tagged_files) -+ $(am__define_uniq_tagged_files); mkid -fID $$unique -+tags: tags-am -+TAGS: tags -+ -+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ -@@ -433,15 +538,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $$unique; \ - fi; \ - fi --ctags: CTAGS --CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ctags: ctags-am -+ -+CTAGS: ctags -+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) -+ $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique -@@ -450,6 +551,21 @@ GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -+cscopelist: cscopelist-am -+ -+cscopelist-am: $(am__tagged_files) -+ list='$(am__tagged_files)'; \ -+ case "$(srcdir)" in \ -+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ -+ *) sdir=$(subdir)/$(srcdir) ;; \ -+ esac; \ -+ for i in $$list; do \ -+ if test -f "$$i"; then \ -+ echo "$(subdir)/$$i"; \ -+ else \ -+ echo "$$sdir/$$i"; \ -+ fi; \ -+ done >> $(top_builddir)/cscope.files - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -@@ -501,10 +617,15 @@ install-am: all-am - - installcheck: installcheck-am - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+ if test -z '$(STRIP)'; then \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ install; \ -+ else \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -+ fi - mostlyclean-generic: - - clean-generic: -@@ -589,19 +710,20 @@ uninstall-am: uninstall-pkglibLTLIBRARIES - - .MAKE: install-am install-strip - --.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ -- clean-libtool clean-pkglibLTLIBRARIES ctags distclean \ -- distclean-compile distclean-generic distclean-libtool \ -- distclean-tags distdir dvi dvi-am html html-am info info-am \ -- install install-am install-data install-data-am install-dvi \ -- install-dvi-am install-exec install-exec-am install-html \ -- install-html-am install-info install-info-am install-man \ -- install-pdf install-pdf-am install-pkglibLTLIBRARIES \ -- install-ps install-ps-am install-strip installcheck \ -- installcheck-am installdirs maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-compile \ -- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -- tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES -+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ -+ clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \ -+ ctags-am distclean distclean-compile distclean-generic \ -+ distclean-libtool distclean-tags distdir dvi dvi-am html \ -+ html-am info info-am install install-am install-data \ -+ install-data-am install-dvi install-dvi-am install-exec \ -+ install-exec-am install-html install-html-am install-info \ -+ install-info-am install-man install-pdf install-pdf-am \ -+ install-pkglibLTLIBRARIES install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ maintainer-clean maintainer-clean-generic mostlyclean \ -+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ -+ pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ -+ uninstall-pkglibLTLIBRARIES - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff --git a/src/modules/grid/grid_gridding/Makefile.in b/src/modules/grid/grid_gridding/Makefile.in -index 09d12dc..4ff6a48 100644 ---- a/src/modules/grid/grid_gridding/Makefile.in -+++ b/src/modules/grid/grid_gridding/Makefile.in -@@ -1,9 +1,8 @@ --# Makefile.in generated by automake 1.11.1 from Makefile.am. -+# Makefile.in generated by automake 1.14 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, --# Inc. -+# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+ - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -16,6 +15,51 @@ - @SET_MAKE@ - - VPATH = @srcdir@ -+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -+am__make_running_with_option = \ -+ case $${target_option-} in \ -+ ?) ;; \ -+ *) echo "am__make_running_with_option: internal error: invalid" \ -+ "target option '$${target_option-}' specified" >&2; \ -+ exit 1;; \ -+ esac; \ -+ has_opt=no; \ -+ sane_makeflags=$$MAKEFLAGS; \ -+ if $(am__is_gnu_make); then \ -+ sane_makeflags=$$MFLAGS; \ -+ else \ -+ case $$MAKEFLAGS in \ -+ *\\[\ \ ]*) \ -+ bs=\\; \ -+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -+ esac; \ -+ fi; \ -+ skip_next=no; \ -+ strip_trailopt () \ -+ { \ -+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -+ }; \ -+ for flg in $$sane_makeflags; do \ -+ test $$skip_next = yes && { skip_next=no; continue; }; \ -+ case $$flg in \ -+ *=*|--*) continue;; \ -+ -*I) strip_trailopt 'I'; skip_next=yes;; \ -+ -*I?*) strip_trailopt 'I';; \ -+ -*O) strip_trailopt 'O'; skip_next=yes;; \ -+ -*O?*) strip_trailopt 'O';; \ -+ -*l) strip_trailopt 'l'; skip_next=yes;; \ -+ -*l?*) strip_trailopt 'l';; \ -+ -[dEDm]) skip_next=yes;; \ -+ -[JT]) skip_next=yes;; \ -+ esac; \ -+ case $$flg in \ -+ *$$target_option*) has_opt=yes; break;; \ -+ esac; \ -+ done; \ -+ test $$has_opt = yes -+am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -+am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -35,7 +79,8 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - subdir = src/modules/grid/grid_gridding --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ -+ $(top_srcdir)/depcomp - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ - $(top_srcdir)/m4/ax_python_devel.m4 \ -@@ -71,6 +116,12 @@ am__nobase_list = $(am__nobase_strip_setup); \ - am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -+am__uninstall_files_from_dir = { \ -+ test -z "$$files" \ -+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ -+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ -+ $(am__cd) "$$dir" && rm -f $$files; }; \ -+ } - am__installdirs = "$(DESTDIR)$(pkglibdir)" - LTLIBRARIES = $(pkglib_LTLIBRARIES) - libgrid_gridding_la_DEPENDENCIES = \ -@@ -84,35 +135,92 @@ am_libgrid_gridding_la_OBJECTS = Interpolation.lo \ - MLB_Interface.lo Shapes2Grid.lo Shepard.lo delaunay.lo hash.lo \ - istack.lo lpi.lo nnai.lo nncommon.lo nnpi.lo triangle.lo - libgrid_gridding_la_OBJECTS = $(am_libgrid_gridding_la_OBJECTS) -+AM_V_lt = $(am__v_lt_@AM_V@) -+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -+am__v_lt_0 = --silent -+am__v_lt_1 = -+AM_V_P = $(am__v_P_@AM_V@) -+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -+am__v_P_0 = false -+am__v_P_1 = : -+AM_V_GEN = $(am__v_GEN_@AM_V@) -+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+am__v_GEN_0 = @echo " GEN " $@; -+am__v_GEN_1 = -+AM_V_at = $(am__v_at_@AM_V@) -+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+am__v_at_0 = @ -+am__v_at_1 = - DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - am__mv = mv -f - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CFLAGS) $(CFLAGS) -+AM_V_CC = $(am__v_CC_@AM_V@) -+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -+am__v_CC_0 = @echo " CC " $@; -+am__v_CC_1 = - CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CCLD = $(am__v_CCLD_@AM_V@) -+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -+am__v_CCLD_0 = @echo " CCLD " $@; -+am__v_CCLD_1 = - CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) --LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CXXFLAGS) $(CXXFLAGS) -+AM_V_CXX = $(am__v_CXX_@AM_V@) -+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) -+am__v_CXX_0 = @echo " CXX " $@; -+am__v_CXX_1 = - CXXLD = $(CXX) --CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ -+ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) -+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) -+am__v_CXXLD_0 = @echo " CXXLD " $@; -+am__v_CXXLD_1 = - SOURCES = $(libgrid_gridding_la_SOURCES) - DIST_SOURCES = $(libgrid_gridding_la_SOURCES) -+am__can_run_installinfo = \ -+ case $$AM_UPDATE_INFO_DIR in \ -+ n|no|NO) false;; \ -+ *) (install-info --version) >/dev/null 2>&1;; \ -+ esac -+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -+# Read a list of newline-separated strings from the standard input, -+# and print each of them once, without duplicates. Input order is -+# *not* preserved. -+am__uniquify_input = $(AWK) '\ -+ BEGIN { nonempty = 0; } \ -+ { items[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in items) print i; }; } \ -+' -+# Make sure the list of sources is unique. This is necessary because, -+# e.g., the same source file might be shared among _SOURCES variables -+# for different programs/libraries. -+am__define_uniq_tagged_files = \ -+ list='$(am__tagged_files)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | $(am__uniquify_input)` - ETAGS = etags - CTAGS = ctags - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ -+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ -@@ -133,6 +241,7 @@ CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DISABLELIBHARU = @DISABLELIBHARU@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -160,6 +269,7 @@ LOCAL_INCS = @LOCAL_INCS@ - LOCAL_LIBS = @LOCAL_LIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - NM = @NM@ - NMEDIT = @NMEDIT@ -@@ -172,6 +282,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - POW_LIB = @POW_LIB@ -@@ -197,6 +308,7 @@ abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -@@ -230,7 +342,6 @@ libdir = @libdir@ - libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -@@ -336,9 +447,9 @@ $(top_srcdir)/configure: $(am__configure_deps) - $(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - $(am__aclocal_m4_deps): -+ - install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" - @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ - list2=; for p in $$list; do \ - if test -f $$p; then \ -@@ -346,6 +457,8 @@ install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - else :; fi; \ - done; \ - test -z "$$list2" || { \ -+ echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \ -+ $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \ - } -@@ -361,14 +474,17 @@ uninstall-pkglibLTLIBRARIES: - - clean-pkglibLTLIBRARIES: - -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES) -- @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \ -- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -- echo "rm -f \"$${dir}/so_locations\""; \ -- rm -f "$${dir}/so_locations"; \ -- done --libgrid_gridding.la: $(libgrid_gridding_la_OBJECTS) $(libgrid_gridding_la_DEPENDENCIES) -- $(CXXLINK) -rpath $(pkglibdir) $(libgrid_gridding_la_OBJECTS) $(libgrid_gridding_la_LIBADD) $(LIBS) -+ @list='$(pkglib_LTLIBRARIES)'; \ -+ locs=`for p in $$list; do echo $$p; done | \ -+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ -+ sort -u`; \ -+ test -z "$$locs" || { \ -+ echo rm -f $${locs}; \ -+ rm -f $${locs}; \ -+ } -+ -+libgrid_gridding.la: $(libgrid_gridding_la_OBJECTS) $(libgrid_gridding_la_DEPENDENCIES) $(EXTRA_libgrid_gridding_la_DEPENDENCIES) -+ $(AM_V_CXXLD)$(CXXLINK) -rpath $(pkglibdir) $(libgrid_gridding_la_OBJECTS) $(libgrid_gridding_la_LIBADD) $(LIBS) - - mostlyclean-compile: - -rm -f *.$(OBJEXT) -@@ -397,102 +513,102 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/triangle.Plo@am__quote@ - - .c.o: --@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(COMPILE) -c $< -+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< - - .c.obj: --@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` --@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` -+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - - .c.lo: --@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< -+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< - - delaunay.lo: ./nn/delaunay.c --@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT delaunay.lo -MD -MP -MF $(DEPDIR)/delaunay.Tpo -c -o delaunay.lo `test -f './nn/delaunay.c' || echo '$(srcdir)/'`./nn/delaunay.c --@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/delaunay.Tpo $(DEPDIR)/delaunay.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='./nn/delaunay.c' object='delaunay.lo' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT delaunay.lo -MD -MP -MF $(DEPDIR)/delaunay.Tpo -c -o delaunay.lo `test -f './nn/delaunay.c' || echo '$(srcdir)/'`./nn/delaunay.c -+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/delaunay.Tpo $(DEPDIR)/delaunay.Plo -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='./nn/delaunay.c' object='delaunay.lo' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o delaunay.lo `test -f './nn/delaunay.c' || echo '$(srcdir)/'`./nn/delaunay.c -+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o delaunay.lo `test -f './nn/delaunay.c' || echo '$(srcdir)/'`./nn/delaunay.c - - hash.lo: ./nn/hash.c --@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hash.lo -MD -MP -MF $(DEPDIR)/hash.Tpo -c -o hash.lo `test -f './nn/hash.c' || echo '$(srcdir)/'`./nn/hash.c --@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/hash.Tpo $(DEPDIR)/hash.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='./nn/hash.c' object='hash.lo' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hash.lo -MD -MP -MF $(DEPDIR)/hash.Tpo -c -o hash.lo `test -f './nn/hash.c' || echo '$(srcdir)/'`./nn/hash.c -+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/hash.Tpo $(DEPDIR)/hash.Plo -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='./nn/hash.c' object='hash.lo' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o hash.lo `test -f './nn/hash.c' || echo '$(srcdir)/'`./nn/hash.c -+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o hash.lo `test -f './nn/hash.c' || echo '$(srcdir)/'`./nn/hash.c - - istack.lo: ./nn/istack.c --@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT istack.lo -MD -MP -MF $(DEPDIR)/istack.Tpo -c -o istack.lo `test -f './nn/istack.c' || echo '$(srcdir)/'`./nn/istack.c --@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/istack.Tpo $(DEPDIR)/istack.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='./nn/istack.c' object='istack.lo' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT istack.lo -MD -MP -MF $(DEPDIR)/istack.Tpo -c -o istack.lo `test -f './nn/istack.c' || echo '$(srcdir)/'`./nn/istack.c -+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/istack.Tpo $(DEPDIR)/istack.Plo -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='./nn/istack.c' object='istack.lo' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o istack.lo `test -f './nn/istack.c' || echo '$(srcdir)/'`./nn/istack.c -+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o istack.lo `test -f './nn/istack.c' || echo '$(srcdir)/'`./nn/istack.c - - lpi.lo: ./nn/lpi.c --@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lpi.lo -MD -MP -MF $(DEPDIR)/lpi.Tpo -c -o lpi.lo `test -f './nn/lpi.c' || echo '$(srcdir)/'`./nn/lpi.c --@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/lpi.Tpo $(DEPDIR)/lpi.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='./nn/lpi.c' object='lpi.lo' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lpi.lo -MD -MP -MF $(DEPDIR)/lpi.Tpo -c -o lpi.lo `test -f './nn/lpi.c' || echo '$(srcdir)/'`./nn/lpi.c -+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lpi.Tpo $(DEPDIR)/lpi.Plo -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='./nn/lpi.c' object='lpi.lo' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lpi.lo `test -f './nn/lpi.c' || echo '$(srcdir)/'`./nn/lpi.c -+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lpi.lo `test -f './nn/lpi.c' || echo '$(srcdir)/'`./nn/lpi.c - - nnai.lo: ./nn/nnai.c --@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT nnai.lo -MD -MP -MF $(DEPDIR)/nnai.Tpo -c -o nnai.lo `test -f './nn/nnai.c' || echo '$(srcdir)/'`./nn/nnai.c --@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/nnai.Tpo $(DEPDIR)/nnai.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='./nn/nnai.c' object='nnai.lo' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT nnai.lo -MD -MP -MF $(DEPDIR)/nnai.Tpo -c -o nnai.lo `test -f './nn/nnai.c' || echo '$(srcdir)/'`./nn/nnai.c -+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/nnai.Tpo $(DEPDIR)/nnai.Plo -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='./nn/nnai.c' object='nnai.lo' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o nnai.lo `test -f './nn/nnai.c' || echo '$(srcdir)/'`./nn/nnai.c -+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o nnai.lo `test -f './nn/nnai.c' || echo '$(srcdir)/'`./nn/nnai.c - - nncommon.lo: ./nn/nncommon.c --@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT nncommon.lo -MD -MP -MF $(DEPDIR)/nncommon.Tpo -c -o nncommon.lo `test -f './nn/nncommon.c' || echo '$(srcdir)/'`./nn/nncommon.c --@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/nncommon.Tpo $(DEPDIR)/nncommon.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='./nn/nncommon.c' object='nncommon.lo' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT nncommon.lo -MD -MP -MF $(DEPDIR)/nncommon.Tpo -c -o nncommon.lo `test -f './nn/nncommon.c' || echo '$(srcdir)/'`./nn/nncommon.c -+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/nncommon.Tpo $(DEPDIR)/nncommon.Plo -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='./nn/nncommon.c' object='nncommon.lo' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o nncommon.lo `test -f './nn/nncommon.c' || echo '$(srcdir)/'`./nn/nncommon.c -+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o nncommon.lo `test -f './nn/nncommon.c' || echo '$(srcdir)/'`./nn/nncommon.c - - nnpi.lo: ./nn/nnpi.c --@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT nnpi.lo -MD -MP -MF $(DEPDIR)/nnpi.Tpo -c -o nnpi.lo `test -f './nn/nnpi.c' || echo '$(srcdir)/'`./nn/nnpi.c --@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/nnpi.Tpo $(DEPDIR)/nnpi.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='./nn/nnpi.c' object='nnpi.lo' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT nnpi.lo -MD -MP -MF $(DEPDIR)/nnpi.Tpo -c -o nnpi.lo `test -f './nn/nnpi.c' || echo '$(srcdir)/'`./nn/nnpi.c -+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/nnpi.Tpo $(DEPDIR)/nnpi.Plo -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='./nn/nnpi.c' object='nnpi.lo' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o nnpi.lo `test -f './nn/nnpi.c' || echo '$(srcdir)/'`./nn/nnpi.c -+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o nnpi.lo `test -f './nn/nnpi.c' || echo '$(srcdir)/'`./nn/nnpi.c - - triangle.lo: ./nn/triangle.c --@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT triangle.lo -MD -MP -MF $(DEPDIR)/triangle.Tpo -c -o triangle.lo `test -f './nn/triangle.c' || echo '$(srcdir)/'`./nn/triangle.c --@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/triangle.Tpo $(DEPDIR)/triangle.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='./nn/triangle.c' object='triangle.lo' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT triangle.lo -MD -MP -MF $(DEPDIR)/triangle.Tpo -c -o triangle.lo `test -f './nn/triangle.c' || echo '$(srcdir)/'`./nn/triangle.c -+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/triangle.Tpo $(DEPDIR)/triangle.Plo -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='./nn/triangle.c' object='triangle.lo' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o triangle.lo `test -f './nn/triangle.c' || echo '$(srcdir)/'`./nn/triangle.c -+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o triangle.lo `test -f './nn/triangle.c' || echo '$(srcdir)/'`./nn/triangle.c - - .cpp.o: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< - - .cpp.obj: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - - .cpp.lo: --@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< - - mostlyclean-libtool: - -rm -f *.lo -@@ -500,26 +616,15 @@ mostlyclean-libtool: - clean-libtool: - -rm -rf .libs _libs - --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -+ID: $(am__tagged_files) -+ $(am__define_uniq_tagged_files); mkid -fID $$unique -+tags: tags-am -+TAGS: tags -+ -+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ -@@ -531,15 +636,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $$unique; \ - fi; \ - fi --ctags: CTAGS --CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ctags: ctags-am -+ -+CTAGS: ctags -+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) -+ $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique -@@ -548,6 +649,21 @@ GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -+cscopelist: cscopelist-am -+ -+cscopelist-am: $(am__tagged_files) -+ list='$(am__tagged_files)'; \ -+ case "$(srcdir)" in \ -+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ -+ *) sdir=$(subdir)/$(srcdir) ;; \ -+ esac; \ -+ for i in $$list; do \ -+ if test -f "$$i"; then \ -+ echo "$(subdir)/$$i"; \ -+ else \ -+ echo "$$sdir/$$i"; \ -+ fi; \ -+ done >> $(top_builddir)/cscope.files - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -@@ -599,10 +715,15 @@ install-am: all-am - - installcheck: installcheck-am - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+ if test -z '$(STRIP)'; then \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ install; \ -+ else \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -+ fi - mostlyclean-generic: - - clean-generic: -@@ -687,19 +808,20 @@ uninstall-am: uninstall-pkglibLTLIBRARIES - - .MAKE: install-am install-strip - --.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ -- clean-libtool clean-pkglibLTLIBRARIES ctags distclean \ -- distclean-compile distclean-generic distclean-libtool \ -- distclean-tags distdir dvi dvi-am html html-am info info-am \ -- install install-am install-data install-data-am install-dvi \ -- install-dvi-am install-exec install-exec-am install-html \ -- install-html-am install-info install-info-am install-man \ -- install-pdf install-pdf-am install-pkglibLTLIBRARIES \ -- install-ps install-ps-am install-strip installcheck \ -- installcheck-am installdirs maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-compile \ -- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -- tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES -+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ -+ clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \ -+ ctags-am distclean distclean-compile distclean-generic \ -+ distclean-libtool distclean-tags distdir dvi dvi-am html \ -+ html-am info info-am install install-am install-data \ -+ install-data-am install-dvi install-dvi-am install-exec \ -+ install-exec-am install-html install-html-am install-info \ -+ install-info-am install-man install-pdf install-pdf-am \ -+ install-pkglibLTLIBRARIES install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ maintainer-clean maintainer-clean-generic mostlyclean \ -+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ -+ pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ -+ uninstall-pkglibLTLIBRARIES - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff --git a/src/modules/grid/grid_spline/Makefile.in b/src/modules/grid/grid_spline/Makefile.in -index fbb0f0d..9d6856f 100644 ---- a/src/modules/grid/grid_spline/Makefile.in -+++ b/src/modules/grid/grid_spline/Makefile.in -@@ -1,9 +1,8 @@ --# Makefile.in generated by automake 1.11.1 from Makefile.am. -+# Makefile.in generated by automake 1.14 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, --# Inc. -+# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+ - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -16,6 +15,51 @@ - @SET_MAKE@ - - VPATH = @srcdir@ -+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -+am__make_running_with_option = \ -+ case $${target_option-} in \ -+ ?) ;; \ -+ *) echo "am__make_running_with_option: internal error: invalid" \ -+ "target option '$${target_option-}' specified" >&2; \ -+ exit 1;; \ -+ esac; \ -+ has_opt=no; \ -+ sane_makeflags=$$MAKEFLAGS; \ -+ if $(am__is_gnu_make); then \ -+ sane_makeflags=$$MFLAGS; \ -+ else \ -+ case $$MAKEFLAGS in \ -+ *\\[\ \ ]*) \ -+ bs=\\; \ -+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -+ esac; \ -+ fi; \ -+ skip_next=no; \ -+ strip_trailopt () \ -+ { \ -+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -+ }; \ -+ for flg in $$sane_makeflags; do \ -+ test $$skip_next = yes && { skip_next=no; continue; }; \ -+ case $$flg in \ -+ *=*|--*) continue;; \ -+ -*I) strip_trailopt 'I'; skip_next=yes;; \ -+ -*I?*) strip_trailopt 'I';; \ -+ -*O) strip_trailopt 'O'; skip_next=yes;; \ -+ -*O?*) strip_trailopt 'O';; \ -+ -*l) strip_trailopt 'l'; skip_next=yes;; \ -+ -*l?*) strip_trailopt 'l';; \ -+ -[dEDm]) skip_next=yes;; \ -+ -[JT]) skip_next=yes;; \ -+ esac; \ -+ case $$flg in \ -+ *$$target_option*) has_opt=yes; break;; \ -+ esac; \ -+ done; \ -+ test $$has_opt = yes -+am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -+am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -35,7 +79,8 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - subdir = src/modules/grid/grid_spline --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ -+ $(top_srcdir)/depcomp - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ - $(top_srcdir)/m4/ax_python_devel.m4 \ -@@ -71,6 +116,12 @@ am__nobase_list = $(am__nobase_strip_setup); \ - am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -+am__uninstall_files_from_dir = { \ -+ test -z "$$files" \ -+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ -+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ -+ $(am__cd) "$$dir" && rm -f $$files; }; \ -+ } - am__installdirs = "$(DESTDIR)$(pkglibdir)" - LTLIBRARIES = $(pkglib_LTLIBRARIES) - libgrid_spline_la_DEPENDENCIES = \ -@@ -81,35 +132,92 @@ am_libgrid_spline_la_OBJECTS = csa.lo Gridding_Spline_BA.lo \ - Gridding_Spline_TPS_Global.lo Gridding_Spline_TPS_Local.lo \ - Gridding_Spline_TPS_TIN.lo MLB_Interface.lo - libgrid_spline_la_OBJECTS = $(am_libgrid_spline_la_OBJECTS) -+AM_V_lt = $(am__v_lt_@AM_V@) -+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -+am__v_lt_0 = --silent -+am__v_lt_1 = -+AM_V_P = $(am__v_P_@AM_V@) -+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -+am__v_P_0 = false -+am__v_P_1 = : -+AM_V_GEN = $(am__v_GEN_@AM_V@) -+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+am__v_GEN_0 = @echo " GEN " $@; -+am__v_GEN_1 = -+AM_V_at = $(am__v_at_@AM_V@) -+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+am__v_at_0 = @ -+am__v_at_1 = - DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - am__mv = mv -f - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CFLAGS) $(CFLAGS) -+AM_V_CC = $(am__v_CC_@AM_V@) -+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -+am__v_CC_0 = @echo " CC " $@; -+am__v_CC_1 = - CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CCLD = $(am__v_CCLD_@AM_V@) -+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -+am__v_CCLD_0 = @echo " CCLD " $@; -+am__v_CCLD_1 = - CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) --LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CXXFLAGS) $(CXXFLAGS) -+AM_V_CXX = $(am__v_CXX_@AM_V@) -+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) -+am__v_CXX_0 = @echo " CXX " $@; -+am__v_CXX_1 = - CXXLD = $(CXX) --CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ -+ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) -+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) -+am__v_CXXLD_0 = @echo " CXXLD " $@; -+am__v_CXXLD_1 = - SOURCES = $(libgrid_spline_la_SOURCES) - DIST_SOURCES = $(libgrid_spline_la_SOURCES) -+am__can_run_installinfo = \ -+ case $$AM_UPDATE_INFO_DIR in \ -+ n|no|NO) false;; \ -+ *) (install-info --version) >/dev/null 2>&1;; \ -+ esac -+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -+# Read a list of newline-separated strings from the standard input, -+# and print each of them once, without duplicates. Input order is -+# *not* preserved. -+am__uniquify_input = $(AWK) '\ -+ BEGIN { nonempty = 0; } \ -+ { items[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in items) print i; }; } \ -+' -+# Make sure the list of sources is unique. This is necessary because, -+# e.g., the same source file might be shared among _SOURCES variables -+# for different programs/libraries. -+am__define_uniq_tagged_files = \ -+ list='$(am__tagged_files)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | $(am__uniquify_input)` - ETAGS = etags - CTAGS = ctags - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ -+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ -@@ -130,6 +238,7 @@ CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DISABLELIBHARU = @DISABLELIBHARU@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -157,6 +266,7 @@ LOCAL_INCS = @LOCAL_INCS@ - LOCAL_LIBS = @LOCAL_LIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - NM = @NM@ - NMEDIT = @NMEDIT@ -@@ -169,6 +279,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - POW_LIB = @POW_LIB@ -@@ -194,6 +305,7 @@ abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -@@ -227,7 +339,6 @@ libdir = @libdir@ - libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -@@ -315,9 +426,9 @@ $(top_srcdir)/configure: $(am__configure_deps) - $(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - $(am__aclocal_m4_deps): -+ - install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" - @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ - list2=; for p in $$list; do \ - if test -f $$p; then \ -@@ -325,6 +436,8 @@ install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - else :; fi; \ - done; \ - test -z "$$list2" || { \ -+ echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \ -+ $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \ - } -@@ -340,14 +453,17 @@ uninstall-pkglibLTLIBRARIES: - - clean-pkglibLTLIBRARIES: - -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES) -- @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \ -- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -- echo "rm -f \"$${dir}/so_locations\""; \ -- rm -f "$${dir}/so_locations"; \ -- done --libgrid_spline.la: $(libgrid_spline_la_OBJECTS) $(libgrid_spline_la_DEPENDENCIES) -- $(CXXLINK) -rpath $(pkglibdir) $(libgrid_spline_la_OBJECTS) $(libgrid_spline_la_LIBADD) $(LIBS) -+ @list='$(pkglib_LTLIBRARIES)'; \ -+ locs=`for p in $$list; do echo $$p; done | \ -+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ -+ sort -u`; \ -+ test -z "$$locs" || { \ -+ echo rm -f $${locs}; \ -+ rm -f $${locs}; \ -+ } -+ -+libgrid_spline.la: $(libgrid_spline_la_OBJECTS) $(libgrid_spline_la_DEPENDENCIES) $(EXTRA_libgrid_spline_la_DEPENDENCIES) -+ $(AM_V_CXXLD)$(CXXLINK) -rpath $(pkglibdir) $(libgrid_spline_la_OBJECTS) $(libgrid_spline_la_LIBADD) $(LIBS) - - mostlyclean-compile: - -rm -f *.$(OBJEXT) -@@ -367,46 +483,46 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/csa.Plo@am__quote@ - - .c.o: --@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(COMPILE) -c $< -+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< - - .c.obj: --@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` --@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` -+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - - .c.lo: --@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< -+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< - - .cpp.o: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< - - .cpp.obj: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - - .cpp.lo: --@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< - - mostlyclean-libtool: - -rm -f *.lo -@@ -414,26 +530,15 @@ mostlyclean-libtool: - clean-libtool: - -rm -rf .libs _libs - --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -+ID: $(am__tagged_files) -+ $(am__define_uniq_tagged_files); mkid -fID $$unique -+tags: tags-am -+TAGS: tags -+ -+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ -@@ -445,15 +550,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $$unique; \ - fi; \ - fi --ctags: CTAGS --CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ctags: ctags-am -+ -+CTAGS: ctags -+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) -+ $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique -@@ -462,6 +563,21 @@ GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -+cscopelist: cscopelist-am -+ -+cscopelist-am: $(am__tagged_files) -+ list='$(am__tagged_files)'; \ -+ case "$(srcdir)" in \ -+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ -+ *) sdir=$(subdir)/$(srcdir) ;; \ -+ esac; \ -+ for i in $$list; do \ -+ if test -f "$$i"; then \ -+ echo "$(subdir)/$$i"; \ -+ else \ -+ echo "$$sdir/$$i"; \ -+ fi; \ -+ done >> $(top_builddir)/cscope.files - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -@@ -513,10 +629,15 @@ install-am: all-am - - installcheck: installcheck-am - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+ if test -z '$(STRIP)'; then \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ install; \ -+ else \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -+ fi - mostlyclean-generic: - - clean-generic: -@@ -601,19 +722,20 @@ uninstall-am: uninstall-pkglibLTLIBRARIES - - .MAKE: install-am install-strip - --.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ -- clean-libtool clean-pkglibLTLIBRARIES ctags distclean \ -- distclean-compile distclean-generic distclean-libtool \ -- distclean-tags distdir dvi dvi-am html html-am info info-am \ -- install install-am install-data install-data-am install-dvi \ -- install-dvi-am install-exec install-exec-am install-html \ -- install-html-am install-info install-info-am install-man \ -- install-pdf install-pdf-am install-pkglibLTLIBRARIES \ -- install-ps install-ps-am install-strip installcheck \ -- installcheck-am installdirs maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-compile \ -- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -- tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES -+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ -+ clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \ -+ ctags-am distclean distclean-compile distclean-generic \ -+ distclean-libtool distclean-tags distdir dvi dvi-am html \ -+ html-am info info-am install install-am install-data \ -+ install-data-am install-dvi install-dvi-am install-exec \ -+ install-exec-am install-html install-html-am install-info \ -+ install-info-am install-man install-pdf install-pdf-am \ -+ install-pkglibLTLIBRARIES install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ maintainer-clean maintainer-clean-generic mostlyclean \ -+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ -+ pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ -+ uninstall-pkglibLTLIBRARIES - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff --git a/src/modules/grid/grid_tools/Makefile.in b/src/modules/grid/grid_tools/Makefile.in -index 6debcd4..d76b33a 100644 ---- a/src/modules/grid/grid_tools/Makefile.in -+++ b/src/modules/grid/grid_tools/Makefile.in -@@ -1,9 +1,8 @@ --# Makefile.in generated by automake 1.11.1 from Makefile.am. -+# Makefile.in generated by automake 1.14 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, --# Inc. -+# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+ - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -16,6 +15,51 @@ - @SET_MAKE@ - - VPATH = @srcdir@ -+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -+am__make_running_with_option = \ -+ case $${target_option-} in \ -+ ?) ;; \ -+ *) echo "am__make_running_with_option: internal error: invalid" \ -+ "target option '$${target_option-}' specified" >&2; \ -+ exit 1;; \ -+ esac; \ -+ has_opt=no; \ -+ sane_makeflags=$$MAKEFLAGS; \ -+ if $(am__is_gnu_make); then \ -+ sane_makeflags=$$MFLAGS; \ -+ else \ -+ case $$MAKEFLAGS in \ -+ *\\[\ \ ]*) \ -+ bs=\\; \ -+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -+ esac; \ -+ fi; \ -+ skip_next=no; \ -+ strip_trailopt () \ -+ { \ -+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -+ }; \ -+ for flg in $$sane_makeflags; do \ -+ test $$skip_next = yes && { skip_next=no; continue; }; \ -+ case $$flg in \ -+ *=*|--*) continue;; \ -+ -*I) strip_trailopt 'I'; skip_next=yes;; \ -+ -*I?*) strip_trailopt 'I';; \ -+ -*O) strip_trailopt 'O'; skip_next=yes;; \ -+ -*O?*) strip_trailopt 'O';; \ -+ -*l) strip_trailopt 'l'; skip_next=yes;; \ -+ -*l?*) strip_trailopt 'l';; \ -+ -[dEDm]) skip_next=yes;; \ -+ -[JT]) skip_next=yes;; \ -+ esac; \ -+ case $$flg in \ -+ *$$target_option*) has_opt=yes; break;; \ -+ esac; \ -+ done; \ -+ test $$has_opt = yes -+am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -+am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -35,7 +79,8 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - subdir = src/modules/grid/grid_tools --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ -+ $(top_srcdir)/depcomp - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ - $(top_srcdir)/m4/ax_python_devel.m4 \ -@@ -71,6 +116,12 @@ am__nobase_list = $(am__nobase_strip_setup); \ - am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -+am__uninstall_files_from_dir = { \ -+ test -z "$$files" \ -+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ -+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ -+ $(am__cd) "$$dir" && rm -f $$files; }; \ -+ } - am__installdirs = "$(DESTDIR)$(pkglibdir)" - LTLIBRARIES = $(pkglib_LTLIBRARIES) - libgrid_tools_la_DEPENDENCIES = \ -@@ -88,35 +139,92 @@ am_libgrid_tools_la_OBJECTS = CreateGridSystem.lo Grid_Aggregate.lo \ - Grid_Value_Replace_Interactive.lo Grid_Value_Request.lo \ - Grid_Value_Type.lo GridsFromTableAndGrid.lo MLB_Interface.lo - libgrid_tools_la_OBJECTS = $(am_libgrid_tools_la_OBJECTS) -+AM_V_lt = $(am__v_lt_@AM_V@) -+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -+am__v_lt_0 = --silent -+am__v_lt_1 = -+AM_V_P = $(am__v_P_@AM_V@) -+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -+am__v_P_0 = false -+am__v_P_1 = : -+AM_V_GEN = $(am__v_GEN_@AM_V@) -+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+am__v_GEN_0 = @echo " GEN " $@; -+am__v_GEN_1 = -+AM_V_at = $(am__v_at_@AM_V@) -+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+am__v_at_0 = @ -+am__v_at_1 = - DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - am__mv = mv -f - CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) --LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CXXFLAGS) $(CXXFLAGS) -+AM_V_CXX = $(am__v_CXX_@AM_V@) -+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) -+am__v_CXX_0 = @echo " CXX " $@; -+am__v_CXX_1 = - CXXLD = $(CXX) --CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ -+ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) -+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) -+am__v_CXXLD_0 = @echo " CXXLD " $@; -+am__v_CXXLD_1 = - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CFLAGS) $(CFLAGS) -+AM_V_CC = $(am__v_CC_@AM_V@) -+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -+am__v_CC_0 = @echo " CC " $@; -+am__v_CC_1 = - CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CCLD = $(am__v_CCLD_@AM_V@) -+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -+am__v_CCLD_0 = @echo " CCLD " $@; -+am__v_CCLD_1 = - SOURCES = $(libgrid_tools_la_SOURCES) - DIST_SOURCES = $(libgrid_tools_la_SOURCES) -+am__can_run_installinfo = \ -+ case $$AM_UPDATE_INFO_DIR in \ -+ n|no|NO) false;; \ -+ *) (install-info --version) >/dev/null 2>&1;; \ -+ esac -+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -+# Read a list of newline-separated strings from the standard input, -+# and print each of them once, without duplicates. Input order is -+# *not* preserved. -+am__uniquify_input = $(AWK) '\ -+ BEGIN { nonempty = 0; } \ -+ { items[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in items) print i; }; } \ -+' -+# Make sure the list of sources is unique. This is necessary because, -+# e.g., the same source file might be shared among _SOURCES variables -+# for different programs/libraries. -+am__define_uniq_tagged_files = \ -+ list='$(am__tagged_files)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | $(am__uniquify_input)` - ETAGS = etags - CTAGS = ctags - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ -+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ -@@ -137,6 +245,7 @@ CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DISABLELIBHARU = @DISABLELIBHARU@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -164,6 +273,7 @@ LOCAL_INCS = @LOCAL_INCS@ - LOCAL_LIBS = @LOCAL_LIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - NM = @NM@ - NMEDIT = @NMEDIT@ -@@ -176,6 +286,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - POW_LIB = @POW_LIB@ -@@ -201,6 +312,7 @@ abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -@@ -234,7 +346,6 @@ libdir = @libdir@ - libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -@@ -364,9 +475,9 @@ $(top_srcdir)/configure: $(am__configure_deps) - $(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - $(am__aclocal_m4_deps): -+ - install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" - @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ - list2=; for p in $$list; do \ - if test -f $$p; then \ -@@ -374,6 +485,8 @@ install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - else :; fi; \ - done; \ - test -z "$$list2" || { \ -+ echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \ -+ $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \ - } -@@ -389,14 +502,17 @@ uninstall-pkglibLTLIBRARIES: - - clean-pkglibLTLIBRARIES: - -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES) -- @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \ -- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -- echo "rm -f \"$${dir}/so_locations\""; \ -- rm -f "$${dir}/so_locations"; \ -- done --libgrid_tools.la: $(libgrid_tools_la_OBJECTS) $(libgrid_tools_la_DEPENDENCIES) -- $(CXXLINK) -rpath $(pkglibdir) $(libgrid_tools_la_OBJECTS) $(libgrid_tools_la_LIBADD) $(LIBS) -+ @list='$(pkglib_LTLIBRARIES)'; \ -+ locs=`for p in $$list; do echo $$p; done | \ -+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ -+ sort -u`; \ -+ test -z "$$locs" || { \ -+ echo rm -f $${locs}; \ -+ rm -f $${locs}; \ -+ } -+ -+libgrid_tools.la: $(libgrid_tools_la_OBJECTS) $(libgrid_tools_la_DEPENDENCIES) $(EXTRA_libgrid_tools_la_DEPENDENCIES) -+ $(AM_V_CXXLD)$(CXXLINK) -rpath $(pkglibdir) $(libgrid_tools_la_OBJECTS) $(libgrid_tools_la_LIBADD) $(LIBS) - - mostlyclean-compile: - -rm -f *.$(OBJEXT) -@@ -437,25 +553,25 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MLB_Interface.Plo@am__quote@ - - .cpp.o: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< - - .cpp.obj: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - - .cpp.lo: --@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< - - mostlyclean-libtool: - -rm -f *.lo -@@ -463,26 +579,15 @@ mostlyclean-libtool: - clean-libtool: - -rm -rf .libs _libs - --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -+ID: $(am__tagged_files) -+ $(am__define_uniq_tagged_files); mkid -fID $$unique -+tags: tags-am -+TAGS: tags -+ -+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ -@@ -494,15 +599,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $$unique; \ - fi; \ - fi --ctags: CTAGS --CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ctags: ctags-am -+ -+CTAGS: ctags -+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) -+ $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique -@@ -511,6 +612,21 @@ GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -+cscopelist: cscopelist-am -+ -+cscopelist-am: $(am__tagged_files) -+ list='$(am__tagged_files)'; \ -+ case "$(srcdir)" in \ -+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ -+ *) sdir=$(subdir)/$(srcdir) ;; \ -+ esac; \ -+ for i in $$list; do \ -+ if test -f "$$i"; then \ -+ echo "$(subdir)/$$i"; \ -+ else \ -+ echo "$$sdir/$$i"; \ -+ fi; \ -+ done >> $(top_builddir)/cscope.files - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -@@ -562,10 +678,15 @@ install-am: all-am - - installcheck: installcheck-am - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+ if test -z '$(STRIP)'; then \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ install; \ -+ else \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -+ fi - mostlyclean-generic: - - clean-generic: -@@ -650,19 +771,20 @@ uninstall-am: uninstall-pkglibLTLIBRARIES - - .MAKE: install-am install-strip - --.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ -- clean-libtool clean-pkglibLTLIBRARIES ctags distclean \ -- distclean-compile distclean-generic distclean-libtool \ -- distclean-tags distdir dvi dvi-am html html-am info info-am \ -- install install-am install-data install-data-am install-dvi \ -- install-dvi-am install-exec install-exec-am install-html \ -- install-html-am install-info install-info-am install-man \ -- install-pdf install-pdf-am install-pkglibLTLIBRARIES \ -- install-ps install-ps-am install-strip installcheck \ -- installcheck-am installdirs maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-compile \ -- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -- tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES -+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ -+ clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \ -+ ctags-am distclean distclean-compile distclean-generic \ -+ distclean-libtool distclean-tags distdir dvi dvi-am html \ -+ html-am info info-am install install-am install-data \ -+ install-data-am install-dvi install-dvi-am install-exec \ -+ install-exec-am install-html install-html-am install-info \ -+ install-info-am install-man install-pdf install-pdf-am \ -+ install-pkglibLTLIBRARIES install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ maintainer-clean maintainer-clean-generic mostlyclean \ -+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ -+ pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ -+ uninstall-pkglibLTLIBRARIES - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff --git a/src/modules/grid/grid_visualisation/Makefile.in b/src/modules/grid/grid_visualisation/Makefile.in -index 21b021b..f409be7 100644 ---- a/src/modules/grid/grid_visualisation/Makefile.in -+++ b/src/modules/grid/grid_visualisation/Makefile.in -@@ -1,9 +1,8 @@ --# Makefile.in generated by automake 1.11.1 from Makefile.am. -+# Makefile.in generated by automake 1.14 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, --# Inc. -+# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+ - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -16,6 +15,51 @@ - @SET_MAKE@ - - VPATH = @srcdir@ -+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -+am__make_running_with_option = \ -+ case $${target_option-} in \ -+ ?) ;; \ -+ *) echo "am__make_running_with_option: internal error: invalid" \ -+ "target option '$${target_option-}' specified" >&2; \ -+ exit 1;; \ -+ esac; \ -+ has_opt=no; \ -+ sane_makeflags=$$MAKEFLAGS; \ -+ if $(am__is_gnu_make); then \ -+ sane_makeflags=$$MFLAGS; \ -+ else \ -+ case $$MAKEFLAGS in \ -+ *\\[\ \ ]*) \ -+ bs=\\; \ -+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -+ esac; \ -+ fi; \ -+ skip_next=no; \ -+ strip_trailopt () \ -+ { \ -+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -+ }; \ -+ for flg in $$sane_makeflags; do \ -+ test $$skip_next = yes && { skip_next=no; continue; }; \ -+ case $$flg in \ -+ *=*|--*) continue;; \ -+ -*I) strip_trailopt 'I'; skip_next=yes;; \ -+ -*I?*) strip_trailopt 'I';; \ -+ -*O) strip_trailopt 'O'; skip_next=yes;; \ -+ -*O?*) strip_trailopt 'O';; \ -+ -*l) strip_trailopt 'l'; skip_next=yes;; \ -+ -*l?*) strip_trailopt 'l';; \ -+ -[dEDm]) skip_next=yes;; \ -+ -[JT]) skip_next=yes;; \ -+ esac; \ -+ case $$flg in \ -+ *$$target_option*) has_opt=yes; break;; \ -+ esac; \ -+ done; \ -+ test $$has_opt = yes -+am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -+am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -35,7 +79,8 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - subdir = src/modules/grid/grid_visualisation --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ -+ $(top_srcdir)/depcomp - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ - $(top_srcdir)/m4/ax_python_devel.m4 \ -@@ -71,6 +116,12 @@ am__nobase_list = $(am__nobase_strip_setup); \ - am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -+am__uninstall_files_from_dir = { \ -+ test -z "$$files" \ -+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ -+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ -+ $(am__cd) "$$dir" && rm -f $$files; }; \ -+ } - am__installdirs = "$(DESTDIR)$(pkglibdir)" - LTLIBRARIES = $(pkglib_LTLIBRARIES) - libgrid_visualisation_la_DEPENDENCIES = \ -@@ -82,35 +133,92 @@ am_libgrid_visualisation_la_OBJECTS = Grid_3D_Image.lo \ - Grid_Aspect_Slope_Map.lo MLB_Interface.lo - libgrid_visualisation_la_OBJECTS = \ - $(am_libgrid_visualisation_la_OBJECTS) -+AM_V_lt = $(am__v_lt_@AM_V@) -+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -+am__v_lt_0 = --silent -+am__v_lt_1 = -+AM_V_P = $(am__v_P_@AM_V@) -+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -+am__v_P_0 = false -+am__v_P_1 = : -+AM_V_GEN = $(am__v_GEN_@AM_V@) -+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+am__v_GEN_0 = @echo " GEN " $@; -+am__v_GEN_1 = -+AM_V_at = $(am__v_at_@AM_V@) -+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+am__v_at_0 = @ -+am__v_at_1 = - DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - am__mv = mv -f - CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) --LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CXXFLAGS) $(CXXFLAGS) -+AM_V_CXX = $(am__v_CXX_@AM_V@) -+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) -+am__v_CXX_0 = @echo " CXX " $@; -+am__v_CXX_1 = - CXXLD = $(CXX) --CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ -+ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) -+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) -+am__v_CXXLD_0 = @echo " CXXLD " $@; -+am__v_CXXLD_1 = - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CFLAGS) $(CFLAGS) -+AM_V_CC = $(am__v_CC_@AM_V@) -+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -+am__v_CC_0 = @echo " CC " $@; -+am__v_CC_1 = - CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CCLD = $(am__v_CCLD_@AM_V@) -+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -+am__v_CCLD_0 = @echo " CCLD " $@; -+am__v_CCLD_1 = - SOURCES = $(libgrid_visualisation_la_SOURCES) - DIST_SOURCES = $(libgrid_visualisation_la_SOURCES) -+am__can_run_installinfo = \ -+ case $$AM_UPDATE_INFO_DIR in \ -+ n|no|NO) false;; \ -+ *) (install-info --version) >/dev/null 2>&1;; \ -+ esac -+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -+# Read a list of newline-separated strings from the standard input, -+# and print each of them once, without duplicates. Input order is -+# *not* preserved. -+am__uniquify_input = $(AWK) '\ -+ BEGIN { nonempty = 0; } \ -+ { items[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in items) print i; }; } \ -+' -+# Make sure the list of sources is unique. This is necessary because, -+# e.g., the same source file might be shared among _SOURCES variables -+# for different programs/libraries. -+am__define_uniq_tagged_files = \ -+ list='$(am__tagged_files)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | $(am__uniquify_input)` - ETAGS = etags - CTAGS = ctags - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ -+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ -@@ -131,6 +239,7 @@ CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DISABLELIBHARU = @DISABLELIBHARU@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -158,6 +267,7 @@ LOCAL_INCS = @LOCAL_INCS@ - LOCAL_LIBS = @LOCAL_LIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - NM = @NM@ - NMEDIT = @NMEDIT@ -@@ -170,6 +280,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - POW_LIB = @POW_LIB@ -@@ -195,6 +306,7 @@ abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -@@ -228,7 +340,6 @@ libdir = @libdir@ - libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -@@ -314,9 +425,9 @@ $(top_srcdir)/configure: $(am__configure_deps) - $(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - $(am__aclocal_m4_deps): -+ - install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" - @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ - list2=; for p in $$list; do \ - if test -f $$p; then \ -@@ -324,6 +435,8 @@ install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - else :; fi; \ - done; \ - test -z "$$list2" || { \ -+ echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \ -+ $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \ - } -@@ -339,14 +452,17 @@ uninstall-pkglibLTLIBRARIES: - - clean-pkglibLTLIBRARIES: - -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES) -- @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \ -- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -- echo "rm -f \"$${dir}/so_locations\""; \ -- rm -f "$${dir}/so_locations"; \ -- done --libgrid_visualisation.la: $(libgrid_visualisation_la_OBJECTS) $(libgrid_visualisation_la_DEPENDENCIES) -- $(CXXLINK) -rpath $(pkglibdir) $(libgrid_visualisation_la_OBJECTS) $(libgrid_visualisation_la_LIBADD) $(LIBS) -+ @list='$(pkglib_LTLIBRARIES)'; \ -+ locs=`for p in $$list; do echo $$p; done | \ -+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ -+ sort -u`; \ -+ test -z "$$locs" || { \ -+ echo rm -f $${locs}; \ -+ rm -f $${locs}; \ -+ } -+ -+libgrid_visualisation.la: $(libgrid_visualisation_la_OBJECTS) $(libgrid_visualisation_la_DEPENDENCIES) $(EXTRA_libgrid_visualisation_la_DEPENDENCIES) -+ $(AM_V_CXXLD)$(CXXLINK) -rpath $(pkglibdir) $(libgrid_visualisation_la_OBJECTS) $(libgrid_visualisation_la_LIBADD) $(LIBS) - - mostlyclean-compile: - -rm -f *.$(OBJEXT) -@@ -365,25 +481,25 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MLB_Interface.Plo@am__quote@ - - .cpp.o: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< - - .cpp.obj: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - - .cpp.lo: --@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< - - mostlyclean-libtool: - -rm -f *.lo -@@ -391,26 +507,15 @@ mostlyclean-libtool: - clean-libtool: - -rm -rf .libs _libs - --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -+ID: $(am__tagged_files) -+ $(am__define_uniq_tagged_files); mkid -fID $$unique -+tags: tags-am -+TAGS: tags -+ -+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ -@@ -422,15 +527,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $$unique; \ - fi; \ - fi --ctags: CTAGS --CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ctags: ctags-am -+ -+CTAGS: ctags -+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) -+ $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique -@@ -439,6 +540,21 @@ GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -+cscopelist: cscopelist-am -+ -+cscopelist-am: $(am__tagged_files) -+ list='$(am__tagged_files)'; \ -+ case "$(srcdir)" in \ -+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ -+ *) sdir=$(subdir)/$(srcdir) ;; \ -+ esac; \ -+ for i in $$list; do \ -+ if test -f "$$i"; then \ -+ echo "$(subdir)/$$i"; \ -+ else \ -+ echo "$$sdir/$$i"; \ -+ fi; \ -+ done >> $(top_builddir)/cscope.files - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -@@ -490,10 +606,15 @@ install-am: all-am - - installcheck: installcheck-am - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+ if test -z '$(STRIP)'; then \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ install; \ -+ else \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -+ fi - mostlyclean-generic: - - clean-generic: -@@ -578,19 +699,20 @@ uninstall-am: uninstall-pkglibLTLIBRARIES - - .MAKE: install-am install-strip - --.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ -- clean-libtool clean-pkglibLTLIBRARIES ctags distclean \ -- distclean-compile distclean-generic distclean-libtool \ -- distclean-tags distdir dvi dvi-am html html-am info info-am \ -- install install-am install-data install-data-am install-dvi \ -- install-dvi-am install-exec install-exec-am install-html \ -- install-html-am install-info install-info-am install-man \ -- install-pdf install-pdf-am install-pkglibLTLIBRARIES \ -- install-ps install-ps-am install-strip installcheck \ -- installcheck-am installdirs maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-compile \ -- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -- tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES -+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ -+ clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \ -+ ctags-am distclean distclean-compile distclean-generic \ -+ distclean-libtool distclean-tags distdir dvi dvi-am html \ -+ html-am info info-am install install-am install-data \ -+ install-data-am install-dvi install-dvi-am install-exec \ -+ install-exec-am install-html install-html-am install-info \ -+ install-info-am install-man install-pdf install-pdf-am \ -+ install-pkglibLTLIBRARIES install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ maintainer-clean maintainer-clean-generic mostlyclean \ -+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ -+ pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ -+ uninstall-pkglibLTLIBRARIES - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff --git a/src/modules/pointcloud/Makefile.in b/src/modules/pointcloud/Makefile.in -index 3a26650..4e4d66b 100644 ---- a/src/modules/pointcloud/Makefile.in -+++ b/src/modules/pointcloud/Makefile.in -@@ -1,9 +1,8 @@ --# Makefile.in generated by automake 1.11.1 from Makefile.am. -+# Makefile.in generated by automake 1.14 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, --# Inc. -+# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+ - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -15,6 +14,51 @@ - - @SET_MAKE@ - VPATH = @srcdir@ -+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -+am__make_running_with_option = \ -+ case $${target_option-} in \ -+ ?) ;; \ -+ *) echo "am__make_running_with_option: internal error: invalid" \ -+ "target option '$${target_option-}' specified" >&2; \ -+ exit 1;; \ -+ esac; \ -+ has_opt=no; \ -+ sane_makeflags=$$MAKEFLAGS; \ -+ if $(am__is_gnu_make); then \ -+ sane_makeflags=$$MFLAGS; \ -+ else \ -+ case $$MAKEFLAGS in \ -+ *\\[\ \ ]*) \ -+ bs=\\; \ -+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -+ esac; \ -+ fi; \ -+ skip_next=no; \ -+ strip_trailopt () \ -+ { \ -+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -+ }; \ -+ for flg in $$sane_makeflags; do \ -+ test $$skip_next = yes && { skip_next=no; continue; }; \ -+ case $$flg in \ -+ *=*|--*) continue;; \ -+ -*I) strip_trailopt 'I'; skip_next=yes;; \ -+ -*I?*) strip_trailopt 'I';; \ -+ -*O) strip_trailopt 'O'; skip_next=yes;; \ -+ -*O?*) strip_trailopt 'O';; \ -+ -*l) strip_trailopt 'l'; skip_next=yes;; \ -+ -*l?*) strip_trailopt 'l';; \ -+ -[dEDm]) skip_next=yes;; \ -+ -[JT]) skip_next=yes;; \ -+ esac; \ -+ case $$flg in \ -+ *$$target_option*) has_opt=yes; break;; \ -+ esac; \ -+ done; \ -+ test $$has_opt = yes -+am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -+am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -34,7 +78,7 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - subdir = src/modules/pointcloud --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ - $(top_srcdir)/m4/ax_python_devel.m4 \ -@@ -49,20 +93,58 @@ mkinstalldirs = $(install_sh) -d - CONFIG_HEADER = $(top_builddir)/config.h - CONFIG_CLEAN_FILES = - CONFIG_CLEAN_VPATH_FILES = -+AM_V_P = $(am__v_P_@AM_V@) -+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -+am__v_P_0 = false -+am__v_P_1 = : -+AM_V_GEN = $(am__v_GEN_@AM_V@) -+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+am__v_GEN_0 = @echo " GEN " $@; -+am__v_GEN_1 = -+AM_V_at = $(am__v_at_@AM_V@) -+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+am__v_at_0 = @ -+am__v_at_1 = - SOURCES = - DIST_SOURCES = --RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ -- html-recursive info-recursive install-data-recursive \ -- install-dvi-recursive install-exec-recursive \ -- install-html-recursive install-info-recursive \ -- install-pdf-recursive install-ps-recursive install-recursive \ -- installcheck-recursive installdirs-recursive pdf-recursive \ -- ps-recursive uninstall-recursive -+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ -+ ctags-recursive dvi-recursive html-recursive info-recursive \ -+ install-data-recursive install-dvi-recursive \ -+ install-exec-recursive install-html-recursive \ -+ install-info-recursive install-pdf-recursive \ -+ install-ps-recursive install-recursive installcheck-recursive \ -+ installdirs-recursive pdf-recursive ps-recursive \ -+ tags-recursive uninstall-recursive -+am__can_run_installinfo = \ -+ case $$AM_UPDATE_INFO_DIR in \ -+ n|no|NO) false;; \ -+ *) (install-info --version) >/dev/null 2>&1;; \ -+ esac - RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ - distclean-recursive maintainer-clean-recursive --AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ -- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ -+am__recursive_targets = \ -+ $(RECURSIVE_TARGETS) \ -+ $(RECURSIVE_CLEAN_TARGETS) \ -+ $(am__extra_recursive_targets) -+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ - distdir -+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -+# Read a list of newline-separated strings from the standard input, -+# and print each of them once, without duplicates. Input order is -+# *not* preserved. -+am__uniquify_input = $(AWK) '\ -+ BEGIN { nonempty = 0; } \ -+ { items[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in items) print i; }; } \ -+' -+# Make sure the list of sources is unique. This is necessary because, -+# e.g., the same source file might be shared among _SOURCES variables -+# for different programs/libraries. -+am__define_uniq_tagged_files = \ -+ list='$(am__tagged_files)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | $(am__uniquify_input)` - ETAGS = etags - CTAGS = ctags - DIST_SUBDIRS = pointcloud_tools pointcloud_viewer -@@ -94,6 +176,7 @@ am__relativize = \ - reldir="$$dir2" - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ -+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ -@@ -114,6 +197,7 @@ CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DISABLELIBHARU = @DISABLELIBHARU@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -141,6 +225,7 @@ LOCAL_INCS = @LOCAL_INCS@ - LOCAL_LIBS = @LOCAL_LIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - NM = @NM@ - NMEDIT = @NMEDIT@ -@@ -153,6 +238,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - POW_LIB = @POW_LIB@ -@@ -178,6 +264,7 @@ abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -@@ -211,7 +298,6 @@ libdir = @libdir@ - libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -@@ -274,22 +360,25 @@ clean-libtool: - -rm -rf .libs _libs - - # This directory's subdirectories are mostly independent; you can cd --# into them and run `make' without going through this Makefile. --# To change the values of `make' variables: instead of editing Makefiles, --# (1) if the variable is set in `config.status', edit `config.status' --# (which will cause the Makefiles to be regenerated when you run `make'); --# (2) otherwise, pass the desired values on the `make' command line. --$(RECURSIVE_TARGETS): -- @fail= failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -+# into them and run 'make' without going through this Makefile. -+# To change the values of 'make' variables: instead of editing Makefiles, -+# (1) if the variable is set in 'config.status', edit 'config.status' -+# (which will cause the Makefiles to be regenerated when you run 'make'); -+# (2) otherwise, pass the desired values on the 'make' command line. -+$(am__recursive_targets): -+ @fail=; \ -+ if $(am__make_keepgoing); then \ -+ failcom='fail=yes'; \ -+ else \ -+ failcom='exit 1'; \ -+ fi; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ -- list='$(SUBDIRS)'; for subdir in $$list; do \ -+ case "$@" in \ -+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -+ *) list='$(SUBDIRS)' ;; \ -+ esac; \ -+ for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ -@@ -304,57 +393,12 @@ $(RECURSIVE_TARGETS): - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - --$(RECURSIVE_CLEAN_TARGETS): -- @fail= failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -- dot_seen=no; \ -- case "$@" in \ -- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -- *) list='$(SUBDIRS)' ;; \ -- esac; \ -- rev=''; for subdir in $$list; do \ -- if test "$$subdir" = "."; then :; else \ -- rev="$$subdir $$rev"; \ -- fi; \ -- done; \ -- rev="$$rev ."; \ -- target=`echo $@ | sed s/-recursive//`; \ -- for subdir in $$rev; do \ -- echo "Making $$target in $$subdir"; \ -- if test "$$subdir" = "."; then \ -- local_target="$$target-am"; \ -- else \ -- local_target="$$target"; \ -- fi; \ -- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || eval $$failcom; \ -- done && test -z "$$fail" --tags-recursive: -- list='$(SUBDIRS)'; for subdir in $$list; do \ -- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ -- done --ctags-recursive: -- list='$(SUBDIRS)'; for subdir in $$list; do \ -- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ -- done -+ID: $(am__tagged_files) -+ $(am__define_uniq_tagged_files); mkid -fID $$unique -+tags: tags-recursive -+TAGS: tags - --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ - if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ -@@ -370,12 +414,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ -@@ -387,15 +426,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $$unique; \ - fi; \ - fi --ctags: CTAGS --CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ctags: ctags-recursive -+ -+CTAGS: ctags -+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) -+ $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique -@@ -404,6 +439,21 @@ GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -+cscopelist: cscopelist-recursive -+ -+cscopelist-am: $(am__tagged_files) -+ list='$(am__tagged_files)'; \ -+ case "$(srcdir)" in \ -+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ -+ *) sdir=$(subdir)/$(srcdir) ;; \ -+ esac; \ -+ for i in $$list; do \ -+ if test -f "$$i"; then \ -+ echo "$(subdir)/$$i"; \ -+ else \ -+ echo "$$sdir/$$i"; \ -+ fi; \ -+ done >> $(top_builddir)/cscope.files - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -@@ -440,13 +490,10 @@ distdir: $(DISTFILES) - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test -d "$(distdir)/$$subdir" \ -- || $(MKDIR_P) "$(distdir)/$$subdir" \ -- || exit 1; \ -- fi; \ -- done -- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ -- if test "$$subdir" = .; then :; else \ -+ $(am__make_dryrun) \ -+ || test -d "$(distdir)/$$subdir" \ -+ || $(MKDIR_P) "$(distdir)/$$subdir" \ -+ || exit 1; \ - dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ - $(am__relativize); \ - new_distdir=$$reldir; \ -@@ -481,10 +528,15 @@ install-am: all-am - - installcheck: installcheck-recursive - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+ if test -z '$(STRIP)'; then \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ install; \ -+ else \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -+ fi - mostlyclean-generic: - - clean-generic: -@@ -562,22 +614,20 @@ ps-am: - - uninstall-am: - --.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ -- install-am install-strip tags-recursive -- --.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ -- all all-am check check-am clean clean-generic clean-libtool \ -- ctags ctags-recursive distclean distclean-generic \ -- distclean-libtool distclean-tags distdir dvi dvi-am html \ -- html-am info info-am install install-am install-data \ -- install-data-am install-dvi install-dvi-am install-exec \ -- install-exec-am install-html install-html-am install-info \ -- install-info-am install-man install-pdf install-pdf-am \ -- install-ps install-ps-am install-strip installcheck \ -- installcheck-am installdirs installdirs-am maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-generic \ -- mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ -- uninstall uninstall-am -+.MAKE: $(am__recursive_targets) install-am install-strip -+ -+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ -+ check-am clean clean-generic clean-libtool cscopelist-am ctags \ -+ ctags-am distclean distclean-generic distclean-libtool \ -+ distclean-tags distdir dvi dvi-am html html-am info info-am \ -+ install install-am install-data install-data-am install-dvi \ -+ install-dvi-am install-exec install-exec-am install-html \ -+ install-html-am install-info install-info-am install-man \ -+ install-pdf install-pdf-am install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ installdirs-am maintainer-clean maintainer-clean-generic \ -+ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ -+ ps ps-am tags tags-am uninstall uninstall-am - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff --git a/src/modules/pointcloud/pointcloud_tools/Makefile.in b/src/modules/pointcloud/pointcloud_tools/Makefile.in -index 140a466..24d24cf 100644 ---- a/src/modules/pointcloud/pointcloud_tools/Makefile.in -+++ b/src/modules/pointcloud/pointcloud_tools/Makefile.in -@@ -1,9 +1,8 @@ --# Makefile.in generated by automake 1.11.1 from Makefile.am. -+# Makefile.in generated by automake 1.14 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, --# Inc. -+# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+ - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -16,6 +15,51 @@ - @SET_MAKE@ - - VPATH = @srcdir@ -+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -+am__make_running_with_option = \ -+ case $${target_option-} in \ -+ ?) ;; \ -+ *) echo "am__make_running_with_option: internal error: invalid" \ -+ "target option '$${target_option-}' specified" >&2; \ -+ exit 1;; \ -+ esac; \ -+ has_opt=no; \ -+ sane_makeflags=$$MAKEFLAGS; \ -+ if $(am__is_gnu_make); then \ -+ sane_makeflags=$$MFLAGS; \ -+ else \ -+ case $$MAKEFLAGS in \ -+ *\\[\ \ ]*) \ -+ bs=\\; \ -+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -+ esac; \ -+ fi; \ -+ skip_next=no; \ -+ strip_trailopt () \ -+ { \ -+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -+ }; \ -+ for flg in $$sane_makeflags; do \ -+ test $$skip_next = yes && { skip_next=no; continue; }; \ -+ case $$flg in \ -+ *=*|--*) continue;; \ -+ -*I) strip_trailopt 'I'; skip_next=yes;; \ -+ -*I?*) strip_trailopt 'I';; \ -+ -*O) strip_trailopt 'O'; skip_next=yes;; \ -+ -*O?*) strip_trailopt 'O';; \ -+ -*l) strip_trailopt 'l'; skip_next=yes;; \ -+ -*l?*) strip_trailopt 'l';; \ -+ -[dEDm]) skip_next=yes;; \ -+ -[JT]) skip_next=yes;; \ -+ esac; \ -+ case $$flg in \ -+ *$$target_option*) has_opt=yes; break;; \ -+ esac; \ -+ done; \ -+ test $$has_opt = yes -+am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -+am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -35,7 +79,8 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - subdir = src/modules/pointcloud/pointcloud_tools --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ -+ $(top_srcdir)/depcomp - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ - $(top_srcdir)/m4/ax_python_devel.m4 \ -@@ -71,6 +116,12 @@ am__nobase_list = $(am__nobase_strip_setup); \ - am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -+am__uninstall_files_from_dir = { \ -+ test -z "$$files" \ -+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ -+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ -+ $(am__cd) "$$dir" && rm -f $$files; }; \ -+ } - am__installdirs = "$(DESTDIR)$(pkglibdir)" - LTLIBRARIES = $(pkglib_LTLIBRARIES) - libpointcloud_tools_la_DEPENDENCIES = \ -@@ -81,35 +132,92 @@ am_libpointcloud_tools_la_OBJECTS = MLB_Interface.lo \ - pc_merge.lo pc_reclass_extract.lo pc_thinning_simple.lo \ - pc_to_grid.lo pc_to_shapes.lo pc_transform.lo - libpointcloud_tools_la_OBJECTS = $(am_libpointcloud_tools_la_OBJECTS) -+AM_V_lt = $(am__v_lt_@AM_V@) -+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -+am__v_lt_0 = --silent -+am__v_lt_1 = -+AM_V_P = $(am__v_P_@AM_V@) -+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -+am__v_P_0 = false -+am__v_P_1 = : -+AM_V_GEN = $(am__v_GEN_@AM_V@) -+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+am__v_GEN_0 = @echo " GEN " $@; -+am__v_GEN_1 = -+AM_V_at = $(am__v_at_@AM_V@) -+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+am__v_at_0 = @ -+am__v_at_1 = - DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - am__mv = mv -f - CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) --LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CXXFLAGS) $(CXXFLAGS) -+AM_V_CXX = $(am__v_CXX_@AM_V@) -+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) -+am__v_CXX_0 = @echo " CXX " $@; -+am__v_CXX_1 = - CXXLD = $(CXX) --CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ -+ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) -+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) -+am__v_CXXLD_0 = @echo " CXXLD " $@; -+am__v_CXXLD_1 = - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CFLAGS) $(CFLAGS) -+AM_V_CC = $(am__v_CC_@AM_V@) -+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -+am__v_CC_0 = @echo " CC " $@; -+am__v_CC_1 = - CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CCLD = $(am__v_CCLD_@AM_V@) -+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -+am__v_CCLD_0 = @echo " CCLD " $@; -+am__v_CCLD_1 = - SOURCES = $(libpointcloud_tools_la_SOURCES) - DIST_SOURCES = $(libpointcloud_tools_la_SOURCES) -+am__can_run_installinfo = \ -+ case $$AM_UPDATE_INFO_DIR in \ -+ n|no|NO) false;; \ -+ *) (install-info --version) >/dev/null 2>&1;; \ -+ esac -+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -+# Read a list of newline-separated strings from the standard input, -+# and print each of them once, without duplicates. Input order is -+# *not* preserved. -+am__uniquify_input = $(AWK) '\ -+ BEGIN { nonempty = 0; } \ -+ { items[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in items) print i; }; } \ -+' -+# Make sure the list of sources is unique. This is necessary because, -+# e.g., the same source file might be shared among _SOURCES variables -+# for different programs/libraries. -+am__define_uniq_tagged_files = \ -+ list='$(am__tagged_files)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | $(am__uniquify_input)` - ETAGS = etags - CTAGS = ctags - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ -+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ -@@ -130,6 +238,7 @@ CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DISABLELIBHARU = @DISABLELIBHARU@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -157,6 +266,7 @@ LOCAL_INCS = @LOCAL_INCS@ - LOCAL_LIBS = @LOCAL_LIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - NM = @NM@ - NMEDIT = @NMEDIT@ -@@ -169,6 +279,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - POW_LIB = @POW_LIB@ -@@ -194,6 +305,7 @@ abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -@@ -227,7 +339,6 @@ libdir = @libdir@ - libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -@@ -321,9 +432,9 @@ $(top_srcdir)/configure: $(am__configure_deps) - $(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - $(am__aclocal_m4_deps): -+ - install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" - @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ - list2=; for p in $$list; do \ - if test -f $$p; then \ -@@ -331,6 +442,8 @@ install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - else :; fi; \ - done; \ - test -z "$$list2" || { \ -+ echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \ -+ $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \ - } -@@ -346,14 +459,17 @@ uninstall-pkglibLTLIBRARIES: - - clean-pkglibLTLIBRARIES: - -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES) -- @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \ -- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -- echo "rm -f \"$${dir}/so_locations\""; \ -- rm -f "$${dir}/so_locations"; \ -- done --libpointcloud_tools.la: $(libpointcloud_tools_la_OBJECTS) $(libpointcloud_tools_la_DEPENDENCIES) -- $(CXXLINK) -rpath $(pkglibdir) $(libpointcloud_tools_la_OBJECTS) $(libpointcloud_tools_la_LIBADD) $(LIBS) -+ @list='$(pkglib_LTLIBRARIES)'; \ -+ locs=`for p in $$list; do echo $$p; done | \ -+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ -+ sort -u`; \ -+ test -z "$$locs" || { \ -+ echo rm -f $${locs}; \ -+ rm -f $${locs}; \ -+ } -+ -+libpointcloud_tools.la: $(libpointcloud_tools_la_OBJECTS) $(libpointcloud_tools_la_DEPENDENCIES) $(EXTRA_libpointcloud_tools_la_DEPENDENCIES) -+ $(AM_V_CXXLD)$(CXXLINK) -rpath $(pkglibdir) $(libpointcloud_tools_la_OBJECTS) $(libpointcloud_tools_la_LIBADD) $(LIBS) - - mostlyclean-compile: - -rm -f *.$(OBJEXT) -@@ -376,25 +492,25 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pc_transform.Plo@am__quote@ - - .cpp.o: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< - - .cpp.obj: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - - .cpp.lo: --@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< - - mostlyclean-libtool: - -rm -f *.lo -@@ -402,26 +518,15 @@ mostlyclean-libtool: - clean-libtool: - -rm -rf .libs _libs - --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -+ID: $(am__tagged_files) -+ $(am__define_uniq_tagged_files); mkid -fID $$unique -+tags: tags-am -+TAGS: tags -+ -+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ -@@ -433,15 +538,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $$unique; \ - fi; \ - fi --ctags: CTAGS --CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ctags: ctags-am -+ -+CTAGS: ctags -+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) -+ $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique -@@ -450,6 +551,21 @@ GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -+cscopelist: cscopelist-am -+ -+cscopelist-am: $(am__tagged_files) -+ list='$(am__tagged_files)'; \ -+ case "$(srcdir)" in \ -+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ -+ *) sdir=$(subdir)/$(srcdir) ;; \ -+ esac; \ -+ for i in $$list; do \ -+ if test -f "$$i"; then \ -+ echo "$(subdir)/$$i"; \ -+ else \ -+ echo "$$sdir/$$i"; \ -+ fi; \ -+ done >> $(top_builddir)/cscope.files - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -@@ -501,10 +617,15 @@ install-am: all-am - - installcheck: installcheck-am - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+ if test -z '$(STRIP)'; then \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ install; \ -+ else \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -+ fi - mostlyclean-generic: - - clean-generic: -@@ -589,19 +710,20 @@ uninstall-am: uninstall-pkglibLTLIBRARIES - - .MAKE: install-am install-strip - --.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ -- clean-libtool clean-pkglibLTLIBRARIES ctags distclean \ -- distclean-compile distclean-generic distclean-libtool \ -- distclean-tags distdir dvi dvi-am html html-am info info-am \ -- install install-am install-data install-data-am install-dvi \ -- install-dvi-am install-exec install-exec-am install-html \ -- install-html-am install-info install-info-am install-man \ -- install-pdf install-pdf-am install-pkglibLTLIBRARIES \ -- install-ps install-ps-am install-strip installcheck \ -- installcheck-am installdirs maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-compile \ -- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -- tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES -+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ -+ clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \ -+ ctags-am distclean distclean-compile distclean-generic \ -+ distclean-libtool distclean-tags distdir dvi dvi-am html \ -+ html-am info info-am install install-am install-data \ -+ install-data-am install-dvi install-dvi-am install-exec \ -+ install-exec-am install-html install-html-am install-info \ -+ install-info-am install-man install-pdf install-pdf-am \ -+ install-pkglibLTLIBRARIES install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ maintainer-clean maintainer-clean-generic mostlyclean \ -+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ -+ pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ -+ uninstall-pkglibLTLIBRARIES - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff --git a/src/modules/pointcloud/pointcloud_viewer/Makefile.in b/src/modules/pointcloud/pointcloud_viewer/Makefile.in -index 00f4e5b..7980027 100644 ---- a/src/modules/pointcloud/pointcloud_viewer/Makefile.in -+++ b/src/modules/pointcloud/pointcloud_viewer/Makefile.in -@@ -1,9 +1,8 @@ --# Makefile.in generated by automake 1.11.1 from Makefile.am. -+# Makefile.in generated by automake 1.14 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, --# Inc. -+# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+ - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -16,6 +15,51 @@ - @SET_MAKE@ - - VPATH = @srcdir@ -+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -+am__make_running_with_option = \ -+ case $${target_option-} in \ -+ ?) ;; \ -+ *) echo "am__make_running_with_option: internal error: invalid" \ -+ "target option '$${target_option-}' specified" >&2; \ -+ exit 1;; \ -+ esac; \ -+ has_opt=no; \ -+ sane_makeflags=$$MAKEFLAGS; \ -+ if $(am__is_gnu_make); then \ -+ sane_makeflags=$$MFLAGS; \ -+ else \ -+ case $$MAKEFLAGS in \ -+ *\\[\ \ ]*) \ -+ bs=\\; \ -+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -+ esac; \ -+ fi; \ -+ skip_next=no; \ -+ strip_trailopt () \ -+ { \ -+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -+ }; \ -+ for flg in $$sane_makeflags; do \ -+ test $$skip_next = yes && { skip_next=no; continue; }; \ -+ case $$flg in \ -+ *=*|--*) continue;; \ -+ -*I) strip_trailopt 'I'; skip_next=yes;; \ -+ -*I?*) strip_trailopt 'I';; \ -+ -*O) strip_trailopt 'O'; skip_next=yes;; \ -+ -*O?*) strip_trailopt 'O';; \ -+ -*l) strip_trailopt 'l'; skip_next=yes;; \ -+ -*l?*) strip_trailopt 'l';; \ -+ -[dEDm]) skip_next=yes;; \ -+ -[JT]) skip_next=yes;; \ -+ esac; \ -+ case $$flg in \ -+ *$$target_option*) has_opt=yes; break;; \ -+ esac; \ -+ done; \ -+ test $$has_opt = yes -+am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -+am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -35,7 +79,8 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - subdir = src/modules/pointcloud/pointcloud_viewer --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ -+ $(top_srcdir)/depcomp - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ - $(top_srcdir)/m4/ax_python_devel.m4 \ -@@ -71,6 +116,12 @@ am__nobase_list = $(am__nobase_strip_setup); \ - am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -+am__uninstall_files_from_dir = { \ -+ test -z "$$files" \ -+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ -+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ -+ $(am__cd) "$$dir" && rm -f $$files; }; \ -+ } - am__installdirs = "$(DESTDIR)$(pkglibdir)" - LTLIBRARIES = $(pkglib_LTLIBRARIES) - libpointcloud_viewer_la_DEPENDENCIES = \ -@@ -81,35 +132,92 @@ am_libpointcloud_viewer_la_OBJECTS = MLB_Interface.lo \ - points_view_extent.lo points_view_module.lo - libpointcloud_viewer_la_OBJECTS = \ - $(am_libpointcloud_viewer_la_OBJECTS) -+AM_V_lt = $(am__v_lt_@AM_V@) -+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -+am__v_lt_0 = --silent -+am__v_lt_1 = -+AM_V_P = $(am__v_P_@AM_V@) -+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -+am__v_P_0 = false -+am__v_P_1 = : -+AM_V_GEN = $(am__v_GEN_@AM_V@) -+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+am__v_GEN_0 = @echo " GEN " $@; -+am__v_GEN_1 = -+AM_V_at = $(am__v_at_@AM_V@) -+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+am__v_at_0 = @ -+am__v_at_1 = - DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - am__mv = mv -f - CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) --LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CXXFLAGS) $(CXXFLAGS) -+AM_V_CXX = $(am__v_CXX_@AM_V@) -+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) -+am__v_CXX_0 = @echo " CXX " $@; -+am__v_CXX_1 = - CXXLD = $(CXX) --CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ -+ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) -+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) -+am__v_CXXLD_0 = @echo " CXXLD " $@; -+am__v_CXXLD_1 = - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CFLAGS) $(CFLAGS) -+AM_V_CC = $(am__v_CC_@AM_V@) -+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -+am__v_CC_0 = @echo " CC " $@; -+am__v_CC_1 = - CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CCLD = $(am__v_CCLD_@AM_V@) -+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -+am__v_CCLD_0 = @echo " CCLD " $@; -+am__v_CCLD_1 = - SOURCES = $(libpointcloud_viewer_la_SOURCES) - DIST_SOURCES = $(libpointcloud_viewer_la_SOURCES) -+am__can_run_installinfo = \ -+ case $$AM_UPDATE_INFO_DIR in \ -+ n|no|NO) false;; \ -+ *) (install-info --version) >/dev/null 2>&1;; \ -+ esac -+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -+# Read a list of newline-separated strings from the standard input, -+# and print each of them once, without duplicates. Input order is -+# *not* preserved. -+am__uniquify_input = $(AWK) '\ -+ BEGIN { nonempty = 0; } \ -+ { items[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in items) print i; }; } \ -+' -+# Make sure the list of sources is unique. This is necessary because, -+# e.g., the same source file might be shared among _SOURCES variables -+# for different programs/libraries. -+am__define_uniq_tagged_files = \ -+ list='$(am__tagged_files)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | $(am__uniquify_input)` - ETAGS = etags - CTAGS = ctags - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ -+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ -@@ -130,6 +238,7 @@ CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DISABLELIBHARU = @DISABLELIBHARU@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -157,6 +266,7 @@ LOCAL_INCS = @LOCAL_INCS@ - LOCAL_LIBS = @LOCAL_LIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - NM = @NM@ - NMEDIT = @NMEDIT@ -@@ -169,6 +279,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - POW_LIB = @POW_LIB@ -@@ -194,6 +305,7 @@ abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -@@ -227,7 +339,6 @@ libdir = @libdir@ - libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -@@ -304,9 +415,9 @@ $(top_srcdir)/configure: $(am__configure_deps) - $(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - $(am__aclocal_m4_deps): -+ - install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" - @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ - list2=; for p in $$list; do \ - if test -f $$p; then \ -@@ -314,6 +425,8 @@ install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - else :; fi; \ - done; \ - test -z "$$list2" || { \ -+ echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \ -+ $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \ - } -@@ -329,14 +442,17 @@ uninstall-pkglibLTLIBRARIES: - - clean-pkglibLTLIBRARIES: - -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES) -- @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \ -- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -- echo "rm -f \"$${dir}/so_locations\""; \ -- rm -f "$${dir}/so_locations"; \ -- done --libpointcloud_viewer.la: $(libpointcloud_viewer_la_OBJECTS) $(libpointcloud_viewer_la_DEPENDENCIES) -- $(CXXLINK) -rpath $(pkglibdir) $(libpointcloud_viewer_la_OBJECTS) $(libpointcloud_viewer_la_LIBADD) $(LIBS) -+ @list='$(pkglib_LTLIBRARIES)'; \ -+ locs=`for p in $$list; do echo $$p; done | \ -+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ -+ sort -u`; \ -+ test -z "$$locs" || { \ -+ echo rm -f $${locs}; \ -+ rm -f $${locs}; \ -+ } -+ -+libpointcloud_viewer.la: $(libpointcloud_viewer_la_OBJECTS) $(libpointcloud_viewer_la_DEPENDENCIES) $(EXTRA_libpointcloud_viewer_la_DEPENDENCIES) -+ $(AM_V_CXXLD)$(CXXLINK) -rpath $(pkglibdir) $(libpointcloud_viewer_la_OBJECTS) $(libpointcloud_viewer_la_LIBADD) $(LIBS) - - mostlyclean-compile: - -rm -f *.$(OBJEXT) -@@ -351,25 +467,25 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/points_view_module.Plo@am__quote@ - - .cpp.o: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< - - .cpp.obj: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - - .cpp.lo: --@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< - - mostlyclean-libtool: - -rm -f *.lo -@@ -377,26 +493,15 @@ mostlyclean-libtool: - clean-libtool: - -rm -rf .libs _libs - --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -+ID: $(am__tagged_files) -+ $(am__define_uniq_tagged_files); mkid -fID $$unique -+tags: tags-am -+TAGS: tags -+ -+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ -@@ -408,15 +513,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $$unique; \ - fi; \ - fi --ctags: CTAGS --CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ctags: ctags-am -+ -+CTAGS: ctags -+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) -+ $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique -@@ -425,6 +526,21 @@ GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -+cscopelist: cscopelist-am -+ -+cscopelist-am: $(am__tagged_files) -+ list='$(am__tagged_files)'; \ -+ case "$(srcdir)" in \ -+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ -+ *) sdir=$(subdir)/$(srcdir) ;; \ -+ esac; \ -+ for i in $$list; do \ -+ if test -f "$$i"; then \ -+ echo "$(subdir)/$$i"; \ -+ else \ -+ echo "$$sdir/$$i"; \ -+ fi; \ -+ done >> $(top_builddir)/cscope.files - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -@@ -476,10 +592,15 @@ install-am: all-am - - installcheck: installcheck-am - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+ if test -z '$(STRIP)'; then \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ install; \ -+ else \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -+ fi - mostlyclean-generic: - - clean-generic: -@@ -564,19 +685,20 @@ uninstall-am: uninstall-pkglibLTLIBRARIES - - .MAKE: install-am install-strip - --.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ -- clean-libtool clean-pkglibLTLIBRARIES ctags distclean \ -- distclean-compile distclean-generic distclean-libtool \ -- distclean-tags distdir dvi dvi-am html html-am info info-am \ -- install install-am install-data install-data-am install-dvi \ -- install-dvi-am install-exec install-exec-am install-html \ -- install-html-am install-info install-info-am install-man \ -- install-pdf install-pdf-am install-pkglibLTLIBRARIES \ -- install-ps install-ps-am install-strip installcheck \ -- installcheck-am installdirs maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-compile \ -- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -- tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES -+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ -+ clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \ -+ ctags-am distclean distclean-compile distclean-generic \ -+ distclean-libtool distclean-tags distdir dvi dvi-am html \ -+ html-am info info-am install install-am install-data \ -+ install-data-am install-dvi install-dvi-am install-exec \ -+ install-exec-am install-html install-html-am install-info \ -+ install-info-am install-man install-pdf install-pdf-am \ -+ install-pkglibLTLIBRARIES install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ maintainer-clean maintainer-clean-generic mostlyclean \ -+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ -+ pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ -+ uninstall-pkglibLTLIBRARIES - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff --git a/src/modules/shapes/Makefile.in b/src/modules/shapes/Makefile.in -index 733b7dc..02c5858 100644 ---- a/src/modules/shapes/Makefile.in -+++ b/src/modules/shapes/Makefile.in -@@ -1,9 +1,8 @@ --# Makefile.in generated by automake 1.11.1 from Makefile.am. -+# Makefile.in generated by automake 1.14 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, --# Inc. -+# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+ - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -15,6 +14,51 @@ - - @SET_MAKE@ - VPATH = @srcdir@ -+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -+am__make_running_with_option = \ -+ case $${target_option-} in \ -+ ?) ;; \ -+ *) echo "am__make_running_with_option: internal error: invalid" \ -+ "target option '$${target_option-}' specified" >&2; \ -+ exit 1;; \ -+ esac; \ -+ has_opt=no; \ -+ sane_makeflags=$$MAKEFLAGS; \ -+ if $(am__is_gnu_make); then \ -+ sane_makeflags=$$MFLAGS; \ -+ else \ -+ case $$MAKEFLAGS in \ -+ *\\[\ \ ]*) \ -+ bs=\\; \ -+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -+ esac; \ -+ fi; \ -+ skip_next=no; \ -+ strip_trailopt () \ -+ { \ -+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -+ }; \ -+ for flg in $$sane_makeflags; do \ -+ test $$skip_next = yes && { skip_next=no; continue; }; \ -+ case $$flg in \ -+ *=*|--*) continue;; \ -+ -*I) strip_trailopt 'I'; skip_next=yes;; \ -+ -*I?*) strip_trailopt 'I';; \ -+ -*O) strip_trailopt 'O'; skip_next=yes;; \ -+ -*O?*) strip_trailopt 'O';; \ -+ -*l) strip_trailopt 'l'; skip_next=yes;; \ -+ -*l?*) strip_trailopt 'l';; \ -+ -[dEDm]) skip_next=yes;; \ -+ -[JT]) skip_next=yes;; \ -+ esac; \ -+ case $$flg in \ -+ *$$target_option*) has_opt=yes; break;; \ -+ esac; \ -+ done; \ -+ test $$has_opt = yes -+am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -+am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -34,7 +78,7 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - subdir = src/modules/shapes --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ - $(top_srcdir)/m4/ax_python_devel.m4 \ -@@ -49,20 +93,58 @@ mkinstalldirs = $(install_sh) -d - CONFIG_HEADER = $(top_builddir)/config.h - CONFIG_CLEAN_FILES = - CONFIG_CLEAN_VPATH_FILES = -+AM_V_P = $(am__v_P_@AM_V@) -+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -+am__v_P_0 = false -+am__v_P_1 = : -+AM_V_GEN = $(am__v_GEN_@AM_V@) -+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+am__v_GEN_0 = @echo " GEN " $@; -+am__v_GEN_1 = -+AM_V_at = $(am__v_at_@AM_V@) -+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+am__v_at_0 = @ -+am__v_at_1 = - SOURCES = - DIST_SOURCES = --RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ -- html-recursive info-recursive install-data-recursive \ -- install-dvi-recursive install-exec-recursive \ -- install-html-recursive install-info-recursive \ -- install-pdf-recursive install-ps-recursive install-recursive \ -- installcheck-recursive installdirs-recursive pdf-recursive \ -- ps-recursive uninstall-recursive -+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ -+ ctags-recursive dvi-recursive html-recursive info-recursive \ -+ install-data-recursive install-dvi-recursive \ -+ install-exec-recursive install-html-recursive \ -+ install-info-recursive install-pdf-recursive \ -+ install-ps-recursive install-recursive installcheck-recursive \ -+ installdirs-recursive pdf-recursive ps-recursive \ -+ tags-recursive uninstall-recursive -+am__can_run_installinfo = \ -+ case $$AM_UPDATE_INFO_DIR in \ -+ n|no|NO) false;; \ -+ *) (install-info --version) >/dev/null 2>&1;; \ -+ esac - RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ - distclean-recursive maintainer-clean-recursive --AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ -- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ -+am__recursive_targets = \ -+ $(RECURSIVE_TARGETS) \ -+ $(RECURSIVE_CLEAN_TARGETS) \ -+ $(am__extra_recursive_targets) -+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ - distdir -+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -+# Read a list of newline-separated strings from the standard input, -+# and print each of them once, without duplicates. Input order is -+# *not* preserved. -+am__uniquify_input = $(AWK) '\ -+ BEGIN { nonempty = 0; } \ -+ { items[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in items) print i; }; } \ -+' -+# Make sure the list of sources is unique. This is necessary because, -+# e.g., the same source file might be shared among _SOURCES variables -+# for different programs/libraries. -+am__define_uniq_tagged_files = \ -+ list='$(am__tagged_files)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | $(am__uniquify_input)` - ETAGS = etags - CTAGS = ctags - DIST_SUBDIRS = $(SUBDIRS) -@@ -94,6 +176,7 @@ am__relativize = \ - reldir="$$dir2" - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ -+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ -@@ -114,6 +197,7 @@ CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DISABLELIBHARU = @DISABLELIBHARU@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -141,6 +225,7 @@ LOCAL_INCS = @LOCAL_INCS@ - LOCAL_LIBS = @LOCAL_LIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - NM = @NM@ - NMEDIT = @NMEDIT@ -@@ -153,6 +238,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - POW_LIB = @POW_LIB@ -@@ -178,6 +264,7 @@ abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -@@ -211,7 +298,6 @@ libdir = @libdir@ - libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -@@ -273,22 +359,25 @@ clean-libtool: - -rm -rf .libs _libs - - # This directory's subdirectories are mostly independent; you can cd --# into them and run `make' without going through this Makefile. --# To change the values of `make' variables: instead of editing Makefiles, --# (1) if the variable is set in `config.status', edit `config.status' --# (which will cause the Makefiles to be regenerated when you run `make'); --# (2) otherwise, pass the desired values on the `make' command line. --$(RECURSIVE_TARGETS): -- @fail= failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -+# into them and run 'make' without going through this Makefile. -+# To change the values of 'make' variables: instead of editing Makefiles, -+# (1) if the variable is set in 'config.status', edit 'config.status' -+# (which will cause the Makefiles to be regenerated when you run 'make'); -+# (2) otherwise, pass the desired values on the 'make' command line. -+$(am__recursive_targets): -+ @fail=; \ -+ if $(am__make_keepgoing); then \ -+ failcom='fail=yes'; \ -+ else \ -+ failcom='exit 1'; \ -+ fi; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ -- list='$(SUBDIRS)'; for subdir in $$list; do \ -+ case "$@" in \ -+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -+ *) list='$(SUBDIRS)' ;; \ -+ esac; \ -+ for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ -@@ -303,57 +392,12 @@ $(RECURSIVE_TARGETS): - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - --$(RECURSIVE_CLEAN_TARGETS): -- @fail= failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -- dot_seen=no; \ -- case "$@" in \ -- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -- *) list='$(SUBDIRS)' ;; \ -- esac; \ -- rev=''; for subdir in $$list; do \ -- if test "$$subdir" = "."; then :; else \ -- rev="$$subdir $$rev"; \ -- fi; \ -- done; \ -- rev="$$rev ."; \ -- target=`echo $@ | sed s/-recursive//`; \ -- for subdir in $$rev; do \ -- echo "Making $$target in $$subdir"; \ -- if test "$$subdir" = "."; then \ -- local_target="$$target-am"; \ -- else \ -- local_target="$$target"; \ -- fi; \ -- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || eval $$failcom; \ -- done && test -z "$$fail" --tags-recursive: -- list='$(SUBDIRS)'; for subdir in $$list; do \ -- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ -- done --ctags-recursive: -- list='$(SUBDIRS)'; for subdir in $$list; do \ -- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ -- done -+ID: $(am__tagged_files) -+ $(am__define_uniq_tagged_files); mkid -fID $$unique -+tags: tags-recursive -+TAGS: tags - --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ - if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ -@@ -369,12 +413,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ -@@ -386,15 +425,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $$unique; \ - fi; \ - fi --ctags: CTAGS --CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ctags: ctags-recursive -+ -+CTAGS: ctags -+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) -+ $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique -@@ -403,6 +438,21 @@ GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -+cscopelist: cscopelist-recursive -+ -+cscopelist-am: $(am__tagged_files) -+ list='$(am__tagged_files)'; \ -+ case "$(srcdir)" in \ -+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ -+ *) sdir=$(subdir)/$(srcdir) ;; \ -+ esac; \ -+ for i in $$list; do \ -+ if test -f "$$i"; then \ -+ echo "$(subdir)/$$i"; \ -+ else \ -+ echo "$$sdir/$$i"; \ -+ fi; \ -+ done >> $(top_builddir)/cscope.files - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -@@ -439,13 +489,10 @@ distdir: $(DISTFILES) - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test -d "$(distdir)/$$subdir" \ -- || $(MKDIR_P) "$(distdir)/$$subdir" \ -- || exit 1; \ -- fi; \ -- done -- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ -- if test "$$subdir" = .; then :; else \ -+ $(am__make_dryrun) \ -+ || test -d "$(distdir)/$$subdir" \ -+ || $(MKDIR_P) "$(distdir)/$$subdir" \ -+ || exit 1; \ - dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ - $(am__relativize); \ - new_distdir=$$reldir; \ -@@ -480,10 +527,15 @@ install-am: all-am - - installcheck: installcheck-recursive - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+ if test -z '$(STRIP)'; then \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ install; \ -+ else \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -+ fi - mostlyclean-generic: - - clean-generic: -@@ -561,22 +613,20 @@ ps-am: - - uninstall-am: - --.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ -- install-am install-strip tags-recursive -- --.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ -- all all-am check check-am clean clean-generic clean-libtool \ -- ctags ctags-recursive distclean distclean-generic \ -- distclean-libtool distclean-tags distdir dvi dvi-am html \ -- html-am info info-am install install-am install-data \ -- install-data-am install-dvi install-dvi-am install-exec \ -- install-exec-am install-html install-html-am install-info \ -- install-info-am install-man install-pdf install-pdf-am \ -- install-ps install-ps-am install-strip installcheck \ -- installcheck-am installdirs installdirs-am maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-generic \ -- mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ -- uninstall uninstall-am -+.MAKE: $(am__recursive_targets) install-am install-strip -+ -+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ -+ check-am clean clean-generic clean-libtool cscopelist-am ctags \ -+ ctags-am distclean distclean-generic distclean-libtool \ -+ distclean-tags distdir dvi dvi-am html html-am info info-am \ -+ install install-am install-data install-data-am install-dvi \ -+ install-dvi-am install-exec install-exec-am install-html \ -+ install-html-am install-info install-info-am install-man \ -+ install-pdf install-pdf-am install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ installdirs-am maintainer-clean maintainer-clean-generic \ -+ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ -+ ps ps-am tags tags-am uninstall uninstall-am - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff --git a/src/modules/shapes/shapes_grid/Makefile.in b/src/modules/shapes/shapes_grid/Makefile.in -index c068338..bf5a9ce 100644 ---- a/src/modules/shapes/shapes_grid/Makefile.in -+++ b/src/modules/shapes/shapes_grid/Makefile.in -@@ -1,9 +1,8 @@ --# Makefile.in generated by automake 1.11.1 from Makefile.am. -+# Makefile.in generated by automake 1.14 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, --# Inc. -+# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+ - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -16,6 +15,51 @@ - @SET_MAKE@ - - VPATH = @srcdir@ -+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -+am__make_running_with_option = \ -+ case $${target_option-} in \ -+ ?) ;; \ -+ *) echo "am__make_running_with_option: internal error: invalid" \ -+ "target option '$${target_option-}' specified" >&2; \ -+ exit 1;; \ -+ esac; \ -+ has_opt=no; \ -+ sane_makeflags=$$MAKEFLAGS; \ -+ if $(am__is_gnu_make); then \ -+ sane_makeflags=$$MFLAGS; \ -+ else \ -+ case $$MAKEFLAGS in \ -+ *\\[\ \ ]*) \ -+ bs=\\; \ -+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -+ esac; \ -+ fi; \ -+ skip_next=no; \ -+ strip_trailopt () \ -+ { \ -+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -+ }; \ -+ for flg in $$sane_makeflags; do \ -+ test $$skip_next = yes && { skip_next=no; continue; }; \ -+ case $$flg in \ -+ *=*|--*) continue;; \ -+ -*I) strip_trailopt 'I'; skip_next=yes;; \ -+ -*I?*) strip_trailopt 'I';; \ -+ -*O) strip_trailopt 'O'; skip_next=yes;; \ -+ -*O?*) strip_trailopt 'O';; \ -+ -*l) strip_trailopt 'l'; skip_next=yes;; \ -+ -*l?*) strip_trailopt 'l';; \ -+ -[dEDm]) skip_next=yes;; \ -+ -[JT]) skip_next=yes;; \ -+ esac; \ -+ case $$flg in \ -+ *$$target_option*) has_opt=yes; break;; \ -+ esac; \ -+ done; \ -+ test $$has_opt = yes -+am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -+am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -35,7 +79,8 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - subdir = src/modules/shapes/shapes_grid --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ -+ $(top_srcdir)/depcomp - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ - $(top_srcdir)/m4/ax_python_devel.m4 \ -@@ -71,6 +116,12 @@ am__nobase_list = $(am__nobase_strip_setup); \ - am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -+am__uninstall_files_from_dir = { \ -+ test -z "$$files" \ -+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ -+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ -+ $(am__cd) "$$dir" && rm -f $$files; }; \ -+ } - am__installdirs = "$(DESTDIR)$(pkglibdir)" - LTLIBRARIES = $(pkglib_LTLIBRARIES) - libshapes_grid_la_DEPENDENCIES = \ -@@ -83,35 +134,92 @@ am_libshapes_grid_la_OBJECTS = Grid_Classes_To_Shapes.lo \ - Grid_Values_AddTo_Points.lo Grid_Values_AddTo_Shapes.lo \ - MLB_Interface.lo - libshapes_grid_la_OBJECTS = $(am_libshapes_grid_la_OBJECTS) -+AM_V_lt = $(am__v_lt_@AM_V@) -+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -+am__v_lt_0 = --silent -+am__v_lt_1 = -+AM_V_P = $(am__v_P_@AM_V@) -+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -+am__v_P_0 = false -+am__v_P_1 = : -+AM_V_GEN = $(am__v_GEN_@AM_V@) -+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+am__v_GEN_0 = @echo " GEN " $@; -+am__v_GEN_1 = -+AM_V_at = $(am__v_at_@AM_V@) -+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+am__v_at_0 = @ -+am__v_at_1 = - DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - am__mv = mv -f - CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) --LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CXXFLAGS) $(CXXFLAGS) -+AM_V_CXX = $(am__v_CXX_@AM_V@) -+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) -+am__v_CXX_0 = @echo " CXX " $@; -+am__v_CXX_1 = - CXXLD = $(CXX) --CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ -+ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) -+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) -+am__v_CXXLD_0 = @echo " CXXLD " $@; -+am__v_CXXLD_1 = - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CFLAGS) $(CFLAGS) -+AM_V_CC = $(am__v_CC_@AM_V@) -+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -+am__v_CC_0 = @echo " CC " $@; -+am__v_CC_1 = - CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CCLD = $(am__v_CCLD_@AM_V@) -+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -+am__v_CCLD_0 = @echo " CCLD " $@; -+am__v_CCLD_1 = - SOURCES = $(libshapes_grid_la_SOURCES) - DIST_SOURCES = $(libshapes_grid_la_SOURCES) -+am__can_run_installinfo = \ -+ case $$AM_UPDATE_INFO_DIR in \ -+ n|no|NO) false;; \ -+ *) (install-info --version) >/dev/null 2>&1;; \ -+ esac -+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -+# Read a list of newline-separated strings from the standard input, -+# and print each of them once, without duplicates. Input order is -+# *not* preserved. -+am__uniquify_input = $(AWK) '\ -+ BEGIN { nonempty = 0; } \ -+ { items[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in items) print i; }; } \ -+' -+# Make sure the list of sources is unique. This is necessary because, -+# e.g., the same source file might be shared among _SOURCES variables -+# for different programs/libraries. -+am__define_uniq_tagged_files = \ -+ list='$(am__tagged_files)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | $(am__uniquify_input)` - ETAGS = etags - CTAGS = ctags - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ -+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ -@@ -132,6 +240,7 @@ CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DISABLELIBHARU = @DISABLELIBHARU@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -159,6 +268,7 @@ LOCAL_INCS = @LOCAL_INCS@ - LOCAL_LIBS = @LOCAL_LIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - NM = @NM@ - NMEDIT = @NMEDIT@ -@@ -171,6 +281,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - POW_LIB = @POW_LIB@ -@@ -196,6 +307,7 @@ abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -@@ -229,7 +341,6 @@ libdir = @libdir@ - libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -@@ -323,9 +434,9 @@ $(top_srcdir)/configure: $(am__configure_deps) - $(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - $(am__aclocal_m4_deps): -+ - install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" - @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ - list2=; for p in $$list; do \ - if test -f $$p; then \ -@@ -333,6 +444,8 @@ install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - else :; fi; \ - done; \ - test -z "$$list2" || { \ -+ echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \ -+ $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \ - } -@@ -348,14 +461,17 @@ uninstall-pkglibLTLIBRARIES: - - clean-pkglibLTLIBRARIES: - -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES) -- @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \ -- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -- echo "rm -f \"$${dir}/so_locations\""; \ -- rm -f "$${dir}/so_locations"; \ -- done --libshapes_grid.la: $(libshapes_grid_la_OBJECTS) $(libshapes_grid_la_DEPENDENCIES) -- $(CXXLINK) -rpath $(pkglibdir) $(libshapes_grid_la_OBJECTS) $(libshapes_grid_la_LIBADD) $(LIBS) -+ @list='$(pkglib_LTLIBRARIES)'; \ -+ locs=`for p in $$list; do echo $$p; done | \ -+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ -+ sort -u`; \ -+ test -z "$$locs" || { \ -+ echo rm -f $${locs}; \ -+ rm -f $${locs}; \ -+ } -+ -+libshapes_grid.la: $(libshapes_grid_la_OBJECTS) $(libshapes_grid_la_DEPENDENCIES) $(EXTRA_libshapes_grid_la_DEPENDENCIES) -+ $(AM_V_CXXLD)$(CXXLINK) -rpath $(pkglibdir) $(libshapes_grid_la_OBJECTS) $(libshapes_grid_la_LIBADD) $(LIBS) - - mostlyclean-compile: - -rm -f *.$(OBJEXT) -@@ -378,25 +494,25 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/grid_rectangle_clip.Plo@am__quote@ - - .cpp.o: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< - - .cpp.obj: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - - .cpp.lo: --@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< - - mostlyclean-libtool: - -rm -f *.lo -@@ -404,26 +520,15 @@ mostlyclean-libtool: - clean-libtool: - -rm -rf .libs _libs - --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -+ID: $(am__tagged_files) -+ $(am__define_uniq_tagged_files); mkid -fID $$unique -+tags: tags-am -+TAGS: tags -+ -+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ -@@ -435,15 +540,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $$unique; \ - fi; \ - fi --ctags: CTAGS --CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ctags: ctags-am -+ -+CTAGS: ctags -+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) -+ $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique -@@ -452,6 +553,21 @@ GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -+cscopelist: cscopelist-am -+ -+cscopelist-am: $(am__tagged_files) -+ list='$(am__tagged_files)'; \ -+ case "$(srcdir)" in \ -+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ -+ *) sdir=$(subdir)/$(srcdir) ;; \ -+ esac; \ -+ for i in $$list; do \ -+ if test -f "$$i"; then \ -+ echo "$(subdir)/$$i"; \ -+ else \ -+ echo "$$sdir/$$i"; \ -+ fi; \ -+ done >> $(top_builddir)/cscope.files - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -@@ -503,10 +619,15 @@ install-am: all-am - - installcheck: installcheck-am - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+ if test -z '$(STRIP)'; then \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ install; \ -+ else \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -+ fi - mostlyclean-generic: - - clean-generic: -@@ -591,19 +712,20 @@ uninstall-am: uninstall-pkglibLTLIBRARIES - - .MAKE: install-am install-strip - --.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ -- clean-libtool clean-pkglibLTLIBRARIES ctags distclean \ -- distclean-compile distclean-generic distclean-libtool \ -- distclean-tags distdir dvi dvi-am html html-am info info-am \ -- install install-am install-data install-data-am install-dvi \ -- install-dvi-am install-exec install-exec-am install-html \ -- install-html-am install-info install-info-am install-man \ -- install-pdf install-pdf-am install-pkglibLTLIBRARIES \ -- install-ps install-ps-am install-strip installcheck \ -- installcheck-am installdirs maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-compile \ -- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -- tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES -+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ -+ clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \ -+ ctags-am distclean distclean-compile distclean-generic \ -+ distclean-libtool distclean-tags distdir dvi dvi-am html \ -+ html-am info info-am install install-am install-data \ -+ install-data-am install-dvi install-dvi-am install-exec \ -+ install-exec-am install-html install-html-am install-info \ -+ install-info-am install-man install-pdf install-pdf-am \ -+ install-pkglibLTLIBRARIES install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ maintainer-clean maintainer-clean-generic mostlyclean \ -+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ -+ pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ -+ uninstall-pkglibLTLIBRARIES - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff --git a/src/modules/shapes/shapes_lines/Makefile.in b/src/modules/shapes/shapes_lines/Makefile.in -index 31d2589..d3c3f75 100644 ---- a/src/modules/shapes/shapes_lines/Makefile.in -+++ b/src/modules/shapes/shapes_lines/Makefile.in -@@ -1,9 +1,8 @@ --# Makefile.in generated by automake 1.11.1 from Makefile.am. -+# Makefile.in generated by automake 1.14 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, --# Inc. -+# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+ - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -16,6 +15,51 @@ - @SET_MAKE@ - - VPATH = @srcdir@ -+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -+am__make_running_with_option = \ -+ case $${target_option-} in \ -+ ?) ;; \ -+ *) echo "am__make_running_with_option: internal error: invalid" \ -+ "target option '$${target_option-}' specified" >&2; \ -+ exit 1;; \ -+ esac; \ -+ has_opt=no; \ -+ sane_makeflags=$$MAKEFLAGS; \ -+ if $(am__is_gnu_make); then \ -+ sane_makeflags=$$MFLAGS; \ -+ else \ -+ case $$MAKEFLAGS in \ -+ *\\[\ \ ]*) \ -+ bs=\\; \ -+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -+ esac; \ -+ fi; \ -+ skip_next=no; \ -+ strip_trailopt () \ -+ { \ -+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -+ }; \ -+ for flg in $$sane_makeflags; do \ -+ test $$skip_next = yes && { skip_next=no; continue; }; \ -+ case $$flg in \ -+ *=*|--*) continue;; \ -+ -*I) strip_trailopt 'I'; skip_next=yes;; \ -+ -*I?*) strip_trailopt 'I';; \ -+ -*O) strip_trailopt 'O'; skip_next=yes;; \ -+ -*O?*) strip_trailopt 'O';; \ -+ -*l) strip_trailopt 'l'; skip_next=yes;; \ -+ -*l?*) strip_trailopt 'l';; \ -+ -[dEDm]) skip_next=yes;; \ -+ -[JT]) skip_next=yes;; \ -+ esac; \ -+ case $$flg in \ -+ *$$target_option*) has_opt=yes; break;; \ -+ esac; \ -+ done; \ -+ test $$has_opt = yes -+am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -+am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -35,7 +79,8 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - subdir = src/modules/shapes/shapes_lines --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ -+ $(top_srcdir)/depcomp - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ - $(top_srcdir)/m4/ax_python_devel.m4 \ -@@ -71,6 +116,12 @@ am__nobase_list = $(am__nobase_strip_setup); \ - am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -+am__uninstall_files_from_dir = { \ -+ test -z "$$files" \ -+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ -+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ -+ $(am__cd) "$$dir" && rm -f $$files; }; \ -+ } - am__installdirs = "$(DESTDIR)$(pkglibdir)" - LTLIBRARIES = $(pkglib_LTLIBRARIES) - libshapes_lines_la_DEPENDENCIES = \ -@@ -79,35 +130,92 @@ am_libshapes_lines_la_OBJECTS = line_dissolve.lo Lines_From_Points.lo \ - Lines_From_Polygons.lo line_polygon_intersection.lo \ - line_properties.lo line_simplification.lo MLB_Interface.lo - libshapes_lines_la_OBJECTS = $(am_libshapes_lines_la_OBJECTS) -+AM_V_lt = $(am__v_lt_@AM_V@) -+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -+am__v_lt_0 = --silent -+am__v_lt_1 = -+AM_V_P = $(am__v_P_@AM_V@) -+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -+am__v_P_0 = false -+am__v_P_1 = : -+AM_V_GEN = $(am__v_GEN_@AM_V@) -+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+am__v_GEN_0 = @echo " GEN " $@; -+am__v_GEN_1 = -+AM_V_at = $(am__v_at_@AM_V@) -+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+am__v_at_0 = @ -+am__v_at_1 = - DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - am__mv = mv -f - CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) --LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CXXFLAGS) $(CXXFLAGS) -+AM_V_CXX = $(am__v_CXX_@AM_V@) -+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) -+am__v_CXX_0 = @echo " CXX " $@; -+am__v_CXX_1 = - CXXLD = $(CXX) --CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ -+ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) -+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) -+am__v_CXXLD_0 = @echo " CXXLD " $@; -+am__v_CXXLD_1 = - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CFLAGS) $(CFLAGS) -+AM_V_CC = $(am__v_CC_@AM_V@) -+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -+am__v_CC_0 = @echo " CC " $@; -+am__v_CC_1 = - CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CCLD = $(am__v_CCLD_@AM_V@) -+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -+am__v_CCLD_0 = @echo " CCLD " $@; -+am__v_CCLD_1 = - SOURCES = $(libshapes_lines_la_SOURCES) - DIST_SOURCES = $(libshapes_lines_la_SOURCES) -+am__can_run_installinfo = \ -+ case $$AM_UPDATE_INFO_DIR in \ -+ n|no|NO) false;; \ -+ *) (install-info --version) >/dev/null 2>&1;; \ -+ esac -+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -+# Read a list of newline-separated strings from the standard input, -+# and print each of them once, without duplicates. Input order is -+# *not* preserved. -+am__uniquify_input = $(AWK) '\ -+ BEGIN { nonempty = 0; } \ -+ { items[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in items) print i; }; } \ -+' -+# Make sure the list of sources is unique. This is necessary because, -+# e.g., the same source file might be shared among _SOURCES variables -+# for different programs/libraries. -+am__define_uniq_tagged_files = \ -+ list='$(am__tagged_files)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | $(am__uniquify_input)` - ETAGS = etags - CTAGS = ctags - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ -+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ -@@ -128,6 +236,7 @@ CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DISABLELIBHARU = @DISABLELIBHARU@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -155,6 +264,7 @@ LOCAL_INCS = @LOCAL_INCS@ - LOCAL_LIBS = @LOCAL_LIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - NM = @NM@ - NMEDIT = @NMEDIT@ -@@ -167,6 +277,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - POW_LIB = @POW_LIB@ -@@ -192,6 +303,7 @@ abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -@@ -225,7 +337,6 @@ libdir = @libdir@ - libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -@@ -307,9 +418,9 @@ $(top_srcdir)/configure: $(am__configure_deps) - $(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - $(am__aclocal_m4_deps): -+ - install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" - @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ - list2=; for p in $$list; do \ - if test -f $$p; then \ -@@ -317,6 +428,8 @@ install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - else :; fi; \ - done; \ - test -z "$$list2" || { \ -+ echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \ -+ $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \ - } -@@ -332,14 +445,17 @@ uninstall-pkglibLTLIBRARIES: - - clean-pkglibLTLIBRARIES: - -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES) -- @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \ -- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -- echo "rm -f \"$${dir}/so_locations\""; \ -- rm -f "$${dir}/so_locations"; \ -- done --libshapes_lines.la: $(libshapes_lines_la_OBJECTS) $(libshapes_lines_la_DEPENDENCIES) -- $(CXXLINK) -rpath $(pkglibdir) $(libshapes_lines_la_OBJECTS) $(libshapes_lines_la_LIBADD) $(LIBS) -+ @list='$(pkglib_LTLIBRARIES)'; \ -+ locs=`for p in $$list; do echo $$p; done | \ -+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ -+ sort -u`; \ -+ test -z "$$locs" || { \ -+ echo rm -f $${locs}; \ -+ rm -f $${locs}; \ -+ } -+ -+libshapes_lines.la: $(libshapes_lines_la_OBJECTS) $(libshapes_lines_la_DEPENDENCIES) $(EXTRA_libshapes_lines_la_DEPENDENCIES) -+ $(AM_V_CXXLD)$(CXXLINK) -rpath $(pkglibdir) $(libshapes_lines_la_OBJECTS) $(libshapes_lines_la_LIBADD) $(LIBS) - - mostlyclean-compile: - -rm -f *.$(OBJEXT) -@@ -356,25 +472,25 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/line_simplification.Plo@am__quote@ - - .cpp.o: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< - - .cpp.obj: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - - .cpp.lo: --@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< - - mostlyclean-libtool: - -rm -f *.lo -@@ -382,26 +498,15 @@ mostlyclean-libtool: - clean-libtool: - -rm -rf .libs _libs - --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -+ID: $(am__tagged_files) -+ $(am__define_uniq_tagged_files); mkid -fID $$unique -+tags: tags-am -+TAGS: tags -+ -+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ -@@ -413,15 +518,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $$unique; \ - fi; \ - fi --ctags: CTAGS --CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ctags: ctags-am -+ -+CTAGS: ctags -+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) -+ $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique -@@ -430,6 +531,21 @@ GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -+cscopelist: cscopelist-am -+ -+cscopelist-am: $(am__tagged_files) -+ list='$(am__tagged_files)'; \ -+ case "$(srcdir)" in \ -+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ -+ *) sdir=$(subdir)/$(srcdir) ;; \ -+ esac; \ -+ for i in $$list; do \ -+ if test -f "$$i"; then \ -+ echo "$(subdir)/$$i"; \ -+ else \ -+ echo "$$sdir/$$i"; \ -+ fi; \ -+ done >> $(top_builddir)/cscope.files - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -@@ -481,10 +597,15 @@ install-am: all-am - - installcheck: installcheck-am - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+ if test -z '$(STRIP)'; then \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ install; \ -+ else \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -+ fi - mostlyclean-generic: - - clean-generic: -@@ -569,19 +690,20 @@ uninstall-am: uninstall-pkglibLTLIBRARIES - - .MAKE: install-am install-strip - --.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ -- clean-libtool clean-pkglibLTLIBRARIES ctags distclean \ -- distclean-compile distclean-generic distclean-libtool \ -- distclean-tags distdir dvi dvi-am html html-am info info-am \ -- install install-am install-data install-data-am install-dvi \ -- install-dvi-am install-exec install-exec-am install-html \ -- install-html-am install-info install-info-am install-man \ -- install-pdf install-pdf-am install-pkglibLTLIBRARIES \ -- install-ps install-ps-am install-strip installcheck \ -- installcheck-am installdirs maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-compile \ -- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -- tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES -+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ -+ clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \ -+ ctags-am distclean distclean-compile distclean-generic \ -+ distclean-libtool distclean-tags distdir dvi dvi-am html \ -+ html-am info info-am install install-am install-data \ -+ install-data-am install-dvi install-dvi-am install-exec \ -+ install-exec-am install-html install-html-am install-info \ -+ install-info-am install-man install-pdf install-pdf-am \ -+ install-pkglibLTLIBRARIES install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ maintainer-clean maintainer-clean-generic mostlyclean \ -+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ -+ pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ -+ uninstall-pkglibLTLIBRARIES - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff --git a/src/modules/shapes/shapes_points/Makefile.in b/src/modules/shapes/shapes_points/Makefile.in -index ebb29dc..bb90157 100644 ---- a/src/modules/shapes/shapes_points/Makefile.in -+++ b/src/modules/shapes/shapes_points/Makefile.in -@@ -1,9 +1,8 @@ --# Makefile.in generated by automake 1.11.1 from Makefile.am. -+# Makefile.in generated by automake 1.14 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, --# Inc. -+# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+ - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -16,6 +15,51 @@ - @SET_MAKE@ - - VPATH = @srcdir@ -+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -+am__make_running_with_option = \ -+ case $${target_option-} in \ -+ ?) ;; \ -+ *) echo "am__make_running_with_option: internal error: invalid" \ -+ "target option '$${target_option-}' specified" >&2; \ -+ exit 1;; \ -+ esac; \ -+ has_opt=no; \ -+ sane_makeflags=$$MAKEFLAGS; \ -+ if $(am__is_gnu_make); then \ -+ sane_makeflags=$$MFLAGS; \ -+ else \ -+ case $$MAKEFLAGS in \ -+ *\\[\ \ ]*) \ -+ bs=\\; \ -+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -+ esac; \ -+ fi; \ -+ skip_next=no; \ -+ strip_trailopt () \ -+ { \ -+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -+ }; \ -+ for flg in $$sane_makeflags; do \ -+ test $$skip_next = yes && { skip_next=no; continue; }; \ -+ case $$flg in \ -+ *=*|--*) continue;; \ -+ -*I) strip_trailopt 'I'; skip_next=yes;; \ -+ -*I?*) strip_trailopt 'I';; \ -+ -*O) strip_trailopt 'O'; skip_next=yes;; \ -+ -*O?*) strip_trailopt 'O';; \ -+ -*l) strip_trailopt 'l'; skip_next=yes;; \ -+ -*l?*) strip_trailopt 'l';; \ -+ -[dEDm]) skip_next=yes;; \ -+ -[JT]) skip_next=yes;; \ -+ esac; \ -+ case $$flg in \ -+ *$$target_option*) has_opt=yes; break;; \ -+ esac; \ -+ done; \ -+ test $$has_opt = yes -+am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -+am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -35,7 +79,8 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - subdir = src/modules/shapes/shapes_points --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ -+ $(top_srcdir)/depcomp - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ - $(top_srcdir)/m4/ax_python_devel.m4 \ -@@ -71,6 +116,12 @@ am__nobase_list = $(am__nobase_strip_setup); \ - am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -+am__uninstall_files_from_dir = { \ -+ test -z "$$files" \ -+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ -+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ -+ $(am__cd) "$$dir" && rm -f $$files; }; \ -+ } - am__installdirs = "$(DESTDIR)$(pkglibdir)" - LTLIBRARIES = $(pkglib_LTLIBRARIES) - libshapes_points_la_DEPENDENCIES = \ -@@ -84,35 +135,92 @@ am_libshapes_points_la_OBJECTS = add_polygon_attributes.lo \ - snap_points_to_features.lo snap_points_to_grid.lo \ - thiessen_polygons.lo - libshapes_points_la_OBJECTS = $(am_libshapes_points_la_OBJECTS) -+AM_V_lt = $(am__v_lt_@AM_V@) -+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -+am__v_lt_0 = --silent -+am__v_lt_1 = -+AM_V_P = $(am__v_P_@AM_V@) -+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -+am__v_P_0 = false -+am__v_P_1 = : -+AM_V_GEN = $(am__v_GEN_@AM_V@) -+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+am__v_GEN_0 = @echo " GEN " $@; -+am__v_GEN_1 = -+AM_V_at = $(am__v_at_@AM_V@) -+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+am__v_at_0 = @ -+am__v_at_1 = - DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - am__mv = mv -f - CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) --LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CXXFLAGS) $(CXXFLAGS) -+AM_V_CXX = $(am__v_CXX_@AM_V@) -+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) -+am__v_CXX_0 = @echo " CXX " $@; -+am__v_CXX_1 = - CXXLD = $(CXX) --CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ -+ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) -+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) -+am__v_CXXLD_0 = @echo " CXXLD " $@; -+am__v_CXXLD_1 = - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CFLAGS) $(CFLAGS) -+AM_V_CC = $(am__v_CC_@AM_V@) -+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -+am__v_CC_0 = @echo " CC " $@; -+am__v_CC_1 = - CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CCLD = $(am__v_CCLD_@AM_V@) -+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -+am__v_CCLD_0 = @echo " CCLD " $@; -+am__v_CCLD_1 = - SOURCES = $(libshapes_points_la_SOURCES) - DIST_SOURCES = $(libshapes_points_la_SOURCES) -+am__can_run_installinfo = \ -+ case $$AM_UPDATE_INFO_DIR in \ -+ n|no|NO) false;; \ -+ *) (install-info --version) >/dev/null 2>&1;; \ -+ esac -+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -+# Read a list of newline-separated strings from the standard input, -+# and print each of them once, without duplicates. Input order is -+# *not* preserved. -+am__uniquify_input = $(AWK) '\ -+ BEGIN { nonempty = 0; } \ -+ { items[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in items) print i; }; } \ -+' -+# Make sure the list of sources is unique. This is necessary because, -+# e.g., the same source file might be shared among _SOURCES variables -+# for different programs/libraries. -+am__define_uniq_tagged_files = \ -+ list='$(am__tagged_files)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | $(am__uniquify_input)` - ETAGS = etags - CTAGS = ctags - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ -+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ -@@ -133,6 +241,7 @@ CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DISABLELIBHARU = @DISABLELIBHARU@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -160,6 +269,7 @@ LOCAL_INCS = @LOCAL_INCS@ - LOCAL_LIBS = @LOCAL_LIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - NM = @NM@ - NMEDIT = @NMEDIT@ -@@ -172,6 +282,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - POW_LIB = @POW_LIB@ -@@ -197,6 +308,7 @@ abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -@@ -230,7 +342,6 @@ libdir = @libdir@ - libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -@@ -338,9 +449,9 @@ $(top_srcdir)/configure: $(am__configure_deps) - $(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - $(am__aclocal_m4_deps): -+ - install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" - @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ - list2=; for p in $$list; do \ - if test -f $$p; then \ -@@ -348,6 +459,8 @@ install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - else :; fi; \ - done; \ - test -z "$$list2" || { \ -+ echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \ -+ $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \ - } -@@ -363,14 +476,17 @@ uninstall-pkglibLTLIBRARIES: - - clean-pkglibLTLIBRARIES: - -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES) -- @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \ -- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -- echo "rm -f \"$${dir}/so_locations\""; \ -- rm -f "$${dir}/so_locations"; \ -- done --libshapes_points.la: $(libshapes_points_la_OBJECTS) $(libshapes_points_la_DEPENDENCIES) -- $(CXXLINK) -rpath $(pkglibdir) $(libshapes_points_la_OBJECTS) $(libshapes_points_la_LIBADD) $(LIBS) -+ @list='$(pkglib_LTLIBRARIES)'; \ -+ locs=`for p in $$list; do echo $$p; done | \ -+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ -+ sort -u`; \ -+ test -z "$$locs" || { \ -+ echo rm -f $${locs}; \ -+ rm -f $${locs}; \ -+ } -+ -+libshapes_points.la: $(libshapes_points_la_OBJECTS) $(libshapes_points_la_DEPENDENCIES) $(EXTRA_libshapes_points_la_DEPENDENCIES) -+ $(AM_V_CXXLD)$(CXXLINK) -rpath $(pkglibdir) $(libshapes_points_la_OBJECTS) $(libshapes_points_la_LIBADD) $(LIBS) - - mostlyclean-compile: - -rm -f *.$(OBJEXT) -@@ -400,25 +516,25 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/thiessen_polygons.Plo@am__quote@ - - .cpp.o: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< - - .cpp.obj: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - - .cpp.lo: --@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< - - mostlyclean-libtool: - -rm -f *.lo -@@ -426,26 +542,15 @@ mostlyclean-libtool: - clean-libtool: - -rm -rf .libs _libs - --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -+ID: $(am__tagged_files) -+ $(am__define_uniq_tagged_files); mkid -fID $$unique -+tags: tags-am -+TAGS: tags -+ -+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ -@@ -457,15 +562,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $$unique; \ - fi; \ - fi --ctags: CTAGS --CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ctags: ctags-am -+ -+CTAGS: ctags -+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) -+ $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique -@@ -474,6 +575,21 @@ GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -+cscopelist: cscopelist-am -+ -+cscopelist-am: $(am__tagged_files) -+ list='$(am__tagged_files)'; \ -+ case "$(srcdir)" in \ -+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ -+ *) sdir=$(subdir)/$(srcdir) ;; \ -+ esac; \ -+ for i in $$list; do \ -+ if test -f "$$i"; then \ -+ echo "$(subdir)/$$i"; \ -+ else \ -+ echo "$$sdir/$$i"; \ -+ fi; \ -+ done >> $(top_builddir)/cscope.files - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -@@ -525,10 +641,15 @@ install-am: all-am - - installcheck: installcheck-am - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+ if test -z '$(STRIP)'; then \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ install; \ -+ else \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -+ fi - mostlyclean-generic: - - clean-generic: -@@ -613,19 +734,20 @@ uninstall-am: uninstall-pkglibLTLIBRARIES - - .MAKE: install-am install-strip - --.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ -- clean-libtool clean-pkglibLTLIBRARIES ctags distclean \ -- distclean-compile distclean-generic distclean-libtool \ -- distclean-tags distdir dvi dvi-am html html-am info info-am \ -- install install-am install-data install-data-am install-dvi \ -- install-dvi-am install-exec install-exec-am install-html \ -- install-html-am install-info install-info-am install-man \ -- install-pdf install-pdf-am install-pkglibLTLIBRARIES \ -- install-ps install-ps-am install-strip installcheck \ -- installcheck-am installdirs maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-compile \ -- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -- tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES -+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ -+ clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \ -+ ctags-am distclean distclean-compile distclean-generic \ -+ distclean-libtool distclean-tags distdir dvi dvi-am html \ -+ html-am info info-am install install-am install-data \ -+ install-data-am install-dvi install-dvi-am install-exec \ -+ install-exec-am install-html install-html-am install-info \ -+ install-info-am install-man install-pdf install-pdf-am \ -+ install-pkglibLTLIBRARIES install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ maintainer-clean maintainer-clean-generic mostlyclean \ -+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ -+ pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ -+ uninstall-pkglibLTLIBRARIES - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff --git a/src/modules/shapes/shapes_polygons/Makefile.in b/src/modules/shapes/shapes_polygons/Makefile.in -index 48ab4b1..ff60961 100644 ---- a/src/modules/shapes/shapes_polygons/Makefile.in -+++ b/src/modules/shapes/shapes_polygons/Makefile.in -@@ -1,9 +1,8 @@ --# Makefile.in generated by automake 1.11.1 from Makefile.am. -+# Makefile.in generated by automake 1.14 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, --# Inc. -+# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+ - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -16,6 +15,51 @@ - @SET_MAKE@ - - VPATH = @srcdir@ -+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -+am__make_running_with_option = \ -+ case $${target_option-} in \ -+ ?) ;; \ -+ *) echo "am__make_running_with_option: internal error: invalid" \ -+ "target option '$${target_option-}' specified" >&2; \ -+ exit 1;; \ -+ esac; \ -+ has_opt=no; \ -+ sane_makeflags=$$MAKEFLAGS; \ -+ if $(am__is_gnu_make); then \ -+ sane_makeflags=$$MFLAGS; \ -+ else \ -+ case $$MAKEFLAGS in \ -+ *\\[\ \ ]*) \ -+ bs=\\; \ -+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -+ esac; \ -+ fi; \ -+ skip_next=no; \ -+ strip_trailopt () \ -+ { \ -+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -+ }; \ -+ for flg in $$sane_makeflags; do \ -+ test $$skip_next = yes && { skip_next=no; continue; }; \ -+ case $$flg in \ -+ *=*|--*) continue;; \ -+ -*I) strip_trailopt 'I'; skip_next=yes;; \ -+ -*I?*) strip_trailopt 'I';; \ -+ -*O) strip_trailopt 'O'; skip_next=yes;; \ -+ -*O?*) strip_trailopt 'O';; \ -+ -*l) strip_trailopt 'l'; skip_next=yes;; \ -+ -*l?*) strip_trailopt 'l';; \ -+ -[dEDm]) skip_next=yes;; \ -+ -[JT]) skip_next=yes;; \ -+ esac; \ -+ case $$flg in \ -+ *$$target_option*) has_opt=yes; break;; \ -+ esac; \ -+ done; \ -+ test $$has_opt = yes -+am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -+am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -35,7 +79,8 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - subdir = src/modules/shapes/shapes_polygons --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ -+ $(top_srcdir)/depcomp - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ - $(top_srcdir)/m4/ax_python_devel.m4 \ -@@ -71,6 +116,12 @@ am__nobase_list = $(am__nobase_strip_setup); \ - am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -+am__uninstall_files_from_dir = { \ -+ test -z "$$files" \ -+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ -+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ -+ $(am__cd) "$$dir" && rm -f $$files; }; \ -+ } - am__installdirs = "$(DESTDIR)$(pkglibdir)" - LTLIBRARIES = $(pkglib_LTLIBRARIES) - libshapes_polygons_la_DEPENDENCIES = \ -@@ -83,35 +134,92 @@ am_libshapes_polygons_la_OBJECTS = MLB_Interface.lo \ - polygon_split_parts.lo polygon_to_edges_nodes.lo \ - polygon_to_points.lo shape_index.lo - libshapes_polygons_la_OBJECTS = $(am_libshapes_polygons_la_OBJECTS) -+AM_V_lt = $(am__v_lt_@AM_V@) -+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -+am__v_lt_0 = --silent -+am__v_lt_1 = -+AM_V_P = $(am__v_P_@AM_V@) -+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -+am__v_P_0 = false -+am__v_P_1 = : -+AM_V_GEN = $(am__v_GEN_@AM_V@) -+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+am__v_GEN_0 = @echo " GEN " $@; -+am__v_GEN_1 = -+AM_V_at = $(am__v_at_@AM_V@) -+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+am__v_at_0 = @ -+am__v_at_1 = - DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - am__mv = mv -f - CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) --LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CXXFLAGS) $(CXXFLAGS) -+AM_V_CXX = $(am__v_CXX_@AM_V@) -+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) -+am__v_CXX_0 = @echo " CXX " $@; -+am__v_CXX_1 = - CXXLD = $(CXX) --CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ -+ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) -+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) -+am__v_CXXLD_0 = @echo " CXXLD " $@; -+am__v_CXXLD_1 = - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CFLAGS) $(CFLAGS) -+AM_V_CC = $(am__v_CC_@AM_V@) -+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -+am__v_CC_0 = @echo " CC " $@; -+am__v_CC_1 = - CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CCLD = $(am__v_CCLD_@AM_V@) -+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -+am__v_CCLD_0 = @echo " CCLD " $@; -+am__v_CCLD_1 = - SOURCES = $(libshapes_polygons_la_SOURCES) - DIST_SOURCES = $(libshapes_polygons_la_SOURCES) -+am__can_run_installinfo = \ -+ case $$AM_UPDATE_INFO_DIR in \ -+ n|no|NO) false;; \ -+ *) (install-info --version) >/dev/null 2>&1;; \ -+ esac -+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -+# Read a list of newline-separated strings from the standard input, -+# and print each of them once, without duplicates. Input order is -+# *not* preserved. -+am__uniquify_input = $(AWK) '\ -+ BEGIN { nonempty = 0; } \ -+ { items[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in items) print i; }; } \ -+' -+# Make sure the list of sources is unique. This is necessary because, -+# e.g., the same source file might be shared among _SOURCES variables -+# for different programs/libraries. -+am__define_uniq_tagged_files = \ -+ list='$(am__tagged_files)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | $(am__uniquify_input)` - ETAGS = etags - CTAGS = ctags - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ -+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ -@@ -132,6 +240,7 @@ CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DISABLELIBHARU = @DISABLELIBHARU@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -159,6 +268,7 @@ LOCAL_INCS = @LOCAL_INCS@ - LOCAL_LIBS = @LOCAL_LIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - NM = @NM@ - NMEDIT = @NMEDIT@ -@@ -171,6 +281,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - POW_LIB = @POW_LIB@ -@@ -196,6 +307,7 @@ abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -@@ -229,7 +341,6 @@ libdir = @libdir@ - libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -@@ -325,9 +436,9 @@ $(top_srcdir)/configure: $(am__configure_deps) - $(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - $(am__aclocal_m4_deps): -+ - install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" - @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ - list2=; for p in $$list; do \ - if test -f $$p; then \ -@@ -335,6 +446,8 @@ install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - else :; fi; \ - done; \ - test -z "$$list2" || { \ -+ echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \ -+ $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \ - } -@@ -350,14 +463,17 @@ uninstall-pkglibLTLIBRARIES: - - clean-pkglibLTLIBRARIES: - -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES) -- @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \ -- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -- echo "rm -f \"$${dir}/so_locations\""; \ -- rm -f "$${dir}/so_locations"; \ -- done --libshapes_polygons.la: $(libshapes_polygons_la_OBJECTS) $(libshapes_polygons_la_DEPENDENCIES) -- $(CXXLINK) -rpath $(pkglibdir) $(libshapes_polygons_la_OBJECTS) $(libshapes_polygons_la_LIBADD) $(LIBS) -+ @list='$(pkglib_LTLIBRARIES)'; \ -+ locs=`for p in $$list; do echo $$p; done | \ -+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ -+ sort -u`; \ -+ test -z "$$locs" || { \ -+ echo rm -f $${locs}; \ -+ rm -f $${locs}; \ -+ } -+ -+libshapes_polygons.la: $(libshapes_polygons_la_OBJECTS) $(libshapes_polygons_la_DEPENDENCIES) $(EXTRA_libshapes_polygons_la_DEPENDENCIES) -+ $(AM_V_CXXLD)$(CXXLINK) -rpath $(pkglibdir) $(libshapes_polygons_la_OBJECTS) $(libshapes_polygons_la_LIBADD) $(LIBS) - - mostlyclean-compile: - -rm -f *.$(OBJEXT) -@@ -381,25 +497,25 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shape_index.Plo@am__quote@ - - .cpp.o: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< - - .cpp.obj: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - - .cpp.lo: --@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< - - mostlyclean-libtool: - -rm -f *.lo -@@ -407,26 +523,15 @@ mostlyclean-libtool: - clean-libtool: - -rm -rf .libs _libs - --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -+ID: $(am__tagged_files) -+ $(am__define_uniq_tagged_files); mkid -fID $$unique -+tags: tags-am -+TAGS: tags -+ -+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ -@@ -438,15 +543,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $$unique; \ - fi; \ - fi --ctags: CTAGS --CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ctags: ctags-am -+ -+CTAGS: ctags -+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) -+ $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique -@@ -455,6 +556,21 @@ GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -+cscopelist: cscopelist-am -+ -+cscopelist-am: $(am__tagged_files) -+ list='$(am__tagged_files)'; \ -+ case "$(srcdir)" in \ -+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ -+ *) sdir=$(subdir)/$(srcdir) ;; \ -+ esac; \ -+ for i in $$list; do \ -+ if test -f "$$i"; then \ -+ echo "$(subdir)/$$i"; \ -+ else \ -+ echo "$$sdir/$$i"; \ -+ fi; \ -+ done >> $(top_builddir)/cscope.files - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -@@ -506,10 +622,15 @@ install-am: all-am - - installcheck: installcheck-am - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+ if test -z '$(STRIP)'; then \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ install; \ -+ else \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -+ fi - mostlyclean-generic: - - clean-generic: -@@ -594,19 +715,20 @@ uninstall-am: uninstall-pkglibLTLIBRARIES - - .MAKE: install-am install-strip - --.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ -- clean-libtool clean-pkglibLTLIBRARIES ctags distclean \ -- distclean-compile distclean-generic distclean-libtool \ -- distclean-tags distdir dvi dvi-am html html-am info info-am \ -- install install-am install-data install-data-am install-dvi \ -- install-dvi-am install-exec install-exec-am install-html \ -- install-html-am install-info install-info-am install-man \ -- install-pdf install-pdf-am install-pkglibLTLIBRARIES \ -- install-ps install-ps-am install-strip installcheck \ -- installcheck-am installdirs maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-compile \ -- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -- tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES -+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ -+ clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \ -+ ctags-am distclean distclean-compile distclean-generic \ -+ distclean-libtool distclean-tags distdir dvi dvi-am html \ -+ html-am info info-am install install-am install-data \ -+ install-data-am install-dvi install-dvi-am install-exec \ -+ install-exec-am install-html install-html-am install-info \ -+ install-info-am install-man install-pdf install-pdf-am \ -+ install-pkglibLTLIBRARIES install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ maintainer-clean maintainer-clean-generic mostlyclean \ -+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ -+ pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ -+ uninstall-pkglibLTLIBRARIES - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff --git a/src/modules/shapes/shapes_tools/Makefile.in b/src/modules/shapes/shapes_tools/Makefile.in -index 6750c71..c00113f 100644 ---- a/src/modules/shapes/shapes_tools/Makefile.in -+++ b/src/modules/shapes/shapes_tools/Makefile.in -@@ -1,9 +1,8 @@ --# Makefile.in generated by automake 1.11.1 from Makefile.am. -+# Makefile.in generated by automake 1.14 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, --# Inc. -+# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+ - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -16,6 +15,51 @@ - @SET_MAKE@ - - VPATH = @srcdir@ -+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -+am__make_running_with_option = \ -+ case $${target_option-} in \ -+ ?) ;; \ -+ *) echo "am__make_running_with_option: internal error: invalid" \ -+ "target option '$${target_option-}' specified" >&2; \ -+ exit 1;; \ -+ esac; \ -+ has_opt=no; \ -+ sane_makeflags=$$MAKEFLAGS; \ -+ if $(am__is_gnu_make); then \ -+ sane_makeflags=$$MFLAGS; \ -+ else \ -+ case $$MAKEFLAGS in \ -+ *\\[\ \ ]*) \ -+ bs=\\; \ -+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -+ esac; \ -+ fi; \ -+ skip_next=no; \ -+ strip_trailopt () \ -+ { \ -+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -+ }; \ -+ for flg in $$sane_makeflags; do \ -+ test $$skip_next = yes && { skip_next=no; continue; }; \ -+ case $$flg in \ -+ *=*|--*) continue;; \ -+ -*I) strip_trailopt 'I'; skip_next=yes;; \ -+ -*I?*) strip_trailopt 'I';; \ -+ -*O) strip_trailopt 'O'; skip_next=yes;; \ -+ -*O?*) strip_trailopt 'O';; \ -+ -*l) strip_trailopt 'l'; skip_next=yes;; \ -+ -*l?*) strip_trailopt 'l';; \ -+ -[dEDm]) skip_next=yes;; \ -+ -[JT]) skip_next=yes;; \ -+ esac; \ -+ case $$flg in \ -+ *$$target_option*) has_opt=yes; break;; \ -+ esac; \ -+ done; \ -+ test $$has_opt = yes -+am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -+am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -35,7 +79,8 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - subdir = src/modules/shapes/shapes_tools --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ -+ $(top_srcdir)/depcomp - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ - $(top_srcdir)/m4/ax_python_devel.m4 \ -@@ -71,6 +116,12 @@ am__nobase_list = $(am__nobase_strip_setup); \ - am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -+am__uninstall_files_from_dir = { \ -+ test -z "$$files" \ -+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ -+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ -+ $(am__cd) "$$dir" && rm -f $$files; }; \ -+ } - am__installdirs = "$(DESTDIR)$(pkglibdir)" - LTLIBRARIES = $(pkglib_LTLIBRARIES) - libshapes_tools_la_DEPENDENCIES = \ -@@ -85,35 +136,92 @@ am_libshapes_tools_la_OBJECTS = CreateChartLayer.lo \ - shapes_polar_to_cartes.lo shapes_split.lo \ - shapes_split_by_attribute.lo shapes_split_randomly.lo - libshapes_tools_la_OBJECTS = $(am_libshapes_tools_la_OBJECTS) -+AM_V_lt = $(am__v_lt_@AM_V@) -+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -+am__v_lt_0 = --silent -+am__v_lt_1 = -+AM_V_P = $(am__v_P_@AM_V@) -+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -+am__v_P_0 = false -+am__v_P_1 = : -+AM_V_GEN = $(am__v_GEN_@AM_V@) -+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+am__v_GEN_0 = @echo " GEN " $@; -+am__v_GEN_1 = -+AM_V_at = $(am__v_at_@AM_V@) -+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+am__v_at_0 = @ -+am__v_at_1 = - DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - am__mv = mv -f - CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) --LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CXXFLAGS) $(CXXFLAGS) -+AM_V_CXX = $(am__v_CXX_@AM_V@) -+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) -+am__v_CXX_0 = @echo " CXX " $@; -+am__v_CXX_1 = - CXXLD = $(CXX) --CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ -+ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) -+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) -+am__v_CXXLD_0 = @echo " CXXLD " $@; -+am__v_CXXLD_1 = - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CFLAGS) $(CFLAGS) -+AM_V_CC = $(am__v_CC_@AM_V@) -+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -+am__v_CC_0 = @echo " CC " $@; -+am__v_CC_1 = - CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CCLD = $(am__v_CCLD_@AM_V@) -+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -+am__v_CCLD_0 = @echo " CCLD " $@; -+am__v_CCLD_1 = - SOURCES = $(libshapes_tools_la_SOURCES) - DIST_SOURCES = $(libshapes_tools_la_SOURCES) -+am__can_run_installinfo = \ -+ case $$AM_UPDATE_INFO_DIR in \ -+ n|no|NO) false;; \ -+ *) (install-info --version) >/dev/null 2>&1;; \ -+ esac -+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -+# Read a list of newline-separated strings from the standard input, -+# and print each of them once, without duplicates. Input order is -+# *not* preserved. -+am__uniquify_input = $(AWK) '\ -+ BEGIN { nonempty = 0; } \ -+ { items[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in items) print i; }; } \ -+' -+# Make sure the list of sources is unique. This is necessary because, -+# e.g., the same source file might be shared among _SOURCES variables -+# for different programs/libraries. -+am__define_uniq_tagged_files = \ -+ list='$(am__tagged_files)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | $(am__uniquify_input)` - ETAGS = etags - CTAGS = ctags - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ -+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ -@@ -134,6 +242,7 @@ CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DISABLELIBHARU = @DISABLELIBHARU@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -161,6 +270,7 @@ LOCAL_INCS = @LOCAL_INCS@ - LOCAL_LIBS = @LOCAL_LIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - NM = @NM@ - NMEDIT = @NMEDIT@ -@@ -173,6 +283,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - POW_LIB = @POW_LIB@ -@@ -198,6 +309,7 @@ abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -@@ -231,7 +343,6 @@ libdir = @libdir@ - libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -@@ -341,9 +452,9 @@ $(top_srcdir)/configure: $(am__configure_deps) - $(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - $(am__aclocal_m4_deps): -+ - install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" - @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ - list2=; for p in $$list; do \ - if test -f $$p; then \ -@@ -351,6 +462,8 @@ install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - else :; fi; \ - done; \ - test -z "$$list2" || { \ -+ echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \ -+ $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \ - } -@@ -366,14 +479,17 @@ uninstall-pkglibLTLIBRARIES: - - clean-pkglibLTLIBRARIES: - -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES) -- @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \ -- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -- echo "rm -f \"$${dir}/so_locations\""; \ -- rm -f "$${dir}/so_locations"; \ -- done --libshapes_tools.la: $(libshapes_tools_la_OBJECTS) $(libshapes_tools_la_DEPENDENCIES) -- $(CXXLINK) -rpath $(pkglibdir) $(libshapes_tools_la_OBJECTS) $(libshapes_tools_la_LIBADD) $(LIBS) -+ @list='$(pkglib_LTLIBRARIES)'; \ -+ locs=`for p in $$list; do echo $$p; done | \ -+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ -+ sort -u`; \ -+ test -z "$$locs" || { \ -+ echo rm -f $${locs}; \ -+ rm -f $${locs}; \ -+ } -+ -+libshapes_tools.la: $(libshapes_tools_la_OBJECTS) $(libshapes_tools_la_DEPENDENCIES) $(EXTRA_libshapes_tools_la_DEPENDENCIES) -+ $(AM_V_CXXLD)$(CXXLINK) -rpath $(pkglibdir) $(libshapes_tools_la_OBJECTS) $(libshapes_tools_la_LIBADD) $(LIBS) - - mostlyclean-compile: - -rm -f *.$(OBJEXT) -@@ -404,25 +520,25 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shapes_split_randomly.Plo@am__quote@ - - .cpp.o: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< - - .cpp.obj: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - - .cpp.lo: --@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< - - mostlyclean-libtool: - -rm -f *.lo -@@ -430,26 +546,15 @@ mostlyclean-libtool: - clean-libtool: - -rm -rf .libs _libs - --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -+ID: $(am__tagged_files) -+ $(am__define_uniq_tagged_files); mkid -fID $$unique -+tags: tags-am -+TAGS: tags -+ -+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ -@@ -461,15 +566,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $$unique; \ - fi; \ - fi --ctags: CTAGS --CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ctags: ctags-am -+ -+CTAGS: ctags -+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) -+ $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique -@@ -478,6 +579,21 @@ GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -+cscopelist: cscopelist-am -+ -+cscopelist-am: $(am__tagged_files) -+ list='$(am__tagged_files)'; \ -+ case "$(srcdir)" in \ -+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ -+ *) sdir=$(subdir)/$(srcdir) ;; \ -+ esac; \ -+ for i in $$list; do \ -+ if test -f "$$i"; then \ -+ echo "$(subdir)/$$i"; \ -+ else \ -+ echo "$$sdir/$$i"; \ -+ fi; \ -+ done >> $(top_builddir)/cscope.files - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -@@ -529,10 +645,15 @@ install-am: all-am - - installcheck: installcheck-am - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+ if test -z '$(STRIP)'; then \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ install; \ -+ else \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -+ fi - mostlyclean-generic: - - clean-generic: -@@ -617,19 +738,20 @@ uninstall-am: uninstall-pkglibLTLIBRARIES - - .MAKE: install-am install-strip - --.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ -- clean-libtool clean-pkglibLTLIBRARIES ctags distclean \ -- distclean-compile distclean-generic distclean-libtool \ -- distclean-tags distdir dvi dvi-am html html-am info info-am \ -- install install-am install-data install-data-am install-dvi \ -- install-dvi-am install-exec install-exec-am install-html \ -- install-html-am install-info install-info-am install-man \ -- install-pdf install-pdf-am install-pkglibLTLIBRARIES \ -- install-ps install-ps-am install-strip installcheck \ -- installcheck-am installdirs maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-compile \ -- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -- tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES -+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ -+ clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \ -+ ctags-am distclean distclean-compile distclean-generic \ -+ distclean-libtool distclean-tags distdir dvi dvi-am html \ -+ html-am info info-am install install-am install-data \ -+ install-data-am install-dvi install-dvi-am install-exec \ -+ install-exec-am install-html install-html-am install-info \ -+ install-info-am install-man install-pdf install-pdf-am \ -+ install-pkglibLTLIBRARIES install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ maintainer-clean maintainer-clean-generic mostlyclean \ -+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ -+ pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ -+ uninstall-pkglibLTLIBRARIES - - - #install-exec-hook: -diff --git a/src/modules/shapes/shapes_transect/Makefile.in b/src/modules/shapes/shapes_transect/Makefile.in -index 34634ff..01f11f5 100644 ---- a/src/modules/shapes/shapes_transect/Makefile.in -+++ b/src/modules/shapes/shapes_transect/Makefile.in -@@ -1,9 +1,8 @@ --# Makefile.in generated by automake 1.11.1 from Makefile.am. -+# Makefile.in generated by automake 1.14 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, --# Inc. -+# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+ - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -16,6 +15,51 @@ - @SET_MAKE@ - - VPATH = @srcdir@ -+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -+am__make_running_with_option = \ -+ case $${target_option-} in \ -+ ?) ;; \ -+ *) echo "am__make_running_with_option: internal error: invalid" \ -+ "target option '$${target_option-}' specified" >&2; \ -+ exit 1;; \ -+ esac; \ -+ has_opt=no; \ -+ sane_makeflags=$$MAKEFLAGS; \ -+ if $(am__is_gnu_make); then \ -+ sane_makeflags=$$MFLAGS; \ -+ else \ -+ case $$MAKEFLAGS in \ -+ *\\[\ \ ]*) \ -+ bs=\\; \ -+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -+ esac; \ -+ fi; \ -+ skip_next=no; \ -+ strip_trailopt () \ -+ { \ -+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -+ }; \ -+ for flg in $$sane_makeflags; do \ -+ test $$skip_next = yes && { skip_next=no; continue; }; \ -+ case $$flg in \ -+ *=*|--*) continue;; \ -+ -*I) strip_trailopt 'I'; skip_next=yes;; \ -+ -*I?*) strip_trailopt 'I';; \ -+ -*O) strip_trailopt 'O'; skip_next=yes;; \ -+ -*O?*) strip_trailopt 'O';; \ -+ -*l) strip_trailopt 'l'; skip_next=yes;; \ -+ -*l?*) strip_trailopt 'l';; \ -+ -[dEDm]) skip_next=yes;; \ -+ -[JT]) skip_next=yes;; \ -+ esac; \ -+ case $$flg in \ -+ *$$target_option*) has_opt=yes; break;; \ -+ esac; \ -+ done; \ -+ test $$has_opt = yes -+am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -+am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -35,7 +79,8 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - subdir = src/modules/shapes/shapes_transect --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ -+ $(top_srcdir)/depcomp - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ - $(top_srcdir)/m4/ax_python_devel.m4 \ -@@ -71,41 +116,104 @@ am__nobase_list = $(am__nobase_strip_setup); \ - am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -+am__uninstall_files_from_dir = { \ -+ test -z "$$files" \ -+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ -+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ -+ $(am__cd) "$$dir" && rm -f $$files; }; \ -+ } - am__installdirs = "$(DESTDIR)$(pkglibdir)" - LTLIBRARIES = $(pkglib_LTLIBRARIES) - libtransect_la_DEPENDENCIES = \ - $(top_srcdir)/src/saga_core/saga_api/libsaga_api.la - am_libtransect_la_OBJECTS = Polygon_Transect.lo MLB_Interface.lo - libtransect_la_OBJECTS = $(am_libtransect_la_OBJECTS) -+AM_V_lt = $(am__v_lt_@AM_V@) -+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -+am__v_lt_0 = --silent -+am__v_lt_1 = -+AM_V_P = $(am__v_P_@AM_V@) -+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -+am__v_P_0 = false -+am__v_P_1 = : -+AM_V_GEN = $(am__v_GEN_@AM_V@) -+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+am__v_GEN_0 = @echo " GEN " $@; -+am__v_GEN_1 = -+AM_V_at = $(am__v_at_@AM_V@) -+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+am__v_at_0 = @ -+am__v_at_1 = - DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - am__mv = mv -f - CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) --LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CXXFLAGS) $(CXXFLAGS) -+AM_V_CXX = $(am__v_CXX_@AM_V@) -+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) -+am__v_CXX_0 = @echo " CXX " $@; -+am__v_CXX_1 = - CXXLD = $(CXX) --CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ -+ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) -+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) -+am__v_CXXLD_0 = @echo " CXXLD " $@; -+am__v_CXXLD_1 = - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CFLAGS) $(CFLAGS) -+AM_V_CC = $(am__v_CC_@AM_V@) -+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -+am__v_CC_0 = @echo " CC " $@; -+am__v_CC_1 = - CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CCLD = $(am__v_CCLD_@AM_V@) -+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -+am__v_CCLD_0 = @echo " CCLD " $@; -+am__v_CCLD_1 = - SOURCES = $(libtransect_la_SOURCES) - DIST_SOURCES = $(libtransect_la_SOURCES) -+am__can_run_installinfo = \ -+ case $$AM_UPDATE_INFO_DIR in \ -+ n|no|NO) false;; \ -+ *) (install-info --version) >/dev/null 2>&1;; \ -+ esac -+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -+# Read a list of newline-separated strings from the standard input, -+# and print each of them once, without duplicates. Input order is -+# *not* preserved. -+am__uniquify_input = $(AWK) '\ -+ BEGIN { nonempty = 0; } \ -+ { items[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in items) print i; }; } \ -+' -+# Make sure the list of sources is unique. This is necessary because, -+# e.g., the same source file might be shared among _SOURCES variables -+# for different programs/libraries. -+am__define_uniq_tagged_files = \ -+ list='$(am__tagged_files)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | $(am__uniquify_input)` - ETAGS = etags - CTAGS = ctags - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ -+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ -@@ -126,6 +234,7 @@ CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DISABLELIBHARU = @DISABLELIBHARU@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -153,6 +262,7 @@ LOCAL_INCS = @LOCAL_INCS@ - LOCAL_LIBS = @LOCAL_LIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - NM = @NM@ - NMEDIT = @NMEDIT@ -@@ -165,6 +275,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - POW_LIB = @POW_LIB@ -@@ -190,6 +301,7 @@ abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -@@ -223,7 +335,6 @@ libdir = @libdir@ - libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -@@ -295,9 +406,9 @@ $(top_srcdir)/configure: $(am__configure_deps) - $(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - $(am__aclocal_m4_deps): -+ - install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" - @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ - list2=; for p in $$list; do \ - if test -f $$p; then \ -@@ -305,6 +416,8 @@ install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - else :; fi; \ - done; \ - test -z "$$list2" || { \ -+ echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \ -+ $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \ - } -@@ -320,14 +433,17 @@ uninstall-pkglibLTLIBRARIES: - - clean-pkglibLTLIBRARIES: - -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES) -- @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \ -- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -- echo "rm -f \"$${dir}/so_locations\""; \ -- rm -f "$${dir}/so_locations"; \ -- done --libtransect.la: $(libtransect_la_OBJECTS) $(libtransect_la_DEPENDENCIES) -- $(CXXLINK) -rpath $(pkglibdir) $(libtransect_la_OBJECTS) $(libtransect_la_LIBADD) $(LIBS) -+ @list='$(pkglib_LTLIBRARIES)'; \ -+ locs=`for p in $$list; do echo $$p; done | \ -+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ -+ sort -u`; \ -+ test -z "$$locs" || { \ -+ echo rm -f $${locs}; \ -+ rm -f $${locs}; \ -+ } -+ -+libtransect.la: $(libtransect_la_OBJECTS) $(libtransect_la_DEPENDENCIES) $(EXTRA_libtransect_la_DEPENDENCIES) -+ $(AM_V_CXXLD)$(CXXLINK) -rpath $(pkglibdir) $(libtransect_la_OBJECTS) $(libtransect_la_LIBADD) $(LIBS) - - mostlyclean-compile: - -rm -f *.$(OBJEXT) -@@ -339,25 +455,25 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Polygon_Transect.Plo@am__quote@ - - .cpp.o: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< - - .cpp.obj: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - - .cpp.lo: --@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< - - mostlyclean-libtool: - -rm -f *.lo -@@ -365,26 +481,15 @@ mostlyclean-libtool: - clean-libtool: - -rm -rf .libs _libs - --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -+ID: $(am__tagged_files) -+ $(am__define_uniq_tagged_files); mkid -fID $$unique -+tags: tags-am -+TAGS: tags -+ -+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ -@@ -396,15 +501,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $$unique; \ - fi; \ - fi --ctags: CTAGS --CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ctags: ctags-am -+ -+CTAGS: ctags -+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) -+ $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique -@@ -413,6 +514,21 @@ GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -+cscopelist: cscopelist-am -+ -+cscopelist-am: $(am__tagged_files) -+ list='$(am__tagged_files)'; \ -+ case "$(srcdir)" in \ -+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ -+ *) sdir=$(subdir)/$(srcdir) ;; \ -+ esac; \ -+ for i in $$list; do \ -+ if test -f "$$i"; then \ -+ echo "$(subdir)/$$i"; \ -+ else \ -+ echo "$$sdir/$$i"; \ -+ fi; \ -+ done >> $(top_builddir)/cscope.files - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -@@ -464,10 +580,15 @@ install-am: all-am - - installcheck: installcheck-am - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+ if test -z '$(STRIP)'; then \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ install; \ -+ else \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -+ fi - mostlyclean-generic: - - clean-generic: -@@ -552,19 +673,20 @@ uninstall-am: uninstall-pkglibLTLIBRARIES - - .MAKE: install-am install-strip - --.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ -- clean-libtool clean-pkglibLTLIBRARIES ctags distclean \ -- distclean-compile distclean-generic distclean-libtool \ -- distclean-tags distdir dvi dvi-am html html-am info info-am \ -- install install-am install-data install-data-am install-dvi \ -- install-dvi-am install-exec install-exec-am install-html \ -- install-html-am install-info install-info-am install-man \ -- install-pdf install-pdf-am install-pkglibLTLIBRARIES \ -- install-ps install-ps-am install-strip installcheck \ -- installcheck-am installdirs maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-compile \ -- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -- tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES -+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ -+ clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \ -+ ctags-am distclean distclean-compile distclean-generic \ -+ distclean-libtool distclean-tags distdir dvi dvi-am html \ -+ html-am info info-am install install-am install-data \ -+ install-data-am install-dvi install-dvi-am install-exec \ -+ install-exec-am install-html install-html-am install-info \ -+ install-info-am install-man install-pdf install-pdf-am \ -+ install-pkglibLTLIBRARIES install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ maintainer-clean maintainer-clean-generic mostlyclean \ -+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ -+ pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ -+ uninstall-pkglibLTLIBRARIES - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff --git a/src/modules/table/Makefile.in b/src/modules/table/Makefile.in -index 15e2d11..c44ac2f 100644 ---- a/src/modules/table/Makefile.in -+++ b/src/modules/table/Makefile.in -@@ -1,9 +1,8 @@ --# Makefile.in generated by automake 1.11.1 from Makefile.am. -+# Makefile.in generated by automake 1.14 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, --# Inc. -+# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+ - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -15,6 +14,51 @@ - - @SET_MAKE@ - VPATH = @srcdir@ -+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -+am__make_running_with_option = \ -+ case $${target_option-} in \ -+ ?) ;; \ -+ *) echo "am__make_running_with_option: internal error: invalid" \ -+ "target option '$${target_option-}' specified" >&2; \ -+ exit 1;; \ -+ esac; \ -+ has_opt=no; \ -+ sane_makeflags=$$MAKEFLAGS; \ -+ if $(am__is_gnu_make); then \ -+ sane_makeflags=$$MFLAGS; \ -+ else \ -+ case $$MAKEFLAGS in \ -+ *\\[\ \ ]*) \ -+ bs=\\; \ -+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -+ esac; \ -+ fi; \ -+ skip_next=no; \ -+ strip_trailopt () \ -+ { \ -+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -+ }; \ -+ for flg in $$sane_makeflags; do \ -+ test $$skip_next = yes && { skip_next=no; continue; }; \ -+ case $$flg in \ -+ *=*|--*) continue;; \ -+ -*I) strip_trailopt 'I'; skip_next=yes;; \ -+ -*I?*) strip_trailopt 'I';; \ -+ -*O) strip_trailopt 'O'; skip_next=yes;; \ -+ -*O?*) strip_trailopt 'O';; \ -+ -*l) strip_trailopt 'l'; skip_next=yes;; \ -+ -*l?*) strip_trailopt 'l';; \ -+ -[dEDm]) skip_next=yes;; \ -+ -[JT]) skip_next=yes;; \ -+ esac; \ -+ case $$flg in \ -+ *$$target_option*) has_opt=yes; break;; \ -+ esac; \ -+ done; \ -+ test $$has_opt = yes -+am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -+am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -34,7 +78,7 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - subdir = src/modules/table --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ - $(top_srcdir)/m4/ax_python_devel.m4 \ -@@ -49,20 +93,58 @@ mkinstalldirs = $(install_sh) -d - CONFIG_HEADER = $(top_builddir)/config.h - CONFIG_CLEAN_FILES = - CONFIG_CLEAN_VPATH_FILES = -+AM_V_P = $(am__v_P_@AM_V@) -+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -+am__v_P_0 = false -+am__v_P_1 = : -+AM_V_GEN = $(am__v_GEN_@AM_V@) -+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+am__v_GEN_0 = @echo " GEN " $@; -+am__v_GEN_1 = -+AM_V_at = $(am__v_at_@AM_V@) -+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+am__v_at_0 = @ -+am__v_at_1 = - SOURCES = - DIST_SOURCES = --RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ -- html-recursive info-recursive install-data-recursive \ -- install-dvi-recursive install-exec-recursive \ -- install-html-recursive install-info-recursive \ -- install-pdf-recursive install-ps-recursive install-recursive \ -- installcheck-recursive installdirs-recursive pdf-recursive \ -- ps-recursive uninstall-recursive -+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ -+ ctags-recursive dvi-recursive html-recursive info-recursive \ -+ install-data-recursive install-dvi-recursive \ -+ install-exec-recursive install-html-recursive \ -+ install-info-recursive install-pdf-recursive \ -+ install-ps-recursive install-recursive installcheck-recursive \ -+ installdirs-recursive pdf-recursive ps-recursive \ -+ tags-recursive uninstall-recursive -+am__can_run_installinfo = \ -+ case $$AM_UPDATE_INFO_DIR in \ -+ n|no|NO) false;; \ -+ *) (install-info --version) >/dev/null 2>&1;; \ -+ esac - RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ - distclean-recursive maintainer-clean-recursive --AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ -- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ -+am__recursive_targets = \ -+ $(RECURSIVE_TARGETS) \ -+ $(RECURSIVE_CLEAN_TARGETS) \ -+ $(am__extra_recursive_targets) -+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ - distdir -+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -+# Read a list of newline-separated strings from the standard input, -+# and print each of them once, without duplicates. Input order is -+# *not* preserved. -+am__uniquify_input = $(AWK) '\ -+ BEGIN { nonempty = 0; } \ -+ { items[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in items) print i; }; } \ -+' -+# Make sure the list of sources is unique. This is necessary because, -+# e.g., the same source file might be shared among _SOURCES variables -+# for different programs/libraries. -+am__define_uniq_tagged_files = \ -+ list='$(am__tagged_files)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | $(am__uniquify_input)` - ETAGS = etags - CTAGS = ctags - DIST_SUBDIRS = $(SUBDIRS) -@@ -94,6 +176,7 @@ am__relativize = \ - reldir="$$dir2" - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ -+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ -@@ -114,6 +197,7 @@ CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DISABLELIBHARU = @DISABLELIBHARU@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -141,6 +225,7 @@ LOCAL_INCS = @LOCAL_INCS@ - LOCAL_LIBS = @LOCAL_LIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - NM = @NM@ - NMEDIT = @NMEDIT@ -@@ -153,6 +238,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - POW_LIB = @POW_LIB@ -@@ -178,6 +264,7 @@ abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -@@ -211,7 +298,6 @@ libdir = @libdir@ - libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -@@ -273,22 +359,25 @@ clean-libtool: - -rm -rf .libs _libs - - # This directory's subdirectories are mostly independent; you can cd --# into them and run `make' without going through this Makefile. --# To change the values of `make' variables: instead of editing Makefiles, --# (1) if the variable is set in `config.status', edit `config.status' --# (which will cause the Makefiles to be regenerated when you run `make'); --# (2) otherwise, pass the desired values on the `make' command line. --$(RECURSIVE_TARGETS): -- @fail= failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -+# into them and run 'make' without going through this Makefile. -+# To change the values of 'make' variables: instead of editing Makefiles, -+# (1) if the variable is set in 'config.status', edit 'config.status' -+# (which will cause the Makefiles to be regenerated when you run 'make'); -+# (2) otherwise, pass the desired values on the 'make' command line. -+$(am__recursive_targets): -+ @fail=; \ -+ if $(am__make_keepgoing); then \ -+ failcom='fail=yes'; \ -+ else \ -+ failcom='exit 1'; \ -+ fi; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ -- list='$(SUBDIRS)'; for subdir in $$list; do \ -+ case "$@" in \ -+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -+ *) list='$(SUBDIRS)' ;; \ -+ esac; \ -+ for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ -@@ -303,57 +392,12 @@ $(RECURSIVE_TARGETS): - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - --$(RECURSIVE_CLEAN_TARGETS): -- @fail= failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -- dot_seen=no; \ -- case "$@" in \ -- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -- *) list='$(SUBDIRS)' ;; \ -- esac; \ -- rev=''; for subdir in $$list; do \ -- if test "$$subdir" = "."; then :; else \ -- rev="$$subdir $$rev"; \ -- fi; \ -- done; \ -- rev="$$rev ."; \ -- target=`echo $@ | sed s/-recursive//`; \ -- for subdir in $$rev; do \ -- echo "Making $$target in $$subdir"; \ -- if test "$$subdir" = "."; then \ -- local_target="$$target-am"; \ -- else \ -- local_target="$$target"; \ -- fi; \ -- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || eval $$failcom; \ -- done && test -z "$$fail" --tags-recursive: -- list='$(SUBDIRS)'; for subdir in $$list; do \ -- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ -- done --ctags-recursive: -- list='$(SUBDIRS)'; for subdir in $$list; do \ -- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ -- done -+ID: $(am__tagged_files) -+ $(am__define_uniq_tagged_files); mkid -fID $$unique -+tags: tags-recursive -+TAGS: tags - --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ - if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ -@@ -369,12 +413,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ -@@ -386,15 +425,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $$unique; \ - fi; \ - fi --ctags: CTAGS --CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ctags: ctags-recursive -+ -+CTAGS: ctags -+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) -+ $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique -@@ -403,6 +438,21 @@ GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -+cscopelist: cscopelist-recursive -+ -+cscopelist-am: $(am__tagged_files) -+ list='$(am__tagged_files)'; \ -+ case "$(srcdir)" in \ -+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ -+ *) sdir=$(subdir)/$(srcdir) ;; \ -+ esac; \ -+ for i in $$list; do \ -+ if test -f "$$i"; then \ -+ echo "$(subdir)/$$i"; \ -+ else \ -+ echo "$$sdir/$$i"; \ -+ fi; \ -+ done >> $(top_builddir)/cscope.files - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -@@ -439,13 +489,10 @@ distdir: $(DISTFILES) - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test -d "$(distdir)/$$subdir" \ -- || $(MKDIR_P) "$(distdir)/$$subdir" \ -- || exit 1; \ -- fi; \ -- done -- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ -- if test "$$subdir" = .; then :; else \ -+ $(am__make_dryrun) \ -+ || test -d "$(distdir)/$$subdir" \ -+ || $(MKDIR_P) "$(distdir)/$$subdir" \ -+ || exit 1; \ - dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ - $(am__relativize); \ - new_distdir=$$reldir; \ -@@ -480,10 +527,15 @@ install-am: all-am - - installcheck: installcheck-recursive - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+ if test -z '$(STRIP)'; then \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ install; \ -+ else \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -+ fi - mostlyclean-generic: - - clean-generic: -@@ -561,22 +613,20 @@ ps-am: - - uninstall-am: - --.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ -- install-am install-strip tags-recursive -- --.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ -- all all-am check check-am clean clean-generic clean-libtool \ -- ctags ctags-recursive distclean distclean-generic \ -- distclean-libtool distclean-tags distdir dvi dvi-am html \ -- html-am info info-am install install-am install-data \ -- install-data-am install-dvi install-dvi-am install-exec \ -- install-exec-am install-html install-html-am install-info \ -- install-info-am install-man install-pdf install-pdf-am \ -- install-ps install-ps-am install-strip installcheck \ -- installcheck-am installdirs installdirs-am maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-generic \ -- mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ -- uninstall uninstall-am -+.MAKE: $(am__recursive_targets) install-am install-strip -+ -+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ -+ check-am clean clean-generic clean-libtool cscopelist-am ctags \ -+ ctags-am distclean distclean-generic distclean-libtool \ -+ distclean-tags distdir dvi dvi-am html html-am info info-am \ -+ install install-am install-data install-data-am install-dvi \ -+ install-dvi-am install-exec install-exec-am install-html \ -+ install-html-am install-info install-info-am install-man \ -+ install-pdf install-pdf-am install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ installdirs-am maintainer-clean maintainer-clean-generic \ -+ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ -+ ps ps-am tags tags-am uninstall uninstall-am - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff --git a/src/modules/table/table_calculus/Makefile.in b/src/modules/table/table_calculus/Makefile.in -index 5055e49..89dc66f 100644 ---- a/src/modules/table/table_calculus/Makefile.in -+++ b/src/modules/table/table_calculus/Makefile.in -@@ -1,9 +1,8 @@ --# Makefile.in generated by automake 1.11.1 from Makefile.am. -+# Makefile.in generated by automake 1.14 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, --# Inc. -+# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+ - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -16,6 +15,51 @@ - @SET_MAKE@ - - VPATH = @srcdir@ -+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -+am__make_running_with_option = \ -+ case $${target_option-} in \ -+ ?) ;; \ -+ *) echo "am__make_running_with_option: internal error: invalid" \ -+ "target option '$${target_option-}' specified" >&2; \ -+ exit 1;; \ -+ esac; \ -+ has_opt=no; \ -+ sane_makeflags=$$MAKEFLAGS; \ -+ if $(am__is_gnu_make); then \ -+ sane_makeflags=$$MFLAGS; \ -+ else \ -+ case $$MAKEFLAGS in \ -+ *\\[\ \ ]*) \ -+ bs=\\; \ -+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -+ esac; \ -+ fi; \ -+ skip_next=no; \ -+ strip_trailopt () \ -+ { \ -+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -+ }; \ -+ for flg in $$sane_makeflags; do \ -+ test $$skip_next = yes && { skip_next=no; continue; }; \ -+ case $$flg in \ -+ *=*|--*) continue;; \ -+ -*I) strip_trailopt 'I'; skip_next=yes;; \ -+ -*I?*) strip_trailopt 'I';; \ -+ -*O) strip_trailopt 'O'; skip_next=yes;; \ -+ -*O?*) strip_trailopt 'O';; \ -+ -*l) strip_trailopt 'l'; skip_next=yes;; \ -+ -*l?*) strip_trailopt 'l';; \ -+ -[dEDm]) skip_next=yes;; \ -+ -[JT]) skip_next=yes;; \ -+ esac; \ -+ case $$flg in \ -+ *$$target_option*) has_opt=yes; break;; \ -+ esac; \ -+ done; \ -+ test $$has_opt = yes -+am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -+am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -35,7 +79,8 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - subdir = src/modules/table/table_calculus --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ -+ $(top_srcdir)/depcomp - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ - $(top_srcdir)/m4/ax_python_devel.m4 \ -@@ -71,6 +116,12 @@ am__nobase_list = $(am__nobase_strip_setup); \ - am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -+am__uninstall_files_from_dir = { \ -+ test -z "$$files" \ -+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ -+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ -+ $(am__cd) "$$dir" && rm -f $$files; }; \ -+ } - am__installdirs = "$(DESTDIR)$(pkglibdir)" - LTLIBRARIES = $(pkglib_LTLIBRARIES) - libtable_calculus_la_DEPENDENCIES = \ -@@ -80,35 +131,92 @@ am_libtable_calculus_la_OBJECTS = Fit.lo LMFit.lo MLB_Interface.lo \ - table_field_analyzer.lo table_fill_record_gaps.lo table_pca.lo \ - table_running_average.lo - libtable_calculus_la_OBJECTS = $(am_libtable_calculus_la_OBJECTS) -+AM_V_lt = $(am__v_lt_@AM_V@) -+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -+am__v_lt_0 = --silent -+am__v_lt_1 = -+AM_V_P = $(am__v_P_@AM_V@) -+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -+am__v_P_0 = false -+am__v_P_1 = : -+AM_V_GEN = $(am__v_GEN_@AM_V@) -+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+am__v_GEN_0 = @echo " GEN " $@; -+am__v_GEN_1 = -+AM_V_at = $(am__v_at_@AM_V@) -+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+am__v_at_0 = @ -+am__v_at_1 = - DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - am__mv = mv -f - CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) --LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CXXFLAGS) $(CXXFLAGS) -+AM_V_CXX = $(am__v_CXX_@AM_V@) -+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) -+am__v_CXX_0 = @echo " CXX " $@; -+am__v_CXX_1 = - CXXLD = $(CXX) --CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ -+ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) -+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) -+am__v_CXXLD_0 = @echo " CXXLD " $@; -+am__v_CXXLD_1 = - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CFLAGS) $(CFLAGS) -+AM_V_CC = $(am__v_CC_@AM_V@) -+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -+am__v_CC_0 = @echo " CC " $@; -+am__v_CC_1 = - CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CCLD = $(am__v_CCLD_@AM_V@) -+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -+am__v_CCLD_0 = @echo " CCLD " $@; -+am__v_CCLD_1 = - SOURCES = $(libtable_calculus_la_SOURCES) - DIST_SOURCES = $(libtable_calculus_la_SOURCES) -+am__can_run_installinfo = \ -+ case $$AM_UPDATE_INFO_DIR in \ -+ n|no|NO) false;; \ -+ *) (install-info --version) >/dev/null 2>&1;; \ -+ esac -+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -+# Read a list of newline-separated strings from the standard input, -+# and print each of them once, without duplicates. Input order is -+# *not* preserved. -+am__uniquify_input = $(AWK) '\ -+ BEGIN { nonempty = 0; } \ -+ { items[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in items) print i; }; } \ -+' -+# Make sure the list of sources is unique. This is necessary because, -+# e.g., the same source file might be shared among _SOURCES variables -+# for different programs/libraries. -+am__define_uniq_tagged_files = \ -+ list='$(am__tagged_files)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | $(am__uniquify_input)` - ETAGS = etags - CTAGS = ctags - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ -+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ -@@ -129,6 +237,7 @@ CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DISABLELIBHARU = @DISABLELIBHARU@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -156,6 +265,7 @@ LOCAL_INCS = @LOCAL_INCS@ - LOCAL_LIBS = @LOCAL_LIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - NM = @NM@ - NMEDIT = @NMEDIT@ -@@ -168,6 +278,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - POW_LIB = @POW_LIB@ -@@ -193,6 +304,7 @@ abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -@@ -226,7 +338,6 @@ libdir = @libdir@ - libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -@@ -312,9 +423,9 @@ $(top_srcdir)/configure: $(am__configure_deps) - $(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - $(am__aclocal_m4_deps): -+ - install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" - @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ - list2=; for p in $$list; do \ - if test -f $$p; then \ -@@ -322,6 +433,8 @@ install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - else :; fi; \ - done; \ - test -z "$$list2" || { \ -+ echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \ -+ $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \ - } -@@ -337,14 +450,17 @@ uninstall-pkglibLTLIBRARIES: - - clean-pkglibLTLIBRARIES: - -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES) -- @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \ -- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -- echo "rm -f \"$${dir}/so_locations\""; \ -- rm -f "$${dir}/so_locations"; \ -- done --libtable_calculus.la: $(libtable_calculus_la_OBJECTS) $(libtable_calculus_la_DEPENDENCIES) -- $(CXXLINK) -rpath $(pkglibdir) $(libtable_calculus_la_OBJECTS) $(libtable_calculus_la_LIBADD) $(LIBS) -+ @list='$(pkglib_LTLIBRARIES)'; \ -+ locs=`for p in $$list; do echo $$p; done | \ -+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ -+ sort -u`; \ -+ test -z "$$locs" || { \ -+ echo rm -f $${locs}; \ -+ rm -f $${locs}; \ -+ } -+ -+libtable_calculus.la: $(libtable_calculus_la_OBJECTS) $(libtable_calculus_la_DEPENDENCIES) $(EXTRA_libtable_calculus_la_DEPENDENCIES) -+ $(AM_V_CXXLD)$(CXXLINK) -rpath $(pkglibdir) $(libtable_calculus_la_OBJECTS) $(libtable_calculus_la_LIBADD) $(LIBS) - - mostlyclean-compile: - -rm -f *.$(OBJEXT) -@@ -363,25 +479,25 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/table_running_average.Plo@am__quote@ - - .cpp.o: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< - - .cpp.obj: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - - .cpp.lo: --@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< - - mostlyclean-libtool: - -rm -f *.lo -@@ -389,26 +505,15 @@ mostlyclean-libtool: - clean-libtool: - -rm -rf .libs _libs - --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -+ID: $(am__tagged_files) -+ $(am__define_uniq_tagged_files); mkid -fID $$unique -+tags: tags-am -+TAGS: tags -+ -+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ -@@ -420,15 +525,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $$unique; \ - fi; \ - fi --ctags: CTAGS --CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ctags: ctags-am -+ -+CTAGS: ctags -+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) -+ $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique -@@ -437,6 +538,21 @@ GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -+cscopelist: cscopelist-am -+ -+cscopelist-am: $(am__tagged_files) -+ list='$(am__tagged_files)'; \ -+ case "$(srcdir)" in \ -+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ -+ *) sdir=$(subdir)/$(srcdir) ;; \ -+ esac; \ -+ for i in $$list; do \ -+ if test -f "$$i"; then \ -+ echo "$(subdir)/$$i"; \ -+ else \ -+ echo "$$sdir/$$i"; \ -+ fi; \ -+ done >> $(top_builddir)/cscope.files - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -@@ -488,10 +604,15 @@ install-am: all-am - - installcheck: installcheck-am - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+ if test -z '$(STRIP)'; then \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ install; \ -+ else \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -+ fi - mostlyclean-generic: - - clean-generic: -@@ -576,19 +697,20 @@ uninstall-am: uninstall-pkglibLTLIBRARIES - - .MAKE: install-am install-strip - --.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ -- clean-libtool clean-pkglibLTLIBRARIES ctags distclean \ -- distclean-compile distclean-generic distclean-libtool \ -- distclean-tags distdir dvi dvi-am html html-am info info-am \ -- install install-am install-data install-data-am install-dvi \ -- install-dvi-am install-exec install-exec-am install-html \ -- install-html-am install-info install-info-am install-man \ -- install-pdf install-pdf-am install-pkglibLTLIBRARIES \ -- install-ps install-ps-am install-strip installcheck \ -- installcheck-am installdirs maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-compile \ -- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -- tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES -+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ -+ clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \ -+ ctags-am distclean distclean-compile distclean-generic \ -+ distclean-libtool distclean-tags distdir dvi dvi-am html \ -+ html-am info info-am install install-am install-data \ -+ install-data-am install-dvi install-dvi-am install-exec \ -+ install-exec-am install-html install-html-am install-info \ -+ install-info-am install-man install-pdf install-pdf-am \ -+ install-pkglibLTLIBRARIES install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ maintainer-clean maintainer-clean-generic mostlyclean \ -+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ -+ pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ -+ uninstall-pkglibLTLIBRARIES - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff --git a/src/modules/table/table_tools/Makefile.in b/src/modules/table/table_tools/Makefile.in -index f7c6b4d..ab2e9d3 100644 ---- a/src/modules/table/table_tools/Makefile.in -+++ b/src/modules/table/table_tools/Makefile.in -@@ -1,9 +1,8 @@ --# Makefile.in generated by automake 1.11.1 from Makefile.am. -+# Makefile.in generated by automake 1.14 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, --# Inc. -+# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+ - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -16,6 +15,51 @@ - @SET_MAKE@ - - VPATH = @srcdir@ -+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -+am__make_running_with_option = \ -+ case $${target_option-} in \ -+ ?) ;; \ -+ *) echo "am__make_running_with_option: internal error: invalid" \ -+ "target option '$${target_option-}' specified" >&2; \ -+ exit 1;; \ -+ esac; \ -+ has_opt=no; \ -+ sane_makeflags=$$MAKEFLAGS; \ -+ if $(am__is_gnu_make); then \ -+ sane_makeflags=$$MFLAGS; \ -+ else \ -+ case $$MAKEFLAGS in \ -+ *\\[\ \ ]*) \ -+ bs=\\; \ -+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -+ esac; \ -+ fi; \ -+ skip_next=no; \ -+ strip_trailopt () \ -+ { \ -+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -+ }; \ -+ for flg in $$sane_makeflags; do \ -+ test $$skip_next = yes && { skip_next=no; continue; }; \ -+ case $$flg in \ -+ *=*|--*) continue;; \ -+ -*I) strip_trailopt 'I'; skip_next=yes;; \ -+ -*I?*) strip_trailopt 'I';; \ -+ -*O) strip_trailopt 'O'; skip_next=yes;; \ -+ -*O?*) strip_trailopt 'O';; \ -+ -*l) strip_trailopt 'l'; skip_next=yes;; \ -+ -*l?*) strip_trailopt 'l';; \ -+ -[dEDm]) skip_next=yes;; \ -+ -[JT]) skip_next=yes;; \ -+ esac; \ -+ case $$flg in \ -+ *$$target_option*) has_opt=yes; break;; \ -+ esac; \ -+ done; \ -+ test $$has_opt = yes -+am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -+am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -35,7 +79,8 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - subdir = src/modules/table/table_tools --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ -+ $(top_srcdir)/depcomp - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ - $(top_srcdir)/m4/ax_python_devel.m4 \ -@@ -71,6 +116,12 @@ am__nobase_list = $(am__nobase_strip_setup); \ - am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -+am__uninstall_files_from_dir = { \ -+ test -z "$$files" \ -+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ -+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ -+ $(am__cd) "$$dir" && rm -f $$files; }; \ -+ } - am__installdirs = "$(DESTDIR)$(pkglibdir)" - LTLIBRARIES = $(pkglib_LTLIBRARIES) - libtable_tools_la_DEPENDENCIES = \ -@@ -79,35 +130,92 @@ am_libtable_tools_la_OBJECTS = Join_Tables.lo MLB_Interface.lo \ - table_change_date_format.lo table_change_field_type.lo \ - Table_Create_Empty.lo Table_Enumerate.lo Table_Rotate.lo - libtable_tools_la_OBJECTS = $(am_libtable_tools_la_OBJECTS) -+AM_V_lt = $(am__v_lt_@AM_V@) -+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -+am__v_lt_0 = --silent -+am__v_lt_1 = -+AM_V_P = $(am__v_P_@AM_V@) -+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -+am__v_P_0 = false -+am__v_P_1 = : -+AM_V_GEN = $(am__v_GEN_@AM_V@) -+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+am__v_GEN_0 = @echo " GEN " $@; -+am__v_GEN_1 = -+AM_V_at = $(am__v_at_@AM_V@) -+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+am__v_at_0 = @ -+am__v_at_1 = - DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - am__mv = mv -f - CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) --LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CXXFLAGS) $(CXXFLAGS) -+AM_V_CXX = $(am__v_CXX_@AM_V@) -+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) -+am__v_CXX_0 = @echo " CXX " $@; -+am__v_CXX_1 = - CXXLD = $(CXX) --CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ -+ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) -+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) -+am__v_CXXLD_0 = @echo " CXXLD " $@; -+am__v_CXXLD_1 = - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CFLAGS) $(CFLAGS) -+AM_V_CC = $(am__v_CC_@AM_V@) -+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -+am__v_CC_0 = @echo " CC " $@; -+am__v_CC_1 = - CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CCLD = $(am__v_CCLD_@AM_V@) -+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -+am__v_CCLD_0 = @echo " CCLD " $@; -+am__v_CCLD_1 = - SOURCES = $(libtable_tools_la_SOURCES) - DIST_SOURCES = $(libtable_tools_la_SOURCES) -+am__can_run_installinfo = \ -+ case $$AM_UPDATE_INFO_DIR in \ -+ n|no|NO) false;; \ -+ *) (install-info --version) >/dev/null 2>&1;; \ -+ esac -+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -+# Read a list of newline-separated strings from the standard input, -+# and print each of them once, without duplicates. Input order is -+# *not* preserved. -+am__uniquify_input = $(AWK) '\ -+ BEGIN { nonempty = 0; } \ -+ { items[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in items) print i; }; } \ -+' -+# Make sure the list of sources is unique. This is necessary because, -+# e.g., the same source file might be shared among _SOURCES variables -+# for different programs/libraries. -+am__define_uniq_tagged_files = \ -+ list='$(am__tagged_files)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | $(am__uniquify_input)` - ETAGS = etags - CTAGS = ctags - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ -+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ -@@ -128,6 +236,7 @@ CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DISABLELIBHARU = @DISABLELIBHARU@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -155,6 +264,7 @@ LOCAL_INCS = @LOCAL_INCS@ - LOCAL_LIBS = @LOCAL_LIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - NM = @NM@ - NMEDIT = @NMEDIT@ -@@ -167,6 +277,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - POW_LIB = @POW_LIB@ -@@ -192,6 +303,7 @@ abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -@@ -225,7 +337,6 @@ libdir = @libdir@ - libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -@@ -307,9 +418,9 @@ $(top_srcdir)/configure: $(am__configure_deps) - $(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - $(am__aclocal_m4_deps): -+ - install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" - @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ - list2=; for p in $$list; do \ - if test -f $$p; then \ -@@ -317,6 +428,8 @@ install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - else :; fi; \ - done; \ - test -z "$$list2" || { \ -+ echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \ -+ $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \ - } -@@ -332,14 +445,17 @@ uninstall-pkglibLTLIBRARIES: - - clean-pkglibLTLIBRARIES: - -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES) -- @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \ -- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -- echo "rm -f \"$${dir}/so_locations\""; \ -- rm -f "$${dir}/so_locations"; \ -- done --libtable_tools.la: $(libtable_tools_la_OBJECTS) $(libtable_tools_la_DEPENDENCIES) -- $(CXXLINK) -rpath $(pkglibdir) $(libtable_tools_la_OBJECTS) $(libtable_tools_la_LIBADD) $(LIBS) -+ @list='$(pkglib_LTLIBRARIES)'; \ -+ locs=`for p in $$list; do echo $$p; done | \ -+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ -+ sort -u`; \ -+ test -z "$$locs" || { \ -+ echo rm -f $${locs}; \ -+ rm -f $${locs}; \ -+ } -+ -+libtable_tools.la: $(libtable_tools_la_OBJECTS) $(libtable_tools_la_DEPENDENCIES) $(EXTRA_libtable_tools_la_DEPENDENCIES) -+ $(AM_V_CXXLD)$(CXXLINK) -rpath $(pkglibdir) $(libtable_tools_la_OBJECTS) $(libtable_tools_la_LIBADD) $(LIBS) - - mostlyclean-compile: - -rm -f *.$(OBJEXT) -@@ -356,25 +472,25 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/table_change_field_type.Plo@am__quote@ - - .cpp.o: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< - - .cpp.obj: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - - .cpp.lo: --@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< - - mostlyclean-libtool: - -rm -f *.lo -@@ -382,26 +498,15 @@ mostlyclean-libtool: - clean-libtool: - -rm -rf .libs _libs - --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -+ID: $(am__tagged_files) -+ $(am__define_uniq_tagged_files); mkid -fID $$unique -+tags: tags-am -+TAGS: tags -+ -+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ -@@ -413,15 +518,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $$unique; \ - fi; \ - fi --ctags: CTAGS --CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ctags: ctags-am -+ -+CTAGS: ctags -+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) -+ $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique -@@ -430,6 +531,21 @@ GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -+cscopelist: cscopelist-am -+ -+cscopelist-am: $(am__tagged_files) -+ list='$(am__tagged_files)'; \ -+ case "$(srcdir)" in \ -+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ -+ *) sdir=$(subdir)/$(srcdir) ;; \ -+ esac; \ -+ for i in $$list; do \ -+ if test -f "$$i"; then \ -+ echo "$(subdir)/$$i"; \ -+ else \ -+ echo "$$sdir/$$i"; \ -+ fi; \ -+ done >> $(top_builddir)/cscope.files - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -@@ -481,10 +597,15 @@ install-am: all-am - - installcheck: installcheck-am - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+ if test -z '$(STRIP)'; then \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ install; \ -+ else \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -+ fi - mostlyclean-generic: - - clean-generic: -@@ -569,19 +690,20 @@ uninstall-am: uninstall-pkglibLTLIBRARIES - - .MAKE: install-am install-strip - --.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ -- clean-libtool clean-pkglibLTLIBRARIES ctags distclean \ -- distclean-compile distclean-generic distclean-libtool \ -- distclean-tags distdir dvi dvi-am html html-am info info-am \ -- install install-am install-data install-data-am install-dvi \ -- install-dvi-am install-exec install-exec-am install-html \ -- install-html-am install-info install-info-am install-man \ -- install-pdf install-pdf-am install-pkglibLTLIBRARIES \ -- install-ps install-ps-am install-strip installcheck \ -- installcheck-am installdirs maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-compile \ -- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -- tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES -+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ -+ clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \ -+ ctags-am distclean distclean-compile distclean-generic \ -+ distclean-libtool distclean-tags distdir dvi dvi-am html \ -+ html-am info info-am install install-am install-data \ -+ install-data-am install-dvi install-dvi-am install-exec \ -+ install-exec-am install-html install-html-am install-info \ -+ install-info-am install-man install-pdf install-pdf-am \ -+ install-pkglibLTLIBRARIES install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ maintainer-clean maintainer-clean-generic mostlyclean \ -+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ -+ pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ -+ uninstall-pkglibLTLIBRARIES - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff --git a/src/modules/tin/Makefile.in b/src/modules/tin/Makefile.in -index 7cad957..590a725 100644 ---- a/src/modules/tin/Makefile.in -+++ b/src/modules/tin/Makefile.in -@@ -1,9 +1,8 @@ --# Makefile.in generated by automake 1.11.1 from Makefile.am. -+# Makefile.in generated by automake 1.14 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, --# Inc. -+# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+ - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -15,6 +14,51 @@ - - @SET_MAKE@ - VPATH = @srcdir@ -+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -+am__make_running_with_option = \ -+ case $${target_option-} in \ -+ ?) ;; \ -+ *) echo "am__make_running_with_option: internal error: invalid" \ -+ "target option '$${target_option-}' specified" >&2; \ -+ exit 1;; \ -+ esac; \ -+ has_opt=no; \ -+ sane_makeflags=$$MAKEFLAGS; \ -+ if $(am__is_gnu_make); then \ -+ sane_makeflags=$$MFLAGS; \ -+ else \ -+ case $$MAKEFLAGS in \ -+ *\\[\ \ ]*) \ -+ bs=\\; \ -+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -+ esac; \ -+ fi; \ -+ skip_next=no; \ -+ strip_trailopt () \ -+ { \ -+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -+ }; \ -+ for flg in $$sane_makeflags; do \ -+ test $$skip_next = yes && { skip_next=no; continue; }; \ -+ case $$flg in \ -+ *=*|--*) continue;; \ -+ -*I) strip_trailopt 'I'; skip_next=yes;; \ -+ -*I?*) strip_trailopt 'I';; \ -+ -*O) strip_trailopt 'O'; skip_next=yes;; \ -+ -*O?*) strip_trailopt 'O';; \ -+ -*l) strip_trailopt 'l'; skip_next=yes;; \ -+ -*l?*) strip_trailopt 'l';; \ -+ -[dEDm]) skip_next=yes;; \ -+ -[JT]) skip_next=yes;; \ -+ esac; \ -+ case $$flg in \ -+ *$$target_option*) has_opt=yes; break;; \ -+ esac; \ -+ done; \ -+ test $$has_opt = yes -+am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -+am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -34,7 +78,7 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - subdir = src/modules/tin --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ - $(top_srcdir)/m4/ax_python_devel.m4 \ -@@ -49,20 +93,58 @@ mkinstalldirs = $(install_sh) -d - CONFIG_HEADER = $(top_builddir)/config.h - CONFIG_CLEAN_FILES = - CONFIG_CLEAN_VPATH_FILES = -+AM_V_P = $(am__v_P_@AM_V@) -+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -+am__v_P_0 = false -+am__v_P_1 = : -+AM_V_GEN = $(am__v_GEN_@AM_V@) -+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+am__v_GEN_0 = @echo " GEN " $@; -+am__v_GEN_1 = -+AM_V_at = $(am__v_at_@AM_V@) -+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+am__v_at_0 = @ -+am__v_at_1 = - SOURCES = - DIST_SOURCES = --RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ -- html-recursive info-recursive install-data-recursive \ -- install-dvi-recursive install-exec-recursive \ -- install-html-recursive install-info-recursive \ -- install-pdf-recursive install-ps-recursive install-recursive \ -- installcheck-recursive installdirs-recursive pdf-recursive \ -- ps-recursive uninstall-recursive -+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ -+ ctags-recursive dvi-recursive html-recursive info-recursive \ -+ install-data-recursive install-dvi-recursive \ -+ install-exec-recursive install-html-recursive \ -+ install-info-recursive install-pdf-recursive \ -+ install-ps-recursive install-recursive installcheck-recursive \ -+ installdirs-recursive pdf-recursive ps-recursive \ -+ tags-recursive uninstall-recursive -+am__can_run_installinfo = \ -+ case $$AM_UPDATE_INFO_DIR in \ -+ n|no|NO) false;; \ -+ *) (install-info --version) >/dev/null 2>&1;; \ -+ esac - RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ - distclean-recursive maintainer-clean-recursive --AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ -- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ -+am__recursive_targets = \ -+ $(RECURSIVE_TARGETS) \ -+ $(RECURSIVE_CLEAN_TARGETS) \ -+ $(am__extra_recursive_targets) -+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ - distdir -+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -+# Read a list of newline-separated strings from the standard input, -+# and print each of them once, without duplicates. Input order is -+# *not* preserved. -+am__uniquify_input = $(AWK) '\ -+ BEGIN { nonempty = 0; } \ -+ { items[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in items) print i; }; } \ -+' -+# Make sure the list of sources is unique. This is necessary because, -+# e.g., the same source file might be shared among _SOURCES variables -+# for different programs/libraries. -+am__define_uniq_tagged_files = \ -+ list='$(am__tagged_files)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | $(am__uniquify_input)` - ETAGS = etags - CTAGS = ctags - DIST_SUBDIRS = tin_tools tin_viewer -@@ -94,6 +176,7 @@ am__relativize = \ - reldir="$$dir2" - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ -+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ -@@ -114,6 +197,7 @@ CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DISABLELIBHARU = @DISABLELIBHARU@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -141,6 +225,7 @@ LOCAL_INCS = @LOCAL_INCS@ - LOCAL_LIBS = @LOCAL_LIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - NM = @NM@ - NMEDIT = @NMEDIT@ -@@ -153,6 +238,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - POW_LIB = @POW_LIB@ -@@ -178,6 +264,7 @@ abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -@@ -211,7 +298,6 @@ libdir = @libdir@ - libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -@@ -274,22 +360,25 @@ clean-libtool: - -rm -rf .libs _libs - - # This directory's subdirectories are mostly independent; you can cd --# into them and run `make' without going through this Makefile. --# To change the values of `make' variables: instead of editing Makefiles, --# (1) if the variable is set in `config.status', edit `config.status' --# (which will cause the Makefiles to be regenerated when you run `make'); --# (2) otherwise, pass the desired values on the `make' command line. --$(RECURSIVE_TARGETS): -- @fail= failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -+# into them and run 'make' without going through this Makefile. -+# To change the values of 'make' variables: instead of editing Makefiles, -+# (1) if the variable is set in 'config.status', edit 'config.status' -+# (which will cause the Makefiles to be regenerated when you run 'make'); -+# (2) otherwise, pass the desired values on the 'make' command line. -+$(am__recursive_targets): -+ @fail=; \ -+ if $(am__make_keepgoing); then \ -+ failcom='fail=yes'; \ -+ else \ -+ failcom='exit 1'; \ -+ fi; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ -- list='$(SUBDIRS)'; for subdir in $$list; do \ -+ case "$@" in \ -+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -+ *) list='$(SUBDIRS)' ;; \ -+ esac; \ -+ for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ -@@ -304,57 +393,12 @@ $(RECURSIVE_TARGETS): - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - --$(RECURSIVE_CLEAN_TARGETS): -- @fail= failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -- dot_seen=no; \ -- case "$@" in \ -- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -- *) list='$(SUBDIRS)' ;; \ -- esac; \ -- rev=''; for subdir in $$list; do \ -- if test "$$subdir" = "."; then :; else \ -- rev="$$subdir $$rev"; \ -- fi; \ -- done; \ -- rev="$$rev ."; \ -- target=`echo $@ | sed s/-recursive//`; \ -- for subdir in $$rev; do \ -- echo "Making $$target in $$subdir"; \ -- if test "$$subdir" = "."; then \ -- local_target="$$target-am"; \ -- else \ -- local_target="$$target"; \ -- fi; \ -- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || eval $$failcom; \ -- done && test -z "$$fail" --tags-recursive: -- list='$(SUBDIRS)'; for subdir in $$list; do \ -- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ -- done --ctags-recursive: -- list='$(SUBDIRS)'; for subdir in $$list; do \ -- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ -- done -+ID: $(am__tagged_files) -+ $(am__define_uniq_tagged_files); mkid -fID $$unique -+tags: tags-recursive -+TAGS: tags - --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ - if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ -@@ -370,12 +414,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ -@@ -387,15 +426,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $$unique; \ - fi; \ - fi --ctags: CTAGS --CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ctags: ctags-recursive -+ -+CTAGS: ctags -+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) -+ $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique -@@ -404,6 +439,21 @@ GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -+cscopelist: cscopelist-recursive -+ -+cscopelist-am: $(am__tagged_files) -+ list='$(am__tagged_files)'; \ -+ case "$(srcdir)" in \ -+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ -+ *) sdir=$(subdir)/$(srcdir) ;; \ -+ esac; \ -+ for i in $$list; do \ -+ if test -f "$$i"; then \ -+ echo "$(subdir)/$$i"; \ -+ else \ -+ echo "$$sdir/$$i"; \ -+ fi; \ -+ done >> $(top_builddir)/cscope.files - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -@@ -440,13 +490,10 @@ distdir: $(DISTFILES) - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test -d "$(distdir)/$$subdir" \ -- || $(MKDIR_P) "$(distdir)/$$subdir" \ -- || exit 1; \ -- fi; \ -- done -- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ -- if test "$$subdir" = .; then :; else \ -+ $(am__make_dryrun) \ -+ || test -d "$(distdir)/$$subdir" \ -+ || $(MKDIR_P) "$(distdir)/$$subdir" \ -+ || exit 1; \ - dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ - $(am__relativize); \ - new_distdir=$$reldir; \ -@@ -481,10 +528,15 @@ install-am: all-am - - installcheck: installcheck-recursive - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+ if test -z '$(STRIP)'; then \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ install; \ -+ else \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -+ fi - mostlyclean-generic: - - clean-generic: -@@ -562,22 +614,20 @@ ps-am: - - uninstall-am: - --.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ -- install-am install-strip tags-recursive -- --.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ -- all all-am check check-am clean clean-generic clean-libtool \ -- ctags ctags-recursive distclean distclean-generic \ -- distclean-libtool distclean-tags distdir dvi dvi-am html \ -- html-am info info-am install install-am install-data \ -- install-data-am install-dvi install-dvi-am install-exec \ -- install-exec-am install-html install-html-am install-info \ -- install-info-am install-man install-pdf install-pdf-am \ -- install-ps install-ps-am install-strip installcheck \ -- installcheck-am installdirs installdirs-am maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-generic \ -- mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ -- uninstall uninstall-am -+.MAKE: $(am__recursive_targets) install-am install-strip -+ -+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ -+ check-am clean clean-generic clean-libtool cscopelist-am ctags \ -+ ctags-am distclean distclean-generic distclean-libtool \ -+ distclean-tags distdir dvi dvi-am html html-am info info-am \ -+ install install-am install-data install-data-am install-dvi \ -+ install-dvi-am install-exec install-exec-am install-html \ -+ install-html-am install-info install-info-am install-man \ -+ install-pdf install-pdf-am install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ installdirs-am maintainer-clean maintainer-clean-generic \ -+ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ -+ ps ps-am tags tags-am uninstall uninstall-am - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff --git a/src/modules/tin/tin_tools/Makefile.in b/src/modules/tin/tin_tools/Makefile.in -index 9c5ec1c..c592f86 100644 ---- a/src/modules/tin/tin_tools/Makefile.in -+++ b/src/modules/tin/tin_tools/Makefile.in -@@ -1,9 +1,8 @@ --# Makefile.in generated by automake 1.11.1 from Makefile.am. -+# Makefile.in generated by automake 1.14 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, --# Inc. -+# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+ - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -16,6 +15,51 @@ - @SET_MAKE@ - - VPATH = @srcdir@ -+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -+am__make_running_with_option = \ -+ case $${target_option-} in \ -+ ?) ;; \ -+ *) echo "am__make_running_with_option: internal error: invalid" \ -+ "target option '$${target_option-}' specified" >&2; \ -+ exit 1;; \ -+ esac; \ -+ has_opt=no; \ -+ sane_makeflags=$$MAKEFLAGS; \ -+ if $(am__is_gnu_make); then \ -+ sane_makeflags=$$MFLAGS; \ -+ else \ -+ case $$MAKEFLAGS in \ -+ *\\[\ \ ]*) \ -+ bs=\\; \ -+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -+ esac; \ -+ fi; \ -+ skip_next=no; \ -+ strip_trailopt () \ -+ { \ -+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -+ }; \ -+ for flg in $$sane_makeflags; do \ -+ test $$skip_next = yes && { skip_next=no; continue; }; \ -+ case $$flg in \ -+ *=*|--*) continue;; \ -+ -*I) strip_trailopt 'I'; skip_next=yes;; \ -+ -*I?*) strip_trailopt 'I';; \ -+ -*O) strip_trailopt 'O'; skip_next=yes;; \ -+ -*O?*) strip_trailopt 'O';; \ -+ -*l) strip_trailopt 'l'; skip_next=yes;; \ -+ -*l?*) strip_trailopt 'l';; \ -+ -[dEDm]) skip_next=yes;; \ -+ -[JT]) skip_next=yes;; \ -+ esac; \ -+ case $$flg in \ -+ *$$target_option*) has_opt=yes; break;; \ -+ esac; \ -+ done; \ -+ test $$has_opt = yes -+am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -+am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -35,7 +79,8 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - subdir = src/modules/tin/tin_tools --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ -+ $(top_srcdir)/depcomp - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ - $(top_srcdir)/m4/ax_python_devel.m4 \ -@@ -71,6 +116,12 @@ am__nobase_list = $(am__nobase_strip_setup); \ - am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -+am__uninstall_files_from_dir = { \ -+ test -z "$$files" \ -+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ -+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ -+ $(am__cd) "$$dir" && rm -f $$files; }; \ -+ } - am__installdirs = "$(DESTDIR)$(pkglibdir)" - LTLIBRARIES = $(pkglib_LTLIBRARIES) - libtin_tools_la_DEPENDENCIES = \ -@@ -80,35 +131,92 @@ am_libtin_tools_la_OBJECTS = MLB_Interface.lo TIN_Flow_Parallel.lo \ - TIN_From_Grid_Specific_Points.lo TIN_From_Shapes.lo \ - TIN_Gradient.lo TIN_To_Shapes.lo - libtin_tools_la_OBJECTS = $(am_libtin_tools_la_OBJECTS) -+AM_V_lt = $(am__v_lt_@AM_V@) -+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -+am__v_lt_0 = --silent -+am__v_lt_1 = -+AM_V_P = $(am__v_P_@AM_V@) -+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -+am__v_P_0 = false -+am__v_P_1 = : -+AM_V_GEN = $(am__v_GEN_@AM_V@) -+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+am__v_GEN_0 = @echo " GEN " $@; -+am__v_GEN_1 = -+AM_V_at = $(am__v_at_@AM_V@) -+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+am__v_at_0 = @ -+am__v_at_1 = - DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - am__mv = mv -f - CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) --LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CXXFLAGS) $(CXXFLAGS) -+AM_V_CXX = $(am__v_CXX_@AM_V@) -+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) -+am__v_CXX_0 = @echo " CXX " $@; -+am__v_CXX_1 = - CXXLD = $(CXX) --CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ -+ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) -+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) -+am__v_CXXLD_0 = @echo " CXXLD " $@; -+am__v_CXXLD_1 = - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CFLAGS) $(CFLAGS) -+AM_V_CC = $(am__v_CC_@AM_V@) -+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -+am__v_CC_0 = @echo " CC " $@; -+am__v_CC_1 = - CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CCLD = $(am__v_CCLD_@AM_V@) -+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -+am__v_CCLD_0 = @echo " CCLD " $@; -+am__v_CCLD_1 = - SOURCES = $(libtin_tools_la_SOURCES) - DIST_SOURCES = $(libtin_tools_la_SOURCES) -+am__can_run_installinfo = \ -+ case $$AM_UPDATE_INFO_DIR in \ -+ n|no|NO) false;; \ -+ *) (install-info --version) >/dev/null 2>&1;; \ -+ esac -+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -+# Read a list of newline-separated strings from the standard input, -+# and print each of them once, without duplicates. Input order is -+# *not* preserved. -+am__uniquify_input = $(AWK) '\ -+ BEGIN { nonempty = 0; } \ -+ { items[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in items) print i; }; } \ -+' -+# Make sure the list of sources is unique. This is necessary because, -+# e.g., the same source file might be shared among _SOURCES variables -+# for different programs/libraries. -+am__define_uniq_tagged_files = \ -+ list='$(am__tagged_files)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | $(am__uniquify_input)` - ETAGS = etags - CTAGS = ctags - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ -+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ -@@ -129,6 +237,7 @@ CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DISABLELIBHARU = @DISABLELIBHARU@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -156,6 +265,7 @@ LOCAL_INCS = @LOCAL_INCS@ - LOCAL_LIBS = @LOCAL_LIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - NM = @NM@ - NMEDIT = @NMEDIT@ -@@ -168,6 +278,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - POW_LIB = @POW_LIB@ -@@ -193,6 +304,7 @@ abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -@@ -226,7 +338,6 @@ libdir = @libdir@ - libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -@@ -310,9 +421,9 @@ $(top_srcdir)/configure: $(am__configure_deps) - $(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - $(am__aclocal_m4_deps): -+ - install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" - @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ - list2=; for p in $$list; do \ - if test -f $$p; then \ -@@ -320,6 +431,8 @@ install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - else :; fi; \ - done; \ - test -z "$$list2" || { \ -+ echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \ -+ $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \ - } -@@ -335,14 +448,17 @@ uninstall-pkglibLTLIBRARIES: - - clean-pkglibLTLIBRARIES: - -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES) -- @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \ -- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -- echo "rm -f \"$${dir}/so_locations\""; \ -- rm -f "$${dir}/so_locations"; \ -- done --libtin_tools.la: $(libtin_tools_la_OBJECTS) $(libtin_tools_la_DEPENDENCIES) -- $(CXXLINK) -rpath $(pkglibdir) $(libtin_tools_la_OBJECTS) $(libtin_tools_la_LIBADD) $(LIBS) -+ @list='$(pkglib_LTLIBRARIES)'; \ -+ locs=`for p in $$list; do echo $$p; done | \ -+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ -+ sort -u`; \ -+ test -z "$$locs" || { \ -+ echo rm -f $${locs}; \ -+ rm -f $${locs}; \ -+ } -+ -+libtin_tools.la: $(libtin_tools_la_OBJECTS) $(libtin_tools_la_DEPENDENCIES) $(EXTRA_libtin_tools_la_DEPENDENCIES) -+ $(AM_V_CXXLD)$(CXXLINK) -rpath $(pkglibdir) $(libtin_tools_la_OBJECTS) $(libtin_tools_la_LIBADD) $(LIBS) - - mostlyclean-compile: - -rm -f *.$(OBJEXT) -@@ -360,25 +476,25 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TIN_To_Shapes.Plo@am__quote@ - - .cpp.o: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< - - .cpp.obj: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - - .cpp.lo: --@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< - - mostlyclean-libtool: - -rm -f *.lo -@@ -386,26 +502,15 @@ mostlyclean-libtool: - clean-libtool: - -rm -rf .libs _libs - --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -+ID: $(am__tagged_files) -+ $(am__define_uniq_tagged_files); mkid -fID $$unique -+tags: tags-am -+TAGS: tags -+ -+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ -@@ -417,15 +522,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $$unique; \ - fi; \ - fi --ctags: CTAGS --CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ctags: ctags-am -+ -+CTAGS: ctags -+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) -+ $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique -@@ -434,6 +535,21 @@ GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -+cscopelist: cscopelist-am -+ -+cscopelist-am: $(am__tagged_files) -+ list='$(am__tagged_files)'; \ -+ case "$(srcdir)" in \ -+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ -+ *) sdir=$(subdir)/$(srcdir) ;; \ -+ esac; \ -+ for i in $$list; do \ -+ if test -f "$$i"; then \ -+ echo "$(subdir)/$$i"; \ -+ else \ -+ echo "$$sdir/$$i"; \ -+ fi; \ -+ done >> $(top_builddir)/cscope.files - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -@@ -485,10 +601,15 @@ install-am: all-am - - installcheck: installcheck-am - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+ if test -z '$(STRIP)'; then \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ install; \ -+ else \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -+ fi - mostlyclean-generic: - - clean-generic: -@@ -573,19 +694,20 @@ uninstall-am: uninstall-pkglibLTLIBRARIES - - .MAKE: install-am install-strip - --.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ -- clean-libtool clean-pkglibLTLIBRARIES ctags distclean \ -- distclean-compile distclean-generic distclean-libtool \ -- distclean-tags distdir dvi dvi-am html html-am info info-am \ -- install install-am install-data install-data-am install-dvi \ -- install-dvi-am install-exec install-exec-am install-html \ -- install-html-am install-info install-info-am install-man \ -- install-pdf install-pdf-am install-pkglibLTLIBRARIES \ -- install-ps install-ps-am install-strip installcheck \ -- installcheck-am installdirs maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-compile \ -- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -- tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES -+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ -+ clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \ -+ ctags-am distclean distclean-compile distclean-generic \ -+ distclean-libtool distclean-tags distdir dvi dvi-am html \ -+ html-am info info-am install install-am install-data \ -+ install-data-am install-dvi install-dvi-am install-exec \ -+ install-exec-am install-html install-html-am install-info \ -+ install-info-am install-man install-pdf install-pdf-am \ -+ install-pkglibLTLIBRARIES install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ maintainer-clean maintainer-clean-generic mostlyclean \ -+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ -+ pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ -+ uninstall-pkglibLTLIBRARIES - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff --git a/src/modules/tin/tin_viewer/Makefile.in b/src/modules/tin/tin_viewer/Makefile.in -index 970ca81..0b853d0 100644 ---- a/src/modules/tin/tin_viewer/Makefile.in -+++ b/src/modules/tin/tin_viewer/Makefile.in -@@ -1,9 +1,8 @@ --# Makefile.in generated by automake 1.11.1 from Makefile.am. -+# Makefile.in generated by automake 1.14 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, --# Inc. -+# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+ - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -16,6 +15,51 @@ - @SET_MAKE@ - - VPATH = @srcdir@ -+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -+am__make_running_with_option = \ -+ case $${target_option-} in \ -+ ?) ;; \ -+ *) echo "am__make_running_with_option: internal error: invalid" \ -+ "target option '$${target_option-}' specified" >&2; \ -+ exit 1;; \ -+ esac; \ -+ has_opt=no; \ -+ sane_makeflags=$$MAKEFLAGS; \ -+ if $(am__is_gnu_make); then \ -+ sane_makeflags=$$MFLAGS; \ -+ else \ -+ case $$MAKEFLAGS in \ -+ *\\[\ \ ]*) \ -+ bs=\\; \ -+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -+ esac; \ -+ fi; \ -+ skip_next=no; \ -+ strip_trailopt () \ -+ { \ -+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -+ }; \ -+ for flg in $$sane_makeflags; do \ -+ test $$skip_next = yes && { skip_next=no; continue; }; \ -+ case $$flg in \ -+ *=*|--*) continue;; \ -+ -*I) strip_trailopt 'I'; skip_next=yes;; \ -+ -*I?*) strip_trailopt 'I';; \ -+ -*O) strip_trailopt 'O'; skip_next=yes;; \ -+ -*O?*) strip_trailopt 'O';; \ -+ -*l) strip_trailopt 'l'; skip_next=yes;; \ -+ -*l?*) strip_trailopt 'l';; \ -+ -[dEDm]) skip_next=yes;; \ -+ -[JT]) skip_next=yes;; \ -+ esac; \ -+ case $$flg in \ -+ *$$target_option*) has_opt=yes; break;; \ -+ esac; \ -+ done; \ -+ test $$has_opt = yes -+am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -+am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -35,7 +79,8 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - subdir = src/modules/tin/tin_viewer --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ -+ $(top_srcdir)/depcomp - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ - $(top_srcdir)/m4/ax_python_devel.m4 \ -@@ -71,6 +116,12 @@ am__nobase_list = $(am__nobase_strip_setup); \ - am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -+am__uninstall_files_from_dir = { \ -+ test -z "$$files" \ -+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ -+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ -+ $(am__cd) "$$dir" && rm -f $$files; }; \ -+ } - am__installdirs = "$(DESTDIR)$(pkglibdir)" - LTLIBRARIES = $(pkglib_LTLIBRARIES) - libtin_viewer_la_DEPENDENCIES = \ -@@ -79,35 +130,92 @@ libtin_viewer_la_DEPENDENCIES = \ - am_libtin_viewer_la_OBJECTS = MLB_Interface.lo tin_view_control.lo \ - tin_view_dialog.lo tin_view_module.lo - libtin_viewer_la_OBJECTS = $(am_libtin_viewer_la_OBJECTS) -+AM_V_lt = $(am__v_lt_@AM_V@) -+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -+am__v_lt_0 = --silent -+am__v_lt_1 = -+AM_V_P = $(am__v_P_@AM_V@) -+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -+am__v_P_0 = false -+am__v_P_1 = : -+AM_V_GEN = $(am__v_GEN_@AM_V@) -+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+am__v_GEN_0 = @echo " GEN " $@; -+am__v_GEN_1 = -+AM_V_at = $(am__v_at_@AM_V@) -+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+am__v_at_0 = @ -+am__v_at_1 = - DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - am__mv = mv -f - CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) --LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CXXFLAGS) $(CXXFLAGS) -+AM_V_CXX = $(am__v_CXX_@AM_V@) -+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) -+am__v_CXX_0 = @echo " CXX " $@; -+am__v_CXX_1 = - CXXLD = $(CXX) --CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ -+ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) -+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) -+am__v_CXXLD_0 = @echo " CXXLD " $@; -+am__v_CXXLD_1 = - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CFLAGS) $(CFLAGS) -+AM_V_CC = $(am__v_CC_@AM_V@) -+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -+am__v_CC_0 = @echo " CC " $@; -+am__v_CC_1 = - CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CCLD = $(am__v_CCLD_@AM_V@) -+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -+am__v_CCLD_0 = @echo " CCLD " $@; -+am__v_CCLD_1 = - SOURCES = $(libtin_viewer_la_SOURCES) - DIST_SOURCES = $(libtin_viewer_la_SOURCES) -+am__can_run_installinfo = \ -+ case $$AM_UPDATE_INFO_DIR in \ -+ n|no|NO) false;; \ -+ *) (install-info --version) >/dev/null 2>&1;; \ -+ esac -+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -+# Read a list of newline-separated strings from the standard input, -+# and print each of them once, without duplicates. Input order is -+# *not* preserved. -+am__uniquify_input = $(AWK) '\ -+ BEGIN { nonempty = 0; } \ -+ { items[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in items) print i; }; } \ -+' -+# Make sure the list of sources is unique. This is necessary because, -+# e.g., the same source file might be shared among _SOURCES variables -+# for different programs/libraries. -+am__define_uniq_tagged_files = \ -+ list='$(am__tagged_files)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | $(am__uniquify_input)` - ETAGS = etags - CTAGS = ctags - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ -+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ -@@ -128,6 +236,7 @@ CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DISABLELIBHARU = @DISABLELIBHARU@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -155,6 +264,7 @@ LOCAL_INCS = @LOCAL_INCS@ - LOCAL_LIBS = @LOCAL_LIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - NM = @NM@ - NMEDIT = @NMEDIT@ -@@ -167,6 +277,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - POW_LIB = @POW_LIB@ -@@ -192,6 +303,7 @@ abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -@@ -225,7 +337,6 @@ libdir = @libdir@ - libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -@@ -300,9 +411,9 @@ $(top_srcdir)/configure: $(am__configure_deps) - $(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - $(am__aclocal_m4_deps): -+ - install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" - @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ - list2=; for p in $$list; do \ - if test -f $$p; then \ -@@ -310,6 +421,8 @@ install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - else :; fi; \ - done; \ - test -z "$$list2" || { \ -+ echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \ -+ $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \ - } -@@ -325,14 +438,17 @@ uninstall-pkglibLTLIBRARIES: - - clean-pkglibLTLIBRARIES: - -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES) -- @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \ -- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -- echo "rm -f \"$${dir}/so_locations\""; \ -- rm -f "$${dir}/so_locations"; \ -- done --libtin_viewer.la: $(libtin_viewer_la_OBJECTS) $(libtin_viewer_la_DEPENDENCIES) -- $(CXXLINK) -rpath $(pkglibdir) $(libtin_viewer_la_OBJECTS) $(libtin_viewer_la_LIBADD) $(LIBS) -+ @list='$(pkglib_LTLIBRARIES)'; \ -+ locs=`for p in $$list; do echo $$p; done | \ -+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ -+ sort -u`; \ -+ test -z "$$locs" || { \ -+ echo rm -f $${locs}; \ -+ rm -f $${locs}; \ -+ } -+ -+libtin_viewer.la: $(libtin_viewer_la_OBJECTS) $(libtin_viewer_la_DEPENDENCIES) $(EXTRA_libtin_viewer_la_DEPENDENCIES) -+ $(AM_V_CXXLD)$(CXXLINK) -rpath $(pkglibdir) $(libtin_viewer_la_OBJECTS) $(libtin_viewer_la_LIBADD) $(LIBS) - - mostlyclean-compile: - -rm -f *.$(OBJEXT) -@@ -346,25 +462,25 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tin_view_module.Plo@am__quote@ - - .cpp.o: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< - - .cpp.obj: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - - .cpp.lo: --@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< - - mostlyclean-libtool: - -rm -f *.lo -@@ -372,26 +488,15 @@ mostlyclean-libtool: - clean-libtool: - -rm -rf .libs _libs - --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -+ID: $(am__tagged_files) -+ $(am__define_uniq_tagged_files); mkid -fID $$unique -+tags: tags-am -+TAGS: tags -+ -+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ -@@ -403,15 +508,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $$unique; \ - fi; \ - fi --ctags: CTAGS --CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ctags: ctags-am -+ -+CTAGS: ctags -+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) -+ $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique -@@ -420,6 +521,21 @@ GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -+cscopelist: cscopelist-am -+ -+cscopelist-am: $(am__tagged_files) -+ list='$(am__tagged_files)'; \ -+ case "$(srcdir)" in \ -+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ -+ *) sdir=$(subdir)/$(srcdir) ;; \ -+ esac; \ -+ for i in $$list; do \ -+ if test -f "$$i"; then \ -+ echo "$(subdir)/$$i"; \ -+ else \ -+ echo "$$sdir/$$i"; \ -+ fi; \ -+ done >> $(top_builddir)/cscope.files - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -@@ -471,10 +587,15 @@ install-am: all-am - - installcheck: installcheck-am - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+ if test -z '$(STRIP)'; then \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ install; \ -+ else \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -+ fi - mostlyclean-generic: - - clean-generic: -@@ -559,19 +680,20 @@ uninstall-am: uninstall-pkglibLTLIBRARIES - - .MAKE: install-am install-strip - --.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ -- clean-libtool clean-pkglibLTLIBRARIES ctags distclean \ -- distclean-compile distclean-generic distclean-libtool \ -- distclean-tags distdir dvi dvi-am html html-am info info-am \ -- install install-am install-data install-data-am install-dvi \ -- install-dvi-am install-exec install-exec-am install-html \ -- install-html-am install-info install-info-am install-man \ -- install-pdf install-pdf-am install-pkglibLTLIBRARIES \ -- install-ps install-ps-am install-strip installcheck \ -- installcheck-am installdirs maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-compile \ -- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -- tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES -+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ -+ clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \ -+ ctags-am distclean distclean-compile distclean-generic \ -+ distclean-libtool distclean-tags distdir dvi dvi-am html \ -+ html-am info info-am install install-am install-data \ -+ install-data-am install-dvi install-dvi-am install-exec \ -+ install-exec-am install-html install-html-am install-info \ -+ install-info-am install-man install-pdf install-pdf-am \ -+ install-pkglibLTLIBRARIES install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ maintainer-clean maintainer-clean-generic mostlyclean \ -+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ -+ pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ -+ uninstall-pkglibLTLIBRARIES - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff --git a/src/modules_contrib/Makefile.in b/src/modules_contrib/Makefile.in -index e63d39c..2c23bf6 100644 ---- a/src/modules_contrib/Makefile.in -+++ b/src/modules_contrib/Makefile.in -@@ -1,9 +1,8 @@ --# Makefile.in generated by automake 1.11.1 from Makefile.am. -+# Makefile.in generated by automake 1.14 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, --# Inc. -+# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+ - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -15,6 +14,51 @@ - - @SET_MAKE@ - VPATH = @srcdir@ -+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -+am__make_running_with_option = \ -+ case $${target_option-} in \ -+ ?) ;; \ -+ *) echo "am__make_running_with_option: internal error: invalid" \ -+ "target option '$${target_option-}' specified" >&2; \ -+ exit 1;; \ -+ esac; \ -+ has_opt=no; \ -+ sane_makeflags=$$MAKEFLAGS; \ -+ if $(am__is_gnu_make); then \ -+ sane_makeflags=$$MFLAGS; \ -+ else \ -+ case $$MAKEFLAGS in \ -+ *\\[\ \ ]*) \ -+ bs=\\; \ -+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -+ esac; \ -+ fi; \ -+ skip_next=no; \ -+ strip_trailopt () \ -+ { \ -+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -+ }; \ -+ for flg in $$sane_makeflags; do \ -+ test $$skip_next = yes && { skip_next=no; continue; }; \ -+ case $$flg in \ -+ *=*|--*) continue;; \ -+ -*I) strip_trailopt 'I'; skip_next=yes;; \ -+ -*I?*) strip_trailopt 'I';; \ -+ -*O) strip_trailopt 'O'; skip_next=yes;; \ -+ -*O?*) strip_trailopt 'O';; \ -+ -*l) strip_trailopt 'l'; skip_next=yes;; \ -+ -*l?*) strip_trailopt 'l';; \ -+ -[dEDm]) skip_next=yes;; \ -+ -[JT]) skip_next=yes;; \ -+ esac; \ -+ case $$flg in \ -+ *$$target_option*) has_opt=yes; break;; \ -+ esac; \ -+ done; \ -+ test $$has_opt = yes -+am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -+am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -34,7 +78,7 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - subdir = src/modules_contrib --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ - $(top_srcdir)/m4/ax_python_devel.m4 \ -@@ -49,20 +93,58 @@ mkinstalldirs = $(install_sh) -d - CONFIG_HEADER = $(top_builddir)/config.h - CONFIG_CLEAN_FILES = - CONFIG_CLEAN_VPATH_FILES = -+AM_V_P = $(am__v_P_@AM_V@) -+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -+am__v_P_0 = false -+am__v_P_1 = : -+AM_V_GEN = $(am__v_GEN_@AM_V@) -+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+am__v_GEN_0 = @echo " GEN " $@; -+am__v_GEN_1 = -+AM_V_at = $(am__v_at_@AM_V@) -+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+am__v_at_0 = @ -+am__v_at_1 = - SOURCES = - DIST_SOURCES = --RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ -- html-recursive info-recursive install-data-recursive \ -- install-dvi-recursive install-exec-recursive \ -- install-html-recursive install-info-recursive \ -- install-pdf-recursive install-ps-recursive install-recursive \ -- installcheck-recursive installdirs-recursive pdf-recursive \ -- ps-recursive uninstall-recursive -+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ -+ ctags-recursive dvi-recursive html-recursive info-recursive \ -+ install-data-recursive install-dvi-recursive \ -+ install-exec-recursive install-html-recursive \ -+ install-info-recursive install-pdf-recursive \ -+ install-ps-recursive install-recursive installcheck-recursive \ -+ installdirs-recursive pdf-recursive ps-recursive \ -+ tags-recursive uninstall-recursive -+am__can_run_installinfo = \ -+ case $$AM_UPDATE_INFO_DIR in \ -+ n|no|NO) false;; \ -+ *) (install-info --version) >/dev/null 2>&1;; \ -+ esac - RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ - distclean-recursive maintainer-clean-recursive --AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ -- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ -+am__recursive_targets = \ -+ $(RECURSIVE_TARGETS) \ -+ $(RECURSIVE_CLEAN_TARGETS) \ -+ $(am__extra_recursive_targets) -+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ - distdir -+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -+# Read a list of newline-separated strings from the standard input, -+# and print each of them once, without duplicates. Input order is -+# *not* preserved. -+am__uniquify_input = $(AWK) '\ -+ BEGIN { nonempty = 0; } \ -+ { items[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in items) print i; }; } \ -+' -+# Make sure the list of sources is unique. This is necessary because, -+# e.g., the same source file might be shared among _SOURCES variables -+# for different programs/libraries. -+am__define_uniq_tagged_files = \ -+ list='$(am__tagged_files)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | $(am__uniquify_input)` - ETAGS = etags - CTAGS = ctags - DIST_SUBDIRS = $(SUBDIRS) -@@ -94,6 +176,7 @@ am__relativize = \ - reldir="$$dir2" - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ -+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ -@@ -114,6 +197,7 @@ CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DISABLELIBHARU = @DISABLELIBHARU@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -141,6 +225,7 @@ LOCAL_INCS = @LOCAL_INCS@ - LOCAL_LIBS = @LOCAL_LIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - NM = @NM@ - NMEDIT = @NMEDIT@ -@@ -153,6 +238,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - POW_LIB = @POW_LIB@ -@@ -178,6 +264,7 @@ abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -@@ -211,7 +298,6 @@ libdir = @libdir@ - libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -@@ -273,22 +359,25 @@ clean-libtool: - -rm -rf .libs _libs - - # This directory's subdirectories are mostly independent; you can cd --# into them and run `make' without going through this Makefile. --# To change the values of `make' variables: instead of editing Makefiles, --# (1) if the variable is set in `config.status', edit `config.status' --# (which will cause the Makefiles to be regenerated when you run `make'); --# (2) otherwise, pass the desired values on the `make' command line. --$(RECURSIVE_TARGETS): -- @fail= failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -+# into them and run 'make' without going through this Makefile. -+# To change the values of 'make' variables: instead of editing Makefiles, -+# (1) if the variable is set in 'config.status', edit 'config.status' -+# (which will cause the Makefiles to be regenerated when you run 'make'); -+# (2) otherwise, pass the desired values on the 'make' command line. -+$(am__recursive_targets): -+ @fail=; \ -+ if $(am__make_keepgoing); then \ -+ failcom='fail=yes'; \ -+ else \ -+ failcom='exit 1'; \ -+ fi; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ -- list='$(SUBDIRS)'; for subdir in $$list; do \ -+ case "$@" in \ -+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -+ *) list='$(SUBDIRS)' ;; \ -+ esac; \ -+ for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ -@@ -303,57 +392,12 @@ $(RECURSIVE_TARGETS): - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - --$(RECURSIVE_CLEAN_TARGETS): -- @fail= failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -- dot_seen=no; \ -- case "$@" in \ -- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -- *) list='$(SUBDIRS)' ;; \ -- esac; \ -- rev=''; for subdir in $$list; do \ -- if test "$$subdir" = "."; then :; else \ -- rev="$$subdir $$rev"; \ -- fi; \ -- done; \ -- rev="$$rev ."; \ -- target=`echo $@ | sed s/-recursive//`; \ -- for subdir in $$rev; do \ -- echo "Making $$target in $$subdir"; \ -- if test "$$subdir" = "."; then \ -- local_target="$$target-am"; \ -- else \ -- local_target="$$target"; \ -- fi; \ -- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || eval $$failcom; \ -- done && test -z "$$fail" --tags-recursive: -- list='$(SUBDIRS)'; for subdir in $$list; do \ -- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ -- done --ctags-recursive: -- list='$(SUBDIRS)'; for subdir in $$list; do \ -- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ -- done -+ID: $(am__tagged_files) -+ $(am__define_uniq_tagged_files); mkid -fID $$unique -+tags: tags-recursive -+TAGS: tags - --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ - if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ -@@ -369,12 +413,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ -@@ -386,15 +425,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $$unique; \ - fi; \ - fi --ctags: CTAGS --CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ctags: ctags-recursive -+ -+CTAGS: ctags -+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) -+ $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique -@@ -403,6 +438,21 @@ GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -+cscopelist: cscopelist-recursive -+ -+cscopelist-am: $(am__tagged_files) -+ list='$(am__tagged_files)'; \ -+ case "$(srcdir)" in \ -+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ -+ *) sdir=$(subdir)/$(srcdir) ;; \ -+ esac; \ -+ for i in $$list; do \ -+ if test -f "$$i"; then \ -+ echo "$(subdir)/$$i"; \ -+ else \ -+ echo "$$sdir/$$i"; \ -+ fi; \ -+ done >> $(top_builddir)/cscope.files - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -@@ -439,13 +489,10 @@ distdir: $(DISTFILES) - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test -d "$(distdir)/$$subdir" \ -- || $(MKDIR_P) "$(distdir)/$$subdir" \ -- || exit 1; \ -- fi; \ -- done -- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ -- if test "$$subdir" = .; then :; else \ -+ $(am__make_dryrun) \ -+ || test -d "$(distdir)/$$subdir" \ -+ || $(MKDIR_P) "$(distdir)/$$subdir" \ -+ || exit 1; \ - dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ - $(am__relativize); \ - new_distdir=$$reldir; \ -@@ -480,10 +527,15 @@ install-am: all-am - - installcheck: installcheck-recursive - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+ if test -z '$(STRIP)'; then \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ install; \ -+ else \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -+ fi - mostlyclean-generic: - - clean-generic: -@@ -561,22 +613,20 @@ ps-am: - - uninstall-am: - --.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ -- install-am install-strip tags-recursive -- --.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ -- all all-am check check-am clean clean-generic clean-libtool \ -- ctags ctags-recursive distclean distclean-generic \ -- distclean-libtool distclean-tags distdir dvi dvi-am html \ -- html-am info info-am install install-am install-data \ -- install-data-am install-dvi install-dvi-am install-exec \ -- install-exec-am install-html install-html-am install-info \ -- install-info-am install-man install-pdf install-pdf-am \ -- install-ps install-ps-am install-strip installcheck \ -- installcheck-am installdirs installdirs-am maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-generic \ -- mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ -- uninstall uninstall-am -+.MAKE: $(am__recursive_targets) install-am install-strip -+ -+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ -+ check-am clean clean-generic clean-libtool cscopelist-am ctags \ -+ ctags-am distclean distclean-generic distclean-libtool \ -+ distclean-tags distdir dvi dvi-am html html-am info info-am \ -+ install install-am install-data install-data-am install-dvi \ -+ install-dvi-am install-exec install-exec-am install-html \ -+ install-html-am install-info install-info-am install-man \ -+ install-pdf install-pdf-am install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ installdirs-am maintainer-clean maintainer-clean-generic \ -+ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ -+ ps ps-am tags tags-am uninstall uninstall-am - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff --git a/src/modules_contrib/contrib_a_perego/Makefile.in b/src/modules_contrib/contrib_a_perego/Makefile.in -index 413c695..78a7f45 100644 ---- a/src/modules_contrib/contrib_a_perego/Makefile.in -+++ b/src/modules_contrib/contrib_a_perego/Makefile.in -@@ -1,9 +1,8 @@ --# Makefile.in generated by automake 1.11.1 from Makefile.am. -+# Makefile.in generated by automake 1.14 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, --# Inc. -+# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+ - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -15,6 +14,51 @@ - - @SET_MAKE@ - VPATH = @srcdir@ -+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -+am__make_running_with_option = \ -+ case $${target_option-} in \ -+ ?) ;; \ -+ *) echo "am__make_running_with_option: internal error: invalid" \ -+ "target option '$${target_option-}' specified" >&2; \ -+ exit 1;; \ -+ esac; \ -+ has_opt=no; \ -+ sane_makeflags=$$MAKEFLAGS; \ -+ if $(am__is_gnu_make); then \ -+ sane_makeflags=$$MFLAGS; \ -+ else \ -+ case $$MAKEFLAGS in \ -+ *\\[\ \ ]*) \ -+ bs=\\; \ -+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -+ esac; \ -+ fi; \ -+ skip_next=no; \ -+ strip_trailopt () \ -+ { \ -+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -+ }; \ -+ for flg in $$sane_makeflags; do \ -+ test $$skip_next = yes && { skip_next=no; continue; }; \ -+ case $$flg in \ -+ *=*|--*) continue;; \ -+ -*I) strip_trailopt 'I'; skip_next=yes;; \ -+ -*I?*) strip_trailopt 'I';; \ -+ -*O) strip_trailopt 'O'; skip_next=yes;; \ -+ -*O?*) strip_trailopt 'O';; \ -+ -*l) strip_trailopt 'l'; skip_next=yes;; \ -+ -*l?*) strip_trailopt 'l';; \ -+ -[dEDm]) skip_next=yes;; \ -+ -[JT]) skip_next=yes;; \ -+ esac; \ -+ case $$flg in \ -+ *$$target_option*) has_opt=yes; break;; \ -+ esac; \ -+ done; \ -+ test $$has_opt = yes -+am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -+am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -34,7 +78,7 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - subdir = src/modules_contrib/contrib_a_perego --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ - $(top_srcdir)/m4/ax_python_devel.m4 \ -@@ -49,20 +93,58 @@ mkinstalldirs = $(install_sh) -d - CONFIG_HEADER = $(top_builddir)/config.h - CONFIG_CLEAN_FILES = - CONFIG_CLEAN_VPATH_FILES = -+AM_V_P = $(am__v_P_@AM_V@) -+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -+am__v_P_0 = false -+am__v_P_1 = : -+AM_V_GEN = $(am__v_GEN_@AM_V@) -+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+am__v_GEN_0 = @echo " GEN " $@; -+am__v_GEN_1 = -+AM_V_at = $(am__v_at_@AM_V@) -+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+am__v_at_0 = @ -+am__v_at_1 = - SOURCES = - DIST_SOURCES = --RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ -- html-recursive info-recursive install-data-recursive \ -- install-dvi-recursive install-exec-recursive \ -- install-html-recursive install-info-recursive \ -- install-pdf-recursive install-ps-recursive install-recursive \ -- installcheck-recursive installdirs-recursive pdf-recursive \ -- ps-recursive uninstall-recursive -+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ -+ ctags-recursive dvi-recursive html-recursive info-recursive \ -+ install-data-recursive install-dvi-recursive \ -+ install-exec-recursive install-html-recursive \ -+ install-info-recursive install-pdf-recursive \ -+ install-ps-recursive install-recursive installcheck-recursive \ -+ installdirs-recursive pdf-recursive ps-recursive \ -+ tags-recursive uninstall-recursive -+am__can_run_installinfo = \ -+ case $$AM_UPDATE_INFO_DIR in \ -+ n|no|NO) false;; \ -+ *) (install-info --version) >/dev/null 2>&1;; \ -+ esac - RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ - distclean-recursive maintainer-clean-recursive --AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ -- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ -+am__recursive_targets = \ -+ $(RECURSIVE_TARGETS) \ -+ $(RECURSIVE_CLEAN_TARGETS) \ -+ $(am__extra_recursive_targets) -+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ - distdir -+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -+# Read a list of newline-separated strings from the standard input, -+# and print each of them once, without duplicates. Input order is -+# *not* preserved. -+am__uniquify_input = $(AWK) '\ -+ BEGIN { nonempty = 0; } \ -+ { items[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in items) print i; }; } \ -+' -+# Make sure the list of sources is unique. This is necessary because, -+# e.g., the same source file might be shared among _SOURCES variables -+# for different programs/libraries. -+am__define_uniq_tagged_files = \ -+ list='$(am__tagged_files)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | $(am__uniquify_input)` - ETAGS = etags - CTAGS = ctags - DIST_SUBDIRS = $(SUBDIRS) -@@ -94,6 +176,7 @@ am__relativize = \ - reldir="$$dir2" - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ -+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ -@@ -114,6 +197,7 @@ CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DISABLELIBHARU = @DISABLELIBHARU@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -141,6 +225,7 @@ LOCAL_INCS = @LOCAL_INCS@ - LOCAL_LIBS = @LOCAL_LIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - NM = @NM@ - NMEDIT = @NMEDIT@ -@@ -153,6 +238,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - POW_LIB = @POW_LIB@ -@@ -178,6 +264,7 @@ abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -@@ -211,7 +298,6 @@ libdir = @libdir@ - libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -@@ -273,22 +359,25 @@ clean-libtool: - -rm -rf .libs _libs - - # This directory's subdirectories are mostly independent; you can cd --# into them and run `make' without going through this Makefile. --# To change the values of `make' variables: instead of editing Makefiles, --# (1) if the variable is set in `config.status', edit `config.status' --# (which will cause the Makefiles to be regenerated when you run `make'); --# (2) otherwise, pass the desired values on the `make' command line. --$(RECURSIVE_TARGETS): -- @fail= failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -+# into them and run 'make' without going through this Makefile. -+# To change the values of 'make' variables: instead of editing Makefiles, -+# (1) if the variable is set in 'config.status', edit 'config.status' -+# (which will cause the Makefiles to be regenerated when you run 'make'); -+# (2) otherwise, pass the desired values on the 'make' command line. -+$(am__recursive_targets): -+ @fail=; \ -+ if $(am__make_keepgoing); then \ -+ failcom='fail=yes'; \ -+ else \ -+ failcom='exit 1'; \ -+ fi; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ -- list='$(SUBDIRS)'; for subdir in $$list; do \ -+ case "$@" in \ -+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -+ *) list='$(SUBDIRS)' ;; \ -+ esac; \ -+ for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ -@@ -303,57 +392,12 @@ $(RECURSIVE_TARGETS): - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - --$(RECURSIVE_CLEAN_TARGETS): -- @fail= failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -- dot_seen=no; \ -- case "$@" in \ -- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -- *) list='$(SUBDIRS)' ;; \ -- esac; \ -- rev=''; for subdir in $$list; do \ -- if test "$$subdir" = "."; then :; else \ -- rev="$$subdir $$rev"; \ -- fi; \ -- done; \ -- rev="$$rev ."; \ -- target=`echo $@ | sed s/-recursive//`; \ -- for subdir in $$rev; do \ -- echo "Making $$target in $$subdir"; \ -- if test "$$subdir" = "."; then \ -- local_target="$$target-am"; \ -- else \ -- local_target="$$target"; \ -- fi; \ -- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || eval $$failcom; \ -- done && test -z "$$fail" --tags-recursive: -- list='$(SUBDIRS)'; for subdir in $$list; do \ -- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ -- done --ctags-recursive: -- list='$(SUBDIRS)'; for subdir in $$list; do \ -- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ -- done -+ID: $(am__tagged_files) -+ $(am__define_uniq_tagged_files); mkid -fID $$unique -+tags: tags-recursive -+TAGS: tags - --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ - if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ -@@ -369,12 +413,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ -@@ -386,15 +425,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $$unique; \ - fi; \ - fi --ctags: CTAGS --CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ctags: ctags-recursive -+ -+CTAGS: ctags -+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) -+ $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique -@@ -403,6 +438,21 @@ GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -+cscopelist: cscopelist-recursive -+ -+cscopelist-am: $(am__tagged_files) -+ list='$(am__tagged_files)'; \ -+ case "$(srcdir)" in \ -+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ -+ *) sdir=$(subdir)/$(srcdir) ;; \ -+ esac; \ -+ for i in $$list; do \ -+ if test -f "$$i"; then \ -+ echo "$(subdir)/$$i"; \ -+ else \ -+ echo "$$sdir/$$i"; \ -+ fi; \ -+ done >> $(top_builddir)/cscope.files - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -@@ -439,13 +489,10 @@ distdir: $(DISTFILES) - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test -d "$(distdir)/$$subdir" \ -- || $(MKDIR_P) "$(distdir)/$$subdir" \ -- || exit 1; \ -- fi; \ -- done -- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ -- if test "$$subdir" = .; then :; else \ -+ $(am__make_dryrun) \ -+ || test -d "$(distdir)/$$subdir" \ -+ || $(MKDIR_P) "$(distdir)/$$subdir" \ -+ || exit 1; \ - dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ - $(am__relativize); \ - new_distdir=$$reldir; \ -@@ -480,10 +527,15 @@ install-am: all-am - - installcheck: installcheck-recursive - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+ if test -z '$(STRIP)'; then \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ install; \ -+ else \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -+ fi - mostlyclean-generic: - - clean-generic: -@@ -561,22 +613,20 @@ ps-am: - - uninstall-am: - --.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ -- install-am install-strip tags-recursive -- --.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ -- all all-am check check-am clean clean-generic clean-libtool \ -- ctags ctags-recursive distclean distclean-generic \ -- distclean-libtool distclean-tags distdir dvi dvi-am html \ -- html-am info info-am install install-am install-data \ -- install-data-am install-dvi install-dvi-am install-exec \ -- install-exec-am install-html install-html-am install-info \ -- install-info-am install-man install-pdf install-pdf-am \ -- install-ps install-ps-am install-strip installcheck \ -- installcheck-am installdirs installdirs-am maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-generic \ -- mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ -- uninstall uninstall-am -+.MAKE: $(am__recursive_targets) install-am install-strip -+ -+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ -+ check-am clean clean-generic clean-libtool cscopelist-am ctags \ -+ ctags-am distclean distclean-generic distclean-libtool \ -+ distclean-tags distdir dvi dvi-am html html-am info info-am \ -+ install install-am install-data install-data-am install-dvi \ -+ install-dvi-am install-exec install-exec-am install-html \ -+ install-html-am install-info install-info-am install-man \ -+ install-pdf install-pdf-am install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ installdirs-am maintainer-clean maintainer-clean-generic \ -+ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ -+ ps ps-am tags tags-am uninstall uninstall-am - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff --git a/src/modules_contrib/contrib_a_perego/contrib_a_perego/Makefile.in b/src/modules_contrib/contrib_a_perego/contrib_a_perego/Makefile.in -index 660587a..b9b0547 100644 ---- a/src/modules_contrib/contrib_a_perego/contrib_a_perego/Makefile.in -+++ b/src/modules_contrib/contrib_a_perego/contrib_a_perego/Makefile.in -@@ -1,9 +1,8 @@ --# Makefile.in generated by automake 1.11.1 from Makefile.am. -+# Makefile.in generated by automake 1.14 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, --# Inc. -+# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+ - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -16,6 +15,51 @@ - @SET_MAKE@ - - VPATH = @srcdir@ -+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -+am__make_running_with_option = \ -+ case $${target_option-} in \ -+ ?) ;; \ -+ *) echo "am__make_running_with_option: internal error: invalid" \ -+ "target option '$${target_option-}' specified" >&2; \ -+ exit 1;; \ -+ esac; \ -+ has_opt=no; \ -+ sane_makeflags=$$MAKEFLAGS; \ -+ if $(am__is_gnu_make); then \ -+ sane_makeflags=$$MFLAGS; \ -+ else \ -+ case $$MAKEFLAGS in \ -+ *\\[\ \ ]*) \ -+ bs=\\; \ -+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -+ esac; \ -+ fi; \ -+ skip_next=no; \ -+ strip_trailopt () \ -+ { \ -+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -+ }; \ -+ for flg in $$sane_makeflags; do \ -+ test $$skip_next = yes && { skip_next=no; continue; }; \ -+ case $$flg in \ -+ *=*|--*) continue;; \ -+ -*I) strip_trailopt 'I'; skip_next=yes;; \ -+ -*I?*) strip_trailopt 'I';; \ -+ -*O) strip_trailopt 'O'; skip_next=yes;; \ -+ -*O?*) strip_trailopt 'O';; \ -+ -*l) strip_trailopt 'l'; skip_next=yes;; \ -+ -*l?*) strip_trailopt 'l';; \ -+ -[dEDm]) skip_next=yes;; \ -+ -[JT]) skip_next=yes;; \ -+ esac; \ -+ case $$flg in \ -+ *$$target_option*) has_opt=yes; break;; \ -+ esac; \ -+ done; \ -+ test $$has_opt = yes -+am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -+am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -35,7 +79,8 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - subdir = src/modules_contrib/contrib_a_perego/contrib_a_perego --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ -+ $(top_srcdir)/depcomp - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ - $(top_srcdir)/m4/ax_python_devel.m4 \ -@@ -71,6 +116,12 @@ am__nobase_list = $(am__nobase_strip_setup); \ - am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -+am__uninstall_files_from_dir = { \ -+ test -z "$$files" \ -+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ -+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ -+ $(am__cd) "$$dir" && rm -f $$files; }; \ -+ } - am__installdirs = "$(DESTDIR)$(pkglibdir)" - LTLIBRARIES = $(pkglib_LTLIBRARIES) - libcontrib_a_perego_la_DEPENDENCIES = \ -@@ -79,35 +130,92 @@ am_libcontrib_a_perego_la_OBJECTS = A1WiTh.lo A2WiTh.lo A3WiTh.lo \ - AvWiMa1.lo AvWiMa2.lo destriping1.lo destriping2.lo \ - directional1.lo MLB_Interface.lo - libcontrib_a_perego_la_OBJECTS = $(am_libcontrib_a_perego_la_OBJECTS) -+AM_V_lt = $(am__v_lt_@AM_V@) -+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -+am__v_lt_0 = --silent -+am__v_lt_1 = -+AM_V_P = $(am__v_P_@AM_V@) -+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -+am__v_P_0 = false -+am__v_P_1 = : -+AM_V_GEN = $(am__v_GEN_@AM_V@) -+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+am__v_GEN_0 = @echo " GEN " $@; -+am__v_GEN_1 = -+AM_V_at = $(am__v_at_@AM_V@) -+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+am__v_at_0 = @ -+am__v_at_1 = - DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - am__mv = mv -f - CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) --LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CXXFLAGS) $(CXXFLAGS) -+AM_V_CXX = $(am__v_CXX_@AM_V@) -+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) -+am__v_CXX_0 = @echo " CXX " $@; -+am__v_CXX_1 = - CXXLD = $(CXX) --CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ -+ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) -+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) -+am__v_CXXLD_0 = @echo " CXXLD " $@; -+am__v_CXXLD_1 = - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CFLAGS) $(CFLAGS) -+AM_V_CC = $(am__v_CC_@AM_V@) -+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -+am__v_CC_0 = @echo " CC " $@; -+am__v_CC_1 = - CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CCLD = $(am__v_CCLD_@AM_V@) -+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -+am__v_CCLD_0 = @echo " CCLD " $@; -+am__v_CCLD_1 = - SOURCES = $(libcontrib_a_perego_la_SOURCES) - DIST_SOURCES = $(libcontrib_a_perego_la_SOURCES) -+am__can_run_installinfo = \ -+ case $$AM_UPDATE_INFO_DIR in \ -+ n|no|NO) false;; \ -+ *) (install-info --version) >/dev/null 2>&1;; \ -+ esac -+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -+# Read a list of newline-separated strings from the standard input, -+# and print each of them once, without duplicates. Input order is -+# *not* preserved. -+am__uniquify_input = $(AWK) '\ -+ BEGIN { nonempty = 0; } \ -+ { items[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in items) print i; }; } \ -+' -+# Make sure the list of sources is unique. This is necessary because, -+# e.g., the same source file might be shared among _SOURCES variables -+# for different programs/libraries. -+am__define_uniq_tagged_files = \ -+ list='$(am__tagged_files)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | $(am__uniquify_input)` - ETAGS = etags - CTAGS = ctags - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ -+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ -@@ -128,6 +236,7 @@ CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DISABLELIBHARU = @DISABLELIBHARU@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -155,6 +264,7 @@ LOCAL_INCS = @LOCAL_INCS@ - LOCAL_LIBS = @LOCAL_LIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - NM = @NM@ - NMEDIT = @NMEDIT@ -@@ -167,6 +277,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - POW_LIB = @POW_LIB@ -@@ -192,6 +303,7 @@ abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -@@ -225,7 +337,6 @@ libdir = @libdir@ - libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -@@ -311,9 +422,9 @@ $(top_srcdir)/configure: $(am__configure_deps) - $(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - $(am__aclocal_m4_deps): -+ - install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" - @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ - list2=; for p in $$list; do \ - if test -f $$p; then \ -@@ -321,6 +432,8 @@ install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - else :; fi; \ - done; \ - test -z "$$list2" || { \ -+ echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \ -+ $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \ - } -@@ -336,14 +449,17 @@ uninstall-pkglibLTLIBRARIES: - - clean-pkglibLTLIBRARIES: - -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES) -- @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \ -- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -- echo "rm -f \"$${dir}/so_locations\""; \ -- rm -f "$${dir}/so_locations"; \ -- done --libcontrib_a_perego.la: $(libcontrib_a_perego_la_OBJECTS) $(libcontrib_a_perego_la_DEPENDENCIES) -- $(CXXLINK) -rpath $(pkglibdir) $(libcontrib_a_perego_la_OBJECTS) $(libcontrib_a_perego_la_LIBADD) $(LIBS) -+ @list='$(pkglib_LTLIBRARIES)'; \ -+ locs=`for p in $$list; do echo $$p; done | \ -+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ -+ sort -u`; \ -+ test -z "$$locs" || { \ -+ echo rm -f $${locs}; \ -+ rm -f $${locs}; \ -+ } -+ -+libcontrib_a_perego.la: $(libcontrib_a_perego_la_OBJECTS) $(libcontrib_a_perego_la_DEPENDENCIES) $(EXTRA_libcontrib_a_perego_la_DEPENDENCIES) -+ $(AM_V_CXXLD)$(CXXLINK) -rpath $(pkglibdir) $(libcontrib_a_perego_la_OBJECTS) $(libcontrib_a_perego_la_LIBADD) $(LIBS) - - mostlyclean-compile: - -rm -f *.$(OBJEXT) -@@ -362,25 +478,25 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/directional1.Plo@am__quote@ - - .cpp.o: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< - - .cpp.obj: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - - .cpp.lo: --@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< - - mostlyclean-libtool: - -rm -f *.lo -@@ -388,26 +504,15 @@ mostlyclean-libtool: - clean-libtool: - -rm -rf .libs _libs - --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -+ID: $(am__tagged_files) -+ $(am__define_uniq_tagged_files); mkid -fID $$unique -+tags: tags-am -+TAGS: tags -+ -+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ -@@ -419,15 +524,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $$unique; \ - fi; \ - fi --ctags: CTAGS --CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ctags: ctags-am -+ -+CTAGS: ctags -+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) -+ $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique -@@ -436,6 +537,21 @@ GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -+cscopelist: cscopelist-am -+ -+cscopelist-am: $(am__tagged_files) -+ list='$(am__tagged_files)'; \ -+ case "$(srcdir)" in \ -+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ -+ *) sdir=$(subdir)/$(srcdir) ;; \ -+ esac; \ -+ for i in $$list; do \ -+ if test -f "$$i"; then \ -+ echo "$(subdir)/$$i"; \ -+ else \ -+ echo "$$sdir/$$i"; \ -+ fi; \ -+ done >> $(top_builddir)/cscope.files - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -@@ -487,10 +603,15 @@ install-am: all-am - - installcheck: installcheck-am - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+ if test -z '$(STRIP)'; then \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ install; \ -+ else \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -+ fi - mostlyclean-generic: - - clean-generic: -@@ -575,19 +696,20 @@ uninstall-am: uninstall-pkglibLTLIBRARIES - - .MAKE: install-am install-strip - --.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ -- clean-libtool clean-pkglibLTLIBRARIES ctags distclean \ -- distclean-compile distclean-generic distclean-libtool \ -- distclean-tags distdir dvi dvi-am html html-am info info-am \ -- install install-am install-data install-data-am install-dvi \ -- install-dvi-am install-exec install-exec-am install-html \ -- install-html-am install-info install-info-am install-man \ -- install-pdf install-pdf-am install-pkglibLTLIBRARIES \ -- install-ps install-ps-am install-strip installcheck \ -- installcheck-am installdirs maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-compile \ -- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -- tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES -+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ -+ clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \ -+ ctags-am distclean distclean-compile distclean-generic \ -+ distclean-libtool distclean-tags distdir dvi dvi-am html \ -+ html-am info info-am install install-am install-data \ -+ install-data-am install-dvi install-dvi-am install-exec \ -+ install-exec-am install-html install-html-am install-info \ -+ install-info-am install-man install-pdf install-pdf-am \ -+ install-pkglibLTLIBRARIES install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ maintainer-clean maintainer-clean-generic mostlyclean \ -+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ -+ pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ -+ uninstall-pkglibLTLIBRARIES - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff --git a/src/modules_contrib/contrib_s_liersch/Makefile.in b/src/modules_contrib/contrib_s_liersch/Makefile.in -index a1eeecc..794da2b 100644 ---- a/src/modules_contrib/contrib_s_liersch/Makefile.in -+++ b/src/modules_contrib/contrib_s_liersch/Makefile.in -@@ -1,9 +1,8 @@ --# Makefile.in generated by automake 1.11.1 from Makefile.am. -+# Makefile.in generated by automake 1.14 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, --# Inc. -+# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+ - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -15,6 +14,51 @@ - - @SET_MAKE@ - VPATH = @srcdir@ -+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -+am__make_running_with_option = \ -+ case $${target_option-} in \ -+ ?) ;; \ -+ *) echo "am__make_running_with_option: internal error: invalid" \ -+ "target option '$${target_option-}' specified" >&2; \ -+ exit 1;; \ -+ esac; \ -+ has_opt=no; \ -+ sane_makeflags=$$MAKEFLAGS; \ -+ if $(am__is_gnu_make); then \ -+ sane_makeflags=$$MFLAGS; \ -+ else \ -+ case $$MAKEFLAGS in \ -+ *\\[\ \ ]*) \ -+ bs=\\; \ -+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -+ esac; \ -+ fi; \ -+ skip_next=no; \ -+ strip_trailopt () \ -+ { \ -+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -+ }; \ -+ for flg in $$sane_makeflags; do \ -+ test $$skip_next = yes && { skip_next=no; continue; }; \ -+ case $$flg in \ -+ *=*|--*) continue;; \ -+ -*I) strip_trailopt 'I'; skip_next=yes;; \ -+ -*I?*) strip_trailopt 'I';; \ -+ -*O) strip_trailopt 'O'; skip_next=yes;; \ -+ -*O?*) strip_trailopt 'O';; \ -+ -*l) strip_trailopt 'l'; skip_next=yes;; \ -+ -*l?*) strip_trailopt 'l';; \ -+ -[dEDm]) skip_next=yes;; \ -+ -[JT]) skip_next=yes;; \ -+ esac; \ -+ case $$flg in \ -+ *$$target_option*) has_opt=yes; break;; \ -+ esac; \ -+ done; \ -+ test $$has_opt = yes -+am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -+am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -34,7 +78,7 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - subdir = src/modules_contrib/contrib_s_liersch --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ - $(top_srcdir)/m4/ax_python_devel.m4 \ -@@ -49,20 +93,58 @@ mkinstalldirs = $(install_sh) -d - CONFIG_HEADER = $(top_builddir)/config.h - CONFIG_CLEAN_FILES = - CONFIG_CLEAN_VPATH_FILES = -+AM_V_P = $(am__v_P_@AM_V@) -+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -+am__v_P_0 = false -+am__v_P_1 = : -+AM_V_GEN = $(am__v_GEN_@AM_V@) -+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+am__v_GEN_0 = @echo " GEN " $@; -+am__v_GEN_1 = -+AM_V_at = $(am__v_at_@AM_V@) -+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+am__v_at_0 = @ -+am__v_at_1 = - SOURCES = - DIST_SOURCES = --RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ -- html-recursive info-recursive install-data-recursive \ -- install-dvi-recursive install-exec-recursive \ -- install-html-recursive install-info-recursive \ -- install-pdf-recursive install-ps-recursive install-recursive \ -- installcheck-recursive installdirs-recursive pdf-recursive \ -- ps-recursive uninstall-recursive -+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ -+ ctags-recursive dvi-recursive html-recursive info-recursive \ -+ install-data-recursive install-dvi-recursive \ -+ install-exec-recursive install-html-recursive \ -+ install-info-recursive install-pdf-recursive \ -+ install-ps-recursive install-recursive installcheck-recursive \ -+ installdirs-recursive pdf-recursive ps-recursive \ -+ tags-recursive uninstall-recursive -+am__can_run_installinfo = \ -+ case $$AM_UPDATE_INFO_DIR in \ -+ n|no|NO) false;; \ -+ *) (install-info --version) >/dev/null 2>&1;; \ -+ esac - RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ - distclean-recursive maintainer-clean-recursive --AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ -- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ -+am__recursive_targets = \ -+ $(RECURSIVE_TARGETS) \ -+ $(RECURSIVE_CLEAN_TARGETS) \ -+ $(am__extra_recursive_targets) -+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ - distdir -+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -+# Read a list of newline-separated strings from the standard input, -+# and print each of them once, without duplicates. Input order is -+# *not* preserved. -+am__uniquify_input = $(AWK) '\ -+ BEGIN { nonempty = 0; } \ -+ { items[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in items) print i; }; } \ -+' -+# Make sure the list of sources is unique. This is necessary because, -+# e.g., the same source file might be shared among _SOURCES variables -+# for different programs/libraries. -+am__define_uniq_tagged_files = \ -+ list='$(am__tagged_files)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | $(am__uniquify_input)` - ETAGS = etags - CTAGS = ctags - DIST_SUBDIRS = $(SUBDIRS) -@@ -94,6 +176,7 @@ am__relativize = \ - reldir="$$dir2" - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ -+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ -@@ -114,6 +197,7 @@ CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DISABLELIBHARU = @DISABLELIBHARU@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -141,6 +225,7 @@ LOCAL_INCS = @LOCAL_INCS@ - LOCAL_LIBS = @LOCAL_LIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - NM = @NM@ - NMEDIT = @NMEDIT@ -@@ -153,6 +238,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - POW_LIB = @POW_LIB@ -@@ -178,6 +264,7 @@ abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -@@ -211,7 +298,6 @@ libdir = @libdir@ - libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -@@ -273,22 +359,25 @@ clean-libtool: - -rm -rf .libs _libs - - # This directory's subdirectories are mostly independent; you can cd --# into them and run `make' without going through this Makefile. --# To change the values of `make' variables: instead of editing Makefiles, --# (1) if the variable is set in `config.status', edit `config.status' --# (which will cause the Makefiles to be regenerated when you run `make'); --# (2) otherwise, pass the desired values on the `make' command line. --$(RECURSIVE_TARGETS): -- @fail= failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -+# into them and run 'make' without going through this Makefile. -+# To change the values of 'make' variables: instead of editing Makefiles, -+# (1) if the variable is set in 'config.status', edit 'config.status' -+# (which will cause the Makefiles to be regenerated when you run 'make'); -+# (2) otherwise, pass the desired values on the 'make' command line. -+$(am__recursive_targets): -+ @fail=; \ -+ if $(am__make_keepgoing); then \ -+ failcom='fail=yes'; \ -+ else \ -+ failcom='exit 1'; \ -+ fi; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ -- list='$(SUBDIRS)'; for subdir in $$list; do \ -+ case "$@" in \ -+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -+ *) list='$(SUBDIRS)' ;; \ -+ esac; \ -+ for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ -@@ -303,57 +392,12 @@ $(RECURSIVE_TARGETS): - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - --$(RECURSIVE_CLEAN_TARGETS): -- @fail= failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -- dot_seen=no; \ -- case "$@" in \ -- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -- *) list='$(SUBDIRS)' ;; \ -- esac; \ -- rev=''; for subdir in $$list; do \ -- if test "$$subdir" = "."; then :; else \ -- rev="$$subdir $$rev"; \ -- fi; \ -- done; \ -- rev="$$rev ."; \ -- target=`echo $@ | sed s/-recursive//`; \ -- for subdir in $$rev; do \ -- echo "Making $$target in $$subdir"; \ -- if test "$$subdir" = "."; then \ -- local_target="$$target-am"; \ -- else \ -- local_target="$$target"; \ -- fi; \ -- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || eval $$failcom; \ -- done && test -z "$$fail" --tags-recursive: -- list='$(SUBDIRS)'; for subdir in $$list; do \ -- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ -- done --ctags-recursive: -- list='$(SUBDIRS)'; for subdir in $$list; do \ -- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ -- done -+ID: $(am__tagged_files) -+ $(am__define_uniq_tagged_files); mkid -fID $$unique -+tags: tags-recursive -+TAGS: tags - --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ - if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ -@@ -369,12 +413,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ -@@ -386,15 +425,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $$unique; \ - fi; \ - fi --ctags: CTAGS --CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ctags: ctags-recursive -+ -+CTAGS: ctags -+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) -+ $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique -@@ -403,6 +438,21 @@ GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -+cscopelist: cscopelist-recursive -+ -+cscopelist-am: $(am__tagged_files) -+ list='$(am__tagged_files)'; \ -+ case "$(srcdir)" in \ -+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ -+ *) sdir=$(subdir)/$(srcdir) ;; \ -+ esac; \ -+ for i in $$list; do \ -+ if test -f "$$i"; then \ -+ echo "$(subdir)/$$i"; \ -+ else \ -+ echo "$$sdir/$$i"; \ -+ fi; \ -+ done >> $(top_builddir)/cscope.files - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -@@ -439,13 +489,10 @@ distdir: $(DISTFILES) - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test -d "$(distdir)/$$subdir" \ -- || $(MKDIR_P) "$(distdir)/$$subdir" \ -- || exit 1; \ -- fi; \ -- done -- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ -- if test "$$subdir" = .; then :; else \ -+ $(am__make_dryrun) \ -+ || test -d "$(distdir)/$$subdir" \ -+ || $(MKDIR_P) "$(distdir)/$$subdir" \ -+ || exit 1; \ - dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ - $(am__relativize); \ - new_distdir=$$reldir; \ -@@ -480,10 +527,15 @@ install-am: all-am - - installcheck: installcheck-recursive - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+ if test -z '$(STRIP)'; then \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ install; \ -+ else \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -+ fi - mostlyclean-generic: - - clean-generic: -@@ -561,22 +613,20 @@ ps-am: - - uninstall-am: - --.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ -- install-am install-strip tags-recursive -- --.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ -- all all-am check check-am clean clean-generic clean-libtool \ -- ctags ctags-recursive distclean distclean-generic \ -- distclean-libtool distclean-tags distdir dvi dvi-am html \ -- html-am info info-am install install-am install-data \ -- install-data-am install-dvi install-dvi-am install-exec \ -- install-exec-am install-html install-html-am install-info \ -- install-info-am install-man install-pdf install-pdf-am \ -- install-ps install-ps-am install-strip installcheck \ -- installcheck-am installdirs installdirs-am maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-generic \ -- mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ -- uninstall uninstall-am -+.MAKE: $(am__recursive_targets) install-am install-strip -+ -+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ -+ check-am clean clean-generic clean-libtool cscopelist-am ctags \ -+ ctags-am distclean distclean-generic distclean-libtool \ -+ distclean-tags distdir dvi dvi-am html html-am info info-am \ -+ install install-am install-data install-data-am install-dvi \ -+ install-dvi-am install-exec install-exec-am install-html \ -+ install-html-am install-info install-info-am install-man \ -+ install-pdf install-pdf-am install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ installdirs-am maintainer-clean maintainer-clean-generic \ -+ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ -+ ps ps-am tags tags-am uninstall uninstall-am - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff --git a/src/modules_contrib/contrib_s_liersch/ihacres/Makefile.in b/src/modules_contrib/contrib_s_liersch/ihacres/Makefile.in -index 63fbd97..a10402b 100644 ---- a/src/modules_contrib/contrib_s_liersch/ihacres/Makefile.in -+++ b/src/modules_contrib/contrib_s_liersch/ihacres/Makefile.in -@@ -1,9 +1,8 @@ --# Makefile.in generated by automake 1.11.1 from Makefile.am. -+# Makefile.in generated by automake 1.14 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, --# Inc. -+# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+ - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -16,6 +15,51 @@ - @SET_MAKE@ - - VPATH = @srcdir@ -+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -+am__make_running_with_option = \ -+ case $${target_option-} in \ -+ ?) ;; \ -+ *) echo "am__make_running_with_option: internal error: invalid" \ -+ "target option '$${target_option-}' specified" >&2; \ -+ exit 1;; \ -+ esac; \ -+ has_opt=no; \ -+ sane_makeflags=$$MAKEFLAGS; \ -+ if $(am__is_gnu_make); then \ -+ sane_makeflags=$$MFLAGS; \ -+ else \ -+ case $$MAKEFLAGS in \ -+ *\\[\ \ ]*) \ -+ bs=\\; \ -+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -+ esac; \ -+ fi; \ -+ skip_next=no; \ -+ strip_trailopt () \ -+ { \ -+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -+ }; \ -+ for flg in $$sane_makeflags; do \ -+ test $$skip_next = yes && { skip_next=no; continue; }; \ -+ case $$flg in \ -+ *=*|--*) continue;; \ -+ -*I) strip_trailopt 'I'; skip_next=yes;; \ -+ -*I?*) strip_trailopt 'I';; \ -+ -*O) strip_trailopt 'O'; skip_next=yes;; \ -+ -*O?*) strip_trailopt 'O';; \ -+ -*l) strip_trailopt 'l'; skip_next=yes;; \ -+ -*l?*) strip_trailopt 'l';; \ -+ -[dEDm]) skip_next=yes;; \ -+ -[JT]) skip_next=yes;; \ -+ esac; \ -+ case $$flg in \ -+ *$$target_option*) has_opt=yes; break;; \ -+ esac; \ -+ done; \ -+ test $$has_opt = yes -+am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -+am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -35,7 +79,8 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - subdir = src/modules_contrib/contrib_s_liersch/ihacres --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ -+ $(top_srcdir)/depcomp - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ - $(top_srcdir)/m4/ax_python_devel.m4 \ -@@ -71,6 +116,12 @@ am__nobase_list = $(am__nobase_strip_setup); \ - am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -+am__uninstall_files_from_dir = { \ -+ test -z "$$files" \ -+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ -+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ -+ $(am__cd) "$$dir" && rm -f $$files; }; \ -+ } - am__installdirs = "$(DESTDIR)$(pkglibdir)" - LTLIBRARIES = $(pkglib_LTLIBRARIES) - libihacres_la_DEPENDENCIES = \ -@@ -80,35 +131,92 @@ am_libihacres_la_OBJECTS = convert_sl.lo ihacres_basin.lo \ - ihacres_elev_cal.lo ihacres_eq.lo ihacres_v1.lo \ - MLB_Interface.lo model_tools.lo snow_module.lo - libihacres_la_OBJECTS = $(am_libihacres_la_OBJECTS) -+AM_V_lt = $(am__v_lt_@AM_V@) -+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -+am__v_lt_0 = --silent -+am__v_lt_1 = -+AM_V_P = $(am__v_P_@AM_V@) -+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -+am__v_P_0 = false -+am__v_P_1 = : -+AM_V_GEN = $(am__v_GEN_@AM_V@) -+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+am__v_GEN_0 = @echo " GEN " $@; -+am__v_GEN_1 = -+AM_V_at = $(am__v_at_@AM_V@) -+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+am__v_at_0 = @ -+am__v_at_1 = - DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - am__mv = mv -f - CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) --LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CXXFLAGS) $(CXXFLAGS) -+AM_V_CXX = $(am__v_CXX_@AM_V@) -+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) -+am__v_CXX_0 = @echo " CXX " $@; -+am__v_CXX_1 = - CXXLD = $(CXX) --CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ -+ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) -+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) -+am__v_CXXLD_0 = @echo " CXXLD " $@; -+am__v_CXXLD_1 = - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CFLAGS) $(CFLAGS) -+AM_V_CC = $(am__v_CC_@AM_V@) -+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -+am__v_CC_0 = @echo " CC " $@; -+am__v_CC_1 = - CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CCLD = $(am__v_CCLD_@AM_V@) -+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -+am__v_CCLD_0 = @echo " CCLD " $@; -+am__v_CCLD_1 = - SOURCES = $(libihacres_la_SOURCES) - DIST_SOURCES = $(libihacres_la_SOURCES) -+am__can_run_installinfo = \ -+ case $$AM_UPDATE_INFO_DIR in \ -+ n|no|NO) false;; \ -+ *) (install-info --version) >/dev/null 2>&1;; \ -+ esac -+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -+# Read a list of newline-separated strings from the standard input, -+# and print each of them once, without duplicates. Input order is -+# *not* preserved. -+am__uniquify_input = $(AWK) '\ -+ BEGIN { nonempty = 0; } \ -+ { items[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in items) print i; }; } \ -+' -+# Make sure the list of sources is unique. This is necessary because, -+# e.g., the same source file might be shared among _SOURCES variables -+# for different programs/libraries. -+am__define_uniq_tagged_files = \ -+ list='$(am__tagged_files)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | $(am__uniquify_input)` - ETAGS = etags - CTAGS = ctags - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ -+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ -@@ -129,6 +237,7 @@ CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DISABLELIBHARU = @DISABLELIBHARU@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -156,6 +265,7 @@ LOCAL_INCS = @LOCAL_INCS@ - LOCAL_LIBS = @LOCAL_LIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - NM = @NM@ - NMEDIT = @NMEDIT@ -@@ -168,6 +278,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - POW_LIB = @POW_LIB@ -@@ -193,6 +304,7 @@ abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -@@ -226,7 +338,6 @@ libdir = @libdir@ - libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -@@ -316,9 +427,9 @@ $(top_srcdir)/configure: $(am__configure_deps) - $(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - $(am__aclocal_m4_deps): -+ - install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" - @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ - list2=; for p in $$list; do \ - if test -f $$p; then \ -@@ -326,6 +437,8 @@ install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - else :; fi; \ - done; \ - test -z "$$list2" || { \ -+ echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \ -+ $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \ - } -@@ -341,14 +454,17 @@ uninstall-pkglibLTLIBRARIES: - - clean-pkglibLTLIBRARIES: - -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES) -- @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \ -- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -- echo "rm -f \"$${dir}/so_locations\""; \ -- rm -f "$${dir}/so_locations"; \ -- done --libihacres.la: $(libihacres_la_OBJECTS) $(libihacres_la_DEPENDENCIES) -- $(CXXLINK) -rpath $(pkglibdir) $(libihacres_la_OBJECTS) $(libihacres_la_LIBADD) $(LIBS) -+ @list='$(pkglib_LTLIBRARIES)'; \ -+ locs=`for p in $$list; do echo $$p; done | \ -+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ -+ sort -u`; \ -+ test -z "$$locs" || { \ -+ echo rm -f $${locs}; \ -+ rm -f $${locs}; \ -+ } -+ -+libihacres.la: $(libihacres_la_OBJECTS) $(libihacres_la_DEPENDENCIES) $(EXTRA_libihacres_la_DEPENDENCIES) -+ $(AM_V_CXXLD)$(CXXLINK) -rpath $(pkglibdir) $(libihacres_la_OBJECTS) $(libihacres_la_LIBADD) $(LIBS) - - mostlyclean-compile: - -rm -f *.$(OBJEXT) -@@ -369,25 +485,25 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/snow_module.Plo@am__quote@ - - .cpp.o: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< - - .cpp.obj: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - - .cpp.lo: --@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< - - mostlyclean-libtool: - -rm -f *.lo -@@ -395,26 +511,15 @@ mostlyclean-libtool: - clean-libtool: - -rm -rf .libs _libs - --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -+ID: $(am__tagged_files) -+ $(am__define_uniq_tagged_files); mkid -fID $$unique -+tags: tags-am -+TAGS: tags -+ -+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ -@@ -426,15 +531,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $$unique; \ - fi; \ - fi --ctags: CTAGS --CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ctags: ctags-am -+ -+CTAGS: ctags -+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) -+ $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique -@@ -443,6 +544,21 @@ GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -+cscopelist: cscopelist-am -+ -+cscopelist-am: $(am__tagged_files) -+ list='$(am__tagged_files)'; \ -+ case "$(srcdir)" in \ -+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ -+ *) sdir=$(subdir)/$(srcdir) ;; \ -+ esac; \ -+ for i in $$list; do \ -+ if test -f "$$i"; then \ -+ echo "$(subdir)/$$i"; \ -+ else \ -+ echo "$$sdir/$$i"; \ -+ fi; \ -+ done >> $(top_builddir)/cscope.files - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -@@ -494,10 +610,15 @@ install-am: all-am - - installcheck: installcheck-am - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+ if test -z '$(STRIP)'; then \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ install; \ -+ else \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -+ fi - mostlyclean-generic: - - clean-generic: -@@ -582,19 +703,20 @@ uninstall-am: uninstall-pkglibLTLIBRARIES - - .MAKE: install-am install-strip - --.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ -- clean-libtool clean-pkglibLTLIBRARIES ctags distclean \ -- distclean-compile distclean-generic distclean-libtool \ -- distclean-tags distdir dvi dvi-am html html-am info info-am \ -- install install-am install-data install-data-am install-dvi \ -- install-dvi-am install-exec install-exec-am install-html \ -- install-html-am install-info install-info-am install-man \ -- install-pdf install-pdf-am install-pkglibLTLIBRARIES \ -- install-ps install-ps-am install-strip installcheck \ -- installcheck-am installdirs maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-compile \ -- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -- tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES -+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ -+ clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \ -+ ctags-am distclean distclean-compile distclean-generic \ -+ distclean-libtool distclean-tags distdir dvi dvi-am html \ -+ html-am info info-am install install-am install-data \ -+ install-data-am install-dvi install-dvi-am install-exec \ -+ install-exec-am install-html install-html-am install-info \ -+ install-info-am install-man install-pdf install-pdf-am \ -+ install-pkglibLTLIBRARIES install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ maintainer-clean maintainer-clean-generic mostlyclean \ -+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ -+ pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ -+ uninstall-pkglibLTLIBRARIES - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff --git a/src/modules_contrib/garden/Makefile.in b/src/modules_contrib/garden/Makefile.in -index 4ad922d..3937534 100644 ---- a/src/modules_contrib/garden/Makefile.in -+++ b/src/modules_contrib/garden/Makefile.in -@@ -1,9 +1,8 @@ --# Makefile.in generated by automake 1.11.1 from Makefile.am. -+# Makefile.in generated by automake 1.14 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, --# Inc. -+# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+ - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -15,6 +14,51 @@ - - @SET_MAKE@ - VPATH = @srcdir@ -+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -+am__make_running_with_option = \ -+ case $${target_option-} in \ -+ ?) ;; \ -+ *) echo "am__make_running_with_option: internal error: invalid" \ -+ "target option '$${target_option-}' specified" >&2; \ -+ exit 1;; \ -+ esac; \ -+ has_opt=no; \ -+ sane_makeflags=$$MAKEFLAGS; \ -+ if $(am__is_gnu_make); then \ -+ sane_makeflags=$$MFLAGS; \ -+ else \ -+ case $$MAKEFLAGS in \ -+ *\\[\ \ ]*) \ -+ bs=\\; \ -+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -+ esac; \ -+ fi; \ -+ skip_next=no; \ -+ strip_trailopt () \ -+ { \ -+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -+ }; \ -+ for flg in $$sane_makeflags; do \ -+ test $$skip_next = yes && { skip_next=no; continue; }; \ -+ case $$flg in \ -+ *=*|--*) continue;; \ -+ -*I) strip_trailopt 'I'; skip_next=yes;; \ -+ -*I?*) strip_trailopt 'I';; \ -+ -*O) strip_trailopt 'O'; skip_next=yes;; \ -+ -*O?*) strip_trailopt 'O';; \ -+ -*l) strip_trailopt 'l'; skip_next=yes;; \ -+ -*l?*) strip_trailopt 'l';; \ -+ -[dEDm]) skip_next=yes;; \ -+ -[JT]) skip_next=yes;; \ -+ esac; \ -+ case $$flg in \ -+ *$$target_option*) has_opt=yes; break;; \ -+ esac; \ -+ done; \ -+ test $$has_opt = yes -+am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -+am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -34,7 +78,7 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - subdir = src/modules_contrib/garden --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ - $(top_srcdir)/m4/ax_python_devel.m4 \ -@@ -49,20 +93,58 @@ mkinstalldirs = $(install_sh) -d - CONFIG_HEADER = $(top_builddir)/config.h - CONFIG_CLEAN_FILES = - CONFIG_CLEAN_VPATH_FILES = -+AM_V_P = $(am__v_P_@AM_V@) -+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -+am__v_P_0 = false -+am__v_P_1 = : -+AM_V_GEN = $(am__v_GEN_@AM_V@) -+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+am__v_GEN_0 = @echo " GEN " $@; -+am__v_GEN_1 = -+AM_V_at = $(am__v_at_@AM_V@) -+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+am__v_at_0 = @ -+am__v_at_1 = - SOURCES = - DIST_SOURCES = --RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ -- html-recursive info-recursive install-data-recursive \ -- install-dvi-recursive install-exec-recursive \ -- install-html-recursive install-info-recursive \ -- install-pdf-recursive install-ps-recursive install-recursive \ -- installcheck-recursive installdirs-recursive pdf-recursive \ -- ps-recursive uninstall-recursive -+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ -+ ctags-recursive dvi-recursive html-recursive info-recursive \ -+ install-data-recursive install-dvi-recursive \ -+ install-exec-recursive install-html-recursive \ -+ install-info-recursive install-pdf-recursive \ -+ install-ps-recursive install-recursive installcheck-recursive \ -+ installdirs-recursive pdf-recursive ps-recursive \ -+ tags-recursive uninstall-recursive -+am__can_run_installinfo = \ -+ case $$AM_UPDATE_INFO_DIR in \ -+ n|no|NO) false;; \ -+ *) (install-info --version) >/dev/null 2>&1;; \ -+ esac - RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ - distclean-recursive maintainer-clean-recursive --AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ -- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ -+am__recursive_targets = \ -+ $(RECURSIVE_TARGETS) \ -+ $(RECURSIVE_CLEAN_TARGETS) \ -+ $(am__extra_recursive_targets) -+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ - distdir -+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -+# Read a list of newline-separated strings from the standard input, -+# and print each of them once, without duplicates. Input order is -+# *not* preserved. -+am__uniquify_input = $(AWK) '\ -+ BEGIN { nonempty = 0; } \ -+ { items[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in items) print i; }; } \ -+' -+# Make sure the list of sources is unique. This is necessary because, -+# e.g., the same source file might be shared among _SOURCES variables -+# for different programs/libraries. -+am__define_uniq_tagged_files = \ -+ list='$(am__tagged_files)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | $(am__uniquify_input)` - ETAGS = etags - CTAGS = ctags - DIST_SUBDIRS = garden_3d_viewer garden_webservices -@@ -94,6 +176,7 @@ am__relativize = \ - reldir="$$dir2" - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ -+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ -@@ -114,6 +197,7 @@ CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DISABLELIBHARU = @DISABLELIBHARU@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -141,6 +225,7 @@ LOCAL_INCS = @LOCAL_INCS@ - LOCAL_LIBS = @LOCAL_LIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - NM = @NM@ - NMEDIT = @NMEDIT@ -@@ -153,6 +238,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - POW_LIB = @POW_LIB@ -@@ -178,6 +264,7 @@ abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -@@ -211,7 +298,6 @@ libdir = @libdir@ - libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -@@ -274,22 +360,25 @@ clean-libtool: - -rm -rf .libs _libs - - # This directory's subdirectories are mostly independent; you can cd --# into them and run `make' without going through this Makefile. --# To change the values of `make' variables: instead of editing Makefiles, --# (1) if the variable is set in `config.status', edit `config.status' --# (which will cause the Makefiles to be regenerated when you run `make'); --# (2) otherwise, pass the desired values on the `make' command line. --$(RECURSIVE_TARGETS): -- @fail= failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -+# into them and run 'make' without going through this Makefile. -+# To change the values of 'make' variables: instead of editing Makefiles, -+# (1) if the variable is set in 'config.status', edit 'config.status' -+# (which will cause the Makefiles to be regenerated when you run 'make'); -+# (2) otherwise, pass the desired values on the 'make' command line. -+$(am__recursive_targets): -+ @fail=; \ -+ if $(am__make_keepgoing); then \ -+ failcom='fail=yes'; \ -+ else \ -+ failcom='exit 1'; \ -+ fi; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ -- list='$(SUBDIRS)'; for subdir in $$list; do \ -+ case "$@" in \ -+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -+ *) list='$(SUBDIRS)' ;; \ -+ esac; \ -+ for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ -@@ -304,57 +393,12 @@ $(RECURSIVE_TARGETS): - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - --$(RECURSIVE_CLEAN_TARGETS): -- @fail= failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -- dot_seen=no; \ -- case "$@" in \ -- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -- *) list='$(SUBDIRS)' ;; \ -- esac; \ -- rev=''; for subdir in $$list; do \ -- if test "$$subdir" = "."; then :; else \ -- rev="$$subdir $$rev"; \ -- fi; \ -- done; \ -- rev="$$rev ."; \ -- target=`echo $@ | sed s/-recursive//`; \ -- for subdir in $$rev; do \ -- echo "Making $$target in $$subdir"; \ -- if test "$$subdir" = "."; then \ -- local_target="$$target-am"; \ -- else \ -- local_target="$$target"; \ -- fi; \ -- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || eval $$failcom; \ -- done && test -z "$$fail" --tags-recursive: -- list='$(SUBDIRS)'; for subdir in $$list; do \ -- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ -- done --ctags-recursive: -- list='$(SUBDIRS)'; for subdir in $$list; do \ -- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ -- done -+ID: $(am__tagged_files) -+ $(am__define_uniq_tagged_files); mkid -fID $$unique -+tags: tags-recursive -+TAGS: tags - --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ - if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ -@@ -370,12 +414,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ -@@ -387,15 +426,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $$unique; \ - fi; \ - fi --ctags: CTAGS --CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ctags: ctags-recursive -+ -+CTAGS: ctags -+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) -+ $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique -@@ -404,6 +439,21 @@ GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -+cscopelist: cscopelist-recursive -+ -+cscopelist-am: $(am__tagged_files) -+ list='$(am__tagged_files)'; \ -+ case "$(srcdir)" in \ -+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ -+ *) sdir=$(subdir)/$(srcdir) ;; \ -+ esac; \ -+ for i in $$list; do \ -+ if test -f "$$i"; then \ -+ echo "$(subdir)/$$i"; \ -+ else \ -+ echo "$$sdir/$$i"; \ -+ fi; \ -+ done >> $(top_builddir)/cscope.files - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -@@ -440,13 +490,10 @@ distdir: $(DISTFILES) - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test -d "$(distdir)/$$subdir" \ -- || $(MKDIR_P) "$(distdir)/$$subdir" \ -- || exit 1; \ -- fi; \ -- done -- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ -- if test "$$subdir" = .; then :; else \ -+ $(am__make_dryrun) \ -+ || test -d "$(distdir)/$$subdir" \ -+ || $(MKDIR_P) "$(distdir)/$$subdir" \ -+ || exit 1; \ - dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ - $(am__relativize); \ - new_distdir=$$reldir; \ -@@ -481,10 +528,15 @@ install-am: all-am - - installcheck: installcheck-recursive - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+ if test -z '$(STRIP)'; then \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ install; \ -+ else \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -+ fi - mostlyclean-generic: - - clean-generic: -@@ -562,22 +614,20 @@ ps-am: - - uninstall-am: - --.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ -- install-am install-strip tags-recursive -- --.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ -- all all-am check check-am clean clean-generic clean-libtool \ -- ctags ctags-recursive distclean distclean-generic \ -- distclean-libtool distclean-tags distdir dvi dvi-am html \ -- html-am info info-am install install-am install-data \ -- install-data-am install-dvi install-dvi-am install-exec \ -- install-exec-am install-html install-html-am install-info \ -- install-info-am install-man install-pdf install-pdf-am \ -- install-ps install-ps-am install-strip installcheck \ -- installcheck-am installdirs installdirs-am maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-generic \ -- mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ -- uninstall uninstall-am -+.MAKE: $(am__recursive_targets) install-am install-strip -+ -+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ -+ check-am clean clean-generic clean-libtool cscopelist-am ctags \ -+ ctags-am distclean distclean-generic distclean-libtool \ -+ distclean-tags distdir dvi dvi-am html html-am info info-am \ -+ install install-am install-data install-data-am install-dvi \ -+ install-dvi-am install-exec install-exec-am install-html \ -+ install-html-am install-info install-info-am install-man \ -+ install-pdf install-pdf-am install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ installdirs-am maintainer-clean maintainer-clean-generic \ -+ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ -+ ps ps-am tags tags-am uninstall uninstall-am - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff --git a/src/modules_contrib/garden/garden_3d_viewer/Makefile.in b/src/modules_contrib/garden/garden_3d_viewer/Makefile.in -index 465b497..3c48e03 100644 ---- a/src/modules_contrib/garden/garden_3d_viewer/Makefile.in -+++ b/src/modules_contrib/garden/garden_3d_viewer/Makefile.in -@@ -1,9 +1,8 @@ --# Makefile.in generated by automake 1.11.1 from Makefile.am. -+# Makefile.in generated by automake 1.14 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, --# Inc. -+# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+ - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -16,6 +15,51 @@ - @SET_MAKE@ - - VPATH = @srcdir@ -+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -+am__make_running_with_option = \ -+ case $${target_option-} in \ -+ ?) ;; \ -+ *) echo "am__make_running_with_option: internal error: invalid" \ -+ "target option '$${target_option-}' specified" >&2; \ -+ exit 1;; \ -+ esac; \ -+ has_opt=no; \ -+ sane_makeflags=$$MAKEFLAGS; \ -+ if $(am__is_gnu_make); then \ -+ sane_makeflags=$$MFLAGS; \ -+ else \ -+ case $$MAKEFLAGS in \ -+ *\\[\ \ ]*) \ -+ bs=\\; \ -+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -+ esac; \ -+ fi; \ -+ skip_next=no; \ -+ strip_trailopt () \ -+ { \ -+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -+ }; \ -+ for flg in $$sane_makeflags; do \ -+ test $$skip_next = yes && { skip_next=no; continue; }; \ -+ case $$flg in \ -+ *=*|--*) continue;; \ -+ -*I) strip_trailopt 'I'; skip_next=yes;; \ -+ -*I?*) strip_trailopt 'I';; \ -+ -*O) strip_trailopt 'O'; skip_next=yes;; \ -+ -*O?*) strip_trailopt 'O';; \ -+ -*l) strip_trailopt 'l'; skip_next=yes;; \ -+ -*l?*) strip_trailopt 'l';; \ -+ -[dEDm]) skip_next=yes;; \ -+ -[JT]) skip_next=yes;; \ -+ esac; \ -+ case $$flg in \ -+ *$$target_option*) has_opt=yes; break;; \ -+ esac; \ -+ done; \ -+ test $$has_opt = yes -+am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -+am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -35,7 +79,8 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - subdir = src/modules_contrib/garden/garden_3d_viewer --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ -+ $(top_srcdir)/depcomp - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ - $(top_srcdir)/m4/ax_python_devel.m4 \ -@@ -71,6 +116,12 @@ am__nobase_list = $(am__nobase_strip_setup); \ - am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -+am__uninstall_files_from_dir = { \ -+ test -z "$$files" \ -+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ -+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ -+ $(am__cd) "$$dir" && rm -f $$files; }; \ -+ } - am__installdirs = "$(DESTDIR)$(pkglibdir)" - LTLIBRARIES = $(pkglib_LTLIBRARIES) - libgarden_3d_viewer_la_DEPENDENCIES = \ -@@ -81,35 +132,92 @@ am_libgarden_3d_viewer_la_OBJECTS = MLB_Interface.lo \ - 3d_multigrid_view_module.lo 3dshapes_view_control.lo \ - 3dshapes_view_dialog.lo 3dshapes_view_module.lo - libgarden_3d_viewer_la_OBJECTS = $(am_libgarden_3d_viewer_la_OBJECTS) -+AM_V_lt = $(am__v_lt_@AM_V@) -+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -+am__v_lt_0 = --silent -+am__v_lt_1 = -+AM_V_P = $(am__v_P_@AM_V@) -+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -+am__v_P_0 = false -+am__v_P_1 = : -+AM_V_GEN = $(am__v_GEN_@AM_V@) -+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+am__v_GEN_0 = @echo " GEN " $@; -+am__v_GEN_1 = -+AM_V_at = $(am__v_at_@AM_V@) -+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+am__v_at_0 = @ -+am__v_at_1 = - DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - am__mv = mv -f - CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) --LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CXXFLAGS) $(CXXFLAGS) -+AM_V_CXX = $(am__v_CXX_@AM_V@) -+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) -+am__v_CXX_0 = @echo " CXX " $@; -+am__v_CXX_1 = - CXXLD = $(CXX) --CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ -+ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) -+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) -+am__v_CXXLD_0 = @echo " CXXLD " $@; -+am__v_CXXLD_1 = - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CFLAGS) $(CFLAGS) -+AM_V_CC = $(am__v_CC_@AM_V@) -+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -+am__v_CC_0 = @echo " CC " $@; -+am__v_CC_1 = - CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CCLD = $(am__v_CCLD_@AM_V@) -+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -+am__v_CCLD_0 = @echo " CCLD " $@; -+am__v_CCLD_1 = - SOURCES = $(libgarden_3d_viewer_la_SOURCES) - DIST_SOURCES = $(libgarden_3d_viewer_la_SOURCES) -+am__can_run_installinfo = \ -+ case $$AM_UPDATE_INFO_DIR in \ -+ n|no|NO) false;; \ -+ *) (install-info --version) >/dev/null 2>&1;; \ -+ esac -+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -+# Read a list of newline-separated strings from the standard input, -+# and print each of them once, without duplicates. Input order is -+# *not* preserved. -+am__uniquify_input = $(AWK) '\ -+ BEGIN { nonempty = 0; } \ -+ { items[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in items) print i; }; } \ -+' -+# Make sure the list of sources is unique. This is necessary because, -+# e.g., the same source file might be shared among _SOURCES variables -+# for different programs/libraries. -+am__define_uniq_tagged_files = \ -+ list='$(am__tagged_files)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | $(am__uniquify_input)` - ETAGS = etags - CTAGS = ctags - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ -+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ -@@ -130,6 +238,7 @@ CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DISABLELIBHARU = @DISABLELIBHARU@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -157,6 +266,7 @@ LOCAL_INCS = @LOCAL_INCS@ - LOCAL_LIBS = @LOCAL_LIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - NM = @NM@ - NMEDIT = @NMEDIT@ -@@ -169,6 +279,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - POW_LIB = @POW_LIB@ -@@ -194,6 +305,7 @@ abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -@@ -227,7 +339,6 @@ libdir = @libdir@ - libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -@@ -308,9 +419,9 @@ $(top_srcdir)/configure: $(am__configure_deps) - $(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - $(am__aclocal_m4_deps): -+ - install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" - @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ - list2=; for p in $$list; do \ - if test -f $$p; then \ -@@ -318,6 +429,8 @@ install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - else :; fi; \ - done; \ - test -z "$$list2" || { \ -+ echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \ -+ $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \ - } -@@ -333,14 +446,17 @@ uninstall-pkglibLTLIBRARIES: - - clean-pkglibLTLIBRARIES: - -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES) -- @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \ -- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -- echo "rm -f \"$${dir}/so_locations\""; \ -- rm -f "$${dir}/so_locations"; \ -- done --libgarden_3d_viewer.la: $(libgarden_3d_viewer_la_OBJECTS) $(libgarden_3d_viewer_la_DEPENDENCIES) -- $(CXXLINK) -rpath $(pkglibdir) $(libgarden_3d_viewer_la_OBJECTS) $(libgarden_3d_viewer_la_LIBADD) $(LIBS) -+ @list='$(pkglib_LTLIBRARIES)'; \ -+ locs=`for p in $$list; do echo $$p; done | \ -+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ -+ sort -u`; \ -+ test -z "$$locs" || { \ -+ echo rm -f $${locs}; \ -+ rm -f $${locs}; \ -+ } -+ -+libgarden_3d_viewer.la: $(libgarden_3d_viewer_la_OBJECTS) $(libgarden_3d_viewer_la_DEPENDENCIES) $(EXTRA_libgarden_3d_viewer_la_DEPENDENCIES) -+ $(AM_V_CXXLD)$(CXXLINK) -rpath $(pkglibdir) $(libgarden_3d_viewer_la_OBJECTS) $(libgarden_3d_viewer_la_LIBADD) $(LIBS) - - mostlyclean-compile: - -rm -f *.$(OBJEXT) -@@ -357,25 +473,25 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MLB_Interface.Plo@am__quote@ - - .cpp.o: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< - - .cpp.obj: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - - .cpp.lo: --@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< - - mostlyclean-libtool: - -rm -f *.lo -@@ -383,26 +499,15 @@ mostlyclean-libtool: - clean-libtool: - -rm -rf .libs _libs - --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -+ID: $(am__tagged_files) -+ $(am__define_uniq_tagged_files); mkid -fID $$unique -+tags: tags-am -+TAGS: tags -+ -+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ -@@ -414,15 +519,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $$unique; \ - fi; \ - fi --ctags: CTAGS --CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ctags: ctags-am -+ -+CTAGS: ctags -+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) -+ $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique -@@ -431,6 +532,21 @@ GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -+cscopelist: cscopelist-am -+ -+cscopelist-am: $(am__tagged_files) -+ list='$(am__tagged_files)'; \ -+ case "$(srcdir)" in \ -+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ -+ *) sdir=$(subdir)/$(srcdir) ;; \ -+ esac; \ -+ for i in $$list; do \ -+ if test -f "$$i"; then \ -+ echo "$(subdir)/$$i"; \ -+ else \ -+ echo "$$sdir/$$i"; \ -+ fi; \ -+ done >> $(top_builddir)/cscope.files - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -@@ -482,10 +598,15 @@ install-am: all-am - - installcheck: installcheck-am - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+ if test -z '$(STRIP)'; then \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ install; \ -+ else \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -+ fi - mostlyclean-generic: - - clean-generic: -@@ -570,19 +691,20 @@ uninstall-am: uninstall-pkglibLTLIBRARIES - - .MAKE: install-am install-strip - --.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ -- clean-libtool clean-pkglibLTLIBRARIES ctags distclean \ -- distclean-compile distclean-generic distclean-libtool \ -- distclean-tags distdir dvi dvi-am html html-am info info-am \ -- install install-am install-data install-data-am install-dvi \ -- install-dvi-am install-exec install-exec-am install-html \ -- install-html-am install-info install-info-am install-man \ -- install-pdf install-pdf-am install-pkglibLTLIBRARIES \ -- install-ps install-ps-am install-strip installcheck \ -- installcheck-am installdirs maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-compile \ -- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -- tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES -+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ -+ clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \ -+ ctags-am distclean distclean-compile distclean-generic \ -+ distclean-libtool distclean-tags distdir dvi dvi-am html \ -+ html-am info info-am install install-am install-data \ -+ install-data-am install-dvi install-dvi-am install-exec \ -+ install-exec-am install-html install-html-am install-info \ -+ install-info-am install-man install-pdf install-pdf-am \ -+ install-pkglibLTLIBRARIES install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ maintainer-clean maintainer-clean-generic mostlyclean \ -+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ -+ pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ -+ uninstall-pkglibLTLIBRARIES - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff --git a/src/modules_contrib/garden/garden_webservices/Makefile.in b/src/modules_contrib/garden/garden_webservices/Makefile.in -index 79e6a85..9d5fb92 100644 ---- a/src/modules_contrib/garden/garden_webservices/Makefile.in -+++ b/src/modules_contrib/garden/garden_webservices/Makefile.in -@@ -1,9 +1,8 @@ --# Makefile.in generated by automake 1.11.1 from Makefile.am. -+# Makefile.in generated by automake 1.14 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, --# Inc. -+# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+ - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -16,6 +15,51 @@ - @SET_MAKE@ - - VPATH = @srcdir@ -+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -+am__make_running_with_option = \ -+ case $${target_option-} in \ -+ ?) ;; \ -+ *) echo "am__make_running_with_option: internal error: invalid" \ -+ "target option '$${target_option-}' specified" >&2; \ -+ exit 1;; \ -+ esac; \ -+ has_opt=no; \ -+ sane_makeflags=$$MAKEFLAGS; \ -+ if $(am__is_gnu_make); then \ -+ sane_makeflags=$$MFLAGS; \ -+ else \ -+ case $$MAKEFLAGS in \ -+ *\\[\ \ ]*) \ -+ bs=\\; \ -+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -+ esac; \ -+ fi; \ -+ skip_next=no; \ -+ strip_trailopt () \ -+ { \ -+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -+ }; \ -+ for flg in $$sane_makeflags; do \ -+ test $$skip_next = yes && { skip_next=no; continue; }; \ -+ case $$flg in \ -+ *=*|--*) continue;; \ -+ -*I) strip_trailopt 'I'; skip_next=yes;; \ -+ -*I?*) strip_trailopt 'I';; \ -+ -*O) strip_trailopt 'O'; skip_next=yes;; \ -+ -*O?*) strip_trailopt 'O';; \ -+ -*l) strip_trailopt 'l'; skip_next=yes;; \ -+ -*l?*) strip_trailopt 'l';; \ -+ -[dEDm]) skip_next=yes;; \ -+ -[JT]) skip_next=yes;; \ -+ esac; \ -+ case $$flg in \ -+ *$$target_option*) has_opt=yes; break;; \ -+ esac; \ -+ done; \ -+ test $$has_opt = yes -+am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -+am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -35,7 +79,8 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - subdir = src/modules_contrib/garden/garden_webservices --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ -+ $(top_srcdir)/depcomp - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ - $(top_srcdir)/m4/ax_python_devel.m4 \ -@@ -71,6 +116,12 @@ am__nobase_list = $(am__nobase_strip_setup); \ - am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -+am__uninstall_files_from_dir = { \ -+ test -z "$$files" \ -+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ -+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ -+ $(am__cd) "$$dir" && rm -f $$files; }; \ -+ } - am__installdirs = "$(DESTDIR)$(pkglibdir)" - LTLIBRARIES = $(pkglib_LTLIBRARIES) - libgarden_webservices_la_DEPENDENCIES = \ -@@ -79,35 +130,92 @@ am_libgarden_webservices_la_OBJECTS = MLB_Interface.lo osm_import.lo \ - wms_import.lo - libgarden_webservices_la_OBJECTS = \ - $(am_libgarden_webservices_la_OBJECTS) -+AM_V_lt = $(am__v_lt_@AM_V@) -+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -+am__v_lt_0 = --silent -+am__v_lt_1 = -+AM_V_P = $(am__v_P_@AM_V@) -+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -+am__v_P_0 = false -+am__v_P_1 = : -+AM_V_GEN = $(am__v_GEN_@AM_V@) -+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+am__v_GEN_0 = @echo " GEN " $@; -+am__v_GEN_1 = -+AM_V_at = $(am__v_at_@AM_V@) -+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+am__v_at_0 = @ -+am__v_at_1 = - DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - am__mv = mv -f - CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) --LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CXXFLAGS) $(CXXFLAGS) -+AM_V_CXX = $(am__v_CXX_@AM_V@) -+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) -+am__v_CXX_0 = @echo " CXX " $@; -+am__v_CXX_1 = - CXXLD = $(CXX) --CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ -+ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) -+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) -+am__v_CXXLD_0 = @echo " CXXLD " $@; -+am__v_CXXLD_1 = - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CFLAGS) $(CFLAGS) -+AM_V_CC = $(am__v_CC_@AM_V@) -+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -+am__v_CC_0 = @echo " CC " $@; -+am__v_CC_1 = - CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CCLD = $(am__v_CCLD_@AM_V@) -+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -+am__v_CCLD_0 = @echo " CCLD " $@; -+am__v_CCLD_1 = - SOURCES = $(libgarden_webservices_la_SOURCES) - DIST_SOURCES = $(libgarden_webservices_la_SOURCES) -+am__can_run_installinfo = \ -+ case $$AM_UPDATE_INFO_DIR in \ -+ n|no|NO) false;; \ -+ *) (install-info --version) >/dev/null 2>&1;; \ -+ esac -+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -+# Read a list of newline-separated strings from the standard input, -+# and print each of them once, without duplicates. Input order is -+# *not* preserved. -+am__uniquify_input = $(AWK) '\ -+ BEGIN { nonempty = 0; } \ -+ { items[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in items) print i; }; } \ -+' -+# Make sure the list of sources is unique. This is necessary because, -+# e.g., the same source file might be shared among _SOURCES variables -+# for different programs/libraries. -+am__define_uniq_tagged_files = \ -+ list='$(am__tagged_files)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | $(am__uniquify_input)` - ETAGS = etags - CTAGS = ctags - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ -+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ -@@ -128,6 +236,7 @@ CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DISABLELIBHARU = @DISABLELIBHARU@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -155,6 +264,7 @@ LOCAL_INCS = @LOCAL_INCS@ - LOCAL_LIBS = @LOCAL_LIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - NM = @NM@ - NMEDIT = @NMEDIT@ -@@ -167,6 +277,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - POW_LIB = @POW_LIB@ -@@ -192,6 +303,7 @@ abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -@@ -225,7 +337,6 @@ libdir = @libdir@ - libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -@@ -298,9 +409,9 @@ $(top_srcdir)/configure: $(am__configure_deps) - $(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - $(am__aclocal_m4_deps): -+ - install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" - @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ - list2=; for p in $$list; do \ - if test -f $$p; then \ -@@ -308,6 +419,8 @@ install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - else :; fi; \ - done; \ - test -z "$$list2" || { \ -+ echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \ -+ $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \ - } -@@ -323,14 +436,17 @@ uninstall-pkglibLTLIBRARIES: - - clean-pkglibLTLIBRARIES: - -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES) -- @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \ -- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -- echo "rm -f \"$${dir}/so_locations\""; \ -- rm -f "$${dir}/so_locations"; \ -- done --libgarden_webservices.la: $(libgarden_webservices_la_OBJECTS) $(libgarden_webservices_la_DEPENDENCIES) -- $(CXXLINK) -rpath $(pkglibdir) $(libgarden_webservices_la_OBJECTS) $(libgarden_webservices_la_LIBADD) $(LIBS) -+ @list='$(pkglib_LTLIBRARIES)'; \ -+ locs=`for p in $$list; do echo $$p; done | \ -+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ -+ sort -u`; \ -+ test -z "$$locs" || { \ -+ echo rm -f $${locs}; \ -+ rm -f $${locs}; \ -+ } -+ -+libgarden_webservices.la: $(libgarden_webservices_la_OBJECTS) $(libgarden_webservices_la_DEPENDENCIES) $(EXTRA_libgarden_webservices_la_DEPENDENCIES) -+ $(AM_V_CXXLD)$(CXXLINK) -rpath $(pkglibdir) $(libgarden_webservices_la_OBJECTS) $(libgarden_webservices_la_LIBADD) $(LIBS) - - mostlyclean-compile: - -rm -f *.$(OBJEXT) -@@ -343,25 +459,25 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wms_import.Plo@am__quote@ - - .cpp.o: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< - - .cpp.obj: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - - .cpp.lo: --@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< - - mostlyclean-libtool: - -rm -f *.lo -@@ -369,26 +485,15 @@ mostlyclean-libtool: - clean-libtool: - -rm -rf .libs _libs - --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -+ID: $(am__tagged_files) -+ $(am__define_uniq_tagged_files); mkid -fID $$unique -+tags: tags-am -+TAGS: tags -+ -+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ -@@ -400,15 +505,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $$unique; \ - fi; \ - fi --ctags: CTAGS --CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ctags: ctags-am -+ -+CTAGS: ctags -+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) -+ $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique -@@ -417,6 +518,21 @@ GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -+cscopelist: cscopelist-am -+ -+cscopelist-am: $(am__tagged_files) -+ list='$(am__tagged_files)'; \ -+ case "$(srcdir)" in \ -+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ -+ *) sdir=$(subdir)/$(srcdir) ;; \ -+ esac; \ -+ for i in $$list; do \ -+ if test -f "$$i"; then \ -+ echo "$(subdir)/$$i"; \ -+ else \ -+ echo "$$sdir/$$i"; \ -+ fi; \ -+ done >> $(top_builddir)/cscope.files - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -@@ -468,10 +584,15 @@ install-am: all-am - - installcheck: installcheck-am - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+ if test -z '$(STRIP)'; then \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ install; \ -+ else \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -+ fi - mostlyclean-generic: - - clean-generic: -@@ -556,19 +677,20 @@ uninstall-am: uninstall-pkglibLTLIBRARIES - - .MAKE: install-am install-strip - --.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ -- clean-libtool clean-pkglibLTLIBRARIES ctags distclean \ -- distclean-compile distclean-generic distclean-libtool \ -- distclean-tags distdir dvi dvi-am html html-am info info-am \ -- install install-am install-data install-data-am install-dvi \ -- install-dvi-am install-exec install-exec-am install-html \ -- install-html-am install-info install-info-am install-man \ -- install-pdf install-pdf-am install-pkglibLTLIBRARIES \ -- install-ps install-ps-am install-strip installcheck \ -- installcheck-am installdirs maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-compile \ -- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -- tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES -+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ -+ clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \ -+ ctags-am distclean distclean-compile distclean-generic \ -+ distclean-libtool distclean-tags distdir dvi dvi-am html \ -+ html-am info info-am install install-am install-data \ -+ install-data-am install-dvi install-dvi-am install-exec \ -+ install-exec-am install-html install-html-am install-info \ -+ install-info-am install-man install-pdf install-pdf-am \ -+ install-pkglibLTLIBRARIES install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ maintainer-clean maintainer-clean-generic mostlyclean \ -+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ -+ pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ -+ uninstall-pkglibLTLIBRARIES - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff --git a/src/modules_geostatistics/Makefile.in b/src/modules_geostatistics/Makefile.in -index f663774..1bc0e9d 100644 ---- a/src/modules_geostatistics/Makefile.in -+++ b/src/modules_geostatistics/Makefile.in -@@ -1,9 +1,8 @@ --# Makefile.in generated by automake 1.11.1 from Makefile.am. -+# Makefile.in generated by automake 1.14 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, --# Inc. -+# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+ - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -15,6 +14,51 @@ - - @SET_MAKE@ - VPATH = @srcdir@ -+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -+am__make_running_with_option = \ -+ case $${target_option-} in \ -+ ?) ;; \ -+ *) echo "am__make_running_with_option: internal error: invalid" \ -+ "target option '$${target_option-}' specified" >&2; \ -+ exit 1;; \ -+ esac; \ -+ has_opt=no; \ -+ sane_makeflags=$$MAKEFLAGS; \ -+ if $(am__is_gnu_make); then \ -+ sane_makeflags=$$MFLAGS; \ -+ else \ -+ case $$MAKEFLAGS in \ -+ *\\[\ \ ]*) \ -+ bs=\\; \ -+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -+ esac; \ -+ fi; \ -+ skip_next=no; \ -+ strip_trailopt () \ -+ { \ -+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -+ }; \ -+ for flg in $$sane_makeflags; do \ -+ test $$skip_next = yes && { skip_next=no; continue; }; \ -+ case $$flg in \ -+ *=*|--*) continue;; \ -+ -*I) strip_trailopt 'I'; skip_next=yes;; \ -+ -*I?*) strip_trailopt 'I';; \ -+ -*O) strip_trailopt 'O'; skip_next=yes;; \ -+ -*O?*) strip_trailopt 'O';; \ -+ -*l) strip_trailopt 'l'; skip_next=yes;; \ -+ -*l?*) strip_trailopt 'l';; \ -+ -[dEDm]) skip_next=yes;; \ -+ -[JT]) skip_next=yes;; \ -+ esac; \ -+ case $$flg in \ -+ *$$target_option*) has_opt=yes; break;; \ -+ esac; \ -+ done; \ -+ test $$has_opt = yes -+am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -+am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -34,7 +78,7 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - subdir = src/modules_geostatistics --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ - $(top_srcdir)/m4/ax_python_devel.m4 \ -@@ -49,20 +93,58 @@ mkinstalldirs = $(install_sh) -d - CONFIG_HEADER = $(top_builddir)/config.h - CONFIG_CLEAN_FILES = - CONFIG_CLEAN_VPATH_FILES = -+AM_V_P = $(am__v_P_@AM_V@) -+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -+am__v_P_0 = false -+am__v_P_1 = : -+AM_V_GEN = $(am__v_GEN_@AM_V@) -+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+am__v_GEN_0 = @echo " GEN " $@; -+am__v_GEN_1 = -+AM_V_at = $(am__v_at_@AM_V@) -+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+am__v_at_0 = @ -+am__v_at_1 = - SOURCES = - DIST_SOURCES = --RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ -- html-recursive info-recursive install-data-recursive \ -- install-dvi-recursive install-exec-recursive \ -- install-html-recursive install-info-recursive \ -- install-pdf-recursive install-ps-recursive install-recursive \ -- installcheck-recursive installdirs-recursive pdf-recursive \ -- ps-recursive uninstall-recursive -+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ -+ ctags-recursive dvi-recursive html-recursive info-recursive \ -+ install-data-recursive install-dvi-recursive \ -+ install-exec-recursive install-html-recursive \ -+ install-info-recursive install-pdf-recursive \ -+ install-ps-recursive install-recursive installcheck-recursive \ -+ installdirs-recursive pdf-recursive ps-recursive \ -+ tags-recursive uninstall-recursive -+am__can_run_installinfo = \ -+ case $$AM_UPDATE_INFO_DIR in \ -+ n|no|NO) false;; \ -+ *) (install-info --version) >/dev/null 2>&1;; \ -+ esac - RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ - distclean-recursive maintainer-clean-recursive --AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ -- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ -+am__recursive_targets = \ -+ $(RECURSIVE_TARGETS) \ -+ $(RECURSIVE_CLEAN_TARGETS) \ -+ $(am__extra_recursive_targets) -+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ - distdir -+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -+# Read a list of newline-separated strings from the standard input, -+# and print each of them once, without duplicates. Input order is -+# *not* preserved. -+am__uniquify_input = $(AWK) '\ -+ BEGIN { nonempty = 0; } \ -+ { items[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in items) print i; }; } \ -+' -+# Make sure the list of sources is unique. This is necessary because, -+# e.g., the same source file might be shared among _SOURCES variables -+# for different programs/libraries. -+am__define_uniq_tagged_files = \ -+ list='$(am__tagged_files)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | $(am__uniquify_input)` - ETAGS = etags - CTAGS = ctags - DIST_SUBDIRS = $(SUBDIRS) -@@ -94,6 +176,7 @@ am__relativize = \ - reldir="$$dir2" - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ -+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ -@@ -114,6 +197,7 @@ CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DISABLELIBHARU = @DISABLELIBHARU@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -141,6 +225,7 @@ LOCAL_INCS = @LOCAL_INCS@ - LOCAL_LIBS = @LOCAL_LIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - NM = @NM@ - NMEDIT = @NMEDIT@ -@@ -153,6 +238,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - POW_LIB = @POW_LIB@ -@@ -178,6 +264,7 @@ abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -@@ -211,7 +298,6 @@ libdir = @libdir@ - libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -@@ -273,22 +359,25 @@ clean-libtool: - -rm -rf .libs _libs - - # This directory's subdirectories are mostly independent; you can cd --# into them and run `make' without going through this Makefile. --# To change the values of `make' variables: instead of editing Makefiles, --# (1) if the variable is set in `config.status', edit `config.status' --# (which will cause the Makefiles to be regenerated when you run `make'); --# (2) otherwise, pass the desired values on the `make' command line. --$(RECURSIVE_TARGETS): -- @fail= failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -+# into them and run 'make' without going through this Makefile. -+# To change the values of 'make' variables: instead of editing Makefiles, -+# (1) if the variable is set in 'config.status', edit 'config.status' -+# (which will cause the Makefiles to be regenerated when you run 'make'); -+# (2) otherwise, pass the desired values on the 'make' command line. -+$(am__recursive_targets): -+ @fail=; \ -+ if $(am__make_keepgoing); then \ -+ failcom='fail=yes'; \ -+ else \ -+ failcom='exit 1'; \ -+ fi; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ -- list='$(SUBDIRS)'; for subdir in $$list; do \ -+ case "$@" in \ -+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -+ *) list='$(SUBDIRS)' ;; \ -+ esac; \ -+ for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ -@@ -303,57 +392,12 @@ $(RECURSIVE_TARGETS): - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - --$(RECURSIVE_CLEAN_TARGETS): -- @fail= failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -- dot_seen=no; \ -- case "$@" in \ -- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -- *) list='$(SUBDIRS)' ;; \ -- esac; \ -- rev=''; for subdir in $$list; do \ -- if test "$$subdir" = "."; then :; else \ -- rev="$$subdir $$rev"; \ -- fi; \ -- done; \ -- rev="$$rev ."; \ -- target=`echo $@ | sed s/-recursive//`; \ -- for subdir in $$rev; do \ -- echo "Making $$target in $$subdir"; \ -- if test "$$subdir" = "."; then \ -- local_target="$$target-am"; \ -- else \ -- local_target="$$target"; \ -- fi; \ -- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || eval $$failcom; \ -- done && test -z "$$fail" --tags-recursive: -- list='$(SUBDIRS)'; for subdir in $$list; do \ -- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ -- done --ctags-recursive: -- list='$(SUBDIRS)'; for subdir in $$list; do \ -- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ -- done -+ID: $(am__tagged_files) -+ $(am__define_uniq_tagged_files); mkid -fID $$unique -+tags: tags-recursive -+TAGS: tags - --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ - if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ -@@ -369,12 +413,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ -@@ -386,15 +425,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $$unique; \ - fi; \ - fi --ctags: CTAGS --CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ctags: ctags-recursive -+ -+CTAGS: ctags -+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) -+ $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique -@@ -403,6 +438,21 @@ GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -+cscopelist: cscopelist-recursive -+ -+cscopelist-am: $(am__tagged_files) -+ list='$(am__tagged_files)'; \ -+ case "$(srcdir)" in \ -+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ -+ *) sdir=$(subdir)/$(srcdir) ;; \ -+ esac; \ -+ for i in $$list; do \ -+ if test -f "$$i"; then \ -+ echo "$(subdir)/$$i"; \ -+ else \ -+ echo "$$sdir/$$i"; \ -+ fi; \ -+ done >> $(top_builddir)/cscope.files - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -@@ -439,13 +489,10 @@ distdir: $(DISTFILES) - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test -d "$(distdir)/$$subdir" \ -- || $(MKDIR_P) "$(distdir)/$$subdir" \ -- || exit 1; \ -- fi; \ -- done -- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ -- if test "$$subdir" = .; then :; else \ -+ $(am__make_dryrun) \ -+ || test -d "$(distdir)/$$subdir" \ -+ || $(MKDIR_P) "$(distdir)/$$subdir" \ -+ || exit 1; \ - dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ - $(am__relativize); \ - new_distdir=$$reldir; \ -@@ -480,10 +527,15 @@ install-am: all-am - - installcheck: installcheck-recursive - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+ if test -z '$(STRIP)'; then \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ install; \ -+ else \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -+ fi - mostlyclean-generic: - - clean-generic: -@@ -561,22 +613,20 @@ ps-am: - - uninstall-am: - --.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ -- install-am install-strip tags-recursive -- --.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ -- all all-am check check-am clean clean-generic clean-libtool \ -- ctags ctags-recursive distclean distclean-generic \ -- distclean-libtool distclean-tags distdir dvi dvi-am html \ -- html-am info info-am install install-am install-data \ -- install-data-am install-dvi install-dvi-am install-exec \ -- install-exec-am install-html install-html-am install-info \ -- install-info-am install-man install-pdf install-pdf-am \ -- install-ps install-ps-am install-strip installcheck \ -- installcheck-am installdirs installdirs-am maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-generic \ -- mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ -- uninstall uninstall-am -+.MAKE: $(am__recursive_targets) install-am install-strip -+ -+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ -+ check-am clean clean-generic clean-libtool cscopelist-am ctags \ -+ ctags-am distclean distclean-generic distclean-libtool \ -+ distclean-tags distdir dvi dvi-am html html-am info info-am \ -+ install install-am install-data install-data-am install-dvi \ -+ install-dvi-am install-exec install-exec-am install-html \ -+ install-html-am install-info install-info-am install-man \ -+ install-pdf install-pdf-am install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ installdirs-am maintainer-clean maintainer-clean-generic \ -+ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ -+ ps ps-am tags tags-am uninstall uninstall-am - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff --git a/src/modules_geostatistics/geostatistics/Makefile.in b/src/modules_geostatistics/geostatistics/Makefile.in -index 145f0dc..be0d45a 100644 ---- a/src/modules_geostatistics/geostatistics/Makefile.in -+++ b/src/modules_geostatistics/geostatistics/Makefile.in -@@ -1,9 +1,8 @@ --# Makefile.in generated by automake 1.11.1 from Makefile.am. -+# Makefile.in generated by automake 1.14 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, --# Inc. -+# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+ - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -15,6 +14,51 @@ - - @SET_MAKE@ - VPATH = @srcdir@ -+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -+am__make_running_with_option = \ -+ case $${target_option-} in \ -+ ?) ;; \ -+ *) echo "am__make_running_with_option: internal error: invalid" \ -+ "target option '$${target_option-}' specified" >&2; \ -+ exit 1;; \ -+ esac; \ -+ has_opt=no; \ -+ sane_makeflags=$$MAKEFLAGS; \ -+ if $(am__is_gnu_make); then \ -+ sane_makeflags=$$MFLAGS; \ -+ else \ -+ case $$MAKEFLAGS in \ -+ *\\[\ \ ]*) \ -+ bs=\\; \ -+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -+ esac; \ -+ fi; \ -+ skip_next=no; \ -+ strip_trailopt () \ -+ { \ -+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -+ }; \ -+ for flg in $$sane_makeflags; do \ -+ test $$skip_next = yes && { skip_next=no; continue; }; \ -+ case $$flg in \ -+ *=*|--*) continue;; \ -+ -*I) strip_trailopt 'I'; skip_next=yes;; \ -+ -*I?*) strip_trailopt 'I';; \ -+ -*O) strip_trailopt 'O'; skip_next=yes;; \ -+ -*O?*) strip_trailopt 'O';; \ -+ -*l) strip_trailopt 'l'; skip_next=yes;; \ -+ -*l?*) strip_trailopt 'l';; \ -+ -[dEDm]) skip_next=yes;; \ -+ -[JT]) skip_next=yes;; \ -+ esac; \ -+ case $$flg in \ -+ *$$target_option*) has_opt=yes; break;; \ -+ esac; \ -+ done; \ -+ test $$has_opt = yes -+am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -+am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -34,7 +78,7 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - subdir = src/modules_geostatistics/geostatistics --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ - $(top_srcdir)/m4/ax_python_devel.m4 \ -@@ -49,20 +93,58 @@ mkinstalldirs = $(install_sh) -d - CONFIG_HEADER = $(top_builddir)/config.h - CONFIG_CLEAN_FILES = - CONFIG_CLEAN_VPATH_FILES = -+AM_V_P = $(am__v_P_@AM_V@) -+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -+am__v_P_0 = false -+am__v_P_1 = : -+AM_V_GEN = $(am__v_GEN_@AM_V@) -+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+am__v_GEN_0 = @echo " GEN " $@; -+am__v_GEN_1 = -+AM_V_at = $(am__v_at_@AM_V@) -+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+am__v_at_0 = @ -+am__v_at_1 = - SOURCES = - DIST_SOURCES = --RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ -- html-recursive info-recursive install-data-recursive \ -- install-dvi-recursive install-exec-recursive \ -- install-html-recursive install-info-recursive \ -- install-pdf-recursive install-ps-recursive install-recursive \ -- installcheck-recursive installdirs-recursive pdf-recursive \ -- ps-recursive uninstall-recursive -+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ -+ ctags-recursive dvi-recursive html-recursive info-recursive \ -+ install-data-recursive install-dvi-recursive \ -+ install-exec-recursive install-html-recursive \ -+ install-info-recursive install-pdf-recursive \ -+ install-ps-recursive install-recursive installcheck-recursive \ -+ installdirs-recursive pdf-recursive ps-recursive \ -+ tags-recursive uninstall-recursive -+am__can_run_installinfo = \ -+ case $$AM_UPDATE_INFO_DIR in \ -+ n|no|NO) false;; \ -+ *) (install-info --version) >/dev/null 2>&1;; \ -+ esac - RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ - distclean-recursive maintainer-clean-recursive --AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ -- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ -+am__recursive_targets = \ -+ $(RECURSIVE_TARGETS) \ -+ $(RECURSIVE_CLEAN_TARGETS) \ -+ $(am__extra_recursive_targets) -+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ - distdir -+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -+# Read a list of newline-separated strings from the standard input, -+# and print each of them once, without duplicates. Input order is -+# *not* preserved. -+am__uniquify_input = $(AWK) '\ -+ BEGIN { nonempty = 0; } \ -+ { items[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in items) print i; }; } \ -+' -+# Make sure the list of sources is unique. This is necessary because, -+# e.g., the same source file might be shared among _SOURCES variables -+# for different programs/libraries. -+am__define_uniq_tagged_files = \ -+ list='$(am__tagged_files)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | $(am__uniquify_input)` - ETAGS = etags - CTAGS = ctags - DIST_SUBDIRS = geostatistics_points geostatistics_grid \ -@@ -95,6 +177,7 @@ am__relativize = \ - reldir="$$dir2" - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ -+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ -@@ -115,6 +198,7 @@ CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DISABLELIBHARU = @DISABLELIBHARU@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -142,6 +226,7 @@ LOCAL_INCS = @LOCAL_INCS@ - LOCAL_LIBS = @LOCAL_LIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - NM = @NM@ - NMEDIT = @NMEDIT@ -@@ -154,6 +239,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - POW_LIB = @POW_LIB@ -@@ -179,6 +265,7 @@ abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -@@ -212,7 +299,6 @@ libdir = @libdir@ - libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -@@ -275,22 +361,25 @@ clean-libtool: - -rm -rf .libs _libs - - # This directory's subdirectories are mostly independent; you can cd --# into them and run `make' without going through this Makefile. --# To change the values of `make' variables: instead of editing Makefiles, --# (1) if the variable is set in `config.status', edit `config.status' --# (which will cause the Makefiles to be regenerated when you run `make'); --# (2) otherwise, pass the desired values on the `make' command line. --$(RECURSIVE_TARGETS): -- @fail= failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -+# into them and run 'make' without going through this Makefile. -+# To change the values of 'make' variables: instead of editing Makefiles, -+# (1) if the variable is set in 'config.status', edit 'config.status' -+# (which will cause the Makefiles to be regenerated when you run 'make'); -+# (2) otherwise, pass the desired values on the 'make' command line. -+$(am__recursive_targets): -+ @fail=; \ -+ if $(am__make_keepgoing); then \ -+ failcom='fail=yes'; \ -+ else \ -+ failcom='exit 1'; \ -+ fi; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ -- list='$(SUBDIRS)'; for subdir in $$list; do \ -+ case "$@" in \ -+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -+ *) list='$(SUBDIRS)' ;; \ -+ esac; \ -+ for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ -@@ -305,57 +394,12 @@ $(RECURSIVE_TARGETS): - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - --$(RECURSIVE_CLEAN_TARGETS): -- @fail= failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -- dot_seen=no; \ -- case "$@" in \ -- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -- *) list='$(SUBDIRS)' ;; \ -- esac; \ -- rev=''; for subdir in $$list; do \ -- if test "$$subdir" = "."; then :; else \ -- rev="$$subdir $$rev"; \ -- fi; \ -- done; \ -- rev="$$rev ."; \ -- target=`echo $@ | sed s/-recursive//`; \ -- for subdir in $$rev; do \ -- echo "Making $$target in $$subdir"; \ -- if test "$$subdir" = "."; then \ -- local_target="$$target-am"; \ -- else \ -- local_target="$$target"; \ -- fi; \ -- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || eval $$failcom; \ -- done && test -z "$$fail" --tags-recursive: -- list='$(SUBDIRS)'; for subdir in $$list; do \ -- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ -- done --ctags-recursive: -- list='$(SUBDIRS)'; for subdir in $$list; do \ -- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ -- done -+ID: $(am__tagged_files) -+ $(am__define_uniq_tagged_files); mkid -fID $$unique -+tags: tags-recursive -+TAGS: tags - --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ - if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ -@@ -371,12 +415,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ -@@ -388,15 +427,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $$unique; \ - fi; \ - fi --ctags: CTAGS --CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ctags: ctags-recursive -+ -+CTAGS: ctags -+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) -+ $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique -@@ -405,6 +440,21 @@ GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -+cscopelist: cscopelist-recursive -+ -+cscopelist-am: $(am__tagged_files) -+ list='$(am__tagged_files)'; \ -+ case "$(srcdir)" in \ -+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ -+ *) sdir=$(subdir)/$(srcdir) ;; \ -+ esac; \ -+ for i in $$list; do \ -+ if test -f "$$i"; then \ -+ echo "$(subdir)/$$i"; \ -+ else \ -+ echo "$$sdir/$$i"; \ -+ fi; \ -+ done >> $(top_builddir)/cscope.files - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -@@ -441,13 +491,10 @@ distdir: $(DISTFILES) - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test -d "$(distdir)/$$subdir" \ -- || $(MKDIR_P) "$(distdir)/$$subdir" \ -- || exit 1; \ -- fi; \ -- done -- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ -- if test "$$subdir" = .; then :; else \ -+ $(am__make_dryrun) \ -+ || test -d "$(distdir)/$$subdir" \ -+ || $(MKDIR_P) "$(distdir)/$$subdir" \ -+ || exit 1; \ - dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ - $(am__relativize); \ - new_distdir=$$reldir; \ -@@ -482,10 +529,15 @@ install-am: all-am - - installcheck: installcheck-recursive - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+ if test -z '$(STRIP)'; then \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ install; \ -+ else \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -+ fi - mostlyclean-generic: - - clean-generic: -@@ -563,22 +615,20 @@ ps-am: - - uninstall-am: - --.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ -- install-am install-strip tags-recursive -- --.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ -- all all-am check check-am clean clean-generic clean-libtool \ -- ctags ctags-recursive distclean distclean-generic \ -- distclean-libtool distclean-tags distdir dvi dvi-am html \ -- html-am info info-am install install-am install-data \ -- install-data-am install-dvi install-dvi-am install-exec \ -- install-exec-am install-html install-html-am install-info \ -- install-info-am install-man install-pdf install-pdf-am \ -- install-ps install-ps-am install-strip installcheck \ -- installcheck-am installdirs installdirs-am maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-generic \ -- mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ -- uninstall uninstall-am -+.MAKE: $(am__recursive_targets) install-am install-strip -+ -+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ -+ check-am clean clean-generic clean-libtool cscopelist-am ctags \ -+ ctags-am distclean distclean-generic distclean-libtool \ -+ distclean-tags distdir dvi dvi-am html html-am info info-am \ -+ install install-am install-data install-data-am install-dvi \ -+ install-dvi-am install-exec install-exec-am install-html \ -+ install-html-am install-info install-info-am install-man \ -+ install-pdf install-pdf-am install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ installdirs-am maintainer-clean maintainer-clean-generic \ -+ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ -+ ps ps-am tags tags-am uninstall uninstall-am - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff --git a/src/modules_geostatistics/geostatistics/geostatistics_grid/Makefile.in b/src/modules_geostatistics/geostatistics/geostatistics_grid/Makefile.in -index e07a374..fe34e52 100644 ---- a/src/modules_geostatistics/geostatistics/geostatistics_grid/Makefile.in -+++ b/src/modules_geostatistics/geostatistics/geostatistics_grid/Makefile.in -@@ -1,9 +1,8 @@ --# Makefile.in generated by automake 1.11.1 from Makefile.am. -+# Makefile.in generated by automake 1.14 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, --# Inc. -+# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+ - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -16,6 +15,51 @@ - @SET_MAKE@ - - VPATH = @srcdir@ -+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -+am__make_running_with_option = \ -+ case $${target_option-} in \ -+ ?) ;; \ -+ *) echo "am__make_running_with_option: internal error: invalid" \ -+ "target option '$${target_option-}' specified" >&2; \ -+ exit 1;; \ -+ esac; \ -+ has_opt=no; \ -+ sane_makeflags=$$MAKEFLAGS; \ -+ if $(am__is_gnu_make); then \ -+ sane_makeflags=$$MFLAGS; \ -+ else \ -+ case $$MAKEFLAGS in \ -+ *\\[\ \ ]*) \ -+ bs=\\; \ -+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -+ esac; \ -+ fi; \ -+ skip_next=no; \ -+ strip_trailopt () \ -+ { \ -+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -+ }; \ -+ for flg in $$sane_makeflags; do \ -+ test $$skip_next = yes && { skip_next=no; continue; }; \ -+ case $$flg in \ -+ *=*|--*) continue;; \ -+ -*I) strip_trailopt 'I'; skip_next=yes;; \ -+ -*I?*) strip_trailopt 'I';; \ -+ -*O) strip_trailopt 'O'; skip_next=yes;; \ -+ -*O?*) strip_trailopt 'O';; \ -+ -*l) strip_trailopt 'l'; skip_next=yes;; \ -+ -*l?*) strip_trailopt 'l';; \ -+ -[dEDm]) skip_next=yes;; \ -+ -[JT]) skip_next=yes;; \ -+ esac; \ -+ case $$flg in \ -+ *$$target_option*) has_opt=yes; break;; \ -+ esac; \ -+ done; \ -+ test $$has_opt = yes -+am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -+am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -35,7 +79,8 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - subdir = src/modules_geostatistics/geostatistics/geostatistics_grid --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ -+ $(top_srcdir)/depcomp - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ - $(top_srcdir)/m4/ax_python_devel.m4 \ -@@ -71,6 +116,12 @@ am__nobase_list = $(am__nobase_strip_setup); \ - am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -+am__uninstall_files_from_dir = { \ -+ test -z "$$files" \ -+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ -+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ -+ $(am__cd) "$$dir" && rm -f $$files; }; \ -+ } - am__installdirs = "$(DESTDIR)$(pkglibdir)" - LTLIBRARIES = $(pkglib_LTLIBRARIES) - libgeostatistics_grid_la_DEPENDENCIES = \ -@@ -83,35 +134,92 @@ am_libgeostatistics_grid_la_OBJECTS = fast_representativeness.lo \ - MLB_Interface.lo - libgeostatistics_grid_la_OBJECTS = \ - $(am_libgeostatistics_grid_la_OBJECTS) -+AM_V_lt = $(am__v_lt_@AM_V@) -+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -+am__v_lt_0 = --silent -+am__v_lt_1 = -+AM_V_P = $(am__v_P_@AM_V@) -+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -+am__v_P_0 = false -+am__v_P_1 = : -+AM_V_GEN = $(am__v_GEN_@AM_V@) -+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+am__v_GEN_0 = @echo " GEN " $@; -+am__v_GEN_1 = -+AM_V_at = $(am__v_at_@AM_V@) -+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+am__v_at_0 = @ -+am__v_at_1 = - DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - am__mv = mv -f - CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) --LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CXXFLAGS) $(CXXFLAGS) -+AM_V_CXX = $(am__v_CXX_@AM_V@) -+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) -+am__v_CXX_0 = @echo " CXX " $@; -+am__v_CXX_1 = - CXXLD = $(CXX) --CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ -+ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) -+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) -+am__v_CXXLD_0 = @echo " CXXLD " $@; -+am__v_CXXLD_1 = - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CFLAGS) $(CFLAGS) -+AM_V_CC = $(am__v_CC_@AM_V@) -+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -+am__v_CC_0 = @echo " CC " $@; -+am__v_CC_1 = - CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CCLD = $(am__v_CCLD_@AM_V@) -+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -+am__v_CCLD_0 = @echo " CCLD " $@; -+am__v_CCLD_1 = - SOURCES = $(libgeostatistics_grid_la_SOURCES) - DIST_SOURCES = $(libgeostatistics_grid_la_SOURCES) -+am__can_run_installinfo = \ -+ case $$AM_UPDATE_INFO_DIR in \ -+ n|no|NO) false;; \ -+ *) (install-info --version) >/dev/null 2>&1;; \ -+ esac -+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -+# Read a list of newline-separated strings from the standard input, -+# and print each of them once, without duplicates. Input order is -+# *not* preserved. -+am__uniquify_input = $(AWK) '\ -+ BEGIN { nonempty = 0; } \ -+ { items[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in items) print i; }; } \ -+' -+# Make sure the list of sources is unique. This is necessary because, -+# e.g., the same source file might be shared among _SOURCES variables -+# for different programs/libraries. -+am__define_uniq_tagged_files = \ -+ list='$(am__tagged_files)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | $(am__uniquify_input)` - ETAGS = etags - CTAGS = ctags - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ -+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ -@@ -132,6 +240,7 @@ CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DISABLELIBHARU = @DISABLELIBHARU@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -159,6 +268,7 @@ LOCAL_INCS = @LOCAL_INCS@ - LOCAL_LIBS = @LOCAL_LIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - NM = @NM@ - NMEDIT = @NMEDIT@ -@@ -171,6 +281,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - POW_LIB = @POW_LIB@ -@@ -196,6 +307,7 @@ abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -@@ -229,7 +341,6 @@ libdir = @libdir@ - libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -@@ -321,9 +432,9 @@ $(top_srcdir)/configure: $(am__configure_deps) - $(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - $(am__aclocal_m4_deps): -+ - install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" - @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ - list2=; for p in $$list; do \ - if test -f $$p; then \ -@@ -331,6 +442,8 @@ install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - else :; fi; \ - done; \ - test -z "$$list2" || { \ -+ echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \ -+ $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \ - } -@@ -346,14 +459,17 @@ uninstall-pkglibLTLIBRARIES: - - clean-pkglibLTLIBRARIES: - -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES) -- @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \ -- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -- echo "rm -f \"$${dir}/so_locations\""; \ -- rm -f "$${dir}/so_locations"; \ -- done --libgeostatistics_grid.la: $(libgeostatistics_grid_la_OBJECTS) $(libgeostatistics_grid_la_DEPENDENCIES) -- $(CXXLINK) -rpath $(pkglibdir) $(libgeostatistics_grid_la_OBJECTS) $(libgeostatistics_grid_la_LIBADD) $(LIBS) -+ @list='$(pkglib_LTLIBRARIES)'; \ -+ locs=`for p in $$list; do echo $$p; done | \ -+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ -+ sort -u`; \ -+ test -z "$$locs" || { \ -+ echo rm -f $${locs}; \ -+ rm -f $${locs}; \ -+ } -+ -+libgeostatistics_grid.la: $(libgeostatistics_grid_la_OBJECTS) $(libgeostatistics_grid_la_DEPENDENCIES) $(EXTRA_libgeostatistics_grid_la_DEPENDENCIES) -+ $(AM_V_CXXLD)$(CXXLINK) -rpath $(pkglibdir) $(libgeostatistics_grid_la_OBJECTS) $(libgeostatistics_grid_la_LIBADD) $(LIBS) - - mostlyclean-compile: - -rm -f *.$(OBJEXT) -@@ -375,25 +491,25 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/multiband_variation.Plo@am__quote@ - - .cpp.o: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< - - .cpp.obj: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - - .cpp.lo: --@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< - - mostlyclean-libtool: - -rm -f *.lo -@@ -401,26 +517,15 @@ mostlyclean-libtool: - clean-libtool: - -rm -rf .libs _libs - --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -+ID: $(am__tagged_files) -+ $(am__define_uniq_tagged_files); mkid -fID $$unique -+tags: tags-am -+TAGS: tags -+ -+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ -@@ -432,15 +537,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $$unique; \ - fi; \ - fi --ctags: CTAGS --CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ctags: ctags-am -+ -+CTAGS: ctags -+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) -+ $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique -@@ -449,6 +550,21 @@ GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -+cscopelist: cscopelist-am -+ -+cscopelist-am: $(am__tagged_files) -+ list='$(am__tagged_files)'; \ -+ case "$(srcdir)" in \ -+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ -+ *) sdir=$(subdir)/$(srcdir) ;; \ -+ esac; \ -+ for i in $$list; do \ -+ if test -f "$$i"; then \ -+ echo "$(subdir)/$$i"; \ -+ else \ -+ echo "$$sdir/$$i"; \ -+ fi; \ -+ done >> $(top_builddir)/cscope.files - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -@@ -500,10 +616,15 @@ install-am: all-am - - installcheck: installcheck-am - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+ if test -z '$(STRIP)'; then \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ install; \ -+ else \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -+ fi - mostlyclean-generic: - - clean-generic: -@@ -588,19 +709,20 @@ uninstall-am: uninstall-pkglibLTLIBRARIES - - .MAKE: install-am install-strip - --.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ -- clean-libtool clean-pkglibLTLIBRARIES ctags distclean \ -- distclean-compile distclean-generic distclean-libtool \ -- distclean-tags distdir dvi dvi-am html html-am info info-am \ -- install install-am install-data install-data-am install-dvi \ -- install-dvi-am install-exec install-exec-am install-html \ -- install-html-am install-info install-info-am install-man \ -- install-pdf install-pdf-am install-pkglibLTLIBRARIES \ -- install-ps install-ps-am install-strip installcheck \ -- installcheck-am installdirs maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-compile \ -- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -- tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES -+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ -+ clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \ -+ ctags-am distclean distclean-compile distclean-generic \ -+ distclean-libtool distclean-tags distdir dvi dvi-am html \ -+ html-am info info-am install install-am install-data \ -+ install-data-am install-dvi install-dvi-am install-exec \ -+ install-exec-am install-html install-html-am install-info \ -+ install-info-am install-man install-pdf install-pdf-am \ -+ install-pkglibLTLIBRARIES install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ maintainer-clean maintainer-clean-generic mostlyclean \ -+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ -+ pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ -+ uninstall-pkglibLTLIBRARIES - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff --git a/src/modules_geostatistics/geostatistics/geostatistics_kriging/Makefile.in b/src/modules_geostatistics/geostatistics/geostatistics_kriging/Makefile.in -index 9e84e74..16f1d53 100644 ---- a/src/modules_geostatistics/geostatistics/geostatistics_kriging/Makefile.in -+++ b/src/modules_geostatistics/geostatistics/geostatistics_kriging/Makefile.in -@@ -1,9 +1,8 @@ --# Makefile.in generated by automake 1.11.1 from Makefile.am. -+# Makefile.in generated by automake 1.14 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, --# Inc. -+# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+ - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -16,6 +15,51 @@ - @SET_MAKE@ - - VPATH = @srcdir@ -+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -+am__make_running_with_option = \ -+ case $${target_option-} in \ -+ ?) ;; \ -+ *) echo "am__make_running_with_option: internal error: invalid" \ -+ "target option '$${target_option-}' specified" >&2; \ -+ exit 1;; \ -+ esac; \ -+ has_opt=no; \ -+ sane_makeflags=$$MAKEFLAGS; \ -+ if $(am__is_gnu_make); then \ -+ sane_makeflags=$$MFLAGS; \ -+ else \ -+ case $$MAKEFLAGS in \ -+ *\\[\ \ ]*) \ -+ bs=\\; \ -+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -+ esac; \ -+ fi; \ -+ skip_next=no; \ -+ strip_trailopt () \ -+ { \ -+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -+ }; \ -+ for flg in $$sane_makeflags; do \ -+ test $$skip_next = yes && { skip_next=no; continue; }; \ -+ case $$flg in \ -+ *=*|--*) continue;; \ -+ -*I) strip_trailopt 'I'; skip_next=yes;; \ -+ -*I?*) strip_trailopt 'I';; \ -+ -*O) strip_trailopt 'O'; skip_next=yes;; \ -+ -*O?*) strip_trailopt 'O';; \ -+ -*l) strip_trailopt 'l'; skip_next=yes;; \ -+ -*l?*) strip_trailopt 'l';; \ -+ -[dEDm]) skip_next=yes;; \ -+ -[JT]) skip_next=yes;; \ -+ esac; \ -+ case $$flg in \ -+ *$$target_option*) has_opt=yes; break;; \ -+ esac; \ -+ done; \ -+ test $$has_opt = yes -+am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -+am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -36,7 +80,8 @@ build_triplet = @build@ - host_triplet = @host@ - subdir = \ - src/modules_geostatistics/geostatistics/geostatistics_kriging --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ -+ $(top_srcdir)/depcomp - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ - $(top_srcdir)/m4/ax_python_devel.m4 \ -@@ -72,6 +117,12 @@ am__nobase_list = $(am__nobase_strip_setup); \ - am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -+am__uninstall_files_from_dir = { \ -+ test -z "$$files" \ -+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ -+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ -+ $(am__cd) "$$dir" && rm -f $$files; }; \ -+ } - am__installdirs = "$(DESTDIR)$(pkglibdir)" - LTLIBRARIES = $(pkglib_LTLIBRARIES) - libgeostatistics_kriging_la_DEPENDENCIES = \ -@@ -85,35 +136,92 @@ am_libgeostatistics_kriging_la_OBJECTS = _kriging_base.lo \ - MLB_Interface.lo semivariogram.lo variogram_dialog.lo - libgeostatistics_kriging_la_OBJECTS = \ - $(am_libgeostatistics_kriging_la_OBJECTS) -+AM_V_lt = $(am__v_lt_@AM_V@) -+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -+am__v_lt_0 = --silent -+am__v_lt_1 = -+AM_V_P = $(am__v_P_@AM_V@) -+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -+am__v_P_0 = false -+am__v_P_1 = : -+AM_V_GEN = $(am__v_GEN_@AM_V@) -+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+am__v_GEN_0 = @echo " GEN " $@; -+am__v_GEN_1 = -+AM_V_at = $(am__v_at_@AM_V@) -+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+am__v_at_0 = @ -+am__v_at_1 = - DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - am__mv = mv -f - CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) --LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CXXFLAGS) $(CXXFLAGS) -+AM_V_CXX = $(am__v_CXX_@AM_V@) -+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) -+am__v_CXX_0 = @echo " CXX " $@; -+am__v_CXX_1 = - CXXLD = $(CXX) --CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ -+ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) -+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) -+am__v_CXXLD_0 = @echo " CXXLD " $@; -+am__v_CXXLD_1 = - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CFLAGS) $(CFLAGS) -+AM_V_CC = $(am__v_CC_@AM_V@) -+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -+am__v_CC_0 = @echo " CC " $@; -+am__v_CC_1 = - CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CCLD = $(am__v_CCLD_@AM_V@) -+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -+am__v_CCLD_0 = @echo " CCLD " $@; -+am__v_CCLD_1 = - SOURCES = $(libgeostatistics_kriging_la_SOURCES) - DIST_SOURCES = $(libgeostatistics_kriging_la_SOURCES) -+am__can_run_installinfo = \ -+ case $$AM_UPDATE_INFO_DIR in \ -+ n|no|NO) false;; \ -+ *) (install-info --version) >/dev/null 2>&1;; \ -+ esac -+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -+# Read a list of newline-separated strings from the standard input, -+# and print each of them once, without duplicates. Input order is -+# *not* preserved. -+am__uniquify_input = $(AWK) '\ -+ BEGIN { nonempty = 0; } \ -+ { items[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in items) print i; }; } \ -+' -+# Make sure the list of sources is unique. This is necessary because, -+# e.g., the same source file might be shared among _SOURCES variables -+# for different programs/libraries. -+am__define_uniq_tagged_files = \ -+ list='$(am__tagged_files)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | $(am__uniquify_input)` - ETAGS = etags - CTAGS = ctags - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ -+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ -@@ -134,6 +242,7 @@ CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DISABLELIBHARU = @DISABLELIBHARU@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -161,6 +270,7 @@ LOCAL_INCS = @LOCAL_INCS@ - LOCAL_LIBS = @LOCAL_LIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - NM = @NM@ - NMEDIT = @NMEDIT@ -@@ -173,6 +283,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - POW_LIB = @POW_LIB@ -@@ -198,6 +309,7 @@ abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -@@ -231,7 +343,6 @@ libdir = @libdir@ - libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -@@ -324,9 +435,9 @@ $(top_srcdir)/configure: $(am__configure_deps) - $(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - $(am__aclocal_m4_deps): -+ - install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" - @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ - list2=; for p in $$list; do \ - if test -f $$p; then \ -@@ -334,6 +445,8 @@ install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - else :; fi; \ - done; \ - test -z "$$list2" || { \ -+ echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \ -+ $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \ - } -@@ -349,14 +462,17 @@ uninstall-pkglibLTLIBRARIES: - - clean-pkglibLTLIBRARIES: - -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES) -- @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \ -- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -- echo "rm -f \"$${dir}/so_locations\""; \ -- rm -f "$${dir}/so_locations"; \ -- done --libgeostatistics_kriging.la: $(libgeostatistics_kriging_la_OBJECTS) $(libgeostatistics_kriging_la_DEPENDENCIES) -- $(CXXLINK) -rpath $(pkglibdir) $(libgeostatistics_kriging_la_OBJECTS) $(libgeostatistics_kriging_la_LIBADD) $(LIBS) -+ @list='$(pkglib_LTLIBRARIES)'; \ -+ locs=`for p in $$list; do echo $$p; done | \ -+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ -+ sort -u`; \ -+ test -z "$$locs" || { \ -+ echo rm -f $${locs}; \ -+ rm -f $${locs}; \ -+ } -+ -+libgeostatistics_kriging.la: $(libgeostatistics_kriging_la_OBJECTS) $(libgeostatistics_kriging_la_DEPENDENCIES) $(EXTRA_libgeostatistics_kriging_la_DEPENDENCIES) -+ $(AM_V_CXXLD)$(CXXLINK) -rpath $(pkglibdir) $(libgeostatistics_kriging_la_OBJECTS) $(libgeostatistics_kriging_la_LIBADD) $(LIBS) - - mostlyclean-compile: - -rm -f *.$(OBJEXT) -@@ -379,25 +495,25 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/variogram_dialog.Plo@am__quote@ - - .cpp.o: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< - - .cpp.obj: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - - .cpp.lo: --@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< - - mostlyclean-libtool: - -rm -f *.lo -@@ -405,26 +521,15 @@ mostlyclean-libtool: - clean-libtool: - -rm -rf .libs _libs - --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -+ID: $(am__tagged_files) -+ $(am__define_uniq_tagged_files); mkid -fID $$unique -+tags: tags-am -+TAGS: tags -+ -+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ -@@ -436,15 +541,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $$unique; \ - fi; \ - fi --ctags: CTAGS --CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ctags: ctags-am -+ -+CTAGS: ctags -+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) -+ $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique -@@ -453,6 +554,21 @@ GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -+cscopelist: cscopelist-am -+ -+cscopelist-am: $(am__tagged_files) -+ list='$(am__tagged_files)'; \ -+ case "$(srcdir)" in \ -+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ -+ *) sdir=$(subdir)/$(srcdir) ;; \ -+ esac; \ -+ for i in $$list; do \ -+ if test -f "$$i"; then \ -+ echo "$(subdir)/$$i"; \ -+ else \ -+ echo "$$sdir/$$i"; \ -+ fi; \ -+ done >> $(top_builddir)/cscope.files - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -@@ -504,10 +620,15 @@ install-am: all-am - - installcheck: installcheck-am - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+ if test -z '$(STRIP)'; then \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ install; \ -+ else \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -+ fi - mostlyclean-generic: - - clean-generic: -@@ -592,19 +713,20 @@ uninstall-am: uninstall-pkglibLTLIBRARIES - - .MAKE: install-am install-strip - --.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ -- clean-libtool clean-pkglibLTLIBRARIES ctags distclean \ -- distclean-compile distclean-generic distclean-libtool \ -- distclean-tags distdir dvi dvi-am html html-am info info-am \ -- install install-am install-data install-data-am install-dvi \ -- install-dvi-am install-exec install-exec-am install-html \ -- install-html-am install-info install-info-am install-man \ -- install-pdf install-pdf-am install-pkglibLTLIBRARIES \ -- install-ps install-ps-am install-strip installcheck \ -- installcheck-am installdirs maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-compile \ -- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -- tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES -+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ -+ clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \ -+ ctags-am distclean distclean-compile distclean-generic \ -+ distclean-libtool distclean-tags distdir dvi dvi-am html \ -+ html-am info info-am install install-am install-data \ -+ install-data-am install-dvi install-dvi-am install-exec \ -+ install-exec-am install-html install-html-am install-info \ -+ install-info-am install-man install-pdf install-pdf-am \ -+ install-pkglibLTLIBRARIES install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ maintainer-clean maintainer-clean-generic mostlyclean \ -+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ -+ pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ -+ uninstall-pkglibLTLIBRARIES - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff --git a/src/modules_geostatistics/geostatistics/geostatistics_points/Makefile.in b/src/modules_geostatistics/geostatistics/geostatistics_points/Makefile.in -index b71455c..2fe25ad 100644 ---- a/src/modules_geostatistics/geostatistics/geostatistics_points/Makefile.in -+++ b/src/modules_geostatistics/geostatistics/geostatistics_points/Makefile.in -@@ -1,9 +1,8 @@ --# Makefile.in generated by automake 1.11.1 from Makefile.am. -+# Makefile.in generated by automake 1.14 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, --# Inc. -+# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+ - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -16,6 +15,51 @@ - @SET_MAKE@ - - VPATH = @srcdir@ -+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -+am__make_running_with_option = \ -+ case $${target_option-} in \ -+ ?) ;; \ -+ *) echo "am__make_running_with_option: internal error: invalid" \ -+ "target option '$${target_option-}' specified" >&2; \ -+ exit 1;; \ -+ esac; \ -+ has_opt=no; \ -+ sane_makeflags=$$MAKEFLAGS; \ -+ if $(am__is_gnu_make); then \ -+ sane_makeflags=$$MFLAGS; \ -+ else \ -+ case $$MAKEFLAGS in \ -+ *\\[\ \ ]*) \ -+ bs=\\; \ -+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -+ esac; \ -+ fi; \ -+ skip_next=no; \ -+ strip_trailopt () \ -+ { \ -+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -+ }; \ -+ for flg in $$sane_makeflags; do \ -+ test $$skip_next = yes && { skip_next=no; continue; }; \ -+ case $$flg in \ -+ *=*|--*) continue;; \ -+ -*I) strip_trailopt 'I'; skip_next=yes;; \ -+ -*I?*) strip_trailopt 'I';; \ -+ -*O) strip_trailopt 'O'; skip_next=yes;; \ -+ -*O?*) strip_trailopt 'O';; \ -+ -*l) strip_trailopt 'l'; skip_next=yes;; \ -+ -*l?*) strip_trailopt 'l';; \ -+ -[dEDm]) skip_next=yes;; \ -+ -[JT]) skip_next=yes;; \ -+ esac; \ -+ case $$flg in \ -+ *$$target_option*) has_opt=yes; break;; \ -+ esac; \ -+ done; \ -+ test $$has_opt = yes -+am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -+am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -35,7 +79,8 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - subdir = src/modules_geostatistics/geostatistics/geostatistics_points --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ -+ $(top_srcdir)/depcomp - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ - $(top_srcdir)/m4/ax_python_devel.m4 \ -@@ -71,6 +116,12 @@ am__nobase_list = $(am__nobase_strip_setup); \ - am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -+am__uninstall_files_from_dir = { \ -+ test -z "$$files" \ -+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ -+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ -+ $(am__cd) "$$dir" && rm -f $$files; }; \ -+ } - am__installdirs = "$(DESTDIR)$(pkglibdir)" - LTLIBRARIES = $(pkglib_LTLIBRARIES) - libgeostatistics_points_la_DEPENDENCIES = \ -@@ -81,35 +132,92 @@ am_libgeostatistics_points_la_OBJECTS = GSPoints_Distances.lo \ - MLB_Interface.lo - libgeostatistics_points_la_OBJECTS = \ - $(am_libgeostatistics_points_la_OBJECTS) -+AM_V_lt = $(am__v_lt_@AM_V@) -+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -+am__v_lt_0 = --silent -+am__v_lt_1 = -+AM_V_P = $(am__v_P_@AM_V@) -+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -+am__v_P_0 = false -+am__v_P_1 = : -+AM_V_GEN = $(am__v_GEN_@AM_V@) -+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+am__v_GEN_0 = @echo " GEN " $@; -+am__v_GEN_1 = -+AM_V_at = $(am__v_at_@AM_V@) -+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+am__v_at_0 = @ -+am__v_at_1 = - DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - am__mv = mv -f - CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) --LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CXXFLAGS) $(CXXFLAGS) -+AM_V_CXX = $(am__v_CXX_@AM_V@) -+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) -+am__v_CXX_0 = @echo " CXX " $@; -+am__v_CXX_1 = - CXXLD = $(CXX) --CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ -+ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) -+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) -+am__v_CXXLD_0 = @echo " CXXLD " $@; -+am__v_CXXLD_1 = - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CFLAGS) $(CFLAGS) -+AM_V_CC = $(am__v_CC_@AM_V@) -+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -+am__v_CC_0 = @echo " CC " $@; -+am__v_CC_1 = - CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CCLD = $(am__v_CCLD_@AM_V@) -+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -+am__v_CCLD_0 = @echo " CCLD " $@; -+am__v_CCLD_1 = - SOURCES = $(libgeostatistics_points_la_SOURCES) - DIST_SOURCES = $(libgeostatistics_points_la_SOURCES) -+am__can_run_installinfo = \ -+ case $$AM_UPDATE_INFO_DIR in \ -+ n|no|NO) false;; \ -+ *) (install-info --version) >/dev/null 2>&1;; \ -+ esac -+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -+# Read a list of newline-separated strings from the standard input, -+# and print each of them once, without duplicates. Input order is -+# *not* preserved. -+am__uniquify_input = $(AWK) '\ -+ BEGIN { nonempty = 0; } \ -+ { items[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in items) print i; }; } \ -+' -+# Make sure the list of sources is unique. This is necessary because, -+# e.g., the same source file might be shared among _SOURCES variables -+# for different programs/libraries. -+am__define_uniq_tagged_files = \ -+ list='$(am__tagged_files)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | $(am__uniquify_input)` - ETAGS = etags - CTAGS = ctags - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ -+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ -@@ -130,6 +238,7 @@ CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DISABLELIBHARU = @DISABLELIBHARU@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -157,6 +266,7 @@ LOCAL_INCS = @LOCAL_INCS@ - LOCAL_LIBS = @LOCAL_LIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - NM = @NM@ - NMEDIT = @NMEDIT@ -@@ -169,6 +279,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - POW_LIB = @POW_LIB@ -@@ -194,6 +305,7 @@ abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -@@ -227,7 +339,6 @@ libdir = @libdir@ - libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -@@ -307,9 +418,9 @@ $(top_srcdir)/configure: $(am__configure_deps) - $(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - $(am__aclocal_m4_deps): -+ - install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" - @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ - list2=; for p in $$list; do \ - if test -f $$p; then \ -@@ -317,6 +428,8 @@ install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - else :; fi; \ - done; \ - test -z "$$list2" || { \ -+ echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \ -+ $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \ - } -@@ -332,14 +445,17 @@ uninstall-pkglibLTLIBRARIES: - - clean-pkglibLTLIBRARIES: - -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES) -- @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \ -- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -- echo "rm -f \"$${dir}/so_locations\""; \ -- rm -f "$${dir}/so_locations"; \ -- done --libgeostatistics_points.la: $(libgeostatistics_points_la_OBJECTS) $(libgeostatistics_points_la_DEPENDENCIES) -- $(CXXLINK) -rpath $(pkglibdir) $(libgeostatistics_points_la_OBJECTS) $(libgeostatistics_points_la_LIBADD) $(LIBS) -+ @list='$(pkglib_LTLIBRARIES)'; \ -+ locs=`for p in $$list; do echo $$p; done | \ -+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ -+ sort -u`; \ -+ test -z "$$locs" || { \ -+ echo rm -f $${locs}; \ -+ rm -f $${locs}; \ -+ } -+ -+libgeostatistics_points.la: $(libgeostatistics_points_la_OBJECTS) $(libgeostatistics_points_la_DEPENDENCIES) $(EXTRA_libgeostatistics_points_la_DEPENDENCIES) -+ $(AM_V_CXXLD)$(CXXLINK) -rpath $(pkglibdir) $(libgeostatistics_points_la_OBJECTS) $(libgeostatistics_points_la_LIBADD) $(LIBS) - - mostlyclean-compile: - -rm -f *.$(OBJEXT) -@@ -355,25 +471,25 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MLB_Interface.Plo@am__quote@ - - .cpp.o: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< - - .cpp.obj: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - - .cpp.lo: --@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< - - mostlyclean-libtool: - -rm -f *.lo -@@ -381,26 +497,15 @@ mostlyclean-libtool: - clean-libtool: - -rm -rf .libs _libs - --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -+ID: $(am__tagged_files) -+ $(am__define_uniq_tagged_files); mkid -fID $$unique -+tags: tags-am -+TAGS: tags -+ -+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ -@@ -412,15 +517,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $$unique; \ - fi; \ - fi --ctags: CTAGS --CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ctags: ctags-am -+ -+CTAGS: ctags -+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) -+ $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique -@@ -429,6 +530,21 @@ GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -+cscopelist: cscopelist-am -+ -+cscopelist-am: $(am__tagged_files) -+ list='$(am__tagged_files)'; \ -+ case "$(srcdir)" in \ -+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ -+ *) sdir=$(subdir)/$(srcdir) ;; \ -+ esac; \ -+ for i in $$list; do \ -+ if test -f "$$i"; then \ -+ echo "$(subdir)/$$i"; \ -+ else \ -+ echo "$$sdir/$$i"; \ -+ fi; \ -+ done >> $(top_builddir)/cscope.files - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -@@ -480,10 +596,15 @@ install-am: all-am - - installcheck: installcheck-am - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+ if test -z '$(STRIP)'; then \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ install; \ -+ else \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -+ fi - mostlyclean-generic: - - clean-generic: -@@ -568,19 +689,20 @@ uninstall-am: uninstall-pkglibLTLIBRARIES - - .MAKE: install-am install-strip - --.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ -- clean-libtool clean-pkglibLTLIBRARIES ctags distclean \ -- distclean-compile distclean-generic distclean-libtool \ -- distclean-tags distdir dvi dvi-am html html-am info info-am \ -- install install-am install-data install-data-am install-dvi \ -- install-dvi-am install-exec install-exec-am install-html \ -- install-html-am install-info install-info-am install-man \ -- install-pdf install-pdf-am install-pkglibLTLIBRARIES \ -- install-ps install-ps-am install-strip installcheck \ -- installcheck-am installdirs maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-compile \ -- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -- tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES -+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ -+ clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \ -+ ctags-am distclean distclean-compile distclean-generic \ -+ distclean-libtool distclean-tags distdir dvi dvi-am html \ -+ html-am info info-am install install-am install-data \ -+ install-data-am install-dvi install-dvi-am install-exec \ -+ install-exec-am install-html install-html-am install-info \ -+ install-info-am install-man install-pdf install-pdf-am \ -+ install-pkglibLTLIBRARIES install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ maintainer-clean maintainer-clean-generic mostlyclean \ -+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ -+ pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ -+ uninstall-pkglibLTLIBRARIES - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff --git a/src/modules_geostatistics/geostatistics/geostatistics_regression/Makefile.in b/src/modules_geostatistics/geostatistics/geostatistics_regression/Makefile.in -index 06826db..911d4bf 100644 ---- a/src/modules_geostatistics/geostatistics/geostatistics_regression/Makefile.in -+++ b/src/modules_geostatistics/geostatistics/geostatistics_regression/Makefile.in -@@ -1,9 +1,8 @@ --# Makefile.in generated by automake 1.11.1 from Makefile.am. -+# Makefile.in generated by automake 1.14 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, --# Inc. -+# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+ - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -16,6 +15,51 @@ - @SET_MAKE@ - - VPATH = @srcdir@ -+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -+am__make_running_with_option = \ -+ case $${target_option-} in \ -+ ?) ;; \ -+ *) echo "am__make_running_with_option: internal error: invalid" \ -+ "target option '$${target_option-}' specified" >&2; \ -+ exit 1;; \ -+ esac; \ -+ has_opt=no; \ -+ sane_makeflags=$$MAKEFLAGS; \ -+ if $(am__is_gnu_make); then \ -+ sane_makeflags=$$MFLAGS; \ -+ else \ -+ case $$MAKEFLAGS in \ -+ *\\[\ \ ]*) \ -+ bs=\\; \ -+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -+ esac; \ -+ fi; \ -+ skip_next=no; \ -+ strip_trailopt () \ -+ { \ -+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -+ }; \ -+ for flg in $$sane_makeflags; do \ -+ test $$skip_next = yes && { skip_next=no; continue; }; \ -+ case $$flg in \ -+ *=*|--*) continue;; \ -+ -*I) strip_trailopt 'I'; skip_next=yes;; \ -+ -*I?*) strip_trailopt 'I';; \ -+ -*O) strip_trailopt 'O'; skip_next=yes;; \ -+ -*O?*) strip_trailopt 'O';; \ -+ -*l) strip_trailopt 'l'; skip_next=yes;; \ -+ -*l?*) strip_trailopt 'l';; \ -+ -[dEDm]) skip_next=yes;; \ -+ -[JT]) skip_next=yes;; \ -+ esac; \ -+ case $$flg in \ -+ *$$target_option*) has_opt=yes; break;; \ -+ esac; \ -+ done; \ -+ test $$has_opt = yes -+am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -+am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -35,7 +79,8 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - subdir = src/modules_geostatistics/geostatistics/geostatistics_regression --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ -+ $(top_srcdir)/depcomp - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ - $(top_srcdir)/m4/ax_python_devel.m4 \ -@@ -71,6 +116,12 @@ am__nobase_list = $(am__nobase_strip_setup); \ - am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -+am__uninstall_files_from_dir = { \ -+ test -z "$$files" \ -+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ -+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ -+ $(am__cd) "$$dir" && rm -f $$files; }; \ -+ } - am__installdirs = "$(DESTDIR)$(pkglibdir)" - LTLIBRARIES = $(pkglib_LTLIBRARIES) - libgeostatistics_regression_la_DEPENDENCIES = \ -@@ -85,35 +136,92 @@ am_libgeostatistics_regression_la_OBJECTS = \ - table_trend.lo - libgeostatistics_regression_la_OBJECTS = \ - $(am_libgeostatistics_regression_la_OBJECTS) -+AM_V_lt = $(am__v_lt_@AM_V@) -+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -+am__v_lt_0 = --silent -+am__v_lt_1 = -+AM_V_P = $(am__v_P_@AM_V@) -+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -+am__v_P_0 = false -+am__v_P_1 = : -+AM_V_GEN = $(am__v_GEN_@AM_V@) -+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+am__v_GEN_0 = @echo " GEN " $@; -+am__v_GEN_1 = -+AM_V_at = $(am__v_at_@AM_V@) -+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+am__v_at_0 = @ -+am__v_at_1 = - DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - am__mv = mv -f - CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) --LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CXXFLAGS) $(CXXFLAGS) -+AM_V_CXX = $(am__v_CXX_@AM_V@) -+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) -+am__v_CXX_0 = @echo " CXX " $@; -+am__v_CXX_1 = - CXXLD = $(CXX) --CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ -+ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) -+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) -+am__v_CXXLD_0 = @echo " CXXLD " $@; -+am__v_CXXLD_1 = - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CFLAGS) $(CFLAGS) -+AM_V_CC = $(am__v_CC_@AM_V@) -+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -+am__v_CC_0 = @echo " CC " $@; -+am__v_CC_1 = - CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CCLD = $(am__v_CCLD_@AM_V@) -+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -+am__v_CCLD_0 = @echo " CCLD " $@; -+am__v_CCLD_1 = - SOURCES = $(libgeostatistics_regression_la_SOURCES) - DIST_SOURCES = $(libgeostatistics_regression_la_SOURCES) -+am__can_run_installinfo = \ -+ case $$AM_UPDATE_INFO_DIR in \ -+ n|no|NO) false;; \ -+ *) (install-info --version) >/dev/null 2>&1;; \ -+ esac -+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -+# Read a list of newline-separated strings from the standard input, -+# and print each of them once, without duplicates. Input order is -+# *not* preserved. -+am__uniquify_input = $(AWK) '\ -+ BEGIN { nonempty = 0; } \ -+ { items[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in items) print i; }; } \ -+' -+# Make sure the list of sources is unique. This is necessary because, -+# e.g., the same source file might be shared among _SOURCES variables -+# for different programs/libraries. -+am__define_uniq_tagged_files = \ -+ list='$(am__tagged_files)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | $(am__uniquify_input)` - ETAGS = etags - CTAGS = ctags - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ -+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ -@@ -134,6 +242,7 @@ CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DISABLELIBHARU = @DISABLELIBHARU@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -161,6 +270,7 @@ LOCAL_INCS = @LOCAL_INCS@ - LOCAL_LIBS = @LOCAL_LIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - NM = @NM@ - NMEDIT = @NMEDIT@ -@@ -173,6 +283,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - POW_LIB = @POW_LIB@ -@@ -198,6 +309,7 @@ abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -@@ -231,7 +343,6 @@ libdir = @libdir@ - libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -@@ -327,9 +438,9 @@ $(top_srcdir)/configure: $(am__configure_deps) - $(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - $(am__aclocal_m4_deps): -+ - install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" - @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ - list2=; for p in $$list; do \ - if test -f $$p; then \ -@@ -337,6 +448,8 @@ install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - else :; fi; \ - done; \ - test -z "$$list2" || { \ -+ echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \ -+ $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \ - } -@@ -352,14 +465,17 @@ uninstall-pkglibLTLIBRARIES: - - clean-pkglibLTLIBRARIES: - -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES) -- @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \ -- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -- echo "rm -f \"$${dir}/so_locations\""; \ -- rm -f "$${dir}/so_locations"; \ -- done --libgeostatistics_regression.la: $(libgeostatistics_regression_la_OBJECTS) $(libgeostatistics_regression_la_DEPENDENCIES) -- $(CXXLINK) -rpath $(pkglibdir) $(libgeostatistics_regression_la_OBJECTS) $(libgeostatistics_regression_la_LIBADD) $(LIBS) -+ @list='$(pkglib_LTLIBRARIES)'; \ -+ locs=`for p in $$list; do echo $$p; done | \ -+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ -+ sort -u`; \ -+ test -z "$$locs" || { \ -+ echo rm -f $${locs}; \ -+ rm -f $${locs}; \ -+ } -+ -+libgeostatistics_regression.la: $(libgeostatistics_regression_la_OBJECTS) $(libgeostatistics_regression_la_DEPENDENCIES) $(EXTRA_libgeostatistics_regression_la_DEPENDENCIES) -+ $(AM_V_CXXLD)$(CXXLINK) -rpath $(pkglibdir) $(libgeostatistics_regression_la_OBJECTS) $(libgeostatistics_regression_la_LIBADD) $(LIBS) - - mostlyclean-compile: - -rm -f *.$(OBJEXT) -@@ -383,25 +499,25 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/table_trend.Plo@am__quote@ - - .cpp.o: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< - - .cpp.obj: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - - .cpp.lo: --@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< - - mostlyclean-libtool: - -rm -f *.lo -@@ -409,26 +525,15 @@ mostlyclean-libtool: - clean-libtool: - -rm -rf .libs _libs - --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -+ID: $(am__tagged_files) -+ $(am__define_uniq_tagged_files); mkid -fID $$unique -+tags: tags-am -+TAGS: tags -+ -+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ -@@ -440,15 +545,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $$unique; \ - fi; \ - fi --ctags: CTAGS --CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ctags: ctags-am -+ -+CTAGS: ctags -+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) -+ $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique -@@ -457,6 +558,21 @@ GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -+cscopelist: cscopelist-am -+ -+cscopelist-am: $(am__tagged_files) -+ list='$(am__tagged_files)'; \ -+ case "$(srcdir)" in \ -+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ -+ *) sdir=$(subdir)/$(srcdir) ;; \ -+ esac; \ -+ for i in $$list; do \ -+ if test -f "$$i"; then \ -+ echo "$(subdir)/$$i"; \ -+ else \ -+ echo "$$sdir/$$i"; \ -+ fi; \ -+ done >> $(top_builddir)/cscope.files - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -@@ -508,10 +624,15 @@ install-am: all-am - - installcheck: installcheck-am - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+ if test -z '$(STRIP)'; then \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ install; \ -+ else \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -+ fi - mostlyclean-generic: - - clean-generic: -@@ -596,19 +717,20 @@ uninstall-am: uninstall-pkglibLTLIBRARIES - - .MAKE: install-am install-strip - --.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ -- clean-libtool clean-pkglibLTLIBRARIES ctags distclean \ -- distclean-compile distclean-generic distclean-libtool \ -- distclean-tags distdir dvi dvi-am html html-am info info-am \ -- install install-am install-data install-data-am install-dvi \ -- install-dvi-am install-exec install-exec-am install-html \ -- install-html-am install-info install-info-am install-man \ -- install-pdf install-pdf-am install-pkglibLTLIBRARIES \ -- install-ps install-ps-am install-strip installcheck \ -- installcheck-am installdirs maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-compile \ -- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -- tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES -+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ -+ clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \ -+ ctags-am distclean distclean-compile distclean-generic \ -+ distclean-libtool distclean-tags distdir dvi dvi-am html \ -+ html-am info info-am install install-am install-data \ -+ install-data-am install-dvi install-dvi-am install-exec \ -+ install-exec-am install-html install-html-am install-info \ -+ install-info-am install-man install-pdf install-pdf-am \ -+ install-pkglibLTLIBRARIES install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ maintainer-clean maintainer-clean-generic mostlyclean \ -+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ -+ pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ -+ uninstall-pkglibLTLIBRARIES - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff --git a/src/modules_images/Makefile.in b/src/modules_images/Makefile.in -index e17287a..39899c6 100644 ---- a/src/modules_images/Makefile.in -+++ b/src/modules_images/Makefile.in -@@ -1,9 +1,8 @@ --# Makefile.in generated by automake 1.11.1 from Makefile.am. -+# Makefile.in generated by automake 1.14 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, --# Inc. -+# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+ - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -15,6 +14,51 @@ - - @SET_MAKE@ - VPATH = @srcdir@ -+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -+am__make_running_with_option = \ -+ case $${target_option-} in \ -+ ?) ;; \ -+ *) echo "am__make_running_with_option: internal error: invalid" \ -+ "target option '$${target_option-}' specified" >&2; \ -+ exit 1;; \ -+ esac; \ -+ has_opt=no; \ -+ sane_makeflags=$$MAKEFLAGS; \ -+ if $(am__is_gnu_make); then \ -+ sane_makeflags=$$MFLAGS; \ -+ else \ -+ case $$MAKEFLAGS in \ -+ *\\[\ \ ]*) \ -+ bs=\\; \ -+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -+ esac; \ -+ fi; \ -+ skip_next=no; \ -+ strip_trailopt () \ -+ { \ -+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -+ }; \ -+ for flg in $$sane_makeflags; do \ -+ test $$skip_next = yes && { skip_next=no; continue; }; \ -+ case $$flg in \ -+ *=*|--*) continue;; \ -+ -*I) strip_trailopt 'I'; skip_next=yes;; \ -+ -*I?*) strip_trailopt 'I';; \ -+ -*O) strip_trailopt 'O'; skip_next=yes;; \ -+ -*O?*) strip_trailopt 'O';; \ -+ -*l) strip_trailopt 'l'; skip_next=yes;; \ -+ -*l?*) strip_trailopt 'l';; \ -+ -[dEDm]) skip_next=yes;; \ -+ -[JT]) skip_next=yes;; \ -+ esac; \ -+ case $$flg in \ -+ *$$target_option*) has_opt=yes; break;; \ -+ esac; \ -+ done; \ -+ test $$has_opt = yes -+am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -+am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -34,7 +78,7 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - subdir = src/modules_images --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ - $(top_srcdir)/m4/ax_python_devel.m4 \ -@@ -49,20 +93,58 @@ mkinstalldirs = $(install_sh) -d - CONFIG_HEADER = $(top_builddir)/config.h - CONFIG_CLEAN_FILES = - CONFIG_CLEAN_VPATH_FILES = -+AM_V_P = $(am__v_P_@AM_V@) -+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -+am__v_P_0 = false -+am__v_P_1 = : -+AM_V_GEN = $(am__v_GEN_@AM_V@) -+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+am__v_GEN_0 = @echo " GEN " $@; -+am__v_GEN_1 = -+AM_V_at = $(am__v_at_@AM_V@) -+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+am__v_at_0 = @ -+am__v_at_1 = - SOURCES = - DIST_SOURCES = --RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ -- html-recursive info-recursive install-data-recursive \ -- install-dvi-recursive install-exec-recursive \ -- install-html-recursive install-info-recursive \ -- install-pdf-recursive install-ps-recursive install-recursive \ -- installcheck-recursive installdirs-recursive pdf-recursive \ -- ps-recursive uninstall-recursive -+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ -+ ctags-recursive dvi-recursive html-recursive info-recursive \ -+ install-data-recursive install-dvi-recursive \ -+ install-exec-recursive install-html-recursive \ -+ install-info-recursive install-pdf-recursive \ -+ install-ps-recursive install-recursive installcheck-recursive \ -+ installdirs-recursive pdf-recursive ps-recursive \ -+ tags-recursive uninstall-recursive -+am__can_run_installinfo = \ -+ case $$AM_UPDATE_INFO_DIR in \ -+ n|no|NO) false;; \ -+ *) (install-info --version) >/dev/null 2>&1;; \ -+ esac - RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ - distclean-recursive maintainer-clean-recursive --AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ -- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ -+am__recursive_targets = \ -+ $(RECURSIVE_TARGETS) \ -+ $(RECURSIVE_CLEAN_TARGETS) \ -+ $(am__extra_recursive_targets) -+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ - distdir -+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -+# Read a list of newline-separated strings from the standard input, -+# and print each of them once, without duplicates. Input order is -+# *not* preserved. -+am__uniquify_input = $(AWK) '\ -+ BEGIN { nonempty = 0; } \ -+ { items[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in items) print i; }; } \ -+' -+# Make sure the list of sources is unique. This is necessary because, -+# e.g., the same source file might be shared among _SOURCES variables -+# for different programs/libraries. -+am__define_uniq_tagged_files = \ -+ list='$(am__tagged_files)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | $(am__uniquify_input)` - ETAGS = etags - CTAGS = ctags - DIST_SUBDIRS = $(SUBDIRS) -@@ -94,6 +176,7 @@ am__relativize = \ - reldir="$$dir2" - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ -+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ -@@ -114,6 +197,7 @@ CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DISABLELIBHARU = @DISABLELIBHARU@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -141,6 +225,7 @@ LOCAL_INCS = @LOCAL_INCS@ - LOCAL_LIBS = @LOCAL_LIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - NM = @NM@ - NMEDIT = @NMEDIT@ -@@ -153,6 +238,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - POW_LIB = @POW_LIB@ -@@ -178,6 +264,7 @@ abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -@@ -211,7 +298,6 @@ libdir = @libdir@ - libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -@@ -273,22 +359,25 @@ clean-libtool: - -rm -rf .libs _libs - - # This directory's subdirectories are mostly independent; you can cd --# into them and run `make' without going through this Makefile. --# To change the values of `make' variables: instead of editing Makefiles, --# (1) if the variable is set in `config.status', edit `config.status' --# (which will cause the Makefiles to be regenerated when you run `make'); --# (2) otherwise, pass the desired values on the `make' command line. --$(RECURSIVE_TARGETS): -- @fail= failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -+# into them and run 'make' without going through this Makefile. -+# To change the values of 'make' variables: instead of editing Makefiles, -+# (1) if the variable is set in 'config.status', edit 'config.status' -+# (which will cause the Makefiles to be regenerated when you run 'make'); -+# (2) otherwise, pass the desired values on the 'make' command line. -+$(am__recursive_targets): -+ @fail=; \ -+ if $(am__make_keepgoing); then \ -+ failcom='fail=yes'; \ -+ else \ -+ failcom='exit 1'; \ -+ fi; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ -- list='$(SUBDIRS)'; for subdir in $$list; do \ -+ case "$@" in \ -+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -+ *) list='$(SUBDIRS)' ;; \ -+ esac; \ -+ for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ -@@ -303,57 +392,12 @@ $(RECURSIVE_TARGETS): - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - --$(RECURSIVE_CLEAN_TARGETS): -- @fail= failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -- dot_seen=no; \ -- case "$@" in \ -- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -- *) list='$(SUBDIRS)' ;; \ -- esac; \ -- rev=''; for subdir in $$list; do \ -- if test "$$subdir" = "."; then :; else \ -- rev="$$subdir $$rev"; \ -- fi; \ -- done; \ -- rev="$$rev ."; \ -- target=`echo $@ | sed s/-recursive//`; \ -- for subdir in $$rev; do \ -- echo "Making $$target in $$subdir"; \ -- if test "$$subdir" = "."; then \ -- local_target="$$target-am"; \ -- else \ -- local_target="$$target"; \ -- fi; \ -- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || eval $$failcom; \ -- done && test -z "$$fail" --tags-recursive: -- list='$(SUBDIRS)'; for subdir in $$list; do \ -- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ -- done --ctags-recursive: -- list='$(SUBDIRS)'; for subdir in $$list; do \ -- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ -- done -+ID: $(am__tagged_files) -+ $(am__define_uniq_tagged_files); mkid -fID $$unique -+tags: tags-recursive -+TAGS: tags - --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ - if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ -@@ -369,12 +413,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ -@@ -386,15 +425,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $$unique; \ - fi; \ - fi --ctags: CTAGS --CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ctags: ctags-recursive -+ -+CTAGS: ctags -+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) -+ $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique -@@ -403,6 +438,21 @@ GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -+cscopelist: cscopelist-recursive -+ -+cscopelist-am: $(am__tagged_files) -+ list='$(am__tagged_files)'; \ -+ case "$(srcdir)" in \ -+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ -+ *) sdir=$(subdir)/$(srcdir) ;; \ -+ esac; \ -+ for i in $$list; do \ -+ if test -f "$$i"; then \ -+ echo "$(subdir)/$$i"; \ -+ else \ -+ echo "$$sdir/$$i"; \ -+ fi; \ -+ done >> $(top_builddir)/cscope.files - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -@@ -439,13 +489,10 @@ distdir: $(DISTFILES) - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test -d "$(distdir)/$$subdir" \ -- || $(MKDIR_P) "$(distdir)/$$subdir" \ -- || exit 1; \ -- fi; \ -- done -- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ -- if test "$$subdir" = .; then :; else \ -+ $(am__make_dryrun) \ -+ || test -d "$(distdir)/$$subdir" \ -+ || $(MKDIR_P) "$(distdir)/$$subdir" \ -+ || exit 1; \ - dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ - $(am__relativize); \ - new_distdir=$$reldir; \ -@@ -480,10 +527,15 @@ install-am: all-am - - installcheck: installcheck-recursive - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+ if test -z '$(STRIP)'; then \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ install; \ -+ else \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -+ fi - mostlyclean-generic: - - clean-generic: -@@ -561,22 +613,20 @@ ps-am: - - uninstall-am: - --.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ -- install-am install-strip tags-recursive -- --.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ -- all all-am check check-am clean clean-generic clean-libtool \ -- ctags ctags-recursive distclean distclean-generic \ -- distclean-libtool distclean-tags distdir dvi dvi-am html \ -- html-am info info-am install install-am install-data \ -- install-data-am install-dvi install-dvi-am install-exec \ -- install-exec-am install-html install-html-am install-info \ -- install-info-am install-man install-pdf install-pdf-am \ -- install-ps install-ps-am install-strip installcheck \ -- installcheck-am installdirs installdirs-am maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-generic \ -- mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ -- uninstall uninstall-am -+.MAKE: $(am__recursive_targets) install-am install-strip -+ -+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ -+ check-am clean clean-generic clean-libtool cscopelist-am ctags \ -+ ctags-am distclean distclean-generic distclean-libtool \ -+ distclean-tags distdir dvi dvi-am html html-am info info-am \ -+ install install-am install-data install-data-am install-dvi \ -+ install-dvi-am install-exec install-exec-am install-html \ -+ install-html-am install-info install-info-am install-man \ -+ install-pdf install-pdf-am install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ installdirs-am maintainer-clean maintainer-clean-generic \ -+ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ -+ ps ps-am tags tags-am uninstall uninstall-am - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff --git a/src/modules_images/modules_imagery/Makefile.in b/src/modules_images/modules_imagery/Makefile.in -index cfd939e..42fc3c1 100644 ---- a/src/modules_images/modules_imagery/Makefile.in -+++ b/src/modules_images/modules_imagery/Makefile.in -@@ -1,9 +1,8 @@ --# Makefile.in generated by automake 1.11.1 from Makefile.am. -+# Makefile.in generated by automake 1.14 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, --# Inc. -+# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+ - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -15,6 +14,51 @@ - - @SET_MAKE@ - VPATH = @srcdir@ -+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -+am__make_running_with_option = \ -+ case $${target_option-} in \ -+ ?) ;; \ -+ *) echo "am__make_running_with_option: internal error: invalid" \ -+ "target option '$${target_option-}' specified" >&2; \ -+ exit 1;; \ -+ esac; \ -+ has_opt=no; \ -+ sane_makeflags=$$MAKEFLAGS; \ -+ if $(am__is_gnu_make); then \ -+ sane_makeflags=$$MFLAGS; \ -+ else \ -+ case $$MAKEFLAGS in \ -+ *\\[\ \ ]*) \ -+ bs=\\; \ -+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -+ esac; \ -+ fi; \ -+ skip_next=no; \ -+ strip_trailopt () \ -+ { \ -+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -+ }; \ -+ for flg in $$sane_makeflags; do \ -+ test $$skip_next = yes && { skip_next=no; continue; }; \ -+ case $$flg in \ -+ *=*|--*) continue;; \ -+ -*I) strip_trailopt 'I'; skip_next=yes;; \ -+ -*I?*) strip_trailopt 'I';; \ -+ -*O) strip_trailopt 'O'; skip_next=yes;; \ -+ -*O?*) strip_trailopt 'O';; \ -+ -*l) strip_trailopt 'l'; skip_next=yes;; \ -+ -*l?*) strip_trailopt 'l';; \ -+ -[dEDm]) skip_next=yes;; \ -+ -[JT]) skip_next=yes;; \ -+ esac; \ -+ case $$flg in \ -+ *$$target_option*) has_opt=yes; break;; \ -+ esac; \ -+ done; \ -+ test $$has_opt = yes -+am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -+am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -34,7 +78,7 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - subdir = src/modules_images/modules_imagery --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ - $(top_srcdir)/m4/ax_python_devel.m4 \ -@@ -49,20 +93,58 @@ mkinstalldirs = $(install_sh) -d - CONFIG_HEADER = $(top_builddir)/config.h - CONFIG_CLEAN_FILES = - CONFIG_CLEAN_VPATH_FILES = -+AM_V_P = $(am__v_P_@AM_V@) -+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -+am__v_P_0 = false -+am__v_P_1 = : -+AM_V_GEN = $(am__v_GEN_@AM_V@) -+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+am__v_GEN_0 = @echo " GEN " $@; -+am__v_GEN_1 = -+AM_V_at = $(am__v_at_@AM_V@) -+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+am__v_at_0 = @ -+am__v_at_1 = - SOURCES = - DIST_SOURCES = --RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ -- html-recursive info-recursive install-data-recursive \ -- install-dvi-recursive install-exec-recursive \ -- install-html-recursive install-info-recursive \ -- install-pdf-recursive install-ps-recursive install-recursive \ -- installcheck-recursive installdirs-recursive pdf-recursive \ -- ps-recursive uninstall-recursive -+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ -+ ctags-recursive dvi-recursive html-recursive info-recursive \ -+ install-data-recursive install-dvi-recursive \ -+ install-exec-recursive install-html-recursive \ -+ install-info-recursive install-pdf-recursive \ -+ install-ps-recursive install-recursive installcheck-recursive \ -+ installdirs-recursive pdf-recursive ps-recursive \ -+ tags-recursive uninstall-recursive -+am__can_run_installinfo = \ -+ case $$AM_UPDATE_INFO_DIR in \ -+ n|no|NO) false;; \ -+ *) (install-info --version) >/dev/null 2>&1;; \ -+ esac - RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ - distclean-recursive maintainer-clean-recursive --AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ -- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ -+am__recursive_targets = \ -+ $(RECURSIVE_TARGETS) \ -+ $(RECURSIVE_CLEAN_TARGETS) \ -+ $(am__extra_recursive_targets) -+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ - distdir -+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -+# Read a list of newline-separated strings from the standard input, -+# and print each of them once, without duplicates. Input order is -+# *not* preserved. -+am__uniquify_input = $(AWK) '\ -+ BEGIN { nonempty = 0; } \ -+ { items[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in items) print i; }; } \ -+' -+# Make sure the list of sources is unique. This is necessary because, -+# e.g., the same source file might be shared among _SOURCES variables -+# for different programs/libraries. -+am__define_uniq_tagged_files = \ -+ list='$(am__tagged_files)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | $(am__uniquify_input)` - ETAGS = etags - CTAGS = ctags - DIST_SUBDIRS = $(SUBDIRS) -@@ -94,6 +176,7 @@ am__relativize = \ - reldir="$$dir2" - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ -+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ -@@ -114,6 +197,7 @@ CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DISABLELIBHARU = @DISABLELIBHARU@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -141,6 +225,7 @@ LOCAL_INCS = @LOCAL_INCS@ - LOCAL_LIBS = @LOCAL_LIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - NM = @NM@ - NMEDIT = @NMEDIT@ -@@ -153,6 +238,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - POW_LIB = @POW_LIB@ -@@ -178,6 +264,7 @@ abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -@@ -211,7 +298,6 @@ libdir = @libdir@ - libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -@@ -273,22 +359,25 @@ clean-libtool: - -rm -rf .libs _libs - - # This directory's subdirectories are mostly independent; you can cd --# into them and run `make' without going through this Makefile. --# To change the values of `make' variables: instead of editing Makefiles, --# (1) if the variable is set in `config.status', edit `config.status' --# (which will cause the Makefiles to be regenerated when you run `make'); --# (2) otherwise, pass the desired values on the `make' command line. --$(RECURSIVE_TARGETS): -- @fail= failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -+# into them and run 'make' without going through this Makefile. -+# To change the values of 'make' variables: instead of editing Makefiles, -+# (1) if the variable is set in 'config.status', edit 'config.status' -+# (which will cause the Makefiles to be regenerated when you run 'make'); -+# (2) otherwise, pass the desired values on the 'make' command line. -+$(am__recursive_targets): -+ @fail=; \ -+ if $(am__make_keepgoing); then \ -+ failcom='fail=yes'; \ -+ else \ -+ failcom='exit 1'; \ -+ fi; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ -- list='$(SUBDIRS)'; for subdir in $$list; do \ -+ case "$@" in \ -+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -+ *) list='$(SUBDIRS)' ;; \ -+ esac; \ -+ for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ -@@ -303,57 +392,12 @@ $(RECURSIVE_TARGETS): - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - --$(RECURSIVE_CLEAN_TARGETS): -- @fail= failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -- dot_seen=no; \ -- case "$@" in \ -- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -- *) list='$(SUBDIRS)' ;; \ -- esac; \ -- rev=''; for subdir in $$list; do \ -- if test "$$subdir" = "."; then :; else \ -- rev="$$subdir $$rev"; \ -- fi; \ -- done; \ -- rev="$$rev ."; \ -- target=`echo $@ | sed s/-recursive//`; \ -- for subdir in $$rev; do \ -- echo "Making $$target in $$subdir"; \ -- if test "$$subdir" = "."; then \ -- local_target="$$target-am"; \ -- else \ -- local_target="$$target"; \ -- fi; \ -- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || eval $$failcom; \ -- done && test -z "$$fail" --tags-recursive: -- list='$(SUBDIRS)'; for subdir in $$list; do \ -- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ -- done --ctags-recursive: -- list='$(SUBDIRS)'; for subdir in $$list; do \ -- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ -- done -+ID: $(am__tagged_files) -+ $(am__define_uniq_tagged_files); mkid -fID $$unique -+tags: tags-recursive -+TAGS: tags - --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ - if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ -@@ -369,12 +413,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ -@@ -386,15 +425,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $$unique; \ - fi; \ - fi --ctags: CTAGS --CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ctags: ctags-recursive -+ -+CTAGS: ctags -+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) -+ $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique -@@ -403,6 +438,21 @@ GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -+cscopelist: cscopelist-recursive -+ -+cscopelist-am: $(am__tagged_files) -+ list='$(am__tagged_files)'; \ -+ case "$(srcdir)" in \ -+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ -+ *) sdir=$(subdir)/$(srcdir) ;; \ -+ esac; \ -+ for i in $$list; do \ -+ if test -f "$$i"; then \ -+ echo "$(subdir)/$$i"; \ -+ else \ -+ echo "$$sdir/$$i"; \ -+ fi; \ -+ done >> $(top_builddir)/cscope.files - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -@@ -439,13 +489,10 @@ distdir: $(DISTFILES) - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test -d "$(distdir)/$$subdir" \ -- || $(MKDIR_P) "$(distdir)/$$subdir" \ -- || exit 1; \ -- fi; \ -- done -- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ -- if test "$$subdir" = .; then :; else \ -+ $(am__make_dryrun) \ -+ || test -d "$(distdir)/$$subdir" \ -+ || $(MKDIR_P) "$(distdir)/$$subdir" \ -+ || exit 1; \ - dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ - $(am__relativize); \ - new_distdir=$$reldir; \ -@@ -480,10 +527,15 @@ install-am: all-am - - installcheck: installcheck-recursive - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+ if test -z '$(STRIP)'; then \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ install; \ -+ else \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -+ fi - mostlyclean-generic: - - clean-generic: -@@ -561,22 +613,20 @@ ps-am: - - uninstall-am: - --.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ -- install-am install-strip tags-recursive -- --.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ -- all all-am check check-am clean clean-generic clean-libtool \ -- ctags ctags-recursive distclean distclean-generic \ -- distclean-libtool distclean-tags distdir dvi dvi-am html \ -- html-am info info-am install install-am install-data \ -- install-data-am install-dvi install-dvi-am install-exec \ -- install-exec-am install-html install-html-am install-info \ -- install-info-am install-man install-pdf install-pdf-am \ -- install-ps install-ps-am install-strip installcheck \ -- installcheck-am installdirs installdirs-am maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-generic \ -- mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ -- uninstall uninstall-am -+.MAKE: $(am__recursive_targets) install-am install-strip -+ -+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ -+ check-am clean clean-generic clean-libtool cscopelist-am ctags \ -+ ctags-am distclean distclean-generic distclean-libtool \ -+ distclean-tags distdir dvi dvi-am html html-am info info-am \ -+ install install-am install-data install-data-am install-dvi \ -+ install-dvi-am install-exec install-exec-am install-html \ -+ install-html-am install-info install-info-am install-man \ -+ install-pdf install-pdf-am install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ installdirs-am maintainer-clean maintainer-clean-generic \ -+ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ -+ ps ps-am tags tags-am uninstall uninstall-am - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff --git a/src/modules_images/modules_imagery/imagery_classification/Makefile.in b/src/modules_images/modules_imagery/imagery_classification/Makefile.in -index 7895302..0b13f66 100644 ---- a/src/modules_images/modules_imagery/imagery_classification/Makefile.in -+++ b/src/modules_images/modules_imagery/imagery_classification/Makefile.in -@@ -1,9 +1,8 @@ --# Makefile.in generated by automake 1.11.1 from Makefile.am. -+# Makefile.in generated by automake 1.14 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, --# Inc. -+# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+ - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -16,6 +15,51 @@ - @SET_MAKE@ - - VPATH = @srcdir@ -+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -+am__make_running_with_option = \ -+ case $${target_option-} in \ -+ ?) ;; \ -+ *) echo "am__make_running_with_option: internal error: invalid" \ -+ "target option '$${target_option-}' specified" >&2; \ -+ exit 1;; \ -+ esac; \ -+ has_opt=no; \ -+ sane_makeflags=$$MAKEFLAGS; \ -+ if $(am__is_gnu_make); then \ -+ sane_makeflags=$$MFLAGS; \ -+ else \ -+ case $$MAKEFLAGS in \ -+ *\\[\ \ ]*) \ -+ bs=\\; \ -+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -+ esac; \ -+ fi; \ -+ skip_next=no; \ -+ strip_trailopt () \ -+ { \ -+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -+ }; \ -+ for flg in $$sane_makeflags; do \ -+ test $$skip_next = yes && { skip_next=no; continue; }; \ -+ case $$flg in \ -+ *=*|--*) continue;; \ -+ -*I) strip_trailopt 'I'; skip_next=yes;; \ -+ -*I?*) strip_trailopt 'I';; \ -+ -*O) strip_trailopt 'O'; skip_next=yes;; \ -+ -*O?*) strip_trailopt 'O';; \ -+ -*l) strip_trailopt 'l'; skip_next=yes;; \ -+ -*l?*) strip_trailopt 'l';; \ -+ -[dEDm]) skip_next=yes;; \ -+ -[JT]) skip_next=yes;; \ -+ esac; \ -+ case $$flg in \ -+ *$$target_option*) has_opt=yes; break;; \ -+ esac; \ -+ done; \ -+ test $$has_opt = yes -+am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -+am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -35,7 +79,8 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - subdir = src/modules_images/modules_imagery/imagery_classification --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ -+ $(top_srcdir)/depcomp - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ - $(top_srcdir)/m4/ax_python_devel.m4 \ -@@ -71,6 +116,12 @@ am__nobase_list = $(am__nobase_strip_setup); \ - am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -+am__uninstall_files_from_dir = { \ -+ test -z "$$files" \ -+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ -+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ -+ $(am__cd) "$$dir" && rm -f $$files; }; \ -+ } - am__installdirs = "$(DESTDIR)$(pkglibdir)" - LTLIBRARIES = $(pkglib_LTLIBRARIES) - libimagery_classification_la_DEPENDENCIES = \ -@@ -81,35 +132,92 @@ am_libimagery_classification_la_OBJECTS = change_detection.lo \ - MLB_Interface.lo - libimagery_classification_la_OBJECTS = \ - $(am_libimagery_classification_la_OBJECTS) -+AM_V_lt = $(am__v_lt_@AM_V@) -+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -+am__v_lt_0 = --silent -+am__v_lt_1 = -+AM_V_P = $(am__v_P_@AM_V@) -+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -+am__v_P_0 = false -+am__v_P_1 = : -+AM_V_GEN = $(am__v_GEN_@AM_V@) -+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+am__v_GEN_0 = @echo " GEN " $@; -+am__v_GEN_1 = -+AM_V_at = $(am__v_at_@AM_V@) -+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+am__v_at_0 = @ -+am__v_at_1 = - DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - am__mv = mv -f - CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) --LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CXXFLAGS) $(CXXFLAGS) -+AM_V_CXX = $(am__v_CXX_@AM_V@) -+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) -+am__v_CXX_0 = @echo " CXX " $@; -+am__v_CXX_1 = - CXXLD = $(CXX) --CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ -+ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) -+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) -+am__v_CXXLD_0 = @echo " CXXLD " $@; -+am__v_CXXLD_1 = - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CFLAGS) $(CFLAGS) -+AM_V_CC = $(am__v_CC_@AM_V@) -+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -+am__v_CC_0 = @echo " CC " $@; -+am__v_CC_1 = - CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CCLD = $(am__v_CCLD_@AM_V@) -+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -+am__v_CCLD_0 = @echo " CCLD " $@; -+am__v_CCLD_1 = - SOURCES = $(libimagery_classification_la_SOURCES) - DIST_SOURCES = $(libimagery_classification_la_SOURCES) -+am__can_run_installinfo = \ -+ case $$AM_UPDATE_INFO_DIR in \ -+ n|no|NO) false;; \ -+ *) (install-info --version) >/dev/null 2>&1;; \ -+ esac -+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -+# Read a list of newline-separated strings from the standard input, -+# and print each of them once, without duplicates. Input order is -+# *not* preserved. -+am__uniquify_input = $(AWK) '\ -+ BEGIN { nonempty = 0; } \ -+ { items[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in items) print i; }; } \ -+' -+# Make sure the list of sources is unique. This is necessary because, -+# e.g., the same source file might be shared among _SOURCES variables -+# for different programs/libraries. -+am__define_uniq_tagged_files = \ -+ list='$(am__tagged_files)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | $(am__uniquify_input)` - ETAGS = etags - CTAGS = ctags - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ -+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ -@@ -130,6 +238,7 @@ CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DISABLELIBHARU = @DISABLELIBHARU@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -157,6 +266,7 @@ LOCAL_INCS = @LOCAL_INCS@ - LOCAL_LIBS = @LOCAL_LIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - NM = @NM@ - NMEDIT = @NMEDIT@ -@@ -169,6 +279,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - POW_LIB = @POW_LIB@ -@@ -194,6 +305,7 @@ abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -@@ -227,7 +339,6 @@ libdir = @libdir@ - libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -@@ -303,9 +414,9 @@ $(top_srcdir)/configure: $(am__configure_deps) - $(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - $(am__aclocal_m4_deps): -+ - install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" - @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ - list2=; for p in $$list; do \ - if test -f $$p; then \ -@@ -313,6 +424,8 @@ install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - else :; fi; \ - done; \ - test -z "$$list2" || { \ -+ echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \ -+ $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \ - } -@@ -328,14 +441,17 @@ uninstall-pkglibLTLIBRARIES: - - clean-pkglibLTLIBRARIES: - -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES) -- @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \ -- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -- echo "rm -f \"$${dir}/so_locations\""; \ -- rm -f "$${dir}/so_locations"; \ -- done --libimagery_classification.la: $(libimagery_classification_la_OBJECTS) $(libimagery_classification_la_DEPENDENCIES) -- $(CXXLINK) -rpath $(pkglibdir) $(libimagery_classification_la_OBJECTS) $(libimagery_classification_la_LIBADD) $(LIBS) -+ @list='$(pkglib_LTLIBRARIES)'; \ -+ locs=`for p in $$list; do echo $$p; done | \ -+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ -+ sort -u`; \ -+ test -z "$$locs" || { \ -+ echo rm -f $${locs}; \ -+ rm -f $${locs}; \ -+ } -+ -+libimagery_classification.la: $(libimagery_classification_la_OBJECTS) $(libimagery_classification_la_DEPENDENCIES) $(EXTRA_libimagery_classification_la_DEPENDENCIES) -+ $(AM_V_CXXLD)$(CXXLINK) -rpath $(pkglibdir) $(libimagery_classification_la_OBJECTS) $(libimagery_classification_la_LIBADD) $(LIBS) - - mostlyclean-compile: - -rm -f *.$(OBJEXT) -@@ -351,25 +467,25 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/decision_tree.Plo@am__quote@ - - .cpp.o: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< - - .cpp.obj: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - - .cpp.lo: --@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< - - mostlyclean-libtool: - -rm -f *.lo -@@ -377,26 +493,15 @@ mostlyclean-libtool: - clean-libtool: - -rm -rf .libs _libs - --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -+ID: $(am__tagged_files) -+ $(am__define_uniq_tagged_files); mkid -fID $$unique -+tags: tags-am -+TAGS: tags -+ -+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ -@@ -408,15 +513,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $$unique; \ - fi; \ - fi --ctags: CTAGS --CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ctags: ctags-am -+ -+CTAGS: ctags -+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) -+ $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique -@@ -425,6 +526,21 @@ GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -+cscopelist: cscopelist-am -+ -+cscopelist-am: $(am__tagged_files) -+ list='$(am__tagged_files)'; \ -+ case "$(srcdir)" in \ -+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ -+ *) sdir=$(subdir)/$(srcdir) ;; \ -+ esac; \ -+ for i in $$list; do \ -+ if test -f "$$i"; then \ -+ echo "$(subdir)/$$i"; \ -+ else \ -+ echo "$$sdir/$$i"; \ -+ fi; \ -+ done >> $(top_builddir)/cscope.files - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -@@ -476,10 +592,15 @@ install-am: all-am - - installcheck: installcheck-am - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+ if test -z '$(STRIP)'; then \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ install; \ -+ else \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -+ fi - mostlyclean-generic: - - clean-generic: -@@ -564,19 +685,20 @@ uninstall-am: uninstall-pkglibLTLIBRARIES - - .MAKE: install-am install-strip - --.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ -- clean-libtool clean-pkglibLTLIBRARIES ctags distclean \ -- distclean-compile distclean-generic distclean-libtool \ -- distclean-tags distdir dvi dvi-am html html-am info info-am \ -- install install-am install-data install-data-am install-dvi \ -- install-dvi-am install-exec install-exec-am install-html \ -- install-html-am install-info install-info-am install-man \ -- install-pdf install-pdf-am install-pkglibLTLIBRARIES \ -- install-ps install-ps-am install-strip installcheck \ -- installcheck-am installdirs maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-compile \ -- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -- tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES -+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ -+ clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \ -+ ctags-am distclean distclean-compile distclean-generic \ -+ distclean-libtool distclean-tags distdir dvi dvi-am html \ -+ html-am info info-am install install-am install-data \ -+ install-data-am install-dvi install-dvi-am install-exec \ -+ install-exec-am install-html install-html-am install-info \ -+ install-info-am install-man install-pdf install-pdf-am \ -+ install-pkglibLTLIBRARIES install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ maintainer-clean maintainer-clean-generic mostlyclean \ -+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ -+ pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ -+ uninstall-pkglibLTLIBRARIES - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff --git a/src/modules_images/modules_imagery/imagery_rga/Makefile.in b/src/modules_images/modules_imagery/imagery_rga/Makefile.in -index 000318f..555d6fe 100644 ---- a/src/modules_images/modules_imagery/imagery_rga/Makefile.in -+++ b/src/modules_images/modules_imagery/imagery_rga/Makefile.in -@@ -1,9 +1,8 @@ --# Makefile.in generated by automake 1.11.1 from Makefile.am. -+# Makefile.in generated by automake 1.14 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, --# Inc. -+# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+ - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -16,6 +15,51 @@ - @SET_MAKE@ - - VPATH = @srcdir@ -+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -+am__make_running_with_option = \ -+ case $${target_option-} in \ -+ ?) ;; \ -+ *) echo "am__make_running_with_option: internal error: invalid" \ -+ "target option '$${target_option-}' specified" >&2; \ -+ exit 1;; \ -+ esac; \ -+ has_opt=no; \ -+ sane_makeflags=$$MAKEFLAGS; \ -+ if $(am__is_gnu_make); then \ -+ sane_makeflags=$$MFLAGS; \ -+ else \ -+ case $$MAKEFLAGS in \ -+ *\\[\ \ ]*) \ -+ bs=\\; \ -+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -+ esac; \ -+ fi; \ -+ skip_next=no; \ -+ strip_trailopt () \ -+ { \ -+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -+ }; \ -+ for flg in $$sane_makeflags; do \ -+ test $$skip_next = yes && { skip_next=no; continue; }; \ -+ case $$flg in \ -+ *=*|--*) continue;; \ -+ -*I) strip_trailopt 'I'; skip_next=yes;; \ -+ -*I?*) strip_trailopt 'I';; \ -+ -*O) strip_trailopt 'O'; skip_next=yes;; \ -+ -*O?*) strip_trailopt 'O';; \ -+ -*l) strip_trailopt 'l'; skip_next=yes;; \ -+ -*l?*) strip_trailopt 'l';; \ -+ -[dEDm]) skip_next=yes;; \ -+ -[JT]) skip_next=yes;; \ -+ esac; \ -+ case $$flg in \ -+ *$$target_option*) has_opt=yes; break;; \ -+ esac; \ -+ done; \ -+ test $$has_opt = yes -+am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -+am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -35,7 +79,8 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - subdir = src/modules_images/modules_imagery/imagery_rga --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ -+ $(top_srcdir)/depcomp - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ - $(top_srcdir)/m4/ax_python_devel.m4 \ -@@ -71,41 +116,104 @@ am__nobase_list = $(am__nobase_strip_setup); \ - am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -+am__uninstall_files_from_dir = { \ -+ test -z "$$files" \ -+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ -+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ -+ $(am__cd) "$$dir" && rm -f $$files; }; \ -+ } - am__installdirs = "$(DESTDIR)$(pkglibdir)" - LTLIBRARIES = $(pkglib_LTLIBRARIES) - libimagery_rga_la_DEPENDENCIES = \ - $(top_srcdir)/src/saga_core/saga_api/libsaga_api.la - am_libimagery_rga_la_OBJECTS = fast_region_growing.lo MLB_Interface.lo - libimagery_rga_la_OBJECTS = $(am_libimagery_rga_la_OBJECTS) -+AM_V_lt = $(am__v_lt_@AM_V@) -+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -+am__v_lt_0 = --silent -+am__v_lt_1 = -+AM_V_P = $(am__v_P_@AM_V@) -+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -+am__v_P_0 = false -+am__v_P_1 = : -+AM_V_GEN = $(am__v_GEN_@AM_V@) -+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+am__v_GEN_0 = @echo " GEN " $@; -+am__v_GEN_1 = -+AM_V_at = $(am__v_at_@AM_V@) -+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+am__v_at_0 = @ -+am__v_at_1 = - DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - am__mv = mv -f - CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) --LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CXXFLAGS) $(CXXFLAGS) -+AM_V_CXX = $(am__v_CXX_@AM_V@) -+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) -+am__v_CXX_0 = @echo " CXX " $@; -+am__v_CXX_1 = - CXXLD = $(CXX) --CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ -+ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) -+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) -+am__v_CXXLD_0 = @echo " CXXLD " $@; -+am__v_CXXLD_1 = - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CFLAGS) $(CFLAGS) -+AM_V_CC = $(am__v_CC_@AM_V@) -+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -+am__v_CC_0 = @echo " CC " $@; -+am__v_CC_1 = - CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CCLD = $(am__v_CCLD_@AM_V@) -+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -+am__v_CCLD_0 = @echo " CCLD " $@; -+am__v_CCLD_1 = - SOURCES = $(libimagery_rga_la_SOURCES) - DIST_SOURCES = $(libimagery_rga_la_SOURCES) -+am__can_run_installinfo = \ -+ case $$AM_UPDATE_INFO_DIR in \ -+ n|no|NO) false;; \ -+ *) (install-info --version) >/dev/null 2>&1;; \ -+ esac -+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -+# Read a list of newline-separated strings from the standard input, -+# and print each of them once, without duplicates. Input order is -+# *not* preserved. -+am__uniquify_input = $(AWK) '\ -+ BEGIN { nonempty = 0; } \ -+ { items[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in items) print i; }; } \ -+' -+# Make sure the list of sources is unique. This is necessary because, -+# e.g., the same source file might be shared among _SOURCES variables -+# for different programs/libraries. -+am__define_uniq_tagged_files = \ -+ list='$(am__tagged_files)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | $(am__uniquify_input)` - ETAGS = etags - CTAGS = ctags - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ -+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ -@@ -126,6 +234,7 @@ CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DISABLELIBHARU = @DISABLELIBHARU@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -153,6 +262,7 @@ LOCAL_INCS = @LOCAL_INCS@ - LOCAL_LIBS = @LOCAL_LIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - NM = @NM@ - NMEDIT = @NMEDIT@ -@@ -165,6 +275,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - POW_LIB = @POW_LIB@ -@@ -190,6 +301,7 @@ abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -@@ -223,7 +335,6 @@ libdir = @libdir@ - libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -@@ -295,9 +406,9 @@ $(top_srcdir)/configure: $(am__configure_deps) - $(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - $(am__aclocal_m4_deps): -+ - install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" - @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ - list2=; for p in $$list; do \ - if test -f $$p; then \ -@@ -305,6 +416,8 @@ install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - else :; fi; \ - done; \ - test -z "$$list2" || { \ -+ echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \ -+ $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \ - } -@@ -320,14 +433,17 @@ uninstall-pkglibLTLIBRARIES: - - clean-pkglibLTLIBRARIES: - -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES) -- @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \ -- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -- echo "rm -f \"$${dir}/so_locations\""; \ -- rm -f "$${dir}/so_locations"; \ -- done --libimagery_rga.la: $(libimagery_rga_la_OBJECTS) $(libimagery_rga_la_DEPENDENCIES) -- $(CXXLINK) -rpath $(pkglibdir) $(libimagery_rga_la_OBJECTS) $(libimagery_rga_la_LIBADD) $(LIBS) -+ @list='$(pkglib_LTLIBRARIES)'; \ -+ locs=`for p in $$list; do echo $$p; done | \ -+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ -+ sort -u`; \ -+ test -z "$$locs" || { \ -+ echo rm -f $${locs}; \ -+ rm -f $${locs}; \ -+ } -+ -+libimagery_rga.la: $(libimagery_rga_la_OBJECTS) $(libimagery_rga_la_DEPENDENCIES) $(EXTRA_libimagery_rga_la_DEPENDENCIES) -+ $(AM_V_CXXLD)$(CXXLINK) -rpath $(pkglibdir) $(libimagery_rga_la_OBJECTS) $(libimagery_rga_la_LIBADD) $(LIBS) - - mostlyclean-compile: - -rm -f *.$(OBJEXT) -@@ -339,25 +455,25 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fast_region_growing.Plo@am__quote@ - - .cpp.o: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< - - .cpp.obj: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - - .cpp.lo: --@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< - - mostlyclean-libtool: - -rm -f *.lo -@@ -365,26 +481,15 @@ mostlyclean-libtool: - clean-libtool: - -rm -rf .libs _libs - --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -+ID: $(am__tagged_files) -+ $(am__define_uniq_tagged_files); mkid -fID $$unique -+tags: tags-am -+TAGS: tags -+ -+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ -@@ -396,15 +501,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $$unique; \ - fi; \ - fi --ctags: CTAGS --CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ctags: ctags-am -+ -+CTAGS: ctags -+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) -+ $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique -@@ -413,6 +514,21 @@ GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -+cscopelist: cscopelist-am -+ -+cscopelist-am: $(am__tagged_files) -+ list='$(am__tagged_files)'; \ -+ case "$(srcdir)" in \ -+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ -+ *) sdir=$(subdir)/$(srcdir) ;; \ -+ esac; \ -+ for i in $$list; do \ -+ if test -f "$$i"; then \ -+ echo "$(subdir)/$$i"; \ -+ else \ -+ echo "$$sdir/$$i"; \ -+ fi; \ -+ done >> $(top_builddir)/cscope.files - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -@@ -464,10 +580,15 @@ install-am: all-am - - installcheck: installcheck-am - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+ if test -z '$(STRIP)'; then \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ install; \ -+ else \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -+ fi - mostlyclean-generic: - - clean-generic: -@@ -552,19 +673,20 @@ uninstall-am: uninstall-pkglibLTLIBRARIES - - .MAKE: install-am install-strip - --.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ -- clean-libtool clean-pkglibLTLIBRARIES ctags distclean \ -- distclean-compile distclean-generic distclean-libtool \ -- distclean-tags distdir dvi dvi-am html html-am info info-am \ -- install install-am install-data install-data-am install-dvi \ -- install-dvi-am install-exec install-exec-am install-html \ -- install-html-am install-info install-info-am install-man \ -- install-pdf install-pdf-am install-pkglibLTLIBRARIES \ -- install-ps install-ps-am install-strip installcheck \ -- installcheck-am installdirs maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-compile \ -- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -- tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES -+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ -+ clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \ -+ ctags-am distclean distclean-compile distclean-generic \ -+ distclean-libtool distclean-tags distdir dvi dvi-am html \ -+ html-am info info-am install install-am install-data \ -+ install-data-am install-dvi install-dvi-am install-exec \ -+ install-exec-am install-html install-html-am install-info \ -+ install-info-am install-man install-pdf install-pdf-am \ -+ install-pkglibLTLIBRARIES install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ maintainer-clean maintainer-clean-generic mostlyclean \ -+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ -+ pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ -+ uninstall-pkglibLTLIBRARIES - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff --git a/src/modules_images/modules_imagery/imagery_segmentation/Makefile.in b/src/modules_images/modules_imagery/imagery_segmentation/Makefile.in -index dd55596..f368289 100644 ---- a/src/modules_images/modules_imagery/imagery_segmentation/Makefile.in -+++ b/src/modules_images/modules_imagery/imagery_segmentation/Makefile.in -@@ -1,9 +1,8 @@ --# Makefile.in generated by automake 1.11.1 from Makefile.am. -+# Makefile.in generated by automake 1.14 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, --# Inc. -+# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+ - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -16,6 +15,51 @@ - @SET_MAKE@ - - VPATH = @srcdir@ -+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -+am__make_running_with_option = \ -+ case $${target_option-} in \ -+ ?) ;; \ -+ *) echo "am__make_running_with_option: internal error: invalid" \ -+ "target option '$${target_option-}' specified" >&2; \ -+ exit 1;; \ -+ esac; \ -+ has_opt=no; \ -+ sane_makeflags=$$MAKEFLAGS; \ -+ if $(am__is_gnu_make); then \ -+ sane_makeflags=$$MFLAGS; \ -+ else \ -+ case $$MAKEFLAGS in \ -+ *\\[\ \ ]*) \ -+ bs=\\; \ -+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -+ esac; \ -+ fi; \ -+ skip_next=no; \ -+ strip_trailopt () \ -+ { \ -+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -+ }; \ -+ for flg in $$sane_makeflags; do \ -+ test $$skip_next = yes && { skip_next=no; continue; }; \ -+ case $$flg in \ -+ *=*|--*) continue;; \ -+ -*I) strip_trailopt 'I'; skip_next=yes;; \ -+ -*I?*) strip_trailopt 'I';; \ -+ -*O) strip_trailopt 'O'; skip_next=yes;; \ -+ -*O?*) strip_trailopt 'O';; \ -+ -*l) strip_trailopt 'l'; skip_next=yes;; \ -+ -*l?*) strip_trailopt 'l';; \ -+ -[dEDm]) skip_next=yes;; \ -+ -[JT]) skip_next=yes;; \ -+ esac; \ -+ case $$flg in \ -+ *$$target_option*) has_opt=yes; break;; \ -+ esac; \ -+ done; \ -+ test $$has_opt = yes -+am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -+am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -35,7 +79,8 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - subdir = src/modules_images/modules_imagery/imagery_segmentation --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ -+ $(top_srcdir)/depcomp - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ - $(top_srcdir)/m4/ax_python_devel.m4 \ -@@ -71,6 +116,12 @@ am__nobase_list = $(am__nobase_strip_setup); \ - am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -+am__uninstall_files_from_dir = { \ -+ test -z "$$files" \ -+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ -+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ -+ $(am__cd) "$$dir" && rm -f $$files; }; \ -+ } - am__installdirs = "$(DESTDIR)$(pkglibdir)" - LTLIBRARIES = $(pkglib_LTLIBRARIES) - libimagery_segmentation_la_DEPENDENCIES = \ -@@ -79,35 +130,92 @@ am_libimagery_segmentation_la_OBJECTS = grid_seeds.lo MLB_Interface.lo \ - rga_basic.lo skeletonization.lo watershed_segmentation.lo - libimagery_segmentation_la_OBJECTS = \ - $(am_libimagery_segmentation_la_OBJECTS) -+AM_V_lt = $(am__v_lt_@AM_V@) -+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -+am__v_lt_0 = --silent -+am__v_lt_1 = -+AM_V_P = $(am__v_P_@AM_V@) -+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -+am__v_P_0 = false -+am__v_P_1 = : -+AM_V_GEN = $(am__v_GEN_@AM_V@) -+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+am__v_GEN_0 = @echo " GEN " $@; -+am__v_GEN_1 = -+AM_V_at = $(am__v_at_@AM_V@) -+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+am__v_at_0 = @ -+am__v_at_1 = - DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - am__mv = mv -f - CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) --LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CXXFLAGS) $(CXXFLAGS) -+AM_V_CXX = $(am__v_CXX_@AM_V@) -+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) -+am__v_CXX_0 = @echo " CXX " $@; -+am__v_CXX_1 = - CXXLD = $(CXX) --CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ -+ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) -+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) -+am__v_CXXLD_0 = @echo " CXXLD " $@; -+am__v_CXXLD_1 = - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CFLAGS) $(CFLAGS) -+AM_V_CC = $(am__v_CC_@AM_V@) -+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -+am__v_CC_0 = @echo " CC " $@; -+am__v_CC_1 = - CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CCLD = $(am__v_CCLD_@AM_V@) -+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -+am__v_CCLD_0 = @echo " CCLD " $@; -+am__v_CCLD_1 = - SOURCES = $(libimagery_segmentation_la_SOURCES) - DIST_SOURCES = $(libimagery_segmentation_la_SOURCES) -+am__can_run_installinfo = \ -+ case $$AM_UPDATE_INFO_DIR in \ -+ n|no|NO) false;; \ -+ *) (install-info --version) >/dev/null 2>&1;; \ -+ esac -+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -+# Read a list of newline-separated strings from the standard input, -+# and print each of them once, without duplicates. Input order is -+# *not* preserved. -+am__uniquify_input = $(AWK) '\ -+ BEGIN { nonempty = 0; } \ -+ { items[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in items) print i; }; } \ -+' -+# Make sure the list of sources is unique. This is necessary because, -+# e.g., the same source file might be shared among _SOURCES variables -+# for different programs/libraries. -+am__define_uniq_tagged_files = \ -+ list='$(am__tagged_files)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | $(am__uniquify_input)` - ETAGS = etags - CTAGS = ctags - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ -+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ -@@ -128,6 +236,7 @@ CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DISABLELIBHARU = @DISABLELIBHARU@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -155,6 +264,7 @@ LOCAL_INCS = @LOCAL_INCS@ - LOCAL_LIBS = @LOCAL_LIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - NM = @NM@ - NMEDIT = @NMEDIT@ -@@ -167,6 +277,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - POW_LIB = @POW_LIB@ -@@ -192,6 +303,7 @@ abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -@@ -225,7 +337,6 @@ libdir = @libdir@ - libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -@@ -303,9 +414,9 @@ $(top_srcdir)/configure: $(am__configure_deps) - $(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - $(am__aclocal_m4_deps): -+ - install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" - @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ - list2=; for p in $$list; do \ - if test -f $$p; then \ -@@ -313,6 +424,8 @@ install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - else :; fi; \ - done; \ - test -z "$$list2" || { \ -+ echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \ -+ $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \ - } -@@ -328,14 +441,17 @@ uninstall-pkglibLTLIBRARIES: - - clean-pkglibLTLIBRARIES: - -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES) -- @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \ -- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -- echo "rm -f \"$${dir}/so_locations\""; \ -- rm -f "$${dir}/so_locations"; \ -- done --libimagery_segmentation.la: $(libimagery_segmentation_la_OBJECTS) $(libimagery_segmentation_la_DEPENDENCIES) -- $(CXXLINK) -rpath $(pkglibdir) $(libimagery_segmentation_la_OBJECTS) $(libimagery_segmentation_la_LIBADD) $(LIBS) -+ @list='$(pkglib_LTLIBRARIES)'; \ -+ locs=`for p in $$list; do echo $$p; done | \ -+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ -+ sort -u`; \ -+ test -z "$$locs" || { \ -+ echo rm -f $${locs}; \ -+ rm -f $${locs}; \ -+ } -+ -+libimagery_segmentation.la: $(libimagery_segmentation_la_OBJECTS) $(libimagery_segmentation_la_DEPENDENCIES) $(EXTRA_libimagery_segmentation_la_DEPENDENCIES) -+ $(AM_V_CXXLD)$(CXXLINK) -rpath $(pkglibdir) $(libimagery_segmentation_la_OBJECTS) $(libimagery_segmentation_la_LIBADD) $(LIBS) - - mostlyclean-compile: - -rm -f *.$(OBJEXT) -@@ -350,25 +466,25 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/watershed_segmentation.Plo@am__quote@ - - .cpp.o: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< - - .cpp.obj: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - - .cpp.lo: --@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< - - mostlyclean-libtool: - -rm -f *.lo -@@ -376,26 +492,15 @@ mostlyclean-libtool: - clean-libtool: - -rm -rf .libs _libs - --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -+ID: $(am__tagged_files) -+ $(am__define_uniq_tagged_files); mkid -fID $$unique -+tags: tags-am -+TAGS: tags -+ -+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ -@@ -407,15 +512,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $$unique; \ - fi; \ - fi --ctags: CTAGS --CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ctags: ctags-am -+ -+CTAGS: ctags -+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) -+ $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique -@@ -424,6 +525,21 @@ GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -+cscopelist: cscopelist-am -+ -+cscopelist-am: $(am__tagged_files) -+ list='$(am__tagged_files)'; \ -+ case "$(srcdir)" in \ -+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ -+ *) sdir=$(subdir)/$(srcdir) ;; \ -+ esac; \ -+ for i in $$list; do \ -+ if test -f "$$i"; then \ -+ echo "$(subdir)/$$i"; \ -+ else \ -+ echo "$$sdir/$$i"; \ -+ fi; \ -+ done >> $(top_builddir)/cscope.files - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -@@ -475,10 +591,15 @@ install-am: all-am - - installcheck: installcheck-am - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+ if test -z '$(STRIP)'; then \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ install; \ -+ else \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -+ fi - mostlyclean-generic: - - clean-generic: -@@ -563,19 +684,20 @@ uninstall-am: uninstall-pkglibLTLIBRARIES - - .MAKE: install-am install-strip - --.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ -- clean-libtool clean-pkglibLTLIBRARIES ctags distclean \ -- distclean-compile distclean-generic distclean-libtool \ -- distclean-tags distdir dvi dvi-am html html-am info info-am \ -- install install-am install-data install-data-am install-dvi \ -- install-dvi-am install-exec install-exec-am install-html \ -- install-html-am install-info install-info-am install-man \ -- install-pdf install-pdf-am install-pkglibLTLIBRARIES \ -- install-ps install-ps-am install-strip installcheck \ -- installcheck-am installdirs maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-compile \ -- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -- tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES -+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ -+ clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \ -+ ctags-am distclean distclean-compile distclean-generic \ -+ distclean-libtool distclean-tags distdir dvi dvi-am html \ -+ html-am info info-am install install-am install-data \ -+ install-data-am install-dvi install-dvi-am install-exec \ -+ install-exec-am install-html install-html-am install-info \ -+ install-info-am install-man install-pdf install-pdf-am \ -+ install-pkglibLTLIBRARIES install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ maintainer-clean maintainer-clean-generic mostlyclean \ -+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ -+ pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ -+ uninstall-pkglibLTLIBRARIES - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff --git a/src/modules_images/modules_imagery/imagery_svm/Makefile.in b/src/modules_images/modules_imagery/imagery_svm/Makefile.in -index bbd92af..db30420 100644 ---- a/src/modules_images/modules_imagery/imagery_svm/Makefile.in -+++ b/src/modules_images/modules_imagery/imagery_svm/Makefile.in -@@ -1,9 +1,8 @@ --# Makefile.in generated by automake 1.11.1 from Makefile.am. -+# Makefile.in generated by automake 1.14 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, --# Inc. -+# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+ - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -16,6 +15,51 @@ - @SET_MAKE@ - - VPATH = @srcdir@ -+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -+am__make_running_with_option = \ -+ case $${target_option-} in \ -+ ?) ;; \ -+ *) echo "am__make_running_with_option: internal error: invalid" \ -+ "target option '$${target_option-}' specified" >&2; \ -+ exit 1;; \ -+ esac; \ -+ has_opt=no; \ -+ sane_makeflags=$$MAKEFLAGS; \ -+ if $(am__is_gnu_make); then \ -+ sane_makeflags=$$MFLAGS; \ -+ else \ -+ case $$MAKEFLAGS in \ -+ *\\[\ \ ]*) \ -+ bs=\\; \ -+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -+ esac; \ -+ fi; \ -+ skip_next=no; \ -+ strip_trailopt () \ -+ { \ -+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -+ }; \ -+ for flg in $$sane_makeflags; do \ -+ test $$skip_next = yes && { skip_next=no; continue; }; \ -+ case $$flg in \ -+ *=*|--*) continue;; \ -+ -*I) strip_trailopt 'I'; skip_next=yes;; \ -+ -*I?*) strip_trailopt 'I';; \ -+ -*O) strip_trailopt 'O'; skip_next=yes;; \ -+ -*O?*) strip_trailopt 'O';; \ -+ -*l) strip_trailopt 'l'; skip_next=yes;; \ -+ -*l?*) strip_trailopt 'l';; \ -+ -[dEDm]) skip_next=yes;; \ -+ -[JT]) skip_next=yes;; \ -+ esac; \ -+ case $$flg in \ -+ *$$target_option*) has_opt=yes; break;; \ -+ esac; \ -+ done; \ -+ test $$has_opt = yes -+am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -+am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -35,7 +79,8 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - subdir = src/modules_images/modules_imagery/imagery_svm --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ -+ $(top_srcdir)/depcomp - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ - $(top_srcdir)/m4/ax_python_devel.m4 \ -@@ -71,41 +116,104 @@ am__nobase_list = $(am__nobase_strip_setup); \ - am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -+am__uninstall_files_from_dir = { \ -+ test -z "$$files" \ -+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ -+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ -+ $(am__cd) "$$dir" && rm -f $$files; }; \ -+ } - am__installdirs = "$(DESTDIR)$(pkglibdir)" - LTLIBRARIES = $(pkglib_LTLIBRARIES) - libimagery_svm_la_DEPENDENCIES = \ - $(top_srcdir)/src/saga_core/saga_api/libsaga_api.la - am_libimagery_svm_la_OBJECTS = MLB_Interface.lo svm.lo svm_grids.lo - libimagery_svm_la_OBJECTS = $(am_libimagery_svm_la_OBJECTS) -+AM_V_lt = $(am__v_lt_@AM_V@) -+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -+am__v_lt_0 = --silent -+am__v_lt_1 = -+AM_V_P = $(am__v_P_@AM_V@) -+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -+am__v_P_0 = false -+am__v_P_1 = : -+AM_V_GEN = $(am__v_GEN_@AM_V@) -+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+am__v_GEN_0 = @echo " GEN " $@; -+am__v_GEN_1 = -+AM_V_at = $(am__v_at_@AM_V@) -+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+am__v_at_0 = @ -+am__v_at_1 = - DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - am__mv = mv -f - CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) --LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CXXFLAGS) $(CXXFLAGS) -+AM_V_CXX = $(am__v_CXX_@AM_V@) -+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) -+am__v_CXX_0 = @echo " CXX " $@; -+am__v_CXX_1 = - CXXLD = $(CXX) --CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ -+ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) -+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) -+am__v_CXXLD_0 = @echo " CXXLD " $@; -+am__v_CXXLD_1 = - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CFLAGS) $(CFLAGS) -+AM_V_CC = $(am__v_CC_@AM_V@) -+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -+am__v_CC_0 = @echo " CC " $@; -+am__v_CC_1 = - CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CCLD = $(am__v_CCLD_@AM_V@) -+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -+am__v_CCLD_0 = @echo " CCLD " $@; -+am__v_CCLD_1 = - SOURCES = $(libimagery_svm_la_SOURCES) - DIST_SOURCES = $(libimagery_svm_la_SOURCES) -+am__can_run_installinfo = \ -+ case $$AM_UPDATE_INFO_DIR in \ -+ n|no|NO) false;; \ -+ *) (install-info --version) >/dev/null 2>&1;; \ -+ esac -+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -+# Read a list of newline-separated strings from the standard input, -+# and print each of them once, without duplicates. Input order is -+# *not* preserved. -+am__uniquify_input = $(AWK) '\ -+ BEGIN { nonempty = 0; } \ -+ { items[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in items) print i; }; } \ -+' -+# Make sure the list of sources is unique. This is necessary because, -+# e.g., the same source file might be shared among _SOURCES variables -+# for different programs/libraries. -+am__define_uniq_tagged_files = \ -+ list='$(am__tagged_files)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | $(am__uniquify_input)` - ETAGS = etags - CTAGS = ctags - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ -+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ -@@ -126,6 +234,7 @@ CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DISABLELIBHARU = @DISABLELIBHARU@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -153,6 +262,7 @@ LOCAL_INCS = @LOCAL_INCS@ - LOCAL_LIBS = @LOCAL_LIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - NM = @NM@ - NMEDIT = @NMEDIT@ -@@ -165,6 +275,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - POW_LIB = @POW_LIB@ -@@ -190,6 +301,7 @@ abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -@@ -223,7 +335,6 @@ libdir = @libdir@ - libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -@@ -293,9 +404,9 @@ $(top_srcdir)/configure: $(am__configure_deps) - $(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - $(am__aclocal_m4_deps): -+ - install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" - @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ - list2=; for p in $$list; do \ - if test -f $$p; then \ -@@ -303,6 +414,8 @@ install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - else :; fi; \ - done; \ - test -z "$$list2" || { \ -+ echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \ -+ $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \ - } -@@ -318,14 +431,17 @@ uninstall-pkglibLTLIBRARIES: - - clean-pkglibLTLIBRARIES: - -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES) -- @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \ -- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -- echo "rm -f \"$${dir}/so_locations\""; \ -- rm -f "$${dir}/so_locations"; \ -- done --libimagery_svm.la: $(libimagery_svm_la_OBJECTS) $(libimagery_svm_la_DEPENDENCIES) -- $(CXXLINK) -rpath $(pkglibdir) $(libimagery_svm_la_OBJECTS) $(libimagery_svm_la_LIBADD) $(LIBS) -+ @list='$(pkglib_LTLIBRARIES)'; \ -+ locs=`for p in $$list; do echo $$p; done | \ -+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ -+ sort -u`; \ -+ test -z "$$locs" || { \ -+ echo rm -f $${locs}; \ -+ rm -f $${locs}; \ -+ } -+ -+libimagery_svm.la: $(libimagery_svm_la_OBJECTS) $(libimagery_svm_la_DEPENDENCIES) $(EXTRA_libimagery_svm_la_DEPENDENCIES) -+ $(AM_V_CXXLD)$(CXXLINK) -rpath $(pkglibdir) $(libimagery_svm_la_OBJECTS) $(libimagery_svm_la_LIBADD) $(LIBS) - - mostlyclean-compile: - -rm -f *.$(OBJEXT) -@@ -338,25 +454,25 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/svm_grids.Plo@am__quote@ - - .cpp.o: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< - - .cpp.obj: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - - .cpp.lo: --@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< - - mostlyclean-libtool: - -rm -f *.lo -@@ -364,26 +480,15 @@ mostlyclean-libtool: - clean-libtool: - -rm -rf .libs _libs - --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -+ID: $(am__tagged_files) -+ $(am__define_uniq_tagged_files); mkid -fID $$unique -+tags: tags-am -+TAGS: tags -+ -+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ -@@ -395,15 +500,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $$unique; \ - fi; \ - fi --ctags: CTAGS --CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ctags: ctags-am -+ -+CTAGS: ctags -+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) -+ $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique -@@ -412,6 +513,21 @@ GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -+cscopelist: cscopelist-am -+ -+cscopelist-am: $(am__tagged_files) -+ list='$(am__tagged_files)'; \ -+ case "$(srcdir)" in \ -+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ -+ *) sdir=$(subdir)/$(srcdir) ;; \ -+ esac; \ -+ for i in $$list; do \ -+ if test -f "$$i"; then \ -+ echo "$(subdir)/$$i"; \ -+ else \ -+ echo "$$sdir/$$i"; \ -+ fi; \ -+ done >> $(top_builddir)/cscope.files - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -@@ -463,10 +579,15 @@ install-am: all-am - - installcheck: installcheck-am - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+ if test -z '$(STRIP)'; then \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ install; \ -+ else \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -+ fi - mostlyclean-generic: - - clean-generic: -@@ -551,19 +672,20 @@ uninstall-am: uninstall-pkglibLTLIBRARIES - - .MAKE: install-am install-strip - --.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ -- clean-libtool clean-pkglibLTLIBRARIES ctags distclean \ -- distclean-compile distclean-generic distclean-libtool \ -- distclean-tags distdir dvi dvi-am html html-am info info-am \ -- install install-am install-data install-data-am install-dvi \ -- install-dvi-am install-exec install-exec-am install-html \ -- install-html-am install-info install-info-am install-man \ -- install-pdf install-pdf-am install-pkglibLTLIBRARIES \ -- install-ps install-ps-am install-strip installcheck \ -- installcheck-am installdirs maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-compile \ -- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -- tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES -+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ -+ clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \ -+ ctags-am distclean distclean-compile distclean-generic \ -+ distclean-libtool distclean-tags distdir dvi dvi-am html \ -+ html-am info info-am install install-am install-data \ -+ install-data-am install-dvi install-dvi-am install-exec \ -+ install-exec-am install-html install-html-am install-info \ -+ install-info-am install-man install-pdf install-pdf-am \ -+ install-pkglibLTLIBRARIES install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ maintainer-clean maintainer-clean-generic mostlyclean \ -+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ -+ pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ -+ uninstall-pkglibLTLIBRARIES - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff --git a/src/modules_images/modules_imagery/imagery_tools/Makefile.in b/src/modules_images/modules_imagery/imagery_tools/Makefile.in -index cbcefd1..089c99f 100644 ---- a/src/modules_images/modules_imagery/imagery_tools/Makefile.in -+++ b/src/modules_images/modules_imagery/imagery_tools/Makefile.in -@@ -1,9 +1,8 @@ --# Makefile.in generated by automake 1.11.1 from Makefile.am. -+# Makefile.in generated by automake 1.14 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, --# Inc. -+# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+ - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -16,6 +15,51 @@ - @SET_MAKE@ - - VPATH = @srcdir@ -+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -+am__make_running_with_option = \ -+ case $${target_option-} in \ -+ ?) ;; \ -+ *) echo "am__make_running_with_option: internal error: invalid" \ -+ "target option '$${target_option-}' specified" >&2; \ -+ exit 1;; \ -+ esac; \ -+ has_opt=no; \ -+ sane_makeflags=$$MAKEFLAGS; \ -+ if $(am__is_gnu_make); then \ -+ sane_makeflags=$$MFLAGS; \ -+ else \ -+ case $$MAKEFLAGS in \ -+ *\\[\ \ ]*) \ -+ bs=\\; \ -+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -+ esac; \ -+ fi; \ -+ skip_next=no; \ -+ strip_trailopt () \ -+ { \ -+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -+ }; \ -+ for flg in $$sane_makeflags; do \ -+ test $$skip_next = yes && { skip_next=no; continue; }; \ -+ case $$flg in \ -+ *=*|--*) continue;; \ -+ -*I) strip_trailopt 'I'; skip_next=yes;; \ -+ -*I?*) strip_trailopt 'I';; \ -+ -*O) strip_trailopt 'O'; skip_next=yes;; \ -+ -*O?*) strip_trailopt 'O';; \ -+ -*l) strip_trailopt 'l'; skip_next=yes;; \ -+ -*l?*) strip_trailopt 'l';; \ -+ -[dEDm]) skip_next=yes;; \ -+ -[JT]) skip_next=yes;; \ -+ esac; \ -+ case $$flg in \ -+ *$$target_option*) has_opt=yes; break;; \ -+ esac; \ -+ done; \ -+ test $$has_opt = yes -+am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -+am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -35,7 +79,8 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - subdir = src/modules_images/modules_imagery/imagery_tools --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ -+ $(top_srcdir)/depcomp - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ - $(top_srcdir)/m4/ax_python_devel.m4 \ -@@ -71,6 +116,12 @@ am__nobase_list = $(am__nobase_strip_setup); \ - am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -+am__uninstall_files_from_dir = { \ -+ test -z "$$files" \ -+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ -+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ -+ $(am__cd) "$$dir" && rm -f $$files; }; \ -+ } - am__installdirs = "$(DESTDIR)$(pkglibdir)" - LTLIBRARIES = $(pkglib_LTLIBRARIES) - libimagery_tools_la_DEPENDENCIES = \ -@@ -80,35 +131,92 @@ am_libimagery_tools_la_OBJECTS = evi.lo Image_VI_Distance.lo \ - landsat_toar_core.lo MLB_Interface.lo pansharpening.lo \ - tasseled_cap.lo - libimagery_tools_la_OBJECTS = $(am_libimagery_tools_la_OBJECTS) -+AM_V_lt = $(am__v_lt_@AM_V@) -+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -+am__v_lt_0 = --silent -+am__v_lt_1 = -+AM_V_P = $(am__v_P_@AM_V@) -+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -+am__v_P_0 = false -+am__v_P_1 = : -+AM_V_GEN = $(am__v_GEN_@AM_V@) -+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+am__v_GEN_0 = @echo " GEN " $@; -+am__v_GEN_1 = -+AM_V_at = $(am__v_at_@AM_V@) -+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+am__v_at_0 = @ -+am__v_at_1 = - DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - am__mv = mv -f - CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) --LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CXXFLAGS) $(CXXFLAGS) -+AM_V_CXX = $(am__v_CXX_@AM_V@) -+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) -+am__v_CXX_0 = @echo " CXX " $@; -+am__v_CXX_1 = - CXXLD = $(CXX) --CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ -+ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) -+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) -+am__v_CXXLD_0 = @echo " CXXLD " $@; -+am__v_CXXLD_1 = - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CFLAGS) $(CFLAGS) -+AM_V_CC = $(am__v_CC_@AM_V@) -+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -+am__v_CC_0 = @echo " CC " $@; -+am__v_CC_1 = - CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CCLD = $(am__v_CCLD_@AM_V@) -+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -+am__v_CCLD_0 = @echo " CCLD " $@; -+am__v_CCLD_1 = - SOURCES = $(libimagery_tools_la_SOURCES) - DIST_SOURCES = $(libimagery_tools_la_SOURCES) -+am__can_run_installinfo = \ -+ case $$AM_UPDATE_INFO_DIR in \ -+ n|no|NO) false;; \ -+ *) (install-info --version) >/dev/null 2>&1;; \ -+ esac -+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -+# Read a list of newline-separated strings from the standard input, -+# and print each of them once, without duplicates. Input order is -+# *not* preserved. -+am__uniquify_input = $(AWK) '\ -+ BEGIN { nonempty = 0; } \ -+ { items[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in items) print i; }; } \ -+' -+# Make sure the list of sources is unique. This is necessary because, -+# e.g., the same source file might be shared among _SOURCES variables -+# for different programs/libraries. -+am__define_uniq_tagged_files = \ -+ list='$(am__tagged_files)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | $(am__uniquify_input)` - ETAGS = etags - CTAGS = ctags - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ -+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ -@@ -129,6 +237,7 @@ CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DISABLELIBHARU = @DISABLELIBHARU@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -156,6 +265,7 @@ LOCAL_INCS = @LOCAL_INCS@ - LOCAL_LIBS = @LOCAL_LIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - NM = @NM@ - NMEDIT = @NMEDIT@ -@@ -168,6 +278,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - POW_LIB = @POW_LIB@ -@@ -193,6 +304,7 @@ abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -@@ -226,7 +338,6 @@ libdir = @libdir@ - libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -@@ -308,9 +419,9 @@ $(top_srcdir)/configure: $(am__configure_deps) - $(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - $(am__aclocal_m4_deps): -+ - install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" - @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ - list2=; for p in $$list; do \ - if test -f $$p; then \ -@@ -318,6 +429,8 @@ install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - else :; fi; \ - done; \ - test -z "$$list2" || { \ -+ echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \ -+ $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \ - } -@@ -333,14 +446,17 @@ uninstall-pkglibLTLIBRARIES: - - clean-pkglibLTLIBRARIES: - -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES) -- @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \ -- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -- echo "rm -f \"$${dir}/so_locations\""; \ -- rm -f "$${dir}/so_locations"; \ -- done --libimagery_tools.la: $(libimagery_tools_la_OBJECTS) $(libimagery_tools_la_DEPENDENCIES) -- $(CXXLINK) -rpath $(pkglibdir) $(libimagery_tools_la_OBJECTS) $(libimagery_tools_la_LIBADD) $(LIBS) -+ @list='$(pkglib_LTLIBRARIES)'; \ -+ locs=`for p in $$list; do echo $$p; done | \ -+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ -+ sort -u`; \ -+ test -z "$$locs" || { \ -+ echo rm -f $${locs}; \ -+ rm -f $${locs}; \ -+ } -+ -+libimagery_tools.la: $(libimagery_tools_la_OBJECTS) $(libimagery_tools_la_DEPENDENCIES) $(EXTRA_libimagery_tools_la_DEPENDENCIES) -+ $(AM_V_CXXLD)$(CXXLINK) -rpath $(pkglibdir) $(libimagery_tools_la_OBJECTS) $(libimagery_tools_la_LIBADD) $(LIBS) - - mostlyclean-compile: - -rm -f *.$(OBJEXT) -@@ -359,25 +475,25 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tasseled_cap.Plo@am__quote@ - - .cpp.o: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< - - .cpp.obj: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - - .cpp.lo: --@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< - - mostlyclean-libtool: - -rm -f *.lo -@@ -385,26 +501,15 @@ mostlyclean-libtool: - clean-libtool: - -rm -rf .libs _libs - --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -+ID: $(am__tagged_files) -+ $(am__define_uniq_tagged_files); mkid -fID $$unique -+tags: tags-am -+TAGS: tags -+ -+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ -@@ -416,15 +521,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $$unique; \ - fi; \ - fi --ctags: CTAGS --CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ctags: ctags-am -+ -+CTAGS: ctags -+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) -+ $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique -@@ -433,6 +534,21 @@ GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -+cscopelist: cscopelist-am -+ -+cscopelist-am: $(am__tagged_files) -+ list='$(am__tagged_files)'; \ -+ case "$(srcdir)" in \ -+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ -+ *) sdir=$(subdir)/$(srcdir) ;; \ -+ esac; \ -+ for i in $$list; do \ -+ if test -f "$$i"; then \ -+ echo "$(subdir)/$$i"; \ -+ else \ -+ echo "$$sdir/$$i"; \ -+ fi; \ -+ done >> $(top_builddir)/cscope.files - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -@@ -484,10 +600,15 @@ install-am: all-am - - installcheck: installcheck-am - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+ if test -z '$(STRIP)'; then \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ install; \ -+ else \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -+ fi - mostlyclean-generic: - - clean-generic: -@@ -572,19 +693,20 @@ uninstall-am: uninstall-pkglibLTLIBRARIES - - .MAKE: install-am install-strip - --.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ -- clean-libtool clean-pkglibLTLIBRARIES ctags distclean \ -- distclean-compile distclean-generic distclean-libtool \ -- distclean-tags distdir dvi dvi-am html html-am info info-am \ -- install install-am install-data install-data-am install-dvi \ -- install-dvi-am install-exec install-exec-am install-html \ -- install-html-am install-info install-info-am install-man \ -- install-pdf install-pdf-am install-pkglibLTLIBRARIES \ -- install-ps install-ps-am install-strip installcheck \ -- installcheck-am installdirs maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-compile \ -- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -- tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES -+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ -+ clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \ -+ ctags-am distclean distclean-compile distclean-generic \ -+ distclean-libtool distclean-tags distdir dvi dvi-am html \ -+ html-am info info-am install install-am install-data \ -+ install-data-am install-dvi install-dvi-am install-exec \ -+ install-exec-am install-html install-html-am install-info \ -+ install-info-am install-man install-pdf install-pdf-am \ -+ install-pkglibLTLIBRARIES install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ maintainer-clean maintainer-clean-generic mostlyclean \ -+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ -+ pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ -+ uninstall-pkglibLTLIBRARIES - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff --git a/src/modules_images/modules_opencv/Makefile.in b/src/modules_images/modules_opencv/Makefile.in -index 275bfbc..e9ff14e 100644 ---- a/src/modules_images/modules_opencv/Makefile.in -+++ b/src/modules_images/modules_opencv/Makefile.in -@@ -1,9 +1,8 @@ --# Makefile.in generated by automake 1.11.1 from Makefile.am. -+# Makefile.in generated by automake 1.14 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, --# Inc. -+# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+ - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -15,6 +14,51 @@ - - @SET_MAKE@ - VPATH = @srcdir@ -+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -+am__make_running_with_option = \ -+ case $${target_option-} in \ -+ ?) ;; \ -+ *) echo "am__make_running_with_option: internal error: invalid" \ -+ "target option '$${target_option-}' specified" >&2; \ -+ exit 1;; \ -+ esac; \ -+ has_opt=no; \ -+ sane_makeflags=$$MAKEFLAGS; \ -+ if $(am__is_gnu_make); then \ -+ sane_makeflags=$$MFLAGS; \ -+ else \ -+ case $$MAKEFLAGS in \ -+ *\\[\ \ ]*) \ -+ bs=\\; \ -+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -+ esac; \ -+ fi; \ -+ skip_next=no; \ -+ strip_trailopt () \ -+ { \ -+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -+ }; \ -+ for flg in $$sane_makeflags; do \ -+ test $$skip_next = yes && { skip_next=no; continue; }; \ -+ case $$flg in \ -+ *=*|--*) continue;; \ -+ -*I) strip_trailopt 'I'; skip_next=yes;; \ -+ -*I?*) strip_trailopt 'I';; \ -+ -*O) strip_trailopt 'O'; skip_next=yes;; \ -+ -*O?*) strip_trailopt 'O';; \ -+ -*l) strip_trailopt 'l'; skip_next=yes;; \ -+ -*l?*) strip_trailopt 'l';; \ -+ -[dEDm]) skip_next=yes;; \ -+ -[JT]) skip_next=yes;; \ -+ esac; \ -+ case $$flg in \ -+ *$$target_option*) has_opt=yes; break;; \ -+ esac; \ -+ done; \ -+ test $$has_opt = yes -+am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -+am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -34,7 +78,7 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - subdir = src/modules_images/modules_opencv --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ - $(top_srcdir)/m4/ax_python_devel.m4 \ -@@ -49,20 +93,58 @@ mkinstalldirs = $(install_sh) -d - CONFIG_HEADER = $(top_builddir)/config.h - CONFIG_CLEAN_FILES = - CONFIG_CLEAN_VPATH_FILES = -+AM_V_P = $(am__v_P_@AM_V@) -+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -+am__v_P_0 = false -+am__v_P_1 = : -+AM_V_GEN = $(am__v_GEN_@AM_V@) -+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+am__v_GEN_0 = @echo " GEN " $@; -+am__v_GEN_1 = -+AM_V_at = $(am__v_at_@AM_V@) -+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+am__v_at_0 = @ -+am__v_at_1 = - SOURCES = - DIST_SOURCES = --RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ -- html-recursive info-recursive install-data-recursive \ -- install-dvi-recursive install-exec-recursive \ -- install-html-recursive install-info-recursive \ -- install-pdf-recursive install-ps-recursive install-recursive \ -- installcheck-recursive installdirs-recursive pdf-recursive \ -- ps-recursive uninstall-recursive -+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ -+ ctags-recursive dvi-recursive html-recursive info-recursive \ -+ install-data-recursive install-dvi-recursive \ -+ install-exec-recursive install-html-recursive \ -+ install-info-recursive install-pdf-recursive \ -+ install-ps-recursive install-recursive installcheck-recursive \ -+ installdirs-recursive pdf-recursive ps-recursive \ -+ tags-recursive uninstall-recursive -+am__can_run_installinfo = \ -+ case $$AM_UPDATE_INFO_DIR in \ -+ n|no|NO) false;; \ -+ *) (install-info --version) >/dev/null 2>&1;; \ -+ esac - RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ - distclean-recursive maintainer-clean-recursive --AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ -- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ -+am__recursive_targets = \ -+ $(RECURSIVE_TARGETS) \ -+ $(RECURSIVE_CLEAN_TARGETS) \ -+ $(am__extra_recursive_targets) -+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ - distdir -+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -+# Read a list of newline-separated strings from the standard input, -+# and print each of them once, without duplicates. Input order is -+# *not* preserved. -+am__uniquify_input = $(AWK) '\ -+ BEGIN { nonempty = 0; } \ -+ { items[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in items) print i; }; } \ -+' -+# Make sure the list of sources is unique. This is necessary because, -+# e.g., the same source file might be shared among _SOURCES variables -+# for different programs/libraries. -+am__define_uniq_tagged_files = \ -+ list='$(am__tagged_files)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | $(am__uniquify_input)` - ETAGS = etags - CTAGS = ctags - DIST_SUBDIRS = $(SUBDIRS) -@@ -94,6 +176,7 @@ am__relativize = \ - reldir="$$dir2" - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ -+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ -@@ -114,6 +197,7 @@ CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DISABLELIBHARU = @DISABLELIBHARU@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -141,6 +225,7 @@ LOCAL_INCS = @LOCAL_INCS@ - LOCAL_LIBS = @LOCAL_LIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - NM = @NM@ - NMEDIT = @NMEDIT@ -@@ -153,6 +238,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - POW_LIB = @POW_LIB@ -@@ -178,6 +264,7 @@ abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -@@ -211,7 +298,6 @@ libdir = @libdir@ - libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -@@ -273,22 +359,25 @@ clean-libtool: - -rm -rf .libs _libs - - # This directory's subdirectories are mostly independent; you can cd --# into them and run `make' without going through this Makefile. --# To change the values of `make' variables: instead of editing Makefiles, --# (1) if the variable is set in `config.status', edit `config.status' --# (which will cause the Makefiles to be regenerated when you run `make'); --# (2) otherwise, pass the desired values on the `make' command line. --$(RECURSIVE_TARGETS): -- @fail= failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -+# into them and run 'make' without going through this Makefile. -+# To change the values of 'make' variables: instead of editing Makefiles, -+# (1) if the variable is set in 'config.status', edit 'config.status' -+# (which will cause the Makefiles to be regenerated when you run 'make'); -+# (2) otherwise, pass the desired values on the 'make' command line. -+$(am__recursive_targets): -+ @fail=; \ -+ if $(am__make_keepgoing); then \ -+ failcom='fail=yes'; \ -+ else \ -+ failcom='exit 1'; \ -+ fi; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ -- list='$(SUBDIRS)'; for subdir in $$list; do \ -+ case "$@" in \ -+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -+ *) list='$(SUBDIRS)' ;; \ -+ esac; \ -+ for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ -@@ -303,57 +392,12 @@ $(RECURSIVE_TARGETS): - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - --$(RECURSIVE_CLEAN_TARGETS): -- @fail= failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -- dot_seen=no; \ -- case "$@" in \ -- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -- *) list='$(SUBDIRS)' ;; \ -- esac; \ -- rev=''; for subdir in $$list; do \ -- if test "$$subdir" = "."; then :; else \ -- rev="$$subdir $$rev"; \ -- fi; \ -- done; \ -- rev="$$rev ."; \ -- target=`echo $@ | sed s/-recursive//`; \ -- for subdir in $$rev; do \ -- echo "Making $$target in $$subdir"; \ -- if test "$$subdir" = "."; then \ -- local_target="$$target-am"; \ -- else \ -- local_target="$$target"; \ -- fi; \ -- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || eval $$failcom; \ -- done && test -z "$$fail" --tags-recursive: -- list='$(SUBDIRS)'; for subdir in $$list; do \ -- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ -- done --ctags-recursive: -- list='$(SUBDIRS)'; for subdir in $$list; do \ -- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ -- done -+ID: $(am__tagged_files) -+ $(am__define_uniq_tagged_files); mkid -fID $$unique -+tags: tags-recursive -+TAGS: tags - --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ - if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ -@@ -369,12 +413,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ -@@ -386,15 +425,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $$unique; \ - fi; \ - fi --ctags: CTAGS --CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ctags: ctags-recursive -+ -+CTAGS: ctags -+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) -+ $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique -@@ -403,6 +438,21 @@ GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -+cscopelist: cscopelist-recursive -+ -+cscopelist-am: $(am__tagged_files) -+ list='$(am__tagged_files)'; \ -+ case "$(srcdir)" in \ -+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ -+ *) sdir=$(subdir)/$(srcdir) ;; \ -+ esac; \ -+ for i in $$list; do \ -+ if test -f "$$i"; then \ -+ echo "$(subdir)/$$i"; \ -+ else \ -+ echo "$$sdir/$$i"; \ -+ fi; \ -+ done >> $(top_builddir)/cscope.files - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -@@ -439,13 +489,10 @@ distdir: $(DISTFILES) - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test -d "$(distdir)/$$subdir" \ -- || $(MKDIR_P) "$(distdir)/$$subdir" \ -- || exit 1; \ -- fi; \ -- done -- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ -- if test "$$subdir" = .; then :; else \ -+ $(am__make_dryrun) \ -+ || test -d "$(distdir)/$$subdir" \ -+ || $(MKDIR_P) "$(distdir)/$$subdir" \ -+ || exit 1; \ - dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ - $(am__relativize); \ - new_distdir=$$reldir; \ -@@ -480,10 +527,15 @@ install-am: all-am - - installcheck: installcheck-recursive - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+ if test -z '$(STRIP)'; then \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ install; \ -+ else \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -+ fi - mostlyclean-generic: - - clean-generic: -@@ -561,22 +613,20 @@ ps-am: - - uninstall-am: - --.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ -- install-am install-strip tags-recursive -- --.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ -- all all-am check check-am clean clean-generic clean-libtool \ -- ctags ctags-recursive distclean distclean-generic \ -- distclean-libtool distclean-tags distdir dvi dvi-am html \ -- html-am info info-am install install-am install-data \ -- install-data-am install-dvi install-dvi-am install-exec \ -- install-exec-am install-html install-html-am install-info \ -- install-info-am install-man install-pdf install-pdf-am \ -- install-ps install-ps-am install-strip installcheck \ -- installcheck-am installdirs installdirs-am maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-generic \ -- mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ -- uninstall uninstall-am -+.MAKE: $(am__recursive_targets) install-am install-strip -+ -+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ -+ check-am clean clean-generic clean-libtool cscopelist-am ctags \ -+ ctags-am distclean distclean-generic distclean-libtool \ -+ distclean-tags distdir dvi dvi-am html html-am info info-am \ -+ install install-am install-data install-data-am install-dvi \ -+ install-dvi-am install-exec install-exec-am install-html \ -+ install-html-am install-info install-info-am install-man \ -+ install-pdf install-pdf-am install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ installdirs-am maintainer-clean maintainer-clean-generic \ -+ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ -+ ps ps-am tags tags-am uninstall uninstall-am - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff --git a/src/modules_images/modules_opencv/opencv/Makefile.in b/src/modules_images/modules_opencv/opencv/Makefile.in -index 6af45e8..f6b3410 100644 ---- a/src/modules_images/modules_opencv/opencv/Makefile.in -+++ b/src/modules_images/modules_opencv/opencv/Makefile.in -@@ -1,9 +1,8 @@ --# Makefile.in generated by automake 1.11.1 from Makefile.am. -+# Makefile.in generated by automake 1.14 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, --# Inc. -+# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+ - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -16,6 +15,51 @@ - @SET_MAKE@ - - VPATH = @srcdir@ -+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -+am__make_running_with_option = \ -+ case $${target_option-} in \ -+ ?) ;; \ -+ *) echo "am__make_running_with_option: internal error: invalid" \ -+ "target option '$${target_option-}' specified" >&2; \ -+ exit 1;; \ -+ esac; \ -+ has_opt=no; \ -+ sane_makeflags=$$MAKEFLAGS; \ -+ if $(am__is_gnu_make); then \ -+ sane_makeflags=$$MFLAGS; \ -+ else \ -+ case $$MAKEFLAGS in \ -+ *\\[\ \ ]*) \ -+ bs=\\; \ -+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -+ esac; \ -+ fi; \ -+ skip_next=no; \ -+ strip_trailopt () \ -+ { \ -+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -+ }; \ -+ for flg in $$sane_makeflags; do \ -+ test $$skip_next = yes && { skip_next=no; continue; }; \ -+ case $$flg in \ -+ *=*|--*) continue;; \ -+ -*I) strip_trailopt 'I'; skip_next=yes;; \ -+ -*I?*) strip_trailopt 'I';; \ -+ -*O) strip_trailopt 'O'; skip_next=yes;; \ -+ -*O?*) strip_trailopt 'O';; \ -+ -*l) strip_trailopt 'l'; skip_next=yes;; \ -+ -*l?*) strip_trailopt 'l';; \ -+ -[dEDm]) skip_next=yes;; \ -+ -[JT]) skip_next=yes;; \ -+ esac; \ -+ case $$flg in \ -+ *$$target_option*) has_opt=yes; break;; \ -+ esac; \ -+ done; \ -+ test $$has_opt = yes -+am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -+am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -35,7 +79,8 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - subdir = src/modules_images/modules_opencv/opencv --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ -+ $(top_srcdir)/depcomp - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ - $(top_srcdir)/m4/ax_python_devel.m4 \ -@@ -71,6 +116,12 @@ am__nobase_list = $(am__nobase_strip_setup); \ - am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -+am__uninstall_files_from_dir = { \ -+ test -z "$$files" \ -+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ -+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ -+ $(am__cd) "$$dir" && rm -f $$files; }; \ -+ } - am__installdirs = "$(DESTDIR)$(pkglibdir)" - LTLIBRARIES = $(pkglib_LTLIBRARIES) - @HAVE_CV_TRUE@libopencv_la_DEPENDENCIES = $(top_srcdir)/src/saga_core/saga_api/libsaga_api.la -@@ -82,36 +133,93 @@ am__libopencv_la_SOURCES_DIST = MLB_Interface.cpp opencv.cpp \ - @HAVE_CV_TRUE@ opencv_fourier.lo opencv_morphology.lo \ - @HAVE_CV_TRUE@ opencv_svd.lo - libopencv_la_OBJECTS = $(am_libopencv_la_OBJECTS) -+AM_V_lt = $(am__v_lt_@AM_V@) -+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -+am__v_lt_0 = --silent -+am__v_lt_1 = - @HAVE_CV_TRUE@am_libopencv_la_rpath = -rpath $(pkglibdir) -+AM_V_P = $(am__v_P_@AM_V@) -+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -+am__v_P_0 = false -+am__v_P_1 = : -+AM_V_GEN = $(am__v_GEN_@AM_V@) -+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+am__v_GEN_0 = @echo " GEN " $@; -+am__v_GEN_1 = -+AM_V_at = $(am__v_at_@AM_V@) -+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+am__v_at_0 = @ -+am__v_at_1 = - DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - am__mv = mv -f - CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) --LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CXXFLAGS) $(CXXFLAGS) -+AM_V_CXX = $(am__v_CXX_@AM_V@) -+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) -+am__v_CXX_0 = @echo " CXX " $@; -+am__v_CXX_1 = - CXXLD = $(CXX) --CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ -+ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) -+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) -+am__v_CXXLD_0 = @echo " CXXLD " $@; -+am__v_CXXLD_1 = - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CFLAGS) $(CFLAGS) -+AM_V_CC = $(am__v_CC_@AM_V@) -+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -+am__v_CC_0 = @echo " CC " $@; -+am__v_CC_1 = - CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CCLD = $(am__v_CCLD_@AM_V@) -+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -+am__v_CCLD_0 = @echo " CCLD " $@; -+am__v_CCLD_1 = - SOURCES = $(libopencv_la_SOURCES) - DIST_SOURCES = $(am__libopencv_la_SOURCES_DIST) -+am__can_run_installinfo = \ -+ case $$AM_UPDATE_INFO_DIR in \ -+ n|no|NO) false;; \ -+ *) (install-info --version) >/dev/null 2>&1;; \ -+ esac -+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -+# Read a list of newline-separated strings from the standard input, -+# and print each of them once, without duplicates. Input order is -+# *not* preserved. -+am__uniquify_input = $(AWK) '\ -+ BEGIN { nonempty = 0; } \ -+ { items[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in items) print i; }; } \ -+' -+# Make sure the list of sources is unique. This is necessary because, -+# e.g., the same source file might be shared among _SOURCES variables -+# for different programs/libraries. -+am__define_uniq_tagged_files = \ -+ list='$(am__tagged_files)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | $(am__uniquify_input)` - ETAGS = etags - CTAGS = ctags - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ -+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ -@@ -132,6 +240,7 @@ CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DISABLELIBHARU = @DISABLELIBHARU@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -159,6 +268,7 @@ LOCAL_INCS = @LOCAL_INCS@ - LOCAL_LIBS = @LOCAL_LIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - NM = @NM@ - NMEDIT = @NMEDIT@ -@@ -171,6 +281,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - POW_LIB = @POW_LIB@ -@@ -196,6 +307,7 @@ abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -@@ -229,7 +341,6 @@ libdir = @libdir@ - libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -@@ -307,9 +418,9 @@ $(top_srcdir)/configure: $(am__configure_deps) - $(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - $(am__aclocal_m4_deps): -+ - install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" - @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ - list2=; for p in $$list; do \ - if test -f $$p; then \ -@@ -317,6 +428,8 @@ install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - else :; fi; \ - done; \ - test -z "$$list2" || { \ -+ echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \ -+ $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \ - } -@@ -332,14 +445,17 @@ uninstall-pkglibLTLIBRARIES: - - clean-pkglibLTLIBRARIES: - -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES) -- @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \ -- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -- echo "rm -f \"$${dir}/so_locations\""; \ -- rm -f "$${dir}/so_locations"; \ -- done --libopencv.la: $(libopencv_la_OBJECTS) $(libopencv_la_DEPENDENCIES) -- $(CXXLINK) $(am_libopencv_la_rpath) $(libopencv_la_OBJECTS) $(libopencv_la_LIBADD) $(LIBS) -+ @list='$(pkglib_LTLIBRARIES)'; \ -+ locs=`for p in $$list; do echo $$p; done | \ -+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ -+ sort -u`; \ -+ test -z "$$locs" || { \ -+ echo rm -f $${locs}; \ -+ rm -f $${locs}; \ -+ } -+ -+libopencv.la: $(libopencv_la_OBJECTS) $(libopencv_la_DEPENDENCIES) $(EXTRA_libopencv_la_DEPENDENCIES) -+ $(AM_V_CXXLD)$(CXXLINK) $(am_libopencv_la_rpath) $(libopencv_la_OBJECTS) $(libopencv_la_LIBADD) $(LIBS) - - mostlyclean-compile: - -rm -f *.$(OBJEXT) -@@ -354,25 +470,25 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/opencv_svd.Plo@am__quote@ - - .cpp.o: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< - - .cpp.obj: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - - .cpp.lo: --@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< - - mostlyclean-libtool: - -rm -f *.lo -@@ -380,26 +496,15 @@ mostlyclean-libtool: - clean-libtool: - -rm -rf .libs _libs - --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -+ID: $(am__tagged_files) -+ $(am__define_uniq_tagged_files); mkid -fID $$unique -+tags: tags-am -+TAGS: tags -+ -+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ -@@ -411,15 +516,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $$unique; \ - fi; \ - fi --ctags: CTAGS --CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ctags: ctags-am -+ -+CTAGS: ctags -+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) -+ $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique -@@ -428,6 +529,21 @@ GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -+cscopelist: cscopelist-am -+ -+cscopelist-am: $(am__tagged_files) -+ list='$(am__tagged_files)'; \ -+ case "$(srcdir)" in \ -+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ -+ *) sdir=$(subdir)/$(srcdir) ;; \ -+ esac; \ -+ for i in $$list; do \ -+ if test -f "$$i"; then \ -+ echo "$(subdir)/$$i"; \ -+ else \ -+ echo "$$sdir/$$i"; \ -+ fi; \ -+ done >> $(top_builddir)/cscope.files - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -@@ -479,10 +595,15 @@ install-am: all-am - - installcheck: installcheck-am - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+ if test -z '$(STRIP)'; then \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ install; \ -+ else \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -+ fi - mostlyclean-generic: - - clean-generic: -@@ -567,19 +688,20 @@ uninstall-am: uninstall-pkglibLTLIBRARIES - - .MAKE: install-am install-strip - --.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ -- clean-libtool clean-pkglibLTLIBRARIES ctags distclean \ -- distclean-compile distclean-generic distclean-libtool \ -- distclean-tags distdir dvi dvi-am html html-am info info-am \ -- install install-am install-data install-data-am install-dvi \ -- install-dvi-am install-exec install-exec-am install-html \ -- install-html-am install-info install-info-am install-man \ -- install-pdf install-pdf-am install-pkglibLTLIBRARIES \ -- install-ps install-ps-am install-strip installcheck \ -- installcheck-am installdirs maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-compile \ -- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -- tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES -+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ -+ clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \ -+ ctags-am distclean distclean-compile distclean-generic \ -+ distclean-libtool distclean-tags distdir dvi dvi-am html \ -+ html-am info info-am install install-am install-data \ -+ install-data-am install-dvi install-dvi-am install-exec \ -+ install-exec-am install-html install-html-am install-info \ -+ install-info-am install-man install-pdf install-pdf-am \ -+ install-pkglibLTLIBRARIES install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ maintainer-clean maintainer-clean-generic mostlyclean \ -+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ -+ pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ -+ uninstall-pkglibLTLIBRARIES - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff --git a/src/modules_images/modules_vigra/Makefile.in b/src/modules_images/modules_vigra/Makefile.in -index 202f250..29ad50a 100644 ---- a/src/modules_images/modules_vigra/Makefile.in -+++ b/src/modules_images/modules_vigra/Makefile.in -@@ -1,9 +1,8 @@ --# Makefile.in generated by automake 1.11.1 from Makefile.am. -+# Makefile.in generated by automake 1.14 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, --# Inc. -+# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+ - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -15,6 +14,51 @@ - - @SET_MAKE@ - VPATH = @srcdir@ -+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -+am__make_running_with_option = \ -+ case $${target_option-} in \ -+ ?) ;; \ -+ *) echo "am__make_running_with_option: internal error: invalid" \ -+ "target option '$${target_option-}' specified" >&2; \ -+ exit 1;; \ -+ esac; \ -+ has_opt=no; \ -+ sane_makeflags=$$MAKEFLAGS; \ -+ if $(am__is_gnu_make); then \ -+ sane_makeflags=$$MFLAGS; \ -+ else \ -+ case $$MAKEFLAGS in \ -+ *\\[\ \ ]*) \ -+ bs=\\; \ -+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -+ esac; \ -+ fi; \ -+ skip_next=no; \ -+ strip_trailopt () \ -+ { \ -+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -+ }; \ -+ for flg in $$sane_makeflags; do \ -+ test $$skip_next = yes && { skip_next=no; continue; }; \ -+ case $$flg in \ -+ *=*|--*) continue;; \ -+ -*I) strip_trailopt 'I'; skip_next=yes;; \ -+ -*I?*) strip_trailopt 'I';; \ -+ -*O) strip_trailopt 'O'; skip_next=yes;; \ -+ -*O?*) strip_trailopt 'O';; \ -+ -*l) strip_trailopt 'l'; skip_next=yes;; \ -+ -*l?*) strip_trailopt 'l';; \ -+ -[dEDm]) skip_next=yes;; \ -+ -[JT]) skip_next=yes;; \ -+ esac; \ -+ case $$flg in \ -+ *$$target_option*) has_opt=yes; break;; \ -+ esac; \ -+ done; \ -+ test $$has_opt = yes -+am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -+am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -34,7 +78,7 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - subdir = src/modules_images/modules_vigra --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ - $(top_srcdir)/m4/ax_python_devel.m4 \ -@@ -49,20 +93,58 @@ mkinstalldirs = $(install_sh) -d - CONFIG_HEADER = $(top_builddir)/config.h - CONFIG_CLEAN_FILES = - CONFIG_CLEAN_VPATH_FILES = -+AM_V_P = $(am__v_P_@AM_V@) -+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -+am__v_P_0 = false -+am__v_P_1 = : -+AM_V_GEN = $(am__v_GEN_@AM_V@) -+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+am__v_GEN_0 = @echo " GEN " $@; -+am__v_GEN_1 = -+AM_V_at = $(am__v_at_@AM_V@) -+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+am__v_at_0 = @ -+am__v_at_1 = - SOURCES = - DIST_SOURCES = --RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ -- html-recursive info-recursive install-data-recursive \ -- install-dvi-recursive install-exec-recursive \ -- install-html-recursive install-info-recursive \ -- install-pdf-recursive install-ps-recursive install-recursive \ -- installcheck-recursive installdirs-recursive pdf-recursive \ -- ps-recursive uninstall-recursive -+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ -+ ctags-recursive dvi-recursive html-recursive info-recursive \ -+ install-data-recursive install-dvi-recursive \ -+ install-exec-recursive install-html-recursive \ -+ install-info-recursive install-pdf-recursive \ -+ install-ps-recursive install-recursive installcheck-recursive \ -+ installdirs-recursive pdf-recursive ps-recursive \ -+ tags-recursive uninstall-recursive -+am__can_run_installinfo = \ -+ case $$AM_UPDATE_INFO_DIR in \ -+ n|no|NO) false;; \ -+ *) (install-info --version) >/dev/null 2>&1;; \ -+ esac - RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ - distclean-recursive maintainer-clean-recursive --AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ -- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ -+am__recursive_targets = \ -+ $(RECURSIVE_TARGETS) \ -+ $(RECURSIVE_CLEAN_TARGETS) \ -+ $(am__extra_recursive_targets) -+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ - distdir -+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -+# Read a list of newline-separated strings from the standard input, -+# and print each of them once, without duplicates. Input order is -+# *not* preserved. -+am__uniquify_input = $(AWK) '\ -+ BEGIN { nonempty = 0; } \ -+ { items[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in items) print i; }; } \ -+' -+# Make sure the list of sources is unique. This is necessary because, -+# e.g., the same source file might be shared among _SOURCES variables -+# for different programs/libraries. -+am__define_uniq_tagged_files = \ -+ list='$(am__tagged_files)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | $(am__uniquify_input)` - ETAGS = etags - CTAGS = ctags - DIST_SUBDIRS = $(SUBDIRS) -@@ -94,6 +176,7 @@ am__relativize = \ - reldir="$$dir2" - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ -+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ -@@ -114,6 +197,7 @@ CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DISABLELIBHARU = @DISABLELIBHARU@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -141,6 +225,7 @@ LOCAL_INCS = @LOCAL_INCS@ - LOCAL_LIBS = @LOCAL_LIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - NM = @NM@ - NMEDIT = @NMEDIT@ -@@ -153,6 +238,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - POW_LIB = @POW_LIB@ -@@ -178,6 +264,7 @@ abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -@@ -211,7 +298,6 @@ libdir = @libdir@ - libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -@@ -273,22 +359,25 @@ clean-libtool: - -rm -rf .libs _libs - - # This directory's subdirectories are mostly independent; you can cd --# into them and run `make' without going through this Makefile. --# To change the values of `make' variables: instead of editing Makefiles, --# (1) if the variable is set in `config.status', edit `config.status' --# (which will cause the Makefiles to be regenerated when you run `make'); --# (2) otherwise, pass the desired values on the `make' command line. --$(RECURSIVE_TARGETS): -- @fail= failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -+# into them and run 'make' without going through this Makefile. -+# To change the values of 'make' variables: instead of editing Makefiles, -+# (1) if the variable is set in 'config.status', edit 'config.status' -+# (which will cause the Makefiles to be regenerated when you run 'make'); -+# (2) otherwise, pass the desired values on the 'make' command line. -+$(am__recursive_targets): -+ @fail=; \ -+ if $(am__make_keepgoing); then \ -+ failcom='fail=yes'; \ -+ else \ -+ failcom='exit 1'; \ -+ fi; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ -- list='$(SUBDIRS)'; for subdir in $$list; do \ -+ case "$@" in \ -+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -+ *) list='$(SUBDIRS)' ;; \ -+ esac; \ -+ for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ -@@ -303,57 +392,12 @@ $(RECURSIVE_TARGETS): - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - --$(RECURSIVE_CLEAN_TARGETS): -- @fail= failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -- dot_seen=no; \ -- case "$@" in \ -- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -- *) list='$(SUBDIRS)' ;; \ -- esac; \ -- rev=''; for subdir in $$list; do \ -- if test "$$subdir" = "."; then :; else \ -- rev="$$subdir $$rev"; \ -- fi; \ -- done; \ -- rev="$$rev ."; \ -- target=`echo $@ | sed s/-recursive//`; \ -- for subdir in $$rev; do \ -- echo "Making $$target in $$subdir"; \ -- if test "$$subdir" = "."; then \ -- local_target="$$target-am"; \ -- else \ -- local_target="$$target"; \ -- fi; \ -- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || eval $$failcom; \ -- done && test -z "$$fail" --tags-recursive: -- list='$(SUBDIRS)'; for subdir in $$list; do \ -- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ -- done --ctags-recursive: -- list='$(SUBDIRS)'; for subdir in $$list; do \ -- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ -- done -+ID: $(am__tagged_files) -+ $(am__define_uniq_tagged_files); mkid -fID $$unique -+tags: tags-recursive -+TAGS: tags - --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ - if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ -@@ -369,12 +413,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ -@@ -386,15 +425,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $$unique; \ - fi; \ - fi --ctags: CTAGS --CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ctags: ctags-recursive -+ -+CTAGS: ctags -+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) -+ $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique -@@ -403,6 +438,21 @@ GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -+cscopelist: cscopelist-recursive -+ -+cscopelist-am: $(am__tagged_files) -+ list='$(am__tagged_files)'; \ -+ case "$(srcdir)" in \ -+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ -+ *) sdir=$(subdir)/$(srcdir) ;; \ -+ esac; \ -+ for i in $$list; do \ -+ if test -f "$$i"; then \ -+ echo "$(subdir)/$$i"; \ -+ else \ -+ echo "$$sdir/$$i"; \ -+ fi; \ -+ done >> $(top_builddir)/cscope.files - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -@@ -439,13 +489,10 @@ distdir: $(DISTFILES) - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test -d "$(distdir)/$$subdir" \ -- || $(MKDIR_P) "$(distdir)/$$subdir" \ -- || exit 1; \ -- fi; \ -- done -- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ -- if test "$$subdir" = .; then :; else \ -+ $(am__make_dryrun) \ -+ || test -d "$(distdir)/$$subdir" \ -+ || $(MKDIR_P) "$(distdir)/$$subdir" \ -+ || exit 1; \ - dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ - $(am__relativize); \ - new_distdir=$$reldir; \ -@@ -480,10 +527,15 @@ install-am: all-am - - installcheck: installcheck-recursive - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+ if test -z '$(STRIP)'; then \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ install; \ -+ else \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -+ fi - mostlyclean-generic: - - clean-generic: -@@ -561,22 +613,20 @@ ps-am: - - uninstall-am: - --.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ -- install-am install-strip tags-recursive -- --.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ -- all all-am check check-am clean clean-generic clean-libtool \ -- ctags ctags-recursive distclean distclean-generic \ -- distclean-libtool distclean-tags distdir dvi dvi-am html \ -- html-am info info-am install install-am install-data \ -- install-data-am install-dvi install-dvi-am install-exec \ -- install-exec-am install-html install-html-am install-info \ -- install-info-am install-man install-pdf install-pdf-am \ -- install-ps install-ps-am install-strip installcheck \ -- installcheck-am installdirs installdirs-am maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-generic \ -- mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ -- uninstall uninstall-am -+.MAKE: $(am__recursive_targets) install-am install-strip -+ -+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ -+ check-am clean clean-generic clean-libtool cscopelist-am ctags \ -+ ctags-am distclean distclean-generic distclean-libtool \ -+ distclean-tags distdir dvi dvi-am html html-am info info-am \ -+ install install-am install-data install-data-am install-dvi \ -+ install-dvi-am install-exec install-exec-am install-html \ -+ install-html-am install-info install-info-am install-man \ -+ install-pdf install-pdf-am install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ installdirs-am maintainer-clean maintainer-clean-generic \ -+ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ -+ ps ps-am tags tags-am uninstall uninstall-am - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff --git a/src/modules_images/modules_vigra/vigra/Makefile.in b/src/modules_images/modules_vigra/vigra/Makefile.in -index 3f60957..957cc43 100644 ---- a/src/modules_images/modules_vigra/vigra/Makefile.in -+++ b/src/modules_images/modules_vigra/vigra/Makefile.in -@@ -1,9 +1,8 @@ --# Makefile.in generated by automake 1.11.1 from Makefile.am. -+# Makefile.in generated by automake 1.14 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, --# Inc. -+# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+ - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -16,6 +15,51 @@ - @SET_MAKE@ - - VPATH = @srcdir@ -+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -+am__make_running_with_option = \ -+ case $${target_option-} in \ -+ ?) ;; \ -+ *) echo "am__make_running_with_option: internal error: invalid" \ -+ "target option '$${target_option-}' specified" >&2; \ -+ exit 1;; \ -+ esac; \ -+ has_opt=no; \ -+ sane_makeflags=$$MAKEFLAGS; \ -+ if $(am__is_gnu_make); then \ -+ sane_makeflags=$$MFLAGS; \ -+ else \ -+ case $$MAKEFLAGS in \ -+ *\\[\ \ ]*) \ -+ bs=\\; \ -+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -+ esac; \ -+ fi; \ -+ skip_next=no; \ -+ strip_trailopt () \ -+ { \ -+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -+ }; \ -+ for flg in $$sane_makeflags; do \ -+ test $$skip_next = yes && { skip_next=no; continue; }; \ -+ case $$flg in \ -+ *=*|--*) continue;; \ -+ -*I) strip_trailopt 'I'; skip_next=yes;; \ -+ -*I?*) strip_trailopt 'I';; \ -+ -*O) strip_trailopt 'O'; skip_next=yes;; \ -+ -*O?*) strip_trailopt 'O';; \ -+ -*l) strip_trailopt 'l'; skip_next=yes;; \ -+ -*l?*) strip_trailopt 'l';; \ -+ -[dEDm]) skip_next=yes;; \ -+ -[JT]) skip_next=yes;; \ -+ esac; \ -+ case $$flg in \ -+ *$$target_option*) has_opt=yes; break;; \ -+ esac; \ -+ done; \ -+ test $$has_opt = yes -+am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -+am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -35,7 +79,8 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - subdir = src/modules_images/modules_vigra/vigra --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ -+ $(top_srcdir)/depcomp - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ - $(top_srcdir)/m4/ax_python_devel.m4 \ -@@ -71,6 +116,12 @@ am__nobase_list = $(am__nobase_strip_setup); \ - am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -+am__uninstall_files_from_dir = { \ -+ test -z "$$files" \ -+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ -+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ -+ $(am__cd) "$$dir" && rm -f $$files; }; \ -+ } - am__installdirs = "$(DESTDIR)$(pkglibdir)" - LTLIBRARIES = $(pkglib_LTLIBRARIES) - @HAVE_VIGRA_TRUE@libvigra_la_DEPENDENCIES = $(top_srcdir)/src/saga_core/saga_api/libsaga_api.la -@@ -84,36 +135,93 @@ am__libvigra_la_SOURCES_DIST = vigra.h vigra_edges.h vigra_smoothing.h \ - @HAVE_VIGRA_TRUE@ vigra_smoothing.lo vigra_edges.lo \ - @HAVE_VIGRA_TRUE@ vigra_morphology.lo vigra_watershed.lo - libvigra_la_OBJECTS = $(am_libvigra_la_OBJECTS) -+AM_V_lt = $(am__v_lt_@AM_V@) -+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -+am__v_lt_0 = --silent -+am__v_lt_1 = - @HAVE_VIGRA_TRUE@am_libvigra_la_rpath = -rpath $(pkglibdir) -+AM_V_P = $(am__v_P_@AM_V@) -+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -+am__v_P_0 = false -+am__v_P_1 = : -+AM_V_GEN = $(am__v_GEN_@AM_V@) -+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+am__v_GEN_0 = @echo " GEN " $@; -+am__v_GEN_1 = -+AM_V_at = $(am__v_at_@AM_V@) -+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+am__v_at_0 = @ -+am__v_at_1 = - DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - am__mv = mv -f - CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) --LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CXXFLAGS) $(CXXFLAGS) -+AM_V_CXX = $(am__v_CXX_@AM_V@) -+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) -+am__v_CXX_0 = @echo " CXX " $@; -+am__v_CXX_1 = - CXXLD = $(CXX) --CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ -+ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) -+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) -+am__v_CXXLD_0 = @echo " CXXLD " $@; -+am__v_CXXLD_1 = - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CFLAGS) $(CFLAGS) -+AM_V_CC = $(am__v_CC_@AM_V@) -+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -+am__v_CC_0 = @echo " CC " $@; -+am__v_CC_1 = - CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CCLD = $(am__v_CCLD_@AM_V@) -+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -+am__v_CCLD_0 = @echo " CCLD " $@; -+am__v_CCLD_1 = - SOURCES = $(libvigra_la_SOURCES) - DIST_SOURCES = $(am__libvigra_la_SOURCES_DIST) -+am__can_run_installinfo = \ -+ case $$AM_UPDATE_INFO_DIR in \ -+ n|no|NO) false;; \ -+ *) (install-info --version) >/dev/null 2>&1;; \ -+ esac -+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -+# Read a list of newline-separated strings from the standard input, -+# and print each of them once, without duplicates. Input order is -+# *not* preserved. -+am__uniquify_input = $(AWK) '\ -+ BEGIN { nonempty = 0; } \ -+ { items[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in items) print i; }; } \ -+' -+# Make sure the list of sources is unique. This is necessary because, -+# e.g., the same source file might be shared among _SOURCES variables -+# for different programs/libraries. -+am__define_uniq_tagged_files = \ -+ list='$(am__tagged_files)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | $(am__uniquify_input)` - ETAGS = etags - CTAGS = ctags - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ -+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ -@@ -134,6 +242,7 @@ CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DISABLELIBHARU = @DISABLELIBHARU@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -161,6 +270,7 @@ LOCAL_INCS = @LOCAL_INCS@ - LOCAL_LIBS = @LOCAL_LIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - NM = @NM@ - NMEDIT = @NMEDIT@ -@@ -173,6 +283,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - POW_LIB = @POW_LIB@ -@@ -198,6 +309,7 @@ abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -@@ -231,7 +343,6 @@ libdir = @libdir@ - libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -@@ -315,9 +426,9 @@ $(top_srcdir)/configure: $(am__configure_deps) - $(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - $(am__aclocal_m4_deps): -+ - install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" - @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ - list2=; for p in $$list; do \ - if test -f $$p; then \ -@@ -325,6 +436,8 @@ install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - else :; fi; \ - done; \ - test -z "$$list2" || { \ -+ echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \ -+ $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \ - } -@@ -340,14 +453,17 @@ uninstall-pkglibLTLIBRARIES: - - clean-pkglibLTLIBRARIES: - -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES) -- @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \ -- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -- echo "rm -f \"$${dir}/so_locations\""; \ -- rm -f "$${dir}/so_locations"; \ -- done --libvigra.la: $(libvigra_la_OBJECTS) $(libvigra_la_DEPENDENCIES) -- $(CXXLINK) $(am_libvigra_la_rpath) $(libvigra_la_OBJECTS) $(libvigra_la_LIBADD) $(LIBS) -+ @list='$(pkglib_LTLIBRARIES)'; \ -+ locs=`for p in $$list; do echo $$p; done | \ -+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ -+ sort -u`; \ -+ test -z "$$locs" || { \ -+ echo rm -f $${locs}; \ -+ rm -f $${locs}; \ -+ } -+ -+libvigra.la: $(libvigra_la_OBJECTS) $(libvigra_la_DEPENDENCIES) $(EXTRA_libvigra_la_DEPENDENCIES) -+ $(AM_V_CXXLD)$(CXXLINK) $(am_libvigra_la_rpath) $(libvigra_la_OBJECTS) $(libvigra_la_LIBADD) $(LIBS) - - mostlyclean-compile: - -rm -f *.$(OBJEXT) -@@ -365,25 +481,25 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vigra_watershed.Plo@am__quote@ - - .cpp.o: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< - - .cpp.obj: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - - .cpp.lo: --@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< - - mostlyclean-libtool: - -rm -f *.lo -@@ -391,26 +507,15 @@ mostlyclean-libtool: - clean-libtool: - -rm -rf .libs _libs - --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -+ID: $(am__tagged_files) -+ $(am__define_uniq_tagged_files); mkid -fID $$unique -+tags: tags-am -+TAGS: tags -+ -+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ -@@ -422,15 +527,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $$unique; \ - fi; \ - fi --ctags: CTAGS --CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ctags: ctags-am -+ -+CTAGS: ctags -+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) -+ $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique -@@ -439,6 +540,21 @@ GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -+cscopelist: cscopelist-am -+ -+cscopelist-am: $(am__tagged_files) -+ list='$(am__tagged_files)'; \ -+ case "$(srcdir)" in \ -+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ -+ *) sdir=$(subdir)/$(srcdir) ;; \ -+ esac; \ -+ for i in $$list; do \ -+ if test -f "$$i"; then \ -+ echo "$(subdir)/$$i"; \ -+ else \ -+ echo "$$sdir/$$i"; \ -+ fi; \ -+ done >> $(top_builddir)/cscope.files - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -@@ -490,10 +606,15 @@ install-am: all-am - - installcheck: installcheck-am - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+ if test -z '$(STRIP)'; then \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ install; \ -+ else \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -+ fi - mostlyclean-generic: - - clean-generic: -@@ -578,19 +699,20 @@ uninstall-am: uninstall-pkglibLTLIBRARIES - - .MAKE: install-am install-strip - --.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ -- clean-libtool clean-pkglibLTLIBRARIES ctags distclean \ -- distclean-compile distclean-generic distclean-libtool \ -- distclean-tags distdir dvi dvi-am html html-am info info-am \ -- install install-am install-data install-data-am install-dvi \ -- install-dvi-am install-exec install-exec-am install-html \ -- install-html-am install-info install-info-am install-man \ -- install-pdf install-pdf-am install-pkglibLTLIBRARIES \ -- install-ps install-ps-am install-strip installcheck \ -- installcheck-am installdirs maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-compile \ -- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -- tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES -+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ -+ clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \ -+ ctags-am distclean distclean-compile distclean-generic \ -+ distclean-libtool distclean-tags distdir dvi dvi-am html \ -+ html-am info info-am install install-am install-data \ -+ install-data-am install-dvi install-dvi-am install-exec \ -+ install-exec-am install-html install-html-am install-info \ -+ install-info-am install-man install-pdf install-pdf-am \ -+ install-pkglibLTLIBRARIES install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ maintainer-clean maintainer-clean-generic mostlyclean \ -+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ -+ pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ -+ uninstall-pkglibLTLIBRARIES - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff --git a/src/modules_io/Makefile.in b/src/modules_io/Makefile.in -index 86ff7ed..f012a33 100644 ---- a/src/modules_io/Makefile.in -+++ b/src/modules_io/Makefile.in -@@ -1,9 +1,8 @@ --# Makefile.in generated by automake 1.11.1 from Makefile.am. -+# Makefile.in generated by automake 1.14 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, --# Inc. -+# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+ - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -15,6 +14,51 @@ - - @SET_MAKE@ - VPATH = @srcdir@ -+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -+am__make_running_with_option = \ -+ case $${target_option-} in \ -+ ?) ;; \ -+ *) echo "am__make_running_with_option: internal error: invalid" \ -+ "target option '$${target_option-}' specified" >&2; \ -+ exit 1;; \ -+ esac; \ -+ has_opt=no; \ -+ sane_makeflags=$$MAKEFLAGS; \ -+ if $(am__is_gnu_make); then \ -+ sane_makeflags=$$MFLAGS; \ -+ else \ -+ case $$MAKEFLAGS in \ -+ *\\[\ \ ]*) \ -+ bs=\\; \ -+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -+ esac; \ -+ fi; \ -+ skip_next=no; \ -+ strip_trailopt () \ -+ { \ -+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -+ }; \ -+ for flg in $$sane_makeflags; do \ -+ test $$skip_next = yes && { skip_next=no; continue; }; \ -+ case $$flg in \ -+ *=*|--*) continue;; \ -+ -*I) strip_trailopt 'I'; skip_next=yes;; \ -+ -*I?*) strip_trailopt 'I';; \ -+ -*O) strip_trailopt 'O'; skip_next=yes;; \ -+ -*O?*) strip_trailopt 'O';; \ -+ -*l) strip_trailopt 'l'; skip_next=yes;; \ -+ -*l?*) strip_trailopt 'l';; \ -+ -[dEDm]) skip_next=yes;; \ -+ -[JT]) skip_next=yes;; \ -+ esac; \ -+ case $$flg in \ -+ *$$target_option*) has_opt=yes; break;; \ -+ esac; \ -+ done; \ -+ test $$has_opt = yes -+am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -+am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -34,7 +78,7 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - subdir = src/modules_io --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ - $(top_srcdir)/m4/ax_python_devel.m4 \ -@@ -49,20 +93,58 @@ mkinstalldirs = $(install_sh) -d - CONFIG_HEADER = $(top_builddir)/config.h - CONFIG_CLEAN_FILES = - CONFIG_CLEAN_VPATH_FILES = -+AM_V_P = $(am__v_P_@AM_V@) -+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -+am__v_P_0 = false -+am__v_P_1 = : -+AM_V_GEN = $(am__v_GEN_@AM_V@) -+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+am__v_GEN_0 = @echo " GEN " $@; -+am__v_GEN_1 = -+AM_V_at = $(am__v_at_@AM_V@) -+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+am__v_at_0 = @ -+am__v_at_1 = - SOURCES = - DIST_SOURCES = --RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ -- html-recursive info-recursive install-data-recursive \ -- install-dvi-recursive install-exec-recursive \ -- install-html-recursive install-info-recursive \ -- install-pdf-recursive install-ps-recursive install-recursive \ -- installcheck-recursive installdirs-recursive pdf-recursive \ -- ps-recursive uninstall-recursive -+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ -+ ctags-recursive dvi-recursive html-recursive info-recursive \ -+ install-data-recursive install-dvi-recursive \ -+ install-exec-recursive install-html-recursive \ -+ install-info-recursive install-pdf-recursive \ -+ install-ps-recursive install-recursive installcheck-recursive \ -+ installdirs-recursive pdf-recursive ps-recursive \ -+ tags-recursive uninstall-recursive -+am__can_run_installinfo = \ -+ case $$AM_UPDATE_INFO_DIR in \ -+ n|no|NO) false;; \ -+ *) (install-info --version) >/dev/null 2>&1;; \ -+ esac - RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ - distclean-recursive maintainer-clean-recursive --AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ -- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ -+am__recursive_targets = \ -+ $(RECURSIVE_TARGETS) \ -+ $(RECURSIVE_CLEAN_TARGETS) \ -+ $(am__extra_recursive_targets) -+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ - distdir -+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -+# Read a list of newline-separated strings from the standard input, -+# and print each of them once, without duplicates. Input order is -+# *not* preserved. -+am__uniquify_input = $(AWK) '\ -+ BEGIN { nonempty = 0; } \ -+ { items[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in items) print i; }; } \ -+' -+# Make sure the list of sources is unique. This is necessary because, -+# e.g., the same source file might be shared among _SOURCES variables -+# for different programs/libraries. -+am__define_uniq_tagged_files = \ -+ list='$(am__tagged_files)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | $(am__uniquify_input)` - ETAGS = etags - CTAGS = ctags - DIST_SUBDIRS = $(SUBDIRS) -@@ -94,6 +176,7 @@ am__relativize = \ - reldir="$$dir2" - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ -+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ -@@ -114,6 +197,7 @@ CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DISABLELIBHARU = @DISABLELIBHARU@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -141,6 +225,7 @@ LOCAL_INCS = @LOCAL_INCS@ - LOCAL_LIBS = @LOCAL_LIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - NM = @NM@ - NMEDIT = @NMEDIT@ -@@ -153,6 +238,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - POW_LIB = @POW_LIB@ -@@ -178,6 +264,7 @@ abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -@@ -211,7 +298,6 @@ libdir = @libdir@ - libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -@@ -273,22 +359,25 @@ clean-libtool: - -rm -rf .libs _libs - - # This directory's subdirectories are mostly independent; you can cd --# into them and run `make' without going through this Makefile. --# To change the values of `make' variables: instead of editing Makefiles, --# (1) if the variable is set in `config.status', edit `config.status' --# (which will cause the Makefiles to be regenerated when you run `make'); --# (2) otherwise, pass the desired values on the `make' command line. --$(RECURSIVE_TARGETS): -- @fail= failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -+# into them and run 'make' without going through this Makefile. -+# To change the values of 'make' variables: instead of editing Makefiles, -+# (1) if the variable is set in 'config.status', edit 'config.status' -+# (which will cause the Makefiles to be regenerated when you run 'make'); -+# (2) otherwise, pass the desired values on the 'make' command line. -+$(am__recursive_targets): -+ @fail=; \ -+ if $(am__make_keepgoing); then \ -+ failcom='fail=yes'; \ -+ else \ -+ failcom='exit 1'; \ -+ fi; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ -- list='$(SUBDIRS)'; for subdir in $$list; do \ -+ case "$@" in \ -+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -+ *) list='$(SUBDIRS)' ;; \ -+ esac; \ -+ for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ -@@ -303,57 +392,12 @@ $(RECURSIVE_TARGETS): - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - --$(RECURSIVE_CLEAN_TARGETS): -- @fail= failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -- dot_seen=no; \ -- case "$@" in \ -- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -- *) list='$(SUBDIRS)' ;; \ -- esac; \ -- rev=''; for subdir in $$list; do \ -- if test "$$subdir" = "."; then :; else \ -- rev="$$subdir $$rev"; \ -- fi; \ -- done; \ -- rev="$$rev ."; \ -- target=`echo $@ | sed s/-recursive//`; \ -- for subdir in $$rev; do \ -- echo "Making $$target in $$subdir"; \ -- if test "$$subdir" = "."; then \ -- local_target="$$target-am"; \ -- else \ -- local_target="$$target"; \ -- fi; \ -- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || eval $$failcom; \ -- done && test -z "$$fail" --tags-recursive: -- list='$(SUBDIRS)'; for subdir in $$list; do \ -- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ -- done --ctags-recursive: -- list='$(SUBDIRS)'; for subdir in $$list; do \ -- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ -- done -+ID: $(am__tagged_files) -+ $(am__define_uniq_tagged_files); mkid -fID $$unique -+tags: tags-recursive -+TAGS: tags - --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ - if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ -@@ -369,12 +413,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ -@@ -386,15 +425,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $$unique; \ - fi; \ - fi --ctags: CTAGS --CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ctags: ctags-recursive -+ -+CTAGS: ctags -+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) -+ $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique -@@ -403,6 +438,21 @@ GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -+cscopelist: cscopelist-recursive -+ -+cscopelist-am: $(am__tagged_files) -+ list='$(am__tagged_files)'; \ -+ case "$(srcdir)" in \ -+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ -+ *) sdir=$(subdir)/$(srcdir) ;; \ -+ esac; \ -+ for i in $$list; do \ -+ if test -f "$$i"; then \ -+ echo "$(subdir)/$$i"; \ -+ else \ -+ echo "$$sdir/$$i"; \ -+ fi; \ -+ done >> $(top_builddir)/cscope.files - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -@@ -439,13 +489,10 @@ distdir: $(DISTFILES) - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test -d "$(distdir)/$$subdir" \ -- || $(MKDIR_P) "$(distdir)/$$subdir" \ -- || exit 1; \ -- fi; \ -- done -- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ -- if test "$$subdir" = .; then :; else \ -+ $(am__make_dryrun) \ -+ || test -d "$(distdir)/$$subdir" \ -+ || $(MKDIR_P) "$(distdir)/$$subdir" \ -+ || exit 1; \ - dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ - $(am__relativize); \ - new_distdir=$$reldir; \ -@@ -480,10 +527,15 @@ install-am: all-am - - installcheck: installcheck-recursive - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+ if test -z '$(STRIP)'; then \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ install; \ -+ else \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -+ fi - mostlyclean-generic: - - clean-generic: -@@ -561,22 +613,20 @@ ps-am: - - uninstall-am: - --.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ -- install-am install-strip tags-recursive -- --.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ -- all all-am check check-am clean clean-generic clean-libtool \ -- ctags ctags-recursive distclean distclean-generic \ -- distclean-libtool distclean-tags distdir dvi dvi-am html \ -- html-am info info-am install install-am install-data \ -- install-data-am install-dvi install-dvi-am install-exec \ -- install-exec-am install-html install-html-am install-info \ -- install-info-am install-man install-pdf install-pdf-am \ -- install-ps install-ps-am install-strip installcheck \ -- installcheck-am installdirs installdirs-am maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-generic \ -- mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ -- uninstall uninstall-am -+.MAKE: $(am__recursive_targets) install-am install-strip -+ -+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ -+ check-am clean clean-generic clean-libtool cscopelist-am ctags \ -+ ctags-am distclean distclean-generic distclean-libtool \ -+ distclean-tags distdir dvi dvi-am html html-am info info-am \ -+ install install-am install-data install-data-am install-dvi \ -+ install-dvi-am install-exec install-exec-am install-html \ -+ install-html-am install-info install-info-am install-man \ -+ install-pdf install-pdf-am install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ installdirs-am maintainer-clean maintainer-clean-generic \ -+ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ -+ ps ps-am tags tags-am uninstall uninstall-am - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff --git a/src/modules_io/db/Makefile.in b/src/modules_io/db/Makefile.in -index b96fb05..59e6939 100644 ---- a/src/modules_io/db/Makefile.in -+++ b/src/modules_io/db/Makefile.in -@@ -1,9 +1,8 @@ --# Makefile.in generated by automake 1.11.1 from Makefile.am. -+# Makefile.in generated by automake 1.14 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, --# Inc. -+# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+ - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -15,6 +14,51 @@ - - @SET_MAKE@ - VPATH = @srcdir@ -+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -+am__make_running_with_option = \ -+ case $${target_option-} in \ -+ ?) ;; \ -+ *) echo "am__make_running_with_option: internal error: invalid" \ -+ "target option '$${target_option-}' specified" >&2; \ -+ exit 1;; \ -+ esac; \ -+ has_opt=no; \ -+ sane_makeflags=$$MAKEFLAGS; \ -+ if $(am__is_gnu_make); then \ -+ sane_makeflags=$$MFLAGS; \ -+ else \ -+ case $$MAKEFLAGS in \ -+ *\\[\ \ ]*) \ -+ bs=\\; \ -+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -+ esac; \ -+ fi; \ -+ skip_next=no; \ -+ strip_trailopt () \ -+ { \ -+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -+ }; \ -+ for flg in $$sane_makeflags; do \ -+ test $$skip_next = yes && { skip_next=no; continue; }; \ -+ case $$flg in \ -+ *=*|--*) continue;; \ -+ -*I) strip_trailopt 'I'; skip_next=yes;; \ -+ -*I?*) strip_trailopt 'I';; \ -+ -*O) strip_trailopt 'O'; skip_next=yes;; \ -+ -*O?*) strip_trailopt 'O';; \ -+ -*l) strip_trailopt 'l'; skip_next=yes;; \ -+ -*l?*) strip_trailopt 'l';; \ -+ -[dEDm]) skip_next=yes;; \ -+ -[JT]) skip_next=yes;; \ -+ esac; \ -+ case $$flg in \ -+ *$$target_option*) has_opt=yes; break;; \ -+ esac; \ -+ done; \ -+ test $$has_opt = yes -+am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -+am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -34,7 +78,7 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - subdir = src/modules_io/db --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ - $(top_srcdir)/m4/ax_python_devel.m4 \ -@@ -49,20 +93,58 @@ mkinstalldirs = $(install_sh) -d - CONFIG_HEADER = $(top_builddir)/config.h - CONFIG_CLEAN_FILES = - CONFIG_CLEAN_VPATH_FILES = -+AM_V_P = $(am__v_P_@AM_V@) -+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -+am__v_P_0 = false -+am__v_P_1 = : -+AM_V_GEN = $(am__v_GEN_@AM_V@) -+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+am__v_GEN_0 = @echo " GEN " $@; -+am__v_GEN_1 = -+AM_V_at = $(am__v_at_@AM_V@) -+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+am__v_at_0 = @ -+am__v_at_1 = - SOURCES = - DIST_SOURCES = --RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ -- html-recursive info-recursive install-data-recursive \ -- install-dvi-recursive install-exec-recursive \ -- install-html-recursive install-info-recursive \ -- install-pdf-recursive install-ps-recursive install-recursive \ -- installcheck-recursive installdirs-recursive pdf-recursive \ -- ps-recursive uninstall-recursive -+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ -+ ctags-recursive dvi-recursive html-recursive info-recursive \ -+ install-data-recursive install-dvi-recursive \ -+ install-exec-recursive install-html-recursive \ -+ install-info-recursive install-pdf-recursive \ -+ install-ps-recursive install-recursive installcheck-recursive \ -+ installdirs-recursive pdf-recursive ps-recursive \ -+ tags-recursive uninstall-recursive -+am__can_run_installinfo = \ -+ case $$AM_UPDATE_INFO_DIR in \ -+ n|no|NO) false;; \ -+ *) (install-info --version) >/dev/null 2>&1;; \ -+ esac - RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ - distclean-recursive maintainer-clean-recursive --AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ -- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ -+am__recursive_targets = \ -+ $(RECURSIVE_TARGETS) \ -+ $(RECURSIVE_CLEAN_TARGETS) \ -+ $(am__extra_recursive_targets) -+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ - distdir -+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -+# Read a list of newline-separated strings from the standard input, -+# and print each of them once, without duplicates. Input order is -+# *not* preserved. -+am__uniquify_input = $(AWK) '\ -+ BEGIN { nonempty = 0; } \ -+ { items[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in items) print i; }; } \ -+' -+# Make sure the list of sources is unique. This is necessary because, -+# e.g., the same source file might be shared among _SOURCES variables -+# for different programs/libraries. -+am__define_uniq_tagged_files = \ -+ list='$(am__tagged_files)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | $(am__uniquify_input)` - ETAGS = etags - CTAGS = ctags - DIST_SUBDIRS = io_odbc -@@ -94,6 +176,7 @@ am__relativize = \ - reldir="$$dir2" - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ -+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ -@@ -114,6 +197,7 @@ CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DISABLELIBHARU = @DISABLELIBHARU@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -141,6 +225,7 @@ LOCAL_INCS = @LOCAL_INCS@ - LOCAL_LIBS = @LOCAL_LIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - NM = @NM@ - NMEDIT = @NMEDIT@ -@@ -153,6 +238,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - POW_LIB = @POW_LIB@ -@@ -178,6 +264,7 @@ abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -@@ -211,7 +298,6 @@ libdir = @libdir@ - libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -@@ -274,22 +360,25 @@ clean-libtool: - -rm -rf .libs _libs - - # This directory's subdirectories are mostly independent; you can cd --# into them and run `make' without going through this Makefile. --# To change the values of `make' variables: instead of editing Makefiles, --# (1) if the variable is set in `config.status', edit `config.status' --# (which will cause the Makefiles to be regenerated when you run `make'); --# (2) otherwise, pass the desired values on the `make' command line. --$(RECURSIVE_TARGETS): -- @fail= failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -+# into them and run 'make' without going through this Makefile. -+# To change the values of 'make' variables: instead of editing Makefiles, -+# (1) if the variable is set in 'config.status', edit 'config.status' -+# (which will cause the Makefiles to be regenerated when you run 'make'); -+# (2) otherwise, pass the desired values on the 'make' command line. -+$(am__recursive_targets): -+ @fail=; \ -+ if $(am__make_keepgoing); then \ -+ failcom='fail=yes'; \ -+ else \ -+ failcom='exit 1'; \ -+ fi; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ -- list='$(SUBDIRS)'; for subdir in $$list; do \ -+ case "$@" in \ -+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -+ *) list='$(SUBDIRS)' ;; \ -+ esac; \ -+ for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ -@@ -304,57 +393,12 @@ $(RECURSIVE_TARGETS): - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - --$(RECURSIVE_CLEAN_TARGETS): -- @fail= failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -- dot_seen=no; \ -- case "$@" in \ -- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -- *) list='$(SUBDIRS)' ;; \ -- esac; \ -- rev=''; for subdir in $$list; do \ -- if test "$$subdir" = "."; then :; else \ -- rev="$$subdir $$rev"; \ -- fi; \ -- done; \ -- rev="$$rev ."; \ -- target=`echo $@ | sed s/-recursive//`; \ -- for subdir in $$rev; do \ -- echo "Making $$target in $$subdir"; \ -- if test "$$subdir" = "."; then \ -- local_target="$$target-am"; \ -- else \ -- local_target="$$target"; \ -- fi; \ -- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || eval $$failcom; \ -- done && test -z "$$fail" --tags-recursive: -- list='$(SUBDIRS)'; for subdir in $$list; do \ -- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ -- done --ctags-recursive: -- list='$(SUBDIRS)'; for subdir in $$list; do \ -- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ -- done -+ID: $(am__tagged_files) -+ $(am__define_uniq_tagged_files); mkid -fID $$unique -+tags: tags-recursive -+TAGS: tags - --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ - if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ -@@ -370,12 +414,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ -@@ -387,15 +426,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $$unique; \ - fi; \ - fi --ctags: CTAGS --CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ctags: ctags-recursive -+ -+CTAGS: ctags -+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) -+ $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique -@@ -404,6 +439,21 @@ GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -+cscopelist: cscopelist-recursive -+ -+cscopelist-am: $(am__tagged_files) -+ list='$(am__tagged_files)'; \ -+ case "$(srcdir)" in \ -+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ -+ *) sdir=$(subdir)/$(srcdir) ;; \ -+ esac; \ -+ for i in $$list; do \ -+ if test -f "$$i"; then \ -+ echo "$(subdir)/$$i"; \ -+ else \ -+ echo "$$sdir/$$i"; \ -+ fi; \ -+ done >> $(top_builddir)/cscope.files - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -@@ -440,13 +490,10 @@ distdir: $(DISTFILES) - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test -d "$(distdir)/$$subdir" \ -- || $(MKDIR_P) "$(distdir)/$$subdir" \ -- || exit 1; \ -- fi; \ -- done -- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ -- if test "$$subdir" = .; then :; else \ -+ $(am__make_dryrun) \ -+ || test -d "$(distdir)/$$subdir" \ -+ || $(MKDIR_P) "$(distdir)/$$subdir" \ -+ || exit 1; \ - dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ - $(am__relativize); \ - new_distdir=$$reldir; \ -@@ -481,10 +528,15 @@ install-am: all-am - - installcheck: installcheck-recursive - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+ if test -z '$(STRIP)'; then \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ install; \ -+ else \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -+ fi - mostlyclean-generic: - - clean-generic: -@@ -562,22 +614,20 @@ ps-am: - - uninstall-am: - --.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ -- install-am install-strip tags-recursive -- --.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ -- all all-am check check-am clean clean-generic clean-libtool \ -- ctags ctags-recursive distclean distclean-generic \ -- distclean-libtool distclean-tags distdir dvi dvi-am html \ -- html-am info info-am install install-am install-data \ -- install-data-am install-dvi install-dvi-am install-exec \ -- install-exec-am install-html install-html-am install-info \ -- install-info-am install-man install-pdf install-pdf-am \ -- install-ps install-ps-am install-strip installcheck \ -- installcheck-am installdirs installdirs-am maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-generic \ -- mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ -- uninstall uninstall-am -+.MAKE: $(am__recursive_targets) install-am install-strip -+ -+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ -+ check-am clean clean-generic clean-libtool cscopelist-am ctags \ -+ ctags-am distclean distclean-generic distclean-libtool \ -+ distclean-tags distdir dvi dvi-am html html-am info info-am \ -+ install install-am install-data install-data-am install-dvi \ -+ install-dvi-am install-exec install-exec-am install-html \ -+ install-html-am install-info install-info-am install-man \ -+ install-pdf install-pdf-am install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ installdirs-am maintainer-clean maintainer-clean-generic \ -+ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ -+ ps ps-am tags tags-am uninstall uninstall-am - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff --git a/src/modules_io/db/io_odbc/Makefile.in b/src/modules_io/db/io_odbc/Makefile.in -index c63360a..699efaf 100644 ---- a/src/modules_io/db/io_odbc/Makefile.in -+++ b/src/modules_io/db/io_odbc/Makefile.in -@@ -1,9 +1,8 @@ --# Makefile.in generated by automake 1.11.1 from Makefile.am. -+# Makefile.in generated by automake 1.14 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, --# Inc. -+# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+ - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -16,6 +15,51 @@ - @SET_MAKE@ - - VPATH = @srcdir@ -+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -+am__make_running_with_option = \ -+ case $${target_option-} in \ -+ ?) ;; \ -+ *) echo "am__make_running_with_option: internal error: invalid" \ -+ "target option '$${target_option-}' specified" >&2; \ -+ exit 1;; \ -+ esac; \ -+ has_opt=no; \ -+ sane_makeflags=$$MAKEFLAGS; \ -+ if $(am__is_gnu_make); then \ -+ sane_makeflags=$$MFLAGS; \ -+ else \ -+ case $$MAKEFLAGS in \ -+ *\\[\ \ ]*) \ -+ bs=\\; \ -+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -+ esac; \ -+ fi; \ -+ skip_next=no; \ -+ strip_trailopt () \ -+ { \ -+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -+ }; \ -+ for flg in $$sane_makeflags; do \ -+ test $$skip_next = yes && { skip_next=no; continue; }; \ -+ case $$flg in \ -+ *=*|--*) continue;; \ -+ -*I) strip_trailopt 'I'; skip_next=yes;; \ -+ -*I?*) strip_trailopt 'I';; \ -+ -*O) strip_trailopt 'O'; skip_next=yes;; \ -+ -*O?*) strip_trailopt 'O';; \ -+ -*l) strip_trailopt 'l'; skip_next=yes;; \ -+ -*l?*) strip_trailopt 'l';; \ -+ -[dEDm]) skip_next=yes;; \ -+ -[JT]) skip_next=yes;; \ -+ esac; \ -+ case $$flg in \ -+ *$$target_option*) has_opt=yes; break;; \ -+ esac; \ -+ done; \ -+ test $$has_opt = yes -+am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -+am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -35,7 +79,8 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - subdir = src/modules_io/db/io_odbc --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ -+ $(top_srcdir)/depcomp - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ - $(top_srcdir)/m4/ax_python_devel.m4 \ -@@ -71,6 +116,12 @@ am__nobase_list = $(am__nobase_strip_setup); \ - am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -+am__uninstall_files_from_dir = { \ -+ test -z "$$files" \ -+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ -+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ -+ $(am__cd) "$$dir" && rm -f $$files; }; \ -+ } - am__installdirs = "$(DESTDIR)$(pkglibdir)" - LTLIBRARIES = $(pkglib_LTLIBRARIES) - libio_odbc_la_DEPENDENCIES = \ -@@ -79,35 +130,92 @@ libio_odbc_la_DEPENDENCIES = \ - am_libio_odbc_la_OBJECTS = get_connection.lo MLB_Interface.lo \ - pgis_shapes.lo shapes.lo table.lo - libio_odbc_la_OBJECTS = $(am_libio_odbc_la_OBJECTS) -+AM_V_lt = $(am__v_lt_@AM_V@) -+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -+am__v_lt_0 = --silent -+am__v_lt_1 = -+AM_V_P = $(am__v_P_@AM_V@) -+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -+am__v_P_0 = false -+am__v_P_1 = : -+AM_V_GEN = $(am__v_GEN_@AM_V@) -+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+am__v_GEN_0 = @echo " GEN " $@; -+am__v_GEN_1 = -+AM_V_at = $(am__v_at_@AM_V@) -+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+am__v_at_0 = @ -+am__v_at_1 = - DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - am__mv = mv -f - CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) --LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CXXFLAGS) $(CXXFLAGS) -+AM_V_CXX = $(am__v_CXX_@AM_V@) -+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) -+am__v_CXX_0 = @echo " CXX " $@; -+am__v_CXX_1 = - CXXLD = $(CXX) --CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ -+ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) -+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) -+am__v_CXXLD_0 = @echo " CXXLD " $@; -+am__v_CXXLD_1 = - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CFLAGS) $(CFLAGS) -+AM_V_CC = $(am__v_CC_@AM_V@) -+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -+am__v_CC_0 = @echo " CC " $@; -+am__v_CC_1 = - CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CCLD = $(am__v_CCLD_@AM_V@) -+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -+am__v_CCLD_0 = @echo " CCLD " $@; -+am__v_CCLD_1 = - SOURCES = $(libio_odbc_la_SOURCES) - DIST_SOURCES = $(libio_odbc_la_SOURCES) -+am__can_run_installinfo = \ -+ case $$AM_UPDATE_INFO_DIR in \ -+ n|no|NO) false;; \ -+ *) (install-info --version) >/dev/null 2>&1;; \ -+ esac -+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -+# Read a list of newline-separated strings from the standard input, -+# and print each of them once, without duplicates. Input order is -+# *not* preserved. -+am__uniquify_input = $(AWK) '\ -+ BEGIN { nonempty = 0; } \ -+ { items[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in items) print i; }; } \ -+' -+# Make sure the list of sources is unique. This is necessary because, -+# e.g., the same source file might be shared among _SOURCES variables -+# for different programs/libraries. -+am__define_uniq_tagged_files = \ -+ list='$(am__tagged_files)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | $(am__uniquify_input)` - ETAGS = etags - CTAGS = ctags - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ -+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ -@@ -128,6 +236,7 @@ CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DISABLELIBHARU = @DISABLELIBHARU@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -155,6 +264,7 @@ LOCAL_INCS = @LOCAL_INCS@ - LOCAL_LIBS = @LOCAL_LIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - NM = @NM@ - NMEDIT = @NMEDIT@ -@@ -167,6 +277,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - POW_LIB = @POW_LIB@ -@@ -192,6 +303,7 @@ abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -@@ -225,7 +337,6 @@ libdir = @libdir@ - libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -@@ -303,9 +414,9 @@ $(top_srcdir)/configure: $(am__configure_deps) - $(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - $(am__aclocal_m4_deps): -+ - install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" - @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ - list2=; for p in $$list; do \ - if test -f $$p; then \ -@@ -313,6 +424,8 @@ install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - else :; fi; \ - done; \ - test -z "$$list2" || { \ -+ echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \ -+ $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \ - } -@@ -328,14 +441,17 @@ uninstall-pkglibLTLIBRARIES: - - clean-pkglibLTLIBRARIES: - -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES) -- @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \ -- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -- echo "rm -f \"$${dir}/so_locations\""; \ -- rm -f "$${dir}/so_locations"; \ -- done --libio_odbc.la: $(libio_odbc_la_OBJECTS) $(libio_odbc_la_DEPENDENCIES) -- $(CXXLINK) -rpath $(pkglibdir) $(libio_odbc_la_OBJECTS) $(libio_odbc_la_LIBADD) $(LIBS) -+ @list='$(pkglib_LTLIBRARIES)'; \ -+ locs=`for p in $$list; do echo $$p; done | \ -+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ -+ sort -u`; \ -+ test -z "$$locs" || { \ -+ echo rm -f $${locs}; \ -+ rm -f $${locs}; \ -+ } -+ -+libio_odbc.la: $(libio_odbc_la_OBJECTS) $(libio_odbc_la_DEPENDENCIES) $(EXTRA_libio_odbc_la_DEPENDENCIES) -+ $(AM_V_CXXLD)$(CXXLINK) -rpath $(pkglibdir) $(libio_odbc_la_OBJECTS) $(libio_odbc_la_LIBADD) $(LIBS) - - mostlyclean-compile: - -rm -f *.$(OBJEXT) -@@ -350,25 +466,25 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/table.Plo@am__quote@ - - .cpp.o: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< - - .cpp.obj: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - - .cpp.lo: --@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< - - mostlyclean-libtool: - -rm -f *.lo -@@ -376,26 +492,15 @@ mostlyclean-libtool: - clean-libtool: - -rm -rf .libs _libs - --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -+ID: $(am__tagged_files) -+ $(am__define_uniq_tagged_files); mkid -fID $$unique -+tags: tags-am -+TAGS: tags -+ -+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ -@@ -407,15 +512,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $$unique; \ - fi; \ - fi --ctags: CTAGS --CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ctags: ctags-am -+ -+CTAGS: ctags -+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) -+ $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique -@@ -424,6 +525,21 @@ GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -+cscopelist: cscopelist-am -+ -+cscopelist-am: $(am__tagged_files) -+ list='$(am__tagged_files)'; \ -+ case "$(srcdir)" in \ -+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ -+ *) sdir=$(subdir)/$(srcdir) ;; \ -+ esac; \ -+ for i in $$list; do \ -+ if test -f "$$i"; then \ -+ echo "$(subdir)/$$i"; \ -+ else \ -+ echo "$$sdir/$$i"; \ -+ fi; \ -+ done >> $(top_builddir)/cscope.files - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -@@ -475,10 +591,15 @@ install-am: all-am - - installcheck: installcheck-am - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+ if test -z '$(STRIP)'; then \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ install; \ -+ else \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -+ fi - mostlyclean-generic: - - clean-generic: -@@ -563,19 +684,20 @@ uninstall-am: uninstall-pkglibLTLIBRARIES - - .MAKE: install-am install-strip - --.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ -- clean-libtool clean-pkglibLTLIBRARIES ctags distclean \ -- distclean-compile distclean-generic distclean-libtool \ -- distclean-tags distdir dvi dvi-am html html-am info info-am \ -- install install-am install-data install-data-am install-dvi \ -- install-dvi-am install-exec install-exec-am install-html \ -- install-html-am install-info install-info-am install-man \ -- install-pdf install-pdf-am install-pkglibLTLIBRARIES \ -- install-ps install-ps-am install-strip installcheck \ -- installcheck-am installdirs maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-compile \ -- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -- tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES -+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ -+ clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \ -+ ctags-am distclean distclean-compile distclean-generic \ -+ distclean-libtool distclean-tags distdir dvi dvi-am html \ -+ html-am info info-am install install-am install-data \ -+ install-data-am install-dvi install-dvi-am install-exec \ -+ install-exec-am install-html install-html-am install-info \ -+ install-info-am install-man install-pdf install-pdf-am \ -+ install-pkglibLTLIBRARIES install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ maintainer-clean maintainer-clean-generic mostlyclean \ -+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ -+ pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ -+ uninstall-pkglibLTLIBRARIES - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff --git a/src/modules_io/docs/Makefile.in b/src/modules_io/docs/Makefile.in -index f664473..5c5bac2 100644 ---- a/src/modules_io/docs/Makefile.in -+++ b/src/modules_io/docs/Makefile.in -@@ -1,9 +1,8 @@ --# Makefile.in generated by automake 1.11.1 from Makefile.am. -+# Makefile.in generated by automake 1.14 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, --# Inc. -+# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+ - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -15,6 +14,51 @@ - - @SET_MAKE@ - VPATH = @srcdir@ -+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -+am__make_running_with_option = \ -+ case $${target_option-} in \ -+ ?) ;; \ -+ *) echo "am__make_running_with_option: internal error: invalid" \ -+ "target option '$${target_option-}' specified" >&2; \ -+ exit 1;; \ -+ esac; \ -+ has_opt=no; \ -+ sane_makeflags=$$MAKEFLAGS; \ -+ if $(am__is_gnu_make); then \ -+ sane_makeflags=$$MFLAGS; \ -+ else \ -+ case $$MAKEFLAGS in \ -+ *\\[\ \ ]*) \ -+ bs=\\; \ -+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -+ esac; \ -+ fi; \ -+ skip_next=no; \ -+ strip_trailopt () \ -+ { \ -+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -+ }; \ -+ for flg in $$sane_makeflags; do \ -+ test $$skip_next = yes && { skip_next=no; continue; }; \ -+ case $$flg in \ -+ *=*|--*) continue;; \ -+ -*I) strip_trailopt 'I'; skip_next=yes;; \ -+ -*I?*) strip_trailopt 'I';; \ -+ -*O) strip_trailopt 'O'; skip_next=yes;; \ -+ -*O?*) strip_trailopt 'O';; \ -+ -*l) strip_trailopt 'l'; skip_next=yes;; \ -+ -*l?*) strip_trailopt 'l';; \ -+ -[dEDm]) skip_next=yes;; \ -+ -[JT]) skip_next=yes;; \ -+ esac; \ -+ case $$flg in \ -+ *$$target_option*) has_opt=yes; break;; \ -+ esac; \ -+ done; \ -+ test $$has_opt = yes -+am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -+am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -34,7 +78,7 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - subdir = src/modules_io/docs --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ - $(top_srcdir)/m4/ax_python_devel.m4 \ -@@ -49,20 +93,58 @@ mkinstalldirs = $(install_sh) -d - CONFIG_HEADER = $(top_builddir)/config.h - CONFIG_CLEAN_FILES = - CONFIG_CLEAN_VPATH_FILES = -+AM_V_P = $(am__v_P_@AM_V@) -+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -+am__v_P_0 = false -+am__v_P_1 = : -+AM_V_GEN = $(am__v_GEN_@AM_V@) -+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+am__v_GEN_0 = @echo " GEN " $@; -+am__v_GEN_1 = -+AM_V_at = $(am__v_at_@AM_V@) -+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+am__v_at_0 = @ -+am__v_at_1 = - SOURCES = - DIST_SOURCES = --RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ -- html-recursive info-recursive install-data-recursive \ -- install-dvi-recursive install-exec-recursive \ -- install-html-recursive install-info-recursive \ -- install-pdf-recursive install-ps-recursive install-recursive \ -- installcheck-recursive installdirs-recursive pdf-recursive \ -- ps-recursive uninstall-recursive -+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ -+ ctags-recursive dvi-recursive html-recursive info-recursive \ -+ install-data-recursive install-dvi-recursive \ -+ install-exec-recursive install-html-recursive \ -+ install-info-recursive install-pdf-recursive \ -+ install-ps-recursive install-recursive installcheck-recursive \ -+ installdirs-recursive pdf-recursive ps-recursive \ -+ tags-recursive uninstall-recursive -+am__can_run_installinfo = \ -+ case $$AM_UPDATE_INFO_DIR in \ -+ n|no|NO) false;; \ -+ *) (install-info --version) >/dev/null 2>&1;; \ -+ esac - RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ - distclean-recursive maintainer-clean-recursive --AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ -- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ -+am__recursive_targets = \ -+ $(RECURSIVE_TARGETS) \ -+ $(RECURSIVE_CLEAN_TARGETS) \ -+ $(am__extra_recursive_targets) -+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ - distdir -+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -+# Read a list of newline-separated strings from the standard input, -+# and print each of them once, without duplicates. Input order is -+# *not* preserved. -+am__uniquify_input = $(AWK) '\ -+ BEGIN { nonempty = 0; } \ -+ { items[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in items) print i; }; } \ -+' -+# Make sure the list of sources is unique. This is necessary because, -+# e.g., the same source file might be shared among _SOURCES variables -+# for different programs/libraries. -+am__define_uniq_tagged_files = \ -+ list='$(am__tagged_files)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | $(am__uniquify_input)` - ETAGS = etags - CTAGS = ctags - DIST_SUBDIRS = $(SUBDIRS) -@@ -94,6 +176,7 @@ am__relativize = \ - reldir="$$dir2" - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ -+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ -@@ -114,6 +197,7 @@ CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DISABLELIBHARU = @DISABLELIBHARU@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -141,6 +225,7 @@ LOCAL_INCS = @LOCAL_INCS@ - LOCAL_LIBS = @LOCAL_LIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - NM = @NM@ - NMEDIT = @NMEDIT@ -@@ -153,6 +238,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - POW_LIB = @POW_LIB@ -@@ -178,6 +264,7 @@ abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -@@ -211,7 +298,6 @@ libdir = @libdir@ - libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -@@ -273,22 +359,25 @@ clean-libtool: - -rm -rf .libs _libs - - # This directory's subdirectories are mostly independent; you can cd --# into them and run `make' without going through this Makefile. --# To change the values of `make' variables: instead of editing Makefiles, --# (1) if the variable is set in `config.status', edit `config.status' --# (which will cause the Makefiles to be regenerated when you run `make'); --# (2) otherwise, pass the desired values on the `make' command line. --$(RECURSIVE_TARGETS): -- @fail= failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -+# into them and run 'make' without going through this Makefile. -+# To change the values of 'make' variables: instead of editing Makefiles, -+# (1) if the variable is set in 'config.status', edit 'config.status' -+# (which will cause the Makefiles to be regenerated when you run 'make'); -+# (2) otherwise, pass the desired values on the 'make' command line. -+$(am__recursive_targets): -+ @fail=; \ -+ if $(am__make_keepgoing); then \ -+ failcom='fail=yes'; \ -+ else \ -+ failcom='exit 1'; \ -+ fi; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ -- list='$(SUBDIRS)'; for subdir in $$list; do \ -+ case "$@" in \ -+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -+ *) list='$(SUBDIRS)' ;; \ -+ esac; \ -+ for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ -@@ -303,57 +392,12 @@ $(RECURSIVE_TARGETS): - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - --$(RECURSIVE_CLEAN_TARGETS): -- @fail= failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -- dot_seen=no; \ -- case "$@" in \ -- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -- *) list='$(SUBDIRS)' ;; \ -- esac; \ -- rev=''; for subdir in $$list; do \ -- if test "$$subdir" = "."; then :; else \ -- rev="$$subdir $$rev"; \ -- fi; \ -- done; \ -- rev="$$rev ."; \ -- target=`echo $@ | sed s/-recursive//`; \ -- for subdir in $$rev; do \ -- echo "Making $$target in $$subdir"; \ -- if test "$$subdir" = "."; then \ -- local_target="$$target-am"; \ -- else \ -- local_target="$$target"; \ -- fi; \ -- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || eval $$failcom; \ -- done && test -z "$$fail" --tags-recursive: -- list='$(SUBDIRS)'; for subdir in $$list; do \ -- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ -- done --ctags-recursive: -- list='$(SUBDIRS)'; for subdir in $$list; do \ -- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ -- done -+ID: $(am__tagged_files) -+ $(am__define_uniq_tagged_files); mkid -fID $$unique -+tags: tags-recursive -+TAGS: tags - --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ - if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ -@@ -369,12 +413,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ -@@ -386,15 +425,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $$unique; \ - fi; \ - fi --ctags: CTAGS --CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ctags: ctags-recursive -+ -+CTAGS: ctags -+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) -+ $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique -@@ -403,6 +438,21 @@ GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -+cscopelist: cscopelist-recursive -+ -+cscopelist-am: $(am__tagged_files) -+ list='$(am__tagged_files)'; \ -+ case "$(srcdir)" in \ -+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ -+ *) sdir=$(subdir)/$(srcdir) ;; \ -+ esac; \ -+ for i in $$list; do \ -+ if test -f "$$i"; then \ -+ echo "$(subdir)/$$i"; \ -+ else \ -+ echo "$$sdir/$$i"; \ -+ fi; \ -+ done >> $(top_builddir)/cscope.files - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -@@ -439,13 +489,10 @@ distdir: $(DISTFILES) - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test -d "$(distdir)/$$subdir" \ -- || $(MKDIR_P) "$(distdir)/$$subdir" \ -- || exit 1; \ -- fi; \ -- done -- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ -- if test "$$subdir" = .; then :; else \ -+ $(am__make_dryrun) \ -+ || test -d "$(distdir)/$$subdir" \ -+ || $(MKDIR_P) "$(distdir)/$$subdir" \ -+ || exit 1; \ - dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ - $(am__relativize); \ - new_distdir=$$reldir; \ -@@ -480,10 +527,15 @@ install-am: all-am - - installcheck: installcheck-recursive - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+ if test -z '$(STRIP)'; then \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ install; \ -+ else \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -+ fi - mostlyclean-generic: - - clean-generic: -@@ -561,22 +613,20 @@ ps-am: - - uninstall-am: - --.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ -- install-am install-strip tags-recursive -- --.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ -- all all-am check check-am clean clean-generic clean-libtool \ -- ctags ctags-recursive distclean distclean-generic \ -- distclean-libtool distclean-tags distdir dvi dvi-am html \ -- html-am info info-am install install-am install-data \ -- install-data-am install-dvi install-dvi-am install-exec \ -- install-exec-am install-html install-html-am install-info \ -- install-info-am install-man install-pdf install-pdf-am \ -- install-ps install-ps-am install-strip installcheck \ -- installcheck-am installdirs installdirs-am maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-generic \ -- mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ -- uninstall uninstall-am -+.MAKE: $(am__recursive_targets) install-am install-strip -+ -+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ -+ check-am clean clean-generic clean-libtool cscopelist-am ctags \ -+ ctags-am distclean distclean-generic distclean-libtool \ -+ distclean-tags distdir dvi dvi-am html html-am info info-am \ -+ install install-am install-data install-data-am install-dvi \ -+ install-dvi-am install-exec install-exec-am install-html \ -+ install-html-am install-info install-info-am install-man \ -+ install-pdf install-pdf-am install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ installdirs-am maintainer-clean maintainer-clean-generic \ -+ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ -+ ps ps-am tags tags-am uninstall uninstall-am - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff --git a/src/modules_io/docs/docs_html/Makefile.in b/src/modules_io/docs/docs_html/Makefile.in -index fa556ab..8fb27f0 100644 ---- a/src/modules_io/docs/docs_html/Makefile.in -+++ b/src/modules_io/docs/docs_html/Makefile.in -@@ -1,9 +1,8 @@ --# Makefile.in generated by automake 1.11.1 from Makefile.am. -+# Makefile.in generated by automake 1.14 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, --# Inc. -+# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+ - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -16,6 +15,51 @@ - @SET_MAKE@ - - VPATH = @srcdir@ -+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -+am__make_running_with_option = \ -+ case $${target_option-} in \ -+ ?) ;; \ -+ *) echo "am__make_running_with_option: internal error: invalid" \ -+ "target option '$${target_option-}' specified" >&2; \ -+ exit 1;; \ -+ esac; \ -+ has_opt=no; \ -+ sane_makeflags=$$MAKEFLAGS; \ -+ if $(am__is_gnu_make); then \ -+ sane_makeflags=$$MFLAGS; \ -+ else \ -+ case $$MAKEFLAGS in \ -+ *\\[\ \ ]*) \ -+ bs=\\; \ -+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -+ esac; \ -+ fi; \ -+ skip_next=no; \ -+ strip_trailopt () \ -+ { \ -+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -+ }; \ -+ for flg in $$sane_makeflags; do \ -+ test $$skip_next = yes && { skip_next=no; continue; }; \ -+ case $$flg in \ -+ *=*|--*) continue;; \ -+ -*I) strip_trailopt 'I'; skip_next=yes;; \ -+ -*I?*) strip_trailopt 'I';; \ -+ -*O) strip_trailopt 'O'; skip_next=yes;; \ -+ -*O?*) strip_trailopt 'O';; \ -+ -*l) strip_trailopt 'l'; skip_next=yes;; \ -+ -*l?*) strip_trailopt 'l';; \ -+ -[dEDm]) skip_next=yes;; \ -+ -[JT]) skip_next=yes;; \ -+ esac; \ -+ case $$flg in \ -+ *$$target_option*) has_opt=yes; break;; \ -+ esac; \ -+ done; \ -+ test $$has_opt = yes -+am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -+am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -35,7 +79,8 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - subdir = src/modules_io/docs/docs_html --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ -+ $(top_srcdir)/depcomp - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ - $(top_srcdir)/m4/ax_python_devel.m4 \ -@@ -71,6 +116,12 @@ am__nobase_list = $(am__nobase_strip_setup); \ - am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -+am__uninstall_files_from_dir = { \ -+ test -z "$$files" \ -+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ -+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ -+ $(am__cd) "$$dir" && rm -f $$files; }; \ -+ } - am__installdirs = "$(DESTDIR)$(pkglibdir)" - LTLIBRARIES = $(pkglib_LTLIBRARIES) - libdocs_html_la_DEPENDENCIES = \ -@@ -78,35 +129,92 @@ libdocs_html_la_DEPENDENCIES = \ - am_libdocs_html_la_OBJECTS = CreateWebContent.lo doc_html.lo \ - doc_svg.lo MLB_Interface.lo svg_interactive_map.lo - libdocs_html_la_OBJECTS = $(am_libdocs_html_la_OBJECTS) -+AM_V_lt = $(am__v_lt_@AM_V@) -+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -+am__v_lt_0 = --silent -+am__v_lt_1 = -+AM_V_P = $(am__v_P_@AM_V@) -+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -+am__v_P_0 = false -+am__v_P_1 = : -+AM_V_GEN = $(am__v_GEN_@AM_V@) -+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+am__v_GEN_0 = @echo " GEN " $@; -+am__v_GEN_1 = -+AM_V_at = $(am__v_at_@AM_V@) -+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+am__v_at_0 = @ -+am__v_at_1 = - DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - am__mv = mv -f - CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) --LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CXXFLAGS) $(CXXFLAGS) -+AM_V_CXX = $(am__v_CXX_@AM_V@) -+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) -+am__v_CXX_0 = @echo " CXX " $@; -+am__v_CXX_1 = - CXXLD = $(CXX) --CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ -+ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) -+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) -+am__v_CXXLD_0 = @echo " CXXLD " $@; -+am__v_CXXLD_1 = - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CFLAGS) $(CFLAGS) -+AM_V_CC = $(am__v_CC_@AM_V@) -+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -+am__v_CC_0 = @echo " CC " $@; -+am__v_CC_1 = - CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CCLD = $(am__v_CCLD_@AM_V@) -+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -+am__v_CCLD_0 = @echo " CCLD " $@; -+am__v_CCLD_1 = - SOURCES = $(libdocs_html_la_SOURCES) - DIST_SOURCES = $(libdocs_html_la_SOURCES) -+am__can_run_installinfo = \ -+ case $$AM_UPDATE_INFO_DIR in \ -+ n|no|NO) false;; \ -+ *) (install-info --version) >/dev/null 2>&1;; \ -+ esac -+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -+# Read a list of newline-separated strings from the standard input, -+# and print each of them once, without duplicates. Input order is -+# *not* preserved. -+am__uniquify_input = $(AWK) '\ -+ BEGIN { nonempty = 0; } \ -+ { items[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in items) print i; }; } \ -+' -+# Make sure the list of sources is unique. This is necessary because, -+# e.g., the same source file might be shared among _SOURCES variables -+# for different programs/libraries. -+am__define_uniq_tagged_files = \ -+ list='$(am__tagged_files)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | $(am__uniquify_input)` - ETAGS = etags - CTAGS = ctags - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ -+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ -@@ -127,6 +235,7 @@ CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DISABLELIBHARU = @DISABLELIBHARU@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -154,6 +263,7 @@ LOCAL_INCS = @LOCAL_INCS@ - LOCAL_LIBS = @LOCAL_LIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - NM = @NM@ - NMEDIT = @NMEDIT@ -@@ -166,6 +276,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - POW_LIB = @POW_LIB@ -@@ -191,6 +302,7 @@ abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -@@ -224,7 +336,6 @@ libdir = @libdir@ - libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -@@ -302,9 +413,9 @@ $(top_srcdir)/configure: $(am__configure_deps) - $(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - $(am__aclocal_m4_deps): -+ - install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" - @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ - list2=; for p in $$list; do \ - if test -f $$p; then \ -@@ -312,6 +423,8 @@ install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - else :; fi; \ - done; \ - test -z "$$list2" || { \ -+ echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \ -+ $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \ - } -@@ -327,14 +440,17 @@ uninstall-pkglibLTLIBRARIES: - - clean-pkglibLTLIBRARIES: - -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES) -- @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \ -- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -- echo "rm -f \"$${dir}/so_locations\""; \ -- rm -f "$${dir}/so_locations"; \ -- done --libdocs_html.la: $(libdocs_html_la_OBJECTS) $(libdocs_html_la_DEPENDENCIES) -- $(CXXLINK) -rpath $(pkglibdir) $(libdocs_html_la_OBJECTS) $(libdocs_html_la_LIBADD) $(LIBS) -+ @list='$(pkglib_LTLIBRARIES)'; \ -+ locs=`for p in $$list; do echo $$p; done | \ -+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ -+ sort -u`; \ -+ test -z "$$locs" || { \ -+ echo rm -f $${locs}; \ -+ rm -f $${locs}; \ -+ } -+ -+libdocs_html.la: $(libdocs_html_la_OBJECTS) $(libdocs_html_la_DEPENDENCIES) $(EXTRA_libdocs_html_la_DEPENDENCIES) -+ $(AM_V_CXXLD)$(CXXLINK) -rpath $(pkglibdir) $(libdocs_html_la_OBJECTS) $(libdocs_html_la_LIBADD) $(LIBS) - - mostlyclean-compile: - -rm -f *.$(OBJEXT) -@@ -349,25 +465,25 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/svg_interactive_map.Plo@am__quote@ - - .cpp.o: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< - - .cpp.obj: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - - .cpp.lo: --@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< - - mostlyclean-libtool: - -rm -f *.lo -@@ -375,26 +491,15 @@ mostlyclean-libtool: - clean-libtool: - -rm -rf .libs _libs - --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -+ID: $(am__tagged_files) -+ $(am__define_uniq_tagged_files); mkid -fID $$unique -+tags: tags-am -+TAGS: tags -+ -+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ -@@ -406,15 +511,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $$unique; \ - fi; \ - fi --ctags: CTAGS --CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ctags: ctags-am -+ -+CTAGS: ctags -+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) -+ $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique -@@ -423,6 +524,21 @@ GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -+cscopelist: cscopelist-am -+ -+cscopelist-am: $(am__tagged_files) -+ list='$(am__tagged_files)'; \ -+ case "$(srcdir)" in \ -+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ -+ *) sdir=$(subdir)/$(srcdir) ;; \ -+ esac; \ -+ for i in $$list; do \ -+ if test -f "$$i"; then \ -+ echo "$(subdir)/$$i"; \ -+ else \ -+ echo "$$sdir/$$i"; \ -+ fi; \ -+ done >> $(top_builddir)/cscope.files - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -@@ -474,10 +590,15 @@ install-am: all-am - - installcheck: installcheck-am - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+ if test -z '$(STRIP)'; then \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ install; \ -+ else \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -+ fi - mostlyclean-generic: - - clean-generic: -@@ -562,19 +683,20 @@ uninstall-am: uninstall-pkglibLTLIBRARIES - - .MAKE: install-am install-strip - --.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ -- clean-libtool clean-pkglibLTLIBRARIES ctags distclean \ -- distclean-compile distclean-generic distclean-libtool \ -- distclean-tags distdir dvi dvi-am html html-am info info-am \ -- install install-am install-data install-data-am install-dvi \ -- install-dvi-am install-exec install-exec-am install-html \ -- install-html-am install-info install-info-am install-man \ -- install-pdf install-pdf-am install-pkglibLTLIBRARIES \ -- install-ps install-ps-am install-strip installcheck \ -- installcheck-am installdirs maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-compile \ -- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -- tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES -+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ -+ clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \ -+ ctags-am distclean distclean-compile distclean-generic \ -+ distclean-libtool distclean-tags distdir dvi dvi-am html \ -+ html-am info info-am install install-am install-data \ -+ install-data-am install-dvi install-dvi-am install-exec \ -+ install-exec-am install-html install-html-am install-info \ -+ install-info-am install-man install-pdf install-pdf-am \ -+ install-pkglibLTLIBRARIES install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ maintainer-clean maintainer-clean-generic mostlyclean \ -+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ -+ pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ -+ uninstall-pkglibLTLIBRARIES - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff --git a/src/modules_io/docs/docs_pdf/Makefile.in b/src/modules_io/docs/docs_pdf/Makefile.in -index 58df430..2ea62f5 100644 ---- a/src/modules_io/docs/docs_pdf/Makefile.in -+++ b/src/modules_io/docs/docs_pdf/Makefile.in -@@ -1,9 +1,8 @@ --# Makefile.in generated by automake 1.11.1 from Makefile.am. -+# Makefile.in generated by automake 1.14 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, --# Inc. -+# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+ - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -16,6 +15,51 @@ - @SET_MAKE@ - - VPATH = @srcdir@ -+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -+am__make_running_with_option = \ -+ case $${target_option-} in \ -+ ?) ;; \ -+ *) echo "am__make_running_with_option: internal error: invalid" \ -+ "target option '$${target_option-}' specified" >&2; \ -+ exit 1;; \ -+ esac; \ -+ has_opt=no; \ -+ sane_makeflags=$$MAKEFLAGS; \ -+ if $(am__is_gnu_make); then \ -+ sane_makeflags=$$MFLAGS; \ -+ else \ -+ case $$MAKEFLAGS in \ -+ *\\[\ \ ]*) \ -+ bs=\\; \ -+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -+ esac; \ -+ fi; \ -+ skip_next=no; \ -+ strip_trailopt () \ -+ { \ -+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -+ }; \ -+ for flg in $$sane_makeflags; do \ -+ test $$skip_next = yes && { skip_next=no; continue; }; \ -+ case $$flg in \ -+ *=*|--*) continue;; \ -+ -*I) strip_trailopt 'I'; skip_next=yes;; \ -+ -*I?*) strip_trailopt 'I';; \ -+ -*O) strip_trailopt 'O'; skip_next=yes;; \ -+ -*O?*) strip_trailopt 'O';; \ -+ -*l) strip_trailopt 'l'; skip_next=yes;; \ -+ -*l?*) strip_trailopt 'l';; \ -+ -[dEDm]) skip_next=yes;; \ -+ -[JT]) skip_next=yes;; \ -+ esac; \ -+ case $$flg in \ -+ *$$target_option*) has_opt=yes; break;; \ -+ esac; \ -+ done; \ -+ test $$has_opt = yes -+am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -+am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -35,7 +79,8 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - subdir = src/modules_io/docs/docs_pdf --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ -+ $(top_srcdir)/depcomp - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ - $(top_srcdir)/m4/ax_python_devel.m4 \ -@@ -71,6 +116,12 @@ am__nobase_list = $(am__nobase_strip_setup); \ - am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -+am__uninstall_files_from_dir = { \ -+ test -z "$$files" \ -+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ -+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ -+ $(am__cd) "$$dir" && rm -f $$files; }; \ -+ } - am__installdirs = "$(DESTDIR)$(pkglibdir)" - LTLIBRARIES = $(pkglib_LTLIBRARIES) - @HAVE_HARU_TRUE@libdocs_pdf_la_DEPENDENCIES = $(top_srcdir)/src/saga_core/saga_api/libsaga_api.la -@@ -82,36 +133,93 @@ am__libdocs_pdf_la_SOURCES_DIST = doc_pdf.cpp MLB_Interface.cpp \ - @HAVE_HARU_TRUE@ MLB_Interface.lo Profile_Cross_Sections.lo \ - @HAVE_HARU_TRUE@ Shapes_Report.lo Shapes_Summary.lo - libdocs_pdf_la_OBJECTS = $(am_libdocs_pdf_la_OBJECTS) -+AM_V_lt = $(am__v_lt_@AM_V@) -+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -+am__v_lt_0 = --silent -+am__v_lt_1 = - @HAVE_HARU_TRUE@am_libdocs_pdf_la_rpath = -rpath $(pkglibdir) -+AM_V_P = $(am__v_P_@AM_V@) -+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -+am__v_P_0 = false -+am__v_P_1 = : -+AM_V_GEN = $(am__v_GEN_@AM_V@) -+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+am__v_GEN_0 = @echo " GEN " $@; -+am__v_GEN_1 = -+AM_V_at = $(am__v_at_@AM_V@) -+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+am__v_at_0 = @ -+am__v_at_1 = - DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - am__mv = mv -f - CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) --LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CXXFLAGS) $(CXXFLAGS) -+AM_V_CXX = $(am__v_CXX_@AM_V@) -+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) -+am__v_CXX_0 = @echo " CXX " $@; -+am__v_CXX_1 = - CXXLD = $(CXX) --CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ -+ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) -+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) -+am__v_CXXLD_0 = @echo " CXXLD " $@; -+am__v_CXXLD_1 = - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CFLAGS) $(CFLAGS) -+AM_V_CC = $(am__v_CC_@AM_V@) -+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -+am__v_CC_0 = @echo " CC " $@; -+am__v_CC_1 = - CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CCLD = $(am__v_CCLD_@AM_V@) -+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -+am__v_CCLD_0 = @echo " CCLD " $@; -+am__v_CCLD_1 = - SOURCES = $(libdocs_pdf_la_SOURCES) - DIST_SOURCES = $(am__libdocs_pdf_la_SOURCES_DIST) -+am__can_run_installinfo = \ -+ case $$AM_UPDATE_INFO_DIR in \ -+ n|no|NO) false;; \ -+ *) (install-info --version) >/dev/null 2>&1;; \ -+ esac -+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -+# Read a list of newline-separated strings from the standard input, -+# and print each of them once, without duplicates. Input order is -+# *not* preserved. -+am__uniquify_input = $(AWK) '\ -+ BEGIN { nonempty = 0; } \ -+ { items[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in items) print i; }; } \ -+' -+# Make sure the list of sources is unique. This is necessary because, -+# e.g., the same source file might be shared among _SOURCES variables -+# for different programs/libraries. -+am__define_uniq_tagged_files = \ -+ list='$(am__tagged_files)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | $(am__uniquify_input)` - ETAGS = etags - CTAGS = ctags - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ -+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ -@@ -132,6 +240,7 @@ CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DISABLELIBHARU = @DISABLELIBHARU@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -159,6 +268,7 @@ LOCAL_INCS = @LOCAL_INCS@ - LOCAL_LIBS = @LOCAL_LIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - NM = @NM@ - NMEDIT = @NMEDIT@ -@@ -171,6 +281,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - POW_LIB = @POW_LIB@ -@@ -196,6 +307,7 @@ abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -@@ -229,7 +341,6 @@ libdir = @libdir@ - libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -@@ -307,9 +418,9 @@ $(top_srcdir)/configure: $(am__configure_deps) - $(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - $(am__aclocal_m4_deps): -+ - install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" - @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ - list2=; for p in $$list; do \ - if test -f $$p; then \ -@@ -317,6 +428,8 @@ install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - else :; fi; \ - done; \ - test -z "$$list2" || { \ -+ echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \ -+ $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \ - } -@@ -332,14 +445,17 @@ uninstall-pkglibLTLIBRARIES: - - clean-pkglibLTLIBRARIES: - -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES) -- @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \ -- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -- echo "rm -f \"$${dir}/so_locations\""; \ -- rm -f "$${dir}/so_locations"; \ -- done --libdocs_pdf.la: $(libdocs_pdf_la_OBJECTS) $(libdocs_pdf_la_DEPENDENCIES) -- $(CXXLINK) $(am_libdocs_pdf_la_rpath) $(libdocs_pdf_la_OBJECTS) $(libdocs_pdf_la_LIBADD) $(LIBS) -+ @list='$(pkglib_LTLIBRARIES)'; \ -+ locs=`for p in $$list; do echo $$p; done | \ -+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ -+ sort -u`; \ -+ test -z "$$locs" || { \ -+ echo rm -f $${locs}; \ -+ rm -f $${locs}; \ -+ } -+ -+libdocs_pdf.la: $(libdocs_pdf_la_OBJECTS) $(libdocs_pdf_la_DEPENDENCIES) $(EXTRA_libdocs_pdf_la_DEPENDENCIES) -+ $(AM_V_CXXLD)$(CXXLINK) $(am_libdocs_pdf_la_rpath) $(libdocs_pdf_la_OBJECTS) $(libdocs_pdf_la_LIBADD) $(LIBS) - - mostlyclean-compile: - -rm -f *.$(OBJEXT) -@@ -354,25 +470,25 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/doc_pdf.Plo@am__quote@ - - .cpp.o: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< - - .cpp.obj: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - - .cpp.lo: --@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< - - mostlyclean-libtool: - -rm -f *.lo -@@ -380,26 +496,15 @@ mostlyclean-libtool: - clean-libtool: - -rm -rf .libs _libs - --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -+ID: $(am__tagged_files) -+ $(am__define_uniq_tagged_files); mkid -fID $$unique -+tags: tags-am -+TAGS: tags -+ -+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ -@@ -411,15 +516,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $$unique; \ - fi; \ - fi --ctags: CTAGS --CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ctags: ctags-am -+ -+CTAGS: ctags -+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) -+ $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique -@@ -428,6 +529,21 @@ GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -+cscopelist: cscopelist-am -+ -+cscopelist-am: $(am__tagged_files) -+ list='$(am__tagged_files)'; \ -+ case "$(srcdir)" in \ -+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ -+ *) sdir=$(subdir)/$(srcdir) ;; \ -+ esac; \ -+ for i in $$list; do \ -+ if test -f "$$i"; then \ -+ echo "$(subdir)/$$i"; \ -+ else \ -+ echo "$$sdir/$$i"; \ -+ fi; \ -+ done >> $(top_builddir)/cscope.files - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -@@ -479,10 +595,15 @@ install-am: all-am - - installcheck: installcheck-am - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+ if test -z '$(STRIP)'; then \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ install; \ -+ else \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -+ fi - mostlyclean-generic: - - clean-generic: -@@ -567,19 +688,20 @@ uninstall-am: uninstall-pkglibLTLIBRARIES - - .MAKE: install-am install-strip - --.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ -- clean-libtool clean-pkglibLTLIBRARIES ctags distclean \ -- distclean-compile distclean-generic distclean-libtool \ -- distclean-tags distdir dvi dvi-am html html-am info info-am \ -- install install-am install-data install-data-am install-dvi \ -- install-dvi-am install-exec install-exec-am install-html \ -- install-html-am install-info install-info-am install-man \ -- install-pdf install-pdf-am install-pkglibLTLIBRARIES \ -- install-ps install-ps-am install-strip installcheck \ -- installcheck-am installdirs maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-compile \ -- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -- tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES -+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ -+ clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \ -+ ctags-am distclean distclean-compile distclean-generic \ -+ distclean-libtool distclean-tags distdir dvi dvi-am html \ -+ html-am info info-am install install-am install-data \ -+ install-data-am install-dvi install-dvi-am install-exec \ -+ install-exec-am install-html install-html-am install-info \ -+ install-info-am install-man install-pdf install-pdf-am \ -+ install-pkglibLTLIBRARIES install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ maintainer-clean maintainer-clean-generic mostlyclean \ -+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ -+ pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ -+ uninstall-pkglibLTLIBRARIES - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff --git a/src/modules_io/esri_e00/Makefile.in b/src/modules_io/esri_e00/Makefile.in -index 0a2c3e0..c43ae10 100644 ---- a/src/modules_io/esri_e00/Makefile.in -+++ b/src/modules_io/esri_e00/Makefile.in -@@ -1,9 +1,8 @@ --# Makefile.in generated by automake 1.11.1 from Makefile.am. -+# Makefile.in generated by automake 1.14 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, --# Inc. -+# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+ - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -15,6 +14,51 @@ - - @SET_MAKE@ - VPATH = @srcdir@ -+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -+am__make_running_with_option = \ -+ case $${target_option-} in \ -+ ?) ;; \ -+ *) echo "am__make_running_with_option: internal error: invalid" \ -+ "target option '$${target_option-}' specified" >&2; \ -+ exit 1;; \ -+ esac; \ -+ has_opt=no; \ -+ sane_makeflags=$$MAKEFLAGS; \ -+ if $(am__is_gnu_make); then \ -+ sane_makeflags=$$MFLAGS; \ -+ else \ -+ case $$MAKEFLAGS in \ -+ *\\[\ \ ]*) \ -+ bs=\\; \ -+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -+ esac; \ -+ fi; \ -+ skip_next=no; \ -+ strip_trailopt () \ -+ { \ -+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -+ }; \ -+ for flg in $$sane_makeflags; do \ -+ test $$skip_next = yes && { skip_next=no; continue; }; \ -+ case $$flg in \ -+ *=*|--*) continue;; \ -+ -*I) strip_trailopt 'I'; skip_next=yes;; \ -+ -*I?*) strip_trailopt 'I';; \ -+ -*O) strip_trailopt 'O'; skip_next=yes;; \ -+ -*O?*) strip_trailopt 'O';; \ -+ -*l) strip_trailopt 'l'; skip_next=yes;; \ -+ -*l?*) strip_trailopt 'l';; \ -+ -[dEDm]) skip_next=yes;; \ -+ -[JT]) skip_next=yes;; \ -+ esac; \ -+ case $$flg in \ -+ *$$target_option*) has_opt=yes; break;; \ -+ esac; \ -+ done; \ -+ test $$has_opt = yes -+am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -+am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -34,7 +78,7 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - subdir = src/modules_io/esri_e00 --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ - $(top_srcdir)/m4/ax_python_devel.m4 \ -@@ -49,20 +93,58 @@ mkinstalldirs = $(install_sh) -d - CONFIG_HEADER = $(top_builddir)/config.h - CONFIG_CLEAN_FILES = - CONFIG_CLEAN_VPATH_FILES = -+AM_V_P = $(am__v_P_@AM_V@) -+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -+am__v_P_0 = false -+am__v_P_1 = : -+AM_V_GEN = $(am__v_GEN_@AM_V@) -+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+am__v_GEN_0 = @echo " GEN " $@; -+am__v_GEN_1 = -+AM_V_at = $(am__v_at_@AM_V@) -+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+am__v_at_0 = @ -+am__v_at_1 = - SOURCES = - DIST_SOURCES = --RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ -- html-recursive info-recursive install-data-recursive \ -- install-dvi-recursive install-exec-recursive \ -- install-html-recursive install-info-recursive \ -- install-pdf-recursive install-ps-recursive install-recursive \ -- installcheck-recursive installdirs-recursive pdf-recursive \ -- ps-recursive uninstall-recursive -+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ -+ ctags-recursive dvi-recursive html-recursive info-recursive \ -+ install-data-recursive install-dvi-recursive \ -+ install-exec-recursive install-html-recursive \ -+ install-info-recursive install-pdf-recursive \ -+ install-ps-recursive install-recursive installcheck-recursive \ -+ installdirs-recursive pdf-recursive ps-recursive \ -+ tags-recursive uninstall-recursive -+am__can_run_installinfo = \ -+ case $$AM_UPDATE_INFO_DIR in \ -+ n|no|NO) false;; \ -+ *) (install-info --version) >/dev/null 2>&1;; \ -+ esac - RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ - distclean-recursive maintainer-clean-recursive --AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ -- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ -+am__recursive_targets = \ -+ $(RECURSIVE_TARGETS) \ -+ $(RECURSIVE_CLEAN_TARGETS) \ -+ $(am__extra_recursive_targets) -+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ - distdir -+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -+# Read a list of newline-separated strings from the standard input, -+# and print each of them once, without duplicates. Input order is -+# *not* preserved. -+am__uniquify_input = $(AWK) '\ -+ BEGIN { nonempty = 0; } \ -+ { items[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in items) print i; }; } \ -+' -+# Make sure the list of sources is unique. This is necessary because, -+# e.g., the same source file might be shared among _SOURCES variables -+# for different programs/libraries. -+am__define_uniq_tagged_files = \ -+ list='$(am__tagged_files)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | $(am__uniquify_input)` - ETAGS = etags - CTAGS = ctags - DIST_SUBDIRS = $(SUBDIRS) -@@ -94,6 +176,7 @@ am__relativize = \ - reldir="$$dir2" - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ -+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ -@@ -114,6 +197,7 @@ CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DISABLELIBHARU = @DISABLELIBHARU@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -141,6 +225,7 @@ LOCAL_INCS = @LOCAL_INCS@ - LOCAL_LIBS = @LOCAL_LIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - NM = @NM@ - NMEDIT = @NMEDIT@ -@@ -153,6 +238,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - POW_LIB = @POW_LIB@ -@@ -178,6 +264,7 @@ abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -@@ -211,7 +298,6 @@ libdir = @libdir@ - libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -@@ -273,22 +359,25 @@ clean-libtool: - -rm -rf .libs _libs - - # This directory's subdirectories are mostly independent; you can cd --# into them and run `make' without going through this Makefile. --# To change the values of `make' variables: instead of editing Makefiles, --# (1) if the variable is set in `config.status', edit `config.status' --# (which will cause the Makefiles to be regenerated when you run `make'); --# (2) otherwise, pass the desired values on the `make' command line. --$(RECURSIVE_TARGETS): -- @fail= failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -+# into them and run 'make' without going through this Makefile. -+# To change the values of 'make' variables: instead of editing Makefiles, -+# (1) if the variable is set in 'config.status', edit 'config.status' -+# (which will cause the Makefiles to be regenerated when you run 'make'); -+# (2) otherwise, pass the desired values on the 'make' command line. -+$(am__recursive_targets): -+ @fail=; \ -+ if $(am__make_keepgoing); then \ -+ failcom='fail=yes'; \ -+ else \ -+ failcom='exit 1'; \ -+ fi; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ -- list='$(SUBDIRS)'; for subdir in $$list; do \ -+ case "$@" in \ -+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -+ *) list='$(SUBDIRS)' ;; \ -+ esac; \ -+ for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ -@@ -303,57 +392,12 @@ $(RECURSIVE_TARGETS): - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - --$(RECURSIVE_CLEAN_TARGETS): -- @fail= failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -- dot_seen=no; \ -- case "$@" in \ -- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -- *) list='$(SUBDIRS)' ;; \ -- esac; \ -- rev=''; for subdir in $$list; do \ -- if test "$$subdir" = "."; then :; else \ -- rev="$$subdir $$rev"; \ -- fi; \ -- done; \ -- rev="$$rev ."; \ -- target=`echo $@ | sed s/-recursive//`; \ -- for subdir in $$rev; do \ -- echo "Making $$target in $$subdir"; \ -- if test "$$subdir" = "."; then \ -- local_target="$$target-am"; \ -- else \ -- local_target="$$target"; \ -- fi; \ -- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || eval $$failcom; \ -- done && test -z "$$fail" --tags-recursive: -- list='$(SUBDIRS)'; for subdir in $$list; do \ -- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ -- done --ctags-recursive: -- list='$(SUBDIRS)'; for subdir in $$list; do \ -- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ -- done -+ID: $(am__tagged_files) -+ $(am__define_uniq_tagged_files); mkid -fID $$unique -+tags: tags-recursive -+TAGS: tags - --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ - if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ -@@ -369,12 +413,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ -@@ -386,15 +425,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $$unique; \ - fi; \ - fi --ctags: CTAGS --CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ctags: ctags-recursive -+ -+CTAGS: ctags -+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) -+ $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique -@@ -403,6 +438,21 @@ GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -+cscopelist: cscopelist-recursive -+ -+cscopelist-am: $(am__tagged_files) -+ list='$(am__tagged_files)'; \ -+ case "$(srcdir)" in \ -+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ -+ *) sdir=$(subdir)/$(srcdir) ;; \ -+ esac; \ -+ for i in $$list; do \ -+ if test -f "$$i"; then \ -+ echo "$(subdir)/$$i"; \ -+ else \ -+ echo "$$sdir/$$i"; \ -+ fi; \ -+ done >> $(top_builddir)/cscope.files - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -@@ -439,13 +489,10 @@ distdir: $(DISTFILES) - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test -d "$(distdir)/$$subdir" \ -- || $(MKDIR_P) "$(distdir)/$$subdir" \ -- || exit 1; \ -- fi; \ -- done -- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ -- if test "$$subdir" = .; then :; else \ -+ $(am__make_dryrun) \ -+ || test -d "$(distdir)/$$subdir" \ -+ || $(MKDIR_P) "$(distdir)/$$subdir" \ -+ || exit 1; \ - dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ - $(am__relativize); \ - new_distdir=$$reldir; \ -@@ -480,10 +527,15 @@ install-am: all-am - - installcheck: installcheck-recursive - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+ if test -z '$(STRIP)'; then \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ install; \ -+ else \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -+ fi - mostlyclean-generic: - - clean-generic: -@@ -561,22 +613,20 @@ ps-am: - - uninstall-am: - --.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ -- install-am install-strip tags-recursive -- --.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ -- all all-am check check-am clean clean-generic clean-libtool \ -- ctags ctags-recursive distclean distclean-generic \ -- distclean-libtool distclean-tags distdir dvi dvi-am html \ -- html-am info info-am install install-am install-data \ -- install-data-am install-dvi install-dvi-am install-exec \ -- install-exec-am install-html install-html-am install-info \ -- install-info-am install-man install-pdf install-pdf-am \ -- install-ps install-ps-am install-strip installcheck \ -- installcheck-am installdirs installdirs-am maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-generic \ -- mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ -- uninstall uninstall-am -+.MAKE: $(am__recursive_targets) install-am install-strip -+ -+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ -+ check-am clean clean-generic clean-libtool cscopelist-am ctags \ -+ ctags-am distclean distclean-generic distclean-libtool \ -+ distclean-tags distdir dvi dvi-am html html-am info info-am \ -+ install install-am install-data install-data-am install-dvi \ -+ install-dvi-am install-exec install-exec-am install-html \ -+ install-html-am install-info install-info-am install-man \ -+ install-pdf install-pdf-am install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ installdirs-am maintainer-clean maintainer-clean-generic \ -+ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ -+ ps ps-am tags tags-am uninstall uninstall-am - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff --git a/src/modules_io/esri_e00/io_esri_e00/Makefile.in b/src/modules_io/esri_e00/io_esri_e00/Makefile.in -index 7d40e6a..12fc0e9 100644 ---- a/src/modules_io/esri_e00/io_esri_e00/Makefile.in -+++ b/src/modules_io/esri_e00/io_esri_e00/Makefile.in -@@ -1,9 +1,8 @@ --# Makefile.in generated by automake 1.11.1 from Makefile.am. -+# Makefile.in generated by automake 1.14 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, --# Inc. -+# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+ - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -16,6 +15,51 @@ - @SET_MAKE@ - - VPATH = @srcdir@ -+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -+am__make_running_with_option = \ -+ case $${target_option-} in \ -+ ?) ;; \ -+ *) echo "am__make_running_with_option: internal error: invalid" \ -+ "target option '$${target_option-}' specified" >&2; \ -+ exit 1;; \ -+ esac; \ -+ has_opt=no; \ -+ sane_makeflags=$$MAKEFLAGS; \ -+ if $(am__is_gnu_make); then \ -+ sane_makeflags=$$MFLAGS; \ -+ else \ -+ case $$MAKEFLAGS in \ -+ *\\[\ \ ]*) \ -+ bs=\\; \ -+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -+ esac; \ -+ fi; \ -+ skip_next=no; \ -+ strip_trailopt () \ -+ { \ -+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -+ }; \ -+ for flg in $$sane_makeflags; do \ -+ test $$skip_next = yes && { skip_next=no; continue; }; \ -+ case $$flg in \ -+ *=*|--*) continue;; \ -+ -*I) strip_trailopt 'I'; skip_next=yes;; \ -+ -*I?*) strip_trailopt 'I';; \ -+ -*O) strip_trailopt 'O'; skip_next=yes;; \ -+ -*O?*) strip_trailopt 'O';; \ -+ -*l) strip_trailopt 'l'; skip_next=yes;; \ -+ -*l?*) strip_trailopt 'l';; \ -+ -[dEDm]) skip_next=yes;; \ -+ -[JT]) skip_next=yes;; \ -+ esac; \ -+ case $$flg in \ -+ *$$target_option*) has_opt=yes; break;; \ -+ esac; \ -+ done; \ -+ test $$has_opt = yes -+am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -+am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -35,7 +79,8 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - subdir = src/modules_io/esri_e00/io_esri_e00 --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ -+ $(top_srcdir)/depcomp - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ - $(top_srcdir)/m4/ax_python_devel.m4 \ -@@ -71,6 +116,12 @@ am__nobase_list = $(am__nobase_strip_setup); \ - am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -+am__uninstall_files_from_dir = { \ -+ test -z "$$files" \ -+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ -+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ -+ $(am__cd) "$$dir" && rm -f $$files; }; \ -+ } - am__installdirs = "$(DESTDIR)$(pkglibdir)" - LTLIBRARIES = $(pkglib_LTLIBRARIES) - libio_esri_e00_la_DEPENDENCIES = \ -@@ -79,35 +130,92 @@ am_libio_esri_e00_la_OBJECTS = ESRI_E00_Import.lo MLB_Interface.lo \ - cpl_conv.lo cpl_error.lo cpl_vsisimple.lo e00read.lo \ - e00write.lo - libio_esri_e00_la_OBJECTS = $(am_libio_esri_e00_la_OBJECTS) -+AM_V_lt = $(am__v_lt_@AM_V@) -+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -+am__v_lt_0 = --silent -+am__v_lt_1 = -+AM_V_P = $(am__v_P_@AM_V@) -+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -+am__v_P_0 = false -+am__v_P_1 = : -+AM_V_GEN = $(am__v_GEN_@AM_V@) -+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+am__v_GEN_0 = @echo " GEN " $@; -+am__v_GEN_1 = -+AM_V_at = $(am__v_at_@AM_V@) -+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+am__v_at_0 = @ -+am__v_at_1 = - DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - am__mv = mv -f - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CFLAGS) $(CFLAGS) -+AM_V_CC = $(am__v_CC_@AM_V@) -+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -+am__v_CC_0 = @echo " CC " $@; -+am__v_CC_1 = - CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CCLD = $(am__v_CCLD_@AM_V@) -+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -+am__v_CCLD_0 = @echo " CCLD " $@; -+am__v_CCLD_1 = - CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) --LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CXXFLAGS) $(CXXFLAGS) -+AM_V_CXX = $(am__v_CXX_@AM_V@) -+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) -+am__v_CXX_0 = @echo " CXX " $@; -+am__v_CXX_1 = - CXXLD = $(CXX) --CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ -+ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) -+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) -+am__v_CXXLD_0 = @echo " CXXLD " $@; -+am__v_CXXLD_1 = - SOURCES = $(libio_esri_e00_la_SOURCES) - DIST_SOURCES = $(libio_esri_e00_la_SOURCES) -+am__can_run_installinfo = \ -+ case $$AM_UPDATE_INFO_DIR in \ -+ n|no|NO) false;; \ -+ *) (install-info --version) >/dev/null 2>&1;; \ -+ esac -+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -+# Read a list of newline-separated strings from the standard input, -+# and print each of them once, without duplicates. Input order is -+# *not* preserved. -+am__uniquify_input = $(AWK) '\ -+ BEGIN { nonempty = 0; } \ -+ { items[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in items) print i; }; } \ -+' -+# Make sure the list of sources is unique. This is necessary because, -+# e.g., the same source file might be shared among _SOURCES variables -+# for different programs/libraries. -+am__define_uniq_tagged_files = \ -+ list='$(am__tagged_files)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | $(am__uniquify_input)` - ETAGS = etags - CTAGS = ctags - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ -+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ -@@ -128,6 +236,7 @@ CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DISABLELIBHARU = @DISABLELIBHARU@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -155,6 +264,7 @@ LOCAL_INCS = @LOCAL_INCS@ - LOCAL_LIBS = @LOCAL_LIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - NM = @NM@ - NMEDIT = @NMEDIT@ -@@ -167,6 +277,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - POW_LIB = @POW_LIB@ -@@ -192,6 +303,7 @@ abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -@@ -225,7 +337,6 @@ libdir = @libdir@ - libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -@@ -307,9 +418,9 @@ $(top_srcdir)/configure: $(am__configure_deps) - $(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - $(am__aclocal_m4_deps): -+ - install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" - @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ - list2=; for p in $$list; do \ - if test -f $$p; then \ -@@ -317,6 +428,8 @@ install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - else :; fi; \ - done; \ - test -z "$$list2" || { \ -+ echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \ -+ $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \ - } -@@ -332,14 +445,17 @@ uninstall-pkglibLTLIBRARIES: - - clean-pkglibLTLIBRARIES: - -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES) -- @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \ -- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -- echo "rm -f \"$${dir}/so_locations\""; \ -- rm -f "$${dir}/so_locations"; \ -- done --libio_esri_e00.la: $(libio_esri_e00_la_OBJECTS) $(libio_esri_e00_la_DEPENDENCIES) -- $(CXXLINK) -rpath $(pkglibdir) $(libio_esri_e00_la_OBJECTS) $(libio_esri_e00_la_LIBADD) $(LIBS) -+ @list='$(pkglib_LTLIBRARIES)'; \ -+ locs=`for p in $$list; do echo $$p; done | \ -+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ -+ sort -u`; \ -+ test -z "$$locs" || { \ -+ echo rm -f $${locs}; \ -+ rm -f $${locs}; \ -+ } -+ -+libio_esri_e00.la: $(libio_esri_e00_la_OBJECTS) $(libio_esri_e00_la_DEPENDENCIES) $(EXTRA_libio_esri_e00_la_DEPENDENCIES) -+ $(AM_V_CXXLD)$(CXXLINK) -rpath $(pkglibdir) $(libio_esri_e00_la_OBJECTS) $(libio_esri_e00_la_LIBADD) $(LIBS) - - mostlyclean-compile: - -rm -f *.$(OBJEXT) -@@ -356,81 +472,81 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/e00write.Plo@am__quote@ - - .c.o: --@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(COMPILE) -c $< -+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< - - .c.obj: --@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` --@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` -+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - - .c.lo: --@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< -+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< - - cpl_conv.lo: e00compr/cpl_conv.c --@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT cpl_conv.lo -MD -MP -MF $(DEPDIR)/cpl_conv.Tpo -c -o cpl_conv.lo `test -f 'e00compr/cpl_conv.c' || echo '$(srcdir)/'`e00compr/cpl_conv.c --@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/cpl_conv.Tpo $(DEPDIR)/cpl_conv.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='e00compr/cpl_conv.c' object='cpl_conv.lo' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT cpl_conv.lo -MD -MP -MF $(DEPDIR)/cpl_conv.Tpo -c -o cpl_conv.lo `test -f 'e00compr/cpl_conv.c' || echo '$(srcdir)/'`e00compr/cpl_conv.c -+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/cpl_conv.Tpo $(DEPDIR)/cpl_conv.Plo -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='e00compr/cpl_conv.c' object='cpl_conv.lo' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o cpl_conv.lo `test -f 'e00compr/cpl_conv.c' || echo '$(srcdir)/'`e00compr/cpl_conv.c -+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o cpl_conv.lo `test -f 'e00compr/cpl_conv.c' || echo '$(srcdir)/'`e00compr/cpl_conv.c - - cpl_error.lo: e00compr/cpl_error.c --@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT cpl_error.lo -MD -MP -MF $(DEPDIR)/cpl_error.Tpo -c -o cpl_error.lo `test -f 'e00compr/cpl_error.c' || echo '$(srcdir)/'`e00compr/cpl_error.c --@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/cpl_error.Tpo $(DEPDIR)/cpl_error.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='e00compr/cpl_error.c' object='cpl_error.lo' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT cpl_error.lo -MD -MP -MF $(DEPDIR)/cpl_error.Tpo -c -o cpl_error.lo `test -f 'e00compr/cpl_error.c' || echo '$(srcdir)/'`e00compr/cpl_error.c -+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/cpl_error.Tpo $(DEPDIR)/cpl_error.Plo -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='e00compr/cpl_error.c' object='cpl_error.lo' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o cpl_error.lo `test -f 'e00compr/cpl_error.c' || echo '$(srcdir)/'`e00compr/cpl_error.c -+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o cpl_error.lo `test -f 'e00compr/cpl_error.c' || echo '$(srcdir)/'`e00compr/cpl_error.c - - cpl_vsisimple.lo: e00compr/cpl_vsisimple.c --@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT cpl_vsisimple.lo -MD -MP -MF $(DEPDIR)/cpl_vsisimple.Tpo -c -o cpl_vsisimple.lo `test -f 'e00compr/cpl_vsisimple.c' || echo '$(srcdir)/'`e00compr/cpl_vsisimple.c --@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/cpl_vsisimple.Tpo $(DEPDIR)/cpl_vsisimple.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='e00compr/cpl_vsisimple.c' object='cpl_vsisimple.lo' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT cpl_vsisimple.lo -MD -MP -MF $(DEPDIR)/cpl_vsisimple.Tpo -c -o cpl_vsisimple.lo `test -f 'e00compr/cpl_vsisimple.c' || echo '$(srcdir)/'`e00compr/cpl_vsisimple.c -+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/cpl_vsisimple.Tpo $(DEPDIR)/cpl_vsisimple.Plo -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='e00compr/cpl_vsisimple.c' object='cpl_vsisimple.lo' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o cpl_vsisimple.lo `test -f 'e00compr/cpl_vsisimple.c' || echo '$(srcdir)/'`e00compr/cpl_vsisimple.c -+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o cpl_vsisimple.lo `test -f 'e00compr/cpl_vsisimple.c' || echo '$(srcdir)/'`e00compr/cpl_vsisimple.c - - e00read.lo: e00compr/e00read.c --@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT e00read.lo -MD -MP -MF $(DEPDIR)/e00read.Tpo -c -o e00read.lo `test -f 'e00compr/e00read.c' || echo '$(srcdir)/'`e00compr/e00read.c --@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/e00read.Tpo $(DEPDIR)/e00read.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='e00compr/e00read.c' object='e00read.lo' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT e00read.lo -MD -MP -MF $(DEPDIR)/e00read.Tpo -c -o e00read.lo `test -f 'e00compr/e00read.c' || echo '$(srcdir)/'`e00compr/e00read.c -+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/e00read.Tpo $(DEPDIR)/e00read.Plo -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='e00compr/e00read.c' object='e00read.lo' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o e00read.lo `test -f 'e00compr/e00read.c' || echo '$(srcdir)/'`e00compr/e00read.c -+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o e00read.lo `test -f 'e00compr/e00read.c' || echo '$(srcdir)/'`e00compr/e00read.c - - e00write.lo: e00compr/e00write.c --@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT e00write.lo -MD -MP -MF $(DEPDIR)/e00write.Tpo -c -o e00write.lo `test -f 'e00compr/e00write.c' || echo '$(srcdir)/'`e00compr/e00write.c --@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/e00write.Tpo $(DEPDIR)/e00write.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='e00compr/e00write.c' object='e00write.lo' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT e00write.lo -MD -MP -MF $(DEPDIR)/e00write.Tpo -c -o e00write.lo `test -f 'e00compr/e00write.c' || echo '$(srcdir)/'`e00compr/e00write.c -+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/e00write.Tpo $(DEPDIR)/e00write.Plo -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='e00compr/e00write.c' object='e00write.lo' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o e00write.lo `test -f 'e00compr/e00write.c' || echo '$(srcdir)/'`e00compr/e00write.c -+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o e00write.lo `test -f 'e00compr/e00write.c' || echo '$(srcdir)/'`e00compr/e00write.c - - .cpp.o: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< - - .cpp.obj: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - - .cpp.lo: --@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< - - mostlyclean-libtool: - -rm -f *.lo -@@ -438,26 +554,15 @@ mostlyclean-libtool: - clean-libtool: - -rm -rf .libs _libs - --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -+ID: $(am__tagged_files) -+ $(am__define_uniq_tagged_files); mkid -fID $$unique -+tags: tags-am -+TAGS: tags -+ -+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ -@@ -469,15 +574,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $$unique; \ - fi; \ - fi --ctags: CTAGS --CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ctags: ctags-am -+ -+CTAGS: ctags -+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) -+ $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique -@@ -486,6 +587,21 @@ GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -+cscopelist: cscopelist-am -+ -+cscopelist-am: $(am__tagged_files) -+ list='$(am__tagged_files)'; \ -+ case "$(srcdir)" in \ -+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ -+ *) sdir=$(subdir)/$(srcdir) ;; \ -+ esac; \ -+ for i in $$list; do \ -+ if test -f "$$i"; then \ -+ echo "$(subdir)/$$i"; \ -+ else \ -+ echo "$$sdir/$$i"; \ -+ fi; \ -+ done >> $(top_builddir)/cscope.files - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -@@ -537,10 +653,15 @@ install-am: all-am - - installcheck: installcheck-am - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+ if test -z '$(STRIP)'; then \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ install; \ -+ else \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -+ fi - mostlyclean-generic: - - clean-generic: -@@ -625,19 +746,20 @@ uninstall-am: uninstall-pkglibLTLIBRARIES - - .MAKE: install-am install-strip - --.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ -- clean-libtool clean-pkglibLTLIBRARIES ctags distclean \ -- distclean-compile distclean-generic distclean-libtool \ -- distclean-tags distdir dvi dvi-am html html-am info info-am \ -- install install-am install-data install-data-am install-dvi \ -- install-dvi-am install-exec install-exec-am install-html \ -- install-html-am install-info install-info-am install-man \ -- install-pdf install-pdf-am install-pkglibLTLIBRARIES \ -- install-ps install-ps-am install-strip installcheck \ -- installcheck-am installdirs maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-compile \ -- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -- tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES -+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ -+ clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \ -+ ctags-am distclean distclean-compile distclean-generic \ -+ distclean-libtool distclean-tags distdir dvi dvi-am html \ -+ html-am info info-am install install-am install-data \ -+ install-data-am install-dvi install-dvi-am install-exec \ -+ install-exec-am install-html install-html-am install-info \ -+ install-info-am install-man install-pdf install-pdf-am \ -+ install-pkglibLTLIBRARIES install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ maintainer-clean maintainer-clean-generic mostlyclean \ -+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ -+ pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ -+ uninstall-pkglibLTLIBRARIES - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff --git a/src/modules_io/gdal/Makefile.in b/src/modules_io/gdal/Makefile.in -index 2421df0..477ba6d 100644 ---- a/src/modules_io/gdal/Makefile.in -+++ b/src/modules_io/gdal/Makefile.in -@@ -1,9 +1,8 @@ --# Makefile.in generated by automake 1.11.1 from Makefile.am. -+# Makefile.in generated by automake 1.14 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, --# Inc. -+# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+ - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -15,6 +14,51 @@ - - @SET_MAKE@ - VPATH = @srcdir@ -+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -+am__make_running_with_option = \ -+ case $${target_option-} in \ -+ ?) ;; \ -+ *) echo "am__make_running_with_option: internal error: invalid" \ -+ "target option '$${target_option-}' specified" >&2; \ -+ exit 1;; \ -+ esac; \ -+ has_opt=no; \ -+ sane_makeflags=$$MAKEFLAGS; \ -+ if $(am__is_gnu_make); then \ -+ sane_makeflags=$$MFLAGS; \ -+ else \ -+ case $$MAKEFLAGS in \ -+ *\\[\ \ ]*) \ -+ bs=\\; \ -+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -+ esac; \ -+ fi; \ -+ skip_next=no; \ -+ strip_trailopt () \ -+ { \ -+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -+ }; \ -+ for flg in $$sane_makeflags; do \ -+ test $$skip_next = yes && { skip_next=no; continue; }; \ -+ case $$flg in \ -+ *=*|--*) continue;; \ -+ -*I) strip_trailopt 'I'; skip_next=yes;; \ -+ -*I?*) strip_trailopt 'I';; \ -+ -*O) strip_trailopt 'O'; skip_next=yes;; \ -+ -*O?*) strip_trailopt 'O';; \ -+ -*l) strip_trailopt 'l'; skip_next=yes;; \ -+ -*l?*) strip_trailopt 'l';; \ -+ -[dEDm]) skip_next=yes;; \ -+ -[JT]) skip_next=yes;; \ -+ esac; \ -+ case $$flg in \ -+ *$$target_option*) has_opt=yes; break;; \ -+ esac; \ -+ done; \ -+ test $$has_opt = yes -+am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -+am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -34,7 +78,7 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - subdir = src/modules_io/gdal --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ - $(top_srcdir)/m4/ax_python_devel.m4 \ -@@ -49,20 +93,58 @@ mkinstalldirs = $(install_sh) -d - CONFIG_HEADER = $(top_builddir)/config.h - CONFIG_CLEAN_FILES = - CONFIG_CLEAN_VPATH_FILES = -+AM_V_P = $(am__v_P_@AM_V@) -+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -+am__v_P_0 = false -+am__v_P_1 = : -+AM_V_GEN = $(am__v_GEN_@AM_V@) -+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+am__v_GEN_0 = @echo " GEN " $@; -+am__v_GEN_1 = -+AM_V_at = $(am__v_at_@AM_V@) -+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+am__v_at_0 = @ -+am__v_at_1 = - SOURCES = - DIST_SOURCES = --RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ -- html-recursive info-recursive install-data-recursive \ -- install-dvi-recursive install-exec-recursive \ -- install-html-recursive install-info-recursive \ -- install-pdf-recursive install-ps-recursive install-recursive \ -- installcheck-recursive installdirs-recursive pdf-recursive \ -- ps-recursive uninstall-recursive -+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ -+ ctags-recursive dvi-recursive html-recursive info-recursive \ -+ install-data-recursive install-dvi-recursive \ -+ install-exec-recursive install-html-recursive \ -+ install-info-recursive install-pdf-recursive \ -+ install-ps-recursive install-recursive installcheck-recursive \ -+ installdirs-recursive pdf-recursive ps-recursive \ -+ tags-recursive uninstall-recursive -+am__can_run_installinfo = \ -+ case $$AM_UPDATE_INFO_DIR in \ -+ n|no|NO) false;; \ -+ *) (install-info --version) >/dev/null 2>&1;; \ -+ esac - RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ - distclean-recursive maintainer-clean-recursive --AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ -- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ -+am__recursive_targets = \ -+ $(RECURSIVE_TARGETS) \ -+ $(RECURSIVE_CLEAN_TARGETS) \ -+ $(am__extra_recursive_targets) -+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ - distdir -+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -+# Read a list of newline-separated strings from the standard input, -+# and print each of them once, without duplicates. Input order is -+# *not* preserved. -+am__uniquify_input = $(AWK) '\ -+ BEGIN { nonempty = 0; } \ -+ { items[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in items) print i; }; } \ -+' -+# Make sure the list of sources is unique. This is necessary because, -+# e.g., the same source file might be shared among _SOURCES variables -+# for different programs/libraries. -+am__define_uniq_tagged_files = \ -+ list='$(am__tagged_files)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | $(am__uniquify_input)` - ETAGS = etags - CTAGS = ctags - DIST_SUBDIRS = $(SUBDIRS) -@@ -94,6 +176,7 @@ am__relativize = \ - reldir="$$dir2" - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ -+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ -@@ -114,6 +197,7 @@ CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DISABLELIBHARU = @DISABLELIBHARU@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -141,6 +225,7 @@ LOCAL_INCS = @LOCAL_INCS@ - LOCAL_LIBS = @LOCAL_LIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - NM = @NM@ - NMEDIT = @NMEDIT@ -@@ -153,6 +238,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - POW_LIB = @POW_LIB@ -@@ -178,6 +264,7 @@ abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -@@ -211,7 +298,6 @@ libdir = @libdir@ - libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -@@ -273,22 +359,25 @@ clean-libtool: - -rm -rf .libs _libs - - # This directory's subdirectories are mostly independent; you can cd --# into them and run `make' without going through this Makefile. --# To change the values of `make' variables: instead of editing Makefiles, --# (1) if the variable is set in `config.status', edit `config.status' --# (which will cause the Makefiles to be regenerated when you run `make'); --# (2) otherwise, pass the desired values on the `make' command line. --$(RECURSIVE_TARGETS): -- @fail= failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -+# into them and run 'make' without going through this Makefile. -+# To change the values of 'make' variables: instead of editing Makefiles, -+# (1) if the variable is set in 'config.status', edit 'config.status' -+# (which will cause the Makefiles to be regenerated when you run 'make'); -+# (2) otherwise, pass the desired values on the 'make' command line. -+$(am__recursive_targets): -+ @fail=; \ -+ if $(am__make_keepgoing); then \ -+ failcom='fail=yes'; \ -+ else \ -+ failcom='exit 1'; \ -+ fi; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ -- list='$(SUBDIRS)'; for subdir in $$list; do \ -+ case "$@" in \ -+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -+ *) list='$(SUBDIRS)' ;; \ -+ esac; \ -+ for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ -@@ -303,57 +392,12 @@ $(RECURSIVE_TARGETS): - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - --$(RECURSIVE_CLEAN_TARGETS): -- @fail= failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -- dot_seen=no; \ -- case "$@" in \ -- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -- *) list='$(SUBDIRS)' ;; \ -- esac; \ -- rev=''; for subdir in $$list; do \ -- if test "$$subdir" = "."; then :; else \ -- rev="$$subdir $$rev"; \ -- fi; \ -- done; \ -- rev="$$rev ."; \ -- target=`echo $@ | sed s/-recursive//`; \ -- for subdir in $$rev; do \ -- echo "Making $$target in $$subdir"; \ -- if test "$$subdir" = "."; then \ -- local_target="$$target-am"; \ -- else \ -- local_target="$$target"; \ -- fi; \ -- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || eval $$failcom; \ -- done && test -z "$$fail" --tags-recursive: -- list='$(SUBDIRS)'; for subdir in $$list; do \ -- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ -- done --ctags-recursive: -- list='$(SUBDIRS)'; for subdir in $$list; do \ -- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ -- done -+ID: $(am__tagged_files) -+ $(am__define_uniq_tagged_files); mkid -fID $$unique -+tags: tags-recursive -+TAGS: tags - --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ - if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ -@@ -369,12 +413,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ -@@ -386,15 +425,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $$unique; \ - fi; \ - fi --ctags: CTAGS --CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ctags: ctags-recursive -+ -+CTAGS: ctags -+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) -+ $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique -@@ -403,6 +438,21 @@ GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -+cscopelist: cscopelist-recursive -+ -+cscopelist-am: $(am__tagged_files) -+ list='$(am__tagged_files)'; \ -+ case "$(srcdir)" in \ -+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ -+ *) sdir=$(subdir)/$(srcdir) ;; \ -+ esac; \ -+ for i in $$list; do \ -+ if test -f "$$i"; then \ -+ echo "$(subdir)/$$i"; \ -+ else \ -+ echo "$$sdir/$$i"; \ -+ fi; \ -+ done >> $(top_builddir)/cscope.files - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -@@ -439,13 +489,10 @@ distdir: $(DISTFILES) - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test -d "$(distdir)/$$subdir" \ -- || $(MKDIR_P) "$(distdir)/$$subdir" \ -- || exit 1; \ -- fi; \ -- done -- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ -- if test "$$subdir" = .; then :; else \ -+ $(am__make_dryrun) \ -+ || test -d "$(distdir)/$$subdir" \ -+ || $(MKDIR_P) "$(distdir)/$$subdir" \ -+ || exit 1; \ - dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ - $(am__relativize); \ - new_distdir=$$reldir; \ -@@ -480,10 +527,15 @@ install-am: all-am - - installcheck: installcheck-recursive - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+ if test -z '$(STRIP)'; then \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ install; \ -+ else \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -+ fi - mostlyclean-generic: - - clean-generic: -@@ -561,22 +613,20 @@ ps-am: - - uninstall-am: - --.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ -- install-am install-strip tags-recursive -- --.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ -- all all-am check check-am clean clean-generic clean-libtool \ -- ctags ctags-recursive distclean distclean-generic \ -- distclean-libtool distclean-tags distdir dvi dvi-am html \ -- html-am info info-am install install-am install-data \ -- install-data-am install-dvi install-dvi-am install-exec \ -- install-exec-am install-html install-html-am install-info \ -- install-info-am install-man install-pdf install-pdf-am \ -- install-ps install-ps-am install-strip installcheck \ -- installcheck-am installdirs installdirs-am maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-generic \ -- mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ -- uninstall uninstall-am -+.MAKE: $(am__recursive_targets) install-am install-strip -+ -+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ -+ check-am clean clean-generic clean-libtool cscopelist-am ctags \ -+ ctags-am distclean distclean-generic distclean-libtool \ -+ distclean-tags distdir dvi dvi-am html html-am info info-am \ -+ install install-am install-data install-data-am install-dvi \ -+ install-dvi-am install-exec install-exec-am install-html \ -+ install-html-am install-info install-info-am install-man \ -+ install-pdf install-pdf-am install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ installdirs-am maintainer-clean maintainer-clean-generic \ -+ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ -+ ps ps-am tags tags-am uninstall uninstall-am - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff --git a/src/modules_io/gdal/io_gdal/Makefile.in b/src/modules_io/gdal/io_gdal/Makefile.in -index c62d927..fe1f432 100644 ---- a/src/modules_io/gdal/io_gdal/Makefile.in -+++ b/src/modules_io/gdal/io_gdal/Makefile.in -@@ -1,9 +1,8 @@ --# Makefile.in generated by automake 1.11.1 from Makefile.am. -+# Makefile.in generated by automake 1.14 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, --# Inc. -+# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+ - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -16,6 +15,51 @@ - @SET_MAKE@ - - VPATH = @srcdir@ -+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -+am__make_running_with_option = \ -+ case $${target_option-} in \ -+ ?) ;; \ -+ *) echo "am__make_running_with_option: internal error: invalid" \ -+ "target option '$${target_option-}' specified" >&2; \ -+ exit 1;; \ -+ esac; \ -+ has_opt=no; \ -+ sane_makeflags=$$MAKEFLAGS; \ -+ if $(am__is_gnu_make); then \ -+ sane_makeflags=$$MFLAGS; \ -+ else \ -+ case $$MAKEFLAGS in \ -+ *\\[\ \ ]*) \ -+ bs=\\; \ -+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -+ esac; \ -+ fi; \ -+ skip_next=no; \ -+ strip_trailopt () \ -+ { \ -+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -+ }; \ -+ for flg in $$sane_makeflags; do \ -+ test $$skip_next = yes && { skip_next=no; continue; }; \ -+ case $$flg in \ -+ *=*|--*) continue;; \ -+ -*I) strip_trailopt 'I'; skip_next=yes;; \ -+ -*I?*) strip_trailopt 'I';; \ -+ -*O) strip_trailopt 'O'; skip_next=yes;; \ -+ -*O?*) strip_trailopt 'O';; \ -+ -*l) strip_trailopt 'l'; skip_next=yes;; \ -+ -*l?*) strip_trailopt 'l';; \ -+ -[dEDm]) skip_next=yes;; \ -+ -[JT]) skip_next=yes;; \ -+ esac; \ -+ case $$flg in \ -+ *$$target_option*) has_opt=yes; break;; \ -+ esac; \ -+ done; \ -+ test $$has_opt = yes -+am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -+am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -35,7 +79,8 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - subdir = src/modules_io/gdal/io_gdal --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ -+ $(top_srcdir)/depcomp - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ - $(top_srcdir)/m4/ax_python_devel.m4 \ -@@ -71,6 +116,12 @@ am__nobase_list = $(am__nobase_strip_setup); \ - am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -+am__uninstall_files_from_dir = { \ -+ test -z "$$files" \ -+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ -+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ -+ $(am__cd) "$$dir" && rm -f $$files; }; \ -+ } - am__installdirs = "$(DESTDIR)$(pkglibdir)" - LTLIBRARIES = $(pkglib_LTLIBRARIES) - libio_gdal_la_DEPENDENCIES = \ -@@ -80,35 +131,92 @@ am_libio_gdal_la_OBJECTS = gdal_driver.lo gdal_export.lo \ - MLB_Interface.lo ogr_driver.lo ogr_export.lo ogr_export_kml.lo \ - ogr_import.lo - libio_gdal_la_OBJECTS = $(am_libio_gdal_la_OBJECTS) -+AM_V_lt = $(am__v_lt_@AM_V@) -+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -+am__v_lt_0 = --silent -+am__v_lt_1 = -+AM_V_P = $(am__v_P_@AM_V@) -+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -+am__v_P_0 = false -+am__v_P_1 = : -+AM_V_GEN = $(am__v_GEN_@AM_V@) -+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+am__v_GEN_0 = @echo " GEN " $@; -+am__v_GEN_1 = -+AM_V_at = $(am__v_at_@AM_V@) -+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+am__v_at_0 = @ -+am__v_at_1 = - DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - am__mv = mv -f - CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) --LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CXXFLAGS) $(CXXFLAGS) -+AM_V_CXX = $(am__v_CXX_@AM_V@) -+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) -+am__v_CXX_0 = @echo " CXX " $@; -+am__v_CXX_1 = - CXXLD = $(CXX) --CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ -+ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) -+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) -+am__v_CXXLD_0 = @echo " CXXLD " $@; -+am__v_CXXLD_1 = - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CFLAGS) $(CFLAGS) -+AM_V_CC = $(am__v_CC_@AM_V@) -+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -+am__v_CC_0 = @echo " CC " $@; -+am__v_CC_1 = - CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CCLD = $(am__v_CCLD_@AM_V@) -+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -+am__v_CCLD_0 = @echo " CCLD " $@; -+am__v_CCLD_1 = - SOURCES = $(libio_gdal_la_SOURCES) - DIST_SOURCES = $(libio_gdal_la_SOURCES) -+am__can_run_installinfo = \ -+ case $$AM_UPDATE_INFO_DIR in \ -+ n|no|NO) false;; \ -+ *) (install-info --version) >/dev/null 2>&1;; \ -+ esac -+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -+# Read a list of newline-separated strings from the standard input, -+# and print each of them once, without duplicates. Input order is -+# *not* preserved. -+am__uniquify_input = $(AWK) '\ -+ BEGIN { nonempty = 0; } \ -+ { items[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in items) print i; }; } \ -+' -+# Make sure the list of sources is unique. This is necessary because, -+# e.g., the same source file might be shared among _SOURCES variables -+# for different programs/libraries. -+am__define_uniq_tagged_files = \ -+ list='$(am__tagged_files)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | $(am__uniquify_input)` - ETAGS = etags - CTAGS = ctags - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ -+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ -@@ -129,6 +237,7 @@ CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DISABLELIBHARU = @DISABLELIBHARU@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -156,6 +265,7 @@ LOCAL_INCS = @LOCAL_INCS@ - LOCAL_LIBS = @LOCAL_LIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - NM = @NM@ - NMEDIT = @NMEDIT@ -@@ -168,6 +278,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - POW_LIB = @POW_LIB@ -@@ -193,6 +304,7 @@ abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -@@ -226,7 +338,6 @@ libdir = @libdir@ - libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -@@ -315,9 +426,9 @@ $(top_srcdir)/configure: $(am__configure_deps) - $(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - $(am__aclocal_m4_deps): -+ - install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" - @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ - list2=; for p in $$list; do \ - if test -f $$p; then \ -@@ -325,6 +436,8 @@ install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - else :; fi; \ - done; \ - test -z "$$list2" || { \ -+ echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \ -+ $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \ - } -@@ -340,14 +453,17 @@ uninstall-pkglibLTLIBRARIES: - - clean-pkglibLTLIBRARIES: - -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES) -- @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \ -- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -- echo "rm -f \"$${dir}/so_locations\""; \ -- rm -f "$${dir}/so_locations"; \ -- done --libio_gdal.la: $(libio_gdal_la_OBJECTS) $(libio_gdal_la_DEPENDENCIES) -- $(CXXLINK) -rpath $(pkglibdir) $(libio_gdal_la_OBJECTS) $(libio_gdal_la_LIBADD) $(LIBS) -+ @list='$(pkglib_LTLIBRARIES)'; \ -+ locs=`for p in $$list; do echo $$p; done | \ -+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ -+ sort -u`; \ -+ test -z "$$locs" || { \ -+ echo rm -f $${locs}; \ -+ rm -f $${locs}; \ -+ } -+ -+libio_gdal.la: $(libio_gdal_la_OBJECTS) $(libio_gdal_la_DEPENDENCIES) $(EXTRA_libio_gdal_la_DEPENDENCIES) -+ $(AM_V_CXXLD)$(CXXLINK) -rpath $(pkglibdir) $(libio_gdal_la_OBJECTS) $(libio_gdal_la_LIBADD) $(LIBS) - - mostlyclean-compile: - -rm -f *.$(OBJEXT) -@@ -367,25 +483,25 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ogr_import.Plo@am__quote@ - - .cpp.o: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< - - .cpp.obj: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - - .cpp.lo: --@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< - - mostlyclean-libtool: - -rm -f *.lo -@@ -393,26 +509,15 @@ mostlyclean-libtool: - clean-libtool: - -rm -rf .libs _libs - --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -+ID: $(am__tagged_files) -+ $(am__define_uniq_tagged_files); mkid -fID $$unique -+tags: tags-am -+TAGS: tags -+ -+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ -@@ -424,15 +529,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $$unique; \ - fi; \ - fi --ctags: CTAGS --CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ctags: ctags-am -+ -+CTAGS: ctags -+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) -+ $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique -@@ -441,6 +542,21 @@ GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -+cscopelist: cscopelist-am -+ -+cscopelist-am: $(am__tagged_files) -+ list='$(am__tagged_files)'; \ -+ case "$(srcdir)" in \ -+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ -+ *) sdir=$(subdir)/$(srcdir) ;; \ -+ esac; \ -+ for i in $$list; do \ -+ if test -f "$$i"; then \ -+ echo "$(subdir)/$$i"; \ -+ else \ -+ echo "$$sdir/$$i"; \ -+ fi; \ -+ done >> $(top_builddir)/cscope.files - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -@@ -492,10 +608,15 @@ install-am: all-am - - installcheck: installcheck-am - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+ if test -z '$(STRIP)'; then \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ install; \ -+ else \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -+ fi - mostlyclean-generic: - - clean-generic: -@@ -580,19 +701,20 @@ uninstall-am: uninstall-pkglibLTLIBRARIES - - .MAKE: install-am install-strip - --.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ -- clean-libtool clean-pkglibLTLIBRARIES ctags distclean \ -- distclean-compile distclean-generic distclean-libtool \ -- distclean-tags distdir dvi dvi-am html html-am info info-am \ -- install install-am install-data install-data-am install-dvi \ -- install-dvi-am install-exec install-exec-am install-html \ -- install-html-am install-info install-info-am install-man \ -- install-pdf install-pdf-am install-pkglibLTLIBRARIES \ -- install-ps install-ps-am install-strip installcheck \ -- installcheck-am installdirs maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-compile \ -- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -- tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES -+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ -+ clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \ -+ ctags-am distclean distclean-compile distclean-generic \ -+ distclean-libtool distclean-tags distdir dvi dvi-am html \ -+ html-am info info-am install install-am install-data \ -+ install-data-am install-dvi install-dvi-am install-exec \ -+ install-exec-am install-html install-html-am install-info \ -+ install-info-am install-man install-pdf install-pdf-am \ -+ install-pkglibLTLIBRARIES install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ maintainer-clean maintainer-clean-generic mostlyclean \ -+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ -+ pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ -+ uninstall-pkglibLTLIBRARIES - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff --git a/src/modules_io/gps/Makefile.in b/src/modules_io/gps/Makefile.in -index 4cda78c..92f1643 100644 ---- a/src/modules_io/gps/Makefile.in -+++ b/src/modules_io/gps/Makefile.in -@@ -1,9 +1,8 @@ --# Makefile.in generated by automake 1.11.1 from Makefile.am. -+# Makefile.in generated by automake 1.14 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, --# Inc. -+# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+ - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -15,6 +14,51 @@ - - @SET_MAKE@ - VPATH = @srcdir@ -+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -+am__make_running_with_option = \ -+ case $${target_option-} in \ -+ ?) ;; \ -+ *) echo "am__make_running_with_option: internal error: invalid" \ -+ "target option '$${target_option-}' specified" >&2; \ -+ exit 1;; \ -+ esac; \ -+ has_opt=no; \ -+ sane_makeflags=$$MAKEFLAGS; \ -+ if $(am__is_gnu_make); then \ -+ sane_makeflags=$$MFLAGS; \ -+ else \ -+ case $$MAKEFLAGS in \ -+ *\\[\ \ ]*) \ -+ bs=\\; \ -+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -+ esac; \ -+ fi; \ -+ skip_next=no; \ -+ strip_trailopt () \ -+ { \ -+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -+ }; \ -+ for flg in $$sane_makeflags; do \ -+ test $$skip_next = yes && { skip_next=no; continue; }; \ -+ case $$flg in \ -+ *=*|--*) continue;; \ -+ -*I) strip_trailopt 'I'; skip_next=yes;; \ -+ -*I?*) strip_trailopt 'I';; \ -+ -*O) strip_trailopt 'O'; skip_next=yes;; \ -+ -*O?*) strip_trailopt 'O';; \ -+ -*l) strip_trailopt 'l'; skip_next=yes;; \ -+ -*l?*) strip_trailopt 'l';; \ -+ -[dEDm]) skip_next=yes;; \ -+ -[JT]) skip_next=yes;; \ -+ esac; \ -+ case $$flg in \ -+ *$$target_option*) has_opt=yes; break;; \ -+ esac; \ -+ done; \ -+ test $$has_opt = yes -+am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -+am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -34,7 +78,7 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - subdir = src/modules_io/gps --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ - $(top_srcdir)/m4/ax_python_devel.m4 \ -@@ -49,20 +93,58 @@ mkinstalldirs = $(install_sh) -d - CONFIG_HEADER = $(top_builddir)/config.h - CONFIG_CLEAN_FILES = - CONFIG_CLEAN_VPATH_FILES = -+AM_V_P = $(am__v_P_@AM_V@) -+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -+am__v_P_0 = false -+am__v_P_1 = : -+AM_V_GEN = $(am__v_GEN_@AM_V@) -+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+am__v_GEN_0 = @echo " GEN " $@; -+am__v_GEN_1 = -+AM_V_at = $(am__v_at_@AM_V@) -+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+am__v_at_0 = @ -+am__v_at_1 = - SOURCES = - DIST_SOURCES = --RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ -- html-recursive info-recursive install-data-recursive \ -- install-dvi-recursive install-exec-recursive \ -- install-html-recursive install-info-recursive \ -- install-pdf-recursive install-ps-recursive install-recursive \ -- installcheck-recursive installdirs-recursive pdf-recursive \ -- ps-recursive uninstall-recursive -+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ -+ ctags-recursive dvi-recursive html-recursive info-recursive \ -+ install-data-recursive install-dvi-recursive \ -+ install-exec-recursive install-html-recursive \ -+ install-info-recursive install-pdf-recursive \ -+ install-ps-recursive install-recursive installcheck-recursive \ -+ installdirs-recursive pdf-recursive ps-recursive \ -+ tags-recursive uninstall-recursive -+am__can_run_installinfo = \ -+ case $$AM_UPDATE_INFO_DIR in \ -+ n|no|NO) false;; \ -+ *) (install-info --version) >/dev/null 2>&1;; \ -+ esac - RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ - distclean-recursive maintainer-clean-recursive --AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ -- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ -+am__recursive_targets = \ -+ $(RECURSIVE_TARGETS) \ -+ $(RECURSIVE_CLEAN_TARGETS) \ -+ $(am__extra_recursive_targets) -+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ - distdir -+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -+# Read a list of newline-separated strings from the standard input, -+# and print each of them once, without duplicates. Input order is -+# *not* preserved. -+am__uniquify_input = $(AWK) '\ -+ BEGIN { nonempty = 0; } \ -+ { items[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in items) print i; }; } \ -+' -+# Make sure the list of sources is unique. This is necessary because, -+# e.g., the same source file might be shared among _SOURCES variables -+# for different programs/libraries. -+am__define_uniq_tagged_files = \ -+ list='$(am__tagged_files)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | $(am__uniquify_input)` - ETAGS = etags - CTAGS = ctags - DIST_SUBDIRS = $(SUBDIRS) -@@ -94,6 +176,7 @@ am__relativize = \ - reldir="$$dir2" - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ -+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ -@@ -114,6 +197,7 @@ CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DISABLELIBHARU = @DISABLELIBHARU@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -141,6 +225,7 @@ LOCAL_INCS = @LOCAL_INCS@ - LOCAL_LIBS = @LOCAL_LIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - NM = @NM@ - NMEDIT = @NMEDIT@ -@@ -153,6 +238,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - POW_LIB = @POW_LIB@ -@@ -178,6 +264,7 @@ abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -@@ -211,7 +298,6 @@ libdir = @libdir@ - libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -@@ -273,22 +359,25 @@ clean-libtool: - -rm -rf .libs _libs - - # This directory's subdirectories are mostly independent; you can cd --# into them and run `make' without going through this Makefile. --# To change the values of `make' variables: instead of editing Makefiles, --# (1) if the variable is set in `config.status', edit `config.status' --# (which will cause the Makefiles to be regenerated when you run `make'); --# (2) otherwise, pass the desired values on the `make' command line. --$(RECURSIVE_TARGETS): -- @fail= failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -+# into them and run 'make' without going through this Makefile. -+# To change the values of 'make' variables: instead of editing Makefiles, -+# (1) if the variable is set in 'config.status', edit 'config.status' -+# (which will cause the Makefiles to be regenerated when you run 'make'); -+# (2) otherwise, pass the desired values on the 'make' command line. -+$(am__recursive_targets): -+ @fail=; \ -+ if $(am__make_keepgoing); then \ -+ failcom='fail=yes'; \ -+ else \ -+ failcom='exit 1'; \ -+ fi; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ -- list='$(SUBDIRS)'; for subdir in $$list; do \ -+ case "$@" in \ -+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -+ *) list='$(SUBDIRS)' ;; \ -+ esac; \ -+ for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ -@@ -303,57 +392,12 @@ $(RECURSIVE_TARGETS): - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - --$(RECURSIVE_CLEAN_TARGETS): -- @fail= failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -- dot_seen=no; \ -- case "$@" in \ -- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -- *) list='$(SUBDIRS)' ;; \ -- esac; \ -- rev=''; for subdir in $$list; do \ -- if test "$$subdir" = "."; then :; else \ -- rev="$$subdir $$rev"; \ -- fi; \ -- done; \ -- rev="$$rev ."; \ -- target=`echo $@ | sed s/-recursive//`; \ -- for subdir in $$rev; do \ -- echo "Making $$target in $$subdir"; \ -- if test "$$subdir" = "."; then \ -- local_target="$$target-am"; \ -- else \ -- local_target="$$target"; \ -- fi; \ -- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || eval $$failcom; \ -- done && test -z "$$fail" --tags-recursive: -- list='$(SUBDIRS)'; for subdir in $$list; do \ -- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ -- done --ctags-recursive: -- list='$(SUBDIRS)'; for subdir in $$list; do \ -- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ -- done -+ID: $(am__tagged_files) -+ $(am__define_uniq_tagged_files); mkid -fID $$unique -+tags: tags-recursive -+TAGS: tags - --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ - if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ -@@ -369,12 +413,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ -@@ -386,15 +425,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $$unique; \ - fi; \ - fi --ctags: CTAGS --CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ctags: ctags-recursive -+ -+CTAGS: ctags -+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) -+ $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique -@@ -403,6 +438,21 @@ GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -+cscopelist: cscopelist-recursive -+ -+cscopelist-am: $(am__tagged_files) -+ list='$(am__tagged_files)'; \ -+ case "$(srcdir)" in \ -+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ -+ *) sdir=$(subdir)/$(srcdir) ;; \ -+ esac; \ -+ for i in $$list; do \ -+ if test -f "$$i"; then \ -+ echo "$(subdir)/$$i"; \ -+ else \ -+ echo "$$sdir/$$i"; \ -+ fi; \ -+ done >> $(top_builddir)/cscope.files - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -@@ -439,13 +489,10 @@ distdir: $(DISTFILES) - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test -d "$(distdir)/$$subdir" \ -- || $(MKDIR_P) "$(distdir)/$$subdir" \ -- || exit 1; \ -- fi; \ -- done -- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ -- if test "$$subdir" = .; then :; else \ -+ $(am__make_dryrun) \ -+ || test -d "$(distdir)/$$subdir" \ -+ || $(MKDIR_P) "$(distdir)/$$subdir" \ -+ || exit 1; \ - dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ - $(am__relativize); \ - new_distdir=$$reldir; \ -@@ -480,10 +527,15 @@ install-am: all-am - - installcheck: installcheck-recursive - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+ if test -z '$(STRIP)'; then \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ install; \ -+ else \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -+ fi - mostlyclean-generic: - - clean-generic: -@@ -561,22 +613,20 @@ ps-am: - - uninstall-am: - --.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ -- install-am install-strip tags-recursive -- --.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ -- all all-am check check-am clean clean-generic clean-libtool \ -- ctags ctags-recursive distclean distclean-generic \ -- distclean-libtool distclean-tags distdir dvi dvi-am html \ -- html-am info info-am install install-am install-data \ -- install-data-am install-dvi install-dvi-am install-exec \ -- install-exec-am install-html install-html-am install-info \ -- install-info-am install-man install-pdf install-pdf-am \ -- install-ps install-ps-am install-strip installcheck \ -- installcheck-am installdirs installdirs-am maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-generic \ -- mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ -- uninstall uninstall-am -+.MAKE: $(am__recursive_targets) install-am install-strip -+ -+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ -+ check-am clean clean-generic clean-libtool cscopelist-am ctags \ -+ ctags-am distclean distclean-generic distclean-libtool \ -+ distclean-tags distdir dvi dvi-am html html-am info info-am \ -+ install install-am install-data install-data-am install-dvi \ -+ install-dvi-am install-exec install-exec-am install-html \ -+ install-html-am install-info install-info-am install-man \ -+ install-pdf install-pdf-am install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ installdirs-am maintainer-clean maintainer-clean-generic \ -+ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ -+ ps ps-am tags tags-am uninstall uninstall-am - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff --git a/src/modules_io/gps/io_gps/Makefile.in b/src/modules_io/gps/io_gps/Makefile.in -index d59905c..5b3e821 100644 ---- a/src/modules_io/gps/io_gps/Makefile.in -+++ b/src/modules_io/gps/io_gps/Makefile.in -@@ -1,9 +1,8 @@ --# Makefile.in generated by automake 1.11.1 from Makefile.am. -+# Makefile.in generated by automake 1.14 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, --# Inc. -+# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+ - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -16,6 +15,51 @@ - @SET_MAKE@ - - VPATH = @srcdir@ -+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -+am__make_running_with_option = \ -+ case $${target_option-} in \ -+ ?) ;; \ -+ *) echo "am__make_running_with_option: internal error: invalid" \ -+ "target option '$${target_option-}' specified" >&2; \ -+ exit 1;; \ -+ esac; \ -+ has_opt=no; \ -+ sane_makeflags=$$MAKEFLAGS; \ -+ if $(am__is_gnu_make); then \ -+ sane_makeflags=$$MFLAGS; \ -+ else \ -+ case $$MAKEFLAGS in \ -+ *\\[\ \ ]*) \ -+ bs=\\; \ -+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -+ esac; \ -+ fi; \ -+ skip_next=no; \ -+ strip_trailopt () \ -+ { \ -+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -+ }; \ -+ for flg in $$sane_makeflags; do \ -+ test $$skip_next = yes && { skip_next=no; continue; }; \ -+ case $$flg in \ -+ *=*|--*) continue;; \ -+ -*I) strip_trailopt 'I'; skip_next=yes;; \ -+ -*I?*) strip_trailopt 'I';; \ -+ -*O) strip_trailopt 'O'; skip_next=yes;; \ -+ -*O?*) strip_trailopt 'O';; \ -+ -*l) strip_trailopt 'l'; skip_next=yes;; \ -+ -*l?*) strip_trailopt 'l';; \ -+ -[dEDm]) skip_next=yes;; \ -+ -[JT]) skip_next=yes;; \ -+ esac; \ -+ case $$flg in \ -+ *$$target_option*) has_opt=yes; break;; \ -+ esac; \ -+ done; \ -+ test $$has_opt = yes -+am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -+am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -35,7 +79,8 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - subdir = src/modules_io/gps/io_gps --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ -+ $(top_srcdir)/depcomp - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ - $(top_srcdir)/m4/ax_python_devel.m4 \ -@@ -71,41 +116,104 @@ am__nobase_list = $(am__nobase_strip_setup); \ - am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -+am__uninstall_files_from_dir = { \ -+ test -z "$$files" \ -+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ -+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ -+ $(am__cd) "$$dir" && rm -f $$files; }; \ -+ } - am__installdirs = "$(DESTDIR)$(pkglibdir)" - LTLIBRARIES = $(pkglib_LTLIBRARIES) - libio_gps_la_DEPENDENCIES = \ - $(top_srcdir)/src/saga_core/saga_api/libsaga_api.la - am_libio_gps_la_OBJECTS = GPSBabel.lo gpx2shp.lo MLB_Interface.lo - libio_gps_la_OBJECTS = $(am_libio_gps_la_OBJECTS) -+AM_V_lt = $(am__v_lt_@AM_V@) -+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -+am__v_lt_0 = --silent -+am__v_lt_1 = -+AM_V_P = $(am__v_P_@AM_V@) -+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -+am__v_P_0 = false -+am__v_P_1 = : -+AM_V_GEN = $(am__v_GEN_@AM_V@) -+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+am__v_GEN_0 = @echo " GEN " $@; -+am__v_GEN_1 = -+AM_V_at = $(am__v_at_@AM_V@) -+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+am__v_at_0 = @ -+am__v_at_1 = - DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - am__mv = mv -f - CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) --LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CXXFLAGS) $(CXXFLAGS) -+AM_V_CXX = $(am__v_CXX_@AM_V@) -+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) -+am__v_CXX_0 = @echo " CXX " $@; -+am__v_CXX_1 = - CXXLD = $(CXX) --CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ -+ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) -+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) -+am__v_CXXLD_0 = @echo " CXXLD " $@; -+am__v_CXXLD_1 = - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CFLAGS) $(CFLAGS) -+AM_V_CC = $(am__v_CC_@AM_V@) -+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -+am__v_CC_0 = @echo " CC " $@; -+am__v_CC_1 = - CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CCLD = $(am__v_CCLD_@AM_V@) -+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -+am__v_CCLD_0 = @echo " CCLD " $@; -+am__v_CCLD_1 = - SOURCES = $(libio_gps_la_SOURCES) - DIST_SOURCES = $(libio_gps_la_SOURCES) -+am__can_run_installinfo = \ -+ case $$AM_UPDATE_INFO_DIR in \ -+ n|no|NO) false;; \ -+ *) (install-info --version) >/dev/null 2>&1;; \ -+ esac -+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -+# Read a list of newline-separated strings from the standard input, -+# and print each of them once, without duplicates. Input order is -+# *not* preserved. -+am__uniquify_input = $(AWK) '\ -+ BEGIN { nonempty = 0; } \ -+ { items[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in items) print i; }; } \ -+' -+# Make sure the list of sources is unique. This is necessary because, -+# e.g., the same source file might be shared among _SOURCES variables -+# for different programs/libraries. -+am__define_uniq_tagged_files = \ -+ list='$(am__tagged_files)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | $(am__uniquify_input)` - ETAGS = etags - CTAGS = ctags - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ -+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ -@@ -126,6 +234,7 @@ CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DISABLELIBHARU = @DISABLELIBHARU@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -153,6 +262,7 @@ LOCAL_INCS = @LOCAL_INCS@ - LOCAL_LIBS = @LOCAL_LIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - NM = @NM@ - NMEDIT = @NMEDIT@ -@@ -165,6 +275,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - POW_LIB = @POW_LIB@ -@@ -190,6 +301,7 @@ abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -@@ -223,7 +335,6 @@ libdir = @libdir@ - libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -@@ -297,9 +408,9 @@ $(top_srcdir)/configure: $(am__configure_deps) - $(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - $(am__aclocal_m4_deps): -+ - install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" - @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ - list2=; for p in $$list; do \ - if test -f $$p; then \ -@@ -307,6 +418,8 @@ install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - else :; fi; \ - done; \ - test -z "$$list2" || { \ -+ echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \ -+ $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \ - } -@@ -322,14 +435,17 @@ uninstall-pkglibLTLIBRARIES: - - clean-pkglibLTLIBRARIES: - -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES) -- @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \ -- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -- echo "rm -f \"$${dir}/so_locations\""; \ -- rm -f "$${dir}/so_locations"; \ -- done --libio_gps.la: $(libio_gps_la_OBJECTS) $(libio_gps_la_DEPENDENCIES) -- $(CXXLINK) -rpath $(pkglibdir) $(libio_gps_la_OBJECTS) $(libio_gps_la_LIBADD) $(LIBS) -+ @list='$(pkglib_LTLIBRARIES)'; \ -+ locs=`for p in $$list; do echo $$p; done | \ -+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ -+ sort -u`; \ -+ test -z "$$locs" || { \ -+ echo rm -f $${locs}; \ -+ rm -f $${locs}; \ -+ } -+ -+libio_gps.la: $(libio_gps_la_OBJECTS) $(libio_gps_la_DEPENDENCIES) $(EXTRA_libio_gps_la_DEPENDENCIES) -+ $(AM_V_CXXLD)$(CXXLINK) -rpath $(pkglibdir) $(libio_gps_la_OBJECTS) $(libio_gps_la_LIBADD) $(LIBS) - - mostlyclean-compile: - -rm -f *.$(OBJEXT) -@@ -342,25 +458,25 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gpx2shp.Plo@am__quote@ - - .cpp.o: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< - - .cpp.obj: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - - .cpp.lo: --@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< - - mostlyclean-libtool: - -rm -f *.lo -@@ -368,26 +484,15 @@ mostlyclean-libtool: - clean-libtool: - -rm -rf .libs _libs - --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -+ID: $(am__tagged_files) -+ $(am__define_uniq_tagged_files); mkid -fID $$unique -+tags: tags-am -+TAGS: tags -+ -+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ -@@ -399,15 +504,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $$unique; \ - fi; \ - fi --ctags: CTAGS --CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ctags: ctags-am -+ -+CTAGS: ctags -+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) -+ $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique -@@ -416,6 +517,21 @@ GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -+cscopelist: cscopelist-am -+ -+cscopelist-am: $(am__tagged_files) -+ list='$(am__tagged_files)'; \ -+ case "$(srcdir)" in \ -+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ -+ *) sdir=$(subdir)/$(srcdir) ;; \ -+ esac; \ -+ for i in $$list; do \ -+ if test -f "$$i"; then \ -+ echo "$(subdir)/$$i"; \ -+ else \ -+ echo "$$sdir/$$i"; \ -+ fi; \ -+ done >> $(top_builddir)/cscope.files - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -@@ -467,10 +583,15 @@ install-am: all-am - - installcheck: installcheck-am - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+ if test -z '$(STRIP)'; then \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ install; \ -+ else \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -+ fi - mostlyclean-generic: - - clean-generic: -@@ -555,19 +676,20 @@ uninstall-am: uninstall-pkglibLTLIBRARIES - - .MAKE: install-am install-strip - --.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ -- clean-libtool clean-pkglibLTLIBRARIES ctags distclean \ -- distclean-compile distclean-generic distclean-libtool \ -- distclean-tags distdir dvi dvi-am html html-am info info-am \ -- install install-am install-data install-data-am install-dvi \ -- install-dvi-am install-exec install-exec-am install-html \ -- install-html-am install-info install-info-am install-man \ -- install-pdf install-pdf-am install-pkglibLTLIBRARIES \ -- install-ps install-ps-am install-strip installcheck \ -- installcheck-am installdirs maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-compile \ -- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -- tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES -+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ -+ clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \ -+ ctags-am distclean distclean-compile distclean-generic \ -+ distclean-libtool distclean-tags distdir dvi dvi-am html \ -+ html-am info info-am install install-am install-data \ -+ install-data-am install-dvi install-dvi-am install-exec \ -+ install-exec-am install-html install-html-am install-info \ -+ install-info-am install-man install-pdf install-pdf-am \ -+ install-pkglibLTLIBRARIES install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ maintainer-clean maintainer-clean-generic mostlyclean \ -+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ -+ pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ -+ uninstall-pkglibLTLIBRARIES - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff --git a/src/modules_io/grid/Makefile.in b/src/modules_io/grid/Makefile.in -index cc02f13..1d1b4b9 100644 ---- a/src/modules_io/grid/Makefile.in -+++ b/src/modules_io/grid/Makefile.in -@@ -1,9 +1,8 @@ --# Makefile.in generated by automake 1.11.1 from Makefile.am. -+# Makefile.in generated by automake 1.14 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, --# Inc. -+# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+ - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -15,6 +14,51 @@ - - @SET_MAKE@ - VPATH = @srcdir@ -+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -+am__make_running_with_option = \ -+ case $${target_option-} in \ -+ ?) ;; \ -+ *) echo "am__make_running_with_option: internal error: invalid" \ -+ "target option '$${target_option-}' specified" >&2; \ -+ exit 1;; \ -+ esac; \ -+ has_opt=no; \ -+ sane_makeflags=$$MAKEFLAGS; \ -+ if $(am__is_gnu_make); then \ -+ sane_makeflags=$$MFLAGS; \ -+ else \ -+ case $$MAKEFLAGS in \ -+ *\\[\ \ ]*) \ -+ bs=\\; \ -+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -+ esac; \ -+ fi; \ -+ skip_next=no; \ -+ strip_trailopt () \ -+ { \ -+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -+ }; \ -+ for flg in $$sane_makeflags; do \ -+ test $$skip_next = yes && { skip_next=no; continue; }; \ -+ case $$flg in \ -+ *=*|--*) continue;; \ -+ -*I) strip_trailopt 'I'; skip_next=yes;; \ -+ -*I?*) strip_trailopt 'I';; \ -+ -*O) strip_trailopt 'O'; skip_next=yes;; \ -+ -*O?*) strip_trailopt 'O';; \ -+ -*l) strip_trailopt 'l'; skip_next=yes;; \ -+ -*l?*) strip_trailopt 'l';; \ -+ -[dEDm]) skip_next=yes;; \ -+ -[JT]) skip_next=yes;; \ -+ esac; \ -+ case $$flg in \ -+ *$$target_option*) has_opt=yes; break;; \ -+ esac; \ -+ done; \ -+ test $$has_opt = yes -+am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -+am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -34,7 +78,7 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - subdir = src/modules_io/grid --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ - $(top_srcdir)/m4/ax_python_devel.m4 \ -@@ -49,20 +93,58 @@ mkinstalldirs = $(install_sh) -d - CONFIG_HEADER = $(top_builddir)/config.h - CONFIG_CLEAN_FILES = - CONFIG_CLEAN_VPATH_FILES = -+AM_V_P = $(am__v_P_@AM_V@) -+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -+am__v_P_0 = false -+am__v_P_1 = : -+AM_V_GEN = $(am__v_GEN_@AM_V@) -+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+am__v_GEN_0 = @echo " GEN " $@; -+am__v_GEN_1 = -+AM_V_at = $(am__v_at_@AM_V@) -+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+am__v_at_0 = @ -+am__v_at_1 = - SOURCES = - DIST_SOURCES = --RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ -- html-recursive info-recursive install-data-recursive \ -- install-dvi-recursive install-exec-recursive \ -- install-html-recursive install-info-recursive \ -- install-pdf-recursive install-ps-recursive install-recursive \ -- installcheck-recursive installdirs-recursive pdf-recursive \ -- ps-recursive uninstall-recursive -+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ -+ ctags-recursive dvi-recursive html-recursive info-recursive \ -+ install-data-recursive install-dvi-recursive \ -+ install-exec-recursive install-html-recursive \ -+ install-info-recursive install-pdf-recursive \ -+ install-ps-recursive install-recursive installcheck-recursive \ -+ installdirs-recursive pdf-recursive ps-recursive \ -+ tags-recursive uninstall-recursive -+am__can_run_installinfo = \ -+ case $$AM_UPDATE_INFO_DIR in \ -+ n|no|NO) false;; \ -+ *) (install-info --version) >/dev/null 2>&1;; \ -+ esac - RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ - distclean-recursive maintainer-clean-recursive --AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ -- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ -+am__recursive_targets = \ -+ $(RECURSIVE_TARGETS) \ -+ $(RECURSIVE_CLEAN_TARGETS) \ -+ $(am__extra_recursive_targets) -+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ - distdir -+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -+# Read a list of newline-separated strings from the standard input, -+# and print each of them once, without duplicates. Input order is -+# *not* preserved. -+am__uniquify_input = $(AWK) '\ -+ BEGIN { nonempty = 0; } \ -+ { items[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in items) print i; }; } \ -+' -+# Make sure the list of sources is unique. This is necessary because, -+# e.g., the same source file might be shared among _SOURCES variables -+# for different programs/libraries. -+am__define_uniq_tagged_files = \ -+ list='$(am__tagged_files)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | $(am__uniquify_input)` - ETAGS = etags - CTAGS = ctags - DIST_SUBDIRS = io_grid io_grid_grib2 io_grid_image -@@ -94,6 +176,7 @@ am__relativize = \ - reldir="$$dir2" - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ -+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ -@@ -114,6 +197,7 @@ CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DISABLELIBHARU = @DISABLELIBHARU@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -141,6 +225,7 @@ LOCAL_INCS = @LOCAL_INCS@ - LOCAL_LIBS = @LOCAL_LIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - NM = @NM@ - NMEDIT = @NMEDIT@ -@@ -153,6 +238,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - POW_LIB = @POW_LIB@ -@@ -178,6 +264,7 @@ abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -@@ -211,7 +298,6 @@ libdir = @libdir@ - libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -@@ -274,22 +360,25 @@ clean-libtool: - -rm -rf .libs _libs - - # This directory's subdirectories are mostly independent; you can cd --# into them and run `make' without going through this Makefile. --# To change the values of `make' variables: instead of editing Makefiles, --# (1) if the variable is set in `config.status', edit `config.status' --# (which will cause the Makefiles to be regenerated when you run `make'); --# (2) otherwise, pass the desired values on the `make' command line. --$(RECURSIVE_TARGETS): -- @fail= failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -+# into them and run 'make' without going through this Makefile. -+# To change the values of 'make' variables: instead of editing Makefiles, -+# (1) if the variable is set in 'config.status', edit 'config.status' -+# (which will cause the Makefiles to be regenerated when you run 'make'); -+# (2) otherwise, pass the desired values on the 'make' command line. -+$(am__recursive_targets): -+ @fail=; \ -+ if $(am__make_keepgoing); then \ -+ failcom='fail=yes'; \ -+ else \ -+ failcom='exit 1'; \ -+ fi; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ -- list='$(SUBDIRS)'; for subdir in $$list; do \ -+ case "$@" in \ -+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -+ *) list='$(SUBDIRS)' ;; \ -+ esac; \ -+ for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ -@@ -304,57 +393,12 @@ $(RECURSIVE_TARGETS): - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - --$(RECURSIVE_CLEAN_TARGETS): -- @fail= failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -- dot_seen=no; \ -- case "$@" in \ -- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -- *) list='$(SUBDIRS)' ;; \ -- esac; \ -- rev=''; for subdir in $$list; do \ -- if test "$$subdir" = "."; then :; else \ -- rev="$$subdir $$rev"; \ -- fi; \ -- done; \ -- rev="$$rev ."; \ -- target=`echo $@ | sed s/-recursive//`; \ -- for subdir in $$rev; do \ -- echo "Making $$target in $$subdir"; \ -- if test "$$subdir" = "."; then \ -- local_target="$$target-am"; \ -- else \ -- local_target="$$target"; \ -- fi; \ -- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || eval $$failcom; \ -- done && test -z "$$fail" --tags-recursive: -- list='$(SUBDIRS)'; for subdir in $$list; do \ -- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ -- done --ctags-recursive: -- list='$(SUBDIRS)'; for subdir in $$list; do \ -- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ -- done -+ID: $(am__tagged_files) -+ $(am__define_uniq_tagged_files); mkid -fID $$unique -+tags: tags-recursive -+TAGS: tags - --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ - if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ -@@ -370,12 +414,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ -@@ -387,15 +426,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $$unique; \ - fi; \ - fi --ctags: CTAGS --CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ctags: ctags-recursive -+ -+CTAGS: ctags -+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) -+ $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique -@@ -404,6 +439,21 @@ GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -+cscopelist: cscopelist-recursive -+ -+cscopelist-am: $(am__tagged_files) -+ list='$(am__tagged_files)'; \ -+ case "$(srcdir)" in \ -+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ -+ *) sdir=$(subdir)/$(srcdir) ;; \ -+ esac; \ -+ for i in $$list; do \ -+ if test -f "$$i"; then \ -+ echo "$(subdir)/$$i"; \ -+ else \ -+ echo "$$sdir/$$i"; \ -+ fi; \ -+ done >> $(top_builddir)/cscope.files - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -@@ -440,13 +490,10 @@ distdir: $(DISTFILES) - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test -d "$(distdir)/$$subdir" \ -- || $(MKDIR_P) "$(distdir)/$$subdir" \ -- || exit 1; \ -- fi; \ -- done -- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ -- if test "$$subdir" = .; then :; else \ -+ $(am__make_dryrun) \ -+ || test -d "$(distdir)/$$subdir" \ -+ || $(MKDIR_P) "$(distdir)/$$subdir" \ -+ || exit 1; \ - dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ - $(am__relativize); \ - new_distdir=$$reldir; \ -@@ -481,10 +528,15 @@ install-am: all-am - - installcheck: installcheck-recursive - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+ if test -z '$(STRIP)'; then \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ install; \ -+ else \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -+ fi - mostlyclean-generic: - - clean-generic: -@@ -562,22 +614,20 @@ ps-am: - - uninstall-am: - --.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ -- install-am install-strip tags-recursive -- --.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ -- all all-am check check-am clean clean-generic clean-libtool \ -- ctags ctags-recursive distclean distclean-generic \ -- distclean-libtool distclean-tags distdir dvi dvi-am html \ -- html-am info info-am install install-am install-data \ -- install-data-am install-dvi install-dvi-am install-exec \ -- install-exec-am install-html install-html-am install-info \ -- install-info-am install-man install-pdf install-pdf-am \ -- install-ps install-ps-am install-strip installcheck \ -- installcheck-am installdirs installdirs-am maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-generic \ -- mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ -- uninstall uninstall-am -+.MAKE: $(am__recursive_targets) install-am install-strip -+ -+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ -+ check-am clean clean-generic clean-libtool cscopelist-am ctags \ -+ ctags-am distclean distclean-generic distclean-libtool \ -+ distclean-tags distdir dvi dvi-am html html-am info info-am \ -+ install install-am install-data install-data-am install-dvi \ -+ install-dvi-am install-exec install-exec-am install-html \ -+ install-html-am install-info install-info-am install-man \ -+ install-pdf install-pdf-am install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ installdirs-am maintainer-clean maintainer-clean-generic \ -+ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ -+ ps ps-am tags tags-am uninstall uninstall-am - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff --git a/src/modules_io/grid/io_grid/Makefile.in b/src/modules_io/grid/io_grid/Makefile.in -index 4050247..251474a 100644 ---- a/src/modules_io/grid/io_grid/Makefile.in -+++ b/src/modules_io/grid/io_grid/Makefile.in -@@ -1,9 +1,8 @@ --# Makefile.in generated by automake 1.11.1 from Makefile.am. -+# Makefile.in generated by automake 1.14 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, --# Inc. -+# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+ - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -16,6 +15,51 @@ - @SET_MAKE@ - - VPATH = @srcdir@ -+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -+am__make_running_with_option = \ -+ case $${target_option-} in \ -+ ?) ;; \ -+ *) echo "am__make_running_with_option: internal error: invalid" \ -+ "target option '$${target_option-}' specified" >&2; \ -+ exit 1;; \ -+ esac; \ -+ has_opt=no; \ -+ sane_makeflags=$$MAKEFLAGS; \ -+ if $(am__is_gnu_make); then \ -+ sane_makeflags=$$MFLAGS; \ -+ else \ -+ case $$MAKEFLAGS in \ -+ *\\[\ \ ]*) \ -+ bs=\\; \ -+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -+ esac; \ -+ fi; \ -+ skip_next=no; \ -+ strip_trailopt () \ -+ { \ -+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -+ }; \ -+ for flg in $$sane_makeflags; do \ -+ test $$skip_next = yes && { skip_next=no; continue; }; \ -+ case $$flg in \ -+ *=*|--*) continue;; \ -+ -*I) strip_trailopt 'I'; skip_next=yes;; \ -+ -*I?*) strip_trailopt 'I';; \ -+ -*O) strip_trailopt 'O'; skip_next=yes;; \ -+ -*O?*) strip_trailopt 'O';; \ -+ -*l) strip_trailopt 'l'; skip_next=yes;; \ -+ -*l?*) strip_trailopt 'l';; \ -+ -[dEDm]) skip_next=yes;; \ -+ -[JT]) skip_next=yes;; \ -+ esac; \ -+ case $$flg in \ -+ *$$target_option*) has_opt=yes; break;; \ -+ esac; \ -+ done; \ -+ test $$has_opt = yes -+am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -+am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -35,7 +79,8 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - subdir = src/modules_io/grid/io_grid --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ -+ $(top_srcdir)/depcomp - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ - $(top_srcdir)/m4/ax_python_devel.m4 \ -@@ -71,6 +116,12 @@ am__nobase_list = $(am__nobase_strip_setup); \ - am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -+am__uninstall_files_from_dir = { \ -+ test -z "$$files" \ -+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ -+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ -+ $(am__cd) "$$dir" && rm -f $$files; }; \ -+ } - am__installdirs = "$(DESTDIR)$(pkglibdir)" - LTLIBRARIES = $(pkglib_LTLIBRARIES) - libio_grid_la_DEPENDENCIES = \ -@@ -79,35 +130,92 @@ am_libio_grid_la_OBJECTS = bmp_export.lo erdas_lan.lo esri_arcinfo.lo \ - grid_table.lo MLB_Interface.lo mola.lo raw.lo srtm30.lo \ - surfer.lo usgs_srtm.lo wrf.lo xyz.lo - libio_grid_la_OBJECTS = $(am_libio_grid_la_OBJECTS) -+AM_V_lt = $(am__v_lt_@AM_V@) -+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -+am__v_lt_0 = --silent -+am__v_lt_1 = -+AM_V_P = $(am__v_P_@AM_V@) -+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -+am__v_P_0 = false -+am__v_P_1 = : -+AM_V_GEN = $(am__v_GEN_@AM_V@) -+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+am__v_GEN_0 = @echo " GEN " $@; -+am__v_GEN_1 = -+AM_V_at = $(am__v_at_@AM_V@) -+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+am__v_at_0 = @ -+am__v_at_1 = - DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - am__mv = mv -f - CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) --LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CXXFLAGS) $(CXXFLAGS) -+AM_V_CXX = $(am__v_CXX_@AM_V@) -+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) -+am__v_CXX_0 = @echo " CXX " $@; -+am__v_CXX_1 = - CXXLD = $(CXX) --CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ -+ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) -+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) -+am__v_CXXLD_0 = @echo " CXXLD " $@; -+am__v_CXXLD_1 = - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CFLAGS) $(CFLAGS) -+AM_V_CC = $(am__v_CC_@AM_V@) -+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -+am__v_CC_0 = @echo " CC " $@; -+am__v_CC_1 = - CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CCLD = $(am__v_CCLD_@AM_V@) -+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -+am__v_CCLD_0 = @echo " CCLD " $@; -+am__v_CCLD_1 = - SOURCES = $(libio_grid_la_SOURCES) - DIST_SOURCES = $(libio_grid_la_SOURCES) -+am__can_run_installinfo = \ -+ case $$AM_UPDATE_INFO_DIR in \ -+ n|no|NO) false;; \ -+ *) (install-info --version) >/dev/null 2>&1;; \ -+ esac -+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -+# Read a list of newline-separated strings from the standard input, -+# and print each of them once, without duplicates. Input order is -+# *not* preserved. -+am__uniquify_input = $(AWK) '\ -+ BEGIN { nonempty = 0; } \ -+ { items[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in items) print i; }; } \ -+' -+# Make sure the list of sources is unique. This is necessary because, -+# e.g., the same source file might be shared among _SOURCES variables -+# for different programs/libraries. -+am__define_uniq_tagged_files = \ -+ list='$(am__tagged_files)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | $(am__uniquify_input)` - ETAGS = etags - CTAGS = ctags - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ -+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ -@@ -128,6 +236,7 @@ CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DISABLELIBHARU = @DISABLELIBHARU@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -155,6 +264,7 @@ LOCAL_INCS = @LOCAL_INCS@ - LOCAL_LIBS = @LOCAL_LIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - NM = @NM@ - NMEDIT = @NMEDIT@ -@@ -167,6 +277,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - POW_LIB = @POW_LIB@ -@@ -192,6 +303,7 @@ abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -@@ -225,7 +337,6 @@ libdir = @libdir@ - libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -@@ -317,9 +428,9 @@ $(top_srcdir)/configure: $(am__configure_deps) - $(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - $(am__aclocal_m4_deps): -+ - install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" - @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ - list2=; for p in $$list; do \ - if test -f $$p; then \ -@@ -327,6 +438,8 @@ install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - else :; fi; \ - done; \ - test -z "$$list2" || { \ -+ echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \ -+ $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \ - } -@@ -342,14 +455,17 @@ uninstall-pkglibLTLIBRARIES: - - clean-pkglibLTLIBRARIES: - -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES) -- @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \ -- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -- echo "rm -f \"$${dir}/so_locations\""; \ -- rm -f "$${dir}/so_locations"; \ -- done --libio_grid.la: $(libio_grid_la_OBJECTS) $(libio_grid_la_DEPENDENCIES) -- $(CXXLINK) -rpath $(pkglibdir) $(libio_grid_la_OBJECTS) $(libio_grid_la_LIBADD) $(LIBS) -+ @list='$(pkglib_LTLIBRARIES)'; \ -+ locs=`for p in $$list; do echo $$p; done | \ -+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ -+ sort -u`; \ -+ test -z "$$locs" || { \ -+ echo rm -f $${locs}; \ -+ rm -f $${locs}; \ -+ } -+ -+libio_grid.la: $(libio_grid_la_OBJECTS) $(libio_grid_la_DEPENDENCIES) $(EXTRA_libio_grid_la_DEPENDENCIES) -+ $(AM_V_CXXLD)$(CXXLINK) -rpath $(pkglibdir) $(libio_grid_la_OBJECTS) $(libio_grid_la_LIBADD) $(LIBS) - - mostlyclean-compile: - -rm -f *.$(OBJEXT) -@@ -371,25 +487,25 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xyz.Plo@am__quote@ - - .cpp.o: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< - - .cpp.obj: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - - .cpp.lo: --@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< - - mostlyclean-libtool: - -rm -f *.lo -@@ -397,26 +513,15 @@ mostlyclean-libtool: - clean-libtool: - -rm -rf .libs _libs - --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -+ID: $(am__tagged_files) -+ $(am__define_uniq_tagged_files); mkid -fID $$unique -+tags: tags-am -+TAGS: tags -+ -+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ -@@ -428,15 +533,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $$unique; \ - fi; \ - fi --ctags: CTAGS --CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ctags: ctags-am -+ -+CTAGS: ctags -+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) -+ $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique -@@ -445,6 +546,21 @@ GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -+cscopelist: cscopelist-am -+ -+cscopelist-am: $(am__tagged_files) -+ list='$(am__tagged_files)'; \ -+ case "$(srcdir)" in \ -+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ -+ *) sdir=$(subdir)/$(srcdir) ;; \ -+ esac; \ -+ for i in $$list; do \ -+ if test -f "$$i"; then \ -+ echo "$(subdir)/$$i"; \ -+ else \ -+ echo "$$sdir/$$i"; \ -+ fi; \ -+ done >> $(top_builddir)/cscope.files - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -@@ -496,10 +612,15 @@ install-am: all-am - - installcheck: installcheck-am - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+ if test -z '$(STRIP)'; then \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ install; \ -+ else \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -+ fi - mostlyclean-generic: - - clean-generic: -@@ -584,19 +705,20 @@ uninstall-am: uninstall-pkglibLTLIBRARIES - - .MAKE: install-am install-strip - --.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ -- clean-libtool clean-pkglibLTLIBRARIES ctags distclean \ -- distclean-compile distclean-generic distclean-libtool \ -- distclean-tags distdir dvi dvi-am html html-am info info-am \ -- install install-am install-data install-data-am install-dvi \ -- install-dvi-am install-exec install-exec-am install-html \ -- install-html-am install-info install-info-am install-man \ -- install-pdf install-pdf-am install-pkglibLTLIBRARIES \ -- install-ps install-ps-am install-strip installcheck \ -- installcheck-am installdirs maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-compile \ -- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -- tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES -+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ -+ clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \ -+ ctags-am distclean distclean-compile distclean-generic \ -+ distclean-libtool distclean-tags distdir dvi dvi-am html \ -+ html-am info info-am install install-am install-data \ -+ install-data-am install-dvi install-dvi-am install-exec \ -+ install-exec-am install-html install-html-am install-info \ -+ install-info-am install-man install-pdf install-pdf-am \ -+ install-pkglibLTLIBRARIES install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ maintainer-clean maintainer-clean-generic mostlyclean \ -+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ -+ pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ -+ uninstall-pkglibLTLIBRARIES - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff --git a/src/modules_io/grid/io_grid_grib2/Makefile.in b/src/modules_io/grid/io_grid_grib2/Makefile.in -index 9164d6b..d003dbb 100644 ---- a/src/modules_io/grid/io_grid_grib2/Makefile.in -+++ b/src/modules_io/grid/io_grid_grib2/Makefile.in -@@ -1,9 +1,8 @@ --# Makefile.in generated by automake 1.11.1 from Makefile.am. -+# Makefile.in generated by automake 1.14 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, --# Inc. -+# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+ - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -16,6 +15,51 @@ - @SET_MAKE@ - - VPATH = @srcdir@ -+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -+am__make_running_with_option = \ -+ case $${target_option-} in \ -+ ?) ;; \ -+ *) echo "am__make_running_with_option: internal error: invalid" \ -+ "target option '$${target_option-}' specified" >&2; \ -+ exit 1;; \ -+ esac; \ -+ has_opt=no; \ -+ sane_makeflags=$$MAKEFLAGS; \ -+ if $(am__is_gnu_make); then \ -+ sane_makeflags=$$MFLAGS; \ -+ else \ -+ case $$MAKEFLAGS in \ -+ *\\[\ \ ]*) \ -+ bs=\\; \ -+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -+ esac; \ -+ fi; \ -+ skip_next=no; \ -+ strip_trailopt () \ -+ { \ -+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -+ }; \ -+ for flg in $$sane_makeflags; do \ -+ test $$skip_next = yes && { skip_next=no; continue; }; \ -+ case $$flg in \ -+ *=*|--*) continue;; \ -+ -*I) strip_trailopt 'I'; skip_next=yes;; \ -+ -*I?*) strip_trailopt 'I';; \ -+ -*O) strip_trailopt 'O'; skip_next=yes;; \ -+ -*O?*) strip_trailopt 'O';; \ -+ -*l) strip_trailopt 'l'; skip_next=yes;; \ -+ -*l?*) strip_trailopt 'l';; \ -+ -[dEDm]) skip_next=yes;; \ -+ -[JT]) skip_next=yes;; \ -+ esac; \ -+ case $$flg in \ -+ *$$target_option*) has_opt=yes; break;; \ -+ esac; \ -+ done; \ -+ test $$has_opt = yes -+am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -+am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -35,7 +79,8 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - subdir = src/modules_io/grid/io_grid_grib2 --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ -+ $(top_srcdir)/depcomp - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ - $(top_srcdir)/m4/ax_python_devel.m4 \ -@@ -71,51 +116,104 @@ am__nobase_list = $(am__nobase_strip_setup); \ - am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -+am__uninstall_files_from_dir = { \ -+ test -z "$$files" \ -+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ -+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ -+ $(am__cd) "$$dir" && rm -f $$files; }; \ -+ } - am__installdirs = "$(DESTDIR)$(pkglibdir)" - LTLIBRARIES = $(pkglib_LTLIBRARIES) - libio_grid_grib2_la_DEPENDENCIES = \ - $(top_srcdir)/src/saga_core/saga_api/libsaga_api.la --am_libio_grid_grib2_la_OBJECTS = cmplxpack.lo compack.lo comunpack.lo \ -- dec_jpeg2000.lo dec_png.lo drstemplates.lo enc_jpeg2000.lo \ -- enc_png.lo g2_addfield.lo g2_addgrid.lo g2_addlocal.lo \ -- g2_create.lo g2_free.lo g2_getfld.lo g2_gribend.lo g2_info.lo \ -- g2_miss.lo g2_unpack1.lo g2_unpack2.lo g2_unpack3.lo \ -- g2_unpack4.lo g2_unpack5.lo g2_unpack6.lo g2_unpack7.lo \ -- gbits.lo getdim.lo getpoly.lo gridtemplates.lo int_power.lo \ -- jpcpack.lo jpcunpack.lo misspack.lo mkieee.lo pack_gp.lo \ -- pdstemplates.lo pngpack.lo pngunpack.lo rdieee.lo reduce.lo \ -- seekgb.lo simpack.lo simunpack.lo specpack.lo specunpack.lo \ -- grib2_import.lo MLB_Interface.lo -+am_libio_grid_grib2_la_OBJECTS = grib2_import.lo MLB_Interface.lo - libio_grid_grib2_la_OBJECTS = $(am_libio_grid_grib2_la_OBJECTS) -+AM_V_lt = $(am__v_lt_@AM_V@) -+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -+am__v_lt_0 = --silent -+am__v_lt_1 = -+AM_V_P = $(am__v_P_@AM_V@) -+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -+am__v_P_0 = false -+am__v_P_1 = : -+AM_V_GEN = $(am__v_GEN_@AM_V@) -+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+am__v_GEN_0 = @echo " GEN " $@; -+am__v_GEN_1 = -+AM_V_at = $(am__v_at_@AM_V@) -+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+am__v_at_0 = @ -+am__v_at_1 = - DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - am__mv = mv -f --COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ - CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) --LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CXXFLAGS) $(CXXFLAGS) -+AM_V_CXX = $(am__v_CXX_@AM_V@) -+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) -+am__v_CXX_0 = @echo " CXX " $@; -+am__v_CXX_1 = - CXXLD = $(CXX) --CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ -+ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) -+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) -+am__v_CXXLD_0 = @echo " CXXLD " $@; -+am__v_CXXLD_1 = -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CFLAGS) $(CFLAGS) -+AM_V_CC = $(am__v_CC_@AM_V@) -+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -+am__v_CC_0 = @echo " CC " $@; -+am__v_CC_1 = -+CCLD = $(CC) -+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CCLD = $(am__v_CCLD_@AM_V@) -+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -+am__v_CCLD_0 = @echo " CCLD " $@; -+am__v_CCLD_1 = - SOURCES = $(libio_grid_grib2_la_SOURCES) - DIST_SOURCES = $(libio_grid_grib2_la_SOURCES) -+am__can_run_installinfo = \ -+ case $$AM_UPDATE_INFO_DIR in \ -+ n|no|NO) false;; \ -+ *) (install-info --version) >/dev/null 2>&1;; \ -+ esac -+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -+# Read a list of newline-separated strings from the standard input, -+# and print each of them once, without duplicates. Input order is -+# *not* preserved. -+am__uniquify_input = $(AWK) '\ -+ BEGIN { nonempty = 0; } \ -+ { items[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in items) print i; }; } \ -+' -+# Make sure the list of sources is unique. This is necessary because, -+# e.g., the same source file might be shared among _SOURCES variables -+# for different programs/libraries. -+am__define_uniq_tagged_files = \ -+ list='$(am__tagged_files)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | $(am__uniquify_input)` - ETAGS = etags - CTAGS = ctags - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ -+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ -@@ -136,6 +234,7 @@ CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DISABLELIBHARU = @DISABLELIBHARU@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -163,6 +262,7 @@ LOCAL_INCS = @LOCAL_INCS@ - LOCAL_LIBS = @LOCAL_LIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - NM = @NM@ - NMEDIT = @NMEDIT@ -@@ -175,6 +275,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - POW_LIB = @POW_LIB@ -@@ -200,6 +301,7 @@ abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -@@ -233,7 +335,6 @@ libdir = @libdir@ - libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -@@ -263,57 +364,9 @@ DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -DUSE_JPEG2000 -DUSE_PN - CXX_INCS = -I$(top_srcdir)/src/saga_core $(LOCAL_INCS) - AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS) - #AM_LDFLAGS = -fPIC -shared -avoid-version -lpq -ljasper --AM_LDFLAGS = -fPIC -shared -avoid-version $(LOCAL_LIBS) -ljasper -+AM_LDFLAGS = -fPIC -shared -avoid-version $(LOCAL_LIBS) -ljasper -lgrib2c - pkglib_LTLIBRARIES = libio_grid_grib2.la - libio_grid_grib2_la_SOURCES = \ --./g2clib-1.0.4/cmplxpack.c\ --./g2clib-1.0.4/compack.c\ --./g2clib-1.0.4/comunpack.c\ --./g2clib-1.0.4/dec_jpeg2000.c\ --./g2clib-1.0.4/dec_png.c\ --./g2clib-1.0.4/drstemplates.c\ --./g2clib-1.0.4/enc_jpeg2000.c\ --./g2clib-1.0.4/enc_png.c\ --./g2clib-1.0.4/g2_addfield.c\ --./g2clib-1.0.4/g2_addgrid.c\ --./g2clib-1.0.4/g2_addlocal.c\ --./g2clib-1.0.4/g2_create.c\ --./g2clib-1.0.4/g2_free.c\ --./g2clib-1.0.4/g2_getfld.c\ --./g2clib-1.0.4/g2_gribend.c\ --./g2clib-1.0.4/g2_info.c\ --./g2clib-1.0.4/g2_miss.c\ --./g2clib-1.0.4/g2_unpack1.c\ --./g2clib-1.0.4/g2_unpack2.c\ --./g2clib-1.0.4/g2_unpack3.c\ --./g2clib-1.0.4/g2_unpack4.c\ --./g2clib-1.0.4/g2_unpack5.c\ --./g2clib-1.0.4/g2_unpack6.c\ --./g2clib-1.0.4/g2_unpack7.c\ --./g2clib-1.0.4/gbits.c\ --./g2clib-1.0.4/getdim.c\ --./g2clib-1.0.4/getpoly.c\ --./g2clib-1.0.4/gridtemplates.c\ --./g2clib-1.0.4/int_power.c\ --./g2clib-1.0.4/jpcpack.c\ --./g2clib-1.0.4/jpcunpack.c\ --./g2clib-1.0.4/misspack.c\ --./g2clib-1.0.4/mkieee.c\ --./g2clib-1.0.4/pack_gp.c\ --./g2clib-1.0.4/pdstemplates.c\ --./g2clib-1.0.4/pngpack.c\ --./g2clib-1.0.4/pngunpack.c\ --./g2clib-1.0.4/rdieee.c\ --./g2clib-1.0.4/reduce.c\ --./g2clib-1.0.4/seekgb.c\ --./g2clib-1.0.4/simpack.c\ --./g2clib-1.0.4/simunpack.c\ --./g2clib-1.0.4/specpack.c\ --./g2clib-1.0.4/specunpack.c\ --./g2clib-1.0.4/drstemplates.h\ --./g2clib-1.0.4/grib2.h\ --./g2clib-1.0.4/gridtemplates.h\ --./g2clib-1.0.4/pdstemplates.h\ - grib2_import.cpp\ - MLB_Interface.cpp\ - grib2_import.h\ -@@ -323,7 +376,7 @@ libio_grid_grib2_la_LIBADD = $(top_srcdir)/src/saga_core/saga_api/libsaga_api.la - all: all-am - - .SUFFIXES: --.SUFFIXES: .c .cpp .lo .o .obj -+.SUFFIXES: .cpp .lo .o .obj - $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ -@@ -354,9 +407,9 @@ $(top_srcdir)/configure: $(am__configure_deps) - $(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - $(am__aclocal_m4_deps): -+ - install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" - @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ - list2=; for p in $$list; do \ - if test -f $$p; then \ -@@ -364,6 +417,8 @@ install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - else :; fi; \ - done; \ - test -z "$$list2" || { \ -+ echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \ -+ $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \ - } -@@ -379,14 +434,17 @@ uninstall-pkglibLTLIBRARIES: - - clean-pkglibLTLIBRARIES: - -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES) -- @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \ -- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -- echo "rm -f \"$${dir}/so_locations\""; \ -- rm -f "$${dir}/so_locations"; \ -- done --libio_grid_grib2.la: $(libio_grid_grib2_la_OBJECTS) $(libio_grid_grib2_la_DEPENDENCIES) -- $(CXXLINK) -rpath $(pkglibdir) $(libio_grid_grib2_la_OBJECTS) $(libio_grid_grib2_la_LIBADD) $(LIBS) -+ @list='$(pkglib_LTLIBRARIES)'; \ -+ locs=`for p in $$list; do echo $$p; done | \ -+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ -+ sort -u`; \ -+ test -z "$$locs" || { \ -+ echo rm -f $${locs}; \ -+ rm -f $${locs}; \ -+ } -+ -+libio_grid_grib2.la: $(libio_grid_grib2_la_OBJECTS) $(libio_grid_grib2_la_DEPENDENCIES) $(EXTRA_libio_grid_grib2_la_DEPENDENCIES) -+ $(AM_V_CXXLD)$(CXXLINK) -rpath $(pkglibdir) $(libio_grid_grib2_la_OBJECTS) $(libio_grid_grib2_la_LIBADD) $(LIBS) - - mostlyclean-compile: - -rm -f *.$(OBJEXT) -@@ -395,401 +453,28 @@ distclean-compile: - -rm -f *.tab.c - - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MLB_Interface.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cmplxpack.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/compack.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/comunpack.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dec_jpeg2000.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dec_png.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/drstemplates.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/enc_jpeg2000.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/enc_png.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/g2_addfield.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/g2_addgrid.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/g2_addlocal.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/g2_create.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/g2_free.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/g2_getfld.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/g2_gribend.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/g2_info.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/g2_miss.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/g2_unpack1.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/g2_unpack2.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/g2_unpack3.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/g2_unpack4.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/g2_unpack5.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/g2_unpack6.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/g2_unpack7.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gbits.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getdim.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getpoly.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/grib2_import.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gridtemplates.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/int_power.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jpcpack.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jpcunpack.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/misspack.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mkieee.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pack_gp.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pdstemplates.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pngpack.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pngunpack.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rdieee.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/reduce.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seekgb.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/simpack.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/simunpack.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/specpack.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/specunpack.Plo@am__quote@ -- --.c.o: --@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(COMPILE) -c $< -- --.c.obj: --@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` --@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` -- --.c.lo: --@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< -- --cmplxpack.lo: ./g2clib-1.0.4/cmplxpack.c --@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT cmplxpack.lo -MD -MP -MF $(DEPDIR)/cmplxpack.Tpo -c -o cmplxpack.lo `test -f './g2clib-1.0.4/cmplxpack.c' || echo '$(srcdir)/'`./g2clib-1.0.4/cmplxpack.c --@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/cmplxpack.Tpo $(DEPDIR)/cmplxpack.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='./g2clib-1.0.4/cmplxpack.c' object='cmplxpack.lo' libtool=yes @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o cmplxpack.lo `test -f './g2clib-1.0.4/cmplxpack.c' || echo '$(srcdir)/'`./g2clib-1.0.4/cmplxpack.c -- --compack.lo: ./g2clib-1.0.4/compack.c --@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT compack.lo -MD -MP -MF $(DEPDIR)/compack.Tpo -c -o compack.lo `test -f './g2clib-1.0.4/compack.c' || echo '$(srcdir)/'`./g2clib-1.0.4/compack.c --@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/compack.Tpo $(DEPDIR)/compack.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='./g2clib-1.0.4/compack.c' object='compack.lo' libtool=yes @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o compack.lo `test -f './g2clib-1.0.4/compack.c' || echo '$(srcdir)/'`./g2clib-1.0.4/compack.c -- --comunpack.lo: ./g2clib-1.0.4/comunpack.c --@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT comunpack.lo -MD -MP -MF $(DEPDIR)/comunpack.Tpo -c -o comunpack.lo `test -f './g2clib-1.0.4/comunpack.c' || echo '$(srcdir)/'`./g2clib-1.0.4/comunpack.c --@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/comunpack.Tpo $(DEPDIR)/comunpack.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='./g2clib-1.0.4/comunpack.c' object='comunpack.lo' libtool=yes @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o comunpack.lo `test -f './g2clib-1.0.4/comunpack.c' || echo '$(srcdir)/'`./g2clib-1.0.4/comunpack.c -- --dec_jpeg2000.lo: ./g2clib-1.0.4/dec_jpeg2000.c --@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dec_jpeg2000.lo -MD -MP -MF $(DEPDIR)/dec_jpeg2000.Tpo -c -o dec_jpeg2000.lo `test -f './g2clib-1.0.4/dec_jpeg2000.c' || echo '$(srcdir)/'`./g2clib-1.0.4/dec_jpeg2000.c --@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/dec_jpeg2000.Tpo $(DEPDIR)/dec_jpeg2000.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='./g2clib-1.0.4/dec_jpeg2000.c' object='dec_jpeg2000.lo' libtool=yes @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dec_jpeg2000.lo `test -f './g2clib-1.0.4/dec_jpeg2000.c' || echo '$(srcdir)/'`./g2clib-1.0.4/dec_jpeg2000.c -- --dec_png.lo: ./g2clib-1.0.4/dec_png.c --@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dec_png.lo -MD -MP -MF $(DEPDIR)/dec_png.Tpo -c -o dec_png.lo `test -f './g2clib-1.0.4/dec_png.c' || echo '$(srcdir)/'`./g2clib-1.0.4/dec_png.c --@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/dec_png.Tpo $(DEPDIR)/dec_png.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='./g2clib-1.0.4/dec_png.c' object='dec_png.lo' libtool=yes @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dec_png.lo `test -f './g2clib-1.0.4/dec_png.c' || echo '$(srcdir)/'`./g2clib-1.0.4/dec_png.c -- --drstemplates.lo: ./g2clib-1.0.4/drstemplates.c --@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT drstemplates.lo -MD -MP -MF $(DEPDIR)/drstemplates.Tpo -c -o drstemplates.lo `test -f './g2clib-1.0.4/drstemplates.c' || echo '$(srcdir)/'`./g2clib-1.0.4/drstemplates.c --@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/drstemplates.Tpo $(DEPDIR)/drstemplates.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='./g2clib-1.0.4/drstemplates.c' object='drstemplates.lo' libtool=yes @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o drstemplates.lo `test -f './g2clib-1.0.4/drstemplates.c' || echo '$(srcdir)/'`./g2clib-1.0.4/drstemplates.c -- --enc_jpeg2000.lo: ./g2clib-1.0.4/enc_jpeg2000.c --@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT enc_jpeg2000.lo -MD -MP -MF $(DEPDIR)/enc_jpeg2000.Tpo -c -o enc_jpeg2000.lo `test -f './g2clib-1.0.4/enc_jpeg2000.c' || echo '$(srcdir)/'`./g2clib-1.0.4/enc_jpeg2000.c --@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/enc_jpeg2000.Tpo $(DEPDIR)/enc_jpeg2000.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='./g2clib-1.0.4/enc_jpeg2000.c' object='enc_jpeg2000.lo' libtool=yes @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o enc_jpeg2000.lo `test -f './g2clib-1.0.4/enc_jpeg2000.c' || echo '$(srcdir)/'`./g2clib-1.0.4/enc_jpeg2000.c -- --enc_png.lo: ./g2clib-1.0.4/enc_png.c --@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT enc_png.lo -MD -MP -MF $(DEPDIR)/enc_png.Tpo -c -o enc_png.lo `test -f './g2clib-1.0.4/enc_png.c' || echo '$(srcdir)/'`./g2clib-1.0.4/enc_png.c --@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/enc_png.Tpo $(DEPDIR)/enc_png.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='./g2clib-1.0.4/enc_png.c' object='enc_png.lo' libtool=yes @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o enc_png.lo `test -f './g2clib-1.0.4/enc_png.c' || echo '$(srcdir)/'`./g2clib-1.0.4/enc_png.c -- --g2_addfield.lo: ./g2clib-1.0.4/g2_addfield.c --@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT g2_addfield.lo -MD -MP -MF $(DEPDIR)/g2_addfield.Tpo -c -o g2_addfield.lo `test -f './g2clib-1.0.4/g2_addfield.c' || echo '$(srcdir)/'`./g2clib-1.0.4/g2_addfield.c --@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/g2_addfield.Tpo $(DEPDIR)/g2_addfield.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='./g2clib-1.0.4/g2_addfield.c' object='g2_addfield.lo' libtool=yes @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o g2_addfield.lo `test -f './g2clib-1.0.4/g2_addfield.c' || echo '$(srcdir)/'`./g2clib-1.0.4/g2_addfield.c -- --g2_addgrid.lo: ./g2clib-1.0.4/g2_addgrid.c --@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT g2_addgrid.lo -MD -MP -MF $(DEPDIR)/g2_addgrid.Tpo -c -o g2_addgrid.lo `test -f './g2clib-1.0.4/g2_addgrid.c' || echo '$(srcdir)/'`./g2clib-1.0.4/g2_addgrid.c --@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/g2_addgrid.Tpo $(DEPDIR)/g2_addgrid.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='./g2clib-1.0.4/g2_addgrid.c' object='g2_addgrid.lo' libtool=yes @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o g2_addgrid.lo `test -f './g2clib-1.0.4/g2_addgrid.c' || echo '$(srcdir)/'`./g2clib-1.0.4/g2_addgrid.c -- --g2_addlocal.lo: ./g2clib-1.0.4/g2_addlocal.c --@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT g2_addlocal.lo -MD -MP -MF $(DEPDIR)/g2_addlocal.Tpo -c -o g2_addlocal.lo `test -f './g2clib-1.0.4/g2_addlocal.c' || echo '$(srcdir)/'`./g2clib-1.0.4/g2_addlocal.c --@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/g2_addlocal.Tpo $(DEPDIR)/g2_addlocal.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='./g2clib-1.0.4/g2_addlocal.c' object='g2_addlocal.lo' libtool=yes @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o g2_addlocal.lo `test -f './g2clib-1.0.4/g2_addlocal.c' || echo '$(srcdir)/'`./g2clib-1.0.4/g2_addlocal.c -- --g2_create.lo: ./g2clib-1.0.4/g2_create.c --@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT g2_create.lo -MD -MP -MF $(DEPDIR)/g2_create.Tpo -c -o g2_create.lo `test -f './g2clib-1.0.4/g2_create.c' || echo '$(srcdir)/'`./g2clib-1.0.4/g2_create.c --@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/g2_create.Tpo $(DEPDIR)/g2_create.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='./g2clib-1.0.4/g2_create.c' object='g2_create.lo' libtool=yes @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o g2_create.lo `test -f './g2clib-1.0.4/g2_create.c' || echo '$(srcdir)/'`./g2clib-1.0.4/g2_create.c -- --g2_free.lo: ./g2clib-1.0.4/g2_free.c --@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT g2_free.lo -MD -MP -MF $(DEPDIR)/g2_free.Tpo -c -o g2_free.lo `test -f './g2clib-1.0.4/g2_free.c' || echo '$(srcdir)/'`./g2clib-1.0.4/g2_free.c --@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/g2_free.Tpo $(DEPDIR)/g2_free.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='./g2clib-1.0.4/g2_free.c' object='g2_free.lo' libtool=yes @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o g2_free.lo `test -f './g2clib-1.0.4/g2_free.c' || echo '$(srcdir)/'`./g2clib-1.0.4/g2_free.c -- --g2_getfld.lo: ./g2clib-1.0.4/g2_getfld.c --@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT g2_getfld.lo -MD -MP -MF $(DEPDIR)/g2_getfld.Tpo -c -o g2_getfld.lo `test -f './g2clib-1.0.4/g2_getfld.c' || echo '$(srcdir)/'`./g2clib-1.0.4/g2_getfld.c --@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/g2_getfld.Tpo $(DEPDIR)/g2_getfld.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='./g2clib-1.0.4/g2_getfld.c' object='g2_getfld.lo' libtool=yes @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o g2_getfld.lo `test -f './g2clib-1.0.4/g2_getfld.c' || echo '$(srcdir)/'`./g2clib-1.0.4/g2_getfld.c -- --g2_gribend.lo: ./g2clib-1.0.4/g2_gribend.c --@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT g2_gribend.lo -MD -MP -MF $(DEPDIR)/g2_gribend.Tpo -c -o g2_gribend.lo `test -f './g2clib-1.0.4/g2_gribend.c' || echo '$(srcdir)/'`./g2clib-1.0.4/g2_gribend.c --@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/g2_gribend.Tpo $(DEPDIR)/g2_gribend.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='./g2clib-1.0.4/g2_gribend.c' object='g2_gribend.lo' libtool=yes @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o g2_gribend.lo `test -f './g2clib-1.0.4/g2_gribend.c' || echo '$(srcdir)/'`./g2clib-1.0.4/g2_gribend.c -- --g2_info.lo: ./g2clib-1.0.4/g2_info.c --@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT g2_info.lo -MD -MP -MF $(DEPDIR)/g2_info.Tpo -c -o g2_info.lo `test -f './g2clib-1.0.4/g2_info.c' || echo '$(srcdir)/'`./g2clib-1.0.4/g2_info.c --@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/g2_info.Tpo $(DEPDIR)/g2_info.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='./g2clib-1.0.4/g2_info.c' object='g2_info.lo' libtool=yes @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o g2_info.lo `test -f './g2clib-1.0.4/g2_info.c' || echo '$(srcdir)/'`./g2clib-1.0.4/g2_info.c -- --g2_miss.lo: ./g2clib-1.0.4/g2_miss.c --@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT g2_miss.lo -MD -MP -MF $(DEPDIR)/g2_miss.Tpo -c -o g2_miss.lo `test -f './g2clib-1.0.4/g2_miss.c' || echo '$(srcdir)/'`./g2clib-1.0.4/g2_miss.c --@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/g2_miss.Tpo $(DEPDIR)/g2_miss.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='./g2clib-1.0.4/g2_miss.c' object='g2_miss.lo' libtool=yes @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o g2_miss.lo `test -f './g2clib-1.0.4/g2_miss.c' || echo '$(srcdir)/'`./g2clib-1.0.4/g2_miss.c -- --g2_unpack1.lo: ./g2clib-1.0.4/g2_unpack1.c --@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT g2_unpack1.lo -MD -MP -MF $(DEPDIR)/g2_unpack1.Tpo -c -o g2_unpack1.lo `test -f './g2clib-1.0.4/g2_unpack1.c' || echo '$(srcdir)/'`./g2clib-1.0.4/g2_unpack1.c --@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/g2_unpack1.Tpo $(DEPDIR)/g2_unpack1.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='./g2clib-1.0.4/g2_unpack1.c' object='g2_unpack1.lo' libtool=yes @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o g2_unpack1.lo `test -f './g2clib-1.0.4/g2_unpack1.c' || echo '$(srcdir)/'`./g2clib-1.0.4/g2_unpack1.c -- --g2_unpack2.lo: ./g2clib-1.0.4/g2_unpack2.c --@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT g2_unpack2.lo -MD -MP -MF $(DEPDIR)/g2_unpack2.Tpo -c -o g2_unpack2.lo `test -f './g2clib-1.0.4/g2_unpack2.c' || echo '$(srcdir)/'`./g2clib-1.0.4/g2_unpack2.c --@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/g2_unpack2.Tpo $(DEPDIR)/g2_unpack2.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='./g2clib-1.0.4/g2_unpack2.c' object='g2_unpack2.lo' libtool=yes @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o g2_unpack2.lo `test -f './g2clib-1.0.4/g2_unpack2.c' || echo '$(srcdir)/'`./g2clib-1.0.4/g2_unpack2.c -- --g2_unpack3.lo: ./g2clib-1.0.4/g2_unpack3.c --@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT g2_unpack3.lo -MD -MP -MF $(DEPDIR)/g2_unpack3.Tpo -c -o g2_unpack3.lo `test -f './g2clib-1.0.4/g2_unpack3.c' || echo '$(srcdir)/'`./g2clib-1.0.4/g2_unpack3.c --@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/g2_unpack3.Tpo $(DEPDIR)/g2_unpack3.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='./g2clib-1.0.4/g2_unpack3.c' object='g2_unpack3.lo' libtool=yes @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o g2_unpack3.lo `test -f './g2clib-1.0.4/g2_unpack3.c' || echo '$(srcdir)/'`./g2clib-1.0.4/g2_unpack3.c -- --g2_unpack4.lo: ./g2clib-1.0.4/g2_unpack4.c --@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT g2_unpack4.lo -MD -MP -MF $(DEPDIR)/g2_unpack4.Tpo -c -o g2_unpack4.lo `test -f './g2clib-1.0.4/g2_unpack4.c' || echo '$(srcdir)/'`./g2clib-1.0.4/g2_unpack4.c --@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/g2_unpack4.Tpo $(DEPDIR)/g2_unpack4.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='./g2clib-1.0.4/g2_unpack4.c' object='g2_unpack4.lo' libtool=yes @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o g2_unpack4.lo `test -f './g2clib-1.0.4/g2_unpack4.c' || echo '$(srcdir)/'`./g2clib-1.0.4/g2_unpack4.c -- --g2_unpack5.lo: ./g2clib-1.0.4/g2_unpack5.c --@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT g2_unpack5.lo -MD -MP -MF $(DEPDIR)/g2_unpack5.Tpo -c -o g2_unpack5.lo `test -f './g2clib-1.0.4/g2_unpack5.c' || echo '$(srcdir)/'`./g2clib-1.0.4/g2_unpack5.c --@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/g2_unpack5.Tpo $(DEPDIR)/g2_unpack5.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='./g2clib-1.0.4/g2_unpack5.c' object='g2_unpack5.lo' libtool=yes @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o g2_unpack5.lo `test -f './g2clib-1.0.4/g2_unpack5.c' || echo '$(srcdir)/'`./g2clib-1.0.4/g2_unpack5.c -- --g2_unpack6.lo: ./g2clib-1.0.4/g2_unpack6.c --@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT g2_unpack6.lo -MD -MP -MF $(DEPDIR)/g2_unpack6.Tpo -c -o g2_unpack6.lo `test -f './g2clib-1.0.4/g2_unpack6.c' || echo '$(srcdir)/'`./g2clib-1.0.4/g2_unpack6.c --@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/g2_unpack6.Tpo $(DEPDIR)/g2_unpack6.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='./g2clib-1.0.4/g2_unpack6.c' object='g2_unpack6.lo' libtool=yes @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o g2_unpack6.lo `test -f './g2clib-1.0.4/g2_unpack6.c' || echo '$(srcdir)/'`./g2clib-1.0.4/g2_unpack6.c -- --g2_unpack7.lo: ./g2clib-1.0.4/g2_unpack7.c --@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT g2_unpack7.lo -MD -MP -MF $(DEPDIR)/g2_unpack7.Tpo -c -o g2_unpack7.lo `test -f './g2clib-1.0.4/g2_unpack7.c' || echo '$(srcdir)/'`./g2clib-1.0.4/g2_unpack7.c --@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/g2_unpack7.Tpo $(DEPDIR)/g2_unpack7.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='./g2clib-1.0.4/g2_unpack7.c' object='g2_unpack7.lo' libtool=yes @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o g2_unpack7.lo `test -f './g2clib-1.0.4/g2_unpack7.c' || echo '$(srcdir)/'`./g2clib-1.0.4/g2_unpack7.c -- --gbits.lo: ./g2clib-1.0.4/gbits.c --@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gbits.lo -MD -MP -MF $(DEPDIR)/gbits.Tpo -c -o gbits.lo `test -f './g2clib-1.0.4/gbits.c' || echo '$(srcdir)/'`./g2clib-1.0.4/gbits.c --@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/gbits.Tpo $(DEPDIR)/gbits.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='./g2clib-1.0.4/gbits.c' object='gbits.lo' libtool=yes @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gbits.lo `test -f './g2clib-1.0.4/gbits.c' || echo '$(srcdir)/'`./g2clib-1.0.4/gbits.c -- --getdim.lo: ./g2clib-1.0.4/getdim.c --@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT getdim.lo -MD -MP -MF $(DEPDIR)/getdim.Tpo -c -o getdim.lo `test -f './g2clib-1.0.4/getdim.c' || echo '$(srcdir)/'`./g2clib-1.0.4/getdim.c --@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/getdim.Tpo $(DEPDIR)/getdim.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='./g2clib-1.0.4/getdim.c' object='getdim.lo' libtool=yes @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o getdim.lo `test -f './g2clib-1.0.4/getdim.c' || echo '$(srcdir)/'`./g2clib-1.0.4/getdim.c -- --getpoly.lo: ./g2clib-1.0.4/getpoly.c --@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT getpoly.lo -MD -MP -MF $(DEPDIR)/getpoly.Tpo -c -o getpoly.lo `test -f './g2clib-1.0.4/getpoly.c' || echo '$(srcdir)/'`./g2clib-1.0.4/getpoly.c --@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/getpoly.Tpo $(DEPDIR)/getpoly.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='./g2clib-1.0.4/getpoly.c' object='getpoly.lo' libtool=yes @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o getpoly.lo `test -f './g2clib-1.0.4/getpoly.c' || echo '$(srcdir)/'`./g2clib-1.0.4/getpoly.c -- --gridtemplates.lo: ./g2clib-1.0.4/gridtemplates.c --@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gridtemplates.lo -MD -MP -MF $(DEPDIR)/gridtemplates.Tpo -c -o gridtemplates.lo `test -f './g2clib-1.0.4/gridtemplates.c' || echo '$(srcdir)/'`./g2clib-1.0.4/gridtemplates.c --@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/gridtemplates.Tpo $(DEPDIR)/gridtemplates.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='./g2clib-1.0.4/gridtemplates.c' object='gridtemplates.lo' libtool=yes @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gridtemplates.lo `test -f './g2clib-1.0.4/gridtemplates.c' || echo '$(srcdir)/'`./g2clib-1.0.4/gridtemplates.c -- --int_power.lo: ./g2clib-1.0.4/int_power.c --@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT int_power.lo -MD -MP -MF $(DEPDIR)/int_power.Tpo -c -o int_power.lo `test -f './g2clib-1.0.4/int_power.c' || echo '$(srcdir)/'`./g2clib-1.0.4/int_power.c --@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/int_power.Tpo $(DEPDIR)/int_power.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='./g2clib-1.0.4/int_power.c' object='int_power.lo' libtool=yes @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o int_power.lo `test -f './g2clib-1.0.4/int_power.c' || echo '$(srcdir)/'`./g2clib-1.0.4/int_power.c -- --jpcpack.lo: ./g2clib-1.0.4/jpcpack.c --@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT jpcpack.lo -MD -MP -MF $(DEPDIR)/jpcpack.Tpo -c -o jpcpack.lo `test -f './g2clib-1.0.4/jpcpack.c' || echo '$(srcdir)/'`./g2clib-1.0.4/jpcpack.c --@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/jpcpack.Tpo $(DEPDIR)/jpcpack.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='./g2clib-1.0.4/jpcpack.c' object='jpcpack.lo' libtool=yes @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o jpcpack.lo `test -f './g2clib-1.0.4/jpcpack.c' || echo '$(srcdir)/'`./g2clib-1.0.4/jpcpack.c -- --jpcunpack.lo: ./g2clib-1.0.4/jpcunpack.c --@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT jpcunpack.lo -MD -MP -MF $(DEPDIR)/jpcunpack.Tpo -c -o jpcunpack.lo `test -f './g2clib-1.0.4/jpcunpack.c' || echo '$(srcdir)/'`./g2clib-1.0.4/jpcunpack.c --@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/jpcunpack.Tpo $(DEPDIR)/jpcunpack.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='./g2clib-1.0.4/jpcunpack.c' object='jpcunpack.lo' libtool=yes @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o jpcunpack.lo `test -f './g2clib-1.0.4/jpcunpack.c' || echo '$(srcdir)/'`./g2clib-1.0.4/jpcunpack.c -- --misspack.lo: ./g2clib-1.0.4/misspack.c --@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT misspack.lo -MD -MP -MF $(DEPDIR)/misspack.Tpo -c -o misspack.lo `test -f './g2clib-1.0.4/misspack.c' || echo '$(srcdir)/'`./g2clib-1.0.4/misspack.c --@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/misspack.Tpo $(DEPDIR)/misspack.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='./g2clib-1.0.4/misspack.c' object='misspack.lo' libtool=yes @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o misspack.lo `test -f './g2clib-1.0.4/misspack.c' || echo '$(srcdir)/'`./g2clib-1.0.4/misspack.c -- --mkieee.lo: ./g2clib-1.0.4/mkieee.c --@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mkieee.lo -MD -MP -MF $(DEPDIR)/mkieee.Tpo -c -o mkieee.lo `test -f './g2clib-1.0.4/mkieee.c' || echo '$(srcdir)/'`./g2clib-1.0.4/mkieee.c --@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/mkieee.Tpo $(DEPDIR)/mkieee.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='./g2clib-1.0.4/mkieee.c' object='mkieee.lo' libtool=yes @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mkieee.lo `test -f './g2clib-1.0.4/mkieee.c' || echo '$(srcdir)/'`./g2clib-1.0.4/mkieee.c -- --pack_gp.lo: ./g2clib-1.0.4/pack_gp.c --@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pack_gp.lo -MD -MP -MF $(DEPDIR)/pack_gp.Tpo -c -o pack_gp.lo `test -f './g2clib-1.0.4/pack_gp.c' || echo '$(srcdir)/'`./g2clib-1.0.4/pack_gp.c --@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/pack_gp.Tpo $(DEPDIR)/pack_gp.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='./g2clib-1.0.4/pack_gp.c' object='pack_gp.lo' libtool=yes @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pack_gp.lo `test -f './g2clib-1.0.4/pack_gp.c' || echo '$(srcdir)/'`./g2clib-1.0.4/pack_gp.c -- --pdstemplates.lo: ./g2clib-1.0.4/pdstemplates.c --@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pdstemplates.lo -MD -MP -MF $(DEPDIR)/pdstemplates.Tpo -c -o pdstemplates.lo `test -f './g2clib-1.0.4/pdstemplates.c' || echo '$(srcdir)/'`./g2clib-1.0.4/pdstemplates.c --@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/pdstemplates.Tpo $(DEPDIR)/pdstemplates.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='./g2clib-1.0.4/pdstemplates.c' object='pdstemplates.lo' libtool=yes @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pdstemplates.lo `test -f './g2clib-1.0.4/pdstemplates.c' || echo '$(srcdir)/'`./g2clib-1.0.4/pdstemplates.c -- --pngpack.lo: ./g2clib-1.0.4/pngpack.c --@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pngpack.lo -MD -MP -MF $(DEPDIR)/pngpack.Tpo -c -o pngpack.lo `test -f './g2clib-1.0.4/pngpack.c' || echo '$(srcdir)/'`./g2clib-1.0.4/pngpack.c --@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/pngpack.Tpo $(DEPDIR)/pngpack.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='./g2clib-1.0.4/pngpack.c' object='pngpack.lo' libtool=yes @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pngpack.lo `test -f './g2clib-1.0.4/pngpack.c' || echo '$(srcdir)/'`./g2clib-1.0.4/pngpack.c -- --pngunpack.lo: ./g2clib-1.0.4/pngunpack.c --@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pngunpack.lo -MD -MP -MF $(DEPDIR)/pngunpack.Tpo -c -o pngunpack.lo `test -f './g2clib-1.0.4/pngunpack.c' || echo '$(srcdir)/'`./g2clib-1.0.4/pngunpack.c --@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/pngunpack.Tpo $(DEPDIR)/pngunpack.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='./g2clib-1.0.4/pngunpack.c' object='pngunpack.lo' libtool=yes @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pngunpack.lo `test -f './g2clib-1.0.4/pngunpack.c' || echo '$(srcdir)/'`./g2clib-1.0.4/pngunpack.c -- --rdieee.lo: ./g2clib-1.0.4/rdieee.c --@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT rdieee.lo -MD -MP -MF $(DEPDIR)/rdieee.Tpo -c -o rdieee.lo `test -f './g2clib-1.0.4/rdieee.c' || echo '$(srcdir)/'`./g2clib-1.0.4/rdieee.c --@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/rdieee.Tpo $(DEPDIR)/rdieee.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='./g2clib-1.0.4/rdieee.c' object='rdieee.lo' libtool=yes @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o rdieee.lo `test -f './g2clib-1.0.4/rdieee.c' || echo '$(srcdir)/'`./g2clib-1.0.4/rdieee.c -- --reduce.lo: ./g2clib-1.0.4/reduce.c --@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT reduce.lo -MD -MP -MF $(DEPDIR)/reduce.Tpo -c -o reduce.lo `test -f './g2clib-1.0.4/reduce.c' || echo '$(srcdir)/'`./g2clib-1.0.4/reduce.c --@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/reduce.Tpo $(DEPDIR)/reduce.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='./g2clib-1.0.4/reduce.c' object='reduce.lo' libtool=yes @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o reduce.lo `test -f './g2clib-1.0.4/reduce.c' || echo '$(srcdir)/'`./g2clib-1.0.4/reduce.c -- --seekgb.lo: ./g2clib-1.0.4/seekgb.c --@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT seekgb.lo -MD -MP -MF $(DEPDIR)/seekgb.Tpo -c -o seekgb.lo `test -f './g2clib-1.0.4/seekgb.c' || echo '$(srcdir)/'`./g2clib-1.0.4/seekgb.c --@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/seekgb.Tpo $(DEPDIR)/seekgb.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='./g2clib-1.0.4/seekgb.c' object='seekgb.lo' libtool=yes @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o seekgb.lo `test -f './g2clib-1.0.4/seekgb.c' || echo '$(srcdir)/'`./g2clib-1.0.4/seekgb.c -- --simpack.lo: ./g2clib-1.0.4/simpack.c --@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT simpack.lo -MD -MP -MF $(DEPDIR)/simpack.Tpo -c -o simpack.lo `test -f './g2clib-1.0.4/simpack.c' || echo '$(srcdir)/'`./g2clib-1.0.4/simpack.c --@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/simpack.Tpo $(DEPDIR)/simpack.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='./g2clib-1.0.4/simpack.c' object='simpack.lo' libtool=yes @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o simpack.lo `test -f './g2clib-1.0.4/simpack.c' || echo '$(srcdir)/'`./g2clib-1.0.4/simpack.c -- --simunpack.lo: ./g2clib-1.0.4/simunpack.c --@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT simunpack.lo -MD -MP -MF $(DEPDIR)/simunpack.Tpo -c -o simunpack.lo `test -f './g2clib-1.0.4/simunpack.c' || echo '$(srcdir)/'`./g2clib-1.0.4/simunpack.c --@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/simunpack.Tpo $(DEPDIR)/simunpack.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='./g2clib-1.0.4/simunpack.c' object='simunpack.lo' libtool=yes @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o simunpack.lo `test -f './g2clib-1.0.4/simunpack.c' || echo '$(srcdir)/'`./g2clib-1.0.4/simunpack.c -- --specpack.lo: ./g2clib-1.0.4/specpack.c --@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT specpack.lo -MD -MP -MF $(DEPDIR)/specpack.Tpo -c -o specpack.lo `test -f './g2clib-1.0.4/specpack.c' || echo '$(srcdir)/'`./g2clib-1.0.4/specpack.c --@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/specpack.Tpo $(DEPDIR)/specpack.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='./g2clib-1.0.4/specpack.c' object='specpack.lo' libtool=yes @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o specpack.lo `test -f './g2clib-1.0.4/specpack.c' || echo '$(srcdir)/'`./g2clib-1.0.4/specpack.c -- --specunpack.lo: ./g2clib-1.0.4/specunpack.c --@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT specunpack.lo -MD -MP -MF $(DEPDIR)/specunpack.Tpo -c -o specunpack.lo `test -f './g2clib-1.0.4/specunpack.c' || echo '$(srcdir)/'`./g2clib-1.0.4/specunpack.c --@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/specunpack.Tpo $(DEPDIR)/specunpack.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='./g2clib-1.0.4/specunpack.c' object='specunpack.lo' libtool=yes @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o specunpack.lo `test -f './g2clib-1.0.4/specunpack.c' || echo '$(srcdir)/'`./g2clib-1.0.4/specunpack.c - - .cpp.o: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< - - .cpp.obj: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - - .cpp.lo: --@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< - - mostlyclean-libtool: - -rm -f *.lo -@@ -797,26 +482,15 @@ mostlyclean-libtool: - clean-libtool: - -rm -rf .libs _libs - --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -+ID: $(am__tagged_files) -+ $(am__define_uniq_tagged_files); mkid -fID $$unique -+tags: tags-am -+TAGS: tags -+ -+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ -@@ -828,15 +502,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $$unique; \ - fi; \ - fi --ctags: CTAGS --CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ctags: ctags-am -+ -+CTAGS: ctags -+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) -+ $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique -@@ -845,6 +515,21 @@ GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -+cscopelist: cscopelist-am -+ -+cscopelist-am: $(am__tagged_files) -+ list='$(am__tagged_files)'; \ -+ case "$(srcdir)" in \ -+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ -+ *) sdir=$(subdir)/$(srcdir) ;; \ -+ esac; \ -+ for i in $$list; do \ -+ if test -f "$$i"; then \ -+ echo "$(subdir)/$$i"; \ -+ else \ -+ echo "$$sdir/$$i"; \ -+ fi; \ -+ done >> $(top_builddir)/cscope.files - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -@@ -896,10 +581,15 @@ install-am: all-am - - installcheck: installcheck-am - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+ if test -z '$(STRIP)'; then \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ install; \ -+ else \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -+ fi - mostlyclean-generic: - - clean-generic: -@@ -984,19 +674,20 @@ uninstall-am: uninstall-pkglibLTLIBRARIES - - .MAKE: install-am install-strip - --.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ -- clean-libtool clean-pkglibLTLIBRARIES ctags distclean \ -- distclean-compile distclean-generic distclean-libtool \ -- distclean-tags distdir dvi dvi-am html html-am info info-am \ -- install install-am install-data install-data-am install-dvi \ -- install-dvi-am install-exec install-exec-am install-html \ -- install-html-am install-info install-info-am install-man \ -- install-pdf install-pdf-am install-pkglibLTLIBRARIES \ -- install-ps install-ps-am install-strip installcheck \ -- installcheck-am installdirs maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-compile \ -- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -- tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES -+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ -+ clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \ -+ ctags-am distclean distclean-compile distclean-generic \ -+ distclean-libtool distclean-tags distdir dvi dvi-am html \ -+ html-am info info-am install install-am install-data \ -+ install-data-am install-dvi install-dvi-am install-exec \ -+ install-exec-am install-html install-html-am install-info \ -+ install-info-am install-man install-pdf install-pdf-am \ -+ install-pkglibLTLIBRARIES install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ maintainer-clean maintainer-clean-generic mostlyclean \ -+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ -+ pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ -+ uninstall-pkglibLTLIBRARIES - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff --git a/src/modules_io/grid/io_grid_image/Makefile.in b/src/modules_io/grid/io_grid_image/Makefile.in -index 5d5fed5..8b8e369 100644 ---- a/src/modules_io/grid/io_grid_image/Makefile.in -+++ b/src/modules_io/grid/io_grid_image/Makefile.in -@@ -1,9 +1,8 @@ --# Makefile.in generated by automake 1.11.1 from Makefile.am. -+# Makefile.in generated by automake 1.14 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, --# Inc. -+# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+ - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -16,6 +15,51 @@ - @SET_MAKE@ - - VPATH = @srcdir@ -+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -+am__make_running_with_option = \ -+ case $${target_option-} in \ -+ ?) ;; \ -+ *) echo "am__make_running_with_option: internal error: invalid" \ -+ "target option '$${target_option-}' specified" >&2; \ -+ exit 1;; \ -+ esac; \ -+ has_opt=no; \ -+ sane_makeflags=$$MAKEFLAGS; \ -+ if $(am__is_gnu_make); then \ -+ sane_makeflags=$$MFLAGS; \ -+ else \ -+ case $$MAKEFLAGS in \ -+ *\\[\ \ ]*) \ -+ bs=\\; \ -+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -+ esac; \ -+ fi; \ -+ skip_next=no; \ -+ strip_trailopt () \ -+ { \ -+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -+ }; \ -+ for flg in $$sane_makeflags; do \ -+ test $$skip_next = yes && { skip_next=no; continue; }; \ -+ case $$flg in \ -+ *=*|--*) continue;; \ -+ -*I) strip_trailopt 'I'; skip_next=yes;; \ -+ -*I?*) strip_trailopt 'I';; \ -+ -*O) strip_trailopt 'O'; skip_next=yes;; \ -+ -*O?*) strip_trailopt 'O';; \ -+ -*l) strip_trailopt 'l'; skip_next=yes;; \ -+ -*l?*) strip_trailopt 'l';; \ -+ -[dEDm]) skip_next=yes;; \ -+ -[JT]) skip_next=yes;; \ -+ esac; \ -+ case $$flg in \ -+ *$$target_option*) has_opt=yes; break;; \ -+ esac; \ -+ done; \ -+ test $$has_opt = yes -+am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -+am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -35,7 +79,8 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - subdir = src/modules_io/grid/io_grid_image --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ -+ $(top_srcdir)/depcomp - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ - $(top_srcdir)/m4/ax_python_devel.m4 \ -@@ -71,6 +116,12 @@ am__nobase_list = $(am__nobase_strip_setup); \ - am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -+am__uninstall_files_from_dir = { \ -+ test -z "$$files" \ -+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ -+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ -+ $(am__cd) "$$dir" && rm -f $$files; }; \ -+ } - am__installdirs = "$(DESTDIR)$(pkglibdir)" - LTLIBRARIES = $(pkglib_LTLIBRARIES) - libio_grid_image_la_DEPENDENCIES = \ -@@ -78,35 +129,92 @@ libio_grid_image_la_DEPENDENCIES = \ - am_libio_grid_image_la_OBJECTS = grid_export.lo grid_import.lo \ - MLB_Interface.lo - libio_grid_image_la_OBJECTS = $(am_libio_grid_image_la_OBJECTS) -+AM_V_lt = $(am__v_lt_@AM_V@) -+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -+am__v_lt_0 = --silent -+am__v_lt_1 = -+AM_V_P = $(am__v_P_@AM_V@) -+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -+am__v_P_0 = false -+am__v_P_1 = : -+AM_V_GEN = $(am__v_GEN_@AM_V@) -+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+am__v_GEN_0 = @echo " GEN " $@; -+am__v_GEN_1 = -+AM_V_at = $(am__v_at_@AM_V@) -+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+am__v_at_0 = @ -+am__v_at_1 = - DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - am__mv = mv -f - CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) --LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CXXFLAGS) $(CXXFLAGS) -+AM_V_CXX = $(am__v_CXX_@AM_V@) -+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) -+am__v_CXX_0 = @echo " CXX " $@; -+am__v_CXX_1 = - CXXLD = $(CXX) --CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ -+ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) -+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) -+am__v_CXXLD_0 = @echo " CXXLD " $@; -+am__v_CXXLD_1 = - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CFLAGS) $(CFLAGS) -+AM_V_CC = $(am__v_CC_@AM_V@) -+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -+am__v_CC_0 = @echo " CC " $@; -+am__v_CC_1 = - CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CCLD = $(am__v_CCLD_@AM_V@) -+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -+am__v_CCLD_0 = @echo " CCLD " $@; -+am__v_CCLD_1 = - SOURCES = $(libio_grid_image_la_SOURCES) - DIST_SOURCES = $(libio_grid_image_la_SOURCES) -+am__can_run_installinfo = \ -+ case $$AM_UPDATE_INFO_DIR in \ -+ n|no|NO) false;; \ -+ *) (install-info --version) >/dev/null 2>&1;; \ -+ esac -+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -+# Read a list of newline-separated strings from the standard input, -+# and print each of them once, without duplicates. Input order is -+# *not* preserved. -+am__uniquify_input = $(AWK) '\ -+ BEGIN { nonempty = 0; } \ -+ { items[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in items) print i; }; } \ -+' -+# Make sure the list of sources is unique. This is necessary because, -+# e.g., the same source file might be shared among _SOURCES variables -+# for different programs/libraries. -+am__define_uniq_tagged_files = \ -+ list='$(am__tagged_files)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | $(am__uniquify_input)` - ETAGS = etags - CTAGS = ctags - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ -+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ -@@ -127,6 +235,7 @@ CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DISABLELIBHARU = @DISABLELIBHARU@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -154,6 +263,7 @@ LOCAL_INCS = @LOCAL_INCS@ - LOCAL_LIBS = @LOCAL_LIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - NM = @NM@ - NMEDIT = @NMEDIT@ -@@ -166,6 +276,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - POW_LIB = @POW_LIB@ -@@ -191,6 +302,7 @@ abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -@@ -224,7 +336,6 @@ libdir = @libdir@ - libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -@@ -297,9 +408,9 @@ $(top_srcdir)/configure: $(am__configure_deps) - $(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - $(am__aclocal_m4_deps): -+ - install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" - @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ - list2=; for p in $$list; do \ - if test -f $$p; then \ -@@ -307,6 +418,8 @@ install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - else :; fi; \ - done; \ - test -z "$$list2" || { \ -+ echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \ -+ $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \ - } -@@ -322,14 +435,17 @@ uninstall-pkglibLTLIBRARIES: - - clean-pkglibLTLIBRARIES: - -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES) -- @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \ -- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -- echo "rm -f \"$${dir}/so_locations\""; \ -- rm -f "$${dir}/so_locations"; \ -- done --libio_grid_image.la: $(libio_grid_image_la_OBJECTS) $(libio_grid_image_la_DEPENDENCIES) -- $(CXXLINK) -rpath $(pkglibdir) $(libio_grid_image_la_OBJECTS) $(libio_grid_image_la_LIBADD) $(LIBS) -+ @list='$(pkglib_LTLIBRARIES)'; \ -+ locs=`for p in $$list; do echo $$p; done | \ -+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ -+ sort -u`; \ -+ test -z "$$locs" || { \ -+ echo rm -f $${locs}; \ -+ rm -f $${locs}; \ -+ } -+ -+libio_grid_image.la: $(libio_grid_image_la_OBJECTS) $(libio_grid_image_la_DEPENDENCIES) $(EXTRA_libio_grid_image_la_DEPENDENCIES) -+ $(AM_V_CXXLD)$(CXXLINK) -rpath $(pkglibdir) $(libio_grid_image_la_OBJECTS) $(libio_grid_image_la_LIBADD) $(LIBS) - - mostlyclean-compile: - -rm -f *.$(OBJEXT) -@@ -342,25 +458,25 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/grid_import.Plo@am__quote@ - - .cpp.o: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< - - .cpp.obj: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - - .cpp.lo: --@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< - - mostlyclean-libtool: - -rm -f *.lo -@@ -368,26 +484,15 @@ mostlyclean-libtool: - clean-libtool: - -rm -rf .libs _libs - --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -+ID: $(am__tagged_files) -+ $(am__define_uniq_tagged_files); mkid -fID $$unique -+tags: tags-am -+TAGS: tags -+ -+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ -@@ -399,15 +504,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $$unique; \ - fi; \ - fi --ctags: CTAGS --CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ctags: ctags-am -+ -+CTAGS: ctags -+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) -+ $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique -@@ -416,6 +517,21 @@ GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -+cscopelist: cscopelist-am -+ -+cscopelist-am: $(am__tagged_files) -+ list='$(am__tagged_files)'; \ -+ case "$(srcdir)" in \ -+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ -+ *) sdir=$(subdir)/$(srcdir) ;; \ -+ esac; \ -+ for i in $$list; do \ -+ if test -f "$$i"; then \ -+ echo "$(subdir)/$$i"; \ -+ else \ -+ echo "$$sdir/$$i"; \ -+ fi; \ -+ done >> $(top_builddir)/cscope.files - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -@@ -467,10 +583,15 @@ install-am: all-am - - installcheck: installcheck-am - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+ if test -z '$(STRIP)'; then \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ install; \ -+ else \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -+ fi - mostlyclean-generic: - - clean-generic: -@@ -555,19 +676,20 @@ uninstall-am: uninstall-pkglibLTLIBRARIES - - .MAKE: install-am install-strip - --.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ -- clean-libtool clean-pkglibLTLIBRARIES ctags distclean \ -- distclean-compile distclean-generic distclean-libtool \ -- distclean-tags distdir dvi dvi-am html html-am info info-am \ -- install install-am install-data install-data-am install-dvi \ -- install-dvi-am install-exec install-exec-am install-html \ -- install-html-am install-info install-info-am install-man \ -- install-pdf install-pdf-am install-pkglibLTLIBRARIES \ -- install-ps install-ps-am install-strip installcheck \ -- installcheck-am installdirs maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-compile \ -- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -- tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES -+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ -+ clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \ -+ ctags-am distclean distclean-compile distclean-generic \ -+ distclean-libtool distclean-tags distdir dvi dvi-am html \ -+ html-am info info-am install install-am install-data \ -+ install-data-am install-dvi install-dvi-am install-exec \ -+ install-exec-am install-html install-html-am install-info \ -+ install-info-am install-man install-pdf install-pdf-am \ -+ install-pkglibLTLIBRARIES install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ maintainer-clean maintainer-clean-generic mostlyclean \ -+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ -+ pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ -+ uninstall-pkglibLTLIBRARIES - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff --git a/src/modules_io/shapes/Makefile.in b/src/modules_io/shapes/Makefile.in -index ef9cf73..142a001 100644 ---- a/src/modules_io/shapes/Makefile.in -+++ b/src/modules_io/shapes/Makefile.in -@@ -1,9 +1,8 @@ --# Makefile.in generated by automake 1.11.1 from Makefile.am. -+# Makefile.in generated by automake 1.14 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, --# Inc. -+# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+ - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -15,6 +14,51 @@ - - @SET_MAKE@ - VPATH = @srcdir@ -+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -+am__make_running_with_option = \ -+ case $${target_option-} in \ -+ ?) ;; \ -+ *) echo "am__make_running_with_option: internal error: invalid" \ -+ "target option '$${target_option-}' specified" >&2; \ -+ exit 1;; \ -+ esac; \ -+ has_opt=no; \ -+ sane_makeflags=$$MAKEFLAGS; \ -+ if $(am__is_gnu_make); then \ -+ sane_makeflags=$$MFLAGS; \ -+ else \ -+ case $$MAKEFLAGS in \ -+ *\\[\ \ ]*) \ -+ bs=\\; \ -+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -+ esac; \ -+ fi; \ -+ skip_next=no; \ -+ strip_trailopt () \ -+ { \ -+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -+ }; \ -+ for flg in $$sane_makeflags; do \ -+ test $$skip_next = yes && { skip_next=no; continue; }; \ -+ case $$flg in \ -+ *=*|--*) continue;; \ -+ -*I) strip_trailopt 'I'; skip_next=yes;; \ -+ -*I?*) strip_trailopt 'I';; \ -+ -*O) strip_trailopt 'O'; skip_next=yes;; \ -+ -*O?*) strip_trailopt 'O';; \ -+ -*l) strip_trailopt 'l'; skip_next=yes;; \ -+ -*l?*) strip_trailopt 'l';; \ -+ -[dEDm]) skip_next=yes;; \ -+ -[JT]) skip_next=yes;; \ -+ esac; \ -+ case $$flg in \ -+ *$$target_option*) has_opt=yes; break;; \ -+ esac; \ -+ done; \ -+ test $$has_opt = yes -+am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -+am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -34,7 +78,7 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - subdir = src/modules_io/shapes --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ - $(top_srcdir)/m4/ax_python_devel.m4 \ -@@ -49,20 +93,58 @@ mkinstalldirs = $(install_sh) -d - CONFIG_HEADER = $(top_builddir)/config.h - CONFIG_CLEAN_FILES = - CONFIG_CLEAN_VPATH_FILES = -+AM_V_P = $(am__v_P_@AM_V@) -+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -+am__v_P_0 = false -+am__v_P_1 = : -+AM_V_GEN = $(am__v_GEN_@AM_V@) -+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+am__v_GEN_0 = @echo " GEN " $@; -+am__v_GEN_1 = -+AM_V_at = $(am__v_at_@AM_V@) -+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+am__v_at_0 = @ -+am__v_at_1 = - SOURCES = - DIST_SOURCES = --RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ -- html-recursive info-recursive install-data-recursive \ -- install-dvi-recursive install-exec-recursive \ -- install-html-recursive install-info-recursive \ -- install-pdf-recursive install-ps-recursive install-recursive \ -- installcheck-recursive installdirs-recursive pdf-recursive \ -- ps-recursive uninstall-recursive -+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ -+ ctags-recursive dvi-recursive html-recursive info-recursive \ -+ install-data-recursive install-dvi-recursive \ -+ install-exec-recursive install-html-recursive \ -+ install-info-recursive install-pdf-recursive \ -+ install-ps-recursive install-recursive installcheck-recursive \ -+ installdirs-recursive pdf-recursive ps-recursive \ -+ tags-recursive uninstall-recursive -+am__can_run_installinfo = \ -+ case $$AM_UPDATE_INFO_DIR in \ -+ n|no|NO) false;; \ -+ *) (install-info --version) >/dev/null 2>&1;; \ -+ esac - RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ - distclean-recursive maintainer-clean-recursive --AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ -- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ -+am__recursive_targets = \ -+ $(RECURSIVE_TARGETS) \ -+ $(RECURSIVE_CLEAN_TARGETS) \ -+ $(am__extra_recursive_targets) -+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ - distdir -+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -+# Read a list of newline-separated strings from the standard input, -+# and print each of them once, without duplicates. Input order is -+# *not* preserved. -+am__uniquify_input = $(AWK) '\ -+ BEGIN { nonempty = 0; } \ -+ { items[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in items) print i; }; } \ -+' -+# Make sure the list of sources is unique. This is necessary because, -+# e.g., the same source file might be shared among _SOURCES variables -+# for different programs/libraries. -+am__define_uniq_tagged_files = \ -+ list='$(am__tagged_files)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | $(am__uniquify_input)` - ETAGS = etags - CTAGS = ctags - DIST_SUBDIRS = $(SUBDIRS) -@@ -94,6 +176,7 @@ am__relativize = \ - reldir="$$dir2" - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ -+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ -@@ -114,6 +197,7 @@ CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DISABLELIBHARU = @DISABLELIBHARU@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -141,6 +225,7 @@ LOCAL_INCS = @LOCAL_INCS@ - LOCAL_LIBS = @LOCAL_LIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - NM = @NM@ - NMEDIT = @NMEDIT@ -@@ -153,6 +238,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - POW_LIB = @POW_LIB@ -@@ -178,6 +264,7 @@ abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -@@ -211,7 +298,6 @@ libdir = @libdir@ - libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -@@ -273,22 +359,25 @@ clean-libtool: - -rm -rf .libs _libs - - # This directory's subdirectories are mostly independent; you can cd --# into them and run `make' without going through this Makefile. --# To change the values of `make' variables: instead of editing Makefiles, --# (1) if the variable is set in `config.status', edit `config.status' --# (which will cause the Makefiles to be regenerated when you run `make'); --# (2) otherwise, pass the desired values on the `make' command line. --$(RECURSIVE_TARGETS): -- @fail= failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -+# into them and run 'make' without going through this Makefile. -+# To change the values of 'make' variables: instead of editing Makefiles, -+# (1) if the variable is set in 'config.status', edit 'config.status' -+# (which will cause the Makefiles to be regenerated when you run 'make'); -+# (2) otherwise, pass the desired values on the 'make' command line. -+$(am__recursive_targets): -+ @fail=; \ -+ if $(am__make_keepgoing); then \ -+ failcom='fail=yes'; \ -+ else \ -+ failcom='exit 1'; \ -+ fi; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ -- list='$(SUBDIRS)'; for subdir in $$list; do \ -+ case "$@" in \ -+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -+ *) list='$(SUBDIRS)' ;; \ -+ esac; \ -+ for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ -@@ -303,57 +392,12 @@ $(RECURSIVE_TARGETS): - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - --$(RECURSIVE_CLEAN_TARGETS): -- @fail= failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -- dot_seen=no; \ -- case "$@" in \ -- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -- *) list='$(SUBDIRS)' ;; \ -- esac; \ -- rev=''; for subdir in $$list; do \ -- if test "$$subdir" = "."; then :; else \ -- rev="$$subdir $$rev"; \ -- fi; \ -- done; \ -- rev="$$rev ."; \ -- target=`echo $@ | sed s/-recursive//`; \ -- for subdir in $$rev; do \ -- echo "Making $$target in $$subdir"; \ -- if test "$$subdir" = "."; then \ -- local_target="$$target-am"; \ -- else \ -- local_target="$$target"; \ -- fi; \ -- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || eval $$failcom; \ -- done && test -z "$$fail" --tags-recursive: -- list='$(SUBDIRS)'; for subdir in $$list; do \ -- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ -- done --ctags-recursive: -- list='$(SUBDIRS)'; for subdir in $$list; do \ -- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ -- done -+ID: $(am__tagged_files) -+ $(am__define_uniq_tagged_files); mkid -fID $$unique -+tags: tags-recursive -+TAGS: tags - --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ - if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ -@@ -369,12 +413,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ -@@ -386,15 +425,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $$unique; \ - fi; \ - fi --ctags: CTAGS --CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ctags: ctags-recursive -+ -+CTAGS: ctags -+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) -+ $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique -@@ -403,6 +438,21 @@ GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -+cscopelist: cscopelist-recursive -+ -+cscopelist-am: $(am__tagged_files) -+ list='$(am__tagged_files)'; \ -+ case "$(srcdir)" in \ -+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ -+ *) sdir=$(subdir)/$(srcdir) ;; \ -+ esac; \ -+ for i in $$list; do \ -+ if test -f "$$i"; then \ -+ echo "$(subdir)/$$i"; \ -+ else \ -+ echo "$$sdir/$$i"; \ -+ fi; \ -+ done >> $(top_builddir)/cscope.files - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -@@ -439,13 +489,10 @@ distdir: $(DISTFILES) - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test -d "$(distdir)/$$subdir" \ -- || $(MKDIR_P) "$(distdir)/$$subdir" \ -- || exit 1; \ -- fi; \ -- done -- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ -- if test "$$subdir" = .; then :; else \ -+ $(am__make_dryrun) \ -+ || test -d "$(distdir)/$$subdir" \ -+ || $(MKDIR_P) "$(distdir)/$$subdir" \ -+ || exit 1; \ - dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ - $(am__relativize); \ - new_distdir=$$reldir; \ -@@ -480,10 +527,15 @@ install-am: all-am - - installcheck: installcheck-recursive - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+ if test -z '$(STRIP)'; then \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ install; \ -+ else \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -+ fi - mostlyclean-generic: - - clean-generic: -@@ -561,22 +613,20 @@ ps-am: - - uninstall-am: - --.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ -- install-am install-strip tags-recursive -- --.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ -- all all-am check check-am clean clean-generic clean-libtool \ -- ctags ctags-recursive distclean distclean-generic \ -- distclean-libtool distclean-tags distdir dvi dvi-am html \ -- html-am info info-am install install-am install-data \ -- install-data-am install-dvi install-dvi-am install-exec \ -- install-exec-am install-html install-html-am install-info \ -- install-info-am install-man install-pdf install-pdf-am \ -- install-ps install-ps-am install-strip installcheck \ -- installcheck-am installdirs installdirs-am maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-generic \ -- mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ -- uninstall uninstall-am -+.MAKE: $(am__recursive_targets) install-am install-strip -+ -+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ -+ check-am clean clean-generic clean-libtool cscopelist-am ctags \ -+ ctags-am distclean distclean-generic distclean-libtool \ -+ distclean-tags distdir dvi dvi-am html html-am info info-am \ -+ install install-am install-data install-data-am install-dvi \ -+ install-dvi-am install-exec install-exec-am install-html \ -+ install-html-am install-info install-info-am install-man \ -+ install-pdf install-pdf-am install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ installdirs-am maintainer-clean maintainer-clean-generic \ -+ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ -+ ps ps-am tags tags-am uninstall uninstall-am - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff --git a/src/modules_io/shapes/io_shapes/Makefile.in b/src/modules_io/shapes/io_shapes/Makefile.in -index a4bbdb2..97292e3 100644 ---- a/src/modules_io/shapes/io_shapes/Makefile.in -+++ b/src/modules_io/shapes/io_shapes/Makefile.in -@@ -1,9 +1,8 @@ --# Makefile.in generated by automake 1.11.1 from Makefile.am. -+# Makefile.in generated by automake 1.14 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, --# Inc. -+# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+ - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -16,6 +15,51 @@ - @SET_MAKE@ - - VPATH = @srcdir@ -+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -+am__make_running_with_option = \ -+ case $${target_option-} in \ -+ ?) ;; \ -+ *) echo "am__make_running_with_option: internal error: invalid" \ -+ "target option '$${target_option-}' specified" >&2; \ -+ exit 1;; \ -+ esac; \ -+ has_opt=no; \ -+ sane_makeflags=$$MAKEFLAGS; \ -+ if $(am__is_gnu_make); then \ -+ sane_makeflags=$$MFLAGS; \ -+ else \ -+ case $$MAKEFLAGS in \ -+ *\\[\ \ ]*) \ -+ bs=\\; \ -+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -+ esac; \ -+ fi; \ -+ skip_next=no; \ -+ strip_trailopt () \ -+ { \ -+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -+ }; \ -+ for flg in $$sane_makeflags; do \ -+ test $$skip_next = yes && { skip_next=no; continue; }; \ -+ case $$flg in \ -+ *=*|--*) continue;; \ -+ -*I) strip_trailopt 'I'; skip_next=yes;; \ -+ -*I?*) strip_trailopt 'I';; \ -+ -*O) strip_trailopt 'O'; skip_next=yes;; \ -+ -*O?*) strip_trailopt 'O';; \ -+ -*l) strip_trailopt 'l'; skip_next=yes;; \ -+ -*l?*) strip_trailopt 'l';; \ -+ -[dEDm]) skip_next=yes;; \ -+ -[JT]) skip_next=yes;; \ -+ esac; \ -+ case $$flg in \ -+ *$$target_option*) has_opt=yes; break;; \ -+ esac; \ -+ done; \ -+ test $$has_opt = yes -+am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -+am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -35,7 +79,8 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - subdir = src/modules_io/shapes/io_shapes --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ -+ $(top_srcdir)/depcomp - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ - $(top_srcdir)/m4/ax_python_devel.m4 \ -@@ -71,6 +116,12 @@ am__nobase_list = $(am__nobase_strip_setup); \ - am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -+am__uninstall_files_from_dir = { \ -+ test -z "$$files" \ -+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ -+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ -+ $(am__cd) "$$dir" && rm -f $$files; }; \ -+ } - am__installdirs = "$(DESTDIR)$(pkglibdir)" - LTLIBRARIES = $(pkglib_LTLIBRARIES) - libio_shapes_la_DEPENDENCIES = \ -@@ -80,35 +131,92 @@ am_libio_shapes_la_OBJECTS = atlas_bna.lo generate.lo gpx.lo gstat.lo \ - pointcloud_from_text_file.lo pointcloud_to_text_file.lo stl.lo \ - surfer_bln.lo svg.lo wasp_map.lo wktb.lo xyz.lo - libio_shapes_la_OBJECTS = $(am_libio_shapes_la_OBJECTS) -+AM_V_lt = $(am__v_lt_@AM_V@) -+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -+am__v_lt_0 = --silent -+am__v_lt_1 = -+AM_V_P = $(am__v_P_@AM_V@) -+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -+am__v_P_0 = false -+am__v_P_1 = : -+AM_V_GEN = $(am__v_GEN_@AM_V@) -+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+am__v_GEN_0 = @echo " GEN " $@; -+am__v_GEN_1 = -+AM_V_at = $(am__v_at_@AM_V@) -+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+am__v_at_0 = @ -+am__v_at_1 = - DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - am__mv = mv -f - CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) --LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CXXFLAGS) $(CXXFLAGS) -+AM_V_CXX = $(am__v_CXX_@AM_V@) -+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) -+am__v_CXX_0 = @echo " CXX " $@; -+am__v_CXX_1 = - CXXLD = $(CXX) --CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ -+ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) -+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) -+am__v_CXXLD_0 = @echo " CXXLD " $@; -+am__v_CXXLD_1 = - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CFLAGS) $(CFLAGS) -+AM_V_CC = $(am__v_CC_@AM_V@) -+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -+am__v_CC_0 = @echo " CC " $@; -+am__v_CC_1 = - CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CCLD = $(am__v_CCLD_@AM_V@) -+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -+am__v_CCLD_0 = @echo " CCLD " $@; -+am__v_CCLD_1 = - SOURCES = $(libio_shapes_la_SOURCES) - DIST_SOURCES = $(libio_shapes_la_SOURCES) -+am__can_run_installinfo = \ -+ case $$AM_UPDATE_INFO_DIR in \ -+ n|no|NO) false;; \ -+ *) (install-info --version) >/dev/null 2>&1;; \ -+ esac -+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -+# Read a list of newline-separated strings from the standard input, -+# and print each of them once, without duplicates. Input order is -+# *not* preserved. -+am__uniquify_input = $(AWK) '\ -+ BEGIN { nonempty = 0; } \ -+ { items[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in items) print i; }; } \ -+' -+# Make sure the list of sources is unique. This is necessary because, -+# e.g., the same source file might be shared among _SOURCES variables -+# for different programs/libraries. -+am__define_uniq_tagged_files = \ -+ list='$(am__tagged_files)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | $(am__uniquify_input)` - ETAGS = etags - CTAGS = ctags - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ -+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ -@@ -129,6 +237,7 @@ CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DISABLELIBHARU = @DISABLELIBHARU@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -156,6 +265,7 @@ LOCAL_INCS = @LOCAL_INCS@ - LOCAL_LIBS = @LOCAL_LIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - NM = @NM@ - NMEDIT = @NMEDIT@ -@@ -168,6 +278,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - POW_LIB = @POW_LIB@ -@@ -193,6 +304,7 @@ abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -@@ -226,7 +338,6 @@ libdir = @libdir@ - libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -@@ -326,9 +437,9 @@ $(top_srcdir)/configure: $(am__configure_deps) - $(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - $(am__aclocal_m4_deps): -+ - install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" - @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ - list2=; for p in $$list; do \ - if test -f $$p; then \ -@@ -336,6 +447,8 @@ install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - else :; fi; \ - done; \ - test -z "$$list2" || { \ -+ echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \ -+ $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \ - } -@@ -351,14 +464,17 @@ uninstall-pkglibLTLIBRARIES: - - clean-pkglibLTLIBRARIES: - -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES) -- @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \ -- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -- echo "rm -f \"$${dir}/so_locations\""; \ -- rm -f "$${dir}/so_locations"; \ -- done --libio_shapes.la: $(libio_shapes_la_OBJECTS) $(libio_shapes_la_DEPENDENCIES) -- $(CXXLINK) -rpath $(pkglibdir) $(libio_shapes_la_OBJECTS) $(libio_shapes_la_LIBADD) $(LIBS) -+ @list='$(pkglib_LTLIBRARIES)'; \ -+ locs=`for p in $$list; do echo $$p; done | \ -+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ -+ sort -u`; \ -+ test -z "$$locs" || { \ -+ echo rm -f $${locs}; \ -+ rm -f $${locs}; \ -+ } -+ -+libio_shapes.la: $(libio_shapes_la_OBJECTS) $(libio_shapes_la_DEPENDENCIES) $(EXTRA_libio_shapes_la_DEPENDENCIES) -+ $(AM_V_CXXLD)$(CXXLINK) -rpath $(pkglibdir) $(libio_shapes_la_OBJECTS) $(libio_shapes_la_LIBADD) $(LIBS) - - mostlyclean-compile: - -rm -f *.$(OBJEXT) -@@ -382,25 +498,25 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xyz.Plo@am__quote@ - - .cpp.o: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< - - .cpp.obj: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - - .cpp.lo: --@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< - - mostlyclean-libtool: - -rm -f *.lo -@@ -408,26 +524,15 @@ mostlyclean-libtool: - clean-libtool: - -rm -rf .libs _libs - --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -+ID: $(am__tagged_files) -+ $(am__define_uniq_tagged_files); mkid -fID $$unique -+tags: tags-am -+TAGS: tags -+ -+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ -@@ -439,15 +544,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $$unique; \ - fi; \ - fi --ctags: CTAGS --CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ctags: ctags-am -+ -+CTAGS: ctags -+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) -+ $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique -@@ -456,6 +557,21 @@ GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -+cscopelist: cscopelist-am -+ -+cscopelist-am: $(am__tagged_files) -+ list='$(am__tagged_files)'; \ -+ case "$(srcdir)" in \ -+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ -+ *) sdir=$(subdir)/$(srcdir) ;; \ -+ esac; \ -+ for i in $$list; do \ -+ if test -f "$$i"; then \ -+ echo "$(subdir)/$$i"; \ -+ else \ -+ echo "$$sdir/$$i"; \ -+ fi; \ -+ done >> $(top_builddir)/cscope.files - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -@@ -507,10 +623,15 @@ install-am: all-am - - installcheck: installcheck-am - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+ if test -z '$(STRIP)'; then \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ install; \ -+ else \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -+ fi - mostlyclean-generic: - - clean-generic: -@@ -595,19 +716,20 @@ uninstall-am: uninstall-pkglibLTLIBRARIES - - .MAKE: install-am install-strip - --.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ -- clean-libtool clean-pkglibLTLIBRARIES ctags distclean \ -- distclean-compile distclean-generic distclean-libtool \ -- distclean-tags distdir dvi dvi-am html html-am info info-am \ -- install install-am install-data install-data-am install-dvi \ -- install-dvi-am install-exec install-exec-am install-html \ -- install-html-am install-info install-info-am install-man \ -- install-pdf install-pdf-am install-pkglibLTLIBRARIES \ -- install-ps install-ps-am install-strip installcheck \ -- installcheck-am installdirs maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-compile \ -- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -- tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES -+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ -+ clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \ -+ ctags-am distclean distclean-compile distclean-generic \ -+ distclean-libtool distclean-tags distdir dvi dvi-am html \ -+ html-am info info-am install install-am install-data \ -+ install-data-am install-dvi install-dvi-am install-exec \ -+ install-exec-am install-html install-html-am install-info \ -+ install-info-am install-man install-pdf install-pdf-am \ -+ install-pkglibLTLIBRARIES install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ maintainer-clean maintainer-clean-generic mostlyclean \ -+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ -+ pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ -+ uninstall-pkglibLTLIBRARIES - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff --git a/src/modules_io/shapes/io_shapes_dxf/Makefile.in b/src/modules_io/shapes/io_shapes_dxf/Makefile.in -index e1845ee..36cc1ab 100644 ---- a/src/modules_io/shapes/io_shapes_dxf/Makefile.in -+++ b/src/modules_io/shapes/io_shapes_dxf/Makefile.in -@@ -1,9 +1,8 @@ --# Makefile.in generated by automake 1.11.1 from Makefile.am. -+# Makefile.in generated by automake 1.14 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, --# Inc. -+# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+ - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -16,6 +15,51 @@ - @SET_MAKE@ - - VPATH = @srcdir@ -+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -+am__make_running_with_option = \ -+ case $${target_option-} in \ -+ ?) ;; \ -+ *) echo "am__make_running_with_option: internal error: invalid" \ -+ "target option '$${target_option-}' specified" >&2; \ -+ exit 1;; \ -+ esac; \ -+ has_opt=no; \ -+ sane_makeflags=$$MAKEFLAGS; \ -+ if $(am__is_gnu_make); then \ -+ sane_makeflags=$$MFLAGS; \ -+ else \ -+ case $$MAKEFLAGS in \ -+ *\\[\ \ ]*) \ -+ bs=\\; \ -+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -+ esac; \ -+ fi; \ -+ skip_next=no; \ -+ strip_trailopt () \ -+ { \ -+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -+ }; \ -+ for flg in $$sane_makeflags; do \ -+ test $$skip_next = yes && { skip_next=no; continue; }; \ -+ case $$flg in \ -+ *=*|--*) continue;; \ -+ -*I) strip_trailopt 'I'; skip_next=yes;; \ -+ -*I?*) strip_trailopt 'I';; \ -+ -*O) strip_trailopt 'O'; skip_next=yes;; \ -+ -*O?*) strip_trailopt 'O';; \ -+ -*l) strip_trailopt 'l'; skip_next=yes;; \ -+ -*l?*) strip_trailopt 'l';; \ -+ -[dEDm]) skip_next=yes;; \ -+ -[JT]) skip_next=yes;; \ -+ esac; \ -+ case $$flg in \ -+ *$$target_option*) has_opt=yes; break;; \ -+ esac; \ -+ done; \ -+ test $$has_opt = yes -+am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -+am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -35,7 +79,8 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - subdir = src/modules_io/shapes/io_shapes_dxf --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ -+ $(top_srcdir)/depcomp - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ - $(top_srcdir)/m4/ax_python_devel.m4 \ -@@ -71,6 +116,12 @@ am__nobase_list = $(am__nobase_strip_setup); \ - am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -+am__uninstall_files_from_dir = { \ -+ test -z "$$files" \ -+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ -+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ -+ $(am__cd) "$$dir" && rm -f $$files; }; \ -+ } - am__installdirs = "$(DESTDIR)$(pkglibdir)" - LTLIBRARIES = $(pkglib_LTLIBRARIES) - libio_shapes_dxf_la_DEPENDENCIES = \ -@@ -78,35 +129,92 @@ libio_shapes_dxf_la_DEPENDENCIES = \ - am_libio_shapes_dxf_la_OBJECTS = dxf_import.lo MLB_Interface.lo \ - dl_dxf.lo dl_writer_ascii.lo - libio_shapes_dxf_la_OBJECTS = $(am_libio_shapes_dxf_la_OBJECTS) -+AM_V_lt = $(am__v_lt_@AM_V@) -+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -+am__v_lt_0 = --silent -+am__v_lt_1 = -+AM_V_P = $(am__v_P_@AM_V@) -+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -+am__v_P_0 = false -+am__v_P_1 = : -+AM_V_GEN = $(am__v_GEN_@AM_V@) -+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+am__v_GEN_0 = @echo " GEN " $@; -+am__v_GEN_1 = -+AM_V_at = $(am__v_at_@AM_V@) -+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+am__v_at_0 = @ -+am__v_at_1 = - DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - am__mv = mv -f - CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) --LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CXXFLAGS) $(CXXFLAGS) -+AM_V_CXX = $(am__v_CXX_@AM_V@) -+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) -+am__v_CXX_0 = @echo " CXX " $@; -+am__v_CXX_1 = - CXXLD = $(CXX) --CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ -+ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) -+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) -+am__v_CXXLD_0 = @echo " CXXLD " $@; -+am__v_CXXLD_1 = - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CFLAGS) $(CFLAGS) -+AM_V_CC = $(am__v_CC_@AM_V@) -+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -+am__v_CC_0 = @echo " CC " $@; -+am__v_CC_1 = - CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CCLD = $(am__v_CCLD_@AM_V@) -+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -+am__v_CCLD_0 = @echo " CCLD " $@; -+am__v_CCLD_1 = - SOURCES = $(libio_shapes_dxf_la_SOURCES) - DIST_SOURCES = $(libio_shapes_dxf_la_SOURCES) -+am__can_run_installinfo = \ -+ case $$AM_UPDATE_INFO_DIR in \ -+ n|no|NO) false;; \ -+ *) (install-info --version) >/dev/null 2>&1;; \ -+ esac -+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -+# Read a list of newline-separated strings from the standard input, -+# and print each of them once, without duplicates. Input order is -+# *not* preserved. -+am__uniquify_input = $(AWK) '\ -+ BEGIN { nonempty = 0; } \ -+ { items[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in items) print i; }; } \ -+' -+# Make sure the list of sources is unique. This is necessary because, -+# e.g., the same source file might be shared among _SOURCES variables -+# for different programs/libraries. -+am__define_uniq_tagged_files = \ -+ list='$(am__tagged_files)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | $(am__uniquify_input)` - ETAGS = etags - CTAGS = ctags - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ -+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ -@@ -127,6 +235,7 @@ CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DISABLELIBHARU = @DISABLELIBHARU@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -154,6 +263,7 @@ LOCAL_INCS = @LOCAL_INCS@ - LOCAL_LIBS = @LOCAL_LIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - NM = @NM@ - NMEDIT = @NMEDIT@ -@@ -166,6 +276,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - POW_LIB = @POW_LIB@ -@@ -191,6 +302,7 @@ abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -@@ -224,7 +336,6 @@ libdir = @libdir@ - libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -@@ -308,9 +419,9 @@ $(top_srcdir)/configure: $(am__configure_deps) - $(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - $(am__aclocal_m4_deps): -+ - install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" - @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ - list2=; for p in $$list; do \ - if test -f $$p; then \ -@@ -318,6 +429,8 @@ install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - else :; fi; \ - done; \ - test -z "$$list2" || { \ -+ echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \ -+ $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \ - } -@@ -333,14 +446,17 @@ uninstall-pkglibLTLIBRARIES: - - clean-pkglibLTLIBRARIES: - -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES) -- @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \ -- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -- echo "rm -f \"$${dir}/so_locations\""; \ -- rm -f "$${dir}/so_locations"; \ -- done --libio_shapes_dxf.la: $(libio_shapes_dxf_la_OBJECTS) $(libio_shapes_dxf_la_DEPENDENCIES) -- $(CXXLINK) -rpath $(pkglibdir) $(libio_shapes_dxf_la_OBJECTS) $(libio_shapes_dxf_la_LIBADD) $(LIBS) -+ @list='$(pkglib_LTLIBRARIES)'; \ -+ locs=`for p in $$list; do echo $$p; done | \ -+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ -+ sort -u`; \ -+ test -z "$$locs" || { \ -+ echo rm -f $${locs}; \ -+ rm -f $${locs}; \ -+ } -+ -+libio_shapes_dxf.la: $(libio_shapes_dxf_la_OBJECTS) $(libio_shapes_dxf_la_DEPENDENCIES) $(EXTRA_libio_shapes_dxf_la_DEPENDENCIES) -+ $(AM_V_CXXLD)$(CXXLINK) -rpath $(pkglibdir) $(libio_shapes_dxf_la_OBJECTS) $(libio_shapes_dxf_la_LIBADD) $(LIBS) - - mostlyclean-compile: - -rm -f *.$(OBJEXT) -@@ -354,39 +470,39 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dxf_import.Plo@am__quote@ - - .cpp.o: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< - - .cpp.obj: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - - .cpp.lo: --@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< - - dl_dxf.lo: ./dxflib/dl_dxf.cpp --@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT dl_dxf.lo -MD -MP -MF $(DEPDIR)/dl_dxf.Tpo -c -o dl_dxf.lo `test -f './dxflib/dl_dxf.cpp' || echo '$(srcdir)/'`./dxflib/dl_dxf.cpp --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/dl_dxf.Tpo $(DEPDIR)/dl_dxf.Plo --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='./dxflib/dl_dxf.cpp' object='dl_dxf.lo' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT dl_dxf.lo -MD -MP -MF $(DEPDIR)/dl_dxf.Tpo -c -o dl_dxf.lo `test -f './dxflib/dl_dxf.cpp' || echo '$(srcdir)/'`./dxflib/dl_dxf.cpp -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/dl_dxf.Tpo $(DEPDIR)/dl_dxf.Plo -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='./dxflib/dl_dxf.cpp' object='dl_dxf.lo' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o dl_dxf.lo `test -f './dxflib/dl_dxf.cpp' || echo '$(srcdir)/'`./dxflib/dl_dxf.cpp -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o dl_dxf.lo `test -f './dxflib/dl_dxf.cpp' || echo '$(srcdir)/'`./dxflib/dl_dxf.cpp - - dl_writer_ascii.lo: ./dxflib/dl_writer_ascii.cpp --@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT dl_writer_ascii.lo -MD -MP -MF $(DEPDIR)/dl_writer_ascii.Tpo -c -o dl_writer_ascii.lo `test -f './dxflib/dl_writer_ascii.cpp' || echo '$(srcdir)/'`./dxflib/dl_writer_ascii.cpp --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/dl_writer_ascii.Tpo $(DEPDIR)/dl_writer_ascii.Plo --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='./dxflib/dl_writer_ascii.cpp' object='dl_writer_ascii.lo' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT dl_writer_ascii.lo -MD -MP -MF $(DEPDIR)/dl_writer_ascii.Tpo -c -o dl_writer_ascii.lo `test -f './dxflib/dl_writer_ascii.cpp' || echo '$(srcdir)/'`./dxflib/dl_writer_ascii.cpp -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/dl_writer_ascii.Tpo $(DEPDIR)/dl_writer_ascii.Plo -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='./dxflib/dl_writer_ascii.cpp' object='dl_writer_ascii.lo' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o dl_writer_ascii.lo `test -f './dxflib/dl_writer_ascii.cpp' || echo '$(srcdir)/'`./dxflib/dl_writer_ascii.cpp -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o dl_writer_ascii.lo `test -f './dxflib/dl_writer_ascii.cpp' || echo '$(srcdir)/'`./dxflib/dl_writer_ascii.cpp - - mostlyclean-libtool: - -rm -f *.lo -@@ -394,26 +510,15 @@ mostlyclean-libtool: - clean-libtool: - -rm -rf .libs _libs - --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -+ID: $(am__tagged_files) -+ $(am__define_uniq_tagged_files); mkid -fID $$unique -+tags: tags-am -+TAGS: tags -+ -+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ -@@ -425,15 +530,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $$unique; \ - fi; \ - fi --ctags: CTAGS --CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ctags: ctags-am -+ -+CTAGS: ctags -+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) -+ $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique -@@ -442,6 +543,21 @@ GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -+cscopelist: cscopelist-am -+ -+cscopelist-am: $(am__tagged_files) -+ list='$(am__tagged_files)'; \ -+ case "$(srcdir)" in \ -+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ -+ *) sdir=$(subdir)/$(srcdir) ;; \ -+ esac; \ -+ for i in $$list; do \ -+ if test -f "$$i"; then \ -+ echo "$(subdir)/$$i"; \ -+ else \ -+ echo "$$sdir/$$i"; \ -+ fi; \ -+ done >> $(top_builddir)/cscope.files - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -@@ -493,10 +609,15 @@ install-am: all-am - - installcheck: installcheck-am - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+ if test -z '$(STRIP)'; then \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ install; \ -+ else \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -+ fi - mostlyclean-generic: - - clean-generic: -@@ -581,19 +702,20 @@ uninstall-am: uninstall-pkglibLTLIBRARIES - - .MAKE: install-am install-strip - --.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ -- clean-libtool clean-pkglibLTLIBRARIES ctags distclean \ -- distclean-compile distclean-generic distclean-libtool \ -- distclean-tags distdir dvi dvi-am html html-am info info-am \ -- install install-am install-data install-data-am install-dvi \ -- install-dvi-am install-exec install-exec-am install-html \ -- install-html-am install-info install-info-am install-man \ -- install-pdf install-pdf-am install-pkglibLTLIBRARIES \ -- install-ps install-ps-am install-strip installcheck \ -- installcheck-am installdirs maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-compile \ -- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -- tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES -+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ -+ clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \ -+ ctags-am distclean distclean-compile distclean-generic \ -+ distclean-libtool distclean-tags distdir dvi dvi-am html \ -+ html-am info info-am install install-am install-data \ -+ install-data-am install-dvi install-dvi-am install-exec \ -+ install-exec-am install-html install-html-am install-info \ -+ install-info-am install-man install-pdf install-pdf-am \ -+ install-pkglibLTLIBRARIES install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ maintainer-clean maintainer-clean-generic mostlyclean \ -+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ -+ pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ -+ uninstall-pkglibLTLIBRARIES - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff --git a/src/modules_io/shapes/io_shapes_las/Makefile.in b/src/modules_io/shapes/io_shapes_las/Makefile.in -index 71d4a56..78e6384 100644 ---- a/src/modules_io/shapes/io_shapes_las/Makefile.in -+++ b/src/modules_io/shapes/io_shapes_las/Makefile.in -@@ -1,9 +1,8 @@ --# Makefile.in generated by automake 1.11.1 from Makefile.am. -+# Makefile.in generated by automake 1.14 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, --# Inc. -+# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+ - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -16,6 +15,51 @@ - @SET_MAKE@ - - VPATH = @srcdir@ -+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -+am__make_running_with_option = \ -+ case $${target_option-} in \ -+ ?) ;; \ -+ *) echo "am__make_running_with_option: internal error: invalid" \ -+ "target option '$${target_option-}' specified" >&2; \ -+ exit 1;; \ -+ esac; \ -+ has_opt=no; \ -+ sane_makeflags=$$MAKEFLAGS; \ -+ if $(am__is_gnu_make); then \ -+ sane_makeflags=$$MFLAGS; \ -+ else \ -+ case $$MAKEFLAGS in \ -+ *\\[\ \ ]*) \ -+ bs=\\; \ -+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -+ esac; \ -+ fi; \ -+ skip_next=no; \ -+ strip_trailopt () \ -+ { \ -+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -+ }; \ -+ for flg in $$sane_makeflags; do \ -+ test $$skip_next = yes && { skip_next=no; continue; }; \ -+ case $$flg in \ -+ *=*|--*) continue;; \ -+ -*I) strip_trailopt 'I'; skip_next=yes;; \ -+ -*I?*) strip_trailopt 'I';; \ -+ -*O) strip_trailopt 'O'; skip_next=yes;; \ -+ -*O?*) strip_trailopt 'O';; \ -+ -*l) strip_trailopt 'l'; skip_next=yes;; \ -+ -*l?*) strip_trailopt 'l';; \ -+ -[dEDm]) skip_next=yes;; \ -+ -[JT]) skip_next=yes;; \ -+ esac; \ -+ case $$flg in \ -+ *$$target_option*) has_opt=yes; break;; \ -+ esac; \ -+ done; \ -+ test $$has_opt = yes -+am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -+am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -35,7 +79,8 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - subdir = src/modules_io/shapes/io_shapes_las --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ -+ $(top_srcdir)/depcomp - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ - $(top_srcdir)/m4/ax_python_devel.m4 \ -@@ -71,6 +116,12 @@ am__nobase_list = $(am__nobase_strip_setup); \ - am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -+am__uninstall_files_from_dir = { \ -+ test -z "$$files" \ -+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ -+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ -+ $(am__cd) "$$dir" && rm -f $$files; }; \ -+ } - am__installdirs = "$(DESTDIR)$(pkglibdir)" - LTLIBRARIES = $(pkglib_LTLIBRARIES) - @HAVE_LLAS_TRUE@libio_shapes_las_la_DEPENDENCIES = $(top_srcdir)/src/saga_core/saga_api/libsaga_api.la -@@ -80,36 +131,93 @@ am__libio_shapes_las_la_SOURCES_DIST = las_export.cpp las_import.cpp \ - @HAVE_LLAS_TRUE@am_libio_shapes_las_la_OBJECTS = las_export.lo \ - @HAVE_LLAS_TRUE@ las_import.lo las_info.lo MLB_Interface.lo - libio_shapes_las_la_OBJECTS = $(am_libio_shapes_las_la_OBJECTS) -+AM_V_lt = $(am__v_lt_@AM_V@) -+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -+am__v_lt_0 = --silent -+am__v_lt_1 = - @HAVE_LLAS_TRUE@am_libio_shapes_las_la_rpath = -rpath $(pkglibdir) -+AM_V_P = $(am__v_P_@AM_V@) -+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -+am__v_P_0 = false -+am__v_P_1 = : -+AM_V_GEN = $(am__v_GEN_@AM_V@) -+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+am__v_GEN_0 = @echo " GEN " $@; -+am__v_GEN_1 = -+AM_V_at = $(am__v_at_@AM_V@) -+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+am__v_at_0 = @ -+am__v_at_1 = - DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - am__mv = mv -f - CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) --LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CXXFLAGS) $(CXXFLAGS) -+AM_V_CXX = $(am__v_CXX_@AM_V@) -+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) -+am__v_CXX_0 = @echo " CXX " $@; -+am__v_CXX_1 = - CXXLD = $(CXX) --CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ -+ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) -+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) -+am__v_CXXLD_0 = @echo " CXXLD " $@; -+am__v_CXXLD_1 = - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CFLAGS) $(CFLAGS) -+AM_V_CC = $(am__v_CC_@AM_V@) -+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -+am__v_CC_0 = @echo " CC " $@; -+am__v_CC_1 = - CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CCLD = $(am__v_CCLD_@AM_V@) -+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -+am__v_CCLD_0 = @echo " CCLD " $@; -+am__v_CCLD_1 = - SOURCES = $(libio_shapes_las_la_SOURCES) - DIST_SOURCES = $(am__libio_shapes_las_la_SOURCES_DIST) -+am__can_run_installinfo = \ -+ case $$AM_UPDATE_INFO_DIR in \ -+ n|no|NO) false;; \ -+ *) (install-info --version) >/dev/null 2>&1;; \ -+ esac -+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -+# Read a list of newline-separated strings from the standard input, -+# and print each of them once, without duplicates. Input order is -+# *not* preserved. -+am__uniquify_input = $(AWK) '\ -+ BEGIN { nonempty = 0; } \ -+ { items[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in items) print i; }; } \ -+' -+# Make sure the list of sources is unique. This is necessary because, -+# e.g., the same source file might be shared among _SOURCES variables -+# for different programs/libraries. -+am__define_uniq_tagged_files = \ -+ list='$(am__tagged_files)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | $(am__uniquify_input)` - ETAGS = etags - CTAGS = ctags - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ -+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ -@@ -130,6 +238,7 @@ CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DISABLELIBHARU = @DISABLELIBHARU@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -157,6 +266,7 @@ LOCAL_INCS = @LOCAL_INCS@ - LOCAL_LIBS = @LOCAL_LIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - NM = @NM@ - NMEDIT = @NMEDIT@ -@@ -169,6 +279,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - POW_LIB = @POW_LIB@ -@@ -194,6 +305,7 @@ abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -@@ -227,7 +339,6 @@ libdir = @libdir@ - libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -@@ -304,9 +415,9 @@ $(top_srcdir)/configure: $(am__configure_deps) - $(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - $(am__aclocal_m4_deps): -+ - install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" - @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ - list2=; for p in $$list; do \ - if test -f $$p; then \ -@@ -314,6 +425,8 @@ install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - else :; fi; \ - done; \ - test -z "$$list2" || { \ -+ echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \ -+ $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \ - } -@@ -329,14 +442,17 @@ uninstall-pkglibLTLIBRARIES: - - clean-pkglibLTLIBRARIES: - -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES) -- @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \ -- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -- echo "rm -f \"$${dir}/so_locations\""; \ -- rm -f "$${dir}/so_locations"; \ -- done --libio_shapes_las.la: $(libio_shapes_las_la_OBJECTS) $(libio_shapes_las_la_DEPENDENCIES) -- $(CXXLINK) $(am_libio_shapes_las_la_rpath) $(libio_shapes_las_la_OBJECTS) $(libio_shapes_las_la_LIBADD) $(LIBS) -+ @list='$(pkglib_LTLIBRARIES)'; \ -+ locs=`for p in $$list; do echo $$p; done | \ -+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ -+ sort -u`; \ -+ test -z "$$locs" || { \ -+ echo rm -f $${locs}; \ -+ rm -f $${locs}; \ -+ } -+ -+libio_shapes_las.la: $(libio_shapes_las_la_OBJECTS) $(libio_shapes_las_la_DEPENDENCIES) $(EXTRA_libio_shapes_las_la_DEPENDENCIES) -+ $(AM_V_CXXLD)$(CXXLINK) $(am_libio_shapes_las_la_rpath) $(libio_shapes_las_la_OBJECTS) $(libio_shapes_las_la_LIBADD) $(LIBS) - - mostlyclean-compile: - -rm -f *.$(OBJEXT) -@@ -350,25 +466,25 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/las_info.Plo@am__quote@ - - .cpp.o: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< - - .cpp.obj: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - - .cpp.lo: --@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< - - mostlyclean-libtool: - -rm -f *.lo -@@ -376,26 +492,15 @@ mostlyclean-libtool: - clean-libtool: - -rm -rf .libs _libs - --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -+ID: $(am__tagged_files) -+ $(am__define_uniq_tagged_files); mkid -fID $$unique -+tags: tags-am -+TAGS: tags -+ -+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ -@@ -407,15 +512,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $$unique; \ - fi; \ - fi --ctags: CTAGS --CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ctags: ctags-am -+ -+CTAGS: ctags -+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) -+ $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique -@@ -424,6 +525,21 @@ GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -+cscopelist: cscopelist-am -+ -+cscopelist-am: $(am__tagged_files) -+ list='$(am__tagged_files)'; \ -+ case "$(srcdir)" in \ -+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ -+ *) sdir=$(subdir)/$(srcdir) ;; \ -+ esac; \ -+ for i in $$list; do \ -+ if test -f "$$i"; then \ -+ echo "$(subdir)/$$i"; \ -+ else \ -+ echo "$$sdir/$$i"; \ -+ fi; \ -+ done >> $(top_builddir)/cscope.files - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -@@ -475,10 +591,15 @@ install-am: all-am - - installcheck: installcheck-am - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+ if test -z '$(STRIP)'; then \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ install; \ -+ else \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -+ fi - mostlyclean-generic: - - clean-generic: -@@ -563,19 +684,20 @@ uninstall-am: uninstall-pkglibLTLIBRARIES - - .MAKE: install-am install-strip - --.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ -- clean-libtool clean-pkglibLTLIBRARIES ctags distclean \ -- distclean-compile distclean-generic distclean-libtool \ -- distclean-tags distdir dvi dvi-am html html-am info info-am \ -- install install-am install-data install-data-am install-dvi \ -- install-dvi-am install-exec install-exec-am install-html \ -- install-html-am install-info install-info-am install-man \ -- install-pdf install-pdf-am install-pkglibLTLIBRARIES \ -- install-ps install-ps-am install-strip installcheck \ -- installcheck-am installdirs maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-compile \ -- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -- tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES -+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ -+ clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \ -+ ctags-am distclean distclean-compile distclean-generic \ -+ distclean-libtool distclean-tags distdir dvi dvi-am html \ -+ html-am info info-am install install-am install-data \ -+ install-data-am install-dvi install-dvi-am install-exec \ -+ install-exec-am install-html install-html-am install-info \ -+ install-info-am install-man install-pdf install-pdf-am \ -+ install-pkglibLTLIBRARIES install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ maintainer-clean maintainer-clean-generic mostlyclean \ -+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ -+ pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ -+ uninstall-pkglibLTLIBRARIES - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff --git a/src/modules_io/table/Makefile.in b/src/modules_io/table/Makefile.in -index 0369a5a..838af73 100644 ---- a/src/modules_io/table/Makefile.in -+++ b/src/modules_io/table/Makefile.in -@@ -1,9 +1,8 @@ --# Makefile.in generated by automake 1.11.1 from Makefile.am. -+# Makefile.in generated by automake 1.14 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, --# Inc. -+# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+ - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -15,6 +14,51 @@ - - @SET_MAKE@ - VPATH = @srcdir@ -+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -+am__make_running_with_option = \ -+ case $${target_option-} in \ -+ ?) ;; \ -+ *) echo "am__make_running_with_option: internal error: invalid" \ -+ "target option '$${target_option-}' specified" >&2; \ -+ exit 1;; \ -+ esac; \ -+ has_opt=no; \ -+ sane_makeflags=$$MAKEFLAGS; \ -+ if $(am__is_gnu_make); then \ -+ sane_makeflags=$$MFLAGS; \ -+ else \ -+ case $$MAKEFLAGS in \ -+ *\\[\ \ ]*) \ -+ bs=\\; \ -+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -+ esac; \ -+ fi; \ -+ skip_next=no; \ -+ strip_trailopt () \ -+ { \ -+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -+ }; \ -+ for flg in $$sane_makeflags; do \ -+ test $$skip_next = yes && { skip_next=no; continue; }; \ -+ case $$flg in \ -+ *=*|--*) continue;; \ -+ -*I) strip_trailopt 'I'; skip_next=yes;; \ -+ -*I?*) strip_trailopt 'I';; \ -+ -*O) strip_trailopt 'O'; skip_next=yes;; \ -+ -*O?*) strip_trailopt 'O';; \ -+ -*l) strip_trailopt 'l'; skip_next=yes;; \ -+ -*l?*) strip_trailopt 'l';; \ -+ -[dEDm]) skip_next=yes;; \ -+ -[JT]) skip_next=yes;; \ -+ esac; \ -+ case $$flg in \ -+ *$$target_option*) has_opt=yes; break;; \ -+ esac; \ -+ done; \ -+ test $$has_opt = yes -+am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -+am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -34,7 +78,7 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - subdir = src/modules_io/table --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ - $(top_srcdir)/m4/ax_python_devel.m4 \ -@@ -49,20 +93,58 @@ mkinstalldirs = $(install_sh) -d - CONFIG_HEADER = $(top_builddir)/config.h - CONFIG_CLEAN_FILES = - CONFIG_CLEAN_VPATH_FILES = -+AM_V_P = $(am__v_P_@AM_V@) -+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -+am__v_P_0 = false -+am__v_P_1 = : -+AM_V_GEN = $(am__v_GEN_@AM_V@) -+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+am__v_GEN_0 = @echo " GEN " $@; -+am__v_GEN_1 = -+AM_V_at = $(am__v_at_@AM_V@) -+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+am__v_at_0 = @ -+am__v_at_1 = - SOURCES = - DIST_SOURCES = --RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ -- html-recursive info-recursive install-data-recursive \ -- install-dvi-recursive install-exec-recursive \ -- install-html-recursive install-info-recursive \ -- install-pdf-recursive install-ps-recursive install-recursive \ -- installcheck-recursive installdirs-recursive pdf-recursive \ -- ps-recursive uninstall-recursive -+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ -+ ctags-recursive dvi-recursive html-recursive info-recursive \ -+ install-data-recursive install-dvi-recursive \ -+ install-exec-recursive install-html-recursive \ -+ install-info-recursive install-pdf-recursive \ -+ install-ps-recursive install-recursive installcheck-recursive \ -+ installdirs-recursive pdf-recursive ps-recursive \ -+ tags-recursive uninstall-recursive -+am__can_run_installinfo = \ -+ case $$AM_UPDATE_INFO_DIR in \ -+ n|no|NO) false;; \ -+ *) (install-info --version) >/dev/null 2>&1;; \ -+ esac - RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ - distclean-recursive maintainer-clean-recursive --AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ -- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ -+am__recursive_targets = \ -+ $(RECURSIVE_TARGETS) \ -+ $(RECURSIVE_CLEAN_TARGETS) \ -+ $(am__extra_recursive_targets) -+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ - distdir -+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -+# Read a list of newline-separated strings from the standard input, -+# and print each of them once, without duplicates. Input order is -+# *not* preserved. -+am__uniquify_input = $(AWK) '\ -+ BEGIN { nonempty = 0; } \ -+ { items[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in items) print i; }; } \ -+' -+# Make sure the list of sources is unique. This is necessary because, -+# e.g., the same source file might be shared among _SOURCES variables -+# for different programs/libraries. -+am__define_uniq_tagged_files = \ -+ list='$(am__tagged_files)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | $(am__uniquify_input)` - ETAGS = etags - CTAGS = ctags - DIST_SUBDIRS = $(SUBDIRS) -@@ -94,6 +176,7 @@ am__relativize = \ - reldir="$$dir2" - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ -+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ -@@ -114,6 +197,7 @@ CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DISABLELIBHARU = @DISABLELIBHARU@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -141,6 +225,7 @@ LOCAL_INCS = @LOCAL_INCS@ - LOCAL_LIBS = @LOCAL_LIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - NM = @NM@ - NMEDIT = @NMEDIT@ -@@ -153,6 +238,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - POW_LIB = @POW_LIB@ -@@ -178,6 +264,7 @@ abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -@@ -211,7 +298,6 @@ libdir = @libdir@ - libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -@@ -273,22 +359,25 @@ clean-libtool: - -rm -rf .libs _libs - - # This directory's subdirectories are mostly independent; you can cd --# into them and run `make' without going through this Makefile. --# To change the values of `make' variables: instead of editing Makefiles, --# (1) if the variable is set in `config.status', edit `config.status' --# (which will cause the Makefiles to be regenerated when you run `make'); --# (2) otherwise, pass the desired values on the `make' command line. --$(RECURSIVE_TARGETS): -- @fail= failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -+# into them and run 'make' without going through this Makefile. -+# To change the values of 'make' variables: instead of editing Makefiles, -+# (1) if the variable is set in 'config.status', edit 'config.status' -+# (which will cause the Makefiles to be regenerated when you run 'make'); -+# (2) otherwise, pass the desired values on the 'make' command line. -+$(am__recursive_targets): -+ @fail=; \ -+ if $(am__make_keepgoing); then \ -+ failcom='fail=yes'; \ -+ else \ -+ failcom='exit 1'; \ -+ fi; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ -- list='$(SUBDIRS)'; for subdir in $$list; do \ -+ case "$@" in \ -+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -+ *) list='$(SUBDIRS)' ;; \ -+ esac; \ -+ for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ -@@ -303,57 +392,12 @@ $(RECURSIVE_TARGETS): - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - --$(RECURSIVE_CLEAN_TARGETS): -- @fail= failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -- dot_seen=no; \ -- case "$@" in \ -- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -- *) list='$(SUBDIRS)' ;; \ -- esac; \ -- rev=''; for subdir in $$list; do \ -- if test "$$subdir" = "."; then :; else \ -- rev="$$subdir $$rev"; \ -- fi; \ -- done; \ -- rev="$$rev ."; \ -- target=`echo $@ | sed s/-recursive//`; \ -- for subdir in $$rev; do \ -- echo "Making $$target in $$subdir"; \ -- if test "$$subdir" = "."; then \ -- local_target="$$target-am"; \ -- else \ -- local_target="$$target"; \ -- fi; \ -- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || eval $$failcom; \ -- done && test -z "$$fail" --tags-recursive: -- list='$(SUBDIRS)'; for subdir in $$list; do \ -- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ -- done --ctags-recursive: -- list='$(SUBDIRS)'; for subdir in $$list; do \ -- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ -- done -+ID: $(am__tagged_files) -+ $(am__define_uniq_tagged_files); mkid -fID $$unique -+tags: tags-recursive -+TAGS: tags - --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ - if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ -@@ -369,12 +413,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ -@@ -386,15 +425,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $$unique; \ - fi; \ - fi --ctags: CTAGS --CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ctags: ctags-recursive -+ -+CTAGS: ctags -+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) -+ $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique -@@ -403,6 +438,21 @@ GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -+cscopelist: cscopelist-recursive -+ -+cscopelist-am: $(am__tagged_files) -+ list='$(am__tagged_files)'; \ -+ case "$(srcdir)" in \ -+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ -+ *) sdir=$(subdir)/$(srcdir) ;; \ -+ esac; \ -+ for i in $$list; do \ -+ if test -f "$$i"; then \ -+ echo "$(subdir)/$$i"; \ -+ else \ -+ echo "$$sdir/$$i"; \ -+ fi; \ -+ done >> $(top_builddir)/cscope.files - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -@@ -439,13 +489,10 @@ distdir: $(DISTFILES) - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test -d "$(distdir)/$$subdir" \ -- || $(MKDIR_P) "$(distdir)/$$subdir" \ -- || exit 1; \ -- fi; \ -- done -- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ -- if test "$$subdir" = .; then :; else \ -+ $(am__make_dryrun) \ -+ || test -d "$(distdir)/$$subdir" \ -+ || $(MKDIR_P) "$(distdir)/$$subdir" \ -+ || exit 1; \ - dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ - $(am__relativize); \ - new_distdir=$$reldir; \ -@@ -480,10 +527,15 @@ install-am: all-am - - installcheck: installcheck-recursive - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+ if test -z '$(STRIP)'; then \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ install; \ -+ else \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -+ fi - mostlyclean-generic: - - clean-generic: -@@ -561,22 +613,20 @@ ps-am: - - uninstall-am: - --.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ -- install-am install-strip tags-recursive -- --.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ -- all all-am check check-am clean clean-generic clean-libtool \ -- ctags ctags-recursive distclean distclean-generic \ -- distclean-libtool distclean-tags distdir dvi dvi-am html \ -- html-am info info-am install install-am install-data \ -- install-data-am install-dvi install-dvi-am install-exec \ -- install-exec-am install-html install-html-am install-info \ -- install-info-am install-man install-pdf install-pdf-am \ -- install-ps install-ps-am install-strip installcheck \ -- installcheck-am installdirs installdirs-am maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-generic \ -- mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ -- uninstall uninstall-am -+.MAKE: $(am__recursive_targets) install-am install-strip -+ -+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ -+ check-am clean clean-generic clean-libtool cscopelist-am ctags \ -+ ctags-am distclean distclean-generic distclean-libtool \ -+ distclean-tags distdir dvi dvi-am html html-am info info-am \ -+ install install-am install-data install-data-am install-dvi \ -+ install-dvi-am install-exec install-exec-am install-html \ -+ install-html-am install-info install-info-am install-man \ -+ install-pdf install-pdf-am install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ installdirs-am maintainer-clean maintainer-clean-generic \ -+ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ -+ ps ps-am tags tags-am uninstall uninstall-am - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff --git a/src/modules_io/table/io_table/Makefile.in b/src/modules_io/table/io_table/Makefile.in -index 68d1b82..4c60616 100644 ---- a/src/modules_io/table/io_table/Makefile.in -+++ b/src/modules_io/table/io_table/Makefile.in -@@ -1,9 +1,8 @@ --# Makefile.in generated by automake 1.11.1 from Makefile.am. -+# Makefile.in generated by automake 1.14 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, --# Inc. -+# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+ - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -16,6 +15,51 @@ - @SET_MAKE@ - - VPATH = @srcdir@ -+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -+am__make_running_with_option = \ -+ case $${target_option-} in \ -+ ?) ;; \ -+ *) echo "am__make_running_with_option: internal error: invalid" \ -+ "target option '$${target_option-}' specified" >&2; \ -+ exit 1;; \ -+ esac; \ -+ has_opt=no; \ -+ sane_makeflags=$$MAKEFLAGS; \ -+ if $(am__is_gnu_make); then \ -+ sane_makeflags=$$MFLAGS; \ -+ else \ -+ case $$MAKEFLAGS in \ -+ *\\[\ \ ]*) \ -+ bs=\\; \ -+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -+ esac; \ -+ fi; \ -+ skip_next=no; \ -+ strip_trailopt () \ -+ { \ -+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -+ }; \ -+ for flg in $$sane_makeflags; do \ -+ test $$skip_next = yes && { skip_next=no; continue; }; \ -+ case $$flg in \ -+ *=*|--*) continue;; \ -+ -*I) strip_trailopt 'I'; skip_next=yes;; \ -+ -*I?*) strip_trailopt 'I';; \ -+ -*O) strip_trailopt 'O'; skip_next=yes;; \ -+ -*O?*) strip_trailopt 'O';; \ -+ -*l) strip_trailopt 'l'; skip_next=yes;; \ -+ -*l?*) strip_trailopt 'l';; \ -+ -[dEDm]) skip_next=yes;; \ -+ -[JT]) skip_next=yes;; \ -+ esac; \ -+ case $$flg in \ -+ *$$target_option*) has_opt=yes; break;; \ -+ esac; \ -+ done; \ -+ test $$has_opt = yes -+am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -+am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -35,7 +79,8 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - subdir = src/modules_io/table/io_table --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ -+ $(top_srcdir)/depcomp - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ - $(top_srcdir)/m4/ax_python_devel.m4 \ -@@ -71,41 +116,104 @@ am__nobase_list = $(am__nobase_strip_setup); \ - am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -+am__uninstall_files_from_dir = { \ -+ test -z "$$files" \ -+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ -+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ -+ $(am__cd) "$$dir" && rm -f $$files; }; \ -+ } - am__installdirs = "$(DESTDIR)$(pkglibdir)" - LTLIBRARIES = $(pkglib_LTLIBRARIES) - libio_table_la_DEPENDENCIES = \ - $(top_srcdir)/src/saga_core/saga_api/libsaga_api.la - am_libio_table_la_OBJECTS = io_table_txt.lo MLB_Interface.lo - libio_table_la_OBJECTS = $(am_libio_table_la_OBJECTS) -+AM_V_lt = $(am__v_lt_@AM_V@) -+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -+am__v_lt_0 = --silent -+am__v_lt_1 = -+AM_V_P = $(am__v_P_@AM_V@) -+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -+am__v_P_0 = false -+am__v_P_1 = : -+AM_V_GEN = $(am__v_GEN_@AM_V@) -+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+am__v_GEN_0 = @echo " GEN " $@; -+am__v_GEN_1 = -+AM_V_at = $(am__v_at_@AM_V@) -+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+am__v_at_0 = @ -+am__v_at_1 = - DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - am__mv = mv -f - CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) --LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CXXFLAGS) $(CXXFLAGS) -+AM_V_CXX = $(am__v_CXX_@AM_V@) -+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) -+am__v_CXX_0 = @echo " CXX " $@; -+am__v_CXX_1 = - CXXLD = $(CXX) --CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ -+ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) -+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) -+am__v_CXXLD_0 = @echo " CXXLD " $@; -+am__v_CXXLD_1 = - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CFLAGS) $(CFLAGS) -+AM_V_CC = $(am__v_CC_@AM_V@) -+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -+am__v_CC_0 = @echo " CC " $@; -+am__v_CC_1 = - CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CCLD = $(am__v_CCLD_@AM_V@) -+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -+am__v_CCLD_0 = @echo " CCLD " $@; -+am__v_CCLD_1 = - SOURCES = $(libio_table_la_SOURCES) - DIST_SOURCES = $(libio_table_la_SOURCES) -+am__can_run_installinfo = \ -+ case $$AM_UPDATE_INFO_DIR in \ -+ n|no|NO) false;; \ -+ *) (install-info --version) >/dev/null 2>&1;; \ -+ esac -+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -+# Read a list of newline-separated strings from the standard input, -+# and print each of them once, without duplicates. Input order is -+# *not* preserved. -+am__uniquify_input = $(AWK) '\ -+ BEGIN { nonempty = 0; } \ -+ { items[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in items) print i; }; } \ -+' -+# Make sure the list of sources is unique. This is necessary because, -+# e.g., the same source file might be shared among _SOURCES variables -+# for different programs/libraries. -+am__define_uniq_tagged_files = \ -+ list='$(am__tagged_files)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | $(am__uniquify_input)` - ETAGS = etags - CTAGS = ctags - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ -+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ -@@ -126,6 +234,7 @@ CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DISABLELIBHARU = @DISABLELIBHARU@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -153,6 +262,7 @@ LOCAL_INCS = @LOCAL_INCS@ - LOCAL_LIBS = @LOCAL_LIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - NM = @NM@ - NMEDIT = @NMEDIT@ -@@ -165,6 +275,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - POW_LIB = @POW_LIB@ -@@ -190,6 +301,7 @@ abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -@@ -223,7 +335,6 @@ libdir = @libdir@ - libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -@@ -295,9 +406,9 @@ $(top_srcdir)/configure: $(am__configure_deps) - $(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - $(am__aclocal_m4_deps): -+ - install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" - @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ - list2=; for p in $$list; do \ - if test -f $$p; then \ -@@ -305,6 +416,8 @@ install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - else :; fi; \ - done; \ - test -z "$$list2" || { \ -+ echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \ -+ $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \ - } -@@ -320,14 +433,17 @@ uninstall-pkglibLTLIBRARIES: - - clean-pkglibLTLIBRARIES: - -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES) -- @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \ -- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -- echo "rm -f \"$${dir}/so_locations\""; \ -- rm -f "$${dir}/so_locations"; \ -- done --libio_table.la: $(libio_table_la_OBJECTS) $(libio_table_la_DEPENDENCIES) -- $(CXXLINK) -rpath $(pkglibdir) $(libio_table_la_OBJECTS) $(libio_table_la_LIBADD) $(LIBS) -+ @list='$(pkglib_LTLIBRARIES)'; \ -+ locs=`for p in $$list; do echo $$p; done | \ -+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ -+ sort -u`; \ -+ test -z "$$locs" || { \ -+ echo rm -f $${locs}; \ -+ rm -f $${locs}; \ -+ } -+ -+libio_table.la: $(libio_table_la_OBJECTS) $(libio_table_la_DEPENDENCIES) $(EXTRA_libio_table_la_DEPENDENCIES) -+ $(AM_V_CXXLD)$(CXXLINK) -rpath $(pkglibdir) $(libio_table_la_OBJECTS) $(libio_table_la_LIBADD) $(LIBS) - - mostlyclean-compile: - -rm -f *.$(OBJEXT) -@@ -339,25 +455,25 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/io_table_txt.Plo@am__quote@ - - .cpp.o: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< - - .cpp.obj: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - - .cpp.lo: --@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< - - mostlyclean-libtool: - -rm -f *.lo -@@ -365,26 +481,15 @@ mostlyclean-libtool: - clean-libtool: - -rm -rf .libs _libs - --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -+ID: $(am__tagged_files) -+ $(am__define_uniq_tagged_files); mkid -fID $$unique -+tags: tags-am -+TAGS: tags -+ -+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ -@@ -396,15 +501,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $$unique; \ - fi; \ - fi --ctags: CTAGS --CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ctags: ctags-am -+ -+CTAGS: ctags -+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) -+ $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique -@@ -413,6 +514,21 @@ GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -+cscopelist: cscopelist-am -+ -+cscopelist-am: $(am__tagged_files) -+ list='$(am__tagged_files)'; \ -+ case "$(srcdir)" in \ -+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ -+ *) sdir=$(subdir)/$(srcdir) ;; \ -+ esac; \ -+ for i in $$list; do \ -+ if test -f "$$i"; then \ -+ echo "$(subdir)/$$i"; \ -+ else \ -+ echo "$$sdir/$$i"; \ -+ fi; \ -+ done >> $(top_builddir)/cscope.files - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -@@ -464,10 +580,15 @@ install-am: all-am - - installcheck: installcheck-am - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+ if test -z '$(STRIP)'; then \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ install; \ -+ else \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -+ fi - mostlyclean-generic: - - clean-generic: -@@ -552,19 +673,20 @@ uninstall-am: uninstall-pkglibLTLIBRARIES - - .MAKE: install-am install-strip - --.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ -- clean-libtool clean-pkglibLTLIBRARIES ctags distclean \ -- distclean-compile distclean-generic distclean-libtool \ -- distclean-tags distdir dvi dvi-am html html-am info info-am \ -- install install-am install-data install-data-am install-dvi \ -- install-dvi-am install-exec install-exec-am install-html \ -- install-html-am install-info install-info-am install-man \ -- install-pdf install-pdf-am install-pkglibLTLIBRARIES \ -- install-ps install-ps-am install-strip installcheck \ -- installcheck-am installdirs maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-compile \ -- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -- tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES -+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ -+ clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \ -+ ctags-am distclean distclean-compile distclean-generic \ -+ distclean-libtool distclean-tags distdir dvi dvi-am html \ -+ html-am info info-am install install-am install-data \ -+ install-data-am install-dvi install-dvi-am install-exec \ -+ install-exec-am install-html install-html-am install-info \ -+ install-info-am install-man install-pdf install-pdf-am \ -+ install-pkglibLTLIBRARIES install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ maintainer-clean maintainer-clean-generic mostlyclean \ -+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ -+ pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ -+ uninstall-pkglibLTLIBRARIES - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff --git a/src/modules_lectures/Makefile.in b/src/modules_lectures/Makefile.in -index f969efd..85955b5 100644 ---- a/src/modules_lectures/Makefile.in -+++ b/src/modules_lectures/Makefile.in -@@ -1,9 +1,8 @@ --# Makefile.in generated by automake 1.11.1 from Makefile.am. -+# Makefile.in generated by automake 1.14 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, --# Inc. -+# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+ - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -15,6 +14,51 @@ - - @SET_MAKE@ - VPATH = @srcdir@ -+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -+am__make_running_with_option = \ -+ case $${target_option-} in \ -+ ?) ;; \ -+ *) echo "am__make_running_with_option: internal error: invalid" \ -+ "target option '$${target_option-}' specified" >&2; \ -+ exit 1;; \ -+ esac; \ -+ has_opt=no; \ -+ sane_makeflags=$$MAKEFLAGS; \ -+ if $(am__is_gnu_make); then \ -+ sane_makeflags=$$MFLAGS; \ -+ else \ -+ case $$MAKEFLAGS in \ -+ *\\[\ \ ]*) \ -+ bs=\\; \ -+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -+ esac; \ -+ fi; \ -+ skip_next=no; \ -+ strip_trailopt () \ -+ { \ -+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -+ }; \ -+ for flg in $$sane_makeflags; do \ -+ test $$skip_next = yes && { skip_next=no; continue; }; \ -+ case $$flg in \ -+ *=*|--*) continue;; \ -+ -*I) strip_trailopt 'I'; skip_next=yes;; \ -+ -*I?*) strip_trailopt 'I';; \ -+ -*O) strip_trailopt 'O'; skip_next=yes;; \ -+ -*O?*) strip_trailopt 'O';; \ -+ -*l) strip_trailopt 'l'; skip_next=yes;; \ -+ -*l?*) strip_trailopt 'l';; \ -+ -[dEDm]) skip_next=yes;; \ -+ -[JT]) skip_next=yes;; \ -+ esac; \ -+ case $$flg in \ -+ *$$target_option*) has_opt=yes; break;; \ -+ esac; \ -+ done; \ -+ test $$has_opt = yes -+am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -+am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -34,7 +78,7 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - subdir = src/modules_lectures --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ - $(top_srcdir)/m4/ax_python_devel.m4 \ -@@ -49,20 +93,58 @@ mkinstalldirs = $(install_sh) -d - CONFIG_HEADER = $(top_builddir)/config.h - CONFIG_CLEAN_FILES = - CONFIG_CLEAN_VPATH_FILES = -+AM_V_P = $(am__v_P_@AM_V@) -+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -+am__v_P_0 = false -+am__v_P_1 = : -+AM_V_GEN = $(am__v_GEN_@AM_V@) -+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+am__v_GEN_0 = @echo " GEN " $@; -+am__v_GEN_1 = -+AM_V_at = $(am__v_at_@AM_V@) -+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+am__v_at_0 = @ -+am__v_at_1 = - SOURCES = - DIST_SOURCES = --RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ -- html-recursive info-recursive install-data-recursive \ -- install-dvi-recursive install-exec-recursive \ -- install-html-recursive install-info-recursive \ -- install-pdf-recursive install-ps-recursive install-recursive \ -- installcheck-recursive installdirs-recursive pdf-recursive \ -- ps-recursive uninstall-recursive -+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ -+ ctags-recursive dvi-recursive html-recursive info-recursive \ -+ install-data-recursive install-dvi-recursive \ -+ install-exec-recursive install-html-recursive \ -+ install-info-recursive install-pdf-recursive \ -+ install-ps-recursive install-recursive installcheck-recursive \ -+ installdirs-recursive pdf-recursive ps-recursive \ -+ tags-recursive uninstall-recursive -+am__can_run_installinfo = \ -+ case $$AM_UPDATE_INFO_DIR in \ -+ n|no|NO) false;; \ -+ *) (install-info --version) >/dev/null 2>&1;; \ -+ esac - RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ - distclean-recursive maintainer-clean-recursive --AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ -- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ -+am__recursive_targets = \ -+ $(RECURSIVE_TARGETS) \ -+ $(RECURSIVE_CLEAN_TARGETS) \ -+ $(am__extra_recursive_targets) -+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ - distdir -+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -+# Read a list of newline-separated strings from the standard input, -+# and print each of them once, without duplicates. Input order is -+# *not* preserved. -+am__uniquify_input = $(AWK) '\ -+ BEGIN { nonempty = 0; } \ -+ { items[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in items) print i; }; } \ -+' -+# Make sure the list of sources is unique. This is necessary because, -+# e.g., the same source file might be shared among _SOURCES variables -+# for different programs/libraries. -+am__define_uniq_tagged_files = \ -+ list='$(am__tagged_files)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | $(am__uniquify_input)` - ETAGS = etags - CTAGS = ctags - DIST_SUBDIRS = $(SUBDIRS) -@@ -94,6 +176,7 @@ am__relativize = \ - reldir="$$dir2" - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ -+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ -@@ -114,6 +197,7 @@ CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DISABLELIBHARU = @DISABLELIBHARU@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -141,6 +225,7 @@ LOCAL_INCS = @LOCAL_INCS@ - LOCAL_LIBS = @LOCAL_LIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - NM = @NM@ - NMEDIT = @NMEDIT@ -@@ -153,6 +238,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - POW_LIB = @POW_LIB@ -@@ -178,6 +264,7 @@ abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -@@ -211,7 +298,6 @@ libdir = @libdir@ - libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -@@ -273,22 +359,25 @@ clean-libtool: - -rm -rf .libs _libs - - # This directory's subdirectories are mostly independent; you can cd --# into them and run `make' without going through this Makefile. --# To change the values of `make' variables: instead of editing Makefiles, --# (1) if the variable is set in `config.status', edit `config.status' --# (which will cause the Makefiles to be regenerated when you run `make'); --# (2) otherwise, pass the desired values on the `make' command line. --$(RECURSIVE_TARGETS): -- @fail= failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -+# into them and run 'make' without going through this Makefile. -+# To change the values of 'make' variables: instead of editing Makefiles, -+# (1) if the variable is set in 'config.status', edit 'config.status' -+# (which will cause the Makefiles to be regenerated when you run 'make'); -+# (2) otherwise, pass the desired values on the 'make' command line. -+$(am__recursive_targets): -+ @fail=; \ -+ if $(am__make_keepgoing); then \ -+ failcom='fail=yes'; \ -+ else \ -+ failcom='exit 1'; \ -+ fi; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ -- list='$(SUBDIRS)'; for subdir in $$list; do \ -+ case "$@" in \ -+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -+ *) list='$(SUBDIRS)' ;; \ -+ esac; \ -+ for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ -@@ -303,57 +392,12 @@ $(RECURSIVE_TARGETS): - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - --$(RECURSIVE_CLEAN_TARGETS): -- @fail= failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -- dot_seen=no; \ -- case "$@" in \ -- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -- *) list='$(SUBDIRS)' ;; \ -- esac; \ -- rev=''; for subdir in $$list; do \ -- if test "$$subdir" = "."; then :; else \ -- rev="$$subdir $$rev"; \ -- fi; \ -- done; \ -- rev="$$rev ."; \ -- target=`echo $@ | sed s/-recursive//`; \ -- for subdir in $$rev; do \ -- echo "Making $$target in $$subdir"; \ -- if test "$$subdir" = "."; then \ -- local_target="$$target-am"; \ -- else \ -- local_target="$$target"; \ -- fi; \ -- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || eval $$failcom; \ -- done && test -z "$$fail" --tags-recursive: -- list='$(SUBDIRS)'; for subdir in $$list; do \ -- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ -- done --ctags-recursive: -- list='$(SUBDIRS)'; for subdir in $$list; do \ -- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ -- done -+ID: $(am__tagged_files) -+ $(am__define_uniq_tagged_files); mkid -fID $$unique -+tags: tags-recursive -+TAGS: tags - --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ - if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ -@@ -369,12 +413,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ -@@ -386,15 +425,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $$unique; \ - fi; \ - fi --ctags: CTAGS --CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ctags: ctags-recursive -+ -+CTAGS: ctags -+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) -+ $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique -@@ -403,6 +438,21 @@ GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -+cscopelist: cscopelist-recursive -+ -+cscopelist-am: $(am__tagged_files) -+ list='$(am__tagged_files)'; \ -+ case "$(srcdir)" in \ -+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ -+ *) sdir=$(subdir)/$(srcdir) ;; \ -+ esac; \ -+ for i in $$list; do \ -+ if test -f "$$i"; then \ -+ echo "$(subdir)/$$i"; \ -+ else \ -+ echo "$$sdir/$$i"; \ -+ fi; \ -+ done >> $(top_builddir)/cscope.files - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -@@ -439,13 +489,10 @@ distdir: $(DISTFILES) - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test -d "$(distdir)/$$subdir" \ -- || $(MKDIR_P) "$(distdir)/$$subdir" \ -- || exit 1; \ -- fi; \ -- done -- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ -- if test "$$subdir" = .; then :; else \ -+ $(am__make_dryrun) \ -+ || test -d "$(distdir)/$$subdir" \ -+ || $(MKDIR_P) "$(distdir)/$$subdir" \ -+ || exit 1; \ - dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ - $(am__relativize); \ - new_distdir=$$reldir; \ -@@ -480,10 +527,15 @@ install-am: all-am - - installcheck: installcheck-recursive - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+ if test -z '$(STRIP)'; then \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ install; \ -+ else \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -+ fi - mostlyclean-generic: - - clean-generic: -@@ -561,22 +613,20 @@ ps-am: - - uninstall-am: - --.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ -- install-am install-strip tags-recursive -- --.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ -- all all-am check check-am clean clean-generic clean-libtool \ -- ctags ctags-recursive distclean distclean-generic \ -- distclean-libtool distclean-tags distdir dvi dvi-am html \ -- html-am info info-am install install-am install-data \ -- install-data-am install-dvi install-dvi-am install-exec \ -- install-exec-am install-html install-html-am install-info \ -- install-info-am install-man install-pdf install-pdf-am \ -- install-ps install-ps-am install-strip installcheck \ -- installcheck-am installdirs installdirs-am maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-generic \ -- mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ -- uninstall uninstall-am -+.MAKE: $(am__recursive_targets) install-am install-strip -+ -+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ -+ check-am clean clean-generic clean-libtool cscopelist-am ctags \ -+ ctags-am distclean distclean-generic distclean-libtool \ -+ distclean-tags distdir dvi dvi-am html html-am info info-am \ -+ install install-am install-data install-data-am install-dvi \ -+ install-dvi-am install-exec install-exec-am install-html \ -+ install-html-am install-info install-info-am install-man \ -+ install-pdf install-pdf-am install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ installdirs-am maintainer-clean maintainer-clean-generic \ -+ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ -+ ps ps-am tags tags-am uninstall uninstall-am - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff --git a/src/modules_lectures/lectures/Makefile.in b/src/modules_lectures/lectures/Makefile.in -index ca9acf3..3065775 100644 ---- a/src/modules_lectures/lectures/Makefile.in -+++ b/src/modules_lectures/lectures/Makefile.in -@@ -1,9 +1,8 @@ --# Makefile.in generated by automake 1.11.1 from Makefile.am. -+# Makefile.in generated by automake 1.14 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, --# Inc. -+# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+ - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -15,6 +14,51 @@ - - @SET_MAKE@ - VPATH = @srcdir@ -+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -+am__make_running_with_option = \ -+ case $${target_option-} in \ -+ ?) ;; \ -+ *) echo "am__make_running_with_option: internal error: invalid" \ -+ "target option '$${target_option-}' specified" >&2; \ -+ exit 1;; \ -+ esac; \ -+ has_opt=no; \ -+ sane_makeflags=$$MAKEFLAGS; \ -+ if $(am__is_gnu_make); then \ -+ sane_makeflags=$$MFLAGS; \ -+ else \ -+ case $$MAKEFLAGS in \ -+ *\\[\ \ ]*) \ -+ bs=\\; \ -+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -+ esac; \ -+ fi; \ -+ skip_next=no; \ -+ strip_trailopt () \ -+ { \ -+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -+ }; \ -+ for flg in $$sane_makeflags; do \ -+ test $$skip_next = yes && { skip_next=no; continue; }; \ -+ case $$flg in \ -+ *=*|--*) continue;; \ -+ -*I) strip_trailopt 'I'; skip_next=yes;; \ -+ -*I?*) strip_trailopt 'I';; \ -+ -*O) strip_trailopt 'O'; skip_next=yes;; \ -+ -*O?*) strip_trailopt 'O';; \ -+ -*l) strip_trailopt 'l'; skip_next=yes;; \ -+ -*l?*) strip_trailopt 'l';; \ -+ -[dEDm]) skip_next=yes;; \ -+ -[JT]) skip_next=yes;; \ -+ esac; \ -+ case $$flg in \ -+ *$$target_option*) has_opt=yes; break;; \ -+ esac; \ -+ done; \ -+ test $$has_opt = yes -+am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -+am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -34,7 +78,7 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - subdir = src/modules_lectures/lectures --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ - $(top_srcdir)/m4/ax_python_devel.m4 \ -@@ -49,20 +93,58 @@ mkinstalldirs = $(install_sh) -d - CONFIG_HEADER = $(top_builddir)/config.h - CONFIG_CLEAN_FILES = - CONFIG_CLEAN_VPATH_FILES = -+AM_V_P = $(am__v_P_@AM_V@) -+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -+am__v_P_0 = false -+am__v_P_1 = : -+AM_V_GEN = $(am__v_GEN_@AM_V@) -+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+am__v_GEN_0 = @echo " GEN " $@; -+am__v_GEN_1 = -+AM_V_at = $(am__v_at_@AM_V@) -+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+am__v_at_0 = @ -+am__v_at_1 = - SOURCES = - DIST_SOURCES = --RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ -- html-recursive info-recursive install-data-recursive \ -- install-dvi-recursive install-exec-recursive \ -- install-html-recursive install-info-recursive \ -- install-pdf-recursive install-ps-recursive install-recursive \ -- installcheck-recursive installdirs-recursive pdf-recursive \ -- ps-recursive uninstall-recursive -+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ -+ ctags-recursive dvi-recursive html-recursive info-recursive \ -+ install-data-recursive install-dvi-recursive \ -+ install-exec-recursive install-html-recursive \ -+ install-info-recursive install-pdf-recursive \ -+ install-ps-recursive install-recursive installcheck-recursive \ -+ installdirs-recursive pdf-recursive ps-recursive \ -+ tags-recursive uninstall-recursive -+am__can_run_installinfo = \ -+ case $$AM_UPDATE_INFO_DIR in \ -+ n|no|NO) false;; \ -+ *) (install-info --version) >/dev/null 2>&1;; \ -+ esac - RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ - distclean-recursive maintainer-clean-recursive --AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ -- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ -+am__recursive_targets = \ -+ $(RECURSIVE_TARGETS) \ -+ $(RECURSIVE_CLEAN_TARGETS) \ -+ $(am__extra_recursive_targets) -+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ - distdir -+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -+# Read a list of newline-separated strings from the standard input, -+# and print each of them once, without duplicates. Input order is -+# *not* preserved. -+am__uniquify_input = $(AWK) '\ -+ BEGIN { nonempty = 0; } \ -+ { items[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in items) print i; }; } \ -+' -+# Make sure the list of sources is unique. This is necessary because, -+# e.g., the same source file might be shared among _SOURCES variables -+# for different programs/libraries. -+am__define_uniq_tagged_files = \ -+ list='$(am__tagged_files)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | $(am__uniquify_input)` - ETAGS = etags - CTAGS = ctags - DIST_SUBDIRS = $(SUBDIRS) -@@ -94,6 +176,7 @@ am__relativize = \ - reldir="$$dir2" - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ -+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ -@@ -114,6 +197,7 @@ CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DISABLELIBHARU = @DISABLELIBHARU@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -141,6 +225,7 @@ LOCAL_INCS = @LOCAL_INCS@ - LOCAL_LIBS = @LOCAL_LIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - NM = @NM@ - NMEDIT = @NMEDIT@ -@@ -153,6 +238,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - POW_LIB = @POW_LIB@ -@@ -178,6 +264,7 @@ abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -@@ -211,7 +298,6 @@ libdir = @libdir@ - libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -@@ -273,22 +359,25 @@ clean-libtool: - -rm -rf .libs _libs - - # This directory's subdirectories are mostly independent; you can cd --# into them and run `make' without going through this Makefile. --# To change the values of `make' variables: instead of editing Makefiles, --# (1) if the variable is set in `config.status', edit `config.status' --# (which will cause the Makefiles to be regenerated when you run `make'); --# (2) otherwise, pass the desired values on the `make' command line. --$(RECURSIVE_TARGETS): -- @fail= failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -+# into them and run 'make' without going through this Makefile. -+# To change the values of 'make' variables: instead of editing Makefiles, -+# (1) if the variable is set in 'config.status', edit 'config.status' -+# (which will cause the Makefiles to be regenerated when you run 'make'); -+# (2) otherwise, pass the desired values on the 'make' command line. -+$(am__recursive_targets): -+ @fail=; \ -+ if $(am__make_keepgoing); then \ -+ failcom='fail=yes'; \ -+ else \ -+ failcom='exit 1'; \ -+ fi; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ -- list='$(SUBDIRS)'; for subdir in $$list; do \ -+ case "$@" in \ -+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -+ *) list='$(SUBDIRS)' ;; \ -+ esac; \ -+ for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ -@@ -303,57 +392,12 @@ $(RECURSIVE_TARGETS): - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - --$(RECURSIVE_CLEAN_TARGETS): -- @fail= failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -- dot_seen=no; \ -- case "$@" in \ -- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -- *) list='$(SUBDIRS)' ;; \ -- esac; \ -- rev=''; for subdir in $$list; do \ -- if test "$$subdir" = "."; then :; else \ -- rev="$$subdir $$rev"; \ -- fi; \ -- done; \ -- rev="$$rev ."; \ -- target=`echo $@ | sed s/-recursive//`; \ -- for subdir in $$rev; do \ -- echo "Making $$target in $$subdir"; \ -- if test "$$subdir" = "."; then \ -- local_target="$$target-am"; \ -- else \ -- local_target="$$target"; \ -- fi; \ -- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || eval $$failcom; \ -- done && test -z "$$fail" --tags-recursive: -- list='$(SUBDIRS)'; for subdir in $$list; do \ -- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ -- done --ctags-recursive: -- list='$(SUBDIRS)'; for subdir in $$list; do \ -- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ -- done -+ID: $(am__tagged_files) -+ $(am__define_uniq_tagged_files); mkid -fID $$unique -+tags: tags-recursive -+TAGS: tags - --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ - if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ -@@ -369,12 +413,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ -@@ -386,15 +425,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $$unique; \ - fi; \ - fi --ctags: CTAGS --CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ctags: ctags-recursive -+ -+CTAGS: ctags -+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) -+ $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique -@@ -403,6 +438,21 @@ GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -+cscopelist: cscopelist-recursive -+ -+cscopelist-am: $(am__tagged_files) -+ list='$(am__tagged_files)'; \ -+ case "$(srcdir)" in \ -+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ -+ *) sdir=$(subdir)/$(srcdir) ;; \ -+ esac; \ -+ for i in $$list; do \ -+ if test -f "$$i"; then \ -+ echo "$(subdir)/$$i"; \ -+ else \ -+ echo "$$sdir/$$i"; \ -+ fi; \ -+ done >> $(top_builddir)/cscope.files - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -@@ -439,13 +489,10 @@ distdir: $(DISTFILES) - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test -d "$(distdir)/$$subdir" \ -- || $(MKDIR_P) "$(distdir)/$$subdir" \ -- || exit 1; \ -- fi; \ -- done -- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ -- if test "$$subdir" = .; then :; else \ -+ $(am__make_dryrun) \ -+ || test -d "$(distdir)/$$subdir" \ -+ || $(MKDIR_P) "$(distdir)/$$subdir" \ -+ || exit 1; \ - dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ - $(am__relativize); \ - new_distdir=$$reldir; \ -@@ -480,10 +527,15 @@ install-am: all-am - - installcheck: installcheck-recursive - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+ if test -z '$(STRIP)'; then \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ install; \ -+ else \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -+ fi - mostlyclean-generic: - - clean-generic: -@@ -561,22 +613,20 @@ ps-am: - - uninstall-am: - --.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ -- install-am install-strip tags-recursive -- --.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ -- all all-am check check-am clean clean-generic clean-libtool \ -- ctags ctags-recursive distclean distclean-generic \ -- distclean-libtool distclean-tags distdir dvi dvi-am html \ -- html-am info info-am install install-am install-data \ -- install-data-am install-dvi install-dvi-am install-exec \ -- install-exec-am install-html install-html-am install-info \ -- install-info-am install-man install-pdf install-pdf-am \ -- install-ps install-ps-am install-strip installcheck \ -- installcheck-am installdirs installdirs-am maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-generic \ -- mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ -- uninstall uninstall-am -+.MAKE: $(am__recursive_targets) install-am install-strip -+ -+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ -+ check-am clean clean-generic clean-libtool cscopelist-am ctags \ -+ ctags-am distclean distclean-generic distclean-libtool \ -+ distclean-tags distdir dvi dvi-am html html-am info info-am \ -+ install install-am install-data install-data-am install-dvi \ -+ install-dvi-am install-exec install-exec-am install-html \ -+ install-html-am install-info install-info-am install-man \ -+ install-pdf install-pdf-am install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ installdirs-am maintainer-clean maintainer-clean-generic \ -+ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ -+ ps ps-am tags tags-am uninstall uninstall-am - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff --git a/src/modules_lectures/lectures/lectures_introduction/Makefile.in b/src/modules_lectures/lectures/lectures_introduction/Makefile.in -index f61346a..25ecc99 100644 ---- a/src/modules_lectures/lectures/lectures_introduction/Makefile.in -+++ b/src/modules_lectures/lectures/lectures_introduction/Makefile.in -@@ -1,9 +1,8 @@ --# Makefile.in generated by automake 1.11.1 from Makefile.am. -+# Makefile.in generated by automake 1.14 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, --# Inc. -+# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+ - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -16,6 +15,51 @@ - @SET_MAKE@ - - VPATH = @srcdir@ -+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -+am__make_running_with_option = \ -+ case $${target_option-} in \ -+ ?) ;; \ -+ *) echo "am__make_running_with_option: internal error: invalid" \ -+ "target option '$${target_option-}' specified" >&2; \ -+ exit 1;; \ -+ esac; \ -+ has_opt=no; \ -+ sane_makeflags=$$MAKEFLAGS; \ -+ if $(am__is_gnu_make); then \ -+ sane_makeflags=$$MFLAGS; \ -+ else \ -+ case $$MAKEFLAGS in \ -+ *\\[\ \ ]*) \ -+ bs=\\; \ -+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -+ esac; \ -+ fi; \ -+ skip_next=no; \ -+ strip_trailopt () \ -+ { \ -+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -+ }; \ -+ for flg in $$sane_makeflags; do \ -+ test $$skip_next = yes && { skip_next=no; continue; }; \ -+ case $$flg in \ -+ *=*|--*) continue;; \ -+ -*I) strip_trailopt 'I'; skip_next=yes;; \ -+ -*I?*) strip_trailopt 'I';; \ -+ -*O) strip_trailopt 'O'; skip_next=yes;; \ -+ -*O?*) strip_trailopt 'O';; \ -+ -*l) strip_trailopt 'l'; skip_next=yes;; \ -+ -*l?*) strip_trailopt 'l';; \ -+ -[dEDm]) skip_next=yes;; \ -+ -[JT]) skip_next=yes;; \ -+ esac; \ -+ case $$flg in \ -+ *$$target_option*) has_opt=yes; break;; \ -+ esac; \ -+ done; \ -+ test $$has_opt = yes -+am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -+am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -35,7 +79,8 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - subdir = src/modules_lectures/lectures/lectures_introduction --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ -+ $(top_srcdir)/depcomp - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ - $(top_srcdir)/m4/ax_python_devel.m4 \ -@@ -71,6 +116,12 @@ am__nobase_list = $(am__nobase_strip_setup); \ - am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -+am__uninstall_files_from_dir = { \ -+ test -z "$$files" \ -+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ -+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ -+ $(am__cd) "$$dir" && rm -f $$files; }; \ -+ } - am__installdirs = "$(DESTDIR)$(pkglibdir)" - LTLIBRARIES = $(pkglib_LTLIBRARIES) - liblectures_introduction_la_DEPENDENCIES = \ -@@ -82,35 +133,92 @@ am_liblectures_introduction_la_OBJECTS = Exercise_01.lo Exercise_02.lo \ - MLB_Interface.lo - liblectures_introduction_la_OBJECTS = \ - $(am_liblectures_introduction_la_OBJECTS) -+AM_V_lt = $(am__v_lt_@AM_V@) -+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -+am__v_lt_0 = --silent -+am__v_lt_1 = -+AM_V_P = $(am__v_P_@AM_V@) -+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -+am__v_P_0 = false -+am__v_P_1 = : -+AM_V_GEN = $(am__v_GEN_@AM_V@) -+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+am__v_GEN_0 = @echo " GEN " $@; -+am__v_GEN_1 = -+AM_V_at = $(am__v_at_@AM_V@) -+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+am__v_at_0 = @ -+am__v_at_1 = - DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - am__mv = mv -f - CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) --LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CXXFLAGS) $(CXXFLAGS) -+AM_V_CXX = $(am__v_CXX_@AM_V@) -+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) -+am__v_CXX_0 = @echo " CXX " $@; -+am__v_CXX_1 = - CXXLD = $(CXX) --CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ -+ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) -+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) -+am__v_CXXLD_0 = @echo " CXXLD " $@; -+am__v_CXXLD_1 = - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CFLAGS) $(CFLAGS) -+AM_V_CC = $(am__v_CC_@AM_V@) -+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -+am__v_CC_0 = @echo " CC " $@; -+am__v_CC_1 = - CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CCLD = $(am__v_CCLD_@AM_V@) -+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -+am__v_CCLD_0 = @echo " CCLD " $@; -+am__v_CCLD_1 = - SOURCES = $(liblectures_introduction_la_SOURCES) - DIST_SOURCES = $(liblectures_introduction_la_SOURCES) -+am__can_run_installinfo = \ -+ case $$AM_UPDATE_INFO_DIR in \ -+ n|no|NO) false;; \ -+ *) (install-info --version) >/dev/null 2>&1;; \ -+ esac -+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -+# Read a list of newline-separated strings from the standard input, -+# and print each of them once, without duplicates. Input order is -+# *not* preserved. -+am__uniquify_input = $(AWK) '\ -+ BEGIN { nonempty = 0; } \ -+ { items[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in items) print i; }; } \ -+' -+# Make sure the list of sources is unique. This is necessary because, -+# e.g., the same source file might be shared among _SOURCES variables -+# for different programs/libraries. -+am__define_uniq_tagged_files = \ -+ list='$(am__tagged_files)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | $(am__uniquify_input)` - ETAGS = etags - CTAGS = ctags - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ -+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ -@@ -131,6 +239,7 @@ CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DISABLELIBHARU = @DISABLELIBHARU@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -158,6 +267,7 @@ LOCAL_INCS = @LOCAL_INCS@ - LOCAL_LIBS = @LOCAL_LIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - NM = @NM@ - NMEDIT = @NMEDIT@ -@@ -170,6 +280,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - POW_LIB = @POW_LIB@ -@@ -195,6 +306,7 @@ abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -@@ -228,7 +340,6 @@ libdir = @libdir@ - libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -@@ -326,9 +437,9 @@ $(top_srcdir)/configure: $(am__configure_deps) - $(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - $(am__aclocal_m4_deps): -+ - install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" - @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ - list2=; for p in $$list; do \ - if test -f $$p; then \ -@@ -336,6 +447,8 @@ install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - else :; fi; \ - done; \ - test -z "$$list2" || { \ -+ echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \ -+ $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \ - } -@@ -351,14 +464,17 @@ uninstall-pkglibLTLIBRARIES: - - clean-pkglibLTLIBRARIES: - -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES) -- @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \ -- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -- echo "rm -f \"$${dir}/so_locations\""; \ -- rm -f "$${dir}/so_locations"; \ -- done --liblectures_introduction.la: $(liblectures_introduction_la_OBJECTS) $(liblectures_introduction_la_DEPENDENCIES) -- $(CXXLINK) -rpath $(pkglibdir) $(liblectures_introduction_la_OBJECTS) $(liblectures_introduction_la_LIBADD) $(LIBS) -+ @list='$(pkglib_LTLIBRARIES)'; \ -+ locs=`for p in $$list; do echo $$p; done | \ -+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ -+ sort -u`; \ -+ test -z "$$locs" || { \ -+ echo rm -f $${locs}; \ -+ rm -f $${locs}; \ -+ } -+ -+liblectures_introduction.la: $(liblectures_introduction_la_OBJECTS) $(liblectures_introduction_la_DEPENDENCIES) $(EXTRA_liblectures_introduction_la_DEPENDENCIES) -+ $(AM_V_CXXLD)$(CXXLINK) -rpath $(pkglibdir) $(liblectures_introduction_la_OBJECTS) $(liblectures_introduction_la_LIBADD) $(LIBS) - - mostlyclean-compile: - -rm -f *.$(OBJEXT) -@@ -383,25 +499,25 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MLB_Interface.Plo@am__quote@ - - .cpp.o: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< - - .cpp.obj: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - - .cpp.lo: --@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< - - mostlyclean-libtool: - -rm -f *.lo -@@ -409,26 +525,15 @@ mostlyclean-libtool: - clean-libtool: - -rm -rf .libs _libs - --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -+ID: $(am__tagged_files) -+ $(am__define_uniq_tagged_files); mkid -fID $$unique -+tags: tags-am -+TAGS: tags -+ -+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ -@@ -440,15 +545,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $$unique; \ - fi; \ - fi --ctags: CTAGS --CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ctags: ctags-am -+ -+CTAGS: ctags -+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) -+ $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique -@@ -457,6 +558,21 @@ GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -+cscopelist: cscopelist-am -+ -+cscopelist-am: $(am__tagged_files) -+ list='$(am__tagged_files)'; \ -+ case "$(srcdir)" in \ -+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ -+ *) sdir=$(subdir)/$(srcdir) ;; \ -+ esac; \ -+ for i in $$list; do \ -+ if test -f "$$i"; then \ -+ echo "$(subdir)/$$i"; \ -+ else \ -+ echo "$$sdir/$$i"; \ -+ fi; \ -+ done >> $(top_builddir)/cscope.files - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -@@ -508,10 +624,15 @@ install-am: all-am - - installcheck: installcheck-am - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+ if test -z '$(STRIP)'; then \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ install; \ -+ else \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -+ fi - mostlyclean-generic: - - clean-generic: -@@ -596,19 +717,20 @@ uninstall-am: uninstall-pkglibLTLIBRARIES - - .MAKE: install-am install-strip - --.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ -- clean-libtool clean-pkglibLTLIBRARIES ctags distclean \ -- distclean-compile distclean-generic distclean-libtool \ -- distclean-tags distdir dvi dvi-am html html-am info info-am \ -- install install-am install-data install-data-am install-dvi \ -- install-dvi-am install-exec install-exec-am install-html \ -- install-html-am install-info install-info-am install-man \ -- install-pdf install-pdf-am install-pkglibLTLIBRARIES \ -- install-ps install-ps-am install-strip installcheck \ -- installcheck-am installdirs maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-compile \ -- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -- tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES -+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ -+ clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \ -+ ctags-am distclean distclean-compile distclean-generic \ -+ distclean-libtool distclean-tags distdir dvi dvi-am html \ -+ html-am info info-am install install-am install-data \ -+ install-data-am install-dvi install-dvi-am install-exec \ -+ install-exec-am install-html install-html-am install-info \ -+ install-info-am install-man install-pdf install-pdf-am \ -+ install-pkglibLTLIBRARIES install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ maintainer-clean maintainer-clean-generic mostlyclean \ -+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ -+ pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ -+ uninstall-pkglibLTLIBRARIES - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff --git a/src/modules_projection/Makefile.in b/src/modules_projection/Makefile.in -index 42556a8..a168c85 100644 ---- a/src/modules_projection/Makefile.in -+++ b/src/modules_projection/Makefile.in -@@ -1,9 +1,8 @@ --# Makefile.in generated by automake 1.11.1 from Makefile.am. -+# Makefile.in generated by automake 1.14 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, --# Inc. -+# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+ - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -15,6 +14,51 @@ - - @SET_MAKE@ - VPATH = @srcdir@ -+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -+am__make_running_with_option = \ -+ case $${target_option-} in \ -+ ?) ;; \ -+ *) echo "am__make_running_with_option: internal error: invalid" \ -+ "target option '$${target_option-}' specified" >&2; \ -+ exit 1;; \ -+ esac; \ -+ has_opt=no; \ -+ sane_makeflags=$$MAKEFLAGS; \ -+ if $(am__is_gnu_make); then \ -+ sane_makeflags=$$MFLAGS; \ -+ else \ -+ case $$MAKEFLAGS in \ -+ *\\[\ \ ]*) \ -+ bs=\\; \ -+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -+ esac; \ -+ fi; \ -+ skip_next=no; \ -+ strip_trailopt () \ -+ { \ -+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -+ }; \ -+ for flg in $$sane_makeflags; do \ -+ test $$skip_next = yes && { skip_next=no; continue; }; \ -+ case $$flg in \ -+ *=*|--*) continue;; \ -+ -*I) strip_trailopt 'I'; skip_next=yes;; \ -+ -*I?*) strip_trailopt 'I';; \ -+ -*O) strip_trailopt 'O'; skip_next=yes;; \ -+ -*O?*) strip_trailopt 'O';; \ -+ -*l) strip_trailopt 'l'; skip_next=yes;; \ -+ -*l?*) strip_trailopt 'l';; \ -+ -[dEDm]) skip_next=yes;; \ -+ -[JT]) skip_next=yes;; \ -+ esac; \ -+ case $$flg in \ -+ *$$target_option*) has_opt=yes; break;; \ -+ esac; \ -+ done; \ -+ test $$has_opt = yes -+am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -+am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -34,7 +78,7 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - subdir = src/modules_projection --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ - $(top_srcdir)/m4/ax_python_devel.m4 \ -@@ -49,20 +93,58 @@ mkinstalldirs = $(install_sh) -d - CONFIG_HEADER = $(top_builddir)/config.h - CONFIG_CLEAN_FILES = - CONFIG_CLEAN_VPATH_FILES = -+AM_V_P = $(am__v_P_@AM_V@) -+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -+am__v_P_0 = false -+am__v_P_1 = : -+AM_V_GEN = $(am__v_GEN_@AM_V@) -+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+am__v_GEN_0 = @echo " GEN " $@; -+am__v_GEN_1 = -+AM_V_at = $(am__v_at_@AM_V@) -+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+am__v_at_0 = @ -+am__v_at_1 = - SOURCES = - DIST_SOURCES = --RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ -- html-recursive info-recursive install-data-recursive \ -- install-dvi-recursive install-exec-recursive \ -- install-html-recursive install-info-recursive \ -- install-pdf-recursive install-ps-recursive install-recursive \ -- installcheck-recursive installdirs-recursive pdf-recursive \ -- ps-recursive uninstall-recursive -+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ -+ ctags-recursive dvi-recursive html-recursive info-recursive \ -+ install-data-recursive install-dvi-recursive \ -+ install-exec-recursive install-html-recursive \ -+ install-info-recursive install-pdf-recursive \ -+ install-ps-recursive install-recursive installcheck-recursive \ -+ installdirs-recursive pdf-recursive ps-recursive \ -+ tags-recursive uninstall-recursive -+am__can_run_installinfo = \ -+ case $$AM_UPDATE_INFO_DIR in \ -+ n|no|NO) false;; \ -+ *) (install-info --version) >/dev/null 2>&1;; \ -+ esac - RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ - distclean-recursive maintainer-clean-recursive --AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ -- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ -+am__recursive_targets = \ -+ $(RECURSIVE_TARGETS) \ -+ $(RECURSIVE_CLEAN_TARGETS) \ -+ $(am__extra_recursive_targets) -+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ - distdir -+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -+# Read a list of newline-separated strings from the standard input, -+# and print each of them once, without duplicates. Input order is -+# *not* preserved. -+am__uniquify_input = $(AWK) '\ -+ BEGIN { nonempty = 0; } \ -+ { items[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in items) print i; }; } \ -+' -+# Make sure the list of sources is unique. This is necessary because, -+# e.g., the same source file might be shared among _SOURCES variables -+# for different programs/libraries. -+am__define_uniq_tagged_files = \ -+ list='$(am__tagged_files)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | $(am__uniquify_input)` - ETAGS = etags - CTAGS = ctags - DIST_SUBDIRS = $(SUBDIRS) -@@ -94,6 +176,7 @@ am__relativize = \ - reldir="$$dir2" - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ -+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ -@@ -114,6 +197,7 @@ CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DISABLELIBHARU = @DISABLELIBHARU@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -141,6 +225,7 @@ LOCAL_INCS = @LOCAL_INCS@ - LOCAL_LIBS = @LOCAL_LIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - NM = @NM@ - NMEDIT = @NMEDIT@ -@@ -153,6 +238,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - POW_LIB = @POW_LIB@ -@@ -178,6 +264,7 @@ abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -@@ -211,7 +298,6 @@ libdir = @libdir@ - libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -@@ -273,22 +359,25 @@ clean-libtool: - -rm -rf .libs _libs - - # This directory's subdirectories are mostly independent; you can cd --# into them and run `make' without going through this Makefile. --# To change the values of `make' variables: instead of editing Makefiles, --# (1) if the variable is set in `config.status', edit `config.status' --# (which will cause the Makefiles to be regenerated when you run `make'); --# (2) otherwise, pass the desired values on the `make' command line. --$(RECURSIVE_TARGETS): -- @fail= failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -+# into them and run 'make' without going through this Makefile. -+# To change the values of 'make' variables: instead of editing Makefiles, -+# (1) if the variable is set in 'config.status', edit 'config.status' -+# (which will cause the Makefiles to be regenerated when you run 'make'); -+# (2) otherwise, pass the desired values on the 'make' command line. -+$(am__recursive_targets): -+ @fail=; \ -+ if $(am__make_keepgoing); then \ -+ failcom='fail=yes'; \ -+ else \ -+ failcom='exit 1'; \ -+ fi; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ -- list='$(SUBDIRS)'; for subdir in $$list; do \ -+ case "$@" in \ -+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -+ *) list='$(SUBDIRS)' ;; \ -+ esac; \ -+ for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ -@@ -303,57 +392,12 @@ $(RECURSIVE_TARGETS): - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - --$(RECURSIVE_CLEAN_TARGETS): -- @fail= failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -- dot_seen=no; \ -- case "$@" in \ -- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -- *) list='$(SUBDIRS)' ;; \ -- esac; \ -- rev=''; for subdir in $$list; do \ -- if test "$$subdir" = "."; then :; else \ -- rev="$$subdir $$rev"; \ -- fi; \ -- done; \ -- rev="$$rev ."; \ -- target=`echo $@ | sed s/-recursive//`; \ -- for subdir in $$rev; do \ -- echo "Making $$target in $$subdir"; \ -- if test "$$subdir" = "."; then \ -- local_target="$$target-am"; \ -- else \ -- local_target="$$target"; \ -- fi; \ -- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || eval $$failcom; \ -- done && test -z "$$fail" --tags-recursive: -- list='$(SUBDIRS)'; for subdir in $$list; do \ -- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ -- done --ctags-recursive: -- list='$(SUBDIRS)'; for subdir in $$list; do \ -- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ -- done -+ID: $(am__tagged_files) -+ $(am__define_uniq_tagged_files); mkid -fID $$unique -+tags: tags-recursive -+TAGS: tags - --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ - if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ -@@ -369,12 +413,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ -@@ -386,15 +425,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $$unique; \ - fi; \ - fi --ctags: CTAGS --CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ctags: ctags-recursive -+ -+CTAGS: ctags -+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) -+ $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique -@@ -403,6 +438,21 @@ GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -+cscopelist: cscopelist-recursive -+ -+cscopelist-am: $(am__tagged_files) -+ list='$(am__tagged_files)'; \ -+ case "$(srcdir)" in \ -+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ -+ *) sdir=$(subdir)/$(srcdir) ;; \ -+ esac; \ -+ for i in $$list; do \ -+ if test -f "$$i"; then \ -+ echo "$(subdir)/$$i"; \ -+ else \ -+ echo "$$sdir/$$i"; \ -+ fi; \ -+ done >> $(top_builddir)/cscope.files - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -@@ -439,13 +489,10 @@ distdir: $(DISTFILES) - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test -d "$(distdir)/$$subdir" \ -- || $(MKDIR_P) "$(distdir)/$$subdir" \ -- || exit 1; \ -- fi; \ -- done -- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ -- if test "$$subdir" = .; then :; else \ -+ $(am__make_dryrun) \ -+ || test -d "$(distdir)/$$subdir" \ -+ || $(MKDIR_P) "$(distdir)/$$subdir" \ -+ || exit 1; \ - dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ - $(am__relativize); \ - new_distdir=$$reldir; \ -@@ -480,10 +527,15 @@ install-am: all-am - - installcheck: installcheck-recursive - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+ if test -z '$(STRIP)'; then \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ install; \ -+ else \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -+ fi - mostlyclean-generic: - - clean-generic: -@@ -561,22 +613,20 @@ ps-am: - - uninstall-am: - --.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ -- install-am install-strip tags-recursive -- --.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ -- all all-am check check-am clean clean-generic clean-libtool \ -- ctags ctags-recursive distclean distclean-generic \ -- distclean-libtool distclean-tags distdir dvi dvi-am html \ -- html-am info info-am install install-am install-data \ -- install-data-am install-dvi install-dvi-am install-exec \ -- install-exec-am install-html install-html-am install-info \ -- install-info-am install-man install-pdf install-pdf-am \ -- install-ps install-ps-am install-strip installcheck \ -- installcheck-am installdirs installdirs-am maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-generic \ -- mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ -- uninstall uninstall-am -+.MAKE: $(am__recursive_targets) install-am install-strip -+ -+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ -+ check-am clean clean-generic clean-libtool cscopelist-am ctags \ -+ ctags-am distclean distclean-generic distclean-libtool \ -+ distclean-tags distdir dvi dvi-am html html-am info info-am \ -+ install install-am install-data install-data-am install-dvi \ -+ install-dvi-am install-exec install-exec-am install-html \ -+ install-html-am install-info install-info-am install-man \ -+ install-pdf install-pdf-am install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ installdirs-am maintainer-clean maintainer-clean-generic \ -+ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ -+ ps ps-am tags tags-am uninstall uninstall-am - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff --git a/src/modules_projection/pj_georeference/Makefile.in b/src/modules_projection/pj_georeference/Makefile.in -index 8781e15..52c183c 100644 ---- a/src/modules_projection/pj_georeference/Makefile.in -+++ b/src/modules_projection/pj_georeference/Makefile.in -@@ -1,9 +1,8 @@ --# Makefile.in generated by automake 1.11.1 from Makefile.am. -+# Makefile.in generated by automake 1.14 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, --# Inc. -+# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+ - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -15,6 +14,51 @@ - - @SET_MAKE@ - VPATH = @srcdir@ -+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -+am__make_running_with_option = \ -+ case $${target_option-} in \ -+ ?) ;; \ -+ *) echo "am__make_running_with_option: internal error: invalid" \ -+ "target option '$${target_option-}' specified" >&2; \ -+ exit 1;; \ -+ esac; \ -+ has_opt=no; \ -+ sane_makeflags=$$MAKEFLAGS; \ -+ if $(am__is_gnu_make); then \ -+ sane_makeflags=$$MFLAGS; \ -+ else \ -+ case $$MAKEFLAGS in \ -+ *\\[\ \ ]*) \ -+ bs=\\; \ -+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -+ esac; \ -+ fi; \ -+ skip_next=no; \ -+ strip_trailopt () \ -+ { \ -+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -+ }; \ -+ for flg in $$sane_makeflags; do \ -+ test $$skip_next = yes && { skip_next=no; continue; }; \ -+ case $$flg in \ -+ *=*|--*) continue;; \ -+ -*I) strip_trailopt 'I'; skip_next=yes;; \ -+ -*I?*) strip_trailopt 'I';; \ -+ -*O) strip_trailopt 'O'; skip_next=yes;; \ -+ -*O?*) strip_trailopt 'O';; \ -+ -*l) strip_trailopt 'l'; skip_next=yes;; \ -+ -*l?*) strip_trailopt 'l';; \ -+ -[dEDm]) skip_next=yes;; \ -+ -[JT]) skip_next=yes;; \ -+ esac; \ -+ case $$flg in \ -+ *$$target_option*) has_opt=yes; break;; \ -+ esac; \ -+ done; \ -+ test $$has_opt = yes -+am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -+am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -34,7 +78,7 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - subdir = src/modules_projection/pj_georeference --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ - $(top_srcdir)/m4/ax_python_devel.m4 \ -@@ -49,20 +93,58 @@ mkinstalldirs = $(install_sh) -d - CONFIG_HEADER = $(top_builddir)/config.h - CONFIG_CLEAN_FILES = - CONFIG_CLEAN_VPATH_FILES = -+AM_V_P = $(am__v_P_@AM_V@) -+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -+am__v_P_0 = false -+am__v_P_1 = : -+AM_V_GEN = $(am__v_GEN_@AM_V@) -+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+am__v_GEN_0 = @echo " GEN " $@; -+am__v_GEN_1 = -+AM_V_at = $(am__v_at_@AM_V@) -+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+am__v_at_0 = @ -+am__v_at_1 = - SOURCES = - DIST_SOURCES = --RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ -- html-recursive info-recursive install-data-recursive \ -- install-dvi-recursive install-exec-recursive \ -- install-html-recursive install-info-recursive \ -- install-pdf-recursive install-ps-recursive install-recursive \ -- installcheck-recursive installdirs-recursive pdf-recursive \ -- ps-recursive uninstall-recursive -+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ -+ ctags-recursive dvi-recursive html-recursive info-recursive \ -+ install-data-recursive install-dvi-recursive \ -+ install-exec-recursive install-html-recursive \ -+ install-info-recursive install-pdf-recursive \ -+ install-ps-recursive install-recursive installcheck-recursive \ -+ installdirs-recursive pdf-recursive ps-recursive \ -+ tags-recursive uninstall-recursive -+am__can_run_installinfo = \ -+ case $$AM_UPDATE_INFO_DIR in \ -+ n|no|NO) false;; \ -+ *) (install-info --version) >/dev/null 2>&1;; \ -+ esac - RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ - distclean-recursive maintainer-clean-recursive --AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ -- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ -+am__recursive_targets = \ -+ $(RECURSIVE_TARGETS) \ -+ $(RECURSIVE_CLEAN_TARGETS) \ -+ $(am__extra_recursive_targets) -+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ - distdir -+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -+# Read a list of newline-separated strings from the standard input, -+# and print each of them once, without duplicates. Input order is -+# *not* preserved. -+am__uniquify_input = $(AWK) '\ -+ BEGIN { nonempty = 0; } \ -+ { items[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in items) print i; }; } \ -+' -+# Make sure the list of sources is unique. This is necessary because, -+# e.g., the same source file might be shared among _SOURCES variables -+# for different programs/libraries. -+am__define_uniq_tagged_files = \ -+ list='$(am__tagged_files)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | $(am__uniquify_input)` - ETAGS = etags - CTAGS = ctags - DIST_SUBDIRS = $(SUBDIRS) -@@ -94,6 +176,7 @@ am__relativize = \ - reldir="$$dir2" - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ -+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ -@@ -114,6 +197,7 @@ CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DISABLELIBHARU = @DISABLELIBHARU@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -141,6 +225,7 @@ LOCAL_INCS = @LOCAL_INCS@ - LOCAL_LIBS = @LOCAL_LIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - NM = @NM@ - NMEDIT = @NMEDIT@ -@@ -153,6 +238,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - POW_LIB = @POW_LIB@ -@@ -178,6 +264,7 @@ abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -@@ -211,7 +298,6 @@ libdir = @libdir@ - libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -@@ -273,22 +359,25 @@ clean-libtool: - -rm -rf .libs _libs - - # This directory's subdirectories are mostly independent; you can cd --# into them and run `make' without going through this Makefile. --# To change the values of `make' variables: instead of editing Makefiles, --# (1) if the variable is set in `config.status', edit `config.status' --# (which will cause the Makefiles to be regenerated when you run `make'); --# (2) otherwise, pass the desired values on the `make' command line. --$(RECURSIVE_TARGETS): -- @fail= failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -+# into them and run 'make' without going through this Makefile. -+# To change the values of 'make' variables: instead of editing Makefiles, -+# (1) if the variable is set in 'config.status', edit 'config.status' -+# (which will cause the Makefiles to be regenerated when you run 'make'); -+# (2) otherwise, pass the desired values on the 'make' command line. -+$(am__recursive_targets): -+ @fail=; \ -+ if $(am__make_keepgoing); then \ -+ failcom='fail=yes'; \ -+ else \ -+ failcom='exit 1'; \ -+ fi; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ -- list='$(SUBDIRS)'; for subdir in $$list; do \ -+ case "$@" in \ -+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -+ *) list='$(SUBDIRS)' ;; \ -+ esac; \ -+ for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ -@@ -303,57 +392,12 @@ $(RECURSIVE_TARGETS): - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - --$(RECURSIVE_CLEAN_TARGETS): -- @fail= failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -- dot_seen=no; \ -- case "$@" in \ -- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -- *) list='$(SUBDIRS)' ;; \ -- esac; \ -- rev=''; for subdir in $$list; do \ -- if test "$$subdir" = "."; then :; else \ -- rev="$$subdir $$rev"; \ -- fi; \ -- done; \ -- rev="$$rev ."; \ -- target=`echo $@ | sed s/-recursive//`; \ -- for subdir in $$rev; do \ -- echo "Making $$target in $$subdir"; \ -- if test "$$subdir" = "."; then \ -- local_target="$$target-am"; \ -- else \ -- local_target="$$target"; \ -- fi; \ -- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || eval $$failcom; \ -- done && test -z "$$fail" --tags-recursive: -- list='$(SUBDIRS)'; for subdir in $$list; do \ -- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ -- done --ctags-recursive: -- list='$(SUBDIRS)'; for subdir in $$list; do \ -- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ -- done -+ID: $(am__tagged_files) -+ $(am__define_uniq_tagged_files); mkid -fID $$unique -+tags: tags-recursive -+TAGS: tags - --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ - if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ -@@ -369,12 +413,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ -@@ -386,15 +425,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $$unique; \ - fi; \ - fi --ctags: CTAGS --CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ctags: ctags-recursive -+ -+CTAGS: ctags -+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) -+ $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique -@@ -403,6 +438,21 @@ GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -+cscopelist: cscopelist-recursive -+ -+cscopelist-am: $(am__tagged_files) -+ list='$(am__tagged_files)'; \ -+ case "$(srcdir)" in \ -+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ -+ *) sdir=$(subdir)/$(srcdir) ;; \ -+ esac; \ -+ for i in $$list; do \ -+ if test -f "$$i"; then \ -+ echo "$(subdir)/$$i"; \ -+ else \ -+ echo "$$sdir/$$i"; \ -+ fi; \ -+ done >> $(top_builddir)/cscope.files - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -@@ -439,13 +489,10 @@ distdir: $(DISTFILES) - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test -d "$(distdir)/$$subdir" \ -- || $(MKDIR_P) "$(distdir)/$$subdir" \ -- || exit 1; \ -- fi; \ -- done -- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ -- if test "$$subdir" = .; then :; else \ -+ $(am__make_dryrun) \ -+ || test -d "$(distdir)/$$subdir" \ -+ || $(MKDIR_P) "$(distdir)/$$subdir" \ -+ || exit 1; \ - dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ - $(am__relativize); \ - new_distdir=$$reldir; \ -@@ -480,10 +527,15 @@ install-am: all-am - - installcheck: installcheck-recursive - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+ if test -z '$(STRIP)'; then \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ install; \ -+ else \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -+ fi - mostlyclean-generic: - - clean-generic: -@@ -561,22 +613,20 @@ ps-am: - - uninstall-am: - --.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ -- install-am install-strip tags-recursive -- --.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ -- all all-am check check-am clean clean-generic clean-libtool \ -- ctags ctags-recursive distclean distclean-generic \ -- distclean-libtool distclean-tags distdir dvi dvi-am html \ -- html-am info info-am install install-am install-data \ -- install-data-am install-dvi install-dvi-am install-exec \ -- install-exec-am install-html install-html-am install-info \ -- install-info-am install-man install-pdf install-pdf-am \ -- install-ps install-ps-am install-strip installcheck \ -- installcheck-am installdirs installdirs-am maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-generic \ -- mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ -- uninstall uninstall-am -+.MAKE: $(am__recursive_targets) install-am install-strip -+ -+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ -+ check-am clean clean-generic clean-libtool cscopelist-am ctags \ -+ ctags-am distclean distclean-generic distclean-libtool \ -+ distclean-tags distdir dvi dvi-am html html-am info info-am \ -+ install install-am install-data install-data-am install-dvi \ -+ install-dvi-am install-exec install-exec-am install-html \ -+ install-html-am install-info install-info-am install-man \ -+ install-pdf install-pdf-am install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ installdirs-am maintainer-clean maintainer-clean-generic \ -+ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ -+ ps ps-am tags tags-am uninstall uninstall-am - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff --git a/src/modules_projection/pj_georeference/pj_georeference/Makefile.in b/src/modules_projection/pj_georeference/pj_georeference/Makefile.in -index f237a8e..25ffaf6 100644 ---- a/src/modules_projection/pj_georeference/pj_georeference/Makefile.in -+++ b/src/modules_projection/pj_georeference/pj_georeference/Makefile.in -@@ -1,9 +1,8 @@ --# Makefile.in generated by automake 1.11.1 from Makefile.am. -+# Makefile.in generated by automake 1.14 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, --# Inc. -+# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+ - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -16,6 +15,51 @@ - @SET_MAKE@ - - VPATH = @srcdir@ -+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -+am__make_running_with_option = \ -+ case $${target_option-} in \ -+ ?) ;; \ -+ *) echo "am__make_running_with_option: internal error: invalid" \ -+ "target option '$${target_option-}' specified" >&2; \ -+ exit 1;; \ -+ esac; \ -+ has_opt=no; \ -+ sane_makeflags=$$MAKEFLAGS; \ -+ if $(am__is_gnu_make); then \ -+ sane_makeflags=$$MFLAGS; \ -+ else \ -+ case $$MAKEFLAGS in \ -+ *\\[\ \ ]*) \ -+ bs=\\; \ -+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -+ esac; \ -+ fi; \ -+ skip_next=no; \ -+ strip_trailopt () \ -+ { \ -+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -+ }; \ -+ for flg in $$sane_makeflags; do \ -+ test $$skip_next = yes && { skip_next=no; continue; }; \ -+ case $$flg in \ -+ *=*|--*) continue;; \ -+ -*I) strip_trailopt 'I'; skip_next=yes;; \ -+ -*I?*) strip_trailopt 'I';; \ -+ -*O) strip_trailopt 'O'; skip_next=yes;; \ -+ -*O?*) strip_trailopt 'O';; \ -+ -*l) strip_trailopt 'l'; skip_next=yes;; \ -+ -*l?*) strip_trailopt 'l';; \ -+ -[dEDm]) skip_next=yes;; \ -+ -[JT]) skip_next=yes;; \ -+ esac; \ -+ case $$flg in \ -+ *$$target_option*) has_opt=yes; break;; \ -+ esac; \ -+ done; \ -+ test $$has_opt = yes -+am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -+am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -35,7 +79,8 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - subdir = src/modules_projection/pj_georeference/pj_georeference --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ -+ $(top_srcdir)/depcomp - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ - $(top_srcdir)/m4/ax_python_devel.m4 \ -@@ -71,6 +116,12 @@ am__nobase_list = $(am__nobase_strip_setup); \ - am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -+am__uninstall_files_from_dir = { \ -+ test -z "$$files" \ -+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ -+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ -+ $(am__cd) "$$dir" && rm -f $$files; }; \ -+ } - am__installdirs = "$(DESTDIR)$(pkglibdir)" - LTLIBRARIES = $(pkglib_LTLIBRARIES) - libpj_georeference_la_DEPENDENCIES = \ -@@ -80,35 +131,92 @@ am_libpj_georeference_la_OBJECTS = Collect_Points.lo \ - georef_grid_move.lo Georef_Shapes.lo MLB_Interface.lo enorm.lo \ - fdjac2.lo lmdif.lo lmdif0.lo lmpar.lo qrfac.lo qrsolv.lo - libpj_georeference_la_OBJECTS = $(am_libpj_georeference_la_OBJECTS) -+AM_V_lt = $(am__v_lt_@AM_V@) -+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -+am__v_lt_0 = --silent -+am__v_lt_1 = -+AM_V_P = $(am__v_P_@AM_V@) -+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -+am__v_P_0 = false -+am__v_P_1 = : -+AM_V_GEN = $(am__v_GEN_@AM_V@) -+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+am__v_GEN_0 = @echo " GEN " $@; -+am__v_GEN_1 = -+AM_V_at = $(am__v_at_@AM_V@) -+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+am__v_at_0 = @ -+am__v_at_1 = - DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - am__mv = mv -f - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CFLAGS) $(CFLAGS) -+AM_V_CC = $(am__v_CC_@AM_V@) -+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -+am__v_CC_0 = @echo " CC " $@; -+am__v_CC_1 = - CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CCLD = $(am__v_CCLD_@AM_V@) -+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -+am__v_CCLD_0 = @echo " CCLD " $@; -+am__v_CCLD_1 = - CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) --LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CXXFLAGS) $(CXXFLAGS) -+AM_V_CXX = $(am__v_CXX_@AM_V@) -+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) -+am__v_CXX_0 = @echo " CXX " $@; -+am__v_CXX_1 = - CXXLD = $(CXX) --CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ -+ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) -+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) -+am__v_CXXLD_0 = @echo " CXXLD " $@; -+am__v_CXXLD_1 = - SOURCES = $(libpj_georeference_la_SOURCES) - DIST_SOURCES = $(libpj_georeference_la_SOURCES) -+am__can_run_installinfo = \ -+ case $$AM_UPDATE_INFO_DIR in \ -+ n|no|NO) false;; \ -+ *) (install-info --version) >/dev/null 2>&1;; \ -+ esac -+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -+# Read a list of newline-separated strings from the standard input, -+# and print each of them once, without duplicates. Input order is -+# *not* preserved. -+am__uniquify_input = $(AWK) '\ -+ BEGIN { nonempty = 0; } \ -+ { items[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in items) print i; }; } \ -+' -+# Make sure the list of sources is unique. This is necessary because, -+# e.g., the same source file might be shared among _SOURCES variables -+# for different programs/libraries. -+am__define_uniq_tagged_files = \ -+ list='$(am__tagged_files)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | $(am__uniquify_input)` - ETAGS = etags - CTAGS = ctags - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ -+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ -@@ -129,6 +237,7 @@ CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DISABLELIBHARU = @DISABLELIBHARU@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -156,6 +265,7 @@ LOCAL_INCS = @LOCAL_INCS@ - LOCAL_LIBS = @LOCAL_LIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - NM = @NM@ - NMEDIT = @NMEDIT@ -@@ -168,6 +278,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - POW_LIB = @POW_LIB@ -@@ -193,6 +304,7 @@ abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -@@ -226,7 +338,6 @@ libdir = @libdir@ - libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -@@ -317,9 +428,9 @@ $(top_srcdir)/configure: $(am__configure_deps) - $(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - $(am__aclocal_m4_deps): -+ - install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" - @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ - list2=; for p in $$list; do \ - if test -f $$p; then \ -@@ -327,6 +438,8 @@ install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - else :; fi; \ - done; \ - test -z "$$list2" || { \ -+ echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \ -+ $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \ - } -@@ -342,14 +455,17 @@ uninstall-pkglibLTLIBRARIES: - - clean-pkglibLTLIBRARIES: - -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES) -- @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \ -- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -- echo "rm -f \"$${dir}/so_locations\""; \ -- rm -f "$${dir}/so_locations"; \ -- done --libpj_georeference.la: $(libpj_georeference_la_OBJECTS) $(libpj_georeference_la_DEPENDENCIES) -- $(CXXLINK) -rpath $(pkglibdir) $(libpj_georeference_la_OBJECTS) $(libpj_georeference_la_LIBADD) $(LIBS) -+ @list='$(pkglib_LTLIBRARIES)'; \ -+ locs=`for p in $$list; do echo $$p; done | \ -+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ -+ sort -u`; \ -+ test -z "$$locs" || { \ -+ echo rm -f $${locs}; \ -+ rm -f $${locs}; \ -+ } -+ -+libpj_georeference.la: $(libpj_georeference_la_OBJECTS) $(libpj_georeference_la_DEPENDENCIES) $(EXTRA_libpj_georeference_la_DEPENDENCIES) -+ $(AM_V_CXXLD)$(CXXLINK) -rpath $(pkglibdir) $(libpj_georeference_la_OBJECTS) $(libpj_georeference_la_LIBADD) $(LIBS) - - mostlyclean-compile: - -rm -f *.$(OBJEXT) -@@ -373,46 +489,46 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/qrsolv.Plo@am__quote@ - - .c.o: --@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(COMPILE) -c $< -+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< - - .c.obj: --@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` --@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` -+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - - .c.lo: --@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< -+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< - - .cpp.o: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< - - .cpp.obj: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - - .cpp.lo: --@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< - - mostlyclean-libtool: - -rm -f *.lo -@@ -420,26 +536,15 @@ mostlyclean-libtool: - clean-libtool: - -rm -rf .libs _libs - --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -+ID: $(am__tagged_files) -+ $(am__define_uniq_tagged_files); mkid -fID $$unique -+tags: tags-am -+TAGS: tags -+ -+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ -@@ -451,15 +556,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $$unique; \ - fi; \ - fi --ctags: CTAGS --CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ctags: ctags-am -+ -+CTAGS: ctags -+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) -+ $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique -@@ -468,6 +569,21 @@ GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -+cscopelist: cscopelist-am -+ -+cscopelist-am: $(am__tagged_files) -+ list='$(am__tagged_files)'; \ -+ case "$(srcdir)" in \ -+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ -+ *) sdir=$(subdir)/$(srcdir) ;; \ -+ esac; \ -+ for i in $$list; do \ -+ if test -f "$$i"; then \ -+ echo "$(subdir)/$$i"; \ -+ else \ -+ echo "$$sdir/$$i"; \ -+ fi; \ -+ done >> $(top_builddir)/cscope.files - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -@@ -519,10 +635,15 @@ install-am: all-am - - installcheck: installcheck-am - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+ if test -z '$(STRIP)'; then \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ install; \ -+ else \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -+ fi - mostlyclean-generic: - - clean-generic: -@@ -607,19 +728,20 @@ uninstall-am: uninstall-pkglibLTLIBRARIES - - .MAKE: install-am install-strip - --.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ -- clean-libtool clean-pkglibLTLIBRARIES ctags distclean \ -- distclean-compile distclean-generic distclean-libtool \ -- distclean-tags distdir dvi dvi-am html html-am info info-am \ -- install install-am install-data install-data-am install-dvi \ -- install-dvi-am install-exec install-exec-am install-html \ -- install-html-am install-info install-info-am install-man \ -- install-pdf install-pdf-am install-pkglibLTLIBRARIES \ -- install-ps install-ps-am install-strip installcheck \ -- installcheck-am installdirs maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-compile \ -- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -- tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES -+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ -+ clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \ -+ ctags-am distclean distclean-compile distclean-generic \ -+ distclean-libtool distclean-tags distdir dvi dvi-am html \ -+ html-am info info-am install install-am install-data \ -+ install-data-am install-dvi install-dvi-am install-exec \ -+ install-exec-am install-html install-html-am install-info \ -+ install-info-am install-man install-pdf install-pdf-am \ -+ install-pkglibLTLIBRARIES install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ maintainer-clean maintainer-clean-generic mostlyclean \ -+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ -+ pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ -+ uninstall-pkglibLTLIBRARIES - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff --git a/src/modules_projection/pj_proj4/Makefile.in b/src/modules_projection/pj_proj4/Makefile.in -index a4e38e2..8156478 100644 ---- a/src/modules_projection/pj_proj4/Makefile.in -+++ b/src/modules_projection/pj_proj4/Makefile.in -@@ -1,9 +1,8 @@ --# Makefile.in generated by automake 1.11.1 from Makefile.am. -+# Makefile.in generated by automake 1.14 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, --# Inc. -+# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+ - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -15,6 +14,51 @@ - - @SET_MAKE@ - VPATH = @srcdir@ -+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -+am__make_running_with_option = \ -+ case $${target_option-} in \ -+ ?) ;; \ -+ *) echo "am__make_running_with_option: internal error: invalid" \ -+ "target option '$${target_option-}' specified" >&2; \ -+ exit 1;; \ -+ esac; \ -+ has_opt=no; \ -+ sane_makeflags=$$MAKEFLAGS; \ -+ if $(am__is_gnu_make); then \ -+ sane_makeflags=$$MFLAGS; \ -+ else \ -+ case $$MAKEFLAGS in \ -+ *\\[\ \ ]*) \ -+ bs=\\; \ -+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -+ esac; \ -+ fi; \ -+ skip_next=no; \ -+ strip_trailopt () \ -+ { \ -+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -+ }; \ -+ for flg in $$sane_makeflags; do \ -+ test $$skip_next = yes && { skip_next=no; continue; }; \ -+ case $$flg in \ -+ *=*|--*) continue;; \ -+ -*I) strip_trailopt 'I'; skip_next=yes;; \ -+ -*I?*) strip_trailopt 'I';; \ -+ -*O) strip_trailopt 'O'; skip_next=yes;; \ -+ -*O?*) strip_trailopt 'O';; \ -+ -*l) strip_trailopt 'l'; skip_next=yes;; \ -+ -*l?*) strip_trailopt 'l';; \ -+ -[dEDm]) skip_next=yes;; \ -+ -[JT]) skip_next=yes;; \ -+ esac; \ -+ case $$flg in \ -+ *$$target_option*) has_opt=yes; break;; \ -+ esac; \ -+ done; \ -+ test $$has_opt = yes -+am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -+am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -34,7 +78,7 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - subdir = src/modules_projection/pj_proj4 --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ - $(top_srcdir)/m4/ax_python_devel.m4 \ -@@ -49,20 +93,58 @@ mkinstalldirs = $(install_sh) -d - CONFIG_HEADER = $(top_builddir)/config.h - CONFIG_CLEAN_FILES = - CONFIG_CLEAN_VPATH_FILES = -+AM_V_P = $(am__v_P_@AM_V@) -+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -+am__v_P_0 = false -+am__v_P_1 = : -+AM_V_GEN = $(am__v_GEN_@AM_V@) -+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+am__v_GEN_0 = @echo " GEN " $@; -+am__v_GEN_1 = -+AM_V_at = $(am__v_at_@AM_V@) -+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+am__v_at_0 = @ -+am__v_at_1 = - SOURCES = - DIST_SOURCES = --RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ -- html-recursive info-recursive install-data-recursive \ -- install-dvi-recursive install-exec-recursive \ -- install-html-recursive install-info-recursive \ -- install-pdf-recursive install-ps-recursive install-recursive \ -- installcheck-recursive installdirs-recursive pdf-recursive \ -- ps-recursive uninstall-recursive -+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ -+ ctags-recursive dvi-recursive html-recursive info-recursive \ -+ install-data-recursive install-dvi-recursive \ -+ install-exec-recursive install-html-recursive \ -+ install-info-recursive install-pdf-recursive \ -+ install-ps-recursive install-recursive installcheck-recursive \ -+ installdirs-recursive pdf-recursive ps-recursive \ -+ tags-recursive uninstall-recursive -+am__can_run_installinfo = \ -+ case $$AM_UPDATE_INFO_DIR in \ -+ n|no|NO) false;; \ -+ *) (install-info --version) >/dev/null 2>&1;; \ -+ esac - RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ - distclean-recursive maintainer-clean-recursive --AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ -- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ -+am__recursive_targets = \ -+ $(RECURSIVE_TARGETS) \ -+ $(RECURSIVE_CLEAN_TARGETS) \ -+ $(am__extra_recursive_targets) -+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ - distdir -+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -+# Read a list of newline-separated strings from the standard input, -+# and print each of them once, without duplicates. Input order is -+# *not* preserved. -+am__uniquify_input = $(AWK) '\ -+ BEGIN { nonempty = 0; } \ -+ { items[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in items) print i; }; } \ -+' -+# Make sure the list of sources is unique. This is necessary because, -+# e.g., the same source file might be shared among _SOURCES variables -+# for different programs/libraries. -+am__define_uniq_tagged_files = \ -+ list='$(am__tagged_files)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | $(am__uniquify_input)` - ETAGS = etags - CTAGS = ctags - DIST_SUBDIRS = $(SUBDIRS) -@@ -94,6 +176,7 @@ am__relativize = \ - reldir="$$dir2" - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ -+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ -@@ -114,6 +197,7 @@ CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DISABLELIBHARU = @DISABLELIBHARU@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -141,6 +225,7 @@ LOCAL_INCS = @LOCAL_INCS@ - LOCAL_LIBS = @LOCAL_LIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - NM = @NM@ - NMEDIT = @NMEDIT@ -@@ -153,6 +238,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - POW_LIB = @POW_LIB@ -@@ -178,6 +264,7 @@ abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -@@ -211,7 +298,6 @@ libdir = @libdir@ - libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -@@ -273,22 +359,25 @@ clean-libtool: - -rm -rf .libs _libs - - # This directory's subdirectories are mostly independent; you can cd --# into them and run `make' without going through this Makefile. --# To change the values of `make' variables: instead of editing Makefiles, --# (1) if the variable is set in `config.status', edit `config.status' --# (which will cause the Makefiles to be regenerated when you run `make'); --# (2) otherwise, pass the desired values on the `make' command line. --$(RECURSIVE_TARGETS): -- @fail= failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -+# into them and run 'make' without going through this Makefile. -+# To change the values of 'make' variables: instead of editing Makefiles, -+# (1) if the variable is set in 'config.status', edit 'config.status' -+# (which will cause the Makefiles to be regenerated when you run 'make'); -+# (2) otherwise, pass the desired values on the 'make' command line. -+$(am__recursive_targets): -+ @fail=; \ -+ if $(am__make_keepgoing); then \ -+ failcom='fail=yes'; \ -+ else \ -+ failcom='exit 1'; \ -+ fi; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ -- list='$(SUBDIRS)'; for subdir in $$list; do \ -+ case "$@" in \ -+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -+ *) list='$(SUBDIRS)' ;; \ -+ esac; \ -+ for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ -@@ -303,57 +392,12 @@ $(RECURSIVE_TARGETS): - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - --$(RECURSIVE_CLEAN_TARGETS): -- @fail= failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -- dot_seen=no; \ -- case "$@" in \ -- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -- *) list='$(SUBDIRS)' ;; \ -- esac; \ -- rev=''; for subdir in $$list; do \ -- if test "$$subdir" = "."; then :; else \ -- rev="$$subdir $$rev"; \ -- fi; \ -- done; \ -- rev="$$rev ."; \ -- target=`echo $@ | sed s/-recursive//`; \ -- for subdir in $$rev; do \ -- echo "Making $$target in $$subdir"; \ -- if test "$$subdir" = "."; then \ -- local_target="$$target-am"; \ -- else \ -- local_target="$$target"; \ -- fi; \ -- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || eval $$failcom; \ -- done && test -z "$$fail" --tags-recursive: -- list='$(SUBDIRS)'; for subdir in $$list; do \ -- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ -- done --ctags-recursive: -- list='$(SUBDIRS)'; for subdir in $$list; do \ -- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ -- done -+ID: $(am__tagged_files) -+ $(am__define_uniq_tagged_files); mkid -fID $$unique -+tags: tags-recursive -+TAGS: tags - --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ - if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ -@@ -369,12 +413,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ -@@ -386,15 +425,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $$unique; \ - fi; \ - fi --ctags: CTAGS --CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ctags: ctags-recursive -+ -+CTAGS: ctags -+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) -+ $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique -@@ -403,6 +438,21 @@ GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -+cscopelist: cscopelist-recursive -+ -+cscopelist-am: $(am__tagged_files) -+ list='$(am__tagged_files)'; \ -+ case "$(srcdir)" in \ -+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ -+ *) sdir=$(subdir)/$(srcdir) ;; \ -+ esac; \ -+ for i in $$list; do \ -+ if test -f "$$i"; then \ -+ echo "$(subdir)/$$i"; \ -+ else \ -+ echo "$$sdir/$$i"; \ -+ fi; \ -+ done >> $(top_builddir)/cscope.files - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -@@ -439,13 +489,10 @@ distdir: $(DISTFILES) - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test -d "$(distdir)/$$subdir" \ -- || $(MKDIR_P) "$(distdir)/$$subdir" \ -- || exit 1; \ -- fi; \ -- done -- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ -- if test "$$subdir" = .; then :; else \ -+ $(am__make_dryrun) \ -+ || test -d "$(distdir)/$$subdir" \ -+ || $(MKDIR_P) "$(distdir)/$$subdir" \ -+ || exit 1; \ - dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ - $(am__relativize); \ - new_distdir=$$reldir; \ -@@ -480,10 +527,15 @@ install-am: all-am - - installcheck: installcheck-recursive - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+ if test -z '$(STRIP)'; then \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ install; \ -+ else \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -+ fi - mostlyclean-generic: - - clean-generic: -@@ -561,22 +613,20 @@ ps-am: - - uninstall-am: - --.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ -- install-am install-strip tags-recursive -- --.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ -- all all-am check check-am clean clean-generic clean-libtool \ -- ctags ctags-recursive distclean distclean-generic \ -- distclean-libtool distclean-tags distdir dvi dvi-am html \ -- html-am info info-am install install-am install-data \ -- install-data-am install-dvi install-dvi-am install-exec \ -- install-exec-am install-html install-html-am install-info \ -- install-info-am install-man install-pdf install-pdf-am \ -- install-ps install-ps-am install-strip installcheck \ -- installcheck-am installdirs installdirs-am maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-generic \ -- mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ -- uninstall uninstall-am -+.MAKE: $(am__recursive_targets) install-am install-strip -+ -+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ -+ check-am clean clean-generic clean-libtool cscopelist-am ctags \ -+ ctags-am distclean distclean-generic distclean-libtool \ -+ distclean-tags distdir dvi dvi-am html html-am info info-am \ -+ install install-am install-data install-data-am install-dvi \ -+ install-dvi-am install-exec install-exec-am install-html \ -+ install-html-am install-info install-info-am install-man \ -+ install-pdf install-pdf-am install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ installdirs-am maintainer-clean maintainer-clean-generic \ -+ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ -+ ps ps-am tags tags-am uninstall uninstall-am - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff --git a/src/modules_projection/pj_proj4/pj_proj4/Makefile.in b/src/modules_projection/pj_proj4/pj_proj4/Makefile.in -index 3d2f318..b4189a6 100644 ---- a/src/modules_projection/pj_proj4/pj_proj4/Makefile.in -+++ b/src/modules_projection/pj_proj4/pj_proj4/Makefile.in -@@ -1,9 +1,8 @@ --# Makefile.in generated by automake 1.11.1 from Makefile.am. -+# Makefile.in generated by automake 1.14 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, --# Inc. -+# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+ - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -16,6 +15,51 @@ - @SET_MAKE@ - - VPATH = @srcdir@ -+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -+am__make_running_with_option = \ -+ case $${target_option-} in \ -+ ?) ;; \ -+ *) echo "am__make_running_with_option: internal error: invalid" \ -+ "target option '$${target_option-}' specified" >&2; \ -+ exit 1;; \ -+ esac; \ -+ has_opt=no; \ -+ sane_makeflags=$$MAKEFLAGS; \ -+ if $(am__is_gnu_make); then \ -+ sane_makeflags=$$MFLAGS; \ -+ else \ -+ case $$MAKEFLAGS in \ -+ *\\[\ \ ]*) \ -+ bs=\\; \ -+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -+ esac; \ -+ fi; \ -+ skip_next=no; \ -+ strip_trailopt () \ -+ { \ -+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -+ }; \ -+ for flg in $$sane_makeflags; do \ -+ test $$skip_next = yes && { skip_next=no; continue; }; \ -+ case $$flg in \ -+ *=*|--*) continue;; \ -+ -*I) strip_trailopt 'I'; skip_next=yes;; \ -+ -*I?*) strip_trailopt 'I';; \ -+ -*O) strip_trailopt 'O'; skip_next=yes;; \ -+ -*O?*) strip_trailopt 'O';; \ -+ -*l) strip_trailopt 'l'; skip_next=yes;; \ -+ -*l?*) strip_trailopt 'l';; \ -+ -[dEDm]) skip_next=yes;; \ -+ -[JT]) skip_next=yes;; \ -+ esac; \ -+ case $$flg in \ -+ *$$target_option*) has_opt=yes; break;; \ -+ esac; \ -+ done; \ -+ test $$has_opt = yes -+am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -+am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -35,7 +79,8 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - subdir = src/modules_projection/pj_proj4/pj_proj4 --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ -+ $(top_srcdir)/depcomp - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ - $(top_srcdir)/m4/ax_python_devel.m4 \ -@@ -71,6 +116,12 @@ am__nobase_list = $(am__nobase_strip_setup); \ - am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -+am__uninstall_files_from_dir = { \ -+ test -z "$$files" \ -+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ -+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ -+ $(am__cd) "$$dir" && rm -f $$files; }; \ -+ } - am__installdirs = "$(DESTDIR)$(pkglibdir)" - LTLIBRARIES = $(pkglib_LTLIBRARIES) - libpj_proj4_la_DEPENDENCIES = \ -@@ -79,35 +130,92 @@ am_libpj_proj4_la_OBJECTS = MLB_Interface.lo crs_assign.lo crs_base.lo \ - crs_transform.lo crs_transform_grid.lo crs_transform_shapes.lo \ - gcs_lon_range.lo PROJ4_Base.lo PROJ4_Grid.lo PROJ4_Shapes.lo - libpj_proj4_la_OBJECTS = $(am_libpj_proj4_la_OBJECTS) -+AM_V_lt = $(am__v_lt_@AM_V@) -+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -+am__v_lt_0 = --silent -+am__v_lt_1 = -+AM_V_P = $(am__v_P_@AM_V@) -+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -+am__v_P_0 = false -+am__v_P_1 = : -+AM_V_GEN = $(am__v_GEN_@AM_V@) -+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+am__v_GEN_0 = @echo " GEN " $@; -+am__v_GEN_1 = -+AM_V_at = $(am__v_at_@AM_V@) -+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+am__v_at_0 = @ -+am__v_at_1 = - DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - am__mv = mv -f - CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) --LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CXXFLAGS) $(CXXFLAGS) -+AM_V_CXX = $(am__v_CXX_@AM_V@) -+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) -+am__v_CXX_0 = @echo " CXX " $@; -+am__v_CXX_1 = - CXXLD = $(CXX) --CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ -+ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) -+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) -+am__v_CXXLD_0 = @echo " CXXLD " $@; -+am__v_CXXLD_1 = - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CFLAGS) $(CFLAGS) -+AM_V_CC = $(am__v_CC_@AM_V@) -+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -+am__v_CC_0 = @echo " CC " $@; -+am__v_CC_1 = - CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CCLD = $(am__v_CCLD_@AM_V@) -+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -+am__v_CCLD_0 = @echo " CCLD " $@; -+am__v_CCLD_1 = - SOURCES = $(libpj_proj4_la_SOURCES) - DIST_SOURCES = $(libpj_proj4_la_SOURCES) -+am__can_run_installinfo = \ -+ case $$AM_UPDATE_INFO_DIR in \ -+ n|no|NO) false;; \ -+ *) (install-info --version) >/dev/null 2>&1;; \ -+ esac -+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -+# Read a list of newline-separated strings from the standard input, -+# and print each of them once, without duplicates. Input order is -+# *not* preserved. -+am__uniquify_input = $(AWK) '\ -+ BEGIN { nonempty = 0; } \ -+ { items[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in items) print i; }; } \ -+' -+# Make sure the list of sources is unique. This is necessary because, -+# e.g., the same source file might be shared among _SOURCES variables -+# for different programs/libraries. -+am__define_uniq_tagged_files = \ -+ list='$(am__tagged_files)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | $(am__uniquify_input)` - ETAGS = etags - CTAGS = ctags - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ -+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ -@@ -128,6 +236,7 @@ CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DISABLELIBHARU = @DISABLELIBHARU@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -155,6 +264,7 @@ LOCAL_INCS = @LOCAL_INCS@ - LOCAL_LIBS = @LOCAL_LIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - NM = @NM@ - NMEDIT = @NMEDIT@ -@@ -167,6 +277,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - POW_LIB = @POW_LIB@ -@@ -192,6 +303,7 @@ abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -@@ -225,7 +337,6 @@ libdir = @libdir@ - libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -@@ -314,9 +425,9 @@ $(top_srcdir)/configure: $(am__configure_deps) - $(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - $(am__aclocal_m4_deps): -+ - install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" - @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ - list2=; for p in $$list; do \ - if test -f $$p; then \ -@@ -324,6 +435,8 @@ install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - else :; fi; \ - done; \ - test -z "$$list2" || { \ -+ echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \ -+ $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \ - } -@@ -339,14 +452,17 @@ uninstall-pkglibLTLIBRARIES: - - clean-pkglibLTLIBRARIES: - -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES) -- @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \ -- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -- echo "rm -f \"$${dir}/so_locations\""; \ -- rm -f "$${dir}/so_locations"; \ -- done --libpj_proj4.la: $(libpj_proj4_la_OBJECTS) $(libpj_proj4_la_DEPENDENCIES) -- $(CXXLINK) -rpath $(pkglibdir) $(libpj_proj4_la_OBJECTS) $(libpj_proj4_la_LIBADD) $(LIBS) -+ @list='$(pkglib_LTLIBRARIES)'; \ -+ locs=`for p in $$list; do echo $$p; done | \ -+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ -+ sort -u`; \ -+ test -z "$$locs" || { \ -+ echo rm -f $${locs}; \ -+ rm -f $${locs}; \ -+ } -+ -+libpj_proj4.la: $(libpj_proj4_la_OBJECTS) $(libpj_proj4_la_DEPENDENCIES) $(EXTRA_libpj_proj4_la_DEPENDENCIES) -+ $(AM_V_CXXLD)$(CXXLINK) -rpath $(pkglibdir) $(libpj_proj4_la_OBJECTS) $(libpj_proj4_la_LIBADD) $(LIBS) - - mostlyclean-compile: - -rm -f *.$(OBJEXT) -@@ -366,25 +482,25 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gcs_lon_range.Plo@am__quote@ - - .cpp.o: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< - - .cpp.obj: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - - .cpp.lo: --@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< - - mostlyclean-libtool: - -rm -f *.lo -@@ -392,26 +508,15 @@ mostlyclean-libtool: - clean-libtool: - -rm -rf .libs _libs - --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -+ID: $(am__tagged_files) -+ $(am__define_uniq_tagged_files); mkid -fID $$unique -+tags: tags-am -+TAGS: tags -+ -+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ -@@ -423,15 +528,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $$unique; \ - fi; \ - fi --ctags: CTAGS --CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ctags: ctags-am -+ -+CTAGS: ctags -+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) -+ $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique -@@ -440,6 +541,21 @@ GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -+cscopelist: cscopelist-am -+ -+cscopelist-am: $(am__tagged_files) -+ list='$(am__tagged_files)'; \ -+ case "$(srcdir)" in \ -+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ -+ *) sdir=$(subdir)/$(srcdir) ;; \ -+ esac; \ -+ for i in $$list; do \ -+ if test -f "$$i"; then \ -+ echo "$(subdir)/$$i"; \ -+ else \ -+ echo "$$sdir/$$i"; \ -+ fi; \ -+ done >> $(top_builddir)/cscope.files - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -@@ -491,10 +607,15 @@ install-am: all-am - - installcheck: installcheck-am - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+ if test -z '$(STRIP)'; then \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ install; \ -+ else \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -+ fi - mostlyclean-generic: - - clean-generic: -@@ -579,19 +700,20 @@ uninstall-am: uninstall-pkglibLTLIBRARIES - - .MAKE: install-am install-strip - --.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ -- clean-libtool clean-pkglibLTLIBRARIES ctags distclean \ -- distclean-compile distclean-generic distclean-libtool \ -- distclean-tags distdir dvi dvi-am html html-am info info-am \ -- install install-am install-data install-data-am install-dvi \ -- install-dvi-am install-exec install-exec-am install-html \ -- install-html-am install-info install-info-am install-man \ -- install-pdf install-pdf-am install-pkglibLTLIBRARIES \ -- install-ps install-ps-am install-strip installcheck \ -- installcheck-am installdirs maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-compile \ -- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -- tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES -+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ -+ clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \ -+ ctags-am distclean distclean-compile distclean-generic \ -+ distclean-libtool distclean-tags distdir dvi dvi-am html \ -+ html-am info info-am install install-am install-data \ -+ install-data-am install-dvi install-dvi-am install-exec \ -+ install-exec-am install-html install-html-am install-info \ -+ install-info-am install-man install-pdf install-pdf-am \ -+ install-pkglibLTLIBRARIES install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ maintainer-clean maintainer-clean-generic mostlyclean \ -+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ -+ pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ -+ uninstall-pkglibLTLIBRARIES - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff --git a/src/modules_recreations/Makefile.in b/src/modules_recreations/Makefile.in -index dca9d37..20f1511 100644 ---- a/src/modules_recreations/Makefile.in -+++ b/src/modules_recreations/Makefile.in -@@ -1,9 +1,8 @@ --# Makefile.in generated by automake 1.11.1 from Makefile.am. -+# Makefile.in generated by automake 1.14 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, --# Inc. -+# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+ - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -15,6 +14,51 @@ - - @SET_MAKE@ - VPATH = @srcdir@ -+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -+am__make_running_with_option = \ -+ case $${target_option-} in \ -+ ?) ;; \ -+ *) echo "am__make_running_with_option: internal error: invalid" \ -+ "target option '$${target_option-}' specified" >&2; \ -+ exit 1;; \ -+ esac; \ -+ has_opt=no; \ -+ sane_makeflags=$$MAKEFLAGS; \ -+ if $(am__is_gnu_make); then \ -+ sane_makeflags=$$MFLAGS; \ -+ else \ -+ case $$MAKEFLAGS in \ -+ *\\[\ \ ]*) \ -+ bs=\\; \ -+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -+ esac; \ -+ fi; \ -+ skip_next=no; \ -+ strip_trailopt () \ -+ { \ -+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -+ }; \ -+ for flg in $$sane_makeflags; do \ -+ test $$skip_next = yes && { skip_next=no; continue; }; \ -+ case $$flg in \ -+ *=*|--*) continue;; \ -+ -*I) strip_trailopt 'I'; skip_next=yes;; \ -+ -*I?*) strip_trailopt 'I';; \ -+ -*O) strip_trailopt 'O'; skip_next=yes;; \ -+ -*O?*) strip_trailopt 'O';; \ -+ -*l) strip_trailopt 'l'; skip_next=yes;; \ -+ -*l?*) strip_trailopt 'l';; \ -+ -[dEDm]) skip_next=yes;; \ -+ -[JT]) skip_next=yes;; \ -+ esac; \ -+ case $$flg in \ -+ *$$target_option*) has_opt=yes; break;; \ -+ esac; \ -+ done; \ -+ test $$has_opt = yes -+am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -+am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -34,7 +78,7 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - subdir = src/modules_recreations --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ - $(top_srcdir)/m4/ax_python_devel.m4 \ -@@ -49,20 +93,58 @@ mkinstalldirs = $(install_sh) -d - CONFIG_HEADER = $(top_builddir)/config.h - CONFIG_CLEAN_FILES = - CONFIG_CLEAN_VPATH_FILES = -+AM_V_P = $(am__v_P_@AM_V@) -+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -+am__v_P_0 = false -+am__v_P_1 = : -+AM_V_GEN = $(am__v_GEN_@AM_V@) -+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+am__v_GEN_0 = @echo " GEN " $@; -+am__v_GEN_1 = -+AM_V_at = $(am__v_at_@AM_V@) -+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+am__v_at_0 = @ -+am__v_at_1 = - SOURCES = - DIST_SOURCES = --RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ -- html-recursive info-recursive install-data-recursive \ -- install-dvi-recursive install-exec-recursive \ -- install-html-recursive install-info-recursive \ -- install-pdf-recursive install-ps-recursive install-recursive \ -- installcheck-recursive installdirs-recursive pdf-recursive \ -- ps-recursive uninstall-recursive -+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ -+ ctags-recursive dvi-recursive html-recursive info-recursive \ -+ install-data-recursive install-dvi-recursive \ -+ install-exec-recursive install-html-recursive \ -+ install-info-recursive install-pdf-recursive \ -+ install-ps-recursive install-recursive installcheck-recursive \ -+ installdirs-recursive pdf-recursive ps-recursive \ -+ tags-recursive uninstall-recursive -+am__can_run_installinfo = \ -+ case $$AM_UPDATE_INFO_DIR in \ -+ n|no|NO) false;; \ -+ *) (install-info --version) >/dev/null 2>&1;; \ -+ esac - RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ - distclean-recursive maintainer-clean-recursive --AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ -- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ -+am__recursive_targets = \ -+ $(RECURSIVE_TARGETS) \ -+ $(RECURSIVE_CLEAN_TARGETS) \ -+ $(am__extra_recursive_targets) -+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ - distdir -+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -+# Read a list of newline-separated strings from the standard input, -+# and print each of them once, without duplicates. Input order is -+# *not* preserved. -+am__uniquify_input = $(AWK) '\ -+ BEGIN { nonempty = 0; } \ -+ { items[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in items) print i; }; } \ -+' -+# Make sure the list of sources is unique. This is necessary because, -+# e.g., the same source file might be shared among _SOURCES variables -+# for different programs/libraries. -+am__define_uniq_tagged_files = \ -+ list='$(am__tagged_files)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | $(am__uniquify_input)` - ETAGS = etags - CTAGS = ctags - DIST_SUBDIRS = $(SUBDIRS) -@@ -94,6 +176,7 @@ am__relativize = \ - reldir="$$dir2" - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ -+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ -@@ -114,6 +197,7 @@ CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DISABLELIBHARU = @DISABLELIBHARU@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -141,6 +225,7 @@ LOCAL_INCS = @LOCAL_INCS@ - LOCAL_LIBS = @LOCAL_LIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - NM = @NM@ - NMEDIT = @NMEDIT@ -@@ -153,6 +238,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - POW_LIB = @POW_LIB@ -@@ -178,6 +264,7 @@ abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -@@ -211,7 +298,6 @@ libdir = @libdir@ - libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -@@ -273,22 +359,25 @@ clean-libtool: - -rm -rf .libs _libs - - # This directory's subdirectories are mostly independent; you can cd --# into them and run `make' without going through this Makefile. --# To change the values of `make' variables: instead of editing Makefiles, --# (1) if the variable is set in `config.status', edit `config.status' --# (which will cause the Makefiles to be regenerated when you run `make'); --# (2) otherwise, pass the desired values on the `make' command line. --$(RECURSIVE_TARGETS): -- @fail= failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -+# into them and run 'make' without going through this Makefile. -+# To change the values of 'make' variables: instead of editing Makefiles, -+# (1) if the variable is set in 'config.status', edit 'config.status' -+# (which will cause the Makefiles to be regenerated when you run 'make'); -+# (2) otherwise, pass the desired values on the 'make' command line. -+$(am__recursive_targets): -+ @fail=; \ -+ if $(am__make_keepgoing); then \ -+ failcom='fail=yes'; \ -+ else \ -+ failcom='exit 1'; \ -+ fi; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ -- list='$(SUBDIRS)'; for subdir in $$list; do \ -+ case "$@" in \ -+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -+ *) list='$(SUBDIRS)' ;; \ -+ esac; \ -+ for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ -@@ -303,57 +392,12 @@ $(RECURSIVE_TARGETS): - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - --$(RECURSIVE_CLEAN_TARGETS): -- @fail= failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -- dot_seen=no; \ -- case "$@" in \ -- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -- *) list='$(SUBDIRS)' ;; \ -- esac; \ -- rev=''; for subdir in $$list; do \ -- if test "$$subdir" = "."; then :; else \ -- rev="$$subdir $$rev"; \ -- fi; \ -- done; \ -- rev="$$rev ."; \ -- target=`echo $@ | sed s/-recursive//`; \ -- for subdir in $$rev; do \ -- echo "Making $$target in $$subdir"; \ -- if test "$$subdir" = "."; then \ -- local_target="$$target-am"; \ -- else \ -- local_target="$$target"; \ -- fi; \ -- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || eval $$failcom; \ -- done && test -z "$$fail" --tags-recursive: -- list='$(SUBDIRS)'; for subdir in $$list; do \ -- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ -- done --ctags-recursive: -- list='$(SUBDIRS)'; for subdir in $$list; do \ -- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ -- done -+ID: $(am__tagged_files) -+ $(am__define_uniq_tagged_files); mkid -fID $$unique -+tags: tags-recursive -+TAGS: tags - --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ - if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ -@@ -369,12 +413,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ -@@ -386,15 +425,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $$unique; \ - fi; \ - fi --ctags: CTAGS --CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ctags: ctags-recursive -+ -+CTAGS: ctags -+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) -+ $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique -@@ -403,6 +438,21 @@ GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -+cscopelist: cscopelist-recursive -+ -+cscopelist-am: $(am__tagged_files) -+ list='$(am__tagged_files)'; \ -+ case "$(srcdir)" in \ -+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ -+ *) sdir=$(subdir)/$(srcdir) ;; \ -+ esac; \ -+ for i in $$list; do \ -+ if test -f "$$i"; then \ -+ echo "$(subdir)/$$i"; \ -+ else \ -+ echo "$$sdir/$$i"; \ -+ fi; \ -+ done >> $(top_builddir)/cscope.files - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -@@ -439,13 +489,10 @@ distdir: $(DISTFILES) - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test -d "$(distdir)/$$subdir" \ -- || $(MKDIR_P) "$(distdir)/$$subdir" \ -- || exit 1; \ -- fi; \ -- done -- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ -- if test "$$subdir" = .; then :; else \ -+ $(am__make_dryrun) \ -+ || test -d "$(distdir)/$$subdir" \ -+ || $(MKDIR_P) "$(distdir)/$$subdir" \ -+ || exit 1; \ - dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ - $(am__relativize); \ - new_distdir=$$reldir; \ -@@ -480,10 +527,15 @@ install-am: all-am - - installcheck: installcheck-recursive - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+ if test -z '$(STRIP)'; then \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ install; \ -+ else \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -+ fi - mostlyclean-generic: - - clean-generic: -@@ -561,22 +613,20 @@ ps-am: - - uninstall-am: - --.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ -- install-am install-strip tags-recursive -- --.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ -- all all-am check check-am clean clean-generic clean-libtool \ -- ctags ctags-recursive distclean distclean-generic \ -- distclean-libtool distclean-tags distdir dvi dvi-am html \ -- html-am info info-am install install-am install-data \ -- install-data-am install-dvi install-dvi-am install-exec \ -- install-exec-am install-html install-html-am install-info \ -- install-info-am install-man install-pdf install-pdf-am \ -- install-ps install-ps-am install-strip installcheck \ -- installcheck-am installdirs installdirs-am maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-generic \ -- mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ -- uninstall uninstall-am -+.MAKE: $(am__recursive_targets) install-am install-strip -+ -+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ -+ check-am clean clean-generic clean-libtool cscopelist-am ctags \ -+ ctags-am distclean distclean-generic distclean-libtool \ -+ distclean-tags distdir dvi dvi-am html html-am info info-am \ -+ install install-am install-data install-data-am install-dvi \ -+ install-dvi-am install-exec install-exec-am install-html \ -+ install-html-am install-info install-info-am install-man \ -+ install-pdf install-pdf-am install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ installdirs-am maintainer-clean maintainer-clean-generic \ -+ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ -+ ps ps-am tags tags-am uninstall uninstall-am - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff --git a/src/modules_recreations/recreations/Makefile.in b/src/modules_recreations/recreations/Makefile.in -index f258567..3dd0f41 100644 ---- a/src/modules_recreations/recreations/Makefile.in -+++ b/src/modules_recreations/recreations/Makefile.in -@@ -1,9 +1,8 @@ --# Makefile.in generated by automake 1.11.1 from Makefile.am. -+# Makefile.in generated by automake 1.14 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, --# Inc. -+# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+ - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -15,6 +14,51 @@ - - @SET_MAKE@ - VPATH = @srcdir@ -+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -+am__make_running_with_option = \ -+ case $${target_option-} in \ -+ ?) ;; \ -+ *) echo "am__make_running_with_option: internal error: invalid" \ -+ "target option '$${target_option-}' specified" >&2; \ -+ exit 1;; \ -+ esac; \ -+ has_opt=no; \ -+ sane_makeflags=$$MAKEFLAGS; \ -+ if $(am__is_gnu_make); then \ -+ sane_makeflags=$$MFLAGS; \ -+ else \ -+ case $$MAKEFLAGS in \ -+ *\\[\ \ ]*) \ -+ bs=\\; \ -+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -+ esac; \ -+ fi; \ -+ skip_next=no; \ -+ strip_trailopt () \ -+ { \ -+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -+ }; \ -+ for flg in $$sane_makeflags; do \ -+ test $$skip_next = yes && { skip_next=no; continue; }; \ -+ case $$flg in \ -+ *=*|--*) continue;; \ -+ -*I) strip_trailopt 'I'; skip_next=yes;; \ -+ -*I?*) strip_trailopt 'I';; \ -+ -*O) strip_trailopt 'O'; skip_next=yes;; \ -+ -*O?*) strip_trailopt 'O';; \ -+ -*l) strip_trailopt 'l'; skip_next=yes;; \ -+ -*l?*) strip_trailopt 'l';; \ -+ -[dEDm]) skip_next=yes;; \ -+ -[JT]) skip_next=yes;; \ -+ esac; \ -+ case $$flg in \ -+ *$$target_option*) has_opt=yes; break;; \ -+ esac; \ -+ done; \ -+ test $$has_opt = yes -+am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -+am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -34,7 +78,7 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - subdir = src/modules_recreations/recreations --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ - $(top_srcdir)/m4/ax_python_devel.m4 \ -@@ -49,20 +93,58 @@ mkinstalldirs = $(install_sh) -d - CONFIG_HEADER = $(top_builddir)/config.h - CONFIG_CLEAN_FILES = - CONFIG_CLEAN_VPATH_FILES = -+AM_V_P = $(am__v_P_@AM_V@) -+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -+am__v_P_0 = false -+am__v_P_1 = : -+AM_V_GEN = $(am__v_GEN_@AM_V@) -+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+am__v_GEN_0 = @echo " GEN " $@; -+am__v_GEN_1 = -+AM_V_at = $(am__v_at_@AM_V@) -+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+am__v_at_0 = @ -+am__v_at_1 = - SOURCES = - DIST_SOURCES = --RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ -- html-recursive info-recursive install-data-recursive \ -- install-dvi-recursive install-exec-recursive \ -- install-html-recursive install-info-recursive \ -- install-pdf-recursive install-ps-recursive install-recursive \ -- installcheck-recursive installdirs-recursive pdf-recursive \ -- ps-recursive uninstall-recursive -+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ -+ ctags-recursive dvi-recursive html-recursive info-recursive \ -+ install-data-recursive install-dvi-recursive \ -+ install-exec-recursive install-html-recursive \ -+ install-info-recursive install-pdf-recursive \ -+ install-ps-recursive install-recursive installcheck-recursive \ -+ installdirs-recursive pdf-recursive ps-recursive \ -+ tags-recursive uninstall-recursive -+am__can_run_installinfo = \ -+ case $$AM_UPDATE_INFO_DIR in \ -+ n|no|NO) false;; \ -+ *) (install-info --version) >/dev/null 2>&1;; \ -+ esac - RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ - distclean-recursive maintainer-clean-recursive --AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ -- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ -+am__recursive_targets = \ -+ $(RECURSIVE_TARGETS) \ -+ $(RECURSIVE_CLEAN_TARGETS) \ -+ $(am__extra_recursive_targets) -+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ - distdir -+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -+# Read a list of newline-separated strings from the standard input, -+# and print each of them once, without duplicates. Input order is -+# *not* preserved. -+am__uniquify_input = $(AWK) '\ -+ BEGIN { nonempty = 0; } \ -+ { items[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in items) print i; }; } \ -+' -+# Make sure the list of sources is unique. This is necessary because, -+# e.g., the same source file might be shared among _SOURCES variables -+# for different programs/libraries. -+am__define_uniq_tagged_files = \ -+ list='$(am__tagged_files)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | $(am__uniquify_input)` - ETAGS = etags - CTAGS = ctags - DIST_SUBDIRS = $(SUBDIRS) -@@ -94,6 +176,7 @@ am__relativize = \ - reldir="$$dir2" - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ -+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ -@@ -114,6 +197,7 @@ CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DISABLELIBHARU = @DISABLELIBHARU@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -141,6 +225,7 @@ LOCAL_INCS = @LOCAL_INCS@ - LOCAL_LIBS = @LOCAL_LIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - NM = @NM@ - NMEDIT = @NMEDIT@ -@@ -153,6 +238,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - POW_LIB = @POW_LIB@ -@@ -178,6 +264,7 @@ abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -@@ -211,7 +298,6 @@ libdir = @libdir@ - libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -@@ -273,22 +359,25 @@ clean-libtool: - -rm -rf .libs _libs - - # This directory's subdirectories are mostly independent; you can cd --# into them and run `make' without going through this Makefile. --# To change the values of `make' variables: instead of editing Makefiles, --# (1) if the variable is set in `config.status', edit `config.status' --# (which will cause the Makefiles to be regenerated when you run `make'); --# (2) otherwise, pass the desired values on the `make' command line. --$(RECURSIVE_TARGETS): -- @fail= failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -+# into them and run 'make' without going through this Makefile. -+# To change the values of 'make' variables: instead of editing Makefiles, -+# (1) if the variable is set in 'config.status', edit 'config.status' -+# (which will cause the Makefiles to be regenerated when you run 'make'); -+# (2) otherwise, pass the desired values on the 'make' command line. -+$(am__recursive_targets): -+ @fail=; \ -+ if $(am__make_keepgoing); then \ -+ failcom='fail=yes'; \ -+ else \ -+ failcom='exit 1'; \ -+ fi; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ -- list='$(SUBDIRS)'; for subdir in $$list; do \ -+ case "$@" in \ -+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -+ *) list='$(SUBDIRS)' ;; \ -+ esac; \ -+ for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ -@@ -303,57 +392,12 @@ $(RECURSIVE_TARGETS): - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - --$(RECURSIVE_CLEAN_TARGETS): -- @fail= failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -- dot_seen=no; \ -- case "$@" in \ -- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -- *) list='$(SUBDIRS)' ;; \ -- esac; \ -- rev=''; for subdir in $$list; do \ -- if test "$$subdir" = "."; then :; else \ -- rev="$$subdir $$rev"; \ -- fi; \ -- done; \ -- rev="$$rev ."; \ -- target=`echo $@ | sed s/-recursive//`; \ -- for subdir in $$rev; do \ -- echo "Making $$target in $$subdir"; \ -- if test "$$subdir" = "."; then \ -- local_target="$$target-am"; \ -- else \ -- local_target="$$target"; \ -- fi; \ -- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || eval $$failcom; \ -- done && test -z "$$fail" --tags-recursive: -- list='$(SUBDIRS)'; for subdir in $$list; do \ -- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ -- done --ctags-recursive: -- list='$(SUBDIRS)'; for subdir in $$list; do \ -- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ -- done -+ID: $(am__tagged_files) -+ $(am__define_uniq_tagged_files); mkid -fID $$unique -+tags: tags-recursive -+TAGS: tags - --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ - if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ -@@ -369,12 +413,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ -@@ -386,15 +425,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $$unique; \ - fi; \ - fi --ctags: CTAGS --CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ctags: ctags-recursive -+ -+CTAGS: ctags -+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) -+ $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique -@@ -403,6 +438,21 @@ GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -+cscopelist: cscopelist-recursive -+ -+cscopelist-am: $(am__tagged_files) -+ list='$(am__tagged_files)'; \ -+ case "$(srcdir)" in \ -+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ -+ *) sdir=$(subdir)/$(srcdir) ;; \ -+ esac; \ -+ for i in $$list; do \ -+ if test -f "$$i"; then \ -+ echo "$(subdir)/$$i"; \ -+ else \ -+ echo "$$sdir/$$i"; \ -+ fi; \ -+ done >> $(top_builddir)/cscope.files - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -@@ -439,13 +489,10 @@ distdir: $(DISTFILES) - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test -d "$(distdir)/$$subdir" \ -- || $(MKDIR_P) "$(distdir)/$$subdir" \ -- || exit 1; \ -- fi; \ -- done -- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ -- if test "$$subdir" = .; then :; else \ -+ $(am__make_dryrun) \ -+ || test -d "$(distdir)/$$subdir" \ -+ || $(MKDIR_P) "$(distdir)/$$subdir" \ -+ || exit 1; \ - dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ - $(am__relativize); \ - new_distdir=$$reldir; \ -@@ -480,10 +527,15 @@ install-am: all-am - - installcheck: installcheck-recursive - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+ if test -z '$(STRIP)'; then \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ install; \ -+ else \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -+ fi - mostlyclean-generic: - - clean-generic: -@@ -561,22 +613,20 @@ ps-am: - - uninstall-am: - --.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ -- install-am install-strip tags-recursive -- --.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ -- all all-am check check-am clean clean-generic clean-libtool \ -- ctags ctags-recursive distclean distclean-generic \ -- distclean-libtool distclean-tags distdir dvi dvi-am html \ -- html-am info info-am install install-am install-data \ -- install-data-am install-dvi install-dvi-am install-exec \ -- install-exec-am install-html install-html-am install-info \ -- install-info-am install-man install-pdf install-pdf-am \ -- install-ps install-ps-am install-strip installcheck \ -- installcheck-am installdirs installdirs-am maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-generic \ -- mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ -- uninstall uninstall-am -+.MAKE: $(am__recursive_targets) install-am install-strip -+ -+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ -+ check-am clean clean-generic clean-libtool cscopelist-am ctags \ -+ ctags-am distclean distclean-generic distclean-libtool \ -+ distclean-tags distdir dvi dvi-am html html-am info info-am \ -+ install install-am install-data install-data-am install-dvi \ -+ install-dvi-am install-exec install-exec-am install-html \ -+ install-html-am install-info install-info-am install-man \ -+ install-pdf install-pdf-am install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ installdirs-am maintainer-clean maintainer-clean-generic \ -+ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ -+ ps ps-am tags tags-am uninstall uninstall-am - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff --git a/src/modules_recreations/recreations/recreations_fractals/Makefile.in b/src/modules_recreations/recreations/recreations_fractals/Makefile.in -index 7e3ed00..9c8a6b4 100644 ---- a/src/modules_recreations/recreations/recreations_fractals/Makefile.in -+++ b/src/modules_recreations/recreations/recreations_fractals/Makefile.in -@@ -1,9 +1,8 @@ --# Makefile.in generated by automake 1.11.1 from Makefile.am. -+# Makefile.in generated by automake 1.14 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, --# Inc. -+# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+ - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -16,6 +15,51 @@ - @SET_MAKE@ - - VPATH = @srcdir@ -+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -+am__make_running_with_option = \ -+ case $${target_option-} in \ -+ ?) ;; \ -+ *) echo "am__make_running_with_option: internal error: invalid" \ -+ "target option '$${target_option-}' specified" >&2; \ -+ exit 1;; \ -+ esac; \ -+ has_opt=no; \ -+ sane_makeflags=$$MAKEFLAGS; \ -+ if $(am__is_gnu_make); then \ -+ sane_makeflags=$$MFLAGS; \ -+ else \ -+ case $$MAKEFLAGS in \ -+ *\\[\ \ ]*) \ -+ bs=\\; \ -+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -+ esac; \ -+ fi; \ -+ skip_next=no; \ -+ strip_trailopt () \ -+ { \ -+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -+ }; \ -+ for flg in $$sane_makeflags; do \ -+ test $$skip_next = yes && { skip_next=no; continue; }; \ -+ case $$flg in \ -+ *=*|--*) continue;; \ -+ -*I) strip_trailopt 'I'; skip_next=yes;; \ -+ -*I?*) strip_trailopt 'I';; \ -+ -*O) strip_trailopt 'O'; skip_next=yes;; \ -+ -*O?*) strip_trailopt 'O';; \ -+ -*l) strip_trailopt 'l'; skip_next=yes;; \ -+ -*l?*) strip_trailopt 'l';; \ -+ -[dEDm]) skip_next=yes;; \ -+ -[JT]) skip_next=yes;; \ -+ esac; \ -+ case $$flg in \ -+ *$$target_option*) has_opt=yes; break;; \ -+ esac; \ -+ done; \ -+ test $$has_opt = yes -+am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -+am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -35,7 +79,8 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - subdir = src/modules_recreations/recreations/recreations_fractals --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ -+ $(top_srcdir)/depcomp - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ - $(top_srcdir)/m4/ax_python_devel.m4 \ -@@ -71,6 +116,12 @@ am__nobase_list = $(am__nobase_strip_setup); \ - am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -+am__uninstall_files_from_dir = { \ -+ test -z "$$files" \ -+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ -+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ -+ $(am__cd) "$$dir" && rm -f $$files; }; \ -+ } - am__installdirs = "$(DESTDIR)$(pkglibdir)" - LTLIBRARIES = $(pkglib_LTLIBRARIES) - librecreations_fractals_la_DEPENDENCIES = \ -@@ -80,35 +131,92 @@ am_librecreations_fractals_la_OBJECTS = Bifurcation.lo \ - MLB_Interface.lo Newton.lo Pythagoras_Tree.lo - librecreations_fractals_la_OBJECTS = \ - $(am_librecreations_fractals_la_OBJECTS) -+AM_V_lt = $(am__v_lt_@AM_V@) -+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -+am__v_lt_0 = --silent -+am__v_lt_1 = -+AM_V_P = $(am__v_P_@AM_V@) -+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -+am__v_P_0 = false -+am__v_P_1 = : -+AM_V_GEN = $(am__v_GEN_@AM_V@) -+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+am__v_GEN_0 = @echo " GEN " $@; -+am__v_GEN_1 = -+AM_V_at = $(am__v_at_@AM_V@) -+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+am__v_at_0 = @ -+am__v_at_1 = - DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - am__mv = mv -f - CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) --LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CXXFLAGS) $(CXXFLAGS) -+AM_V_CXX = $(am__v_CXX_@AM_V@) -+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) -+am__v_CXX_0 = @echo " CXX " $@; -+am__v_CXX_1 = - CXXLD = $(CXX) --CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ -+ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) -+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) -+am__v_CXXLD_0 = @echo " CXXLD " $@; -+am__v_CXXLD_1 = - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CFLAGS) $(CFLAGS) -+AM_V_CC = $(am__v_CC_@AM_V@) -+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -+am__v_CC_0 = @echo " CC " $@; -+am__v_CC_1 = - CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CCLD = $(am__v_CCLD_@AM_V@) -+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -+am__v_CCLD_0 = @echo " CCLD " $@; -+am__v_CCLD_1 = - SOURCES = $(librecreations_fractals_la_SOURCES) - DIST_SOURCES = $(librecreations_fractals_la_SOURCES) -+am__can_run_installinfo = \ -+ case $$AM_UPDATE_INFO_DIR in \ -+ n|no|NO) false;; \ -+ *) (install-info --version) >/dev/null 2>&1;; \ -+ esac -+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -+# Read a list of newline-separated strings from the standard input, -+# and print each of them once, without duplicates. Input order is -+# *not* preserved. -+am__uniquify_input = $(AWK) '\ -+ BEGIN { nonempty = 0; } \ -+ { items[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in items) print i; }; } \ -+' -+# Make sure the list of sources is unique. This is necessary because, -+# e.g., the same source file might be shared among _SOURCES variables -+# for different programs/libraries. -+am__define_uniq_tagged_files = \ -+ list='$(am__tagged_files)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | $(am__uniquify_input)` - ETAGS = etags - CTAGS = ctags - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ -+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ -@@ -129,6 +237,7 @@ CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DISABLELIBHARU = @DISABLELIBHARU@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -156,6 +265,7 @@ LOCAL_INCS = @LOCAL_INCS@ - LOCAL_LIBS = @LOCAL_LIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - NM = @NM@ - NMEDIT = @NMEDIT@ -@@ -168,6 +278,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - POW_LIB = @POW_LIB@ -@@ -193,6 +304,7 @@ abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -@@ -226,7 +338,6 @@ libdir = @libdir@ - libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -@@ -308,9 +419,9 @@ $(top_srcdir)/configure: $(am__configure_deps) - $(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - $(am__aclocal_m4_deps): -+ - install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" - @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ - list2=; for p in $$list; do \ - if test -f $$p; then \ -@@ -318,6 +429,8 @@ install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - else :; fi; \ - done; \ - test -z "$$list2" || { \ -+ echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \ -+ $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \ - } -@@ -333,14 +446,17 @@ uninstall-pkglibLTLIBRARIES: - - clean-pkglibLTLIBRARIES: - -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES) -- @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \ -- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -- echo "rm -f \"$${dir}/so_locations\""; \ -- rm -f "$${dir}/so_locations"; \ -- done --librecreations_fractals.la: $(librecreations_fractals_la_OBJECTS) $(librecreations_fractals_la_DEPENDENCIES) -- $(CXXLINK) -rpath $(pkglibdir) $(librecreations_fractals_la_OBJECTS) $(librecreations_fractals_la_LIBADD) $(LIBS) -+ @list='$(pkglib_LTLIBRARIES)'; \ -+ locs=`for p in $$list; do echo $$p; done | \ -+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ -+ sort -u`; \ -+ test -z "$$locs" || { \ -+ echo rm -f $${locs}; \ -+ rm -f $${locs}; \ -+ } -+ -+librecreations_fractals.la: $(librecreations_fractals_la_OBJECTS) $(librecreations_fractals_la_DEPENDENCIES) $(EXTRA_librecreations_fractals_la_DEPENDENCIES) -+ $(AM_V_CXXLD)$(CXXLINK) -rpath $(pkglibdir) $(librecreations_fractals_la_OBJECTS) $(librecreations_fractals_la_LIBADD) $(LIBS) - - mostlyclean-compile: - -rm -f *.$(OBJEXT) -@@ -357,25 +473,25 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Pythagoras_Tree.Plo@am__quote@ - - .cpp.o: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< - - .cpp.obj: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - - .cpp.lo: --@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< - - mostlyclean-libtool: - -rm -f *.lo -@@ -383,26 +499,15 @@ mostlyclean-libtool: - clean-libtool: - -rm -rf .libs _libs - --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -+ID: $(am__tagged_files) -+ $(am__define_uniq_tagged_files); mkid -fID $$unique -+tags: tags-am -+TAGS: tags -+ -+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ -@@ -414,15 +519,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $$unique; \ - fi; \ - fi --ctags: CTAGS --CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ctags: ctags-am -+ -+CTAGS: ctags -+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) -+ $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique -@@ -431,6 +532,21 @@ GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -+cscopelist: cscopelist-am -+ -+cscopelist-am: $(am__tagged_files) -+ list='$(am__tagged_files)'; \ -+ case "$(srcdir)" in \ -+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ -+ *) sdir=$(subdir)/$(srcdir) ;; \ -+ esac; \ -+ for i in $$list; do \ -+ if test -f "$$i"; then \ -+ echo "$(subdir)/$$i"; \ -+ else \ -+ echo "$$sdir/$$i"; \ -+ fi; \ -+ done >> $(top_builddir)/cscope.files - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -@@ -482,10 +598,15 @@ install-am: all-am - - installcheck: installcheck-am - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+ if test -z '$(STRIP)'; then \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ install; \ -+ else \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -+ fi - mostlyclean-generic: - - clean-generic: -@@ -570,19 +691,20 @@ uninstall-am: uninstall-pkglibLTLIBRARIES - - .MAKE: install-am install-strip - --.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ -- clean-libtool clean-pkglibLTLIBRARIES ctags distclean \ -- distclean-compile distclean-generic distclean-libtool \ -- distclean-tags distdir dvi dvi-am html html-am info info-am \ -- install install-am install-data install-data-am install-dvi \ -- install-dvi-am install-exec install-exec-am install-html \ -- install-html-am install-info install-info-am install-man \ -- install-pdf install-pdf-am install-pkglibLTLIBRARIES \ -- install-ps install-ps-am install-strip installcheck \ -- installcheck-am installdirs maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-compile \ -- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -- tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES -+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ -+ clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \ -+ ctags-am distclean distclean-compile distclean-generic \ -+ distclean-libtool distclean-tags distdir dvi dvi-am html \ -+ html-am info info-am install install-am install-data \ -+ install-data-am install-dvi install-dvi-am install-exec \ -+ install-exec-am install-html install-html-am install-info \ -+ install-info-am install-man install-pdf install-pdf-am \ -+ install-pkglibLTLIBRARIES install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ maintainer-clean maintainer-clean-generic mostlyclean \ -+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ -+ pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ -+ uninstall-pkglibLTLIBRARIES - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff --git a/src/modules_recreations/recreations/recreations_games/Makefile.in b/src/modules_recreations/recreations/recreations_games/Makefile.in -index 1129603..5924ff9 100644 ---- a/src/modules_recreations/recreations/recreations_games/Makefile.in -+++ b/src/modules_recreations/recreations/recreations_games/Makefile.in -@@ -1,9 +1,8 @@ --# Makefile.in generated by automake 1.11.1 from Makefile.am. -+# Makefile.in generated by automake 1.14 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, --# Inc. -+# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+ - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -16,6 +15,51 @@ - @SET_MAKE@ - - VPATH = @srcdir@ -+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -+am__make_running_with_option = \ -+ case $${target_option-} in \ -+ ?) ;; \ -+ *) echo "am__make_running_with_option: internal error: invalid" \ -+ "target option '$${target_option-}' specified" >&2; \ -+ exit 1;; \ -+ esac; \ -+ has_opt=no; \ -+ sane_makeflags=$$MAKEFLAGS; \ -+ if $(am__is_gnu_make); then \ -+ sane_makeflags=$$MFLAGS; \ -+ else \ -+ case $$MAKEFLAGS in \ -+ *\\[\ \ ]*) \ -+ bs=\\; \ -+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -+ esac; \ -+ fi; \ -+ skip_next=no; \ -+ strip_trailopt () \ -+ { \ -+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -+ }; \ -+ for flg in $$sane_makeflags; do \ -+ test $$skip_next = yes && { skip_next=no; continue; }; \ -+ case $$flg in \ -+ *=*|--*) continue;; \ -+ -*I) strip_trailopt 'I'; skip_next=yes;; \ -+ -*I?*) strip_trailopt 'I';; \ -+ -*O) strip_trailopt 'O'; skip_next=yes;; \ -+ -*O?*) strip_trailopt 'O';; \ -+ -*l) strip_trailopt 'l'; skip_next=yes;; \ -+ -*l?*) strip_trailopt 'l';; \ -+ -[dEDm]) skip_next=yes;; \ -+ -[JT]) skip_next=yes;; \ -+ esac; \ -+ case $$flg in \ -+ *$$target_option*) has_opt=yes; break;; \ -+ esac; \ -+ done; \ -+ test $$has_opt = yes -+am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -+am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -35,7 +79,8 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - subdir = src/modules_recreations/recreations/recreations_games --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ -+ $(top_srcdir)/depcomp - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ - $(top_srcdir)/m4/ax_python_devel.m4 \ -@@ -71,6 +116,12 @@ am__nobase_list = $(am__nobase_strip_setup); \ - am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -+am__uninstall_files_from_dir = { \ -+ test -z "$$files" \ -+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ -+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ -+ $(am__cd) "$$dir" && rm -f $$files; }; \ -+ } - am__installdirs = "$(DESTDIR)$(pkglibdir)" - LTLIBRARIES = $(pkglib_LTLIBRARIES) - librecreations_games_la_DEPENDENCIES = \ -@@ -79,35 +130,92 @@ am_librecreations_games_la_OBJECTS = Mine_Sweeper.lo \ - Mine_Sweeper_Res.lo MLB_Interface.lo Sudoku.lo - librecreations_games_la_OBJECTS = \ - $(am_librecreations_games_la_OBJECTS) -+AM_V_lt = $(am__v_lt_@AM_V@) -+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -+am__v_lt_0 = --silent -+am__v_lt_1 = -+AM_V_P = $(am__v_P_@AM_V@) -+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -+am__v_P_0 = false -+am__v_P_1 = : -+AM_V_GEN = $(am__v_GEN_@AM_V@) -+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+am__v_GEN_0 = @echo " GEN " $@; -+am__v_GEN_1 = -+AM_V_at = $(am__v_at_@AM_V@) -+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+am__v_at_0 = @ -+am__v_at_1 = - DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - am__mv = mv -f - CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) --LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CXXFLAGS) $(CXXFLAGS) -+AM_V_CXX = $(am__v_CXX_@AM_V@) -+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) -+am__v_CXX_0 = @echo " CXX " $@; -+am__v_CXX_1 = - CXXLD = $(CXX) --CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ -+ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) -+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) -+am__v_CXXLD_0 = @echo " CXXLD " $@; -+am__v_CXXLD_1 = - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CFLAGS) $(CFLAGS) -+AM_V_CC = $(am__v_CC_@AM_V@) -+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -+am__v_CC_0 = @echo " CC " $@; -+am__v_CC_1 = - CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CCLD = $(am__v_CCLD_@AM_V@) -+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -+am__v_CCLD_0 = @echo " CCLD " $@; -+am__v_CCLD_1 = - SOURCES = $(librecreations_games_la_SOURCES) - DIST_SOURCES = $(librecreations_games_la_SOURCES) -+am__can_run_installinfo = \ -+ case $$AM_UPDATE_INFO_DIR in \ -+ n|no|NO) false;; \ -+ *) (install-info --version) >/dev/null 2>&1;; \ -+ esac -+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -+# Read a list of newline-separated strings from the standard input, -+# and print each of them once, without duplicates. Input order is -+# *not* preserved. -+am__uniquify_input = $(AWK) '\ -+ BEGIN { nonempty = 0; } \ -+ { items[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in items) print i; }; } \ -+' -+# Make sure the list of sources is unique. This is necessary because, -+# e.g., the same source file might be shared among _SOURCES variables -+# for different programs/libraries. -+am__define_uniq_tagged_files = \ -+ list='$(am__tagged_files)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | $(am__uniquify_input)` - ETAGS = etags - CTAGS = ctags - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ -+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ -@@ -128,6 +236,7 @@ CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DISABLELIBHARU = @DISABLELIBHARU@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -155,6 +264,7 @@ LOCAL_INCS = @LOCAL_INCS@ - LOCAL_LIBS = @LOCAL_LIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - NM = @NM@ - NMEDIT = @NMEDIT@ -@@ -167,6 +277,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - POW_LIB = @POW_LIB@ -@@ -192,6 +303,7 @@ abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -@@ -225,7 +337,6 @@ libdir = @libdir@ - libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -@@ -300,9 +411,9 @@ $(top_srcdir)/configure: $(am__configure_deps) - $(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - $(am__aclocal_m4_deps): -+ - install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" - @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ - list2=; for p in $$list; do \ - if test -f $$p; then \ -@@ -310,6 +421,8 @@ install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - else :; fi; \ - done; \ - test -z "$$list2" || { \ -+ echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \ -+ $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \ - } -@@ -325,14 +438,17 @@ uninstall-pkglibLTLIBRARIES: - - clean-pkglibLTLIBRARIES: - -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES) -- @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \ -- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -- echo "rm -f \"$${dir}/so_locations\""; \ -- rm -f "$${dir}/so_locations"; \ -- done --librecreations_games.la: $(librecreations_games_la_OBJECTS) $(librecreations_games_la_DEPENDENCIES) -- $(CXXLINK) -rpath $(pkglibdir) $(librecreations_games_la_OBJECTS) $(librecreations_games_la_LIBADD) $(LIBS) -+ @list='$(pkglib_LTLIBRARIES)'; \ -+ locs=`for p in $$list; do echo $$p; done | \ -+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ -+ sort -u`; \ -+ test -z "$$locs" || { \ -+ echo rm -f $${locs}; \ -+ rm -f $${locs}; \ -+ } -+ -+librecreations_games.la: $(librecreations_games_la_OBJECTS) $(librecreations_games_la_DEPENDENCIES) $(EXTRA_librecreations_games_la_DEPENDENCIES) -+ $(AM_V_CXXLD)$(CXXLINK) -rpath $(pkglibdir) $(librecreations_games_la_OBJECTS) $(librecreations_games_la_LIBADD) $(LIBS) - - mostlyclean-compile: - -rm -f *.$(OBJEXT) -@@ -346,25 +462,25 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Sudoku.Plo@am__quote@ - - .cpp.o: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< - - .cpp.obj: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - - .cpp.lo: --@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< - - mostlyclean-libtool: - -rm -f *.lo -@@ -372,26 +488,15 @@ mostlyclean-libtool: - clean-libtool: - -rm -rf .libs _libs - --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -+ID: $(am__tagged_files) -+ $(am__define_uniq_tagged_files); mkid -fID $$unique -+tags: tags-am -+TAGS: tags -+ -+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ -@@ -403,15 +508,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $$unique; \ - fi; \ - fi --ctags: CTAGS --CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ctags: ctags-am -+ -+CTAGS: ctags -+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) -+ $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique -@@ -420,6 +521,21 @@ GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -+cscopelist: cscopelist-am -+ -+cscopelist-am: $(am__tagged_files) -+ list='$(am__tagged_files)'; \ -+ case "$(srcdir)" in \ -+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ -+ *) sdir=$(subdir)/$(srcdir) ;; \ -+ esac; \ -+ for i in $$list; do \ -+ if test -f "$$i"; then \ -+ echo "$(subdir)/$$i"; \ -+ else \ -+ echo "$$sdir/$$i"; \ -+ fi; \ -+ done >> $(top_builddir)/cscope.files - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -@@ -471,10 +587,15 @@ install-am: all-am - - installcheck: installcheck-am - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+ if test -z '$(STRIP)'; then \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ install; \ -+ else \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -+ fi - mostlyclean-generic: - - clean-generic: -@@ -559,19 +680,20 @@ uninstall-am: uninstall-pkglibLTLIBRARIES - - .MAKE: install-am install-strip - --.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ -- clean-libtool clean-pkglibLTLIBRARIES ctags distclean \ -- distclean-compile distclean-generic distclean-libtool \ -- distclean-tags distdir dvi dvi-am html html-am info info-am \ -- install install-am install-data install-data-am install-dvi \ -- install-dvi-am install-exec install-exec-am install-html \ -- install-html-am install-info install-info-am install-man \ -- install-pdf install-pdf-am install-pkglibLTLIBRARIES \ -- install-ps install-ps-am install-strip installcheck \ -- installcheck-am installdirs maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-compile \ -- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -- tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES -+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ -+ clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \ -+ ctags-am distclean distclean-compile distclean-generic \ -+ distclean-libtool distclean-tags distdir dvi dvi-am html \ -+ html-am info info-am install install-am install-data \ -+ install-data-am install-dvi install-dvi-am install-exec \ -+ install-exec-am install-html install-html-am install-info \ -+ install-info-am install-man install-pdf install-pdf-am \ -+ install-pkglibLTLIBRARIES install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ maintainer-clean maintainer-clean-generic mostlyclean \ -+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ -+ pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ -+ uninstall-pkglibLTLIBRARIES - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff --git a/src/modules_simulation/Makefile.in b/src/modules_simulation/Makefile.in -index b807e70..144b4ea 100644 ---- a/src/modules_simulation/Makefile.in -+++ b/src/modules_simulation/Makefile.in -@@ -1,9 +1,8 @@ --# Makefile.in generated by automake 1.11.1 from Makefile.am. -+# Makefile.in generated by automake 1.14 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, --# Inc. -+# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+ - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -15,6 +14,51 @@ - - @SET_MAKE@ - VPATH = @srcdir@ -+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -+am__make_running_with_option = \ -+ case $${target_option-} in \ -+ ?) ;; \ -+ *) echo "am__make_running_with_option: internal error: invalid" \ -+ "target option '$${target_option-}' specified" >&2; \ -+ exit 1;; \ -+ esac; \ -+ has_opt=no; \ -+ sane_makeflags=$$MAKEFLAGS; \ -+ if $(am__is_gnu_make); then \ -+ sane_makeflags=$$MFLAGS; \ -+ else \ -+ case $$MAKEFLAGS in \ -+ *\\[\ \ ]*) \ -+ bs=\\; \ -+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -+ esac; \ -+ fi; \ -+ skip_next=no; \ -+ strip_trailopt () \ -+ { \ -+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -+ }; \ -+ for flg in $$sane_makeflags; do \ -+ test $$skip_next = yes && { skip_next=no; continue; }; \ -+ case $$flg in \ -+ *=*|--*) continue;; \ -+ -*I) strip_trailopt 'I'; skip_next=yes;; \ -+ -*I?*) strip_trailopt 'I';; \ -+ -*O) strip_trailopt 'O'; skip_next=yes;; \ -+ -*O?*) strip_trailopt 'O';; \ -+ -*l) strip_trailopt 'l'; skip_next=yes;; \ -+ -*l?*) strip_trailopt 'l';; \ -+ -[dEDm]) skip_next=yes;; \ -+ -[JT]) skip_next=yes;; \ -+ esac; \ -+ case $$flg in \ -+ *$$target_option*) has_opt=yes; break;; \ -+ esac; \ -+ done; \ -+ test $$has_opt = yes -+am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -+am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -34,7 +78,7 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - subdir = src/modules_simulation --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ - $(top_srcdir)/m4/ax_python_devel.m4 \ -@@ -49,20 +93,58 @@ mkinstalldirs = $(install_sh) -d - CONFIG_HEADER = $(top_builddir)/config.h - CONFIG_CLEAN_FILES = - CONFIG_CLEAN_VPATH_FILES = -+AM_V_P = $(am__v_P_@AM_V@) -+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -+am__v_P_0 = false -+am__v_P_1 = : -+AM_V_GEN = $(am__v_GEN_@AM_V@) -+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+am__v_GEN_0 = @echo " GEN " $@; -+am__v_GEN_1 = -+AM_V_at = $(am__v_at_@AM_V@) -+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+am__v_at_0 = @ -+am__v_at_1 = - SOURCES = - DIST_SOURCES = --RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ -- html-recursive info-recursive install-data-recursive \ -- install-dvi-recursive install-exec-recursive \ -- install-html-recursive install-info-recursive \ -- install-pdf-recursive install-ps-recursive install-recursive \ -- installcheck-recursive installdirs-recursive pdf-recursive \ -- ps-recursive uninstall-recursive -+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ -+ ctags-recursive dvi-recursive html-recursive info-recursive \ -+ install-data-recursive install-dvi-recursive \ -+ install-exec-recursive install-html-recursive \ -+ install-info-recursive install-pdf-recursive \ -+ install-ps-recursive install-recursive installcheck-recursive \ -+ installdirs-recursive pdf-recursive ps-recursive \ -+ tags-recursive uninstall-recursive -+am__can_run_installinfo = \ -+ case $$AM_UPDATE_INFO_DIR in \ -+ n|no|NO) false;; \ -+ *) (install-info --version) >/dev/null 2>&1;; \ -+ esac - RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ - distclean-recursive maintainer-clean-recursive --AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ -- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ -+am__recursive_targets = \ -+ $(RECURSIVE_TARGETS) \ -+ $(RECURSIVE_CLEAN_TARGETS) \ -+ $(am__extra_recursive_targets) -+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ - distdir -+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -+# Read a list of newline-separated strings from the standard input, -+# and print each of them once, without duplicates. Input order is -+# *not* preserved. -+am__uniquify_input = $(AWK) '\ -+ BEGIN { nonempty = 0; } \ -+ { items[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in items) print i; }; } \ -+' -+# Make sure the list of sources is unique. This is necessary because, -+# e.g., the same source file might be shared among _SOURCES variables -+# for different programs/libraries. -+am__define_uniq_tagged_files = \ -+ list='$(am__tagged_files)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | $(am__uniquify_input)` - ETAGS = etags - CTAGS = ctags - DIST_SUBDIRS = $(SUBDIRS) -@@ -94,6 +176,7 @@ am__relativize = \ - reldir="$$dir2" - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ -+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ -@@ -114,6 +197,7 @@ CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DISABLELIBHARU = @DISABLELIBHARU@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -141,6 +225,7 @@ LOCAL_INCS = @LOCAL_INCS@ - LOCAL_LIBS = @LOCAL_LIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - NM = @NM@ - NMEDIT = @NMEDIT@ -@@ -153,6 +238,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - POW_LIB = @POW_LIB@ -@@ -178,6 +264,7 @@ abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -@@ -211,7 +298,6 @@ libdir = @libdir@ - libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -@@ -231,7 +317,7 @@ target_alias = @target_alias@ - top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ --SUBDIRS = hydrology fire ecosystems cellular_automata erosion -+SUBDIRS = hydrology ecosystems cellular_automata erosion - all: all-recursive - - .SUFFIXES: -@@ -273,22 +359,25 @@ clean-libtool: - -rm -rf .libs _libs - - # This directory's subdirectories are mostly independent; you can cd --# into them and run `make' without going through this Makefile. --# To change the values of `make' variables: instead of editing Makefiles, --# (1) if the variable is set in `config.status', edit `config.status' --# (which will cause the Makefiles to be regenerated when you run `make'); --# (2) otherwise, pass the desired values on the `make' command line. --$(RECURSIVE_TARGETS): -- @fail= failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -+# into them and run 'make' without going through this Makefile. -+# To change the values of 'make' variables: instead of editing Makefiles, -+# (1) if the variable is set in 'config.status', edit 'config.status' -+# (which will cause the Makefiles to be regenerated when you run 'make'); -+# (2) otherwise, pass the desired values on the 'make' command line. -+$(am__recursive_targets): -+ @fail=; \ -+ if $(am__make_keepgoing); then \ -+ failcom='fail=yes'; \ -+ else \ -+ failcom='exit 1'; \ -+ fi; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ -- list='$(SUBDIRS)'; for subdir in $$list; do \ -+ case "$@" in \ -+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -+ *) list='$(SUBDIRS)' ;; \ -+ esac; \ -+ for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ -@@ -303,57 +392,12 @@ $(RECURSIVE_TARGETS): - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - --$(RECURSIVE_CLEAN_TARGETS): -- @fail= failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -- dot_seen=no; \ -- case "$@" in \ -- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -- *) list='$(SUBDIRS)' ;; \ -- esac; \ -- rev=''; for subdir in $$list; do \ -- if test "$$subdir" = "."; then :; else \ -- rev="$$subdir $$rev"; \ -- fi; \ -- done; \ -- rev="$$rev ."; \ -- target=`echo $@ | sed s/-recursive//`; \ -- for subdir in $$rev; do \ -- echo "Making $$target in $$subdir"; \ -- if test "$$subdir" = "."; then \ -- local_target="$$target-am"; \ -- else \ -- local_target="$$target"; \ -- fi; \ -- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || eval $$failcom; \ -- done && test -z "$$fail" --tags-recursive: -- list='$(SUBDIRS)'; for subdir in $$list; do \ -- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ -- done --ctags-recursive: -- list='$(SUBDIRS)'; for subdir in $$list; do \ -- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ -- done -+ID: $(am__tagged_files) -+ $(am__define_uniq_tagged_files); mkid -fID $$unique -+tags: tags-recursive -+TAGS: tags - --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ - if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ -@@ -369,12 +413,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ -@@ -386,15 +425,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $$unique; \ - fi; \ - fi --ctags: CTAGS --CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ctags: ctags-recursive -+ -+CTAGS: ctags -+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) -+ $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique -@@ -403,6 +438,21 @@ GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -+cscopelist: cscopelist-recursive -+ -+cscopelist-am: $(am__tagged_files) -+ list='$(am__tagged_files)'; \ -+ case "$(srcdir)" in \ -+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ -+ *) sdir=$(subdir)/$(srcdir) ;; \ -+ esac; \ -+ for i in $$list; do \ -+ if test -f "$$i"; then \ -+ echo "$(subdir)/$$i"; \ -+ else \ -+ echo "$$sdir/$$i"; \ -+ fi; \ -+ done >> $(top_builddir)/cscope.files - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -@@ -439,13 +489,10 @@ distdir: $(DISTFILES) - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test -d "$(distdir)/$$subdir" \ -- || $(MKDIR_P) "$(distdir)/$$subdir" \ -- || exit 1; \ -- fi; \ -- done -- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ -- if test "$$subdir" = .; then :; else \ -+ $(am__make_dryrun) \ -+ || test -d "$(distdir)/$$subdir" \ -+ || $(MKDIR_P) "$(distdir)/$$subdir" \ -+ || exit 1; \ - dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ - $(am__relativize); \ - new_distdir=$$reldir; \ -@@ -480,10 +527,15 @@ install-am: all-am - - installcheck: installcheck-recursive - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+ if test -z '$(STRIP)'; then \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ install; \ -+ else \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -+ fi - mostlyclean-generic: - - clean-generic: -@@ -561,22 +613,20 @@ ps-am: - - uninstall-am: - --.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ -- install-am install-strip tags-recursive -- --.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ -- all all-am check check-am clean clean-generic clean-libtool \ -- ctags ctags-recursive distclean distclean-generic \ -- distclean-libtool distclean-tags distdir dvi dvi-am html \ -- html-am info info-am install install-am install-data \ -- install-data-am install-dvi install-dvi-am install-exec \ -- install-exec-am install-html install-html-am install-info \ -- install-info-am install-man install-pdf install-pdf-am \ -- install-ps install-ps-am install-strip installcheck \ -- installcheck-am installdirs installdirs-am maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-generic \ -- mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ -- uninstall uninstall-am -+.MAKE: $(am__recursive_targets) install-am install-strip -+ -+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ -+ check-am clean clean-generic clean-libtool cscopelist-am ctags \ -+ ctags-am distclean distclean-generic distclean-libtool \ -+ distclean-tags distdir dvi dvi-am html html-am info info-am \ -+ install install-am install-data install-data-am install-dvi \ -+ install-dvi-am install-exec install-exec-am install-html \ -+ install-html-am install-info install-info-am install-man \ -+ install-pdf install-pdf-am install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ installdirs-am maintainer-clean maintainer-clean-generic \ -+ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ -+ ps ps-am tags tags-am uninstall uninstall-am - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff --git a/src/modules_simulation/cellular_automata/Makefile.in b/src/modules_simulation/cellular_automata/Makefile.in -index dad3b3c..8af2d63 100644 ---- a/src/modules_simulation/cellular_automata/Makefile.in -+++ b/src/modules_simulation/cellular_automata/Makefile.in -@@ -1,9 +1,8 @@ --# Makefile.in generated by automake 1.11.1 from Makefile.am. -+# Makefile.in generated by automake 1.14 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, --# Inc. -+# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+ - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -15,6 +14,51 @@ - - @SET_MAKE@ - VPATH = @srcdir@ -+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -+am__make_running_with_option = \ -+ case $${target_option-} in \ -+ ?) ;; \ -+ *) echo "am__make_running_with_option: internal error: invalid" \ -+ "target option '$${target_option-}' specified" >&2; \ -+ exit 1;; \ -+ esac; \ -+ has_opt=no; \ -+ sane_makeflags=$$MAKEFLAGS; \ -+ if $(am__is_gnu_make); then \ -+ sane_makeflags=$$MFLAGS; \ -+ else \ -+ case $$MAKEFLAGS in \ -+ *\\[\ \ ]*) \ -+ bs=\\; \ -+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -+ esac; \ -+ fi; \ -+ skip_next=no; \ -+ strip_trailopt () \ -+ { \ -+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -+ }; \ -+ for flg in $$sane_makeflags; do \ -+ test $$skip_next = yes && { skip_next=no; continue; }; \ -+ case $$flg in \ -+ *=*|--*) continue;; \ -+ -*I) strip_trailopt 'I'; skip_next=yes;; \ -+ -*I?*) strip_trailopt 'I';; \ -+ -*O) strip_trailopt 'O'; skip_next=yes;; \ -+ -*O?*) strip_trailopt 'O';; \ -+ -*l) strip_trailopt 'l'; skip_next=yes;; \ -+ -*l?*) strip_trailopt 'l';; \ -+ -[dEDm]) skip_next=yes;; \ -+ -[JT]) skip_next=yes;; \ -+ esac; \ -+ case $$flg in \ -+ *$$target_option*) has_opt=yes; break;; \ -+ esac; \ -+ done; \ -+ test $$has_opt = yes -+am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -+am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -34,7 +78,7 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - subdir = src/modules_simulation/cellular_automata --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ - $(top_srcdir)/m4/ax_python_devel.m4 \ -@@ -49,20 +93,58 @@ mkinstalldirs = $(install_sh) -d - CONFIG_HEADER = $(top_builddir)/config.h - CONFIG_CLEAN_FILES = - CONFIG_CLEAN_VPATH_FILES = -+AM_V_P = $(am__v_P_@AM_V@) -+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -+am__v_P_0 = false -+am__v_P_1 = : -+AM_V_GEN = $(am__v_GEN_@AM_V@) -+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+am__v_GEN_0 = @echo " GEN " $@; -+am__v_GEN_1 = -+AM_V_at = $(am__v_at_@AM_V@) -+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+am__v_at_0 = @ -+am__v_at_1 = - SOURCES = - DIST_SOURCES = --RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ -- html-recursive info-recursive install-data-recursive \ -- install-dvi-recursive install-exec-recursive \ -- install-html-recursive install-info-recursive \ -- install-pdf-recursive install-ps-recursive install-recursive \ -- installcheck-recursive installdirs-recursive pdf-recursive \ -- ps-recursive uninstall-recursive -+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ -+ ctags-recursive dvi-recursive html-recursive info-recursive \ -+ install-data-recursive install-dvi-recursive \ -+ install-exec-recursive install-html-recursive \ -+ install-info-recursive install-pdf-recursive \ -+ install-ps-recursive install-recursive installcheck-recursive \ -+ installdirs-recursive pdf-recursive ps-recursive \ -+ tags-recursive uninstall-recursive -+am__can_run_installinfo = \ -+ case $$AM_UPDATE_INFO_DIR in \ -+ n|no|NO) false;; \ -+ *) (install-info --version) >/dev/null 2>&1;; \ -+ esac - RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ - distclean-recursive maintainer-clean-recursive --AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ -- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ -+am__recursive_targets = \ -+ $(RECURSIVE_TARGETS) \ -+ $(RECURSIVE_CLEAN_TARGETS) \ -+ $(am__extra_recursive_targets) -+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ - distdir -+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -+# Read a list of newline-separated strings from the standard input, -+# and print each of them once, without duplicates. Input order is -+# *not* preserved. -+am__uniquify_input = $(AWK) '\ -+ BEGIN { nonempty = 0; } \ -+ { items[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in items) print i; }; } \ -+' -+# Make sure the list of sources is unique. This is necessary because, -+# e.g., the same source file might be shared among _SOURCES variables -+# for different programs/libraries. -+am__define_uniq_tagged_files = \ -+ list='$(am__tagged_files)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | $(am__uniquify_input)` - ETAGS = etags - CTAGS = ctags - DIST_SUBDIRS = $(SUBDIRS) -@@ -94,6 +176,7 @@ am__relativize = \ - reldir="$$dir2" - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ -+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ -@@ -114,6 +197,7 @@ CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DISABLELIBHARU = @DISABLELIBHARU@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -141,6 +225,7 @@ LOCAL_INCS = @LOCAL_INCS@ - LOCAL_LIBS = @LOCAL_LIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - NM = @NM@ - NMEDIT = @NMEDIT@ -@@ -153,6 +238,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - POW_LIB = @POW_LIB@ -@@ -178,6 +264,7 @@ abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -@@ -211,7 +298,6 @@ libdir = @libdir@ - libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -@@ -273,22 +359,25 @@ clean-libtool: - -rm -rf .libs _libs - - # This directory's subdirectories are mostly independent; you can cd --# into them and run `make' without going through this Makefile. --# To change the values of `make' variables: instead of editing Makefiles, --# (1) if the variable is set in `config.status', edit `config.status' --# (which will cause the Makefiles to be regenerated when you run `make'); --# (2) otherwise, pass the desired values on the `make' command line. --$(RECURSIVE_TARGETS): -- @fail= failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -+# into them and run 'make' without going through this Makefile. -+# To change the values of 'make' variables: instead of editing Makefiles, -+# (1) if the variable is set in 'config.status', edit 'config.status' -+# (which will cause the Makefiles to be regenerated when you run 'make'); -+# (2) otherwise, pass the desired values on the 'make' command line. -+$(am__recursive_targets): -+ @fail=; \ -+ if $(am__make_keepgoing); then \ -+ failcom='fail=yes'; \ -+ else \ -+ failcom='exit 1'; \ -+ fi; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ -- list='$(SUBDIRS)'; for subdir in $$list; do \ -+ case "$@" in \ -+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -+ *) list='$(SUBDIRS)' ;; \ -+ esac; \ -+ for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ -@@ -303,57 +392,12 @@ $(RECURSIVE_TARGETS): - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - --$(RECURSIVE_CLEAN_TARGETS): -- @fail= failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -- dot_seen=no; \ -- case "$@" in \ -- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -- *) list='$(SUBDIRS)' ;; \ -- esac; \ -- rev=''; for subdir in $$list; do \ -- if test "$$subdir" = "."; then :; else \ -- rev="$$subdir $$rev"; \ -- fi; \ -- done; \ -- rev="$$rev ."; \ -- target=`echo $@ | sed s/-recursive//`; \ -- for subdir in $$rev; do \ -- echo "Making $$target in $$subdir"; \ -- if test "$$subdir" = "."; then \ -- local_target="$$target-am"; \ -- else \ -- local_target="$$target"; \ -- fi; \ -- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || eval $$failcom; \ -- done && test -z "$$fail" --tags-recursive: -- list='$(SUBDIRS)'; for subdir in $$list; do \ -- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ -- done --ctags-recursive: -- list='$(SUBDIRS)'; for subdir in $$list; do \ -- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ -- done -+ID: $(am__tagged_files) -+ $(am__define_uniq_tagged_files); mkid -fID $$unique -+tags: tags-recursive -+TAGS: tags - --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ - if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ -@@ -369,12 +413,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ -@@ -386,15 +425,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $$unique; \ - fi; \ - fi --ctags: CTAGS --CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ctags: ctags-recursive -+ -+CTAGS: ctags -+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) -+ $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique -@@ -403,6 +438,21 @@ GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -+cscopelist: cscopelist-recursive -+ -+cscopelist-am: $(am__tagged_files) -+ list='$(am__tagged_files)'; \ -+ case "$(srcdir)" in \ -+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ -+ *) sdir=$(subdir)/$(srcdir) ;; \ -+ esac; \ -+ for i in $$list; do \ -+ if test -f "$$i"; then \ -+ echo "$(subdir)/$$i"; \ -+ else \ -+ echo "$$sdir/$$i"; \ -+ fi; \ -+ done >> $(top_builddir)/cscope.files - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -@@ -439,13 +489,10 @@ distdir: $(DISTFILES) - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test -d "$(distdir)/$$subdir" \ -- || $(MKDIR_P) "$(distdir)/$$subdir" \ -- || exit 1; \ -- fi; \ -- done -- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ -- if test "$$subdir" = .; then :; else \ -+ $(am__make_dryrun) \ -+ || test -d "$(distdir)/$$subdir" \ -+ || $(MKDIR_P) "$(distdir)/$$subdir" \ -+ || exit 1; \ - dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ - $(am__relativize); \ - new_distdir=$$reldir; \ -@@ -480,10 +527,15 @@ install-am: all-am - - installcheck: installcheck-recursive - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+ if test -z '$(STRIP)'; then \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ install; \ -+ else \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -+ fi - mostlyclean-generic: - - clean-generic: -@@ -561,22 +613,20 @@ ps-am: - - uninstall-am: - --.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ -- install-am install-strip tags-recursive -- --.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ -- all all-am check check-am clean clean-generic clean-libtool \ -- ctags ctags-recursive distclean distclean-generic \ -- distclean-libtool distclean-tags distdir dvi dvi-am html \ -- html-am info info-am install install-am install-data \ -- install-data-am install-dvi install-dvi-am install-exec \ -- install-exec-am install-html install-html-am install-info \ -- install-info-am install-man install-pdf install-pdf-am \ -- install-ps install-ps-am install-strip installcheck \ -- installcheck-am installdirs installdirs-am maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-generic \ -- mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ -- uninstall uninstall-am -+.MAKE: $(am__recursive_targets) install-am install-strip -+ -+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ -+ check-am clean clean-generic clean-libtool cscopelist-am ctags \ -+ ctags-am distclean distclean-generic distclean-libtool \ -+ distclean-tags distdir dvi dvi-am html html-am info info-am \ -+ install install-am install-data install-data-am install-dvi \ -+ install-dvi-am install-exec install-exec-am install-html \ -+ install-html-am install-info install-info-am install-man \ -+ install-pdf install-pdf-am install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ installdirs-am maintainer-clean maintainer-clean-generic \ -+ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ -+ ps ps-am tags tags-am uninstall uninstall-am - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff --git a/src/modules_simulation/cellular_automata/sim_cellular_automata/Makefile.in b/src/modules_simulation/cellular_automata/sim_cellular_automata/Makefile.in -index d1a8da0..b2acb04 100644 ---- a/src/modules_simulation/cellular_automata/sim_cellular_automata/Makefile.in -+++ b/src/modules_simulation/cellular_automata/sim_cellular_automata/Makefile.in -@@ -1,9 +1,8 @@ --# Makefile.in generated by automake 1.11.1 from Makefile.am. -+# Makefile.in generated by automake 1.14 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, --# Inc. -+# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+ - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -16,6 +15,51 @@ - @SET_MAKE@ - - VPATH = @srcdir@ -+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -+am__make_running_with_option = \ -+ case $${target_option-} in \ -+ ?) ;; \ -+ *) echo "am__make_running_with_option: internal error: invalid" \ -+ "target option '$${target_option-}' specified" >&2; \ -+ exit 1;; \ -+ esac; \ -+ has_opt=no; \ -+ sane_makeflags=$$MAKEFLAGS; \ -+ if $(am__is_gnu_make); then \ -+ sane_makeflags=$$MFLAGS; \ -+ else \ -+ case $$MAKEFLAGS in \ -+ *\\[\ \ ]*) \ -+ bs=\\; \ -+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -+ esac; \ -+ fi; \ -+ skip_next=no; \ -+ strip_trailopt () \ -+ { \ -+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -+ }; \ -+ for flg in $$sane_makeflags; do \ -+ test $$skip_next = yes && { skip_next=no; continue; }; \ -+ case $$flg in \ -+ *=*|--*) continue;; \ -+ -*I) strip_trailopt 'I'; skip_next=yes;; \ -+ -*I?*) strip_trailopt 'I';; \ -+ -*O) strip_trailopt 'O'; skip_next=yes;; \ -+ -*O?*) strip_trailopt 'O';; \ -+ -*l) strip_trailopt 'l'; skip_next=yes;; \ -+ -*l?*) strip_trailopt 'l';; \ -+ -[dEDm]) skip_next=yes;; \ -+ -[JT]) skip_next=yes;; \ -+ esac; \ -+ case $$flg in \ -+ *$$target_option*) has_opt=yes; break;; \ -+ esac; \ -+ done; \ -+ test $$has_opt = yes -+am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -+am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -35,7 +79,8 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - subdir = src/modules_simulation/cellular_automata/sim_cellular_automata --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ -+ $(top_srcdir)/depcomp - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ - $(top_srcdir)/m4/ax_python_devel.m4 \ -@@ -71,6 +116,12 @@ am__nobase_list = $(am__nobase_strip_setup); \ - am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -+am__uninstall_files_from_dir = { \ -+ test -z "$$files" \ -+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ -+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ -+ $(am__cd) "$$dir" && rm -f $$files; }; \ -+ } - am__installdirs = "$(DESTDIR)$(pkglibdir)" - LTLIBRARIES = $(pkglib_LTLIBRARIES) - libsim_cellular_automata_la_DEPENDENCIES = \ -@@ -79,35 +130,92 @@ am_libsim_cellular_automata_la_OBJECTS = Life.lo MLB_Interface.lo \ - Wator.lo - libsim_cellular_automata_la_OBJECTS = \ - $(am_libsim_cellular_automata_la_OBJECTS) -+AM_V_lt = $(am__v_lt_@AM_V@) -+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -+am__v_lt_0 = --silent -+am__v_lt_1 = -+AM_V_P = $(am__v_P_@AM_V@) -+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -+am__v_P_0 = false -+am__v_P_1 = : -+AM_V_GEN = $(am__v_GEN_@AM_V@) -+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+am__v_GEN_0 = @echo " GEN " $@; -+am__v_GEN_1 = -+AM_V_at = $(am__v_at_@AM_V@) -+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+am__v_at_0 = @ -+am__v_at_1 = - DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - am__mv = mv -f - CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) --LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CXXFLAGS) $(CXXFLAGS) -+AM_V_CXX = $(am__v_CXX_@AM_V@) -+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) -+am__v_CXX_0 = @echo " CXX " $@; -+am__v_CXX_1 = - CXXLD = $(CXX) --CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ -+ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) -+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) -+am__v_CXXLD_0 = @echo " CXXLD " $@; -+am__v_CXXLD_1 = - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CFLAGS) $(CFLAGS) -+AM_V_CC = $(am__v_CC_@AM_V@) -+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -+am__v_CC_0 = @echo " CC " $@; -+am__v_CC_1 = - CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CCLD = $(am__v_CCLD_@AM_V@) -+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -+am__v_CCLD_0 = @echo " CCLD " $@; -+am__v_CCLD_1 = - SOURCES = $(libsim_cellular_automata_la_SOURCES) - DIST_SOURCES = $(libsim_cellular_automata_la_SOURCES) -+am__can_run_installinfo = \ -+ case $$AM_UPDATE_INFO_DIR in \ -+ n|no|NO) false;; \ -+ *) (install-info --version) >/dev/null 2>&1;; \ -+ esac -+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -+# Read a list of newline-separated strings from the standard input, -+# and print each of them once, without duplicates. Input order is -+# *not* preserved. -+am__uniquify_input = $(AWK) '\ -+ BEGIN { nonempty = 0; } \ -+ { items[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in items) print i; }; } \ -+' -+# Make sure the list of sources is unique. This is necessary because, -+# e.g., the same source file might be shared among _SOURCES variables -+# for different programs/libraries. -+am__define_uniq_tagged_files = \ -+ list='$(am__tagged_files)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | $(am__uniquify_input)` - ETAGS = etags - CTAGS = ctags - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ -+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ -@@ -128,6 +236,7 @@ CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DISABLELIBHARU = @DISABLELIBHARU@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -155,6 +264,7 @@ LOCAL_INCS = @LOCAL_INCS@ - LOCAL_LIBS = @LOCAL_LIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - NM = @NM@ - NMEDIT = @NMEDIT@ -@@ -167,6 +277,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - POW_LIB = @POW_LIB@ -@@ -192,6 +303,7 @@ abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -@@ -225,7 +337,6 @@ libdir = @libdir@ - libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -@@ -299,9 +410,9 @@ $(top_srcdir)/configure: $(am__configure_deps) - $(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - $(am__aclocal_m4_deps): -+ - install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" - @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ - list2=; for p in $$list; do \ - if test -f $$p; then \ -@@ -309,6 +420,8 @@ install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - else :; fi; \ - done; \ - test -z "$$list2" || { \ -+ echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \ -+ $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \ - } -@@ -324,14 +437,17 @@ uninstall-pkglibLTLIBRARIES: - - clean-pkglibLTLIBRARIES: - -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES) -- @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \ -- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -- echo "rm -f \"$${dir}/so_locations\""; \ -- rm -f "$${dir}/so_locations"; \ -- done --libsim_cellular_automata.la: $(libsim_cellular_automata_la_OBJECTS) $(libsim_cellular_automata_la_DEPENDENCIES) -- $(CXXLINK) -rpath $(pkglibdir) $(libsim_cellular_automata_la_OBJECTS) $(libsim_cellular_automata_la_LIBADD) $(LIBS) -+ @list='$(pkglib_LTLIBRARIES)'; \ -+ locs=`for p in $$list; do echo $$p; done | \ -+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ -+ sort -u`; \ -+ test -z "$$locs" || { \ -+ echo rm -f $${locs}; \ -+ rm -f $${locs}; \ -+ } -+ -+libsim_cellular_automata.la: $(libsim_cellular_automata_la_OBJECTS) $(libsim_cellular_automata_la_DEPENDENCIES) $(EXTRA_libsim_cellular_automata_la_DEPENDENCIES) -+ $(AM_V_CXXLD)$(CXXLINK) -rpath $(pkglibdir) $(libsim_cellular_automata_la_OBJECTS) $(libsim_cellular_automata_la_LIBADD) $(LIBS) - - mostlyclean-compile: - -rm -f *.$(OBJEXT) -@@ -344,25 +460,25 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Wator.Plo@am__quote@ - - .cpp.o: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< - - .cpp.obj: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - - .cpp.lo: --@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< - - mostlyclean-libtool: - -rm -f *.lo -@@ -370,26 +486,15 @@ mostlyclean-libtool: - clean-libtool: - -rm -rf .libs _libs - --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -+ID: $(am__tagged_files) -+ $(am__define_uniq_tagged_files); mkid -fID $$unique -+tags: tags-am -+TAGS: tags -+ -+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ -@@ -401,15 +506,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $$unique; \ - fi; \ - fi --ctags: CTAGS --CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ctags: ctags-am -+ -+CTAGS: ctags -+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) -+ $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique -@@ -418,6 +519,21 @@ GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -+cscopelist: cscopelist-am -+ -+cscopelist-am: $(am__tagged_files) -+ list='$(am__tagged_files)'; \ -+ case "$(srcdir)" in \ -+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ -+ *) sdir=$(subdir)/$(srcdir) ;; \ -+ esac; \ -+ for i in $$list; do \ -+ if test -f "$$i"; then \ -+ echo "$(subdir)/$$i"; \ -+ else \ -+ echo "$$sdir/$$i"; \ -+ fi; \ -+ done >> $(top_builddir)/cscope.files - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -@@ -469,10 +585,15 @@ install-am: all-am - - installcheck: installcheck-am - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+ if test -z '$(STRIP)'; then \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ install; \ -+ else \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -+ fi - mostlyclean-generic: - - clean-generic: -@@ -557,19 +678,20 @@ uninstall-am: uninstall-pkglibLTLIBRARIES - - .MAKE: install-am install-strip - --.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ -- clean-libtool clean-pkglibLTLIBRARIES ctags distclean \ -- distclean-compile distclean-generic distclean-libtool \ -- distclean-tags distdir dvi dvi-am html html-am info info-am \ -- install install-am install-data install-data-am install-dvi \ -- install-dvi-am install-exec install-exec-am install-html \ -- install-html-am install-info install-info-am install-man \ -- install-pdf install-pdf-am install-pkglibLTLIBRARIES \ -- install-ps install-ps-am install-strip installcheck \ -- installcheck-am installdirs maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-compile \ -- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -- tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES -+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ -+ clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \ -+ ctags-am distclean distclean-compile distclean-generic \ -+ distclean-libtool distclean-tags distdir dvi dvi-am html \ -+ html-am info info-am install install-am install-data \ -+ install-data-am install-dvi install-dvi-am install-exec \ -+ install-exec-am install-html install-html-am install-info \ -+ install-info-am install-man install-pdf install-pdf-am \ -+ install-pkglibLTLIBRARIES install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ maintainer-clean maintainer-clean-generic mostlyclean \ -+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ -+ pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ -+ uninstall-pkglibLTLIBRARIES - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff --git a/src/modules_simulation/ecosystems/Makefile.in b/src/modules_simulation/ecosystems/Makefile.in -index 5984c89..ba4a193 100644 ---- a/src/modules_simulation/ecosystems/Makefile.in -+++ b/src/modules_simulation/ecosystems/Makefile.in -@@ -1,9 +1,8 @@ --# Makefile.in generated by automake 1.11.1 from Makefile.am. -+# Makefile.in generated by automake 1.14 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, --# Inc. -+# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+ - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -15,6 +14,51 @@ - - @SET_MAKE@ - VPATH = @srcdir@ -+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -+am__make_running_with_option = \ -+ case $${target_option-} in \ -+ ?) ;; \ -+ *) echo "am__make_running_with_option: internal error: invalid" \ -+ "target option '$${target_option-}' specified" >&2; \ -+ exit 1;; \ -+ esac; \ -+ has_opt=no; \ -+ sane_makeflags=$$MAKEFLAGS; \ -+ if $(am__is_gnu_make); then \ -+ sane_makeflags=$$MFLAGS; \ -+ else \ -+ case $$MAKEFLAGS in \ -+ *\\[\ \ ]*) \ -+ bs=\\; \ -+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -+ esac; \ -+ fi; \ -+ skip_next=no; \ -+ strip_trailopt () \ -+ { \ -+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -+ }; \ -+ for flg in $$sane_makeflags; do \ -+ test $$skip_next = yes && { skip_next=no; continue; }; \ -+ case $$flg in \ -+ *=*|--*) continue;; \ -+ -*I) strip_trailopt 'I'; skip_next=yes;; \ -+ -*I?*) strip_trailopt 'I';; \ -+ -*O) strip_trailopt 'O'; skip_next=yes;; \ -+ -*O?*) strip_trailopt 'O';; \ -+ -*l) strip_trailopt 'l'; skip_next=yes;; \ -+ -*l?*) strip_trailopt 'l';; \ -+ -[dEDm]) skip_next=yes;; \ -+ -[JT]) skip_next=yes;; \ -+ esac; \ -+ case $$flg in \ -+ *$$target_option*) has_opt=yes; break;; \ -+ esac; \ -+ done; \ -+ test $$has_opt = yes -+am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -+am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -34,7 +78,7 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - subdir = src/modules_simulation/ecosystems --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ - $(top_srcdir)/m4/ax_python_devel.m4 \ -@@ -49,20 +93,58 @@ mkinstalldirs = $(install_sh) -d - CONFIG_HEADER = $(top_builddir)/config.h - CONFIG_CLEAN_FILES = - CONFIG_CLEAN_VPATH_FILES = -+AM_V_P = $(am__v_P_@AM_V@) -+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -+am__v_P_0 = false -+am__v_P_1 = : -+AM_V_GEN = $(am__v_GEN_@AM_V@) -+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+am__v_GEN_0 = @echo " GEN " $@; -+am__v_GEN_1 = -+AM_V_at = $(am__v_at_@AM_V@) -+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+am__v_at_0 = @ -+am__v_at_1 = - SOURCES = - DIST_SOURCES = --RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ -- html-recursive info-recursive install-data-recursive \ -- install-dvi-recursive install-exec-recursive \ -- install-html-recursive install-info-recursive \ -- install-pdf-recursive install-ps-recursive install-recursive \ -- installcheck-recursive installdirs-recursive pdf-recursive \ -- ps-recursive uninstall-recursive -+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ -+ ctags-recursive dvi-recursive html-recursive info-recursive \ -+ install-data-recursive install-dvi-recursive \ -+ install-exec-recursive install-html-recursive \ -+ install-info-recursive install-pdf-recursive \ -+ install-ps-recursive install-recursive installcheck-recursive \ -+ installdirs-recursive pdf-recursive ps-recursive \ -+ tags-recursive uninstall-recursive -+am__can_run_installinfo = \ -+ case $$AM_UPDATE_INFO_DIR in \ -+ n|no|NO) false;; \ -+ *) (install-info --version) >/dev/null 2>&1;; \ -+ esac - RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ - distclean-recursive maintainer-clean-recursive --AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ -- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ -+am__recursive_targets = \ -+ $(RECURSIVE_TARGETS) \ -+ $(RECURSIVE_CLEAN_TARGETS) \ -+ $(am__extra_recursive_targets) -+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ - distdir -+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -+# Read a list of newline-separated strings from the standard input, -+# and print each of them once, without duplicates. Input order is -+# *not* preserved. -+am__uniquify_input = $(AWK) '\ -+ BEGIN { nonempty = 0; } \ -+ { items[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in items) print i; }; } \ -+' -+# Make sure the list of sources is unique. This is necessary because, -+# e.g., the same source file might be shared among _SOURCES variables -+# for different programs/libraries. -+am__define_uniq_tagged_files = \ -+ list='$(am__tagged_files)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | $(am__uniquify_input)` - ETAGS = etags - CTAGS = ctags - DIST_SUBDIRS = $(SUBDIRS) -@@ -94,6 +176,7 @@ am__relativize = \ - reldir="$$dir2" - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ -+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ -@@ -114,6 +197,7 @@ CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DISABLELIBHARU = @DISABLELIBHARU@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -141,6 +225,7 @@ LOCAL_INCS = @LOCAL_INCS@ - LOCAL_LIBS = @LOCAL_LIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - NM = @NM@ - NMEDIT = @NMEDIT@ -@@ -153,6 +238,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - POW_LIB = @POW_LIB@ -@@ -178,6 +264,7 @@ abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -@@ -211,7 +298,6 @@ libdir = @libdir@ - libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -@@ -273,22 +359,25 @@ clean-libtool: - -rm -rf .libs _libs - - # This directory's subdirectories are mostly independent; you can cd --# into them and run `make' without going through this Makefile. --# To change the values of `make' variables: instead of editing Makefiles, --# (1) if the variable is set in `config.status', edit `config.status' --# (which will cause the Makefiles to be regenerated when you run `make'); --# (2) otherwise, pass the desired values on the `make' command line. --$(RECURSIVE_TARGETS): -- @fail= failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -+# into them and run 'make' without going through this Makefile. -+# To change the values of 'make' variables: instead of editing Makefiles, -+# (1) if the variable is set in 'config.status', edit 'config.status' -+# (which will cause the Makefiles to be regenerated when you run 'make'); -+# (2) otherwise, pass the desired values on the 'make' command line. -+$(am__recursive_targets): -+ @fail=; \ -+ if $(am__make_keepgoing); then \ -+ failcom='fail=yes'; \ -+ else \ -+ failcom='exit 1'; \ -+ fi; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ -- list='$(SUBDIRS)'; for subdir in $$list; do \ -+ case "$@" in \ -+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -+ *) list='$(SUBDIRS)' ;; \ -+ esac; \ -+ for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ -@@ -303,57 +392,12 @@ $(RECURSIVE_TARGETS): - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - --$(RECURSIVE_CLEAN_TARGETS): -- @fail= failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -- dot_seen=no; \ -- case "$@" in \ -- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -- *) list='$(SUBDIRS)' ;; \ -- esac; \ -- rev=''; for subdir in $$list; do \ -- if test "$$subdir" = "."; then :; else \ -- rev="$$subdir $$rev"; \ -- fi; \ -- done; \ -- rev="$$rev ."; \ -- target=`echo $@ | sed s/-recursive//`; \ -- for subdir in $$rev; do \ -- echo "Making $$target in $$subdir"; \ -- if test "$$subdir" = "."; then \ -- local_target="$$target-am"; \ -- else \ -- local_target="$$target"; \ -- fi; \ -- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || eval $$failcom; \ -- done && test -z "$$fail" --tags-recursive: -- list='$(SUBDIRS)'; for subdir in $$list; do \ -- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ -- done --ctags-recursive: -- list='$(SUBDIRS)'; for subdir in $$list; do \ -- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ -- done -+ID: $(am__tagged_files) -+ $(am__define_uniq_tagged_files); mkid -fID $$unique -+tags: tags-recursive -+TAGS: tags - --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ - if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ -@@ -369,12 +413,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ -@@ -386,15 +425,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $$unique; \ - fi; \ - fi --ctags: CTAGS --CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ctags: ctags-recursive -+ -+CTAGS: ctags -+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) -+ $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique -@@ -403,6 +438,21 @@ GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -+cscopelist: cscopelist-recursive -+ -+cscopelist-am: $(am__tagged_files) -+ list='$(am__tagged_files)'; \ -+ case "$(srcdir)" in \ -+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ -+ *) sdir=$(subdir)/$(srcdir) ;; \ -+ esac; \ -+ for i in $$list; do \ -+ if test -f "$$i"; then \ -+ echo "$(subdir)/$$i"; \ -+ else \ -+ echo "$$sdir/$$i"; \ -+ fi; \ -+ done >> $(top_builddir)/cscope.files - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -@@ -439,13 +489,10 @@ distdir: $(DISTFILES) - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test -d "$(distdir)/$$subdir" \ -- || $(MKDIR_P) "$(distdir)/$$subdir" \ -- || exit 1; \ -- fi; \ -- done -- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ -- if test "$$subdir" = .; then :; else \ -+ $(am__make_dryrun) \ -+ || test -d "$(distdir)/$$subdir" \ -+ || $(MKDIR_P) "$(distdir)/$$subdir" \ -+ || exit 1; \ - dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ - $(am__relativize); \ - new_distdir=$$reldir; \ -@@ -480,10 +527,15 @@ install-am: all-am - - installcheck: installcheck-recursive - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+ if test -z '$(STRIP)'; then \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ install; \ -+ else \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -+ fi - mostlyclean-generic: - - clean-generic: -@@ -561,22 +613,20 @@ ps-am: - - uninstall-am: - --.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ -- install-am install-strip tags-recursive -- --.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ -- all all-am check check-am clean clean-generic clean-libtool \ -- ctags ctags-recursive distclean distclean-generic \ -- distclean-libtool distclean-tags distdir dvi dvi-am html \ -- html-am info info-am install install-am install-data \ -- install-data-am install-dvi install-dvi-am install-exec \ -- install-exec-am install-html install-html-am install-info \ -- install-info-am install-man install-pdf install-pdf-am \ -- install-ps install-ps-am install-strip installcheck \ -- installcheck-am installdirs installdirs-am maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-generic \ -- mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ -- uninstall uninstall-am -+.MAKE: $(am__recursive_targets) install-am install-strip -+ -+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ -+ check-am clean clean-generic clean-libtool cscopelist-am ctags \ -+ ctags-am distclean distclean-generic distclean-libtool \ -+ distclean-tags distdir dvi dvi-am html html-am info info-am \ -+ install install-am install-data install-data-am install-dvi \ -+ install-dvi-am install-exec install-exec-am install-html \ -+ install-html-am install-info install-info-am install-man \ -+ install-pdf install-pdf-am install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ installdirs-am maintainer-clean maintainer-clean-generic \ -+ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ -+ ps ps-am tags tags-am uninstall uninstall-am - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff --git a/src/modules_simulation/ecosystems/sim_ecosystems_hugget/Makefile.in b/src/modules_simulation/ecosystems/sim_ecosystems_hugget/Makefile.in -index 4d24a57..d0d6df3 100644 ---- a/src/modules_simulation/ecosystems/sim_ecosystems_hugget/Makefile.in -+++ b/src/modules_simulation/ecosystems/sim_ecosystems_hugget/Makefile.in -@@ -1,9 +1,8 @@ --# Makefile.in generated by automake 1.11.1 from Makefile.am. -+# Makefile.in generated by automake 1.14 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, --# Inc. -+# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+ - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -16,6 +15,51 @@ - @SET_MAKE@ - - VPATH = @srcdir@ -+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -+am__make_running_with_option = \ -+ case $${target_option-} in \ -+ ?) ;; \ -+ *) echo "am__make_running_with_option: internal error: invalid" \ -+ "target option '$${target_option-}' specified" >&2; \ -+ exit 1;; \ -+ esac; \ -+ has_opt=no; \ -+ sane_makeflags=$$MAKEFLAGS; \ -+ if $(am__is_gnu_make); then \ -+ sane_makeflags=$$MFLAGS; \ -+ else \ -+ case $$MAKEFLAGS in \ -+ *\\[\ \ ]*) \ -+ bs=\\; \ -+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -+ esac; \ -+ fi; \ -+ skip_next=no; \ -+ strip_trailopt () \ -+ { \ -+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -+ }; \ -+ for flg in $$sane_makeflags; do \ -+ test $$skip_next = yes && { skip_next=no; continue; }; \ -+ case $$flg in \ -+ *=*|--*) continue;; \ -+ -*I) strip_trailopt 'I'; skip_next=yes;; \ -+ -*I?*) strip_trailopt 'I';; \ -+ -*O) strip_trailopt 'O'; skip_next=yes;; \ -+ -*O?*) strip_trailopt 'O';; \ -+ -*l) strip_trailopt 'l'; skip_next=yes;; \ -+ -*l?*) strip_trailopt 'l';; \ -+ -[dEDm]) skip_next=yes;; \ -+ -[JT]) skip_next=yes;; \ -+ esac; \ -+ case $$flg in \ -+ *$$target_option*) has_opt=yes; break;; \ -+ esac; \ -+ done; \ -+ test $$has_opt = yes -+am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -+am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -35,7 +79,8 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - subdir = src/modules_simulation/ecosystems/sim_ecosystems_hugget --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ -+ $(top_srcdir)/depcomp - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ - $(top_srcdir)/m4/ax_python_devel.m4 \ -@@ -71,6 +116,12 @@ am__nobase_list = $(am__nobase_strip_setup); \ - am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -+am__uninstall_files_from_dir = { \ -+ test -z "$$files" \ -+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ -+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ -+ $(am__cd) "$$dir" && rm -f $$files; }; \ -+ } - am__installdirs = "$(DESTDIR)$(pkglibdir)" - LTLIBRARIES = $(pkglib_LTLIBRARIES) - libsim_ecosystems_hugget_la_DEPENDENCIES = \ -@@ -79,35 +130,92 @@ am_libsim_ecosystems_hugget_la_OBJECTS = Hugget_01.lo Hugget_02.lo \ - Hugget_03.lo MLB_Interface.lo - libsim_ecosystems_hugget_la_OBJECTS = \ - $(am_libsim_ecosystems_hugget_la_OBJECTS) -+AM_V_lt = $(am__v_lt_@AM_V@) -+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -+am__v_lt_0 = --silent -+am__v_lt_1 = -+AM_V_P = $(am__v_P_@AM_V@) -+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -+am__v_P_0 = false -+am__v_P_1 = : -+AM_V_GEN = $(am__v_GEN_@AM_V@) -+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+am__v_GEN_0 = @echo " GEN " $@; -+am__v_GEN_1 = -+AM_V_at = $(am__v_at_@AM_V@) -+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+am__v_at_0 = @ -+am__v_at_1 = - DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - am__mv = mv -f - CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) --LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CXXFLAGS) $(CXXFLAGS) -+AM_V_CXX = $(am__v_CXX_@AM_V@) -+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) -+am__v_CXX_0 = @echo " CXX " $@; -+am__v_CXX_1 = - CXXLD = $(CXX) --CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ -+ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) -+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) -+am__v_CXXLD_0 = @echo " CXXLD " $@; -+am__v_CXXLD_1 = - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CFLAGS) $(CFLAGS) -+AM_V_CC = $(am__v_CC_@AM_V@) -+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -+am__v_CC_0 = @echo " CC " $@; -+am__v_CC_1 = - CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CCLD = $(am__v_CCLD_@AM_V@) -+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -+am__v_CCLD_0 = @echo " CCLD " $@; -+am__v_CCLD_1 = - SOURCES = $(libsim_ecosystems_hugget_la_SOURCES) - DIST_SOURCES = $(libsim_ecosystems_hugget_la_SOURCES) -+am__can_run_installinfo = \ -+ case $$AM_UPDATE_INFO_DIR in \ -+ n|no|NO) false;; \ -+ *) (install-info --version) >/dev/null 2>&1;; \ -+ esac -+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -+# Read a list of newline-separated strings from the standard input, -+# and print each of them once, without duplicates. Input order is -+# *not* preserved. -+am__uniquify_input = $(AWK) '\ -+ BEGIN { nonempty = 0; } \ -+ { items[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in items) print i; }; } \ -+' -+# Make sure the list of sources is unique. This is necessary because, -+# e.g., the same source file might be shared among _SOURCES variables -+# for different programs/libraries. -+am__define_uniq_tagged_files = \ -+ list='$(am__tagged_files)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | $(am__uniquify_input)` - ETAGS = etags - CTAGS = ctags - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ -+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ -@@ -128,6 +236,7 @@ CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DISABLELIBHARU = @DISABLELIBHARU@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -155,6 +264,7 @@ LOCAL_INCS = @LOCAL_INCS@ - LOCAL_LIBS = @LOCAL_LIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - NM = @NM@ - NMEDIT = @NMEDIT@ -@@ -167,6 +277,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - POW_LIB = @POW_LIB@ -@@ -192,6 +303,7 @@ abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -@@ -225,7 +337,6 @@ libdir = @libdir@ - libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -@@ -301,9 +412,9 @@ $(top_srcdir)/configure: $(am__configure_deps) - $(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - $(am__aclocal_m4_deps): -+ - install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" - @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ - list2=; for p in $$list; do \ - if test -f $$p; then \ -@@ -311,6 +422,8 @@ install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - else :; fi; \ - done; \ - test -z "$$list2" || { \ -+ echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \ -+ $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \ - } -@@ -326,14 +439,17 @@ uninstall-pkglibLTLIBRARIES: - - clean-pkglibLTLIBRARIES: - -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES) -- @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \ -- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -- echo "rm -f \"$${dir}/so_locations\""; \ -- rm -f "$${dir}/so_locations"; \ -- done --libsim_ecosystems_hugget.la: $(libsim_ecosystems_hugget_la_OBJECTS) $(libsim_ecosystems_hugget_la_DEPENDENCIES) -- $(CXXLINK) -rpath $(pkglibdir) $(libsim_ecosystems_hugget_la_OBJECTS) $(libsim_ecosystems_hugget_la_LIBADD) $(LIBS) -+ @list='$(pkglib_LTLIBRARIES)'; \ -+ locs=`for p in $$list; do echo $$p; done | \ -+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ -+ sort -u`; \ -+ test -z "$$locs" || { \ -+ echo rm -f $${locs}; \ -+ rm -f $${locs}; \ -+ } -+ -+libsim_ecosystems_hugget.la: $(libsim_ecosystems_hugget_la_OBJECTS) $(libsim_ecosystems_hugget_la_DEPENDENCIES) $(EXTRA_libsim_ecosystems_hugget_la_DEPENDENCIES) -+ $(AM_V_CXXLD)$(CXXLINK) -rpath $(pkglibdir) $(libsim_ecosystems_hugget_la_OBJECTS) $(libsim_ecosystems_hugget_la_LIBADD) $(LIBS) - - mostlyclean-compile: - -rm -f *.$(OBJEXT) -@@ -347,25 +463,25 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MLB_Interface.Plo@am__quote@ - - .cpp.o: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< - - .cpp.obj: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - - .cpp.lo: --@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< - - mostlyclean-libtool: - -rm -f *.lo -@@ -373,26 +489,15 @@ mostlyclean-libtool: - clean-libtool: - -rm -rf .libs _libs - --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -+ID: $(am__tagged_files) -+ $(am__define_uniq_tagged_files); mkid -fID $$unique -+tags: tags-am -+TAGS: tags -+ -+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ -@@ -404,15 +509,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $$unique; \ - fi; \ - fi --ctags: CTAGS --CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ctags: ctags-am -+ -+CTAGS: ctags -+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) -+ $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique -@@ -421,6 +522,21 @@ GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -+cscopelist: cscopelist-am -+ -+cscopelist-am: $(am__tagged_files) -+ list='$(am__tagged_files)'; \ -+ case "$(srcdir)" in \ -+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ -+ *) sdir=$(subdir)/$(srcdir) ;; \ -+ esac; \ -+ for i in $$list; do \ -+ if test -f "$$i"; then \ -+ echo "$(subdir)/$$i"; \ -+ else \ -+ echo "$$sdir/$$i"; \ -+ fi; \ -+ done >> $(top_builddir)/cscope.files - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -@@ -472,10 +588,15 @@ install-am: all-am - - installcheck: installcheck-am - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+ if test -z '$(STRIP)'; then \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ install; \ -+ else \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -+ fi - mostlyclean-generic: - - clean-generic: -@@ -560,19 +681,20 @@ uninstall-am: uninstall-pkglibLTLIBRARIES - - .MAKE: install-am install-strip - --.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ -- clean-libtool clean-pkglibLTLIBRARIES ctags distclean \ -- distclean-compile distclean-generic distclean-libtool \ -- distclean-tags distdir dvi dvi-am html html-am info info-am \ -- install install-am install-data install-data-am install-dvi \ -- install-dvi-am install-exec install-exec-am install-html \ -- install-html-am install-info install-info-am install-man \ -- install-pdf install-pdf-am install-pkglibLTLIBRARIES \ -- install-ps install-ps-am install-strip installcheck \ -- installcheck-am installdirs maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-compile \ -- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -- tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES -+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ -+ clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \ -+ ctags-am distclean distclean-compile distclean-generic \ -+ distclean-libtool distclean-tags distdir dvi dvi-am html \ -+ html-am info info-am install install-am install-data \ -+ install-data-am install-dvi install-dvi-am install-exec \ -+ install-exec-am install-html install-html-am install-info \ -+ install-info-am install-man install-pdf install-pdf-am \ -+ install-pkglibLTLIBRARIES install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ maintainer-clean maintainer-clean-generic mostlyclean \ -+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ -+ pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ -+ uninstall-pkglibLTLIBRARIES - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff --git a/src/modules_simulation/erosion/Makefile.in b/src/modules_simulation/erosion/Makefile.in -index 9e9f8c0..82498dc 100644 ---- a/src/modules_simulation/erosion/Makefile.in -+++ b/src/modules_simulation/erosion/Makefile.in -@@ -1,9 +1,8 @@ --# Makefile.in generated by automake 1.11.1 from Makefile.am. -+# Makefile.in generated by automake 1.14 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, --# Inc. -+# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+ - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -15,6 +14,51 @@ - - @SET_MAKE@ - VPATH = @srcdir@ -+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -+am__make_running_with_option = \ -+ case $${target_option-} in \ -+ ?) ;; \ -+ *) echo "am__make_running_with_option: internal error: invalid" \ -+ "target option '$${target_option-}' specified" >&2; \ -+ exit 1;; \ -+ esac; \ -+ has_opt=no; \ -+ sane_makeflags=$$MAKEFLAGS; \ -+ if $(am__is_gnu_make); then \ -+ sane_makeflags=$$MFLAGS; \ -+ else \ -+ case $$MAKEFLAGS in \ -+ *\\[\ \ ]*) \ -+ bs=\\; \ -+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -+ esac; \ -+ fi; \ -+ skip_next=no; \ -+ strip_trailopt () \ -+ { \ -+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -+ }; \ -+ for flg in $$sane_makeflags; do \ -+ test $$skip_next = yes && { skip_next=no; continue; }; \ -+ case $$flg in \ -+ *=*|--*) continue;; \ -+ -*I) strip_trailopt 'I'; skip_next=yes;; \ -+ -*I?*) strip_trailopt 'I';; \ -+ -*O) strip_trailopt 'O'; skip_next=yes;; \ -+ -*O?*) strip_trailopt 'O';; \ -+ -*l) strip_trailopt 'l'; skip_next=yes;; \ -+ -*l?*) strip_trailopt 'l';; \ -+ -[dEDm]) skip_next=yes;; \ -+ -[JT]) skip_next=yes;; \ -+ esac; \ -+ case $$flg in \ -+ *$$target_option*) has_opt=yes; break;; \ -+ esac; \ -+ done; \ -+ test $$has_opt = yes -+am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -+am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -34,7 +78,7 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - subdir = src/modules_simulation/erosion --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ - $(top_srcdir)/m4/ax_python_devel.m4 \ -@@ -49,20 +93,58 @@ mkinstalldirs = $(install_sh) -d - CONFIG_HEADER = $(top_builddir)/config.h - CONFIG_CLEAN_FILES = - CONFIG_CLEAN_VPATH_FILES = -+AM_V_P = $(am__v_P_@AM_V@) -+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -+am__v_P_0 = false -+am__v_P_1 = : -+AM_V_GEN = $(am__v_GEN_@AM_V@) -+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+am__v_GEN_0 = @echo " GEN " $@; -+am__v_GEN_1 = -+AM_V_at = $(am__v_at_@AM_V@) -+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+am__v_at_0 = @ -+am__v_at_1 = - SOURCES = - DIST_SOURCES = --RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ -- html-recursive info-recursive install-data-recursive \ -- install-dvi-recursive install-exec-recursive \ -- install-html-recursive install-info-recursive \ -- install-pdf-recursive install-ps-recursive install-recursive \ -- installcheck-recursive installdirs-recursive pdf-recursive \ -- ps-recursive uninstall-recursive -+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ -+ ctags-recursive dvi-recursive html-recursive info-recursive \ -+ install-data-recursive install-dvi-recursive \ -+ install-exec-recursive install-html-recursive \ -+ install-info-recursive install-pdf-recursive \ -+ install-ps-recursive install-recursive installcheck-recursive \ -+ installdirs-recursive pdf-recursive ps-recursive \ -+ tags-recursive uninstall-recursive -+am__can_run_installinfo = \ -+ case $$AM_UPDATE_INFO_DIR in \ -+ n|no|NO) false;; \ -+ *) (install-info --version) >/dev/null 2>&1;; \ -+ esac - RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ - distclean-recursive maintainer-clean-recursive --AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ -- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ -+am__recursive_targets = \ -+ $(RECURSIVE_TARGETS) \ -+ $(RECURSIVE_CLEAN_TARGETS) \ -+ $(am__extra_recursive_targets) -+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ - distdir -+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -+# Read a list of newline-separated strings from the standard input, -+# and print each of them once, without duplicates. Input order is -+# *not* preserved. -+am__uniquify_input = $(AWK) '\ -+ BEGIN { nonempty = 0; } \ -+ { items[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in items) print i; }; } \ -+' -+# Make sure the list of sources is unique. This is necessary because, -+# e.g., the same source file might be shared among _SOURCES variables -+# for different programs/libraries. -+am__define_uniq_tagged_files = \ -+ list='$(am__tagged_files)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | $(am__uniquify_input)` - ETAGS = etags - CTAGS = ctags - DIST_SUBDIRS = $(SUBDIRS) -@@ -94,6 +176,7 @@ am__relativize = \ - reldir="$$dir2" - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ -+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ -@@ -114,6 +197,7 @@ CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DISABLELIBHARU = @DISABLELIBHARU@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -141,6 +225,7 @@ LOCAL_INCS = @LOCAL_INCS@ - LOCAL_LIBS = @LOCAL_LIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - NM = @NM@ - NMEDIT = @NMEDIT@ -@@ -153,6 +238,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - POW_LIB = @POW_LIB@ -@@ -178,6 +264,7 @@ abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -@@ -211,7 +298,6 @@ libdir = @libdir@ - libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -@@ -273,22 +359,25 @@ clean-libtool: - -rm -rf .libs _libs - - # This directory's subdirectories are mostly independent; you can cd --# into them and run `make' without going through this Makefile. --# To change the values of `make' variables: instead of editing Makefiles, --# (1) if the variable is set in `config.status', edit `config.status' --# (which will cause the Makefiles to be regenerated when you run `make'); --# (2) otherwise, pass the desired values on the `make' command line. --$(RECURSIVE_TARGETS): -- @fail= failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -+# into them and run 'make' without going through this Makefile. -+# To change the values of 'make' variables: instead of editing Makefiles, -+# (1) if the variable is set in 'config.status', edit 'config.status' -+# (which will cause the Makefiles to be regenerated when you run 'make'); -+# (2) otherwise, pass the desired values on the 'make' command line. -+$(am__recursive_targets): -+ @fail=; \ -+ if $(am__make_keepgoing); then \ -+ failcom='fail=yes'; \ -+ else \ -+ failcom='exit 1'; \ -+ fi; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ -- list='$(SUBDIRS)'; for subdir in $$list; do \ -+ case "$@" in \ -+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -+ *) list='$(SUBDIRS)' ;; \ -+ esac; \ -+ for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ -@@ -303,57 +392,12 @@ $(RECURSIVE_TARGETS): - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - --$(RECURSIVE_CLEAN_TARGETS): -- @fail= failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -- dot_seen=no; \ -- case "$@" in \ -- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -- *) list='$(SUBDIRS)' ;; \ -- esac; \ -- rev=''; for subdir in $$list; do \ -- if test "$$subdir" = "."; then :; else \ -- rev="$$subdir $$rev"; \ -- fi; \ -- done; \ -- rev="$$rev ."; \ -- target=`echo $@ | sed s/-recursive//`; \ -- for subdir in $$rev; do \ -- echo "Making $$target in $$subdir"; \ -- if test "$$subdir" = "."; then \ -- local_target="$$target-am"; \ -- else \ -- local_target="$$target"; \ -- fi; \ -- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || eval $$failcom; \ -- done && test -z "$$fail" --tags-recursive: -- list='$(SUBDIRS)'; for subdir in $$list; do \ -- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ -- done --ctags-recursive: -- list='$(SUBDIRS)'; for subdir in $$list; do \ -- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ -- done -+ID: $(am__tagged_files) -+ $(am__define_uniq_tagged_files); mkid -fID $$unique -+tags: tags-recursive -+TAGS: tags - --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ - if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ -@@ -369,12 +413,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ -@@ -386,15 +425,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $$unique; \ - fi; \ - fi --ctags: CTAGS --CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ctags: ctags-recursive -+ -+CTAGS: ctags -+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) -+ $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique -@@ -403,6 +438,21 @@ GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -+cscopelist: cscopelist-recursive -+ -+cscopelist-am: $(am__tagged_files) -+ list='$(am__tagged_files)'; \ -+ case "$(srcdir)" in \ -+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ -+ *) sdir=$(subdir)/$(srcdir) ;; \ -+ esac; \ -+ for i in $$list; do \ -+ if test -f "$$i"; then \ -+ echo "$(subdir)/$$i"; \ -+ else \ -+ echo "$$sdir/$$i"; \ -+ fi; \ -+ done >> $(top_builddir)/cscope.files - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -@@ -439,13 +489,10 @@ distdir: $(DISTFILES) - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test -d "$(distdir)/$$subdir" \ -- || $(MKDIR_P) "$(distdir)/$$subdir" \ -- || exit 1; \ -- fi; \ -- done -- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ -- if test "$$subdir" = .; then :; else \ -+ $(am__make_dryrun) \ -+ || test -d "$(distdir)/$$subdir" \ -+ || $(MKDIR_P) "$(distdir)/$$subdir" \ -+ || exit 1; \ - dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ - $(am__relativize); \ - new_distdir=$$reldir; \ -@@ -480,10 +527,15 @@ install-am: all-am - - installcheck: installcheck-recursive - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+ if test -z '$(STRIP)'; then \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ install; \ -+ else \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -+ fi - mostlyclean-generic: - - clean-generic: -@@ -561,22 +613,20 @@ ps-am: - - uninstall-am: - --.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ -- install-am install-strip tags-recursive -- --.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ -- all all-am check check-am clean clean-generic clean-libtool \ -- ctags ctags-recursive distclean distclean-generic \ -- distclean-libtool distclean-tags distdir dvi dvi-am html \ -- html-am info info-am install install-am install-data \ -- install-data-am install-dvi install-dvi-am install-exec \ -- install-exec-am install-html install-html-am install-info \ -- install-info-am install-man install-pdf install-pdf-am \ -- install-ps install-ps-am install-strip installcheck \ -- installcheck-am installdirs installdirs-am maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-generic \ -- mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ -- uninstall uninstall-am -+.MAKE: $(am__recursive_targets) install-am install-strip -+ -+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ -+ check-am clean clean-generic clean-libtool cscopelist-am ctags \ -+ ctags-am distclean distclean-generic distclean-libtool \ -+ distclean-tags distdir dvi dvi-am html html-am info info-am \ -+ install install-am install-data install-data-am install-dvi \ -+ install-dvi-am install-exec install-exec-am install-html \ -+ install-html-am install-info install-info-am install-man \ -+ install-pdf install-pdf-am install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ installdirs-am maintainer-clean maintainer-clean-generic \ -+ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ -+ ps ps-am tags tags-am uninstall uninstall-am - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff --git a/src/modules_simulation/erosion/sim_erosion/Makefile.in b/src/modules_simulation/erosion/sim_erosion/Makefile.in -index 0a1be05..10b40eb 100644 ---- a/src/modules_simulation/erosion/sim_erosion/Makefile.in -+++ b/src/modules_simulation/erosion/sim_erosion/Makefile.in -@@ -1,9 +1,8 @@ --# Makefile.in generated by automake 1.11.1 from Makefile.am. -+# Makefile.in generated by automake 1.14 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, --# Inc. -+# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+ - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -16,6 +15,51 @@ - @SET_MAKE@ - - VPATH = @srcdir@ -+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -+am__make_running_with_option = \ -+ case $${target_option-} in \ -+ ?) ;; \ -+ *) echo "am__make_running_with_option: internal error: invalid" \ -+ "target option '$${target_option-}' specified" >&2; \ -+ exit 1;; \ -+ esac; \ -+ has_opt=no; \ -+ sane_makeflags=$$MAKEFLAGS; \ -+ if $(am__is_gnu_make); then \ -+ sane_makeflags=$$MFLAGS; \ -+ else \ -+ case $$MAKEFLAGS in \ -+ *\\[\ \ ]*) \ -+ bs=\\; \ -+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -+ esac; \ -+ fi; \ -+ skip_next=no; \ -+ strip_trailopt () \ -+ { \ -+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -+ }; \ -+ for flg in $$sane_makeflags; do \ -+ test $$skip_next = yes && { skip_next=no; continue; }; \ -+ case $$flg in \ -+ *=*|--*) continue;; \ -+ -*I) strip_trailopt 'I'; skip_next=yes;; \ -+ -*I?*) strip_trailopt 'I';; \ -+ -*O) strip_trailopt 'O'; skip_next=yes;; \ -+ -*O?*) strip_trailopt 'O';; \ -+ -*l) strip_trailopt 'l'; skip_next=yes;; \ -+ -*l?*) strip_trailopt 'l';; \ -+ -[dEDm]) skip_next=yes;; \ -+ -[JT]) skip_next=yes;; \ -+ esac; \ -+ case $$flg in \ -+ *$$target_option*) has_opt=yes; break;; \ -+ esac; \ -+ done; \ -+ test $$has_opt = yes -+am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -+am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -35,7 +79,8 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - subdir = src/modules_simulation/erosion/sim_erosion --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ -+ $(top_srcdir)/depcomp - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ - $(top_srcdir)/m4/ax_python_devel.m4 \ -@@ -71,41 +116,104 @@ am__nobase_list = $(am__nobase_strip_setup); \ - am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -+am__uninstall_files_from_dir = { \ -+ test -z "$$files" \ -+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ -+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ -+ $(am__cd) "$$dir" && rm -f $$files; }; \ -+ } - am__installdirs = "$(DESTDIR)$(pkglibdir)" - LTLIBRARIES = $(pkglib_LTLIBRARIES) - libsim_erosion_la_DEPENDENCIES = \ - $(top_srcdir)/src/saga_core/saga_api/libsaga_api.la - am_libsim_erosion_la_OBJECTS = MMF_SAGA.lo MLB_Interface.lo - libsim_erosion_la_OBJECTS = $(am_libsim_erosion_la_OBJECTS) -+AM_V_lt = $(am__v_lt_@AM_V@) -+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -+am__v_lt_0 = --silent -+am__v_lt_1 = -+AM_V_P = $(am__v_P_@AM_V@) -+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -+am__v_P_0 = false -+am__v_P_1 = : -+AM_V_GEN = $(am__v_GEN_@AM_V@) -+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+am__v_GEN_0 = @echo " GEN " $@; -+am__v_GEN_1 = -+AM_V_at = $(am__v_at_@AM_V@) -+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+am__v_at_0 = @ -+am__v_at_1 = - DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - am__mv = mv -f - CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) --LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CXXFLAGS) $(CXXFLAGS) -+AM_V_CXX = $(am__v_CXX_@AM_V@) -+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) -+am__v_CXX_0 = @echo " CXX " $@; -+am__v_CXX_1 = - CXXLD = $(CXX) --CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ -+ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) -+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) -+am__v_CXXLD_0 = @echo " CXXLD " $@; -+am__v_CXXLD_1 = - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CFLAGS) $(CFLAGS) -+AM_V_CC = $(am__v_CC_@AM_V@) -+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -+am__v_CC_0 = @echo " CC " $@; -+am__v_CC_1 = - CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CCLD = $(am__v_CCLD_@AM_V@) -+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -+am__v_CCLD_0 = @echo " CCLD " $@; -+am__v_CCLD_1 = - SOURCES = $(libsim_erosion_la_SOURCES) - DIST_SOURCES = $(libsim_erosion_la_SOURCES) -+am__can_run_installinfo = \ -+ case $$AM_UPDATE_INFO_DIR in \ -+ n|no|NO) false;; \ -+ *) (install-info --version) >/dev/null 2>&1;; \ -+ esac -+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -+# Read a list of newline-separated strings from the standard input, -+# and print each of them once, without duplicates. Input order is -+# *not* preserved. -+am__uniquify_input = $(AWK) '\ -+ BEGIN { nonempty = 0; } \ -+ { items[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in items) print i; }; } \ -+' -+# Make sure the list of sources is unique. This is necessary because, -+# e.g., the same source file might be shared among _SOURCES variables -+# for different programs/libraries. -+am__define_uniq_tagged_files = \ -+ list='$(am__tagged_files)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | $(am__uniquify_input)` - ETAGS = etags - CTAGS = ctags - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ -+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ -@@ -126,6 +234,7 @@ CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DISABLELIBHARU = @DISABLELIBHARU@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -153,6 +262,7 @@ LOCAL_INCS = @LOCAL_INCS@ - LOCAL_LIBS = @LOCAL_LIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - NM = @NM@ - NMEDIT = @NMEDIT@ -@@ -165,6 +275,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - POW_LIB = @POW_LIB@ -@@ -190,6 +301,7 @@ abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -@@ -223,7 +335,6 @@ libdir = @libdir@ - libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -@@ -295,9 +406,9 @@ $(top_srcdir)/configure: $(am__configure_deps) - $(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - $(am__aclocal_m4_deps): -+ - install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" - @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ - list2=; for p in $$list; do \ - if test -f $$p; then \ -@@ -305,6 +416,8 @@ install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - else :; fi; \ - done; \ - test -z "$$list2" || { \ -+ echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \ -+ $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \ - } -@@ -320,14 +433,17 @@ uninstall-pkglibLTLIBRARIES: - - clean-pkglibLTLIBRARIES: - -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES) -- @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \ -- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -- echo "rm -f \"$${dir}/so_locations\""; \ -- rm -f "$${dir}/so_locations"; \ -- done --libsim_erosion.la: $(libsim_erosion_la_OBJECTS) $(libsim_erosion_la_DEPENDENCIES) -- $(CXXLINK) -rpath $(pkglibdir) $(libsim_erosion_la_OBJECTS) $(libsim_erosion_la_LIBADD) $(LIBS) -+ @list='$(pkglib_LTLIBRARIES)'; \ -+ locs=`for p in $$list; do echo $$p; done | \ -+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ -+ sort -u`; \ -+ test -z "$$locs" || { \ -+ echo rm -f $${locs}; \ -+ rm -f $${locs}; \ -+ } -+ -+libsim_erosion.la: $(libsim_erosion_la_OBJECTS) $(libsim_erosion_la_DEPENDENCIES) $(EXTRA_libsim_erosion_la_DEPENDENCIES) -+ $(AM_V_CXXLD)$(CXXLINK) -rpath $(pkglibdir) $(libsim_erosion_la_OBJECTS) $(libsim_erosion_la_LIBADD) $(LIBS) - - mostlyclean-compile: - -rm -f *.$(OBJEXT) -@@ -339,25 +455,25 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MMF_SAGA.Plo@am__quote@ - - .cpp.o: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< - - .cpp.obj: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - - .cpp.lo: --@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< - - mostlyclean-libtool: - -rm -f *.lo -@@ -365,26 +481,15 @@ mostlyclean-libtool: - clean-libtool: - -rm -rf .libs _libs - --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -+ID: $(am__tagged_files) -+ $(am__define_uniq_tagged_files); mkid -fID $$unique -+tags: tags-am -+TAGS: tags -+ -+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ -@@ -396,15 +501,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $$unique; \ - fi; \ - fi --ctags: CTAGS --CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ctags: ctags-am -+ -+CTAGS: ctags -+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) -+ $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique -@@ -413,6 +514,21 @@ GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -+cscopelist: cscopelist-am -+ -+cscopelist-am: $(am__tagged_files) -+ list='$(am__tagged_files)'; \ -+ case "$(srcdir)" in \ -+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ -+ *) sdir=$(subdir)/$(srcdir) ;; \ -+ esac; \ -+ for i in $$list; do \ -+ if test -f "$$i"; then \ -+ echo "$(subdir)/$$i"; \ -+ else \ -+ echo "$$sdir/$$i"; \ -+ fi; \ -+ done >> $(top_builddir)/cscope.files - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -@@ -464,10 +580,15 @@ install-am: all-am - - installcheck: installcheck-am - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+ if test -z '$(STRIP)'; then \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ install; \ -+ else \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -+ fi - mostlyclean-generic: - - clean-generic: -@@ -552,19 +673,20 @@ uninstall-am: uninstall-pkglibLTLIBRARIES - - .MAKE: install-am install-strip - --.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ -- clean-libtool clean-pkglibLTLIBRARIES ctags distclean \ -- distclean-compile distclean-generic distclean-libtool \ -- distclean-tags distdir dvi dvi-am html html-am info info-am \ -- install install-am install-data install-data-am install-dvi \ -- install-dvi-am install-exec install-exec-am install-html \ -- install-html-am install-info install-info-am install-man \ -- install-pdf install-pdf-am install-pkglibLTLIBRARIES \ -- install-ps install-ps-am install-strip installcheck \ -- installcheck-am installdirs maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-compile \ -- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -- tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES -+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ -+ clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \ -+ ctags-am distclean distclean-compile distclean-generic \ -+ distclean-libtool distclean-tags distdir dvi dvi-am html \ -+ html-am info info-am install install-am install-data \ -+ install-data-am install-dvi install-dvi-am install-exec \ -+ install-exec-am install-html install-html-am install-info \ -+ install-info-am install-man install-pdf install-pdf-am \ -+ install-pkglibLTLIBRARIES install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ maintainer-clean maintainer-clean-generic mostlyclean \ -+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ -+ pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ -+ uninstall-pkglibLTLIBRARIES - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff --git a/src/modules_simulation/hydrology/Makefile.in b/src/modules_simulation/hydrology/Makefile.in -index 743dd81..154098e 100644 ---- a/src/modules_simulation/hydrology/Makefile.in -+++ b/src/modules_simulation/hydrology/Makefile.in -@@ -1,9 +1,8 @@ --# Makefile.in generated by automake 1.11.1 from Makefile.am. -+# Makefile.in generated by automake 1.14 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, --# Inc. -+# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+ - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -15,6 +14,51 @@ - - @SET_MAKE@ - VPATH = @srcdir@ -+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -+am__make_running_with_option = \ -+ case $${target_option-} in \ -+ ?) ;; \ -+ *) echo "am__make_running_with_option: internal error: invalid" \ -+ "target option '$${target_option-}' specified" >&2; \ -+ exit 1;; \ -+ esac; \ -+ has_opt=no; \ -+ sane_makeflags=$$MAKEFLAGS; \ -+ if $(am__is_gnu_make); then \ -+ sane_makeflags=$$MFLAGS; \ -+ else \ -+ case $$MAKEFLAGS in \ -+ *\\[\ \ ]*) \ -+ bs=\\; \ -+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -+ esac; \ -+ fi; \ -+ skip_next=no; \ -+ strip_trailopt () \ -+ { \ -+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -+ }; \ -+ for flg in $$sane_makeflags; do \ -+ test $$skip_next = yes && { skip_next=no; continue; }; \ -+ case $$flg in \ -+ *=*|--*) continue;; \ -+ -*I) strip_trailopt 'I'; skip_next=yes;; \ -+ -*I?*) strip_trailopt 'I';; \ -+ -*O) strip_trailopt 'O'; skip_next=yes;; \ -+ -*O?*) strip_trailopt 'O';; \ -+ -*l) strip_trailopt 'l'; skip_next=yes;; \ -+ -*l?*) strip_trailopt 'l';; \ -+ -[dEDm]) skip_next=yes;; \ -+ -[JT]) skip_next=yes;; \ -+ esac; \ -+ case $$flg in \ -+ *$$target_option*) has_opt=yes; break;; \ -+ esac; \ -+ done; \ -+ test $$has_opt = yes -+am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -+am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -34,7 +78,7 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - subdir = src/modules_simulation/hydrology --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ - $(top_srcdir)/m4/ax_python_devel.m4 \ -@@ -49,20 +93,58 @@ mkinstalldirs = $(install_sh) -d - CONFIG_HEADER = $(top_builddir)/config.h - CONFIG_CLEAN_FILES = - CONFIG_CLEAN_VPATH_FILES = -+AM_V_P = $(am__v_P_@AM_V@) -+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -+am__v_P_0 = false -+am__v_P_1 = : -+AM_V_GEN = $(am__v_GEN_@AM_V@) -+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+am__v_GEN_0 = @echo " GEN " $@; -+am__v_GEN_1 = -+AM_V_at = $(am__v_at_@AM_V@) -+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+am__v_at_0 = @ -+am__v_at_1 = - SOURCES = - DIST_SOURCES = --RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ -- html-recursive info-recursive install-data-recursive \ -- install-dvi-recursive install-exec-recursive \ -- install-html-recursive install-info-recursive \ -- install-pdf-recursive install-ps-recursive install-recursive \ -- installcheck-recursive installdirs-recursive pdf-recursive \ -- ps-recursive uninstall-recursive -+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ -+ ctags-recursive dvi-recursive html-recursive info-recursive \ -+ install-data-recursive install-dvi-recursive \ -+ install-exec-recursive install-html-recursive \ -+ install-info-recursive install-pdf-recursive \ -+ install-ps-recursive install-recursive installcheck-recursive \ -+ installdirs-recursive pdf-recursive ps-recursive \ -+ tags-recursive uninstall-recursive -+am__can_run_installinfo = \ -+ case $$AM_UPDATE_INFO_DIR in \ -+ n|no|NO) false;; \ -+ *) (install-info --version) >/dev/null 2>&1;; \ -+ esac - RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ - distclean-recursive maintainer-clean-recursive --AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ -- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ -+am__recursive_targets = \ -+ $(RECURSIVE_TARGETS) \ -+ $(RECURSIVE_CLEAN_TARGETS) \ -+ $(am__extra_recursive_targets) -+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ - distdir -+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -+# Read a list of newline-separated strings from the standard input, -+# and print each of them once, without duplicates. Input order is -+# *not* preserved. -+am__uniquify_input = $(AWK) '\ -+ BEGIN { nonempty = 0; } \ -+ { items[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in items) print i; }; } \ -+' -+# Make sure the list of sources is unique. This is necessary because, -+# e.g., the same source file might be shared among _SOURCES variables -+# for different programs/libraries. -+am__define_uniq_tagged_files = \ -+ list='$(am__tagged_files)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | $(am__uniquify_input)` - ETAGS = etags - CTAGS = ctags - DIST_SUBDIRS = $(SUBDIRS) -@@ -94,6 +176,7 @@ am__relativize = \ - reldir="$$dir2" - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ -+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ -@@ -114,6 +197,7 @@ CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DISABLELIBHARU = @DISABLELIBHARU@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -141,6 +225,7 @@ LOCAL_INCS = @LOCAL_INCS@ - LOCAL_LIBS = @LOCAL_LIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - NM = @NM@ - NMEDIT = @NMEDIT@ -@@ -153,6 +238,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - POW_LIB = @POW_LIB@ -@@ -178,6 +264,7 @@ abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -@@ -211,7 +298,6 @@ libdir = @libdir@ - libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -@@ -273,22 +359,25 @@ clean-libtool: - -rm -rf .libs _libs - - # This directory's subdirectories are mostly independent; you can cd --# into them and run `make' without going through this Makefile. --# To change the values of `make' variables: instead of editing Makefiles, --# (1) if the variable is set in `config.status', edit `config.status' --# (which will cause the Makefiles to be regenerated when you run `make'); --# (2) otherwise, pass the desired values on the `make' command line. --$(RECURSIVE_TARGETS): -- @fail= failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -+# into them and run 'make' without going through this Makefile. -+# To change the values of 'make' variables: instead of editing Makefiles, -+# (1) if the variable is set in 'config.status', edit 'config.status' -+# (which will cause the Makefiles to be regenerated when you run 'make'); -+# (2) otherwise, pass the desired values on the 'make' command line. -+$(am__recursive_targets): -+ @fail=; \ -+ if $(am__make_keepgoing); then \ -+ failcom='fail=yes'; \ -+ else \ -+ failcom='exit 1'; \ -+ fi; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ -- list='$(SUBDIRS)'; for subdir in $$list; do \ -+ case "$@" in \ -+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -+ *) list='$(SUBDIRS)' ;; \ -+ esac; \ -+ for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ -@@ -303,57 +392,12 @@ $(RECURSIVE_TARGETS): - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - --$(RECURSIVE_CLEAN_TARGETS): -- @fail= failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -- dot_seen=no; \ -- case "$@" in \ -- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -- *) list='$(SUBDIRS)' ;; \ -- esac; \ -- rev=''; for subdir in $$list; do \ -- if test "$$subdir" = "."; then :; else \ -- rev="$$subdir $$rev"; \ -- fi; \ -- done; \ -- rev="$$rev ."; \ -- target=`echo $@ | sed s/-recursive//`; \ -- for subdir in $$rev; do \ -- echo "Making $$target in $$subdir"; \ -- if test "$$subdir" = "."; then \ -- local_target="$$target-am"; \ -- else \ -- local_target="$$target"; \ -- fi; \ -- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || eval $$failcom; \ -- done && test -z "$$fail" --tags-recursive: -- list='$(SUBDIRS)'; for subdir in $$list; do \ -- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ -- done --ctags-recursive: -- list='$(SUBDIRS)'; for subdir in $$list; do \ -- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ -- done -+ID: $(am__tagged_files) -+ $(am__define_uniq_tagged_files); mkid -fID $$unique -+tags: tags-recursive -+TAGS: tags - --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ - if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ -@@ -369,12 +413,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ -@@ -386,15 +425,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $$unique; \ - fi; \ - fi --ctags: CTAGS --CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ctags: ctags-recursive -+ -+CTAGS: ctags -+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) -+ $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique -@@ -403,6 +438,21 @@ GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -+cscopelist: cscopelist-recursive -+ -+cscopelist-am: $(am__tagged_files) -+ list='$(am__tagged_files)'; \ -+ case "$(srcdir)" in \ -+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ -+ *) sdir=$(subdir)/$(srcdir) ;; \ -+ esac; \ -+ for i in $$list; do \ -+ if test -f "$$i"; then \ -+ echo "$(subdir)/$$i"; \ -+ else \ -+ echo "$$sdir/$$i"; \ -+ fi; \ -+ done >> $(top_builddir)/cscope.files - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -@@ -439,13 +489,10 @@ distdir: $(DISTFILES) - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test -d "$(distdir)/$$subdir" \ -- || $(MKDIR_P) "$(distdir)/$$subdir" \ -- || exit 1; \ -- fi; \ -- done -- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ -- if test "$$subdir" = .; then :; else \ -+ $(am__make_dryrun) \ -+ || test -d "$(distdir)/$$subdir" \ -+ || $(MKDIR_P) "$(distdir)/$$subdir" \ -+ || exit 1; \ - dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ - $(am__relativize); \ - new_distdir=$$reldir; \ -@@ -480,10 +527,15 @@ install-am: all-am - - installcheck: installcheck-recursive - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+ if test -z '$(STRIP)'; then \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ install; \ -+ else \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -+ fi - mostlyclean-generic: - - clean-generic: -@@ -561,22 +613,20 @@ ps-am: - - uninstall-am: - --.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ -- install-am install-strip tags-recursive -- --.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ -- all all-am check check-am clean clean-generic clean-libtool \ -- ctags ctags-recursive distclean distclean-generic \ -- distclean-libtool distclean-tags distdir dvi dvi-am html \ -- html-am info info-am install install-am install-data \ -- install-data-am install-dvi install-dvi-am install-exec \ -- install-exec-am install-html install-html-am install-info \ -- install-info-am install-man install-pdf install-pdf-am \ -- install-ps install-ps-am install-strip installcheck \ -- installcheck-am installdirs installdirs-am maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-generic \ -- mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ -- uninstall uninstall-am -+.MAKE: $(am__recursive_targets) install-am install-strip -+ -+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ -+ check-am clean clean-generic clean-libtool cscopelist-am ctags \ -+ ctags-am distclean distclean-generic distclean-libtool \ -+ distclean-tags distdir dvi dvi-am html html-am info info-am \ -+ install install-am install-data install-data-am install-dvi \ -+ install-dvi-am install-exec install-exec-am install-html \ -+ install-html-am install-info install-info-am install-man \ -+ install-pdf install-pdf-am install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ installdirs-am maintainer-clean maintainer-clean-generic \ -+ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ -+ ps ps-am tags tags-am uninstall uninstall-am - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff --git a/src/modules_simulation/hydrology/sim_hydrology/Makefile.in b/src/modules_simulation/hydrology/sim_hydrology/Makefile.in -index f64d6ef..b52dc85 100644 ---- a/src/modules_simulation/hydrology/sim_hydrology/Makefile.in -+++ b/src/modules_simulation/hydrology/sim_hydrology/Makefile.in -@@ -1,9 +1,8 @@ --# Makefile.in generated by automake 1.11.1 from Makefile.am. -+# Makefile.in generated by automake 1.14 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, --# Inc. -+# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+ - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -16,6 +15,51 @@ - @SET_MAKE@ - - VPATH = @srcdir@ -+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -+am__make_running_with_option = \ -+ case $${target_option-} in \ -+ ?) ;; \ -+ *) echo "am__make_running_with_option: internal error: invalid" \ -+ "target option '$${target_option-}' specified" >&2; \ -+ exit 1;; \ -+ esac; \ -+ has_opt=no; \ -+ sane_makeflags=$$MAKEFLAGS; \ -+ if $(am__is_gnu_make); then \ -+ sane_makeflags=$$MFLAGS; \ -+ else \ -+ case $$MAKEFLAGS in \ -+ *\\[\ \ ]*) \ -+ bs=\\; \ -+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -+ esac; \ -+ fi; \ -+ skip_next=no; \ -+ strip_trailopt () \ -+ { \ -+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -+ }; \ -+ for flg in $$sane_makeflags; do \ -+ test $$skip_next = yes && { skip_next=no; continue; }; \ -+ case $$flg in \ -+ *=*|--*) continue;; \ -+ -*I) strip_trailopt 'I'; skip_next=yes;; \ -+ -*I?*) strip_trailopt 'I';; \ -+ -*O) strip_trailopt 'O'; skip_next=yes;; \ -+ -*O?*) strip_trailopt 'O';; \ -+ -*l) strip_trailopt 'l'; skip_next=yes;; \ -+ -*l?*) strip_trailopt 'l';; \ -+ -[dEDm]) skip_next=yes;; \ -+ -[JT]) skip_next=yes;; \ -+ esac; \ -+ case $$flg in \ -+ *$$target_option*) has_opt=yes; break;; \ -+ esac; \ -+ done; \ -+ test $$has_opt = yes -+am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -+am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -35,7 +79,8 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - subdir = src/modules_simulation/hydrology/sim_hydrology --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ -+ $(top_srcdir)/depcomp - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ - $(top_srcdir)/m4/ax_python_devel.m4 \ -@@ -71,6 +116,12 @@ am__nobase_list = $(am__nobase_strip_setup); \ - am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -+am__uninstall_files_from_dir = { \ -+ test -z "$$files" \ -+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ -+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ -+ $(am__cd) "$$dir" && rm -f $$files; }; \ -+ } - am__installdirs = "$(DESTDIR)$(pkglibdir)" - LTLIBRARIES = $(pkglib_LTLIBRARIES) - libsim_hydrology_la_DEPENDENCIES = \ -@@ -79,35 +130,92 @@ am_libsim_hydrology_la_OBJECTS = DVWK_SoilMoisture.lo idw.lo \ - KinWav_D8.lo MLB_Interface.lo topmodel.lo topmodel_values.lo \ - WaterRetentionCapacity.lo - libsim_hydrology_la_OBJECTS = $(am_libsim_hydrology_la_OBJECTS) -+AM_V_lt = $(am__v_lt_@AM_V@) -+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -+am__v_lt_0 = --silent -+am__v_lt_1 = -+AM_V_P = $(am__v_P_@AM_V@) -+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -+am__v_P_0 = false -+am__v_P_1 = : -+AM_V_GEN = $(am__v_GEN_@AM_V@) -+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+am__v_GEN_0 = @echo " GEN " $@; -+am__v_GEN_1 = -+AM_V_at = $(am__v_at_@AM_V@) -+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+am__v_at_0 = @ -+am__v_at_1 = - DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - am__mv = mv -f - CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) --LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CXXFLAGS) $(CXXFLAGS) -+AM_V_CXX = $(am__v_CXX_@AM_V@) -+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) -+am__v_CXX_0 = @echo " CXX " $@; -+am__v_CXX_1 = - CXXLD = $(CXX) --CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ -+ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) -+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) -+am__v_CXXLD_0 = @echo " CXXLD " $@; -+am__v_CXXLD_1 = - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CFLAGS) $(CFLAGS) -+AM_V_CC = $(am__v_CC_@AM_V@) -+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -+am__v_CC_0 = @echo " CC " $@; -+am__v_CC_1 = - CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CCLD = $(am__v_CCLD_@AM_V@) -+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -+am__v_CCLD_0 = @echo " CCLD " $@; -+am__v_CCLD_1 = - SOURCES = $(libsim_hydrology_la_SOURCES) - DIST_SOURCES = $(libsim_hydrology_la_SOURCES) -+am__can_run_installinfo = \ -+ case $$AM_UPDATE_INFO_DIR in \ -+ n|no|NO) false;; \ -+ *) (install-info --version) >/dev/null 2>&1;; \ -+ esac -+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -+# Read a list of newline-separated strings from the standard input, -+# and print each of them once, without duplicates. Input order is -+# *not* preserved. -+am__uniquify_input = $(AWK) '\ -+ BEGIN { nonempty = 0; } \ -+ { items[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in items) print i; }; } \ -+' -+# Make sure the list of sources is unique. This is necessary because, -+# e.g., the same source file might be shared among _SOURCES variables -+# for different programs/libraries. -+am__define_uniq_tagged_files = \ -+ list='$(am__tagged_files)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | $(am__uniquify_input)` - ETAGS = etags - CTAGS = ctags - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ -+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ -@@ -128,6 +236,7 @@ CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DISABLELIBHARU = @DISABLELIBHARU@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -155,6 +264,7 @@ LOCAL_INCS = @LOCAL_INCS@ - LOCAL_LIBS = @LOCAL_LIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - NM = @NM@ - NMEDIT = @NMEDIT@ -@@ -167,6 +277,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - POW_LIB = @POW_LIB@ -@@ -192,6 +303,7 @@ abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -@@ -225,7 +337,6 @@ libdir = @libdir@ - libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -@@ -307,9 +418,9 @@ $(top_srcdir)/configure: $(am__configure_deps) - $(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - $(am__aclocal_m4_deps): -+ - install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" - @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ - list2=; for p in $$list; do \ - if test -f $$p; then \ -@@ -317,6 +428,8 @@ install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - else :; fi; \ - done; \ - test -z "$$list2" || { \ -+ echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \ -+ $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \ - } -@@ -332,14 +445,17 @@ uninstall-pkglibLTLIBRARIES: - - clean-pkglibLTLIBRARIES: - -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES) -- @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \ -- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -- echo "rm -f \"$${dir}/so_locations\""; \ -- rm -f "$${dir}/so_locations"; \ -- done --libsim_hydrology.la: $(libsim_hydrology_la_OBJECTS) $(libsim_hydrology_la_DEPENDENCIES) -- $(CXXLINK) -rpath $(pkglibdir) $(libsim_hydrology_la_OBJECTS) $(libsim_hydrology_la_LIBADD) $(LIBS) -+ @list='$(pkglib_LTLIBRARIES)'; \ -+ locs=`for p in $$list; do echo $$p; done | \ -+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ -+ sort -u`; \ -+ test -z "$$locs" || { \ -+ echo rm -f $${locs}; \ -+ rm -f $${locs}; \ -+ } -+ -+libsim_hydrology.la: $(libsim_hydrology_la_OBJECTS) $(libsim_hydrology_la_DEPENDENCIES) $(EXTRA_libsim_hydrology_la_DEPENDENCIES) -+ $(AM_V_CXXLD)$(CXXLINK) -rpath $(pkglibdir) $(libsim_hydrology_la_OBJECTS) $(libsim_hydrology_la_LIBADD) $(LIBS) - - mostlyclean-compile: - -rm -f *.$(OBJEXT) -@@ -356,25 +472,25 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/topmodel_values.Plo@am__quote@ - - .cpp.o: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< - - .cpp.obj: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - - .cpp.lo: --@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< - - mostlyclean-libtool: - -rm -f *.lo -@@ -382,26 +498,15 @@ mostlyclean-libtool: - clean-libtool: - -rm -rf .libs _libs - --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -+ID: $(am__tagged_files) -+ $(am__define_uniq_tagged_files); mkid -fID $$unique -+tags: tags-am -+TAGS: tags -+ -+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ -@@ -413,15 +518,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $$unique; \ - fi; \ - fi --ctags: CTAGS --CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ctags: ctags-am -+ -+CTAGS: ctags -+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) -+ $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique -@@ -430,6 +531,21 @@ GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -+cscopelist: cscopelist-am -+ -+cscopelist-am: $(am__tagged_files) -+ list='$(am__tagged_files)'; \ -+ case "$(srcdir)" in \ -+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ -+ *) sdir=$(subdir)/$(srcdir) ;; \ -+ esac; \ -+ for i in $$list; do \ -+ if test -f "$$i"; then \ -+ echo "$(subdir)/$$i"; \ -+ else \ -+ echo "$$sdir/$$i"; \ -+ fi; \ -+ done >> $(top_builddir)/cscope.files - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -@@ -481,10 +597,15 @@ install-am: all-am - - installcheck: installcheck-am - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+ if test -z '$(STRIP)'; then \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ install; \ -+ else \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -+ fi - mostlyclean-generic: - - clean-generic: -@@ -569,19 +690,20 @@ uninstall-am: uninstall-pkglibLTLIBRARIES - - .MAKE: install-am install-strip - --.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ -- clean-libtool clean-pkglibLTLIBRARIES ctags distclean \ -- distclean-compile distclean-generic distclean-libtool \ -- distclean-tags distdir dvi dvi-am html html-am info info-am \ -- install install-am install-data install-data-am install-dvi \ -- install-dvi-am install-exec install-exec-am install-html \ -- install-html-am install-info install-info-am install-man \ -- install-pdf install-pdf-am install-pkglibLTLIBRARIES \ -- install-ps install-ps-am install-strip installcheck \ -- installcheck-am installdirs maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-compile \ -- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -- tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES -+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ -+ clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \ -+ ctags-am distclean distclean-compile distclean-generic \ -+ distclean-libtool distclean-tags distdir dvi dvi-am html \ -+ html-am info info-am install install-am install-data \ -+ install-data-am install-dvi install-dvi-am install-exec \ -+ install-exec-am install-html install-html-am install-info \ -+ install-info-am install-man install-pdf install-pdf-am \ -+ install-pkglibLTLIBRARIES install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ maintainer-clean maintainer-clean-generic mostlyclean \ -+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ -+ pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ -+ uninstall-pkglibLTLIBRARIES - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff --git a/src/modules_terrain_analysis/Makefile.in b/src/modules_terrain_analysis/Makefile.in -index 6bbdf01..32a2177 100644 ---- a/src/modules_terrain_analysis/Makefile.in -+++ b/src/modules_terrain_analysis/Makefile.in -@@ -1,9 +1,8 @@ --# Makefile.in generated by automake 1.11.1 from Makefile.am. -+# Makefile.in generated by automake 1.14 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, --# Inc. -+# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+ - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -15,6 +14,51 @@ - - @SET_MAKE@ - VPATH = @srcdir@ -+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -+am__make_running_with_option = \ -+ case $${target_option-} in \ -+ ?) ;; \ -+ *) echo "am__make_running_with_option: internal error: invalid" \ -+ "target option '$${target_option-}' specified" >&2; \ -+ exit 1;; \ -+ esac; \ -+ has_opt=no; \ -+ sane_makeflags=$$MAKEFLAGS; \ -+ if $(am__is_gnu_make); then \ -+ sane_makeflags=$$MFLAGS; \ -+ else \ -+ case $$MAKEFLAGS in \ -+ *\\[\ \ ]*) \ -+ bs=\\; \ -+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -+ esac; \ -+ fi; \ -+ skip_next=no; \ -+ strip_trailopt () \ -+ { \ -+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -+ }; \ -+ for flg in $$sane_makeflags; do \ -+ test $$skip_next = yes && { skip_next=no; continue; }; \ -+ case $$flg in \ -+ *=*|--*) continue;; \ -+ -*I) strip_trailopt 'I'; skip_next=yes;; \ -+ -*I?*) strip_trailopt 'I';; \ -+ -*O) strip_trailopt 'O'; skip_next=yes;; \ -+ -*O?*) strip_trailopt 'O';; \ -+ -*l) strip_trailopt 'l'; skip_next=yes;; \ -+ -*l?*) strip_trailopt 'l';; \ -+ -[dEDm]) skip_next=yes;; \ -+ -[JT]) skip_next=yes;; \ -+ esac; \ -+ case $$flg in \ -+ *$$target_option*) has_opt=yes; break;; \ -+ esac; \ -+ done; \ -+ test $$has_opt = yes -+am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -+am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -34,7 +78,7 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - subdir = src/modules_terrain_analysis --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ - $(top_srcdir)/m4/ax_python_devel.m4 \ -@@ -49,20 +93,58 @@ mkinstalldirs = $(install_sh) -d - CONFIG_HEADER = $(top_builddir)/config.h - CONFIG_CLEAN_FILES = - CONFIG_CLEAN_VPATH_FILES = -+AM_V_P = $(am__v_P_@AM_V@) -+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -+am__v_P_0 = false -+am__v_P_1 = : -+AM_V_GEN = $(am__v_GEN_@AM_V@) -+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+am__v_GEN_0 = @echo " GEN " $@; -+am__v_GEN_1 = -+AM_V_at = $(am__v_at_@AM_V@) -+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+am__v_at_0 = @ -+am__v_at_1 = - SOURCES = - DIST_SOURCES = --RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ -- html-recursive info-recursive install-data-recursive \ -- install-dvi-recursive install-exec-recursive \ -- install-html-recursive install-info-recursive \ -- install-pdf-recursive install-ps-recursive install-recursive \ -- installcheck-recursive installdirs-recursive pdf-recursive \ -- ps-recursive uninstall-recursive -+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ -+ ctags-recursive dvi-recursive html-recursive info-recursive \ -+ install-data-recursive install-dvi-recursive \ -+ install-exec-recursive install-html-recursive \ -+ install-info-recursive install-pdf-recursive \ -+ install-ps-recursive install-recursive installcheck-recursive \ -+ installdirs-recursive pdf-recursive ps-recursive \ -+ tags-recursive uninstall-recursive -+am__can_run_installinfo = \ -+ case $$AM_UPDATE_INFO_DIR in \ -+ n|no|NO) false;; \ -+ *) (install-info --version) >/dev/null 2>&1;; \ -+ esac - RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ - distclean-recursive maintainer-clean-recursive --AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ -- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ -+am__recursive_targets = \ -+ $(RECURSIVE_TARGETS) \ -+ $(RECURSIVE_CLEAN_TARGETS) \ -+ $(am__extra_recursive_targets) -+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ - distdir -+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -+# Read a list of newline-separated strings from the standard input, -+# and print each of them once, without duplicates. Input order is -+# *not* preserved. -+am__uniquify_input = $(AWK) '\ -+ BEGIN { nonempty = 0; } \ -+ { items[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in items) print i; }; } \ -+' -+# Make sure the list of sources is unique. This is necessary because, -+# e.g., the same source file might be shared among _SOURCES variables -+# for different programs/libraries. -+am__define_uniq_tagged_files = \ -+ list='$(am__tagged_files)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | $(am__uniquify_input)` - ETAGS = etags - CTAGS = ctags - DIST_SUBDIRS = $(SUBDIRS) -@@ -94,6 +176,7 @@ am__relativize = \ - reldir="$$dir2" - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ -+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ -@@ -114,6 +197,7 @@ CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DISABLELIBHARU = @DISABLELIBHARU@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -141,6 +225,7 @@ LOCAL_INCS = @LOCAL_INCS@ - LOCAL_LIBS = @LOCAL_LIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - NM = @NM@ - NMEDIT = @NMEDIT@ -@@ -153,6 +238,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - POW_LIB = @POW_LIB@ -@@ -178,6 +264,7 @@ abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -@@ -211,7 +298,6 @@ libdir = @libdir@ - libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -@@ -273,22 +359,25 @@ clean-libtool: - -rm -rf .libs _libs - - # This directory's subdirectories are mostly independent; you can cd --# into them and run `make' without going through this Makefile. --# To change the values of `make' variables: instead of editing Makefiles, --# (1) if the variable is set in `config.status', edit `config.status' --# (which will cause the Makefiles to be regenerated when you run `make'); --# (2) otherwise, pass the desired values on the `make' command line. --$(RECURSIVE_TARGETS): -- @fail= failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -+# into them and run 'make' without going through this Makefile. -+# To change the values of 'make' variables: instead of editing Makefiles, -+# (1) if the variable is set in 'config.status', edit 'config.status' -+# (which will cause the Makefiles to be regenerated when you run 'make'); -+# (2) otherwise, pass the desired values on the 'make' command line. -+$(am__recursive_targets): -+ @fail=; \ -+ if $(am__make_keepgoing); then \ -+ failcom='fail=yes'; \ -+ else \ -+ failcom='exit 1'; \ -+ fi; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ -- list='$(SUBDIRS)'; for subdir in $$list; do \ -+ case "$@" in \ -+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -+ *) list='$(SUBDIRS)' ;; \ -+ esac; \ -+ for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ -@@ -303,57 +392,12 @@ $(RECURSIVE_TARGETS): - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - --$(RECURSIVE_CLEAN_TARGETS): -- @fail= failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -- dot_seen=no; \ -- case "$@" in \ -- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -- *) list='$(SUBDIRS)' ;; \ -- esac; \ -- rev=''; for subdir in $$list; do \ -- if test "$$subdir" = "."; then :; else \ -- rev="$$subdir $$rev"; \ -- fi; \ -- done; \ -- rev="$$rev ."; \ -- target=`echo $@ | sed s/-recursive//`; \ -- for subdir in $$rev; do \ -- echo "Making $$target in $$subdir"; \ -- if test "$$subdir" = "."; then \ -- local_target="$$target-am"; \ -- else \ -- local_target="$$target"; \ -- fi; \ -- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || eval $$failcom; \ -- done && test -z "$$fail" --tags-recursive: -- list='$(SUBDIRS)'; for subdir in $$list; do \ -- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ -- done --ctags-recursive: -- list='$(SUBDIRS)'; for subdir in $$list; do \ -- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ -- done -+ID: $(am__tagged_files) -+ $(am__define_uniq_tagged_files); mkid -fID $$unique -+tags: tags-recursive -+TAGS: tags - --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ - if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ -@@ -369,12 +413,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ -@@ -386,15 +425,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $$unique; \ - fi; \ - fi --ctags: CTAGS --CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ctags: ctags-recursive -+ -+CTAGS: ctags -+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) -+ $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique -@@ -403,6 +438,21 @@ GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -+cscopelist: cscopelist-recursive -+ -+cscopelist-am: $(am__tagged_files) -+ list='$(am__tagged_files)'; \ -+ case "$(srcdir)" in \ -+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ -+ *) sdir=$(subdir)/$(srcdir) ;; \ -+ esac; \ -+ for i in $$list; do \ -+ if test -f "$$i"; then \ -+ echo "$(subdir)/$$i"; \ -+ else \ -+ echo "$$sdir/$$i"; \ -+ fi; \ -+ done >> $(top_builddir)/cscope.files - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -@@ -439,13 +489,10 @@ distdir: $(DISTFILES) - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test -d "$(distdir)/$$subdir" \ -- || $(MKDIR_P) "$(distdir)/$$subdir" \ -- || exit 1; \ -- fi; \ -- done -- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ -- if test "$$subdir" = .; then :; else \ -+ $(am__make_dryrun) \ -+ || test -d "$(distdir)/$$subdir" \ -+ || $(MKDIR_P) "$(distdir)/$$subdir" \ -+ || exit 1; \ - dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ - $(am__relativize); \ - new_distdir=$$reldir; \ -@@ -480,10 +527,15 @@ install-am: all-am - - installcheck: installcheck-recursive - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+ if test -z '$(STRIP)'; then \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ install; \ -+ else \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -+ fi - mostlyclean-generic: - - clean-generic: -@@ -561,22 +613,20 @@ ps-am: - - uninstall-am: - --.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ -- install-am install-strip tags-recursive -- --.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ -- all all-am check check-am clean clean-generic clean-libtool \ -- ctags ctags-recursive distclean distclean-generic \ -- distclean-libtool distclean-tags distdir dvi dvi-am html \ -- html-am info info-am install install-am install-data \ -- install-data-am install-dvi install-dvi-am install-exec \ -- install-exec-am install-html install-html-am install-info \ -- install-info-am install-man install-pdf install-pdf-am \ -- install-ps install-ps-am install-strip installcheck \ -- installcheck-am installdirs installdirs-am maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-generic \ -- mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ -- uninstall uninstall-am -+.MAKE: $(am__recursive_targets) install-am install-strip -+ -+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ -+ check-am clean clean-generic clean-libtool cscopelist-am ctags \ -+ ctags-am distclean distclean-generic distclean-libtool \ -+ distclean-tags distdir dvi dvi-am html html-am info info-am \ -+ install install-am install-data install-data-am install-dvi \ -+ install-dvi-am install-exec install-exec-am install-html \ -+ install-html-am install-info install-info-am install-man \ -+ install-pdf install-pdf-am install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ installdirs-am maintainer-clean maintainer-clean-generic \ -+ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ -+ ps ps-am tags tags-am uninstall uninstall-am - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff --git a/src/modules_terrain_analysis/terrain_analysis/Makefile.in b/src/modules_terrain_analysis/terrain_analysis/Makefile.in -index ea71d1e..d2c21c3 100644 ---- a/src/modules_terrain_analysis/terrain_analysis/Makefile.in -+++ b/src/modules_terrain_analysis/terrain_analysis/Makefile.in -@@ -1,9 +1,8 @@ --# Makefile.in generated by automake 1.11.1 from Makefile.am. -+# Makefile.in generated by automake 1.14 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, --# Inc. -+# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+ - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -15,6 +14,51 @@ - - @SET_MAKE@ - VPATH = @srcdir@ -+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -+am__make_running_with_option = \ -+ case $${target_option-} in \ -+ ?) ;; \ -+ *) echo "am__make_running_with_option: internal error: invalid" \ -+ "target option '$${target_option-}' specified" >&2; \ -+ exit 1;; \ -+ esac; \ -+ has_opt=no; \ -+ sane_makeflags=$$MAKEFLAGS; \ -+ if $(am__is_gnu_make); then \ -+ sane_makeflags=$$MFLAGS; \ -+ else \ -+ case $$MAKEFLAGS in \ -+ *\\[\ \ ]*) \ -+ bs=\\; \ -+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -+ esac; \ -+ fi; \ -+ skip_next=no; \ -+ strip_trailopt () \ -+ { \ -+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -+ }; \ -+ for flg in $$sane_makeflags; do \ -+ test $$skip_next = yes && { skip_next=no; continue; }; \ -+ case $$flg in \ -+ *=*|--*) continue;; \ -+ -*I) strip_trailopt 'I'; skip_next=yes;; \ -+ -*I?*) strip_trailopt 'I';; \ -+ -*O) strip_trailopt 'O'; skip_next=yes;; \ -+ -*O?*) strip_trailopt 'O';; \ -+ -*l) strip_trailopt 'l'; skip_next=yes;; \ -+ -*l?*) strip_trailopt 'l';; \ -+ -[dEDm]) skip_next=yes;; \ -+ -[JT]) skip_next=yes;; \ -+ esac; \ -+ case $$flg in \ -+ *$$target_option*) has_opt=yes; break;; \ -+ esac; \ -+ done; \ -+ test $$has_opt = yes -+am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -+am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -34,7 +78,7 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - subdir = src/modules_terrain_analysis/terrain_analysis --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ - $(top_srcdir)/m4/ax_python_devel.m4 \ -@@ -49,20 +93,58 @@ mkinstalldirs = $(install_sh) -d - CONFIG_HEADER = $(top_builddir)/config.h - CONFIG_CLEAN_FILES = - CONFIG_CLEAN_VPATH_FILES = -+AM_V_P = $(am__v_P_@AM_V@) -+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -+am__v_P_0 = false -+am__v_P_1 = : -+AM_V_GEN = $(am__v_GEN_@AM_V@) -+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+am__v_GEN_0 = @echo " GEN " $@; -+am__v_GEN_1 = -+AM_V_at = $(am__v_at_@AM_V@) -+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+am__v_at_0 = @ -+am__v_at_1 = - SOURCES = - DIST_SOURCES = --RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ -- html-recursive info-recursive install-data-recursive \ -- install-dvi-recursive install-exec-recursive \ -- install-html-recursive install-info-recursive \ -- install-pdf-recursive install-ps-recursive install-recursive \ -- installcheck-recursive installdirs-recursive pdf-recursive \ -- ps-recursive uninstall-recursive -+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ -+ ctags-recursive dvi-recursive html-recursive info-recursive \ -+ install-data-recursive install-dvi-recursive \ -+ install-exec-recursive install-html-recursive \ -+ install-info-recursive install-pdf-recursive \ -+ install-ps-recursive install-recursive installcheck-recursive \ -+ installdirs-recursive pdf-recursive ps-recursive \ -+ tags-recursive uninstall-recursive -+am__can_run_installinfo = \ -+ case $$AM_UPDATE_INFO_DIR in \ -+ n|no|NO) false;; \ -+ *) (install-info --version) >/dev/null 2>&1;; \ -+ esac - RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ - distclean-recursive maintainer-clean-recursive --AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ -- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ -+am__recursive_targets = \ -+ $(RECURSIVE_TARGETS) \ -+ $(RECURSIVE_CLEAN_TARGETS) \ -+ $(am__extra_recursive_targets) -+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ - distdir -+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -+# Read a list of newline-separated strings from the standard input, -+# and print each of them once, without duplicates. Input order is -+# *not* preserved. -+am__uniquify_input = $(AWK) '\ -+ BEGIN { nonempty = 0; } \ -+ { items[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in items) print i; }; } \ -+' -+# Make sure the list of sources is unique. This is necessary because, -+# e.g., the same source file might be shared among _SOURCES variables -+# for different programs/libraries. -+am__define_uniq_tagged_files = \ -+ list='$(am__tagged_files)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | $(am__uniquify_input)` - ETAGS = etags - CTAGS = ctags - DIST_SUBDIRS = $(SUBDIRS) -@@ -94,6 +176,7 @@ am__relativize = \ - reldir="$$dir2" - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ -+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ -@@ -114,6 +197,7 @@ CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DISABLELIBHARU = @DISABLELIBHARU@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -141,6 +225,7 @@ LOCAL_INCS = @LOCAL_INCS@ - LOCAL_LIBS = @LOCAL_LIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - NM = @NM@ - NMEDIT = @NMEDIT@ -@@ -153,6 +238,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - POW_LIB = @POW_LIB@ -@@ -178,6 +264,7 @@ abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -@@ -211,7 +298,6 @@ libdir = @libdir@ - libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -@@ -273,22 +359,25 @@ clean-libtool: - -rm -rf .libs _libs - - # This directory's subdirectories are mostly independent; you can cd --# into them and run `make' without going through this Makefile. --# To change the values of `make' variables: instead of editing Makefiles, --# (1) if the variable is set in `config.status', edit `config.status' --# (which will cause the Makefiles to be regenerated when you run `make'); --# (2) otherwise, pass the desired values on the `make' command line. --$(RECURSIVE_TARGETS): -- @fail= failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -+# into them and run 'make' without going through this Makefile. -+# To change the values of 'make' variables: instead of editing Makefiles, -+# (1) if the variable is set in 'config.status', edit 'config.status' -+# (which will cause the Makefiles to be regenerated when you run 'make'); -+# (2) otherwise, pass the desired values on the 'make' command line. -+$(am__recursive_targets): -+ @fail=; \ -+ if $(am__make_keepgoing); then \ -+ failcom='fail=yes'; \ -+ else \ -+ failcom='exit 1'; \ -+ fi; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ -- list='$(SUBDIRS)'; for subdir in $$list; do \ -+ case "$@" in \ -+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -+ *) list='$(SUBDIRS)' ;; \ -+ esac; \ -+ for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ -@@ -303,57 +392,12 @@ $(RECURSIVE_TARGETS): - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - --$(RECURSIVE_CLEAN_TARGETS): -- @fail= failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -- dot_seen=no; \ -- case "$@" in \ -- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -- *) list='$(SUBDIRS)' ;; \ -- esac; \ -- rev=''; for subdir in $$list; do \ -- if test "$$subdir" = "."; then :; else \ -- rev="$$subdir $$rev"; \ -- fi; \ -- done; \ -- rev="$$rev ."; \ -- target=`echo $@ | sed s/-recursive//`; \ -- for subdir in $$rev; do \ -- echo "Making $$target in $$subdir"; \ -- if test "$$subdir" = "."; then \ -- local_target="$$target-am"; \ -- else \ -- local_target="$$target"; \ -- fi; \ -- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || eval $$failcom; \ -- done && test -z "$$fail" --tags-recursive: -- list='$(SUBDIRS)'; for subdir in $$list; do \ -- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ -- done --ctags-recursive: -- list='$(SUBDIRS)'; for subdir in $$list; do \ -- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ -- done -+ID: $(am__tagged_files) -+ $(am__define_uniq_tagged_files); mkid -fID $$unique -+tags: tags-recursive -+TAGS: tags - --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ - if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ -@@ -369,12 +413,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ -@@ -386,15 +425,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $$unique; \ - fi; \ - fi --ctags: CTAGS --CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ctags: ctags-recursive -+ -+CTAGS: ctags -+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) -+ $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique -@@ -403,6 +438,21 @@ GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -+cscopelist: cscopelist-recursive -+ -+cscopelist-am: $(am__tagged_files) -+ list='$(am__tagged_files)'; \ -+ case "$(srcdir)" in \ -+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ -+ *) sdir=$(subdir)/$(srcdir) ;; \ -+ esac; \ -+ for i in $$list; do \ -+ if test -f "$$i"; then \ -+ echo "$(subdir)/$$i"; \ -+ else \ -+ echo "$$sdir/$$i"; \ -+ fi; \ -+ done >> $(top_builddir)/cscope.files - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -@@ -439,13 +489,10 @@ distdir: $(DISTFILES) - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test -d "$(distdir)/$$subdir" \ -- || $(MKDIR_P) "$(distdir)/$$subdir" \ -- || exit 1; \ -- fi; \ -- done -- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ -- if test "$$subdir" = .; then :; else \ -+ $(am__make_dryrun) \ -+ || test -d "$(distdir)/$$subdir" \ -+ || $(MKDIR_P) "$(distdir)/$$subdir" \ -+ || exit 1; \ - dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ - $(am__relativize); \ - new_distdir=$$reldir; \ -@@ -480,10 +527,15 @@ install-am: all-am - - installcheck: installcheck-recursive - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+ if test -z '$(STRIP)'; then \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ install; \ -+ else \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -+ fi - mostlyclean-generic: - - clean-generic: -@@ -561,22 +613,20 @@ ps-am: - - uninstall-am: - --.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ -- install-am install-strip tags-recursive -- --.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ -- all all-am check check-am clean clean-generic clean-libtool \ -- ctags ctags-recursive distclean distclean-generic \ -- distclean-libtool distclean-tags distdir dvi dvi-am html \ -- html-am info info-am install install-am install-data \ -- install-data-am install-dvi install-dvi-am install-exec \ -- install-exec-am install-html install-html-am install-info \ -- install-info-am install-man install-pdf install-pdf-am \ -- install-ps install-ps-am install-strip installcheck \ -- installcheck-am installdirs installdirs-am maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-generic \ -- mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ -- uninstall uninstall-am -+.MAKE: $(am__recursive_targets) install-am install-strip -+ -+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ -+ check-am clean clean-generic clean-libtool cscopelist-am ctags \ -+ ctags-am distclean distclean-generic distclean-libtool \ -+ distclean-tags distdir dvi dvi-am html html-am info info-am \ -+ install install-am install-data install-data-am install-dvi \ -+ install-dvi-am install-exec install-exec-am install-html \ -+ install-html-am install-info install-info-am install-man \ -+ install-pdf install-pdf-am install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ installdirs-am maintainer-clean maintainer-clean-generic \ -+ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ -+ ps ps-am tags tags-am uninstall uninstall-am - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff --git a/src/modules_terrain_analysis/terrain_analysis/ta_channels/Makefile.in b/src/modules_terrain_analysis/terrain_analysis/ta_channels/Makefile.in -index 3c9843b..ee919ef 100644 ---- a/src/modules_terrain_analysis/terrain_analysis/ta_channels/Makefile.in -+++ b/src/modules_terrain_analysis/terrain_analysis/ta_channels/Makefile.in -@@ -1,9 +1,8 @@ --# Makefile.in generated by automake 1.11.1 from Makefile.am. -+# Makefile.in generated by automake 1.14 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, --# Inc. -+# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+ - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -16,6 +15,51 @@ - @SET_MAKE@ - - VPATH = @srcdir@ -+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -+am__make_running_with_option = \ -+ case $${target_option-} in \ -+ ?) ;; \ -+ *) echo "am__make_running_with_option: internal error: invalid" \ -+ "target option '$${target_option-}' specified" >&2; \ -+ exit 1;; \ -+ esac; \ -+ has_opt=no; \ -+ sane_makeflags=$$MAKEFLAGS; \ -+ if $(am__is_gnu_make); then \ -+ sane_makeflags=$$MFLAGS; \ -+ else \ -+ case $$MAKEFLAGS in \ -+ *\\[\ \ ]*) \ -+ bs=\\; \ -+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -+ esac; \ -+ fi; \ -+ skip_next=no; \ -+ strip_trailopt () \ -+ { \ -+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -+ }; \ -+ for flg in $$sane_makeflags; do \ -+ test $$skip_next = yes && { skip_next=no; continue; }; \ -+ case $$flg in \ -+ *=*|--*) continue;; \ -+ -*I) strip_trailopt 'I'; skip_next=yes;; \ -+ -*I?*) strip_trailopt 'I';; \ -+ -*O) strip_trailopt 'O'; skip_next=yes;; \ -+ -*O?*) strip_trailopt 'O';; \ -+ -*l) strip_trailopt 'l'; skip_next=yes;; \ -+ -*l?*) strip_trailopt 'l';; \ -+ -[dEDm]) skip_next=yes;; \ -+ -[JT]) skip_next=yes;; \ -+ esac; \ -+ case $$flg in \ -+ *$$target_option*) has_opt=yes; break;; \ -+ esac; \ -+ done; \ -+ test $$has_opt = yes -+am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -+am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -35,7 +79,8 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - subdir = src/modules_terrain_analysis/terrain_analysis/ta_channels --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ -+ $(top_srcdir)/depcomp - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ - $(top_srcdir)/m4/ax_python_devel.m4 \ -@@ -71,6 +116,12 @@ am__nobase_list = $(am__nobase_strip_setup); \ - am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -+am__uninstall_files_from_dir = { \ -+ test -z "$$files" \ -+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ -+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ -+ $(am__cd) "$$dir" && rm -f $$files; }; \ -+ } - am__installdirs = "$(DESTDIR)$(pkglibdir)" - LTLIBRARIES = $(pkglib_LTLIBRARIES) - libta_channels_la_DEPENDENCIES = \ -@@ -80,35 +131,92 @@ am_libta_channels_la_OBJECTS = ChannelNetwork.lo \ - D8_Flow_Analysis.lo MLB_Interface.lo Strahler.lo Watersheds.lo \ - Watersheds_ext.lo - libta_channels_la_OBJECTS = $(am_libta_channels_la_OBJECTS) -+AM_V_lt = $(am__v_lt_@AM_V@) -+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -+am__v_lt_0 = --silent -+am__v_lt_1 = -+AM_V_P = $(am__v_P_@AM_V@) -+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -+am__v_P_0 = false -+am__v_P_1 = : -+AM_V_GEN = $(am__v_GEN_@AM_V@) -+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+am__v_GEN_0 = @echo " GEN " $@; -+am__v_GEN_1 = -+AM_V_at = $(am__v_at_@AM_V@) -+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+am__v_at_0 = @ -+am__v_at_1 = - DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - am__mv = mv -f - CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) --LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CXXFLAGS) $(CXXFLAGS) -+AM_V_CXX = $(am__v_CXX_@AM_V@) -+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) -+am__v_CXX_0 = @echo " CXX " $@; -+am__v_CXX_1 = - CXXLD = $(CXX) --CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ -+ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) -+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) -+am__v_CXXLD_0 = @echo " CXXLD " $@; -+am__v_CXXLD_1 = - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CFLAGS) $(CFLAGS) -+AM_V_CC = $(am__v_CC_@AM_V@) -+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -+am__v_CC_0 = @echo " CC " $@; -+am__v_CC_1 = - CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CCLD = $(am__v_CCLD_@AM_V@) -+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -+am__v_CCLD_0 = @echo " CCLD " $@; -+am__v_CCLD_1 = - SOURCES = $(libta_channels_la_SOURCES) - DIST_SOURCES = $(libta_channels_la_SOURCES) -+am__can_run_installinfo = \ -+ case $$AM_UPDATE_INFO_DIR in \ -+ n|no|NO) false;; \ -+ *) (install-info --version) >/dev/null 2>&1;; \ -+ esac -+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -+# Read a list of newline-separated strings from the standard input, -+# and print each of them once, without duplicates. Input order is -+# *not* preserved. -+am__uniquify_input = $(AWK) '\ -+ BEGIN { nonempty = 0; } \ -+ { items[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in items) print i; }; } \ -+' -+# Make sure the list of sources is unique. This is necessary because, -+# e.g., the same source file might be shared among _SOURCES variables -+# for different programs/libraries. -+am__define_uniq_tagged_files = \ -+ list='$(am__tagged_files)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | $(am__uniquify_input)` - ETAGS = etags - CTAGS = ctags - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ -+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ -@@ -129,6 +237,7 @@ CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DISABLELIBHARU = @DISABLELIBHARU@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -156,6 +265,7 @@ LOCAL_INCS = @LOCAL_INCS@ - LOCAL_LIBS = @LOCAL_LIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - NM = @NM@ - NMEDIT = @NMEDIT@ -@@ -168,6 +278,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - POW_LIB = @POW_LIB@ -@@ -193,6 +304,7 @@ abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -@@ -226,7 +338,6 @@ libdir = @libdir@ - libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -@@ -310,9 +421,9 @@ $(top_srcdir)/configure: $(am__configure_deps) - $(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - $(am__aclocal_m4_deps): -+ - install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" - @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ - list2=; for p in $$list; do \ - if test -f $$p; then \ -@@ -320,6 +431,8 @@ install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - else :; fi; \ - done; \ - test -z "$$list2" || { \ -+ echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \ -+ $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \ - } -@@ -335,14 +448,17 @@ uninstall-pkglibLTLIBRARIES: - - clean-pkglibLTLIBRARIES: - -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES) -- @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \ -- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -- echo "rm -f \"$${dir}/so_locations\""; \ -- rm -f "$${dir}/so_locations"; \ -- done --libta_channels.la: $(libta_channels_la_OBJECTS) $(libta_channels_la_DEPENDENCIES) -- $(CXXLINK) -rpath $(pkglibdir) $(libta_channels_la_OBJECTS) $(libta_channels_la_LIBADD) $(LIBS) -+ @list='$(pkglib_LTLIBRARIES)'; \ -+ locs=`for p in $$list; do echo $$p; done | \ -+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ -+ sort -u`; \ -+ test -z "$$locs" || { \ -+ echo rm -f $${locs}; \ -+ rm -f $${locs}; \ -+ } -+ -+libta_channels.la: $(libta_channels_la_OBJECTS) $(libta_channels_la_DEPENDENCIES) $(EXTRA_libta_channels_la_DEPENDENCIES) -+ $(AM_V_CXXLD)$(CXXLINK) -rpath $(pkglibdir) $(libta_channels_la_OBJECTS) $(libta_channels_la_LIBADD) $(LIBS) - - mostlyclean-compile: - -rm -f *.$(OBJEXT) -@@ -360,25 +476,25 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Watersheds_ext.Plo@am__quote@ - - .cpp.o: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< - - .cpp.obj: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - - .cpp.lo: --@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< - - mostlyclean-libtool: - -rm -f *.lo -@@ -386,26 +502,15 @@ mostlyclean-libtool: - clean-libtool: - -rm -rf .libs _libs - --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -+ID: $(am__tagged_files) -+ $(am__define_uniq_tagged_files); mkid -fID $$unique -+tags: tags-am -+TAGS: tags -+ -+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ -@@ -417,15 +522,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $$unique; \ - fi; \ - fi --ctags: CTAGS --CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ctags: ctags-am -+ -+CTAGS: ctags -+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) -+ $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique -@@ -434,6 +535,21 @@ GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -+cscopelist: cscopelist-am -+ -+cscopelist-am: $(am__tagged_files) -+ list='$(am__tagged_files)'; \ -+ case "$(srcdir)" in \ -+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ -+ *) sdir=$(subdir)/$(srcdir) ;; \ -+ esac; \ -+ for i in $$list; do \ -+ if test -f "$$i"; then \ -+ echo "$(subdir)/$$i"; \ -+ else \ -+ echo "$$sdir/$$i"; \ -+ fi; \ -+ done >> $(top_builddir)/cscope.files - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -@@ -485,10 +601,15 @@ install-am: all-am - - installcheck: installcheck-am - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+ if test -z '$(STRIP)'; then \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ install; \ -+ else \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -+ fi - mostlyclean-generic: - - clean-generic: -@@ -573,19 +694,20 @@ uninstall-am: uninstall-pkglibLTLIBRARIES - - .MAKE: install-am install-strip - --.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ -- clean-libtool clean-pkglibLTLIBRARIES ctags distclean \ -- distclean-compile distclean-generic distclean-libtool \ -- distclean-tags distdir dvi dvi-am html html-am info info-am \ -- install install-am install-data install-data-am install-dvi \ -- install-dvi-am install-exec install-exec-am install-html \ -- install-html-am install-info install-info-am install-man \ -- install-pdf install-pdf-am install-pkglibLTLIBRARIES \ -- install-ps install-ps-am install-strip installcheck \ -- installcheck-am installdirs maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-compile \ -- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -- tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES -+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ -+ clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \ -+ ctags-am distclean distclean-compile distclean-generic \ -+ distclean-libtool distclean-tags distdir dvi dvi-am html \ -+ html-am info info-am install install-am install-data \ -+ install-data-am install-dvi install-dvi-am install-exec \ -+ install-exec-am install-html install-html-am install-info \ -+ install-info-am install-man install-pdf install-pdf-am \ -+ install-pkglibLTLIBRARIES install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ maintainer-clean maintainer-clean-generic mostlyclean \ -+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ -+ pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ -+ uninstall-pkglibLTLIBRARIES - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff --git a/src/modules_terrain_analysis/terrain_analysis/ta_compound/Makefile.in b/src/modules_terrain_analysis/terrain_analysis/ta_compound/Makefile.in -index 917f787..2e5a92a 100644 ---- a/src/modules_terrain_analysis/terrain_analysis/ta_compound/Makefile.in -+++ b/src/modules_terrain_analysis/terrain_analysis/ta_compound/Makefile.in -@@ -1,9 +1,8 @@ --# Makefile.in generated by automake 1.11.1 from Makefile.am. -+# Makefile.in generated by automake 1.14 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, --# Inc. -+# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+ - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -16,6 +15,51 @@ - @SET_MAKE@ - - VPATH = @srcdir@ -+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -+am__make_running_with_option = \ -+ case $${target_option-} in \ -+ ?) ;; \ -+ *) echo "am__make_running_with_option: internal error: invalid" \ -+ "target option '$${target_option-}' specified" >&2; \ -+ exit 1;; \ -+ esac; \ -+ has_opt=no; \ -+ sane_makeflags=$$MAKEFLAGS; \ -+ if $(am__is_gnu_make); then \ -+ sane_makeflags=$$MFLAGS; \ -+ else \ -+ case $$MAKEFLAGS in \ -+ *\\[\ \ ]*) \ -+ bs=\\; \ -+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -+ esac; \ -+ fi; \ -+ skip_next=no; \ -+ strip_trailopt () \ -+ { \ -+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -+ }; \ -+ for flg in $$sane_makeflags; do \ -+ test $$skip_next = yes && { skip_next=no; continue; }; \ -+ case $$flg in \ -+ *=*|--*) continue;; \ -+ -*I) strip_trailopt 'I'; skip_next=yes;; \ -+ -*I?*) strip_trailopt 'I';; \ -+ -*O) strip_trailopt 'O'; skip_next=yes;; \ -+ -*O?*) strip_trailopt 'O';; \ -+ -*l) strip_trailopt 'l'; skip_next=yes;; \ -+ -*l?*) strip_trailopt 'l';; \ -+ -[dEDm]) skip_next=yes;; \ -+ -[JT]) skip_next=yes;; \ -+ esac; \ -+ case $$flg in \ -+ *$$target_option*) has_opt=yes; break;; \ -+ esac; \ -+ done; \ -+ test $$has_opt = yes -+am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -+am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -35,7 +79,8 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - subdir = src/modules_terrain_analysis/terrain_analysis/ta_compound --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ -+ $(top_srcdir)/depcomp - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ - $(top_srcdir)/m4/ax_python_devel.m4 \ -@@ -71,41 +116,104 @@ am__nobase_list = $(am__nobase_strip_setup); \ - am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -+am__uninstall_files_from_dir = { \ -+ test -z "$$files" \ -+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ -+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ -+ $(am__cd) "$$dir" && rm -f $$files; }; \ -+ } - am__installdirs = "$(DESTDIR)$(pkglibdir)" - LTLIBRARIES = $(pkglib_LTLIBRARIES) - libta_compound_la_DEPENDENCIES = \ - $(top_srcdir)/src/saga_core/saga_api/libsaga_api.la - am_libta_compound_la_OBJECTS = MLB_Interface.lo TA_Standard.lo - libta_compound_la_OBJECTS = $(am_libta_compound_la_OBJECTS) -+AM_V_lt = $(am__v_lt_@AM_V@) -+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -+am__v_lt_0 = --silent -+am__v_lt_1 = -+AM_V_P = $(am__v_P_@AM_V@) -+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -+am__v_P_0 = false -+am__v_P_1 = : -+AM_V_GEN = $(am__v_GEN_@AM_V@) -+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+am__v_GEN_0 = @echo " GEN " $@; -+am__v_GEN_1 = -+AM_V_at = $(am__v_at_@AM_V@) -+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+am__v_at_0 = @ -+am__v_at_1 = - DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - am__mv = mv -f - CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) --LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CXXFLAGS) $(CXXFLAGS) -+AM_V_CXX = $(am__v_CXX_@AM_V@) -+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) -+am__v_CXX_0 = @echo " CXX " $@; -+am__v_CXX_1 = - CXXLD = $(CXX) --CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ -+ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) -+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) -+am__v_CXXLD_0 = @echo " CXXLD " $@; -+am__v_CXXLD_1 = - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CFLAGS) $(CFLAGS) -+AM_V_CC = $(am__v_CC_@AM_V@) -+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -+am__v_CC_0 = @echo " CC " $@; -+am__v_CC_1 = - CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CCLD = $(am__v_CCLD_@AM_V@) -+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -+am__v_CCLD_0 = @echo " CCLD " $@; -+am__v_CCLD_1 = - SOURCES = $(libta_compound_la_SOURCES) - DIST_SOURCES = $(libta_compound_la_SOURCES) -+am__can_run_installinfo = \ -+ case $$AM_UPDATE_INFO_DIR in \ -+ n|no|NO) false;; \ -+ *) (install-info --version) >/dev/null 2>&1;; \ -+ esac -+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -+# Read a list of newline-separated strings from the standard input, -+# and print each of them once, without duplicates. Input order is -+# *not* preserved. -+am__uniquify_input = $(AWK) '\ -+ BEGIN { nonempty = 0; } \ -+ { items[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in items) print i; }; } \ -+' -+# Make sure the list of sources is unique. This is necessary because, -+# e.g., the same source file might be shared among _SOURCES variables -+# for different programs/libraries. -+am__define_uniq_tagged_files = \ -+ list='$(am__tagged_files)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | $(am__uniquify_input)` - ETAGS = etags - CTAGS = ctags - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ -+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ -@@ -126,6 +234,7 @@ CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DISABLELIBHARU = @DISABLELIBHARU@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -153,6 +262,7 @@ LOCAL_INCS = @LOCAL_INCS@ - LOCAL_LIBS = @LOCAL_LIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - NM = @NM@ - NMEDIT = @NMEDIT@ -@@ -165,6 +275,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - POW_LIB = @POW_LIB@ -@@ -190,6 +301,7 @@ abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -@@ -223,7 +335,6 @@ libdir = @libdir@ - libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -@@ -295,9 +406,9 @@ $(top_srcdir)/configure: $(am__configure_deps) - $(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - $(am__aclocal_m4_deps): -+ - install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" - @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ - list2=; for p in $$list; do \ - if test -f $$p; then \ -@@ -305,6 +416,8 @@ install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - else :; fi; \ - done; \ - test -z "$$list2" || { \ -+ echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \ -+ $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \ - } -@@ -320,14 +433,17 @@ uninstall-pkglibLTLIBRARIES: - - clean-pkglibLTLIBRARIES: - -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES) -- @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \ -- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -- echo "rm -f \"$${dir}/so_locations\""; \ -- rm -f "$${dir}/so_locations"; \ -- done --libta_compound.la: $(libta_compound_la_OBJECTS) $(libta_compound_la_DEPENDENCIES) -- $(CXXLINK) -rpath $(pkglibdir) $(libta_compound_la_OBJECTS) $(libta_compound_la_LIBADD) $(LIBS) -+ @list='$(pkglib_LTLIBRARIES)'; \ -+ locs=`for p in $$list; do echo $$p; done | \ -+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ -+ sort -u`; \ -+ test -z "$$locs" || { \ -+ echo rm -f $${locs}; \ -+ rm -f $${locs}; \ -+ } -+ -+libta_compound.la: $(libta_compound_la_OBJECTS) $(libta_compound_la_DEPENDENCIES) $(EXTRA_libta_compound_la_DEPENDENCIES) -+ $(AM_V_CXXLD)$(CXXLINK) -rpath $(pkglibdir) $(libta_compound_la_OBJECTS) $(libta_compound_la_LIBADD) $(LIBS) - - mostlyclean-compile: - -rm -f *.$(OBJEXT) -@@ -339,25 +455,25 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TA_Standard.Plo@am__quote@ - - .cpp.o: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< - - .cpp.obj: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - - .cpp.lo: --@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< - - mostlyclean-libtool: - -rm -f *.lo -@@ -365,26 +481,15 @@ mostlyclean-libtool: - clean-libtool: - -rm -rf .libs _libs - --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -+ID: $(am__tagged_files) -+ $(am__define_uniq_tagged_files); mkid -fID $$unique -+tags: tags-am -+TAGS: tags -+ -+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ -@@ -396,15 +501,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $$unique; \ - fi; \ - fi --ctags: CTAGS --CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ctags: ctags-am -+ -+CTAGS: ctags -+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) -+ $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique -@@ -413,6 +514,21 @@ GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -+cscopelist: cscopelist-am -+ -+cscopelist-am: $(am__tagged_files) -+ list='$(am__tagged_files)'; \ -+ case "$(srcdir)" in \ -+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ -+ *) sdir=$(subdir)/$(srcdir) ;; \ -+ esac; \ -+ for i in $$list; do \ -+ if test -f "$$i"; then \ -+ echo "$(subdir)/$$i"; \ -+ else \ -+ echo "$$sdir/$$i"; \ -+ fi; \ -+ done >> $(top_builddir)/cscope.files - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -@@ -464,10 +580,15 @@ install-am: all-am - - installcheck: installcheck-am - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+ if test -z '$(STRIP)'; then \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ install; \ -+ else \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -+ fi - mostlyclean-generic: - - clean-generic: -@@ -552,19 +673,20 @@ uninstall-am: uninstall-pkglibLTLIBRARIES - - .MAKE: install-am install-strip - --.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ -- clean-libtool clean-pkglibLTLIBRARIES ctags distclean \ -- distclean-compile distclean-generic distclean-libtool \ -- distclean-tags distdir dvi dvi-am html html-am info info-am \ -- install install-am install-data install-data-am install-dvi \ -- install-dvi-am install-exec install-exec-am install-html \ -- install-html-am install-info install-info-am install-man \ -- install-pdf install-pdf-am install-pkglibLTLIBRARIES \ -- install-ps install-ps-am install-strip installcheck \ -- installcheck-am installdirs maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-compile \ -- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -- tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES -+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ -+ clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \ -+ ctags-am distclean distclean-compile distclean-generic \ -+ distclean-libtool distclean-tags distdir dvi dvi-am html \ -+ html-am info info-am install install-am install-data \ -+ install-data-am install-dvi install-dvi-am install-exec \ -+ install-exec-am install-html install-html-am install-info \ -+ install-info-am install-man install-pdf install-pdf-am \ -+ install-pkglibLTLIBRARIES install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ maintainer-clean maintainer-clean-generic mostlyclean \ -+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ -+ pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ -+ uninstall-pkglibLTLIBRARIES - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff --git a/src/modules_terrain_analysis/terrain_analysis/ta_hydrology/Makefile.in b/src/modules_terrain_analysis/terrain_analysis/ta_hydrology/Makefile.in -index 3bed51e..e98b2c4 100644 ---- a/src/modules_terrain_analysis/terrain_analysis/ta_hydrology/Makefile.in -+++ b/src/modules_terrain_analysis/terrain_analysis/ta_hydrology/Makefile.in -@@ -1,9 +1,8 @@ --# Makefile.in generated by automake 1.11.1 from Makefile.am. -+# Makefile.in generated by automake 1.14 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, --# Inc. -+# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+ - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -16,6 +15,51 @@ - @SET_MAKE@ - - VPATH = @srcdir@ -+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -+am__make_running_with_option = \ -+ case $${target_option-} in \ -+ ?) ;; \ -+ *) echo "am__make_running_with_option: internal error: invalid" \ -+ "target option '$${target_option-}' specified" >&2; \ -+ exit 1;; \ -+ esac; \ -+ has_opt=no; \ -+ sane_makeflags=$$MAKEFLAGS; \ -+ if $(am__is_gnu_make); then \ -+ sane_makeflags=$$MFLAGS; \ -+ else \ -+ case $$MAKEFLAGS in \ -+ *\\[\ \ ]*) \ -+ bs=\\; \ -+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -+ esac; \ -+ fi; \ -+ skip_next=no; \ -+ strip_trailopt () \ -+ { \ -+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -+ }; \ -+ for flg in $$sane_makeflags; do \ -+ test $$skip_next = yes && { skip_next=no; continue; }; \ -+ case $$flg in \ -+ *=*|--*) continue;; \ -+ -*I) strip_trailopt 'I'; skip_next=yes;; \ -+ -*I?*) strip_trailopt 'I';; \ -+ -*O) strip_trailopt 'O'; skip_next=yes;; \ -+ -*O?*) strip_trailopt 'O';; \ -+ -*l) strip_trailopt 'l'; skip_next=yes;; \ -+ -*l?*) strip_trailopt 'l';; \ -+ -[dEDm]) skip_next=yes;; \ -+ -[JT]) skip_next=yes;; \ -+ esac; \ -+ case $$flg in \ -+ *$$target_option*) has_opt=yes; break;; \ -+ esac; \ -+ done; \ -+ test $$has_opt = yes -+am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -+am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -35,7 +79,8 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - subdir = src/modules_terrain_analysis/terrain_analysis/ta_hydrology --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ -+ $(top_srcdir)/depcomp - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ - $(top_srcdir)/m4/ax_python_devel.m4 \ -@@ -71,6 +116,12 @@ am__nobase_list = $(am__nobase_strip_setup); \ - am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -+am__uninstall_files_from_dir = { \ -+ test -z "$$files" \ -+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ -+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ -+ $(am__cd) "$$dir" && rm -f $$files; }; \ -+ } - am__installdirs = "$(DESTDIR)$(pkglibdir)" - LTLIBRARIES = $(pkglib_LTLIBRARIES) - libta_hydrology_la_DEPENDENCIES = \ -@@ -84,35 +135,92 @@ am_libta_hydrology_la_OBJECTS = CellBalance.lo EdgeContamination.lo \ - melton_ruggedness.lo SAGA_Wetness_Index.lo Sinuosity.lo \ - SlopeLength.lo TopographicIndices.lo - libta_hydrology_la_OBJECTS = $(am_libta_hydrology_la_OBJECTS) -+AM_V_lt = $(am__v_lt_@AM_V@) -+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -+am__v_lt_0 = --silent -+am__v_lt_1 = -+AM_V_P = $(am__v_P_@AM_V@) -+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -+am__v_P_0 = false -+am__v_P_1 = : -+AM_V_GEN = $(am__v_GEN_@AM_V@) -+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+am__v_GEN_0 = @echo " GEN " $@; -+am__v_GEN_1 = -+AM_V_at = $(am__v_at_@AM_V@) -+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+am__v_at_0 = @ -+am__v_at_1 = - DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - am__mv = mv -f - CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) --LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CXXFLAGS) $(CXXFLAGS) -+AM_V_CXX = $(am__v_CXX_@AM_V@) -+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) -+am__v_CXX_0 = @echo " CXX " $@; -+am__v_CXX_1 = - CXXLD = $(CXX) --CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ -+ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) -+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) -+am__v_CXXLD_0 = @echo " CXXLD " $@; -+am__v_CXXLD_1 = - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CFLAGS) $(CFLAGS) -+AM_V_CC = $(am__v_CC_@AM_V@) -+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -+am__v_CC_0 = @echo " CC " $@; -+am__v_CC_1 = - CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CCLD = $(am__v_CCLD_@AM_V@) -+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -+am__v_CCLD_0 = @echo " CCLD " $@; -+am__v_CCLD_1 = - SOURCES = $(libta_hydrology_la_SOURCES) - DIST_SOURCES = $(libta_hydrology_la_SOURCES) -+am__can_run_installinfo = \ -+ case $$AM_UPDATE_INFO_DIR in \ -+ n|no|NO) false;; \ -+ *) (install-info --version) >/dev/null 2>&1;; \ -+ esac -+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -+# Read a list of newline-separated strings from the standard input, -+# and print each of them once, without duplicates. Input order is -+# *not* preserved. -+am__uniquify_input = $(AWK) '\ -+ BEGIN { nonempty = 0; } \ -+ { items[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in items) print i; }; } \ -+' -+# Make sure the list of sources is unique. This is necessary because, -+# e.g., the same source file might be shared among _SOURCES variables -+# for different programs/libraries. -+am__define_uniq_tagged_files = \ -+ list='$(am__tagged_files)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | $(am__uniquify_input)` - ETAGS = etags - CTAGS = ctags - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ -+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ -@@ -133,6 +241,7 @@ CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DISABLELIBHARU = @DISABLELIBHARU@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -160,6 +269,7 @@ LOCAL_INCS = @LOCAL_INCS@ - LOCAL_LIBS = @LOCAL_LIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - NM = @NM@ - NMEDIT = @NMEDIT@ -@@ -172,6 +282,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - POW_LIB = @POW_LIB@ -@@ -197,6 +308,7 @@ abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -@@ -230,7 +342,6 @@ libdir = @libdir@ - libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -@@ -344,9 +455,9 @@ $(top_srcdir)/configure: $(am__configure_deps) - $(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - $(am__aclocal_m4_deps): -+ - install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" - @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ - list2=; for p in $$list; do \ - if test -f $$p; then \ -@@ -354,6 +465,8 @@ install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - else :; fi; \ - done; \ - test -z "$$list2" || { \ -+ echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \ -+ $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \ - } -@@ -369,14 +482,17 @@ uninstall-pkglibLTLIBRARIES: - - clean-pkglibLTLIBRARIES: - -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES) -- @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \ -- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -- echo "rm -f \"$${dir}/so_locations\""; \ -- rm -f "$${dir}/so_locations"; \ -- done --libta_hydrology.la: $(libta_hydrology_la_OBJECTS) $(libta_hydrology_la_DEPENDENCIES) -- $(CXXLINK) -rpath $(pkglibdir) $(libta_hydrology_la_OBJECTS) $(libta_hydrology_la_LIBADD) $(LIBS) -+ @list='$(pkglib_LTLIBRARIES)'; \ -+ locs=`for p in $$list; do echo $$p; done | \ -+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ -+ sort -u`; \ -+ test -z "$$locs" || { \ -+ echo rm -f $${locs}; \ -+ rm -f $${locs}; \ -+ } -+ -+libta_hydrology.la: $(libta_hydrology_la_OBJECTS) $(libta_hydrology_la_DEPENDENCIES) $(EXTRA_libta_hydrology_la_DEPENDENCIES) -+ $(AM_V_CXXLD)$(CXXLINK) -rpath $(pkglibdir) $(libta_hydrology_la_OBJECTS) $(libta_hydrology_la_LIBADD) $(LIBS) - - mostlyclean-compile: - -rm -f *.$(OBJEXT) -@@ -409,25 +525,25 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/melton_ruggedness.Plo@am__quote@ - - .cpp.o: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< - - .cpp.obj: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - - .cpp.lo: --@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< - - mostlyclean-libtool: - -rm -f *.lo -@@ -435,26 +551,15 @@ mostlyclean-libtool: - clean-libtool: - -rm -rf .libs _libs - --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -+ID: $(am__tagged_files) -+ $(am__define_uniq_tagged_files); mkid -fID $$unique -+tags: tags-am -+TAGS: tags -+ -+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ -@@ -466,15 +571,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $$unique; \ - fi; \ - fi --ctags: CTAGS --CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ctags: ctags-am -+ -+CTAGS: ctags -+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) -+ $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique -@@ -483,6 +584,21 @@ GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -+cscopelist: cscopelist-am -+ -+cscopelist-am: $(am__tagged_files) -+ list='$(am__tagged_files)'; \ -+ case "$(srcdir)" in \ -+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ -+ *) sdir=$(subdir)/$(srcdir) ;; \ -+ esac; \ -+ for i in $$list; do \ -+ if test -f "$$i"; then \ -+ echo "$(subdir)/$$i"; \ -+ else \ -+ echo "$$sdir/$$i"; \ -+ fi; \ -+ done >> $(top_builddir)/cscope.files - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -@@ -534,10 +650,15 @@ install-am: all-am - - installcheck: installcheck-am - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+ if test -z '$(STRIP)'; then \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ install; \ -+ else \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -+ fi - mostlyclean-generic: - - clean-generic: -@@ -622,19 +743,20 @@ uninstall-am: uninstall-pkglibLTLIBRARIES - - .MAKE: install-am install-strip - --.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ -- clean-libtool clean-pkglibLTLIBRARIES ctags distclean \ -- distclean-compile distclean-generic distclean-libtool \ -- distclean-tags distdir dvi dvi-am html html-am info info-am \ -- install install-am install-data install-data-am install-dvi \ -- install-dvi-am install-exec install-exec-am install-html \ -- install-html-am install-info install-info-am install-man \ -- install-pdf install-pdf-am install-pkglibLTLIBRARIES \ -- install-ps install-ps-am install-strip installcheck \ -- installcheck-am installdirs maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-compile \ -- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -- tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES -+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ -+ clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \ -+ ctags-am distclean distclean-compile distclean-generic \ -+ distclean-libtool distclean-tags distdir dvi dvi-am html \ -+ html-am info info-am install install-am install-data \ -+ install-data-am install-dvi install-dvi-am install-exec \ -+ install-exec-am install-html install-html-am install-info \ -+ install-info-am install-man install-pdf install-pdf-am \ -+ install-pkglibLTLIBRARIES install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ maintainer-clean maintainer-clean-generic mostlyclean \ -+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ -+ pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ -+ uninstall-pkglibLTLIBRARIES - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff --git a/src/modules_terrain_analysis/terrain_analysis/ta_lighting/Makefile.in b/src/modules_terrain_analysis/terrain_analysis/ta_lighting/Makefile.in -index 02540c4..4f13e23 100644 ---- a/src/modules_terrain_analysis/terrain_analysis/ta_lighting/Makefile.in -+++ b/src/modules_terrain_analysis/terrain_analysis/ta_lighting/Makefile.in -@@ -1,9 +1,8 @@ --# Makefile.in generated by automake 1.11.1 from Makefile.am. -+# Makefile.in generated by automake 1.14 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, --# Inc. -+# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+ - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -16,6 +15,51 @@ - @SET_MAKE@ - - VPATH = @srcdir@ -+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -+am__make_running_with_option = \ -+ case $${target_option-} in \ -+ ?) ;; \ -+ *) echo "am__make_running_with_option: internal error: invalid" \ -+ "target option '$${target_option-}' specified" >&2; \ -+ exit 1;; \ -+ esac; \ -+ has_opt=no; \ -+ sane_makeflags=$$MAKEFLAGS; \ -+ if $(am__is_gnu_make); then \ -+ sane_makeflags=$$MFLAGS; \ -+ else \ -+ case $$MAKEFLAGS in \ -+ *\\[\ \ ]*) \ -+ bs=\\; \ -+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -+ esac; \ -+ fi; \ -+ skip_next=no; \ -+ strip_trailopt () \ -+ { \ -+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -+ }; \ -+ for flg in $$sane_makeflags; do \ -+ test $$skip_next = yes && { skip_next=no; continue; }; \ -+ case $$flg in \ -+ *=*|--*) continue;; \ -+ -*I) strip_trailopt 'I'; skip_next=yes;; \ -+ -*I?*) strip_trailopt 'I';; \ -+ -*O) strip_trailopt 'O'; skip_next=yes;; \ -+ -*O?*) strip_trailopt 'O';; \ -+ -*l) strip_trailopt 'l'; skip_next=yes;; \ -+ -*l?*) strip_trailopt 'l';; \ -+ -[dEDm]) skip_next=yes;; \ -+ -[JT]) skip_next=yes;; \ -+ esac; \ -+ case $$flg in \ -+ *$$target_option*) has_opt=yes; break;; \ -+ esac; \ -+ done; \ -+ test $$has_opt = yes -+am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -+am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -35,7 +79,8 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - subdir = src/modules_terrain_analysis/terrain_analysis/ta_lighting --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ -+ $(top_srcdir)/depcomp - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ - $(top_srcdir)/m4/ax_python_devel.m4 \ -@@ -71,6 +116,12 @@ am__nobase_list = $(am__nobase_strip_setup); \ - am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -+am__uninstall_files_from_dir = { \ -+ test -z "$$files" \ -+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ -+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ -+ $(am__cd) "$$dir" && rm -f $$files; }; \ -+ } - am__installdirs = "$(DESTDIR)$(pkglibdir)" - LTLIBRARIES = $(pkglib_LTLIBRARIES) - libta_lighting_la_DEPENDENCIES = \ -@@ -80,35 +131,92 @@ am_libta_lighting_la_OBJECTS = HillShade.lo MLB_Interface.lo \ - topographic_openness.lo view_shed.lo Visibility_BASE.lo \ - Visibility_Point.lo Visibility_Points.lo - libta_lighting_la_OBJECTS = $(am_libta_lighting_la_OBJECTS) -+AM_V_lt = $(am__v_lt_@AM_V@) -+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -+am__v_lt_0 = --silent -+am__v_lt_1 = -+AM_V_P = $(am__v_P_@AM_V@) -+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -+am__v_P_0 = false -+am__v_P_1 = : -+AM_V_GEN = $(am__v_GEN_@AM_V@) -+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+am__v_GEN_0 = @echo " GEN " $@; -+am__v_GEN_1 = -+AM_V_at = $(am__v_at_@AM_V@) -+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+am__v_at_0 = @ -+am__v_at_1 = - DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - am__mv = mv -f - CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) --LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CXXFLAGS) $(CXXFLAGS) -+AM_V_CXX = $(am__v_CXX_@AM_V@) -+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) -+am__v_CXX_0 = @echo " CXX " $@; -+am__v_CXX_1 = - CXXLD = $(CXX) --CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ -+ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) -+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) -+am__v_CXXLD_0 = @echo " CXXLD " $@; -+am__v_CXXLD_1 = - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CFLAGS) $(CFLAGS) -+AM_V_CC = $(am__v_CC_@AM_V@) -+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -+am__v_CC_0 = @echo " CC " $@; -+am__v_CC_1 = - CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CCLD = $(am__v_CCLD_@AM_V@) -+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -+am__v_CCLD_0 = @echo " CCLD " $@; -+am__v_CCLD_1 = - SOURCES = $(libta_lighting_la_SOURCES) - DIST_SOURCES = $(libta_lighting_la_SOURCES) -+am__can_run_installinfo = \ -+ case $$AM_UPDATE_INFO_DIR in \ -+ n|no|NO) false;; \ -+ *) (install-info --version) >/dev/null 2>&1;; \ -+ esac -+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -+# Read a list of newline-separated strings from the standard input, -+# and print each of them once, without duplicates. Input order is -+# *not* preserved. -+am__uniquify_input = $(AWK) '\ -+ BEGIN { nonempty = 0; } \ -+ { items[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in items) print i; }; } \ -+' -+# Make sure the list of sources is unique. This is necessary because, -+# e.g., the same source file might be shared among _SOURCES variables -+# for different programs/libraries. -+am__define_uniq_tagged_files = \ -+ list='$(am__tagged_files)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | $(am__uniquify_input)` - ETAGS = etags - CTAGS = ctags - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ -+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ -@@ -129,6 +237,7 @@ CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DISABLELIBHARU = @DISABLELIBHARU@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -156,6 +265,7 @@ LOCAL_INCS = @LOCAL_INCS@ - LOCAL_LIBS = @LOCAL_LIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - NM = @NM@ - NMEDIT = @NMEDIT@ -@@ -168,6 +278,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - POW_LIB = @POW_LIB@ -@@ -193,6 +304,7 @@ abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -@@ -226,7 +338,6 @@ libdir = @libdir@ - libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -@@ -312,9 +423,9 @@ $(top_srcdir)/configure: $(am__configure_deps) - $(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - $(am__aclocal_m4_deps): -+ - install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" - @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ - list2=; for p in $$list; do \ - if test -f $$p; then \ -@@ -322,6 +433,8 @@ install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - else :; fi; \ - done; \ - test -z "$$list2" || { \ -+ echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \ -+ $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \ - } -@@ -337,14 +450,17 @@ uninstall-pkglibLTLIBRARIES: - - clean-pkglibLTLIBRARIES: - -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES) -- @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \ -- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -- echo "rm -f \"$${dir}/so_locations\""; \ -- rm -f "$${dir}/so_locations"; \ -- done --libta_lighting.la: $(libta_lighting_la_OBJECTS) $(libta_lighting_la_DEPENDENCIES) -- $(CXXLINK) -rpath $(pkglibdir) $(libta_lighting_la_OBJECTS) $(libta_lighting_la_LIBADD) $(LIBS) -+ @list='$(pkglib_LTLIBRARIES)'; \ -+ locs=`for p in $$list; do echo $$p; done | \ -+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ -+ sort -u`; \ -+ test -z "$$locs" || { \ -+ echo rm -f $${locs}; \ -+ rm -f $${locs}; \ -+ } -+ -+libta_lighting.la: $(libta_lighting_la_OBJECTS) $(libta_lighting_la_DEPENDENCIES) $(EXTRA_libta_lighting_la_DEPENDENCIES) -+ $(AM_V_CXXLD)$(CXXLINK) -rpath $(pkglibdir) $(libta_lighting_la_OBJECTS) $(libta_lighting_la_LIBADD) $(LIBS) - - mostlyclean-compile: - -rm -f *.$(OBJEXT) -@@ -363,25 +479,25 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/view_shed.Plo@am__quote@ - - .cpp.o: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< - - .cpp.obj: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - - .cpp.lo: --@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< - - mostlyclean-libtool: - -rm -f *.lo -@@ -389,26 +505,15 @@ mostlyclean-libtool: - clean-libtool: - -rm -rf .libs _libs - --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -+ID: $(am__tagged_files) -+ $(am__define_uniq_tagged_files); mkid -fID $$unique -+tags: tags-am -+TAGS: tags -+ -+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ -@@ -420,15 +525,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $$unique; \ - fi; \ - fi --ctags: CTAGS --CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ctags: ctags-am -+ -+CTAGS: ctags -+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) -+ $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique -@@ -437,6 +538,21 @@ GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -+cscopelist: cscopelist-am -+ -+cscopelist-am: $(am__tagged_files) -+ list='$(am__tagged_files)'; \ -+ case "$(srcdir)" in \ -+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ -+ *) sdir=$(subdir)/$(srcdir) ;; \ -+ esac; \ -+ for i in $$list; do \ -+ if test -f "$$i"; then \ -+ echo "$(subdir)/$$i"; \ -+ else \ -+ echo "$$sdir/$$i"; \ -+ fi; \ -+ done >> $(top_builddir)/cscope.files - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -@@ -488,10 +604,15 @@ install-am: all-am - - installcheck: installcheck-am - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+ if test -z '$(STRIP)'; then \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ install; \ -+ else \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -+ fi - mostlyclean-generic: - - clean-generic: -@@ -576,19 +697,20 @@ uninstall-am: uninstall-pkglibLTLIBRARIES - - .MAKE: install-am install-strip - --.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ -- clean-libtool clean-pkglibLTLIBRARIES ctags distclean \ -- distclean-compile distclean-generic distclean-libtool \ -- distclean-tags distdir dvi dvi-am html html-am info info-am \ -- install install-am install-data install-data-am install-dvi \ -- install-dvi-am install-exec install-exec-am install-html \ -- install-html-am install-info install-info-am install-man \ -- install-pdf install-pdf-am install-pkglibLTLIBRARIES \ -- install-ps install-ps-am install-strip installcheck \ -- installcheck-am installdirs maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-compile \ -- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -- tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES -+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ -+ clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \ -+ ctags-am distclean distclean-compile distclean-generic \ -+ distclean-libtool distclean-tags distdir dvi dvi-am html \ -+ html-am info info-am install install-am install-data \ -+ install-data-am install-dvi install-dvi-am install-exec \ -+ install-exec-am install-html install-html-am install-info \ -+ install-info-am install-man install-pdf install-pdf-am \ -+ install-pkglibLTLIBRARIES install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ maintainer-clean maintainer-clean-generic mostlyclean \ -+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ -+ pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ -+ uninstall-pkglibLTLIBRARIES - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff --git a/src/modules_terrain_analysis/terrain_analysis/ta_morphometry/Makefile.in b/src/modules_terrain_analysis/terrain_analysis/ta_morphometry/Makefile.in -index e4a3c5a..a54528f 100644 ---- a/src/modules_terrain_analysis/terrain_analysis/ta_morphometry/Makefile.in -+++ b/src/modules_terrain_analysis/terrain_analysis/ta_morphometry/Makefile.in -@@ -1,9 +1,8 @@ --# Makefile.in generated by automake 1.11.1 from Makefile.am. -+# Makefile.in generated by automake 1.14 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, --# Inc. -+# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+ - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -16,6 +15,51 @@ - @SET_MAKE@ - - VPATH = @srcdir@ -+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -+am__make_running_with_option = \ -+ case $${target_option-} in \ -+ ?) ;; \ -+ *) echo "am__make_running_with_option: internal error: invalid" \ -+ "target option '$${target_option-}' specified" >&2; \ -+ exit 1;; \ -+ esac; \ -+ has_opt=no; \ -+ sane_makeflags=$$MAKEFLAGS; \ -+ if $(am__is_gnu_make); then \ -+ sane_makeflags=$$MFLAGS; \ -+ else \ -+ case $$MAKEFLAGS in \ -+ *\\[\ \ ]*) \ -+ bs=\\; \ -+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -+ esac; \ -+ fi; \ -+ skip_next=no; \ -+ strip_trailopt () \ -+ { \ -+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -+ }; \ -+ for flg in $$sane_makeflags; do \ -+ test $$skip_next = yes && { skip_next=no; continue; }; \ -+ case $$flg in \ -+ *=*|--*) continue;; \ -+ -*I) strip_trailopt 'I'; skip_next=yes;; \ -+ -*I?*) strip_trailopt 'I';; \ -+ -*O) strip_trailopt 'O'; skip_next=yes;; \ -+ -*O?*) strip_trailopt 'O';; \ -+ -*l) strip_trailopt 'l'; skip_next=yes;; \ -+ -*l?*) strip_trailopt 'l';; \ -+ -[dEDm]) skip_next=yes;; \ -+ -[JT]) skip_next=yes;; \ -+ esac; \ -+ case $$flg in \ -+ *$$target_option*) has_opt=yes; break;; \ -+ esac; \ -+ done; \ -+ test $$has_opt = yes -+am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -+am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -35,7 +79,8 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - subdir = src/modules_terrain_analysis/terrain_analysis/ta_morphometry --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ -+ $(top_srcdir)/depcomp - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ - $(top_srcdir)/m4/ax_python_devel.m4 \ -@@ -71,6 +116,12 @@ am__nobase_list = $(am__nobase_strip_setup); \ - am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -+am__uninstall_files_from_dir = { \ -+ test -z "$$files" \ -+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ -+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ -+ $(am__cd) "$$dir" && rm -f $$files; }; \ -+ } - am__installdirs = "$(DESTDIR)$(pkglibdir)" - LTLIBRARIES = $(pkglib_LTLIBRARIES) - libta_morphometry_la_DEPENDENCIES = \ -@@ -85,35 +136,92 @@ am_libta_morphometry_la_OBJECTS = Convergence.lo Convergence_Radius.lo \ - relative_heights.lo ruggedness.lo tc_iwahashi_pike.lo \ - top_hat.lo tpi.lo wind_effect.lo - libta_morphometry_la_OBJECTS = $(am_libta_morphometry_la_OBJECTS) -+AM_V_lt = $(am__v_lt_@AM_V@) -+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -+am__v_lt_0 = --silent -+am__v_lt_1 = -+AM_V_P = $(am__v_P_@AM_V@) -+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -+am__v_P_0 = false -+am__v_P_1 = : -+AM_V_GEN = $(am__v_GEN_@AM_V@) -+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+am__v_GEN_0 = @echo " GEN " $@; -+am__v_GEN_1 = -+AM_V_at = $(am__v_at_@AM_V@) -+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+am__v_at_0 = @ -+am__v_at_1 = - DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - am__mv = mv -f - CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) --LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CXXFLAGS) $(CXXFLAGS) -+AM_V_CXX = $(am__v_CXX_@AM_V@) -+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) -+am__v_CXX_0 = @echo " CXX " $@; -+am__v_CXX_1 = - CXXLD = $(CXX) --CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ -+ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) -+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) -+am__v_CXXLD_0 = @echo " CXXLD " $@; -+am__v_CXXLD_1 = - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CFLAGS) $(CFLAGS) -+AM_V_CC = $(am__v_CC_@AM_V@) -+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -+am__v_CC_0 = @echo " CC " $@; -+am__v_CC_1 = - CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CCLD = $(am__v_CCLD_@AM_V@) -+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -+am__v_CCLD_0 = @echo " CCLD " $@; -+am__v_CCLD_1 = - SOURCES = $(libta_morphometry_la_SOURCES) - DIST_SOURCES = $(libta_morphometry_la_SOURCES) -+am__can_run_installinfo = \ -+ case $$AM_UPDATE_INFO_DIR in \ -+ n|no|NO) false;; \ -+ *) (install-info --version) >/dev/null 2>&1;; \ -+ esac -+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -+# Read a list of newline-separated strings from the standard input, -+# and print each of them once, without duplicates. Input order is -+# *not* preserved. -+am__uniquify_input = $(AWK) '\ -+ BEGIN { nonempty = 0; } \ -+ { items[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in items) print i; }; } \ -+' -+# Make sure the list of sources is unique. This is necessary because, -+# e.g., the same source file might be shared among _SOURCES variables -+# for different programs/libraries. -+am__define_uniq_tagged_files = \ -+ list='$(am__tagged_files)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | $(am__uniquify_input)` - ETAGS = etags - CTAGS = ctags - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ -+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ -@@ -134,6 +242,7 @@ CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DISABLELIBHARU = @DISABLELIBHARU@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -161,6 +270,7 @@ LOCAL_INCS = @LOCAL_INCS@ - LOCAL_LIBS = @LOCAL_LIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - NM = @NM@ - NMEDIT = @NMEDIT@ -@@ -173,6 +283,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - POW_LIB = @POW_LIB@ -@@ -198,6 +309,7 @@ abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -@@ -231,7 +343,6 @@ libdir = @libdir@ - libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -@@ -345,9 +456,9 @@ $(top_srcdir)/configure: $(am__configure_deps) - $(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - $(am__aclocal_m4_deps): -+ - install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" - @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ - list2=; for p in $$list; do \ - if test -f $$p; then \ -@@ -355,6 +466,8 @@ install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - else :; fi; \ - done; \ - test -z "$$list2" || { \ -+ echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \ -+ $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \ - } -@@ -370,14 +483,17 @@ uninstall-pkglibLTLIBRARIES: - - clean-pkglibLTLIBRARIES: - -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES) -- @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \ -- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -- echo "rm -f \"$${dir}/so_locations\""; \ -- rm -f "$${dir}/so_locations"; \ -- done --libta_morphometry.la: $(libta_morphometry_la_OBJECTS) $(libta_morphometry_la_DEPENDENCIES) -- $(CXXLINK) -rpath $(pkglibdir) $(libta_morphometry_la_OBJECTS) $(libta_morphometry_la_LIBADD) $(LIBS) -+ @list='$(pkglib_LTLIBRARIES)'; \ -+ locs=`for p in $$list; do echo $$p; done | \ -+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ -+ sort -u`; \ -+ test -z "$$locs" || { \ -+ echo rm -f $${locs}; \ -+ rm -f $${locs}; \ -+ } -+ -+libta_morphometry.la: $(libta_morphometry_la_OBJECTS) $(libta_morphometry_la_DEPENDENCIES) $(EXTRA_libta_morphometry_la_DEPENDENCIES) -+ $(AM_V_CXXLD)$(CXXLINK) -rpath $(pkglibdir) $(libta_morphometry_la_OBJECTS) $(libta_morphometry_la_LIBADD) $(LIBS) - - mostlyclean-compile: - -rm -f *.$(OBJEXT) -@@ -410,25 +526,25 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wind_effect.Plo@am__quote@ - - .cpp.o: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< - - .cpp.obj: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - - .cpp.lo: --@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< - - mostlyclean-libtool: - -rm -f *.lo -@@ -436,26 +552,15 @@ mostlyclean-libtool: - clean-libtool: - -rm -rf .libs _libs - --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -+ID: $(am__tagged_files) -+ $(am__define_uniq_tagged_files); mkid -fID $$unique -+tags: tags-am -+TAGS: tags -+ -+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ -@@ -467,15 +572,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $$unique; \ - fi; \ - fi --ctags: CTAGS --CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ctags: ctags-am -+ -+CTAGS: ctags -+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) -+ $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique -@@ -484,6 +585,21 @@ GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -+cscopelist: cscopelist-am -+ -+cscopelist-am: $(am__tagged_files) -+ list='$(am__tagged_files)'; \ -+ case "$(srcdir)" in \ -+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ -+ *) sdir=$(subdir)/$(srcdir) ;; \ -+ esac; \ -+ for i in $$list; do \ -+ if test -f "$$i"; then \ -+ echo "$(subdir)/$$i"; \ -+ else \ -+ echo "$$sdir/$$i"; \ -+ fi; \ -+ done >> $(top_builddir)/cscope.files - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -@@ -535,10 +651,15 @@ install-am: all-am - - installcheck: installcheck-am - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+ if test -z '$(STRIP)'; then \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ install; \ -+ else \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -+ fi - mostlyclean-generic: - - clean-generic: -@@ -623,19 +744,20 @@ uninstall-am: uninstall-pkglibLTLIBRARIES - - .MAKE: install-am install-strip - --.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ -- clean-libtool clean-pkglibLTLIBRARIES ctags distclean \ -- distclean-compile distclean-generic distclean-libtool \ -- distclean-tags distdir dvi dvi-am html html-am info info-am \ -- install install-am install-data install-data-am install-dvi \ -- install-dvi-am install-exec install-exec-am install-html \ -- install-html-am install-info install-info-am install-man \ -- install-pdf install-pdf-am install-pkglibLTLIBRARIES \ -- install-ps install-ps-am install-strip installcheck \ -- installcheck-am installdirs maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-compile \ -- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -- tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES -+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ -+ clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \ -+ ctags-am distclean distclean-compile distclean-generic \ -+ distclean-libtool distclean-tags distdir dvi dvi-am html \ -+ html-am info info-am install install-am install-data \ -+ install-data-am install-dvi install-dvi-am install-exec \ -+ install-exec-am install-html install-html-am install-info \ -+ install-info-am install-man install-pdf install-pdf-am \ -+ install-pkglibLTLIBRARIES install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ maintainer-clean maintainer-clean-generic mostlyclean \ -+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ -+ pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ -+ uninstall-pkglibLTLIBRARIES - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff --git a/src/modules_terrain_analysis/terrain_analysis/ta_preprocessor/Makefile.in b/src/modules_terrain_analysis/terrain_analysis/ta_preprocessor/Makefile.in -index ff93dc8..5427754 100644 ---- a/src/modules_terrain_analysis/terrain_analysis/ta_preprocessor/Makefile.in -+++ b/src/modules_terrain_analysis/terrain_analysis/ta_preprocessor/Makefile.in -@@ -1,9 +1,8 @@ --# Makefile.in generated by automake 1.11.1 from Makefile.am. -+# Makefile.in generated by automake 1.14 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, --# Inc. -+# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+ - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -16,6 +15,51 @@ - @SET_MAKE@ - - VPATH = @srcdir@ -+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -+am__make_running_with_option = \ -+ case $${target_option-} in \ -+ ?) ;; \ -+ *) echo "am__make_running_with_option: internal error: invalid" \ -+ "target option '$${target_option-}' specified" >&2; \ -+ exit 1;; \ -+ esac; \ -+ has_opt=no; \ -+ sane_makeflags=$$MAKEFLAGS; \ -+ if $(am__is_gnu_make); then \ -+ sane_makeflags=$$MFLAGS; \ -+ else \ -+ case $$MAKEFLAGS in \ -+ *\\[\ \ ]*) \ -+ bs=\\; \ -+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -+ esac; \ -+ fi; \ -+ skip_next=no; \ -+ strip_trailopt () \ -+ { \ -+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -+ }; \ -+ for flg in $$sane_makeflags; do \ -+ test $$skip_next = yes && { skip_next=no; continue; }; \ -+ case $$flg in \ -+ *=*|--*) continue;; \ -+ -*I) strip_trailopt 'I'; skip_next=yes;; \ -+ -*I?*) strip_trailopt 'I';; \ -+ -*O) strip_trailopt 'O'; skip_next=yes;; \ -+ -*O?*) strip_trailopt 'O';; \ -+ -*l) strip_trailopt 'l'; skip_next=yes;; \ -+ -*l?*) strip_trailopt 'l';; \ -+ -[dEDm]) skip_next=yes;; \ -+ -[JT]) skip_next=yes;; \ -+ esac; \ -+ case $$flg in \ -+ *$$target_option*) has_opt=yes; break;; \ -+ esac; \ -+ done; \ -+ test $$has_opt = yes -+am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -+am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -36,7 +80,8 @@ build_triplet = @build@ - host_triplet = @host@ - subdir = \ - src/modules_terrain_analysis/terrain_analysis/ta_preprocessor --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ -+ $(top_srcdir)/depcomp - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ - $(top_srcdir)/m4/ax_python_devel.m4 \ -@@ -72,6 +117,12 @@ am__nobase_list = $(am__nobase_strip_setup); \ - am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -+am__uninstall_files_from_dir = { \ -+ test -z "$$files" \ -+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ -+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ -+ $(am__cd) "$$dir" && rm -f $$files; }; \ -+ } - am__installdirs = "$(DESTDIR)$(pkglibdir)" - LTLIBRARIES = $(pkglib_LTLIBRARIES) - libta_preprocessor_la_DEPENDENCIES = \ -@@ -80,35 +131,92 @@ am_libta_preprocessor_la_OBJECTS = burn_in_streams.lo FillSinks.lo \ - FillSinks_WL.lo FillSinks_WL_XXL.lo MLB_Interface.lo \ - Flat_Detection.lo Pit_Eliminator.lo Pit_Router.lo - libta_preprocessor_la_OBJECTS = $(am_libta_preprocessor_la_OBJECTS) -+AM_V_lt = $(am__v_lt_@AM_V@) -+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -+am__v_lt_0 = --silent -+am__v_lt_1 = -+AM_V_P = $(am__v_P_@AM_V@) -+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -+am__v_P_0 = false -+am__v_P_1 = : -+AM_V_GEN = $(am__v_GEN_@AM_V@) -+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+am__v_GEN_0 = @echo " GEN " $@; -+am__v_GEN_1 = -+AM_V_at = $(am__v_at_@AM_V@) -+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+am__v_at_0 = @ -+am__v_at_1 = - DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - am__mv = mv -f - CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) --LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CXXFLAGS) $(CXXFLAGS) -+AM_V_CXX = $(am__v_CXX_@AM_V@) -+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) -+am__v_CXX_0 = @echo " CXX " $@; -+am__v_CXX_1 = - CXXLD = $(CXX) --CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ -+ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) -+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) -+am__v_CXXLD_0 = @echo " CXXLD " $@; -+am__v_CXXLD_1 = - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CFLAGS) $(CFLAGS) -+AM_V_CC = $(am__v_CC_@AM_V@) -+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -+am__v_CC_0 = @echo " CC " $@; -+am__v_CC_1 = - CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CCLD = $(am__v_CCLD_@AM_V@) -+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -+am__v_CCLD_0 = @echo " CCLD " $@; -+am__v_CCLD_1 = - SOURCES = $(libta_preprocessor_la_SOURCES) - DIST_SOURCES = $(libta_preprocessor_la_SOURCES) -+am__can_run_installinfo = \ -+ case $$AM_UPDATE_INFO_DIR in \ -+ n|no|NO) false;; \ -+ *) (install-info --version) >/dev/null 2>&1;; \ -+ esac -+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -+# Read a list of newline-separated strings from the standard input, -+# and print each of them once, without duplicates. Input order is -+# *not* preserved. -+am__uniquify_input = $(AWK) '\ -+ BEGIN { nonempty = 0; } \ -+ { items[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in items) print i; }; } \ -+' -+# Make sure the list of sources is unique. This is necessary because, -+# e.g., the same source file might be shared among _SOURCES variables -+# for different programs/libraries. -+am__define_uniq_tagged_files = \ -+ list='$(am__tagged_files)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | $(am__uniquify_input)` - ETAGS = etags - CTAGS = ctags - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ -+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ -@@ -129,6 +237,7 @@ CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DISABLELIBHARU = @DISABLELIBHARU@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -156,6 +265,7 @@ LOCAL_INCS = @LOCAL_INCS@ - LOCAL_LIBS = @LOCAL_LIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - NM = @NM@ - NMEDIT = @NMEDIT@ -@@ -168,6 +278,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - POW_LIB = @POW_LIB@ -@@ -193,6 +304,7 @@ abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -@@ -226,7 +338,6 @@ libdir = @libdir@ - libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -@@ -309,9 +420,9 @@ $(top_srcdir)/configure: $(am__configure_deps) - $(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - $(am__aclocal_m4_deps): -+ - install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" - @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ - list2=; for p in $$list; do \ - if test -f $$p; then \ -@@ -319,6 +430,8 @@ install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - else :; fi; \ - done; \ - test -z "$$list2" || { \ -+ echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \ -+ $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \ - } -@@ -334,14 +447,17 @@ uninstall-pkglibLTLIBRARIES: - - clean-pkglibLTLIBRARIES: - -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES) -- @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \ -- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -- echo "rm -f \"$${dir}/so_locations\""; \ -- rm -f "$${dir}/so_locations"; \ -- done --libta_preprocessor.la: $(libta_preprocessor_la_OBJECTS) $(libta_preprocessor_la_DEPENDENCIES) -- $(CXXLINK) -rpath $(pkglibdir) $(libta_preprocessor_la_OBJECTS) $(libta_preprocessor_la_LIBADD) $(LIBS) -+ @list='$(pkglib_LTLIBRARIES)'; \ -+ locs=`for p in $$list; do echo $$p; done | \ -+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ -+ sort -u`; \ -+ test -z "$$locs" || { \ -+ echo rm -f $${locs}; \ -+ rm -f $${locs}; \ -+ } -+ -+libta_preprocessor.la: $(libta_preprocessor_la_OBJECTS) $(libta_preprocessor_la_DEPENDENCIES) $(EXTRA_libta_preprocessor_la_DEPENDENCIES) -+ $(AM_V_CXXLD)$(CXXLINK) -rpath $(pkglibdir) $(libta_preprocessor_la_OBJECTS) $(libta_preprocessor_la_LIBADD) $(LIBS) - - mostlyclean-compile: - -rm -f *.$(OBJEXT) -@@ -359,25 +475,25 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/burn_in_streams.Plo@am__quote@ - - .cpp.o: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< - - .cpp.obj: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - - .cpp.lo: --@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< - - mostlyclean-libtool: - -rm -f *.lo -@@ -385,26 +501,15 @@ mostlyclean-libtool: - clean-libtool: - -rm -rf .libs _libs - --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -+ID: $(am__tagged_files) -+ $(am__define_uniq_tagged_files); mkid -fID $$unique -+tags: tags-am -+TAGS: tags -+ -+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ -@@ -416,15 +521,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $$unique; \ - fi; \ - fi --ctags: CTAGS --CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ctags: ctags-am -+ -+CTAGS: ctags -+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) -+ $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique -@@ -433,6 +534,21 @@ GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -+cscopelist: cscopelist-am -+ -+cscopelist-am: $(am__tagged_files) -+ list='$(am__tagged_files)'; \ -+ case "$(srcdir)" in \ -+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ -+ *) sdir=$(subdir)/$(srcdir) ;; \ -+ esac; \ -+ for i in $$list; do \ -+ if test -f "$$i"; then \ -+ echo "$(subdir)/$$i"; \ -+ else \ -+ echo "$$sdir/$$i"; \ -+ fi; \ -+ done >> $(top_builddir)/cscope.files - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -@@ -484,10 +600,15 @@ install-am: all-am - - installcheck: installcheck-am - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+ if test -z '$(STRIP)'; then \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ install; \ -+ else \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -+ fi - mostlyclean-generic: - - clean-generic: -@@ -572,19 +693,20 @@ uninstall-am: uninstall-pkglibLTLIBRARIES - - .MAKE: install-am install-strip - --.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ -- clean-libtool clean-pkglibLTLIBRARIES ctags distclean \ -- distclean-compile distclean-generic distclean-libtool \ -- distclean-tags distdir dvi dvi-am html html-am info info-am \ -- install install-am install-data install-data-am install-dvi \ -- install-dvi-am install-exec install-exec-am install-html \ -- install-html-am install-info install-info-am install-man \ -- install-pdf install-pdf-am install-pkglibLTLIBRARIES \ -- install-ps install-ps-am install-strip installcheck \ -- installcheck-am installdirs maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-compile \ -- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -- tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES -+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ -+ clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \ -+ ctags-am distclean distclean-compile distclean-generic \ -+ distclean-libtool distclean-tags distdir dvi dvi-am html \ -+ html-am info info-am install install-am install-data \ -+ install-data-am install-dvi install-dvi-am install-exec \ -+ install-exec-am install-html install-html-am install-info \ -+ install-info-am install-man install-pdf install-pdf-am \ -+ install-pkglibLTLIBRARIES install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ maintainer-clean maintainer-clean-generic mostlyclean \ -+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ -+ pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ -+ uninstall-pkglibLTLIBRARIES - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff --git a/src/modules_terrain_analysis/terrain_analysis/ta_profiles/Makefile.in b/src/modules_terrain_analysis/terrain_analysis/ta_profiles/Makefile.in -index ab1b968..e5e87d6 100644 ---- a/src/modules_terrain_analysis/terrain_analysis/ta_profiles/Makefile.in -+++ b/src/modules_terrain_analysis/terrain_analysis/ta_profiles/Makefile.in -@@ -1,9 +1,8 @@ --# Makefile.in generated by automake 1.11.1 from Makefile.am. -+# Makefile.in generated by automake 1.14 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, --# Inc. -+# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+ - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -16,6 +15,51 @@ - @SET_MAKE@ - - VPATH = @srcdir@ -+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -+am__make_running_with_option = \ -+ case $${target_option-} in \ -+ ?) ;; \ -+ *) echo "am__make_running_with_option: internal error: invalid" \ -+ "target option '$${target_option-}' specified" >&2; \ -+ exit 1;; \ -+ esac; \ -+ has_opt=no; \ -+ sane_makeflags=$$MAKEFLAGS; \ -+ if $(am__is_gnu_make); then \ -+ sane_makeflags=$$MFLAGS; \ -+ else \ -+ case $$MAKEFLAGS in \ -+ *\\[\ \ ]*) \ -+ bs=\\; \ -+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -+ esac; \ -+ fi; \ -+ skip_next=no; \ -+ strip_trailopt () \ -+ { \ -+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -+ }; \ -+ for flg in $$sane_makeflags; do \ -+ test $$skip_next = yes && { skip_next=no; continue; }; \ -+ case $$flg in \ -+ *=*|--*) continue;; \ -+ -*I) strip_trailopt 'I'; skip_next=yes;; \ -+ -*I?*) strip_trailopt 'I';; \ -+ -*O) strip_trailopt 'O'; skip_next=yes;; \ -+ -*O?*) strip_trailopt 'O';; \ -+ -*l) strip_trailopt 'l'; skip_next=yes;; \ -+ -*l?*) strip_trailopt 'l';; \ -+ -[dEDm]) skip_next=yes;; \ -+ -[JT]) skip_next=yes;; \ -+ esac; \ -+ case $$flg in \ -+ *$$target_option*) has_opt=yes; break;; \ -+ esac; \ -+ done; \ -+ test $$has_opt = yes -+am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -+am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -35,7 +79,8 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - subdir = src/modules_terrain_analysis/terrain_analysis/ta_profiles --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ -+ $(top_srcdir)/depcomp - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ - $(top_srcdir)/m4/ax_python_devel.m4 \ -@@ -71,6 +116,12 @@ am__nobase_list = $(am__nobase_strip_setup); \ - am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -+am__uninstall_files_from_dir = { \ -+ test -z "$$files" \ -+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ -+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ -+ $(am__cd) "$$dir" && rm -f $$files; }; \ -+ } - am__installdirs = "$(DESTDIR)$(pkglibdir)" - LTLIBRARIES = $(pkglib_LTLIBRARIES) - libta_profiles_la_DEPENDENCIES = \ -@@ -80,35 +131,92 @@ am_libta_profiles_la_OBJECTS = Grid_Cross_Profiles.lo \ - Grid_Profile_From_Lines.lo Grid_Swath_Profile.lo \ - MLB_Interface.lo - libta_profiles_la_OBJECTS = $(am_libta_profiles_la_OBJECTS) -+AM_V_lt = $(am__v_lt_@AM_V@) -+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -+am__v_lt_0 = --silent -+am__v_lt_1 = -+AM_V_P = $(am__v_P_@AM_V@) -+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -+am__v_P_0 = false -+am__v_P_1 = : -+AM_V_GEN = $(am__v_GEN_@AM_V@) -+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+am__v_GEN_0 = @echo " GEN " $@; -+am__v_GEN_1 = -+AM_V_at = $(am__v_at_@AM_V@) -+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+am__v_at_0 = @ -+am__v_at_1 = - DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - am__mv = mv -f - CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) --LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CXXFLAGS) $(CXXFLAGS) -+AM_V_CXX = $(am__v_CXX_@AM_V@) -+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) -+am__v_CXX_0 = @echo " CXX " $@; -+am__v_CXX_1 = - CXXLD = $(CXX) --CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ -+ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) -+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) -+am__v_CXXLD_0 = @echo " CXXLD " $@; -+am__v_CXXLD_1 = - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CFLAGS) $(CFLAGS) -+AM_V_CC = $(am__v_CC_@AM_V@) -+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -+am__v_CC_0 = @echo " CC " $@; -+am__v_CC_1 = - CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CCLD = $(am__v_CCLD_@AM_V@) -+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -+am__v_CCLD_0 = @echo " CCLD " $@; -+am__v_CCLD_1 = - SOURCES = $(libta_profiles_la_SOURCES) - DIST_SOURCES = $(libta_profiles_la_SOURCES) -+am__can_run_installinfo = \ -+ case $$AM_UPDATE_INFO_DIR in \ -+ n|no|NO) false;; \ -+ *) (install-info --version) >/dev/null 2>&1;; \ -+ esac -+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -+# Read a list of newline-separated strings from the standard input, -+# and print each of them once, without duplicates. Input order is -+# *not* preserved. -+am__uniquify_input = $(AWK) '\ -+ BEGIN { nonempty = 0; } \ -+ { items[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in items) print i; }; } \ -+' -+# Make sure the list of sources is unique. This is necessary because, -+# e.g., the same source file might be shared among _SOURCES variables -+# for different programs/libraries. -+am__define_uniq_tagged_files = \ -+ list='$(am__tagged_files)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | $(am__uniquify_input)` - ETAGS = etags - CTAGS = ctags - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ -+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ -@@ -129,6 +237,7 @@ CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DISABLELIBHARU = @DISABLELIBHARU@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -156,6 +265,7 @@ LOCAL_INCS = @LOCAL_INCS@ - LOCAL_LIBS = @LOCAL_LIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - NM = @NM@ - NMEDIT = @NMEDIT@ -@@ -168,6 +278,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - POW_LIB = @POW_LIB@ -@@ -193,6 +304,7 @@ abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -@@ -226,7 +338,6 @@ libdir = @libdir@ - libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -@@ -308,9 +419,9 @@ $(top_srcdir)/configure: $(am__configure_deps) - $(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - $(am__aclocal_m4_deps): -+ - install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" - @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ - list2=; for p in $$list; do \ - if test -f $$p; then \ -@@ -318,6 +429,8 @@ install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - else :; fi; \ - done; \ - test -z "$$list2" || { \ -+ echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \ -+ $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \ - } -@@ -333,14 +446,17 @@ uninstall-pkglibLTLIBRARIES: - - clean-pkglibLTLIBRARIES: - -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES) -- @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \ -- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -- echo "rm -f \"$${dir}/so_locations\""; \ -- rm -f "$${dir}/so_locations"; \ -- done --libta_profiles.la: $(libta_profiles_la_OBJECTS) $(libta_profiles_la_DEPENDENCIES) -- $(CXXLINK) -rpath $(pkglibdir) $(libta_profiles_la_OBJECTS) $(libta_profiles_la_LIBADD) $(LIBS) -+ @list='$(pkglib_LTLIBRARIES)'; \ -+ locs=`for p in $$list; do echo $$p; done | \ -+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ -+ sort -u`; \ -+ test -z "$$locs" || { \ -+ echo rm -f $${locs}; \ -+ rm -f $${locs}; \ -+ } -+ -+libta_profiles.la: $(libta_profiles_la_OBJECTS) $(libta_profiles_la_DEPENDENCIES) $(EXTRA_libta_profiles_la_DEPENDENCIES) -+ $(AM_V_CXXLD)$(CXXLINK) -rpath $(pkglibdir) $(libta_profiles_la_OBJECTS) $(libta_profiles_la_LIBADD) $(LIBS) - - mostlyclean-compile: - -rm -f *.$(OBJEXT) -@@ -357,25 +473,25 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MLB_Interface.Plo@am__quote@ - - .cpp.o: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< - - .cpp.obj: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - - .cpp.lo: --@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< - - mostlyclean-libtool: - -rm -f *.lo -@@ -383,26 +499,15 @@ mostlyclean-libtool: - clean-libtool: - -rm -rf .libs _libs - --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -+ID: $(am__tagged_files) -+ $(am__define_uniq_tagged_files); mkid -fID $$unique -+tags: tags-am -+TAGS: tags -+ -+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ -@@ -414,15 +519,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $$unique; \ - fi; \ - fi --ctags: CTAGS --CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ctags: ctags-am -+ -+CTAGS: ctags -+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) -+ $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique -@@ -431,6 +532,21 @@ GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -+cscopelist: cscopelist-am -+ -+cscopelist-am: $(am__tagged_files) -+ list='$(am__tagged_files)'; \ -+ case "$(srcdir)" in \ -+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ -+ *) sdir=$(subdir)/$(srcdir) ;; \ -+ esac; \ -+ for i in $$list; do \ -+ if test -f "$$i"; then \ -+ echo "$(subdir)/$$i"; \ -+ else \ -+ echo "$$sdir/$$i"; \ -+ fi; \ -+ done >> $(top_builddir)/cscope.files - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -@@ -482,10 +598,15 @@ install-am: all-am - - installcheck: installcheck-am - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+ if test -z '$(STRIP)'; then \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ install; \ -+ else \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -+ fi - mostlyclean-generic: - - clean-generic: -@@ -570,19 +691,20 @@ uninstall-am: uninstall-pkglibLTLIBRARIES - - .MAKE: install-am install-strip - --.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ -- clean-libtool clean-pkglibLTLIBRARIES ctags distclean \ -- distclean-compile distclean-generic distclean-libtool \ -- distclean-tags distdir dvi dvi-am html html-am info info-am \ -- install install-am install-data install-data-am install-dvi \ -- install-dvi-am install-exec install-exec-am install-html \ -- install-html-am install-info install-info-am install-man \ -- install-pdf install-pdf-am install-pkglibLTLIBRARIES \ -- install-ps install-ps-am install-strip installcheck \ -- installcheck-am installdirs maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-compile \ -- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -- tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES -+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ -+ clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \ -+ ctags-am distclean distclean-compile distclean-generic \ -+ distclean-libtool distclean-tags distdir dvi dvi-am html \ -+ html-am info info-am install install-am install-data \ -+ install-data-am install-dvi install-dvi-am install-exec \ -+ install-exec-am install-html install-html-am install-info \ -+ install-info-am install-man install-pdf install-pdf-am \ -+ install-pkglibLTLIBRARIES install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ maintainer-clean maintainer-clean-generic mostlyclean \ -+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ -+ pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ -+ uninstall-pkglibLTLIBRARIES - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff --git a/src/saga_core/Makefile.in b/src/saga_core/Makefile.in -index 305cba9..48351dc 100644 ---- a/src/saga_core/Makefile.in -+++ b/src/saga_core/Makefile.in -@@ -1,9 +1,8 @@ --# Makefile.in generated by automake 1.11.1 from Makefile.am. -+# Makefile.in generated by automake 1.14 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, --# Inc. -+# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+ - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -15,6 +14,51 @@ - - @SET_MAKE@ - VPATH = @srcdir@ -+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -+am__make_running_with_option = \ -+ case $${target_option-} in \ -+ ?) ;; \ -+ *) echo "am__make_running_with_option: internal error: invalid" \ -+ "target option '$${target_option-}' specified" >&2; \ -+ exit 1;; \ -+ esac; \ -+ has_opt=no; \ -+ sane_makeflags=$$MAKEFLAGS; \ -+ if $(am__is_gnu_make); then \ -+ sane_makeflags=$$MFLAGS; \ -+ else \ -+ case $$MAKEFLAGS in \ -+ *\\[\ \ ]*) \ -+ bs=\\; \ -+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -+ esac; \ -+ fi; \ -+ skip_next=no; \ -+ strip_trailopt () \ -+ { \ -+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -+ }; \ -+ for flg in $$sane_makeflags; do \ -+ test $$skip_next = yes && { skip_next=no; continue; }; \ -+ case $$flg in \ -+ *=*|--*) continue;; \ -+ -*I) strip_trailopt 'I'; skip_next=yes;; \ -+ -*I?*) strip_trailopt 'I';; \ -+ -*O) strip_trailopt 'O'; skip_next=yes;; \ -+ -*O?*) strip_trailopt 'O';; \ -+ -*l) strip_trailopt 'l'; skip_next=yes;; \ -+ -*l?*) strip_trailopt 'l';; \ -+ -[dEDm]) skip_next=yes;; \ -+ -[JT]) skip_next=yes;; \ -+ esac; \ -+ case $$flg in \ -+ *$$target_option*) has_opt=yes; break;; \ -+ esac; \ -+ done; \ -+ test $$has_opt = yes -+am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -+am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -34,7 +78,7 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - subdir = src/saga_core --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ - $(top_srcdir)/m4/ax_python_devel.m4 \ -@@ -49,20 +93,58 @@ mkinstalldirs = $(install_sh) -d - CONFIG_HEADER = $(top_builddir)/config.h - CONFIG_CLEAN_FILES = - CONFIG_CLEAN_VPATH_FILES = -+AM_V_P = $(am__v_P_@AM_V@) -+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -+am__v_P_0 = false -+am__v_P_1 = : -+AM_V_GEN = $(am__v_GEN_@AM_V@) -+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+am__v_GEN_0 = @echo " GEN " $@; -+am__v_GEN_1 = -+AM_V_at = $(am__v_at_@AM_V@) -+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+am__v_at_0 = @ -+am__v_at_1 = - SOURCES = - DIST_SOURCES = --RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ -- html-recursive info-recursive install-data-recursive \ -- install-dvi-recursive install-exec-recursive \ -- install-html-recursive install-info-recursive \ -- install-pdf-recursive install-ps-recursive install-recursive \ -- installcheck-recursive installdirs-recursive pdf-recursive \ -- ps-recursive uninstall-recursive -+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ -+ ctags-recursive dvi-recursive html-recursive info-recursive \ -+ install-data-recursive install-dvi-recursive \ -+ install-exec-recursive install-html-recursive \ -+ install-info-recursive install-pdf-recursive \ -+ install-ps-recursive install-recursive installcheck-recursive \ -+ installdirs-recursive pdf-recursive ps-recursive \ -+ tags-recursive uninstall-recursive -+am__can_run_installinfo = \ -+ case $$AM_UPDATE_INFO_DIR in \ -+ n|no|NO) false;; \ -+ *) (install-info --version) >/dev/null 2>&1;; \ -+ esac - RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ - distclean-recursive maintainer-clean-recursive --AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ -- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ -+am__recursive_targets = \ -+ $(RECURSIVE_TARGETS) \ -+ $(RECURSIVE_CLEAN_TARGETS) \ -+ $(am__extra_recursive_targets) -+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ - distdir -+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -+# Read a list of newline-separated strings from the standard input, -+# and print each of them once, without duplicates. Input order is -+# *not* preserved. -+am__uniquify_input = $(AWK) '\ -+ BEGIN { nonempty = 0; } \ -+ { items[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in items) print i; }; } \ -+' -+# Make sure the list of sources is unique. This is necessary because, -+# e.g., the same source file might be shared among _SOURCES variables -+# for different programs/libraries. -+am__define_uniq_tagged_files = \ -+ list='$(am__tagged_files)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | $(am__uniquify_input)` - ETAGS = etags - CTAGS = ctags - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -@@ -93,6 +175,7 @@ am__relativize = \ - reldir="$$dir2" - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ -+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ -@@ -113,6 +196,7 @@ CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DISABLELIBHARU = @DISABLELIBHARU@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -140,6 +224,7 @@ LOCAL_INCS = @LOCAL_INCS@ - LOCAL_LIBS = @LOCAL_LIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - NM = @NM@ - NMEDIT = @NMEDIT@ -@@ -152,6 +237,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - POW_LIB = @POW_LIB@ -@@ -177,6 +263,7 @@ abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -@@ -210,7 +297,6 @@ libdir = @libdir@ - libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -@@ -279,22 +365,25 @@ clean-libtool: - -rm -rf .libs _libs - - # This directory's subdirectories are mostly independent; you can cd --# into them and run `make' without going through this Makefile. --# To change the values of `make' variables: instead of editing Makefiles, --# (1) if the variable is set in `config.status', edit `config.status' --# (which will cause the Makefiles to be regenerated when you run `make'); --# (2) otherwise, pass the desired values on the `make' command line. --$(RECURSIVE_TARGETS): -- @fail= failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -+# into them and run 'make' without going through this Makefile. -+# To change the values of 'make' variables: instead of editing Makefiles, -+# (1) if the variable is set in 'config.status', edit 'config.status' -+# (which will cause the Makefiles to be regenerated when you run 'make'); -+# (2) otherwise, pass the desired values on the 'make' command line. -+$(am__recursive_targets): -+ @fail=; \ -+ if $(am__make_keepgoing); then \ -+ failcom='fail=yes'; \ -+ else \ -+ failcom='exit 1'; \ -+ fi; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ -- list='$(SUBDIRS)'; for subdir in $$list; do \ -+ case "$@" in \ -+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -+ *) list='$(SUBDIRS)' ;; \ -+ esac; \ -+ for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ -@@ -309,57 +398,12 @@ $(RECURSIVE_TARGETS): - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - --$(RECURSIVE_CLEAN_TARGETS): -- @fail= failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -- dot_seen=no; \ -- case "$@" in \ -- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -- *) list='$(SUBDIRS)' ;; \ -- esac; \ -- rev=''; for subdir in $$list; do \ -- if test "$$subdir" = "."; then :; else \ -- rev="$$subdir $$rev"; \ -- fi; \ -- done; \ -- rev="$$rev ."; \ -- target=`echo $@ | sed s/-recursive//`; \ -- for subdir in $$rev; do \ -- echo "Making $$target in $$subdir"; \ -- if test "$$subdir" = "."; then \ -- local_target="$$target-am"; \ -- else \ -- local_target="$$target"; \ -- fi; \ -- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || eval $$failcom; \ -- done && test -z "$$fail" --tags-recursive: -- list='$(SUBDIRS)'; for subdir in $$list; do \ -- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ -- done --ctags-recursive: -- list='$(SUBDIRS)'; for subdir in $$list; do \ -- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ -- done -+ID: $(am__tagged_files) -+ $(am__define_uniq_tagged_files); mkid -fID $$unique -+tags: tags-recursive -+TAGS: tags - --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ - if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ -@@ -375,12 +419,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ -@@ -392,15 +431,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $$unique; \ - fi; \ - fi --ctags: CTAGS --CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ctags: ctags-recursive -+ -+CTAGS: ctags -+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) -+ $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique -@@ -409,6 +444,21 @@ GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -+cscopelist: cscopelist-recursive -+ -+cscopelist-am: $(am__tagged_files) -+ list='$(am__tagged_files)'; \ -+ case "$(srcdir)" in \ -+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ -+ *) sdir=$(subdir)/$(srcdir) ;; \ -+ esac; \ -+ for i in $$list; do \ -+ if test -f "$$i"; then \ -+ echo "$(subdir)/$$i"; \ -+ else \ -+ echo "$$sdir/$$i"; \ -+ fi; \ -+ done >> $(top_builddir)/cscope.files - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -@@ -445,13 +495,10 @@ distdir: $(DISTFILES) - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test -d "$(distdir)/$$subdir" \ -- || $(MKDIR_P) "$(distdir)/$$subdir" \ -- || exit 1; \ -- fi; \ -- done -- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ -- if test "$$subdir" = .; then :; else \ -+ $(am__make_dryrun) \ -+ || test -d "$(distdir)/$$subdir" \ -+ || $(MKDIR_P) "$(distdir)/$$subdir" \ -+ || exit 1; \ - dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ - $(am__relativize); \ - new_distdir=$$reldir; \ -@@ -486,10 +533,15 @@ install-am: all-am - - installcheck: installcheck-recursive - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+ if test -z '$(STRIP)'; then \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ install; \ -+ else \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -+ fi - mostlyclean-generic: - - clean-generic: -@@ -567,22 +619,20 @@ ps-am: - - uninstall-am: - --.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ -- install-am install-strip tags-recursive -- --.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ -- all all-am check check-am clean clean-generic clean-libtool \ -- ctags ctags-recursive distclean distclean-generic \ -- distclean-libtool distclean-tags distdir dvi dvi-am html \ -- html-am info info-am install install-am install-data \ -- install-data-am install-dvi install-dvi-am install-exec \ -- install-exec-am install-html install-html-am install-info \ -- install-info-am install-man install-pdf install-pdf-am \ -- install-ps install-ps-am install-strip installcheck \ -- installcheck-am installdirs installdirs-am maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-generic \ -- mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ -- uninstall uninstall-am -+.MAKE: $(am__recursive_targets) install-am install-strip -+ -+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ -+ check-am clean clean-generic clean-libtool cscopelist-am ctags \ -+ ctags-am distclean distclean-generic distclean-libtool \ -+ distclean-tags distdir dvi dvi-am html html-am info info-am \ -+ install install-am install-data install-data-am install-dvi \ -+ install-dvi-am install-exec install-exec-am install-html \ -+ install-html-am install-info install-info-am install-man \ -+ install-pdf install-pdf-am install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ installdirs-am maintainer-clean maintainer-clean-generic \ -+ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ -+ ps ps-am tags tags-am uninstall uninstall-am - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff --git a/src/saga_core/saga_api/Makefile.in b/src/saga_core/saga_api/Makefile.in -index 93a3f34..e91ccfa 100644 ---- a/src/saga_core/saga_api/Makefile.in -+++ b/src/saga_core/saga_api/Makefile.in -@@ -1,9 +1,8 @@ --# Makefile.in generated by automake 1.11.1 from Makefile.am. -+# Makefile.in generated by automake 1.14 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, --# Inc. -+# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+ - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -16,6 +15,51 @@ - @SET_MAKE@ - - VPATH = @srcdir@ -+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -+am__make_running_with_option = \ -+ case $${target_option-} in \ -+ ?) ;; \ -+ *) echo "am__make_running_with_option: internal error: invalid" \ -+ "target option '$${target_option-}' specified" >&2; \ -+ exit 1;; \ -+ esac; \ -+ has_opt=no; \ -+ sane_makeflags=$$MAKEFLAGS; \ -+ if $(am__is_gnu_make); then \ -+ sane_makeflags=$$MFLAGS; \ -+ else \ -+ case $$MAKEFLAGS in \ -+ *\\[\ \ ]*) \ -+ bs=\\; \ -+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -+ esac; \ -+ fi; \ -+ skip_next=no; \ -+ strip_trailopt () \ -+ { \ -+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -+ }; \ -+ for flg in $$sane_makeflags; do \ -+ test $$skip_next = yes && { skip_next=no; continue; }; \ -+ case $$flg in \ -+ *=*|--*) continue;; \ -+ -*I) strip_trailopt 'I'; skip_next=yes;; \ -+ -*I?*) strip_trailopt 'I';; \ -+ -*O) strip_trailopt 'O'; skip_next=yes;; \ -+ -*O?*) strip_trailopt 'O';; \ -+ -*l) strip_trailopt 'l'; skip_next=yes;; \ -+ -*l?*) strip_trailopt 'l';; \ -+ -[dEDm]) skip_next=yes;; \ -+ -[JT]) skip_next=yes;; \ -+ esac; \ -+ case $$flg in \ -+ *$$target_option*) has_opt=yes; break;; \ -+ esac; \ -+ done; \ -+ test $$has_opt = yes -+am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -+am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -35,7 +79,8 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - subdir = src/saga_core/saga_api --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ -+ $(top_srcdir)/depcomp $(top_srcdir)/py-compile - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ - $(top_srcdir)/m4/ax_python_devel.m4 \ -@@ -71,6 +116,12 @@ am__nobase_list = $(am__nobase_strip_setup); \ - am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -+am__uninstall_files_from_dir = { \ -+ test -z "$$files" \ -+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ -+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ -+ $(am__cd) "$$dir" && rm -f $$files; }; \ -+ } - am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pyexecdir)" \ - "$(DESTDIR)$(pyexecdir)" - LTLIBRARIES = $(lib_LTLIBRARIES) $(pyexec_LTLIBRARIES) -@@ -78,7 +129,11 @@ LTLIBRARIES = $(lib_LTLIBRARIES) $(pyexec_LTLIBRARIES) - @SAGA_PYTHON_TRUE@nodist__saga_api_la_OBJECTS = \ - @SAGA_PYTHON_TRUE@ _saga_api_la-saga_api_wrap.lo - _saga_api_la_OBJECTS = $(nodist__saga_api_la_OBJECTS) --_saga_api_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+AM_V_lt = $(am__v_lt_@AM_V@) -+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -+am__v_lt_0 = --silent -+am__v_lt_1 = -+_saga_api_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ - $(CXXFLAGS) $(_saga_api_la_LDFLAGS) $(LDFLAGS) -o $@ - @SAGA_PYTHON_TRUE@am__saga_api_la_rpath = -rpath $(pyexecdir) -@@ -102,39 +157,96 @@ am_libsaga_api_la_OBJECTS = api_callback.lo api_colors.lo api_core.lo \ - table_io.lo table_record.lo table_selection.lo tin.lo \ - tin_elements.lo tin_triangulation.lo - libsaga_api_la_OBJECTS = $(am_libsaga_api_la_OBJECTS) --libsaga_api_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ -- $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ -- $(CXXFLAGS) $(libsaga_api_la_LDFLAGS) $(LDFLAGS) -o $@ -+libsaga_api_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \ -+ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ -+ $(AM_CXXFLAGS) $(CXXFLAGS) $(libsaga_api_la_LDFLAGS) \ -+ $(LDFLAGS) -o $@ -+AM_V_P = $(am__v_P_@AM_V@) -+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -+am__v_P_0 = false -+am__v_P_1 = : -+AM_V_GEN = $(am__v_GEN_@AM_V@) -+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+am__v_GEN_0 = @echo " GEN " $@; -+am__v_GEN_1 = -+AM_V_at = $(am__v_at_@AM_V@) -+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+am__v_at_0 = @ -+am__v_at_1 = - DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - am__mv = mv -f - CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) --LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CXXFLAGS) $(CXXFLAGS) -+AM_V_CXX = $(am__v_CXX_@AM_V@) -+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) -+am__v_CXX_0 = @echo " CXX " $@; -+am__v_CXX_1 = - CXXLD = $(CXX) --CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ -+ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) -+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) -+am__v_CXXLD_0 = @echo " CXXLD " $@; -+am__v_CXXLD_1 = - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CFLAGS) $(CFLAGS) -+AM_V_CC = $(am__v_CC_@AM_V@) -+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -+am__v_CC_0 = @echo " CC " $@; -+am__v_CC_1 = - CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CCLD = $(am__v_CCLD_@AM_V@) -+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -+am__v_CCLD_0 = @echo " CCLD " $@; -+am__v_CCLD_1 = - SOURCES = $(nodist__saga_api_la_SOURCES) $(libsaga_api_la_SOURCES) - DIST_SOURCES = $(libsaga_api_la_SOURCES) -+am__can_run_installinfo = \ -+ case $$AM_UPDATE_INFO_DIR in \ -+ n|no|NO) false;; \ -+ *) (install-info --version) >/dev/null 2>&1;; \ -+ esac -+am__py_compile = PYTHON=$(PYTHON) $(SHELL) $(py_compile) -+am__pep3147_tweak = \ -+ sed -e 's|\.py$$||' -e 's|[^/]*$$|__pycache__/&.*.py|' - py_compile = $(top_srcdir)/py-compile -+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -+# Read a list of newline-separated strings from the standard input, -+# and print each of them once, without duplicates. Input order is -+# *not* preserved. -+am__uniquify_input = $(AWK) '\ -+ BEGIN { nonempty = 0; } \ -+ { items[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in items) print i; }; } \ -+' -+# Make sure the list of sources is unique. This is necessary because, -+# e.g., the same source file might be shared among _SOURCES variables -+# for different programs/libraries. -+am__define_uniq_tagged_files = \ -+ list='$(am__tagged_files)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | $(am__uniquify_input)` - ETAGS = etags - CTAGS = ctags - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ -+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ -@@ -155,6 +267,7 @@ CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DISABLELIBHARU = @DISABLELIBHARU@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -182,6 +295,7 @@ LOCAL_INCS = @LOCAL_INCS@ - LOCAL_LIBS = @LOCAL_LIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - NM = @NM@ - NMEDIT = @NMEDIT@ -@@ -194,6 +308,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - POW_LIB = @POW_LIB@ -@@ -219,6 +334,7 @@ abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -@@ -252,7 +368,6 @@ libdir = @libdir@ - libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -@@ -409,9 +524,9 @@ $(top_srcdir)/configure: $(am__configure_deps) - $(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - $(am__aclocal_m4_deps): -+ - install-libLTLIBRARIES: $(lib_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" - @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ - list2=; for p in $$list; do \ - if test -f $$p; then \ -@@ -419,6 +534,8 @@ install-libLTLIBRARIES: $(lib_LTLIBRARIES) - else :; fi; \ - done; \ - test -z "$$list2" || { \ -+ echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \ -+ $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \ - } -@@ -434,15 +551,17 @@ uninstall-libLTLIBRARIES: - - clean-libLTLIBRARIES: - -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) -- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ -- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -- echo "rm -f \"$${dir}/so_locations\""; \ -- rm -f "$${dir}/so_locations"; \ -- done -+ @list='$(lib_LTLIBRARIES)'; \ -+ locs=`for p in $$list; do echo $$p; done | \ -+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ -+ sort -u`; \ -+ test -z "$$locs" || { \ -+ echo rm -f $${locs}; \ -+ rm -f $${locs}; \ -+ } -+ - install-pyexecLTLIBRARIES: $(pyexec_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(pyexecdir)" || $(MKDIR_P) "$(DESTDIR)$(pyexecdir)" - @list='$(pyexec_LTLIBRARIES)'; test -n "$(pyexecdir)" || list=; \ - list2=; for p in $$list; do \ - if test -f $$p; then \ -@@ -450,6 +569,8 @@ install-pyexecLTLIBRARIES: $(pyexec_LTLIBRARIES) - else :; fi; \ - done; \ - test -z "$$list2" || { \ -+ echo " $(MKDIR_P) '$(DESTDIR)$(pyexecdir)'"; \ -+ $(MKDIR_P) "$(DESTDIR)$(pyexecdir)" || exit 1; \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pyexecdir)'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pyexecdir)"; \ - } -@@ -465,16 +586,20 @@ uninstall-pyexecLTLIBRARIES: - - clean-pyexecLTLIBRARIES: - -test -z "$(pyexec_LTLIBRARIES)" || rm -f $(pyexec_LTLIBRARIES) -- @list='$(pyexec_LTLIBRARIES)'; for p in $$list; do \ -- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -- echo "rm -f \"$${dir}/so_locations\""; \ -- rm -f "$${dir}/so_locations"; \ -- done --_saga_api.la: $(_saga_api_la_OBJECTS) $(_saga_api_la_DEPENDENCIES) -- $(_saga_api_la_LINK) $(am__saga_api_la_rpath) $(_saga_api_la_OBJECTS) $(_saga_api_la_LIBADD) $(LIBS) --libsaga_api.la: $(libsaga_api_la_OBJECTS) $(libsaga_api_la_DEPENDENCIES) -- $(libsaga_api_la_LINK) -rpath $(libdir) $(libsaga_api_la_OBJECTS) $(libsaga_api_la_LIBADD) $(LIBS) -+ @list='$(pyexec_LTLIBRARIES)'; \ -+ locs=`for p in $$list; do echo $$p; done | \ -+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ -+ sort -u`; \ -+ test -z "$$locs" || { \ -+ echo rm -f $${locs}; \ -+ rm -f $${locs}; \ -+ } -+ -+_saga_api.la: $(_saga_api_la_OBJECTS) $(_saga_api_la_DEPENDENCIES) $(EXTRA__saga_api_la_DEPENDENCIES) -+ $(AM_V_CXXLD)$(_saga_api_la_LINK) $(am__saga_api_la_rpath) $(_saga_api_la_OBJECTS) $(_saga_api_la_LIBADD) $(LIBS) -+ -+libsaga_api.la: $(libsaga_api_la_OBJECTS) $(libsaga_api_la_DEPENDENCIES) $(EXTRA_libsaga_api_la_DEPENDENCIES) -+ $(AM_V_CXXLD)$(libsaga_api_la_LINK) -rpath $(libdir) $(libsaga_api_la_OBJECTS) $(libsaga_api_la_LIBADD) $(LIBS) - - mostlyclean-compile: - -rm -f *.$(OBJEXT) -@@ -547,53 +672,53 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tin_triangulation.Plo@am__quote@ - - .cpp.o: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< - - .cpp.obj: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - - .cpp.lo: --@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< - - _saga_api_la-saga_api_wrap.lo: saga_api_wrap.cxx --@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(_saga_api_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT _saga_api_la-saga_api_wrap.lo -MD -MP -MF $(DEPDIR)/_saga_api_la-saga_api_wrap.Tpo -c -o _saga_api_la-saga_api_wrap.lo `test -f 'saga_api_wrap.cxx' || echo '$(srcdir)/'`saga_api_wrap.cxx --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/_saga_api_la-saga_api_wrap.Tpo $(DEPDIR)/_saga_api_la-saga_api_wrap.Plo --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='saga_api_wrap.cxx' object='_saga_api_la-saga_api_wrap.lo' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(_saga_api_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT _saga_api_la-saga_api_wrap.lo -MD -MP -MF $(DEPDIR)/_saga_api_la-saga_api_wrap.Tpo -c -o _saga_api_la-saga_api_wrap.lo `test -f 'saga_api_wrap.cxx' || echo '$(srcdir)/'`saga_api_wrap.cxx -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/_saga_api_la-saga_api_wrap.Tpo $(DEPDIR)/_saga_api_la-saga_api_wrap.Plo -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='saga_api_wrap.cxx' object='_saga_api_la-saga_api_wrap.lo' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(_saga_api_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o _saga_api_la-saga_api_wrap.lo `test -f 'saga_api_wrap.cxx' || echo '$(srcdir)/'`saga_api_wrap.cxx -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(_saga_api_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o _saga_api_la-saga_api_wrap.lo `test -f 'saga_api_wrap.cxx' || echo '$(srcdir)/'`saga_api_wrap.cxx - - .cxx.o: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< - - .cxx.obj: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - - .cxx.lo: --@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< - - mostlyclean-libtool: - -rm -f *.lo -@@ -602,8 +727,11 @@ clean-libtool: - -rm -rf .libs _libs - install-nodist_pyexecPYTHON: $(nodist_pyexec_PYTHON) - @$(NORMAL_INSTALL) -- test -z "$(pyexecdir)" || $(MKDIR_P) "$(DESTDIR)$(pyexecdir)" - @list='$(nodist_pyexec_PYTHON)'; dlist=; list2=; test -n "$(pyexecdir)" || list=; \ -+ if test -n "$$list"; then \ -+ echo " $(MKDIR_P) '$(DESTDIR)$(pyexecdir)'"; \ -+ $(MKDIR_P) "$(DESTDIR)$(pyexecdir)" || exit 1; \ -+ fi; \ - for p in $$list; do \ - if test -f "$$p"; then b=; else b="$(srcdir)/"; fi; \ - if test -f $$b$$p; then \ -@@ -618,47 +746,43 @@ install-nodist_pyexecPYTHON: $(nodist_pyexec_PYTHON) - $(INSTALL_DATA) $$files "$(DESTDIR)$(pyexecdir)" || exit $$?; \ - done || exit $$?; \ - if test -n "$$dlist"; then \ -- if test -z "$(DESTDIR)"; then \ -- PYTHON=$(PYTHON) $(py_compile) --basedir "$(pyexecdir)" $$dlist; \ -- else \ -- PYTHON=$(PYTHON) $(py_compile) --destdir "$(DESTDIR)" --basedir "$(pyexecdir)" $$dlist; \ -- fi; \ -+ $(am__py_compile) --destdir "$(DESTDIR)" \ -+ --basedir "$(pyexecdir)" $$dlist; \ - else :; fi - - uninstall-nodist_pyexecPYTHON: - @$(NORMAL_UNINSTALL) - @list='$(nodist_pyexec_PYTHON)'; test -n "$(pyexecdir)" || list=; \ -- files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ -- test -n "$$files" || exit 0; \ -- filesc=`echo "$$files" | sed 's|$$|c|'`; \ -- fileso=`echo "$$files" | sed 's|$$|o|'`; \ -- echo " ( cd '$(DESTDIR)$(pyexecdir)' && rm -f" $$files ")"; \ -- cd "$(DESTDIR)$(pyexecdir)" && rm -f $$files || exit $$?; \ -- echo " ( cd '$(DESTDIR)$(pyexecdir)' && rm -f" $$filesc ")"; \ -- cd "$(DESTDIR)$(pyexecdir)" && rm -f $$filesc || exit $$?; \ -- echo " ( cd '$(DESTDIR)$(pyexecdir)' && rm -f" $$fileso ")"; \ -- cd "$(DESTDIR)$(pyexecdir)" && rm -f $$fileso -- --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -+ py_files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ -+ test -n "$$py_files" || exit 0; \ -+ dir='$(DESTDIR)$(pyexecdir)'; \ -+ pyc_files=`echo "$$py_files" | sed 's|$$|c|'`; \ -+ pyo_files=`echo "$$py_files" | sed 's|$$|o|'`; \ -+ py_files_pep3147=`echo "$$py_files" | $(am__pep3147_tweak)`; \ -+ echo "$$py_files_pep3147";\ -+ pyc_files_pep3147=`echo "$$py_files_pep3147" | sed 's|$$|c|'`; \ -+ pyo_files_pep3147=`echo "$$py_files_pep3147" | sed 's|$$|o|'`; \ -+ st=0; \ -+ for files in \ -+ "$$py_files" \ -+ "$$pyc_files" \ -+ "$$pyo_files" \ -+ "$$pyc_files_pep3147" \ -+ "$$pyo_files_pep3147" \ -+ ; do \ -+ $(am__uninstall_files_from_dir) || st=$$?; \ -+ done; \ -+ exit $$st -+ -+ID: $(am__tagged_files) -+ $(am__define_uniq_tagged_files); mkid -fID $$unique -+tags: tags-am -+TAGS: tags -+ -+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ -@@ -670,15 +794,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $$unique; \ - fi; \ - fi --ctags: CTAGS --CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ctags: ctags-am -+ -+CTAGS: ctags -+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) -+ $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique -@@ -687,6 +807,21 @@ GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -+cscopelist: cscopelist-am -+ -+cscopelist-am: $(am__tagged_files) -+ list='$(am__tagged_files)'; \ -+ case "$(srcdir)" in \ -+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ -+ *) sdir=$(subdir)/$(srcdir) ;; \ -+ esac; \ -+ for i in $$list; do \ -+ if test -f "$$i"; then \ -+ echo "$(subdir)/$$i"; \ -+ else \ -+ echo "$$sdir/$$i"; \ -+ fi; \ -+ done >> $(top_builddir)/cscope.files - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -@@ -738,10 +873,15 @@ install-am: all-am - - installcheck: installcheck-am - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+ if test -z '$(STRIP)'; then \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ install; \ -+ else \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -+ fi - mostlyclean-generic: - - clean-generic: -@@ -830,21 +970,21 @@ uninstall-am: uninstall-libLTLIBRARIES uninstall-nodist_pyexecPYTHON \ - - .MAKE: install-am install-exec-am install-strip - --.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ -+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ - clean-libLTLIBRARIES clean-libtool clean-pyexecLTLIBRARIES \ -- ctags distclean distclean-compile distclean-generic \ -- distclean-libtool distclean-tags distdir dvi dvi-am html \ -- html-am info info-am install install-am install-data \ -- install-data-am install-dvi install-dvi-am install-exec \ -- install-exec-am install-exec-hook install-html install-html-am \ -- install-info install-info-am install-libLTLIBRARIES \ -- install-man install-nodist_pyexecPYTHON install-pdf \ -- install-pdf-am install-ps install-ps-am \ -+ cscopelist-am ctags ctags-am distclean distclean-compile \ -+ distclean-generic distclean-libtool distclean-tags distdir dvi \ -+ dvi-am html html-am info info-am install install-am \ -+ install-data install-data-am install-dvi install-dvi-am \ -+ install-exec install-exec-am install-exec-hook install-html \ -+ install-html-am install-info install-info-am \ -+ install-libLTLIBRARIES install-man install-nodist_pyexecPYTHON \ -+ install-pdf install-pdf-am install-ps install-ps-am \ - install-pyexecLTLIBRARIES install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -- tags uninstall uninstall-am uninstall-libLTLIBRARIES \ -+ tags tags-am uninstall uninstall-am uninstall-libLTLIBRARIES \ - uninstall-nodist_pyexecPYTHON uninstall-pyexecLTLIBRARIES - - -diff --git a/src/saga_core/saga_cmd/Makefile.in b/src/saga_core/saga_cmd/Makefile.in -index e090842..58a29c3 100644 ---- a/src/saga_core/saga_cmd/Makefile.in -+++ b/src/saga_core/saga_cmd/Makefile.in -@@ -1,9 +1,8 @@ --# Makefile.in generated by automake 1.11.1 from Makefile.am. -+# Makefile.in generated by automake 1.14 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, --# Inc. -+# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+ - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -16,6 +15,51 @@ - @SET_MAKE@ - - VPATH = @srcdir@ -+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -+am__make_running_with_option = \ -+ case $${target_option-} in \ -+ ?) ;; \ -+ *) echo "am__make_running_with_option: internal error: invalid" \ -+ "target option '$${target_option-}' specified" >&2; \ -+ exit 1;; \ -+ esac; \ -+ has_opt=no; \ -+ sane_makeflags=$$MAKEFLAGS; \ -+ if $(am__is_gnu_make); then \ -+ sane_makeflags=$$MFLAGS; \ -+ else \ -+ case $$MAKEFLAGS in \ -+ *\\[\ \ ]*) \ -+ bs=\\; \ -+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -+ esac; \ -+ fi; \ -+ skip_next=no; \ -+ strip_trailopt () \ -+ { \ -+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -+ }; \ -+ for flg in $$sane_makeflags; do \ -+ test $$skip_next = yes && { skip_next=no; continue; }; \ -+ case $$flg in \ -+ *=*|--*) continue;; \ -+ -*I) strip_trailopt 'I'; skip_next=yes;; \ -+ -*I?*) strip_trailopt 'I';; \ -+ -*O) strip_trailopt 'O'; skip_next=yes;; \ -+ -*O?*) strip_trailopt 'O';; \ -+ -*l) strip_trailopt 'l'; skip_next=yes;; \ -+ -*l?*) strip_trailopt 'l';; \ -+ -[dEDm]) skip_next=yes;; \ -+ -[JT]) skip_next=yes;; \ -+ esac; \ -+ case $$flg in \ -+ *$$target_option*) has_opt=yes; break;; \ -+ esac; \ -+ done; \ -+ test $$has_opt = yes -+am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -+am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -36,7 +80,8 @@ build_triplet = @build@ - host_triplet = @host@ - bin_PROGRAMS = saga_cmd$(EXEEXT) - subdir = src/saga_core/saga_cmd --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ -+ $(top_srcdir)/depcomp - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ - $(top_srcdir)/m4/ax_python_devel.m4 \ -@@ -57,42 +102,102 @@ am_saga_cmd_OBJECTS = callback.$(OBJEXT) module_library.$(OBJEXT) \ - saga_cmd.$(OBJEXT) - saga_cmd_OBJECTS = $(am_saga_cmd_OBJECTS) - saga_cmd_DEPENDENCIES = ../saga_api/libsaga_api.la -+AM_V_lt = $(am__v_lt_@AM_V@) -+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -+am__v_lt_0 = --silent -+am__v_lt_1 = -+AM_V_P = $(am__v_P_@AM_V@) -+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -+am__v_P_0 = false -+am__v_P_1 = : -+AM_V_GEN = $(am__v_GEN_@AM_V@) -+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+am__v_GEN_0 = @echo " GEN " $@; -+am__v_GEN_1 = -+AM_V_at = $(am__v_at_@AM_V@) -+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+am__v_at_0 = @ -+am__v_at_1 = - DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - am__mv = mv -f - CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) --LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CXXFLAGS) $(CXXFLAGS) -+AM_V_CXX = $(am__v_CXX_@AM_V@) -+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) -+am__v_CXX_0 = @echo " CXX " $@; -+am__v_CXX_1 = - CXXLD = $(CXX) --CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ -+ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) -+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) -+am__v_CXXLD_0 = @echo " CXXLD " $@; -+am__v_CXXLD_1 = - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CFLAGS) $(CFLAGS) -+AM_V_CC = $(am__v_CC_@AM_V@) -+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -+am__v_CC_0 = @echo " CC " $@; -+am__v_CC_1 = - CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CCLD = $(am__v_CCLD_@AM_V@) -+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -+am__v_CCLD_0 = @echo " CCLD " $@; -+am__v_CCLD_1 = - SOURCES = $(saga_cmd_SOURCES) - DIST_SOURCES = $(saga_cmd_SOURCES) --RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ -- html-recursive info-recursive install-data-recursive \ -- install-dvi-recursive install-exec-recursive \ -- install-html-recursive install-info-recursive \ -- install-pdf-recursive install-ps-recursive install-recursive \ -- installcheck-recursive installdirs-recursive pdf-recursive \ -- ps-recursive uninstall-recursive -+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ -+ ctags-recursive dvi-recursive html-recursive info-recursive \ -+ install-data-recursive install-dvi-recursive \ -+ install-exec-recursive install-html-recursive \ -+ install-info-recursive install-pdf-recursive \ -+ install-ps-recursive install-recursive installcheck-recursive \ -+ installdirs-recursive pdf-recursive ps-recursive \ -+ tags-recursive uninstall-recursive -+am__can_run_installinfo = \ -+ case $$AM_UPDATE_INFO_DIR in \ -+ n|no|NO) false;; \ -+ *) (install-info --version) >/dev/null 2>&1;; \ -+ esac - RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ - distclean-recursive maintainer-clean-recursive --AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ -- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ -+am__recursive_targets = \ -+ $(RECURSIVE_TARGETS) \ -+ $(RECURSIVE_CLEAN_TARGETS) \ -+ $(am__extra_recursive_targets) -+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ - distdir -+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -+# Read a list of newline-separated strings from the standard input, -+# and print each of them once, without duplicates. Input order is -+# *not* preserved. -+am__uniquify_input = $(AWK) '\ -+ BEGIN { nonempty = 0; } \ -+ { items[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in items) print i; }; } \ -+' -+# Make sure the list of sources is unique. This is necessary because, -+# e.g., the same source file might be shared among _SOURCES variables -+# for different programs/libraries. -+am__define_uniq_tagged_files = \ -+ list='$(am__tagged_files)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | $(am__uniquify_input)` - ETAGS = etags - CTAGS = ctags - DIST_SUBDIRS = $(SUBDIRS) -@@ -124,6 +229,7 @@ am__relativize = \ - reldir="$$dir2" - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ -+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ -@@ -144,6 +250,7 @@ CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DISABLELIBHARU = @DISABLELIBHARU@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -171,6 +278,7 @@ LOCAL_INCS = @LOCAL_INCS@ - LOCAL_LIBS = @LOCAL_LIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - NM = @NM@ - NMEDIT = @NMEDIT@ -@@ -183,6 +291,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - POW_LIB = @POW_LIB@ -@@ -208,6 +317,7 @@ abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -@@ -241,7 +351,6 @@ libdir = @libdir@ - libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -@@ -317,14 +426,19 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) - $(am__aclocal_m4_deps): - install-binPROGRAMS: $(bin_PROGRAMS) - @$(NORMAL_INSTALL) -- test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" - @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ -+ if test -n "$$list"; then \ -+ echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ -+ $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ -+ fi; \ - for p in $$list; do echo "$$p $$p"; done | \ - sed 's/$(EXEEXT)$$//' | \ -- while read p p1; do if test -f $$p || test -f $$p1; \ -- then echo "$$p"; echo "$$p"; else :; fi; \ -+ while read p p1; do if test -f $$p \ -+ || test -f $$p1 \ -+ ; then echo "$$p"; echo "$$p"; else :; fi; \ - done | \ -- sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ -+ sed -e 'p;s,.*/,,;n;h' \ -+ -e 's|.*|.|' \ - -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ - sed 'N;N;N;s,\n, ,g' | \ - $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ -@@ -345,7 +459,8 @@ uninstall-binPROGRAMS: - @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ - files=`for p in $$list; do echo "$$p"; done | \ - sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ -- -e 's/$$/$(EXEEXT)/' `; \ -+ -e 's/$$/$(EXEEXT)/' \ -+ `; \ - test -n "$$list" || exit 0; \ - echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(bindir)" && rm -f $$files -@@ -358,9 +473,10 @@ clean-binPROGRAMS: - list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f" $$list; \ - rm -f $$list --saga_cmd$(EXEEXT): $(saga_cmd_OBJECTS) $(saga_cmd_DEPENDENCIES) -+ -+saga_cmd$(EXEEXT): $(saga_cmd_OBJECTS) $(saga_cmd_DEPENDENCIES) $(EXTRA_saga_cmd_DEPENDENCIES) - @rm -f saga_cmd$(EXEEXT) -- $(CXXLINK) $(saga_cmd_OBJECTS) $(saga_cmd_LDADD) $(LIBS) -+ $(AM_V_CXXLD)$(CXXLINK) $(saga_cmd_OBJECTS) $(saga_cmd_LDADD) $(LIBS) - - mostlyclean-compile: - -rm -f *.$(OBJEXT) -@@ -373,25 +489,25 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/saga_cmd.Po@am__quote@ - - .cpp.o: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< - - .cpp.obj: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - - .cpp.lo: --@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< - - mostlyclean-libtool: - -rm -f *.lo -@@ -400,22 +516,25 @@ clean-libtool: - -rm -rf .libs _libs - - # This directory's subdirectories are mostly independent; you can cd --# into them and run `make' without going through this Makefile. --# To change the values of `make' variables: instead of editing Makefiles, --# (1) if the variable is set in `config.status', edit `config.status' --# (which will cause the Makefiles to be regenerated when you run `make'); --# (2) otherwise, pass the desired values on the `make' command line. --$(RECURSIVE_TARGETS): -- @fail= failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -+# into them and run 'make' without going through this Makefile. -+# To change the values of 'make' variables: instead of editing Makefiles, -+# (1) if the variable is set in 'config.status', edit 'config.status' -+# (which will cause the Makefiles to be regenerated when you run 'make'); -+# (2) otherwise, pass the desired values on the 'make' command line. -+$(am__recursive_targets): -+ @fail=; \ -+ if $(am__make_keepgoing); then \ -+ failcom='fail=yes'; \ -+ else \ -+ failcom='exit 1'; \ -+ fi; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ -- list='$(SUBDIRS)'; for subdir in $$list; do \ -+ case "$@" in \ -+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -+ *) list='$(SUBDIRS)' ;; \ -+ esac; \ -+ for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ -@@ -430,57 +549,12 @@ $(RECURSIVE_TARGETS): - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - --$(RECURSIVE_CLEAN_TARGETS): -- @fail= failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -- dot_seen=no; \ -- case "$@" in \ -- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -- *) list='$(SUBDIRS)' ;; \ -- esac; \ -- rev=''; for subdir in $$list; do \ -- if test "$$subdir" = "."; then :; else \ -- rev="$$subdir $$rev"; \ -- fi; \ -- done; \ -- rev="$$rev ."; \ -- target=`echo $@ | sed s/-recursive//`; \ -- for subdir in $$rev; do \ -- echo "Making $$target in $$subdir"; \ -- if test "$$subdir" = "."; then \ -- local_target="$$target-am"; \ -- else \ -- local_target="$$target"; \ -- fi; \ -- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || eval $$failcom; \ -- done && test -z "$$fail" --tags-recursive: -- list='$(SUBDIRS)'; for subdir in $$list; do \ -- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ -- done --ctags-recursive: -- list='$(SUBDIRS)'; for subdir in $$list; do \ -- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ -- done -+ID: $(am__tagged_files) -+ $(am__define_uniq_tagged_files); mkid -fID $$unique -+tags: tags-recursive -+TAGS: tags - --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ - if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ -@@ -496,12 +570,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ -@@ -513,15 +582,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $$unique; \ - fi; \ - fi --ctags: CTAGS --CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ctags: ctags-recursive -+ -+CTAGS: ctags -+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) -+ $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique -@@ -530,6 +595,21 @@ GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -+cscopelist: cscopelist-recursive -+ -+cscopelist-am: $(am__tagged_files) -+ list='$(am__tagged_files)'; \ -+ case "$(srcdir)" in \ -+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ -+ *) sdir=$(subdir)/$(srcdir) ;; \ -+ esac; \ -+ for i in $$list; do \ -+ if test -f "$$i"; then \ -+ echo "$(subdir)/$$i"; \ -+ else \ -+ echo "$$sdir/$$i"; \ -+ fi; \ -+ done >> $(top_builddir)/cscope.files - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -@@ -566,13 +646,10 @@ distdir: $(DISTFILES) - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test -d "$(distdir)/$$subdir" \ -- || $(MKDIR_P) "$(distdir)/$$subdir" \ -- || exit 1; \ -- fi; \ -- done -- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ -- if test "$$subdir" = .; then :; else \ -+ $(am__make_dryrun) \ -+ || test -d "$(distdir)/$$subdir" \ -+ || $(MKDIR_P) "$(distdir)/$$subdir" \ -+ || exit 1; \ - dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ - $(am__relativize); \ - new_distdir=$$reldir; \ -@@ -610,10 +687,15 @@ install-am: all-am - - installcheck: installcheck-recursive - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+ if test -z '$(STRIP)'; then \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ install; \ -+ else \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -+ fi - mostlyclean-generic: - - clean-generic: -@@ -695,24 +777,22 @@ ps-am: - - uninstall-am: uninstall-binPROGRAMS - --.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ -- install-am install-strip tags-recursive -- --.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ -- all all-am check check-am clean clean-binPROGRAMS \ -- clean-generic clean-libtool ctags ctags-recursive distclean \ -- distclean-compile distclean-generic distclean-libtool \ -- distclean-tags distdir dvi dvi-am html html-am info info-am \ -- install install-am install-binPROGRAMS install-data \ -- install-data-am install-dvi install-dvi-am install-exec \ -- install-exec-am install-html install-html-am install-info \ -- install-info-am install-man install-pdf install-pdf-am \ -- install-ps install-ps-am install-strip installcheck \ -- installcheck-am installdirs installdirs-am maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-compile \ -- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -- tags tags-recursive uninstall uninstall-am \ -- uninstall-binPROGRAMS -+.MAKE: $(am__recursive_targets) install-am install-strip -+ -+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ -+ check-am clean clean-binPROGRAMS clean-generic clean-libtool \ -+ cscopelist-am ctags ctags-am distclean distclean-compile \ -+ distclean-generic distclean-libtool distclean-tags distdir dvi \ -+ dvi-am html html-am info info-am install install-am \ -+ install-binPROGRAMS install-data install-data-am install-dvi \ -+ install-dvi-am install-exec install-exec-am install-html \ -+ install-html-am install-info install-info-am install-man \ -+ install-pdf install-pdf-am install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ installdirs-am maintainer-clean maintainer-clean-generic \ -+ mostlyclean mostlyclean-compile mostlyclean-generic \ -+ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ -+ uninstall-am uninstall-binPROGRAMS - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff --git a/src/saga_core/saga_cmd/man/Makefile.in b/src/saga_core/saga_cmd/man/Makefile.in -index d9e0d07..6391fbd 100644 ---- a/src/saga_core/saga_cmd/man/Makefile.in -+++ b/src/saga_core/saga_cmd/man/Makefile.in -@@ -1,9 +1,8 @@ --# Makefile.in generated by automake 1.11.1 from Makefile.am. -+# Makefile.in generated by automake 1.14 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, --# Inc. -+# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+ - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -15,6 +14,51 @@ - - @SET_MAKE@ - VPATH = @srcdir@ -+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -+am__make_running_with_option = \ -+ case $${target_option-} in \ -+ ?) ;; \ -+ *) echo "am__make_running_with_option: internal error: invalid" \ -+ "target option '$${target_option-}' specified" >&2; \ -+ exit 1;; \ -+ esac; \ -+ has_opt=no; \ -+ sane_makeflags=$$MAKEFLAGS; \ -+ if $(am__is_gnu_make); then \ -+ sane_makeflags=$$MFLAGS; \ -+ else \ -+ case $$MAKEFLAGS in \ -+ *\\[\ \ ]*) \ -+ bs=\\; \ -+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -+ esac; \ -+ fi; \ -+ skip_next=no; \ -+ strip_trailopt () \ -+ { \ -+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -+ }; \ -+ for flg in $$sane_makeflags; do \ -+ test $$skip_next = yes && { skip_next=no; continue; }; \ -+ case $$flg in \ -+ *=*|--*) continue;; \ -+ -*I) strip_trailopt 'I'; skip_next=yes;; \ -+ -*I?*) strip_trailopt 'I';; \ -+ -*O) strip_trailopt 'O'; skip_next=yes;; \ -+ -*O?*) strip_trailopt 'O';; \ -+ -*l) strip_trailopt 'l'; skip_next=yes;; \ -+ -*l?*) strip_trailopt 'l';; \ -+ -[dEDm]) skip_next=yes;; \ -+ -[JT]) skip_next=yes;; \ -+ esac; \ -+ case $$flg in \ -+ *$$target_option*) has_opt=yes; break;; \ -+ esac; \ -+ done; \ -+ test $$has_opt = yes -+am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -+am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -34,8 +78,8 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - subdir = src/saga_core/saga_cmd/man --DIST_COMMON = $(dist_man_MANS) $(srcdir)/Makefile.am \ -- $(srcdir)/Makefile.in -+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ -+ $(dist_man_MANS) - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ - $(top_srcdir)/m4/ax_python_devel.m4 \ -@@ -50,8 +94,25 @@ mkinstalldirs = $(install_sh) -d - CONFIG_HEADER = $(top_builddir)/config.h - CONFIG_CLEAN_FILES = - CONFIG_CLEAN_VPATH_FILES = -+AM_V_P = $(am__v_P_@AM_V@) -+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -+am__v_P_0 = false -+am__v_P_1 = : -+AM_V_GEN = $(am__v_GEN_@AM_V@) -+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+am__v_GEN_0 = @echo " GEN " $@; -+am__v_GEN_1 = -+AM_V_at = $(am__v_at_@AM_V@) -+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+am__v_at_0 = @ -+am__v_at_1 = - SOURCES = - DIST_SOURCES = -+am__can_run_installinfo = \ -+ case $$AM_UPDATE_INFO_DIR in \ -+ n|no|NO) false;; \ -+ *) (install-info --version) >/dev/null 2>&1;; \ -+ esac - am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; - am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -@@ -73,13 +134,21 @@ am__nobase_list = $(am__nobase_strip_setup); \ - am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -+am__uninstall_files_from_dir = { \ -+ test -z "$$files" \ -+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ -+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ -+ $(am__cd) "$$dir" && rm -f $$files; }; \ -+ } - man1dir = $(mandir)/man1 - am__installdirs = "$(DESTDIR)$(man1dir)" - NROFF = nroff - MANS = $(dist_man_MANS) -+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ -+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ -@@ -100,6 +169,7 @@ CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DISABLELIBHARU = @DISABLELIBHARU@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -127,6 +197,7 @@ LOCAL_INCS = @LOCAL_INCS@ - LOCAL_LIBS = @LOCAL_LIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - NM = @NM@ - NMEDIT = @NMEDIT@ -@@ -139,6 +210,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - POW_LIB = @POW_LIB@ -@@ -164,6 +236,7 @@ abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -@@ -197,7 +270,6 @@ libdir = @libdir@ - libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -@@ -259,11 +331,18 @@ clean-libtool: - -rm -rf .libs _libs - install-man1: $(dist_man_MANS) - @$(NORMAL_INSTALL) -- test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)" -- @list=''; test -n "$(man1dir)" || exit 0; \ -- { for i in $$list; do echo "$$i"; done; \ -- l2='$(dist_man_MANS)'; for i in $$l2; do echo "$$i"; done | \ -- sed -n '/\.1[a-z]*$$/p'; \ -+ @list1=''; \ -+ list2='$(dist_man_MANS)'; \ -+ test -n "$(man1dir)" \ -+ && test -n "`echo $$list1$$list2`" \ -+ || exit 0; \ -+ echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \ -+ $(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \ -+ { for i in $$list1; do echo "$$i"; done; \ -+ if test -n "$$list2"; then \ -+ for i in $$list2; do echo "$$i"; done \ -+ | sed -n '/\.1[a-z]*$$/p'; \ -+ fi; \ - } | while read p; do \ - if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; echo "$$p"; \ -@@ -292,30 +371,15 @@ uninstall-man1: - sed -n '/\.1[a-z]*$$/p'; \ - } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ - -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ -- test -z "$$files" || { \ -- echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \ -- cd "$(DESTDIR)$(man1dir)" && rm -f $$files; } --tags: TAGS --TAGS: -+ dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir) -+tags TAGS: -+ -+ctags CTAGS: - --ctags: CTAGS --CTAGS: -+cscope cscopelist: - - - distdir: $(DISTFILES) -- @list='$(MANS)'; if test -n "$$list"; then \ -- list=`for p in $$list; do \ -- if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ -- if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ -- if test -n "$$list" && \ -- grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ -- echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ -- grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ -- echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ -- echo " typically \`make maintainer-clean' will remove them" >&2; \ -- exit 1; \ -- else :; fi; \ -- else :; fi - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ -@@ -362,10 +426,15 @@ install-am: all-am - - installcheck: installcheck-am - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+ if test -z '$(STRIP)'; then \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ install; \ -+ else \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -+ fi - mostlyclean-generic: - - clean-generic: -@@ -448,16 +517,17 @@ uninstall-man: uninstall-man1 - .MAKE: install-am install-strip - - .PHONY: all all-am check check-am clean clean-generic clean-libtool \ -- distclean distclean-generic distclean-libtool distdir dvi \ -- dvi-am html html-am info info-am install install-am \ -- install-data install-data-am install-dvi install-dvi-am \ -- install-exec install-exec-am install-html install-html-am \ -- install-info install-info-am install-man install-man1 \ -- install-pdf install-pdf-am install-ps install-ps-am \ -- install-strip installcheck installcheck-am installdirs \ -- maintainer-clean maintainer-clean-generic mostlyclean \ -- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -- uninstall uninstall-am uninstall-man uninstall-man1 -+ cscopelist-am ctags-am distclean distclean-generic \ -+ distclean-libtool distdir dvi dvi-am html html-am info info-am \ -+ install install-am install-data install-data-am install-dvi \ -+ install-dvi-am install-exec install-exec-am install-html \ -+ install-html-am install-info install-info-am install-man \ -+ install-man1 install-pdf install-pdf-am install-ps \ -+ install-ps-am install-strip installcheck installcheck-am \ -+ installdirs maintainer-clean maintainer-clean-generic \ -+ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ -+ ps ps-am tags-am uninstall uninstall-am uninstall-man \ -+ uninstall-man1 - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff --git a/src/saga_core/saga_gdi/Makefile.in b/src/saga_core/saga_gdi/Makefile.in -index 6967f4a..279b2c6 100644 ---- a/src/saga_core/saga_gdi/Makefile.in -+++ b/src/saga_core/saga_gdi/Makefile.in -@@ -1,9 +1,8 @@ --# Makefile.in generated by automake 1.11.1 from Makefile.am. -+# Makefile.in generated by automake 1.14 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, --# Inc. -+# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+ - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -16,6 +15,51 @@ - @SET_MAKE@ - - VPATH = @srcdir@ -+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -+am__make_running_with_option = \ -+ case $${target_option-} in \ -+ ?) ;; \ -+ *) echo "am__make_running_with_option: internal error: invalid" \ -+ "target option '$${target_option-}' specified" >&2; \ -+ exit 1;; \ -+ esac; \ -+ has_opt=no; \ -+ sane_makeflags=$$MAKEFLAGS; \ -+ if $(am__is_gnu_make); then \ -+ sane_makeflags=$$MFLAGS; \ -+ else \ -+ case $$MAKEFLAGS in \ -+ *\\[\ \ ]*) \ -+ bs=\\; \ -+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -+ esac; \ -+ fi; \ -+ skip_next=no; \ -+ strip_trailopt () \ -+ { \ -+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -+ }; \ -+ for flg in $$sane_makeflags; do \ -+ test $$skip_next = yes && { skip_next=no; continue; }; \ -+ case $$flg in \ -+ *=*|--*) continue;; \ -+ -*I) strip_trailopt 'I'; skip_next=yes;; \ -+ -*I?*) strip_trailopt 'I';; \ -+ -*O) strip_trailopt 'O'; skip_next=yes;; \ -+ -*O?*) strip_trailopt 'O';; \ -+ -*l) strip_trailopt 'l'; skip_next=yes;; \ -+ -*l?*) strip_trailopt 'l';; \ -+ -[dEDm]) skip_next=yes;; \ -+ -[JT]) skip_next=yes;; \ -+ esac; \ -+ case $$flg in \ -+ *$$target_option*) has_opt=yes; break;; \ -+ esac; \ -+ done; \ -+ test $$has_opt = yes -+am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -+am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -35,7 +79,8 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - subdir = src/saga_core/saga_gdi --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ -+ $(top_srcdir)/depcomp - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ - $(top_srcdir)/m4/ax_python_devel.m4 \ -@@ -71,6 +116,12 @@ am__nobase_list = $(am__nobase_strip_setup); \ - am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -+am__uninstall_files_from_dir = { \ -+ test -z "$$files" \ -+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ -+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ -+ $(am__cd) "$$dir" && rm -f $$files; }; \ -+ } - am__installdirs = "$(DESTDIR)$(libdir)" - LTLIBRARIES = $(lib_LTLIBRARIES) - libsaga_gdi_la_DEPENDENCIES = \ -@@ -78,38 +129,96 @@ libsaga_gdi_la_DEPENDENCIES = \ - am_libsaga_gdi_la_OBJECTS = sgdi_diagram.lo sgdi_dialog.lo \ - sgdi_helper.lo saga_gdi.lo - libsaga_gdi_la_OBJECTS = $(am_libsaga_gdi_la_OBJECTS) --libsaga_gdi_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ -- $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ -- $(CXXFLAGS) $(libsaga_gdi_la_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_lt = $(am__v_lt_@AM_V@) -+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -+am__v_lt_0 = --silent -+am__v_lt_1 = -+libsaga_gdi_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \ -+ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ -+ $(AM_CXXFLAGS) $(CXXFLAGS) $(libsaga_gdi_la_LDFLAGS) \ -+ $(LDFLAGS) -o $@ -+AM_V_P = $(am__v_P_@AM_V@) -+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -+am__v_P_0 = false -+am__v_P_1 = : -+AM_V_GEN = $(am__v_GEN_@AM_V@) -+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+am__v_GEN_0 = @echo " GEN " $@; -+am__v_GEN_1 = -+AM_V_at = $(am__v_at_@AM_V@) -+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+am__v_at_0 = @ -+am__v_at_1 = - DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - am__mv = mv -f - CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) --LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CXXFLAGS) $(CXXFLAGS) -+AM_V_CXX = $(am__v_CXX_@AM_V@) -+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) -+am__v_CXX_0 = @echo " CXX " $@; -+am__v_CXX_1 = - CXXLD = $(CXX) --CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ -+ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) -+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) -+am__v_CXXLD_0 = @echo " CXXLD " $@; -+am__v_CXXLD_1 = - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CFLAGS) $(CFLAGS) -+AM_V_CC = $(am__v_CC_@AM_V@) -+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -+am__v_CC_0 = @echo " CC " $@; -+am__v_CC_1 = - CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CCLD = $(am__v_CCLD_@AM_V@) -+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -+am__v_CCLD_0 = @echo " CCLD " $@; -+am__v_CCLD_1 = - SOURCES = $(libsaga_gdi_la_SOURCES) - DIST_SOURCES = $(libsaga_gdi_la_SOURCES) -+am__can_run_installinfo = \ -+ case $$AM_UPDATE_INFO_DIR in \ -+ n|no|NO) false;; \ -+ *) (install-info --version) >/dev/null 2>&1;; \ -+ esac -+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -+# Read a list of newline-separated strings from the standard input, -+# and print each of them once, without duplicates. Input order is -+# *not* preserved. -+am__uniquify_input = $(AWK) '\ -+ BEGIN { nonempty = 0; } \ -+ { items[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in items) print i; }; } \ -+' -+# Make sure the list of sources is unique. This is necessary because, -+# e.g., the same source file might be shared among _SOURCES variables -+# for different programs/libraries. -+am__define_uniq_tagged_files = \ -+ list='$(am__tagged_files)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | $(am__uniquify_input)` - ETAGS = etags - CTAGS = ctags - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ -+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ -@@ -130,6 +239,7 @@ CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DISABLELIBHARU = @DISABLELIBHARU@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -157,6 +267,7 @@ LOCAL_INCS = @LOCAL_INCS@ - LOCAL_LIBS = @LOCAL_LIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - NM = @NM@ - NMEDIT = @NMEDIT@ -@@ -169,6 +280,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - POW_LIB = @POW_LIB@ -@@ -194,6 +306,7 @@ abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -@@ -227,7 +340,6 @@ libdir = @libdir@ - libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -@@ -303,9 +415,9 @@ $(top_srcdir)/configure: $(am__configure_deps) - $(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - $(am__aclocal_m4_deps): -+ - install-libLTLIBRARIES: $(lib_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" - @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ - list2=; for p in $$list; do \ - if test -f $$p; then \ -@@ -313,6 +425,8 @@ install-libLTLIBRARIES: $(lib_LTLIBRARIES) - else :; fi; \ - done; \ - test -z "$$list2" || { \ -+ echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \ -+ $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \ - } -@@ -328,14 +442,17 @@ uninstall-libLTLIBRARIES: - - clean-libLTLIBRARIES: - -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) -- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ -- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -- echo "rm -f \"$${dir}/so_locations\""; \ -- rm -f "$${dir}/so_locations"; \ -- done --libsaga_gdi.la: $(libsaga_gdi_la_OBJECTS) $(libsaga_gdi_la_DEPENDENCIES) -- $(libsaga_gdi_la_LINK) -rpath $(libdir) $(libsaga_gdi_la_OBJECTS) $(libsaga_gdi_la_LIBADD) $(LIBS) -+ @list='$(lib_LTLIBRARIES)'; \ -+ locs=`for p in $$list; do echo $$p; done | \ -+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ -+ sort -u`; \ -+ test -z "$$locs" || { \ -+ echo rm -f $${locs}; \ -+ rm -f $${locs}; \ -+ } -+ -+libsaga_gdi.la: $(libsaga_gdi_la_OBJECTS) $(libsaga_gdi_la_DEPENDENCIES) $(EXTRA_libsaga_gdi_la_DEPENDENCIES) -+ $(AM_V_CXXLD)$(libsaga_gdi_la_LINK) -rpath $(libdir) $(libsaga_gdi_la_OBJECTS) $(libsaga_gdi_la_LIBADD) $(LIBS) - - mostlyclean-compile: - -rm -f *.$(OBJEXT) -@@ -349,25 +466,25 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sgdi_helper.Plo@am__quote@ - - .cpp.o: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< - - .cpp.obj: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - - .cpp.lo: --@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< - - mostlyclean-libtool: - -rm -f *.lo -@@ -375,26 +492,15 @@ mostlyclean-libtool: - clean-libtool: - -rm -rf .libs _libs - --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -+ID: $(am__tagged_files) -+ $(am__define_uniq_tagged_files); mkid -fID $$unique -+tags: tags-am -+TAGS: tags -+ -+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ -@@ -406,15 +512,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $$unique; \ - fi; \ - fi --ctags: CTAGS --CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ctags: ctags-am -+ -+CTAGS: ctags -+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) -+ $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique -@@ -423,6 +525,21 @@ GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -+cscopelist: cscopelist-am -+ -+cscopelist-am: $(am__tagged_files) -+ list='$(am__tagged_files)'; \ -+ case "$(srcdir)" in \ -+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ -+ *) sdir=$(subdir)/$(srcdir) ;; \ -+ esac; \ -+ for i in $$list; do \ -+ if test -f "$$i"; then \ -+ echo "$(subdir)/$$i"; \ -+ else \ -+ echo "$$sdir/$$i"; \ -+ fi; \ -+ done >> $(top_builddir)/cscope.files - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -@@ -474,10 +591,15 @@ install-am: all-am - - installcheck: installcheck-am - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+ if test -z '$(STRIP)'; then \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ install; \ -+ else \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -+ fi - mostlyclean-generic: - - clean-generic: -@@ -562,19 +684,19 @@ uninstall-am: uninstall-libLTLIBRARIES - - .MAKE: install-am install-strip - --.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ -- clean-libLTLIBRARIES clean-libtool ctags distclean \ -- distclean-compile distclean-generic distclean-libtool \ -- distclean-tags distdir dvi dvi-am html html-am info info-am \ -- install install-am install-data install-data-am install-dvi \ -- install-dvi-am install-exec install-exec-am install-html \ -- install-html-am install-info install-info-am \ -- install-libLTLIBRARIES install-man install-pdf install-pdf-am \ -- install-ps install-ps-am install-strip installcheck \ -- installcheck-am installdirs maintainer-clean \ -+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ -+ clean-libLTLIBRARIES clean-libtool cscopelist-am ctags \ -+ ctags-am distclean distclean-compile distclean-generic \ -+ distclean-libtool distclean-tags distdir dvi dvi-am html \ -+ html-am info info-am install install-am install-data \ -+ install-data-am install-dvi install-dvi-am install-exec \ -+ install-exec-am install-html install-html-am install-info \ -+ install-info-am install-libLTLIBRARIES install-man install-pdf \ -+ install-pdf-am install-ps install-ps-am install-strip \ -+ installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -- tags uninstall uninstall-am uninstall-libLTLIBRARIES -+ tags tags-am uninstall uninstall-am uninstall-libLTLIBRARIES - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff --git a/src/saga_core/saga_gui/Makefile.in b/src/saga_core/saga_gui/Makefile.in -index e3f5862..da08543 100644 ---- a/src/saga_core/saga_gui/Makefile.in -+++ b/src/saga_core/saga_gui/Makefile.in -@@ -1,9 +1,8 @@ --# Makefile.in generated by automake 1.11.1 from Makefile.am. -+# Makefile.in generated by automake 1.14 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, --# Inc. -+# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+ - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -16,6 +15,51 @@ - @SET_MAKE@ - - VPATH = @srcdir@ -+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -+am__make_running_with_option = \ -+ case $${target_option-} in \ -+ ?) ;; \ -+ *) echo "am__make_running_with_option: internal error: invalid" \ -+ "target option '$${target_option-}' specified" >&2; \ -+ exit 1;; \ -+ esac; \ -+ has_opt=no; \ -+ sane_makeflags=$$MAKEFLAGS; \ -+ if $(am__is_gnu_make); then \ -+ sane_makeflags=$$MFLAGS; \ -+ else \ -+ case $$MAKEFLAGS in \ -+ *\\[\ \ ]*) \ -+ bs=\\; \ -+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -+ esac; \ -+ fi; \ -+ skip_next=no; \ -+ strip_trailopt () \ -+ { \ -+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -+ }; \ -+ for flg in $$sane_makeflags; do \ -+ test $$skip_next = yes && { skip_next=no; continue; }; \ -+ case $$flg in \ -+ *=*|--*) continue;; \ -+ -*I) strip_trailopt 'I'; skip_next=yes;; \ -+ -*I?*) strip_trailopt 'I';; \ -+ -*O) strip_trailopt 'O'; skip_next=yes;; \ -+ -*O?*) strip_trailopt 'O';; \ -+ -*l) strip_trailopt 'l'; skip_next=yes;; \ -+ -*l?*) strip_trailopt 'l';; \ -+ -[dEDm]) skip_next=yes;; \ -+ -[JT]) skip_next=yes;; \ -+ esac; \ -+ case $$flg in \ -+ *$$target_option*) has_opt=yes; break;; \ -+ esac; \ -+ done; \ -+ test $$has_opt = yes -+am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -+am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -36,7 +80,8 @@ build_triplet = @build@ - host_triplet = @host@ - bin_PROGRAMS = saga_gui$(EXEEXT) - subdir = src/saga_core/saga_gui --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ -+ $(top_srcdir)/depcomp - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ - $(top_srcdir)/m4/ax_python_devel.m4 \ -@@ -103,42 +148,102 @@ am_saga_gui_OBJECTS = active.$(OBJEXT) active_attributes.$(OBJEXT) \ - saga_gui_OBJECTS = $(am_saga_gui_OBJECTS) - saga_gui_DEPENDENCIES = ../saga_api/libsaga_api.la \ - ../saga_odbc/libsaga_odbc.la -+AM_V_lt = $(am__v_lt_@AM_V@) -+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -+am__v_lt_0 = --silent -+am__v_lt_1 = -+AM_V_P = $(am__v_P_@AM_V@) -+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -+am__v_P_0 = false -+am__v_P_1 = : -+AM_V_GEN = $(am__v_GEN_@AM_V@) -+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+am__v_GEN_0 = @echo " GEN " $@; -+am__v_GEN_1 = -+AM_V_at = $(am__v_at_@AM_V@) -+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+am__v_at_0 = @ -+am__v_at_1 = - DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - am__mv = mv -f - CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) --LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CXXFLAGS) $(CXXFLAGS) -+AM_V_CXX = $(am__v_CXX_@AM_V@) -+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) -+am__v_CXX_0 = @echo " CXX " $@; -+am__v_CXX_1 = - CXXLD = $(CXX) --CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ -+ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) -+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) -+am__v_CXXLD_0 = @echo " CXXLD " $@; -+am__v_CXXLD_1 = - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CFLAGS) $(CFLAGS) -+AM_V_CC = $(am__v_CC_@AM_V@) -+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -+am__v_CC_0 = @echo " CC " $@; -+am__v_CC_1 = - CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CCLD = $(am__v_CCLD_@AM_V@) -+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -+am__v_CCLD_0 = @echo " CCLD " $@; -+am__v_CCLD_1 = - SOURCES = $(saga_gui_SOURCES) - DIST_SOURCES = $(saga_gui_SOURCES) --RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ -- html-recursive info-recursive install-data-recursive \ -- install-dvi-recursive install-exec-recursive \ -- install-html-recursive install-info-recursive \ -- install-pdf-recursive install-ps-recursive install-recursive \ -- installcheck-recursive installdirs-recursive pdf-recursive \ -- ps-recursive uninstall-recursive -+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ -+ ctags-recursive dvi-recursive html-recursive info-recursive \ -+ install-data-recursive install-dvi-recursive \ -+ install-exec-recursive install-html-recursive \ -+ install-info-recursive install-pdf-recursive \ -+ install-ps-recursive install-recursive installcheck-recursive \ -+ installdirs-recursive pdf-recursive ps-recursive \ -+ tags-recursive uninstall-recursive -+am__can_run_installinfo = \ -+ case $$AM_UPDATE_INFO_DIR in \ -+ n|no|NO) false;; \ -+ *) (install-info --version) >/dev/null 2>&1;; \ -+ esac - RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ - distclean-recursive maintainer-clean-recursive --AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ -- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ -+am__recursive_targets = \ -+ $(RECURSIVE_TARGETS) \ -+ $(RECURSIVE_CLEAN_TARGETS) \ -+ $(am__extra_recursive_targets) -+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ - distdir -+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -+# Read a list of newline-separated strings from the standard input, -+# and print each of them once, without duplicates. Input order is -+# *not* preserved. -+am__uniquify_input = $(AWK) '\ -+ BEGIN { nonempty = 0; } \ -+ { items[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in items) print i; }; } \ -+' -+# Make sure the list of sources is unique. This is necessary because, -+# e.g., the same source file might be shared among _SOURCES variables -+# for different programs/libraries. -+am__define_uniq_tagged_files = \ -+ list='$(am__tagged_files)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | $(am__uniquify_input)` - ETAGS = etags - CTAGS = ctags - DIST_SUBDIRS = $(SUBDIRS) -@@ -170,6 +275,7 @@ am__relativize = \ - reldir="$$dir2" - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ -+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ -@@ -190,6 +296,7 @@ CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DISABLELIBHARU = @DISABLELIBHARU@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -217,6 +324,7 @@ LOCAL_INCS = @LOCAL_INCS@ - LOCAL_LIBS = @LOCAL_LIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - NM = @NM@ - NMEDIT = @NMEDIT@ -@@ -229,6 +337,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - POW_LIB = @POW_LIB@ -@@ -254,6 +363,7 @@ abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -@@ -287,7 +397,6 @@ libdir = @libdir@ - libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -@@ -549,14 +658,19 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) - $(am__aclocal_m4_deps): - install-binPROGRAMS: $(bin_PROGRAMS) - @$(NORMAL_INSTALL) -- test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" - @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ -+ if test -n "$$list"; then \ -+ echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ -+ $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ -+ fi; \ - for p in $$list; do echo "$$p $$p"; done | \ - sed 's/$(EXEEXT)$$//' | \ -- while read p p1; do if test -f $$p || test -f $$p1; \ -- then echo "$$p"; echo "$$p"; else :; fi; \ -+ while read p p1; do if test -f $$p \ -+ || test -f $$p1 \ -+ ; then echo "$$p"; echo "$$p"; else :; fi; \ - done | \ -- sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ -+ sed -e 'p;s,.*/,,;n;h' \ -+ -e 's|.*|.|' \ - -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ - sed 'N;N;N;s,\n, ,g' | \ - $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ -@@ -577,7 +691,8 @@ uninstall-binPROGRAMS: - @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ - files=`for p in $$list; do echo "$$p"; done | \ - sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ -- -e 's/$$/$(EXEEXT)/' `; \ -+ -e 's/$$/$(EXEEXT)/' \ -+ `; \ - test -n "$$list" || exit 0; \ - echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(bindir)" && rm -f $$files -@@ -590,9 +705,10 @@ clean-binPROGRAMS: - list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f" $$list; \ - rm -f $$list --saga_gui$(EXEEXT): $(saga_gui_OBJECTS) $(saga_gui_DEPENDENCIES) -+ -+saga_gui$(EXEEXT): $(saga_gui_OBJECTS) $(saga_gui_DEPENDENCIES) $(EXTRA_saga_gui_DEPENDENCIES) - @rm -f saga_gui$(EXEEXT) -- $(CXXLINK) $(saga_gui_OBJECTS) $(saga_gui_LDADD) $(LIBS) -+ $(AM_V_CXXLD)$(CXXLINK) $(saga_gui_OBJECTS) $(saga_gui_LDADD) $(LIBS) - - mostlyclean-compile: - -rm -f *.$(OBJEXT) -@@ -697,25 +813,25 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wksp_tin_manager.Po@am__quote@ - - .cpp.o: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< - - .cpp.obj: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - - .cpp.lo: --@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< - - mostlyclean-libtool: - -rm -f *.lo -@@ -724,22 +840,25 @@ clean-libtool: - -rm -rf .libs _libs - - # This directory's subdirectories are mostly independent; you can cd --# into them and run `make' without going through this Makefile. --# To change the values of `make' variables: instead of editing Makefiles, --# (1) if the variable is set in `config.status', edit `config.status' --# (which will cause the Makefiles to be regenerated when you run `make'); --# (2) otherwise, pass the desired values on the `make' command line. --$(RECURSIVE_TARGETS): -- @fail= failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -+# into them and run 'make' without going through this Makefile. -+# To change the values of 'make' variables: instead of editing Makefiles, -+# (1) if the variable is set in 'config.status', edit 'config.status' -+# (which will cause the Makefiles to be regenerated when you run 'make'); -+# (2) otherwise, pass the desired values on the 'make' command line. -+$(am__recursive_targets): -+ @fail=; \ -+ if $(am__make_keepgoing); then \ -+ failcom='fail=yes'; \ -+ else \ -+ failcom='exit 1'; \ -+ fi; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ -- list='$(SUBDIRS)'; for subdir in $$list; do \ -+ case "$@" in \ -+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -+ *) list='$(SUBDIRS)' ;; \ -+ esac; \ -+ for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ -@@ -754,57 +873,12 @@ $(RECURSIVE_TARGETS): - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - --$(RECURSIVE_CLEAN_TARGETS): -- @fail= failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -- dot_seen=no; \ -- case "$@" in \ -- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -- *) list='$(SUBDIRS)' ;; \ -- esac; \ -- rev=''; for subdir in $$list; do \ -- if test "$$subdir" = "."; then :; else \ -- rev="$$subdir $$rev"; \ -- fi; \ -- done; \ -- rev="$$rev ."; \ -- target=`echo $@ | sed s/-recursive//`; \ -- for subdir in $$rev; do \ -- echo "Making $$target in $$subdir"; \ -- if test "$$subdir" = "."; then \ -- local_target="$$target-am"; \ -- else \ -- local_target="$$target"; \ -- fi; \ -- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || eval $$failcom; \ -- done && test -z "$$fail" --tags-recursive: -- list='$(SUBDIRS)'; for subdir in $$list; do \ -- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ -- done --ctags-recursive: -- list='$(SUBDIRS)'; for subdir in $$list; do \ -- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ -- done -+ID: $(am__tagged_files) -+ $(am__define_uniq_tagged_files); mkid -fID $$unique -+tags: tags-recursive -+TAGS: tags - --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ - if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ -@@ -820,12 +894,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ -@@ -837,15 +906,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $$unique; \ - fi; \ - fi --ctags: CTAGS --CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ctags: ctags-recursive -+ -+CTAGS: ctags -+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) -+ $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique -@@ -854,6 +919,21 @@ GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -+cscopelist: cscopelist-recursive -+ -+cscopelist-am: $(am__tagged_files) -+ list='$(am__tagged_files)'; \ -+ case "$(srcdir)" in \ -+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ -+ *) sdir=$(subdir)/$(srcdir) ;; \ -+ esac; \ -+ for i in $$list; do \ -+ if test -f "$$i"; then \ -+ echo "$(subdir)/$$i"; \ -+ else \ -+ echo "$$sdir/$$i"; \ -+ fi; \ -+ done >> $(top_builddir)/cscope.files - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -@@ -890,13 +970,10 @@ distdir: $(DISTFILES) - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test -d "$(distdir)/$$subdir" \ -- || $(MKDIR_P) "$(distdir)/$$subdir" \ -- || exit 1; \ -- fi; \ -- done -- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ -- if test "$$subdir" = .; then :; else \ -+ $(am__make_dryrun) \ -+ || test -d "$(distdir)/$$subdir" \ -+ || $(MKDIR_P) "$(distdir)/$$subdir" \ -+ || exit 1; \ - dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ - $(am__relativize); \ - new_distdir=$$reldir; \ -@@ -937,10 +1014,15 @@ install-am: all-am - - installcheck: installcheck-recursive - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+ if test -z '$(STRIP)'; then \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ install; \ -+ else \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -+ fi - mostlyclean-generic: - - clean-generic: -@@ -1022,24 +1104,22 @@ ps-am: - - uninstall-am: uninstall-binPROGRAMS - --.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ -- install-am install-strip tags-recursive -- --.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ -- all all-am check check-am clean clean-binPROGRAMS \ -- clean-generic clean-libtool ctags ctags-recursive dist-hook \ -- distclean distclean-compile distclean-generic \ -- distclean-libtool distclean-tags distdir dvi dvi-am html \ -- html-am info info-am install install-am install-binPROGRAMS \ -- install-data install-data-am install-dvi install-dvi-am \ -- install-exec install-exec-am install-html install-html-am \ -- install-info install-info-am install-man install-pdf \ -- install-pdf-am install-ps install-ps-am install-strip \ -- installcheck installcheck-am installdirs installdirs-am \ -- maintainer-clean maintainer-clean-generic mostlyclean \ -- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ -- pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ -- uninstall-binPROGRAMS -+.MAKE: $(am__recursive_targets) install-am install-strip -+ -+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ -+ check-am clean clean-binPROGRAMS clean-generic clean-libtool \ -+ cscopelist-am ctags ctags-am dist-hook distclean \ -+ distclean-compile distclean-generic distclean-libtool \ -+ distclean-tags distdir dvi dvi-am html html-am info info-am \ -+ install install-am install-binPROGRAMS install-data \ -+ install-data-am install-dvi install-dvi-am install-exec \ -+ install-exec-am install-html install-html-am install-info \ -+ install-info-am install-man install-pdf install-pdf-am \ -+ install-ps install-ps-am install-strip installcheck \ -+ installcheck-am installdirs installdirs-am maintainer-clean \ -+ maintainer-clean-generic mostlyclean mostlyclean-compile \ -+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -+ tags tags-am uninstall uninstall-am uninstall-binPROGRAMS - - - dist-hook: -diff --git a/src/saga_core/saga_gui/man/Makefile.in b/src/saga_core/saga_gui/man/Makefile.in -index 7ea0147..4f67956 100644 ---- a/src/saga_core/saga_gui/man/Makefile.in -+++ b/src/saga_core/saga_gui/man/Makefile.in -@@ -1,9 +1,8 @@ --# Makefile.in generated by automake 1.11.1 from Makefile.am. -+# Makefile.in generated by automake 1.14 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, --# Inc. -+# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+ - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -15,6 +14,51 @@ - - @SET_MAKE@ - VPATH = @srcdir@ -+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -+am__make_running_with_option = \ -+ case $${target_option-} in \ -+ ?) ;; \ -+ *) echo "am__make_running_with_option: internal error: invalid" \ -+ "target option '$${target_option-}' specified" >&2; \ -+ exit 1;; \ -+ esac; \ -+ has_opt=no; \ -+ sane_makeflags=$$MAKEFLAGS; \ -+ if $(am__is_gnu_make); then \ -+ sane_makeflags=$$MFLAGS; \ -+ else \ -+ case $$MAKEFLAGS in \ -+ *\\[\ \ ]*) \ -+ bs=\\; \ -+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -+ esac; \ -+ fi; \ -+ skip_next=no; \ -+ strip_trailopt () \ -+ { \ -+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -+ }; \ -+ for flg in $$sane_makeflags; do \ -+ test $$skip_next = yes && { skip_next=no; continue; }; \ -+ case $$flg in \ -+ *=*|--*) continue;; \ -+ -*I) strip_trailopt 'I'; skip_next=yes;; \ -+ -*I?*) strip_trailopt 'I';; \ -+ -*O) strip_trailopt 'O'; skip_next=yes;; \ -+ -*O?*) strip_trailopt 'O';; \ -+ -*l) strip_trailopt 'l'; skip_next=yes;; \ -+ -*l?*) strip_trailopt 'l';; \ -+ -[dEDm]) skip_next=yes;; \ -+ -[JT]) skip_next=yes;; \ -+ esac; \ -+ case $$flg in \ -+ *$$target_option*) has_opt=yes; break;; \ -+ esac; \ -+ done; \ -+ test $$has_opt = yes -+am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -+am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -34,8 +78,8 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - subdir = src/saga_core/saga_gui/man --DIST_COMMON = $(dist_man_MANS) $(srcdir)/Makefile.am \ -- $(srcdir)/Makefile.in -+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ -+ $(dist_man_MANS) - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ - $(top_srcdir)/m4/ax_python_devel.m4 \ -@@ -50,8 +94,25 @@ mkinstalldirs = $(install_sh) -d - CONFIG_HEADER = $(top_builddir)/config.h - CONFIG_CLEAN_FILES = - CONFIG_CLEAN_VPATH_FILES = -+AM_V_P = $(am__v_P_@AM_V@) -+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -+am__v_P_0 = false -+am__v_P_1 = : -+AM_V_GEN = $(am__v_GEN_@AM_V@) -+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+am__v_GEN_0 = @echo " GEN " $@; -+am__v_GEN_1 = -+AM_V_at = $(am__v_at_@AM_V@) -+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+am__v_at_0 = @ -+am__v_at_1 = - SOURCES = - DIST_SOURCES = -+am__can_run_installinfo = \ -+ case $$AM_UPDATE_INFO_DIR in \ -+ n|no|NO) false;; \ -+ *) (install-info --version) >/dev/null 2>&1;; \ -+ esac - am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; - am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -@@ -73,13 +134,21 @@ am__nobase_list = $(am__nobase_strip_setup); \ - am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -+am__uninstall_files_from_dir = { \ -+ test -z "$$files" \ -+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ -+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ -+ $(am__cd) "$$dir" && rm -f $$files; }; \ -+ } - man1dir = $(mandir)/man1 - am__installdirs = "$(DESTDIR)$(man1dir)" - NROFF = nroff - MANS = $(dist_man_MANS) -+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ -+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ -@@ -100,6 +169,7 @@ CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DISABLELIBHARU = @DISABLELIBHARU@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -127,6 +197,7 @@ LOCAL_INCS = @LOCAL_INCS@ - LOCAL_LIBS = @LOCAL_LIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - NM = @NM@ - NMEDIT = @NMEDIT@ -@@ -139,6 +210,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - POW_LIB = @POW_LIB@ -@@ -164,6 +236,7 @@ abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -@@ -197,7 +270,6 @@ libdir = @libdir@ - libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -@@ -259,11 +331,18 @@ clean-libtool: - -rm -rf .libs _libs - install-man1: $(dist_man_MANS) - @$(NORMAL_INSTALL) -- test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)" -- @list=''; test -n "$(man1dir)" || exit 0; \ -- { for i in $$list; do echo "$$i"; done; \ -- l2='$(dist_man_MANS)'; for i in $$l2; do echo "$$i"; done | \ -- sed -n '/\.1[a-z]*$$/p'; \ -+ @list1=''; \ -+ list2='$(dist_man_MANS)'; \ -+ test -n "$(man1dir)" \ -+ && test -n "`echo $$list1$$list2`" \ -+ || exit 0; \ -+ echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \ -+ $(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \ -+ { for i in $$list1; do echo "$$i"; done; \ -+ if test -n "$$list2"; then \ -+ for i in $$list2; do echo "$$i"; done \ -+ | sed -n '/\.1[a-z]*$$/p'; \ -+ fi; \ - } | while read p; do \ - if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; echo "$$p"; \ -@@ -292,30 +371,15 @@ uninstall-man1: - sed -n '/\.1[a-z]*$$/p'; \ - } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ - -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ -- test -z "$$files" || { \ -- echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \ -- cd "$(DESTDIR)$(man1dir)" && rm -f $$files; } --tags: TAGS --TAGS: -+ dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir) -+tags TAGS: -+ -+ctags CTAGS: - --ctags: CTAGS --CTAGS: -+cscope cscopelist: - - - distdir: $(DISTFILES) -- @list='$(MANS)'; if test -n "$$list"; then \ -- list=`for p in $$list; do \ -- if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ -- if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ -- if test -n "$$list" && \ -- grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ -- echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ -- grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ -- echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ -- echo " typically \`make maintainer-clean' will remove them" >&2; \ -- exit 1; \ -- else :; fi; \ -- else :; fi - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ -@@ -362,10 +426,15 @@ install-am: all-am - - installcheck: installcheck-am - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+ if test -z '$(STRIP)'; then \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ install; \ -+ else \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -+ fi - mostlyclean-generic: - - clean-generic: -@@ -448,16 +517,17 @@ uninstall-man: uninstall-man1 - .MAKE: install-am install-strip - - .PHONY: all all-am check check-am clean clean-generic clean-libtool \ -- distclean distclean-generic distclean-libtool distdir dvi \ -- dvi-am html html-am info info-am install install-am \ -- install-data install-data-am install-dvi install-dvi-am \ -- install-exec install-exec-am install-html install-html-am \ -- install-info install-info-am install-man install-man1 \ -- install-pdf install-pdf-am install-ps install-ps-am \ -- install-strip installcheck installcheck-am installdirs \ -- maintainer-clean maintainer-clean-generic mostlyclean \ -- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -- uninstall uninstall-am uninstall-man uninstall-man1 -+ cscopelist-am ctags-am distclean distclean-generic \ -+ distclean-libtool distdir dvi dvi-am html html-am info info-am \ -+ install install-am install-data install-data-am install-dvi \ -+ install-dvi-am install-exec install-exec-am install-html \ -+ install-html-am install-info install-info-am install-man \ -+ install-man1 install-pdf install-pdf-am install-ps \ -+ install-ps-am install-strip installcheck installcheck-am \ -+ installdirs maintainer-clean maintainer-clean-generic \ -+ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ -+ ps ps-am tags-am uninstall uninstall-am uninstall-man \ -+ uninstall-man1 - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff --git a/src/saga_core/saga_odbc/Makefile.in b/src/saga_core/saga_odbc/Makefile.in -index 148141f..0cc3446 100644 ---- a/src/saga_core/saga_odbc/Makefile.in -+++ b/src/saga_core/saga_odbc/Makefile.in -@@ -1,9 +1,8 @@ --# Makefile.in generated by automake 1.11.1 from Makefile.am. -+# Makefile.in generated by automake 1.14 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, --# Inc. -+# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+ - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -16,6 +15,51 @@ - @SET_MAKE@ - - VPATH = @srcdir@ -+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -+am__make_running_with_option = \ -+ case $${target_option-} in \ -+ ?) ;; \ -+ *) echo "am__make_running_with_option: internal error: invalid" \ -+ "target option '$${target_option-}' specified" >&2; \ -+ exit 1;; \ -+ esac; \ -+ has_opt=no; \ -+ sane_makeflags=$$MAKEFLAGS; \ -+ if $(am__is_gnu_make); then \ -+ sane_makeflags=$$MFLAGS; \ -+ else \ -+ case $$MAKEFLAGS in \ -+ *\\[\ \ ]*) \ -+ bs=\\; \ -+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -+ esac; \ -+ fi; \ -+ skip_next=no; \ -+ strip_trailopt () \ -+ { \ -+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -+ }; \ -+ for flg in $$sane_makeflags; do \ -+ test $$skip_next = yes && { skip_next=no; continue; }; \ -+ case $$flg in \ -+ *=*|--*) continue;; \ -+ -*I) strip_trailopt 'I'; skip_next=yes;; \ -+ -*I?*) strip_trailopt 'I';; \ -+ -*O) strip_trailopt 'O'; skip_next=yes;; \ -+ -*O?*) strip_trailopt 'O';; \ -+ -*l) strip_trailopt 'l'; skip_next=yes;; \ -+ -*l?*) strip_trailopt 'l';; \ -+ -[dEDm]) skip_next=yes;; \ -+ -[JT]) skip_next=yes;; \ -+ esac; \ -+ case $$flg in \ -+ *$$target_option*) has_opt=yes; break;; \ -+ esac; \ -+ done; \ -+ test $$has_opt = yes -+am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -+am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -35,7 +79,8 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - subdir = src/saga_core/saga_odbc --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ -+ $(top_srcdir)/depcomp - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ - $(top_srcdir)/m4/ax_python_devel.m4 \ -@@ -71,44 +116,108 @@ am__nobase_list = $(am__nobase_strip_setup); \ - am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -+am__uninstall_files_from_dir = { \ -+ test -z "$$files" \ -+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ -+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ -+ $(am__cd) "$$dir" && rm -f $$files; }; \ -+ } - am__installdirs = "$(DESTDIR)$(libdir)" - LTLIBRARIES = $(lib_LTLIBRARIES) - libsaga_odbc_la_DEPENDENCIES = \ - $(top_srcdir)/src/saga_core/saga_api/libsaga_api.la - am_libsaga_odbc_la_OBJECTS = saga_odbc.lo - libsaga_odbc_la_OBJECTS = $(am_libsaga_odbc_la_OBJECTS) --libsaga_odbc_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ -- $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ -- $(CXXFLAGS) $(libsaga_odbc_la_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_lt = $(am__v_lt_@AM_V@) -+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -+am__v_lt_0 = --silent -+am__v_lt_1 = -+libsaga_odbc_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \ -+ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ -+ $(AM_CXXFLAGS) $(CXXFLAGS) $(libsaga_odbc_la_LDFLAGS) \ -+ $(LDFLAGS) -o $@ -+AM_V_P = $(am__v_P_@AM_V@) -+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -+am__v_P_0 = false -+am__v_P_1 = : -+AM_V_GEN = $(am__v_GEN_@AM_V@) -+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+am__v_GEN_0 = @echo " GEN " $@; -+am__v_GEN_1 = -+AM_V_at = $(am__v_at_@AM_V@) -+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+am__v_at_0 = @ -+am__v_at_1 = - DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - am__mv = mv -f - CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) --LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CXXFLAGS) $(CXXFLAGS) -+AM_V_CXX = $(am__v_CXX_@AM_V@) -+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) -+am__v_CXX_0 = @echo " CXX " $@; -+am__v_CXX_1 = - CXXLD = $(CXX) --CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ -+ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) -+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) -+am__v_CXXLD_0 = @echo " CXXLD " $@; -+am__v_CXXLD_1 = - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CFLAGS) $(CFLAGS) -+AM_V_CC = $(am__v_CC_@AM_V@) -+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -+am__v_CC_0 = @echo " CC " $@; -+am__v_CC_1 = - CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CCLD = $(am__v_CCLD_@AM_V@) -+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -+am__v_CCLD_0 = @echo " CCLD " $@; -+am__v_CCLD_1 = - SOURCES = $(libsaga_odbc_la_SOURCES) - DIST_SOURCES = $(libsaga_odbc_la_SOURCES) -+am__can_run_installinfo = \ -+ case $$AM_UPDATE_INFO_DIR in \ -+ n|no|NO) false;; \ -+ *) (install-info --version) >/dev/null 2>&1;; \ -+ esac -+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -+# Read a list of newline-separated strings from the standard input, -+# and print each of them once, without duplicates. Input order is -+# *not* preserved. -+am__uniquify_input = $(AWK) '\ -+ BEGIN { nonempty = 0; } \ -+ { items[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in items) print i; }; } \ -+' -+# Make sure the list of sources is unique. This is necessary because, -+# e.g., the same source file might be shared among _SOURCES variables -+# for different programs/libraries. -+am__define_uniq_tagged_files = \ -+ list='$(am__tagged_files)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | $(am__uniquify_input)` - ETAGS = etags - CTAGS = ctags - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ -+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ -@@ -129,6 +238,7 @@ CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DISABLELIBHARU = @DISABLELIBHARU@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -156,6 +266,7 @@ LOCAL_INCS = @LOCAL_INCS@ - LOCAL_LIBS = @LOCAL_LIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - NM = @NM@ - NMEDIT = @NMEDIT@ -@@ -168,6 +279,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - POW_LIB = @POW_LIB@ -@@ -193,6 +305,7 @@ abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -@@ -226,7 +339,6 @@ libdir = @libdir@ - libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -@@ -294,9 +406,9 @@ $(top_srcdir)/configure: $(am__configure_deps) - $(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - $(am__aclocal_m4_deps): -+ - install-libLTLIBRARIES: $(lib_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" - @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ - list2=; for p in $$list; do \ - if test -f $$p; then \ -@@ -304,6 +416,8 @@ install-libLTLIBRARIES: $(lib_LTLIBRARIES) - else :; fi; \ - done; \ - test -z "$$list2" || { \ -+ echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \ -+ $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \ - } -@@ -319,14 +433,17 @@ uninstall-libLTLIBRARIES: - - clean-libLTLIBRARIES: - -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) -- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ -- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -- echo "rm -f \"$${dir}/so_locations\""; \ -- rm -f "$${dir}/so_locations"; \ -- done --libsaga_odbc.la: $(libsaga_odbc_la_OBJECTS) $(libsaga_odbc_la_DEPENDENCIES) -- $(libsaga_odbc_la_LINK) -rpath $(libdir) $(libsaga_odbc_la_OBJECTS) $(libsaga_odbc_la_LIBADD) $(LIBS) -+ @list='$(lib_LTLIBRARIES)'; \ -+ locs=`for p in $$list; do echo $$p; done | \ -+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ -+ sort -u`; \ -+ test -z "$$locs" || { \ -+ echo rm -f $${locs}; \ -+ rm -f $${locs}; \ -+ } -+ -+libsaga_odbc.la: $(libsaga_odbc_la_OBJECTS) $(libsaga_odbc_la_DEPENDENCIES) $(EXTRA_libsaga_odbc_la_DEPENDENCIES) -+ $(AM_V_CXXLD)$(libsaga_odbc_la_LINK) -rpath $(libdir) $(libsaga_odbc_la_OBJECTS) $(libsaga_odbc_la_LIBADD) $(LIBS) - - mostlyclean-compile: - -rm -f *.$(OBJEXT) -@@ -337,25 +454,25 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/saga_odbc.Plo@am__quote@ - - .cpp.o: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< - - .cpp.obj: --@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - - .cpp.lo: --@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< -+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< - - mostlyclean-libtool: - -rm -f *.lo -@@ -363,26 +480,15 @@ mostlyclean-libtool: - clean-libtool: - -rm -rf .libs _libs - --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -+ID: $(am__tagged_files) -+ $(am__define_uniq_tagged_files); mkid -fID $$unique -+tags: tags-am -+TAGS: tags -+ -+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ -@@ -394,15 +500,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $$unique; \ - fi; \ - fi --ctags: CTAGS --CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ctags: ctags-am -+ -+CTAGS: ctags -+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) -+ $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique -@@ -411,6 +513,21 @@ GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -+cscopelist: cscopelist-am -+ -+cscopelist-am: $(am__tagged_files) -+ list='$(am__tagged_files)'; \ -+ case "$(srcdir)" in \ -+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ -+ *) sdir=$(subdir)/$(srcdir) ;; \ -+ esac; \ -+ for i in $$list; do \ -+ if test -f "$$i"; then \ -+ echo "$(subdir)/$$i"; \ -+ else \ -+ echo "$$sdir/$$i"; \ -+ fi; \ -+ done >> $(top_builddir)/cscope.files - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -@@ -462,10 +579,15 @@ install-am: all-am - - installcheck: installcheck-am - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+ if test -z '$(STRIP)'; then \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ install; \ -+ else \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -+ fi - mostlyclean-generic: - - clean-generic: -@@ -550,19 +672,19 @@ uninstall-am: uninstall-libLTLIBRARIES - - .MAKE: install-am install-strip - --.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ -- clean-libLTLIBRARIES clean-libtool ctags distclean \ -- distclean-compile distclean-generic distclean-libtool \ -- distclean-tags distdir dvi dvi-am html html-am info info-am \ -- install install-am install-data install-data-am install-dvi \ -- install-dvi-am install-exec install-exec-am install-html \ -- install-html-am install-info install-info-am \ -- install-libLTLIBRARIES install-man install-pdf install-pdf-am \ -- install-ps install-ps-am install-strip installcheck \ -- installcheck-am installdirs maintainer-clean \ -+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ -+ clean-libLTLIBRARIES clean-libtool cscopelist-am ctags \ -+ ctags-am distclean distclean-compile distclean-generic \ -+ distclean-libtool distclean-tags distdir dvi dvi-am html \ -+ html-am info info-am install install-am install-data \ -+ install-data-am install-dvi install-dvi-am install-exec \ -+ install-exec-am install-html install-html-am install-info \ -+ install-info-am install-libLTLIBRARIES install-man install-pdf \ -+ install-pdf-am install-ps install-ps-am install-strip \ -+ installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -- tags uninstall uninstall-am uninstall-libLTLIBRARIES -+ tags tags-am uninstall uninstall-am uninstall-libLTLIBRARIES - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru saga-2.1.0+dfsg/debian/patches/0003-Use-qhull-instead-of-triangle.patch saga-2.1.4+dfsg/debian/patches/0003-Use-qhull-instead-of-triangle.patch --- saga-2.1.0+dfsg/debian/patches/0003-Use-qhull-instead-of-triangle.patch 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/debian/patches/0003-Use-qhull-instead-of-triangle.patch 2014-11-23 21:00:06.000000000 +0000 @@ -0,0 +1,43 @@ +From: Johan Van de Wauw +Date: Tue, 15 Jul 2014 04:30:10 -0400 +Subject: Use qhull instead of triangle + +--- + src/modules/grid/grid_gridding/Makefile.am | 3 +-- + src/modules/grid/grid_gridding/nn/delaunay.c | 2 +- + 2 files changed, 2 insertions(+), 3 deletions(-) + +diff --git a/src/modules/grid/grid_gridding/Makefile.am b/src/modules/grid/grid_gridding/Makefile.am +index 75c79c9..bc55004 100644 +--- a/src/modules/grid/grid_gridding/Makefile.am ++++ b/src/modules/grid/grid_gridding/Makefile.am +@@ -13,7 +13,7 @@ endif + DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD + CXX_INCS = -I$(top_srcdir)/src/saga_core + AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEP_DEFS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS) +-AM_LDFLAGS = -fPIC -shared -avoid-version ++AM_LDFLAGS = -fPIC -shared -avoid-version -lqhull + pkglib_LTLIBRARIES = libgrid_gridding.la + libgrid_gridding_la_SOURCES =\ + Interpolation.cpp\ +@@ -34,7 +34,6 @@ Shepard.cpp\ + ./nn/nnai.c\ + ./nn/nncommon.c\ + ./nn/nnpi.c\ +-./nn/triangle.c\ + Interpolation.h\ + Interpolation_AngularDistance.h\ + Interpolation_InverseDistance.h\ +diff --git a/src/modules/grid/grid_gridding/nn/delaunay.c b/src/modules/grid/grid_gridding/nn/delaunay.c +index dc98875..e2952fa 100644 +--- a/src/modules/grid/grid_gridding/nn/delaunay.c ++++ b/src/modules/grid/grid_gridding/nn/delaunay.c +@@ -24,7 +24,7 @@ + * + *****************************************************************************/ + +-//#define USE_QHULL ++#define USE_QHULL + + #include + #include diff -Nru saga-2.1.0+dfsg/debian/patches/0004-Use-debian-version-of-libsvm.patch saga-2.1.4+dfsg/debian/patches/0004-Use-debian-version-of-libsvm.patch --- saga-2.1.0+dfsg/debian/patches/0004-Use-debian-version-of-libsvm.patch 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/debian/patches/0004-Use-debian-version-of-libsvm.patch 2014-11-23 21:00:06.000000000 +0000 @@ -0,0 +1,31 @@ +From: Johan Van de Wauw +Date: Mon, 3 Nov 2014 20:38:24 +0100 +Subject: Use debian version of libsvm + +--- + src/modules/imagery/imagery_svm/Makefile.am | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +diff --git a/src/modules/imagery/imagery_svm/Makefile.am b/src/modules/imagery/imagery_svm/Makefile.am +index a92c3bd..8a87973 100644 +--- a/src/modules/imagery/imagery_svm/Makefile.am ++++ b/src/modules/imagery/imagery_svm/Makefile.am +@@ -5,16 +5,14 @@ if SAGA_UNICODE + UC_DEFS = -D_SAGA_UNICODE + endif + DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD +-CXX_INCS = -I$(top_srcdir)/src/saga_core ++CXX_INCS = -I$(top_srcdir)/src/saga_core -I/usr/include/libsvm + AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS) +-AM_LDFLAGS = -fPIC -shared -avoid-version ++AM_LDFLAGS = -fPIC -shared -avoid-version -lsvm + pkglib_LTLIBRARIES = libimagery_svm.la + libimagery_svm_la_SOURCES =\ + MLB_Interface.cpp\ +-svm.cpp\ + svm_grids.cpp\ + MLB_Interface.h\ +-svm.h\ + svm_grids.h + + libimagery_svm_la_LIBADD = $(top_srcdir)/src/saga_core/saga_api/libsaga_api.la diff -Nru saga-2.1.0+dfsg/debian/patches/0004-Use-qhull-instead-of-triangle.patch saga-2.1.4+dfsg/debian/patches/0004-Use-qhull-instead-of-triangle.patch --- saga-2.1.0+dfsg/debian/patches/0004-Use-qhull-instead-of-triangle.patch 2013-12-05 17:41:26.000000000 +0000 +++ saga-2.1.4+dfsg/debian/patches/0004-Use-qhull-instead-of-triangle.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,96 +0,0 @@ -From: Johan Van de Wauw -Date: Fri, 15 Nov 2013 00:06:46 -0500 -Subject: Use qhull instead of triangle - ---- - src/modules/grid/grid_gridding/Makefile.am | 3 +-- - src/modules/grid/grid_gridding/Makefile.in | 13 ++----------- - src/modules/grid/grid_gridding/nn/delaunay.c | 2 +- - 3 files changed, 4 insertions(+), 14 deletions(-) - -diff --git a/src/modules/grid/grid_gridding/Makefile.am b/src/modules/grid/grid_gridding/Makefile.am -index 75c79c9..bc55004 100644 ---- a/src/modules/grid/grid_gridding/Makefile.am -+++ b/src/modules/grid/grid_gridding/Makefile.am -@@ -13,7 +13,7 @@ endif - DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD - CXX_INCS = -I$(top_srcdir)/src/saga_core - AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEP_DEFS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS) --AM_LDFLAGS = -fPIC -shared -avoid-version -+AM_LDFLAGS = -fPIC -shared -avoid-version -lqhull - pkglib_LTLIBRARIES = libgrid_gridding.la - libgrid_gridding_la_SOURCES =\ - Interpolation.cpp\ -@@ -34,7 +34,6 @@ Shepard.cpp\ - ./nn/nnai.c\ - ./nn/nncommon.c\ - ./nn/nnpi.c\ --./nn/triangle.c\ - Interpolation.h\ - Interpolation_AngularDistance.h\ - Interpolation_InverseDistance.h\ -diff --git a/src/modules/grid/grid_gridding/Makefile.in b/src/modules/grid/grid_gridding/Makefile.in -index 4ff6a48..1fdaa47 100644 ---- a/src/modules/grid/grid_gridding/Makefile.in -+++ b/src/modules/grid/grid_gridding/Makefile.in -@@ -133,7 +133,7 @@ am_libgrid_gridding_la_OBJECTS = Interpolation.lo \ - Interpolation_NearestNeighbour.lo Interpolation_Shepard.lo \ - Interpolation_Triangulation.lo kernel_density.lo \ - MLB_Interface.lo Shapes2Grid.lo Shepard.lo delaunay.lo hash.lo \ -- istack.lo lpi.lo nnai.lo nncommon.lo nnpi.lo triangle.lo -+ istack.lo lpi.lo nnai.lo nncommon.lo nnpi.lo - libgrid_gridding_la_OBJECTS = $(am_libgrid_gridding_la_OBJECTS) - AM_V_lt = $(am__v_lt_@AM_V@) - am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -@@ -371,7 +371,7 @@ top_srcdir = @top_srcdir@ - DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD - CXX_INCS = -I$(top_srcdir)/src/saga_core - AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEP_DEFS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS) --AM_LDFLAGS = -fPIC -shared -avoid-version -+AM_LDFLAGS = -fPIC -shared -avoid-version -lqhull - pkglib_LTLIBRARIES = libgrid_gridding.la - libgrid_gridding_la_SOURCES = \ - Interpolation.cpp\ -@@ -392,7 +392,6 @@ Shepard.cpp\ - ./nn/nnai.c\ - ./nn/nncommon.c\ - ./nn/nnpi.c\ --./nn/triangle.c\ - Interpolation.h\ - Interpolation_AngularDistance.h\ - Interpolation_InverseDistance.h\ -@@ -510,7 +509,6 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nnai.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nncommon.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nnpi.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/triangle.Plo@am__quote@ - - .c.o: - @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@@ -582,13 +580,6 @@ nnpi.lo: ./nn/nnpi.c - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o nnpi.lo `test -f './nn/nnpi.c' || echo '$(srcdir)/'`./nn/nnpi.c - --triangle.lo: ./nn/triangle.c --@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT triangle.lo -MD -MP -MF $(DEPDIR)/triangle.Tpo -c -o triangle.lo `test -f './nn/triangle.c' || echo '$(srcdir)/'`./nn/triangle.c --@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/triangle.Tpo $(DEPDIR)/triangle.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='./nn/triangle.c' object='triangle.lo' libtool=yes @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o triangle.lo `test -f './nn/triangle.c' || echo '$(srcdir)/'`./nn/triangle.c -- - .cpp.o: - @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< - @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -diff --git a/src/modules/grid/grid_gridding/nn/delaunay.c b/src/modules/grid/grid_gridding/nn/delaunay.c -index dc98875..e2952fa 100644 ---- a/src/modules/grid/grid_gridding/nn/delaunay.c -+++ b/src/modules/grid/grid_gridding/nn/delaunay.c -@@ -24,7 +24,7 @@ - * - *****************************************************************************/ - --//#define USE_QHULL -+#define USE_QHULL - - #include - #include diff -Nru saga-2.1.0+dfsg/debian/patches/0005-Fix-gcc-security-warnings.patch saga-2.1.4+dfsg/debian/patches/0005-Fix-gcc-security-warnings.patch --- saga-2.1.0+dfsg/debian/patches/0005-Fix-gcc-security-warnings.patch 2013-12-05 17:41:26.000000000 +0000 +++ saga-2.1.4+dfsg/debian/patches/0005-Fix-gcc-security-warnings.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,38 +0,0 @@ -From: Johan Van de Wauw -Date: Fri, 15 Nov 2013 01:57:38 -0500 -Subject: Fix gcc security warnings - ---- - src/modules_io/grid/io_grid/esri_arcinfo.cpp | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/modules_io/grid/io_grid/esri_arcinfo.cpp b/src/modules_io/grid/io_grid/esri_arcinfo.cpp -index 477dd41..970eb71 100644 ---- a/src/modules_io/grid/io_grid/esri_arcinfo.cpp -+++ b/src/modules_io/grid/io_grid/esri_arcinfo.cpp -@@ -594,13 +594,13 @@ bool CESRI_ArcInfo_Export::On_Execute(void) - { - if( x > 0 ) - { -- fprintf(Stream.Get_Stream(), " "); -+ fputs(" ",Stream.Get_Stream()); - } - -- fprintf(Stream.Get_Stream(), Write_Value(pGrid->asDouble(x, y), Precision, bComma).b_str()); -+ fputs(Write_Value(pGrid->asDouble(x, y), Precision, bComma).b_str(),Stream.Get_Stream()); - } - -- fprintf(Stream.Get_Stream(), "\n"); -+ fputs("\n", Stream.Get_Stream()); - } - - pGrid->Get_Projection().Save(SG_File_Make_Path(NULL, fName, SG_T("prj"))); -@@ -671,7 +671,7 @@ bool CESRI_ArcInfo_Export::Write_Header(CSG_File &Stream, CSG_Grid *pGrid, bool - s += CSG_String::Format(SG_T("%s %s\n") , HDR_BYTEORDER , Parameters("BYTEORD")->asInt() == 1 ? HDR_BYTEORDER_LO : HDR_BYTEORDER_HI); - } - -- fprintf(Stream.Get_Stream(), s.b_str()); -+ fputs(s.b_str(),Stream.Get_Stream()); - - return( true ); - } diff -Nru saga-2.1.0+dfsg/debian/patches/series saga-2.1.4+dfsg/debian/patches/series --- saga-2.1.0+dfsg/debian/patches/series 2013-12-05 17:41:26.000000000 +0000 +++ saga-2.1.4+dfsg/debian/patches/series 2014-11-23 21:00:06.000000000 +0000 @@ -1,5 +1,4 @@ 0001-Remove-references-to-libfire.patch 0002-Use-debian-version-of-grib2.patch -0003-Autoreconf-fi-result.patch -0004-Use-qhull-instead-of-triangle.patch -0005-Fix-gcc-security-warnings.patch +0003-Use-qhull-instead-of-triangle.patch +0004-Use-debian-version-of-libsvm.patch diff -Nru saga-2.1.0+dfsg/debian/readme.source saga-2.1.4+dfsg/debian/readme.source --- saga-2.1.0+dfsg/debian/readme.source 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/debian/readme.source 2014-11-13 23:10:25.000000000 +0000 @@ -0,0 +1,12 @@ +The original source was downloaded from http://www.saga-gis.org +The main upstream author is: Olaf Conrad + +On two places files were removed to adhere to the DFSG: +- the files triangle.c and triangle.h were removed from libgrid_gridding + because they are incompatible with the DFSG. The functionality + could be retained by linking to libqhull + src/modules/grid/grid_gridding/nn/triangle.[c/h] +- the module fire simulation: src/modules_simulation/fire/* + it relies on a non DFSG library: libfire (www.fire.org) + +These steps can be reproduced by running debian/rules get-orig-source diff -Nru saga-2.1.0+dfsg/debian/rules saga-2.1.4+dfsg/debian/rules --- saga-2.1.0+dfsg/debian/rules 2013-12-05 17:41:26.000000000 +0000 +++ saga-2.1.4+dfsg/debian/rules 2014-11-23 21:00:06.000000000 +0000 @@ -1,11 +1,14 @@ #!/usr/bin/make -f + +CFLAGS+=$(CPPFLAGS) + %: dh $@ --with python2 --with autoreconf override_dh_auto_configure: - dh_auto_configure -- --enable-unicode --prefix=/usr --enable-python $(shell dpkg-buildflags --export=configure) + dh_auto_configure -- --prefix=/usr --enable-openmp --enable-python $(shell dpkg-buildflags --export=configure) -VERSION := $(shell grep '^AC_INIT' configure.in | \ +VERSION := $(shell grep '^AC_INIT' configure.ac | \ sed 's/AC_INIT(saga, \([0-9|\.]*\)\,.*)/\1/g') UPSTREAM_URL ?=$(shell uscan --dehs | sed -n 's/.*\(.*\)<\/upstream-url>.*/\1/p') UPSTREAM_VERSION ?=$(shell uscan --dehs | sed -n 's/.*\(.*\)<\/upstream-version>.*/\1/p') @@ -13,20 +16,24 @@ debian/% :: debian/%.in sed -e 's/@VERSION@/$(VERSION)/' $< >$@ +override_dh_auto_build: man + dh_auto_build + +man: + pod2man --section=1 --release=$(VERSION) --center " " debian/saga_cmd.pod >saga_cmd.1 + pod2man --section=1 --release=$(VERSION) --center " " debian/saga_gui.pod >saga_gui.1 + override_dh_python2: dh_python2 --no-guessing-versions override_dh_clean: dh_clean rm -f src/saga_core/saga_api/saga_api.py + rm -f saga_cmd.1 + rm -f saga_gui.1 + +override_dh_makeshlibs: + dh_makeshlibs -Xpython-saga get-orig-source: - wget $(UPSTREAM_URL) - gunzip *.tar.gz - tar --delete -f saga_$(UPSTREAM_VERSION).tar saga-$(UPSTREAM_VERSION)/src/modules/grid/grid_gridding/nn/triangle.c - tar --delete -f saga_$(UPSTREAM_VERSION).tar saga-$(UPSTREAM_VERSION)/src/modules/grid/grid_gridding/nn/triangle.h - tar --delete -f saga_$(UPSTREAM_VERSION).tar saga-$(UPSTREAM_VERSION)/src/modules_simulation/fire - tar --delete -f saga_$(UPSTREAM_VERSION).tar saga-$(UPSTREAM_VERSION)/src/modules_io/grid/io_grid_grib2/g2clib-1.0.4 - tar --delete -f saga_$(UPSTREAM_VERSION).tar saga-$(UPSTREAM_VERSION)/src/saga_core/saga_gui/res/xpm/.svn - gzip -9n saga_$(UPSTREAM_VERSION).tar - mv saga_$(UPSTREAM_VERSION).tar.gz ../saga_$(UPSTREAM_VERSION)+dfsg.orig.tar.gz + uscan --verbose --force-download --repack --compression xz diff -Nru saga-2.1.0+dfsg/debian/saga_cmd.pod saga-2.1.4+dfsg/debian/saga_cmd.pod --- saga-2.1.0+dfsg/debian/saga_cmd.pod 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/debian/saga_cmd.pod 2014-11-23 21:00:06.000000000 +0000 @@ -0,0 +1,113 @@ +=head1 NAME + +B - command-line interface to the System for Automated Geoscientific Analyses + +=head1 SYNOPSIS + +B [B<-d, --docs>] + +B [B<-b, --batch>] + +B [B<-h, --help>] + +B [B<-f, --flags>][=qrsilpxo][-s, --story][=#][-c, --cores][=#] I [I] + +B [B<-f, --flags>][=qrsilpxo][-s, --story][=#][-c, --cores][=#] I\n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " F\n" + " \n" + " \n" + " \n" + " i\n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " " + " X:\n" + " Y:\n" + " \n" + " " + " \n" + " \n" + " \n" + " -\n" + " \n" + " \n" + " \n" + " -\n" + " \n" + " \n" + " \n" + " \n" + " " + ); +} + +//--------------------------------------------------------- +const char * CSVG_Interactive_Map::_Get_Code_2(void) +{ + return( + "\n" + " \n" + " \n" + " Statusbar: Your Status Text\n" + " \n" + "\n" + "\n" + " " + ); +} + +//--------------------------------------------------------- +const char * CSVG_Interactive_Map::_Get_Code_4(void) +{ + return( + " \n" + " \n " + " \n" + " \n" + ); +} + +//--------------------------------------------------------- +const char * CSVG_Interactive_Map::_Get_Code_Closing_1(void) +{ + return( + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +const char * CSVG_Interactive_Map::_Get_Code_CheckBox(void) +{ + return( + "function checkBoxScript(evt,myLayer) { //checkBox for toggling layers an contextMenue\n" + " var myLayerObj = document.getElementById(myLayer);\n" + " var myCheckCrossObj = document.getElementById(\"checkCross\"+myLayer);\n" + " var myCheckCrossVisibility = myCheckCrossObj.getAttributeNS(null,\"visibility\"));\n" + " if (evt.type == \"click\" && evt.detail == 1) {\n" + " if (myCheckCrossVisibility == \"visible\")) {\n" + " myLayerObj.setAttributeNS(null,\"visibility\"),\"hidden\"));\n" + " myCheckCrossObj.setAttributeNS(null,\"visibility\"),\"hidden\"));\n" + " //you can do if/else or switch statements to set different actions on activating a checkbox here\n" + " //myLayer holds the currentLayer name\n" + " }\n" + " else {\n" + " myLayerObj.setAttributeNS(null,\"visibility\"),\"visible\"));\n" + " myCheckCrossObj.setAttributeNS(null,\"visibility\"),\"visible\"));\n" + " }\n" + " }\n" + "}\n" + "\n" + ); +} + +//--------------------------------------------------------- +const char * CSVG_Interactive_Map::_Get_Code_MapApp(void) +{ + return( + "//holds data on window size\n" + "function mapApp() {\n" + " if (!document.documentElement.getScreenCTM) {\n" + " this.resetFactors();\n" + " //add resize event to document element\n" + " document.documentElement.addEventListener(\"SVGResize\"),this,false);\n" + " }\n" + "}\n" + "\n" + "mapApp.prototype.handleEvent = function(evt) {\n" + " if (evt.type == \"SVGResize\")) {\n" + " this.resetFactors();\n" + " }\n" + "}\n" + "\n" + "mapApp.prototype.resetFactors = function() {\n" + " if (!document.documentElement.getScreenCTM) {\n" + " //case for viewers that don't support .getScreenCTM, such as ASV3\n" + " //calculate ratio and offset values of app window\n" + " var viewBoxArray = document.documentElement.getAttributeNS(null,\"viewBox\")).split(\" \"));\n" + " var myRatio = viewBoxArray[2]/viewBoxArray[3];\n" + " if ((window.innerWidth/window.innerHeight) > myRatio) { //case window is more wide than myRatio\n" + " this.scaleFactor = viewBoxArray[3] / window.innerHeight;\n" + " }\n" + " else { //case window is more tall than myRatio\n" + " this.scaleFactor = viewBoxArray[2] / window.innerWidth;\n" + " }\n" + " this.offsetX = (window.innerWidth - viewBoxArray[2] * 1 / this.scaleFactor) / 2;\n" + " this.offsetY = (window.innerHeight - viewBoxArray[3] * 1 / this.scaleFactor) / 2;\n" + " }\n" + "}\n" + "\n" + "mapApp.prototype.calcCoord = function(evt,ctmNode) {\n" + " var svgPoint = document.documentElement.createSVGPoint();\n" + " svgPoint.x = evt.clientX;\n" + " svgPoint.y = evt.clientY;\n" + " if (!document.documentElement.getScreenCTM) {\n" + " //case ASV3 a. Corel\n" + " svgPoint.x = (svgPoint.x - this.offsetX) * this.scaleFactor;\n" + " svgPoint.y = (svgPoint.y - this.offsetY) * this.scaleFactor;\n" + " //undo the effect of transformations\n" + " if (ctmNode) {\n" + " var ctm = getTransformToRootElement(ctmNode).inverse();\n" + " }\n" + " else {\n" + " var ctm = getTransformToRootElement(evt.target).inverse();\n" + " }\n" + " svgPoint = svgPoint.matrixTransform(ctm);\n" + "\n" + " }\n" + " else {\n" + " if (ctmNode) {\n" + " var matrix = ctmNode.getScreenCTM();\n" + " }\n" + " else {\n" + " var matrix = evt.target.getScreenCTM();\n" + " }\n" + " svgPoint = svgPoint.matrixTransform(matrix.inverse());\n" + " }\n" + " return svgPoint;\n" + "}\n" + "\n" + ); +} + +//--------------------------------------------------------- +const char * CSVG_Interactive_Map::_Get_Code_Timer(void) +{ + return( + "// source/credits: \"Algorithm\": http://www.codingforums.com/showthread.php?s=&threadid=10531\n" + "// The constructor should be called with\n" + "// the parent object (optional, defaults to window).\n" + "\n" + "function Timer(){\n" + " this.obj = (arguments.length)?arguments[0]:window;\n" + " return this;\n" + "}\n" + "\n" + "// The set functions should be called with:\n" + "// - The name of the object method (as a string) (required)\n" + "// - The millisecond delay (required)\n" + "// - Any number of extra arguments, which will all be\n" + "// passed to the method when it is evaluated.\n" + "\n" + "Timer.prototype.setInterval = function(func, msec){\n" + " var i = Timer.getNew();\n" + " var t = Timer.buildCall(this.obj, i, arguments);\n" + " Timer.set[i].timer = window.setInterval(t,msec);\n" + " return i;\n" + "}\n" + "Timer.prototype.setTimeout = function(func, msec){\n" + " var i = Timer.getNew();\n" + " Timer.buildCall(this.obj, i, arguments);\n" + " Timer.set[i].timer = window.setTimeout(\"Timer.callOnce(\"+i+\"));\"),msec);\n" + " return i;\n" + "}\n" + "\n" + "// The clear functions should be called with\n" + "// the return value from the equivalent set function.\n" + "\n" + "Timer.prototype.clearInterval = function(i){\n" + " if(!Timer.set[i]) return;\n" + " window.clearInterval(Timer.set[i].timer);\n" + " Timer.set[i] = null;\n" + "}\n" + "Timer.prototype.clearTimeout = function(i){\n" + " if(!Timer.set[i]) return;\n" + " window.clearTimeout(Timer.set[i].timer);\n" + " Timer.set[i] = null;\n" + "}\n" + "\n" + "// Private data\n" + "\n" + "Timer.set = new Array();\n" + "Timer.buildCall = function(obj, i, args){\n" + " var t = \"\");\n" + " Timer.set[i] = new Array();\n" + " if(obj != window){\n" + " Timer.set[i].obj = obj;\n" + " t = \"Timer.set[\"+i+\"].obj.\");\n" + " }\n" + " t += args[0]+\"(\");\n" + " if(args.length > 2){\n" + " Timer.set[i][0] = args[2];\n" + " t += \"Timer.set[\"+i+\"][0]\");\n" + " for(var j=1; (j+2) \n" + "Version 1.1, 2004-11-18\n" + "neumann@karto.baug.ethz.ch\n" + "http://www.carto.net/\n" + "http://www.carto.net/neumann/\n" + "\n" + "Credits: numerous people on svgdevelopers@yahoogroups.com\n" + "\n" + "This ECMA script library is free software; you can redistribute it and/or\n" + "modify it under the terms of the GNU Lesser General Public\n" + "License as published by the Free Software Foundation; either\n" + "version 2.1 of the License, or (at your option) any later version.\n" + "\n" + "This library is distributed in the hope that it will be useful,\n" + "but WITHOUT ANY WARRANTY; without even the implied warranty of\n" + "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n" + "Lesser General Public License for more details.\n" + "\n" + "You should have received a copy of the GNU Lesser General Public\n" + "License along with this library (http://www.carto.net/papers/svg/resources/lesser_gpl.txt); if not, write to the Free Software\n" + "Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, USA\n" + "\n" + "----\n" + "\n" + "original document site: http://www.carto.net/papers/svg/resources/helper_functions.js\n" + "Please contact the author in case you want to use code or ideas commercially.\n" + "If you use this code, please include this copyright header, the included full\n" + "LGPL 2.1 text and read the terms provided in the LGPL 2.1 license\n" + "(http://www.gnu.org/copyleft/lesser.txt)\n" + "\n" + "-------------------------------\n" + "\n" + "Please report bugs and send improvements to neumann@karto.baug.ethz.ch\n" + "If you use these scripts, please link to the original (http://www.carto.net/papers/svg/navigationTools/)\n" + "somewhere in the source-code-comment or the \"about\" of your project and give credits, thanks!\n" + "\n" + "*/\n" + "\n" + "//global variables necessary to create elements in these namespaces, do not delete them!!!!\n" + "var svgNS = \"http://www.w3.org/2000/svg\");\n" + "var xlinkNS = \"http://www.w3.org/1999/xlink\");\n" + "var cartoNS = \"http://www.carto.net/attrib\");\n" + "var attribNS = \"http://www.carto.net/attrib\");\n" + "var batikNS = \"http://xml.apache.org/batik/ext\");\n" + "\n" + "/* ----------------------- helper functions to calculate stuff ---------------- */\n" + "/* ---------------------------------------------------------------------------- */\n" + "function toPolarDir(xdiff,ydiff) { // Subroutine for calculating polar Coordinates\n" + " direction = (Math.atan2(ydiff,xdiff));\n" + " //result is angle in radian\n" + " return(direction);\n" + "}\n" + "\n" + "function toPolarDist(xdiff,ydiff) { // Subroutine for calculating polar Coordinates\n" + " distance = Math.sqrt(xdiff * xdiff + ydiff * ydiff);\n" + " return(distance);\n" + "}\n" + "\n" + "function toRectX(direction,distance) { // Subroutine for calculating cartesic coordinates\n" + " x = distance * Math.cos(direction);\n" + " y = distance * Math.sin(direction);\n" + " return(x);\n" + "}\n" + "\n" + "function toRectY(direction,distance) { // Subroutine for calculating cartesic coordinates\n" + " x = distance * Math.cos(direction);\n" + " y = distance * Math.sin(direction);\n" + " return(y);\n" + "}\n" + "\n" + "//Converts degrees to radians.\n" + "function DegToRad(deg) {\n" + " return (deg / 180.0 * Math.PI);\n" + "}\n" + "\n" + "//Converts radians to degrees.\n" + "function RadToDeg(rad) {\n" + " return (rad / Math.PI * 180.0);\n" + "}\n" + "\n" + "//converts decimal degrees to degree/minutes/seconds\n" + "function dd2dms(dd) {\n" + " var minutes = (dd - Math.floor(dd)) * 60;\n" + " var seconds = (minutes - Math.floor(minutes)) * 60;\n" + " var minutes = Math.floor(minutes);\n" + " var degrees = Math.floor(dd);\n" + " return {deg:degrees,min:minutes,sec:seconds};\n" + "}\n" + "\n" + "//converts degree/minutes/seconds to decimal degrees\n" + "function dms2dd(deg,min,sec) {\n" + " return deg + (min / 60) + (sec / 3600);\n" + "}\n" + "\n" + "//log functions that do not exist in Math object\n" + "function log(x,b) {\n" + " if(b==null) b=Math.E;\n" + " return Math.log(x)/Math.log(b);\n" + "}\n" + "\n" + "//gets 4 z-values (4 corners), a position, delta x and delty and a cellsize as input and returns interpolated z-value\n" + "function intBilinear(za,zb,zc,zd,xpos,ypos,ax,ay,cellsize) { //bilinear interpolation function\n" + " e = (xpos - ax) / cellsize;\n" + " f = (ypos - ay) / cellsize;\n" + "\n" + " //calculation of weights\n" + " wa = (1 - e) * (1 - f);\n" + " wb = e * (1 - f);\n" + " wc = e * f;\n" + " wd = f * (1 - e);\n" + "\n" + " height_interpol = wa * zc + wb * zd + wc * za + wd * zb;\n" + "\n" + " return (height_interpol); \n" + "}\n" + "\n" + "//test if point is left of or right of, result is 1 (leftof) or 0 (rightof)\n" + "function leftOfTest(pointx,pointy,linex1,liney1,linex2,liney2) {\n" + " result = (liney1 - pointy) * (linex2 - linex1) - (linex1 - pointx) * (liney2 - liney1);\n" + " if (result < 0) {\n" + " leftof = 1; //case left of\n" + " }\n" + " else {\n" + " leftof = 0; //case left of \n" + " }\n" + " return(leftof);\n" + "}\n" + "\n" + "//input is point coordinate, and 2 line coordinates\n" + "function distFromLine(xpoint,ypoint,linex1,liney1,linex2,liney2) {\n" + " dx = linex2 - linex1;\n" + " dy = liney2 - liney1;\n" + " distance = (dy * (xpoint - linex1) - dx * (ypoint - liney1)) / Math.sqrt(Math.pow(dx,2) + Math.pow(dy,2));\n" + " return(distance);\n" + "}\n" + "\n" + "//converts radian value to degrees\n" + "function radian2deg(radian) {\n" + " deg = radian / Math.PI * 180;\n" + " return(deg);\n" + "}\n" + "\n" + "//input is two vectors (a1,a2 is vector a, b1,b2 is vector b), output is angle in radian\n" + "//Formula: Acos from Scalaproduct of the two vectors divided by ( norm (deutsch Betrag) vector 1 by norm vector 2\n" + "//see http://www.mathe-online.at/mathint/vect2/i.html#Winkel\n" + "function angleBetwTwoLines(a1,a2,b1,b2) {\n" + " angle = Math.acos((a1 * b1 + a2 * b2) / (Math.sqrt(Math.pow(a1,2) + Math.pow(a2,2)) * Math.sqrt(Math.pow(b1,2) + Math.pow(b2,2))));\n" + " return(angle);\n" + "}\n" + "\n" + "//input is two vectors (a1,a2 is vector a, b1,b2 is vector b), output is new vector c2 returned as array\n" + "//Formula: Vektor a divided by Norm Vector a (Betrag) plus Vektor b divided by Norm Vector b (Betrag)\n" + "//see http://www.mathe-online.at/mathint/vect1/i.html#Winkelsymmetrale\n" + "function calcBisectorVector(a1,a2,b1,b2) {\n" + " betraga = Math.sqrt(Math.pow(a1,2) + Math.pow(a2,2));\n" + " betragb = Math.sqrt(Math.pow(b1,2) + Math.pow(b2,2));\n" + " c = new Array();\n" + " c[0] = a1 / betraga + b1 / betragb;\n" + " c[1] = a2 / betraga + b2 / betragb;\n" + " return(c);\n" + "}\n" + "\n" + "//input is two vectors (a1,a2 is vector a, b1,b2 is vector b), output is angle in radian\n" + "//Formula: Vektor a divided by Norm Vector a (Betrag) plus Vektor b divided by Norm Vector b (Betrag)\n" + "//see http://www.mathe-online.at/mathint/vect1/i.html#Winkelsymmetrale\n" + "function calcBisectorAngle(a1,a2,b1,b2) {\n" + " betraga = Math.sqrt(Math.pow(a1,2) + Math.pow(a2,2));\n" + " betragb = Math.sqrt(Math.pow(b1,2) + Math.pow(b2,2));\n" + " c1 = a1 / betraga + b1 / betragb;\n" + " c2 = a2 / betraga + b2 / betragb;\n" + " angle = toPolarDir(c1,c2);\n" + " return(angle);\n" + "}\n" + "\n" + "function intersect2lines(line1x1,line1y1,line1x2,line1y2,line2x1,line2y1,line2x2,line2y2) {\n" + " //formula see http://astronomy.swin.edu.au/~pbourke/geometry/lineline2d/\n" + " var result = new Array();\n" + " var denominator = (line2y2 - line2y1)*(line1x2 - line1x1) - (line2x2 - line2x1)*(line1y2 - line1y1);\n" + " if (denominator == 0) {\n" + " alert(\"lines are parallel\"));\n" + " }\n" + " else {\n" + " ua = ((line2x2 - line2x1)*(line1y1 - line2y1) - (line2y2 - line2y1)*(line1x1 - line2x1)) / denominator;\n" + " ub = ((line1x2 - line1x1)*(line1y1 - line2y1) - (line1y2 - line1y1)*(line1x1 - line2x1)) / denominator;\n" + " }\n" + " result[\"x\"] = line1x1 + ua * (line1x2 - line1x1);\n" + " result[\"y\"] = line1y1 + ua * (line1y2 - line1y1);\n" + " return(result);\n" + "}\n" + "\n" + "/* ----------------------- helper function to sort arrays ---------------- */\n" + "/* ----------------------------------------------------------------------- */\n" + "//my own sort function, uses only first part of string (population value)\n" + "function mySort(a,b) {\n" + " var myResulta = a.split(\"+\"));\n" + " var myResultb = b.split(\"+\"));\n" + " if (parseFloat(myResulta[0]) < parseFloat(myResultb[0])) {\n" + " return 1;\n" + " }\n" + " else {\n" + " return -1;\n" + " }\n" + "}\n" + "\n" + "/* ----------------------- helper function format number strings -------------- */\n" + "/* ---------------------------------------------------------------------------- */\n" + "//formatting number strings\n" + "//this function add's \"'\" to a number every third digit\n" + "function formatNumberString(myString) {\n" + " //check if of type string, if number, convert it to string\n" + " if (typeof(myString) == \"number\")) {\n" + " myTempString = myString.toString();\n" + " }\n" + " else {\n" + " myTempString = myString;\n" + " }\n" + " var myNewString=\"\");\n" + " //if it contains a comma, it will be split\n" + " var splitResults = myTempString.split(\".\"));\n" + " var myCounter= splitResults[0].length;\n" + " if (myCounter > 3) {\n" + " while(myCounter > 0) {\n" + " if (myCounter > 3) {\n" + " myNewString = \"),\" + splitResults[0].substr(myCounter - 3,3) + myNewString;\n" + " }\n" + " else {\n" + " myNewString = splitResults[0].substr(0,myCounter) + myNewString;\n" + " }\n" + " myCounter -= 3;\n" + " }\n" + " }\n" + " else {\n" + " myNewString = splitResults[0];\n" + " }\n" + " //concatenate if it contains a comma\n" + " if (splitResults[1]) {\n" + " myNewString = myNewString + \".\" + splitResults[1];\n" + " }\n" + " return myNewString;\n" + "}\n" + "\n" + "//function for status Bar\n" + "function statusChange(statusText) {\n" + " document.getElementById(\"statusText\")).firstChild.nodeValue = \"Statusbar: \" + statusText;\n" + "}\n" + "\n" + "//scale an object\n" + "function scaleObject(evt,factor) {\n" + "//reference to the currently selected object\n" + " var element = evt.currentTarget;\n" + " var myX = element.getAttributeNS(null,\"x\"));\n" + " var myY = element.getAttributeNS(null,\"y\"));\n" + " var newtransform = \"scale(\" + factor + \")) translate(\" + (myX * 1 / factor - myX) + \" \" + (myY * 1 / factor - myY) +\"))\");\n" + " element.setAttributeNS(null,'transform', newtransform);\n" + "}\n" + "\n" + "//this code is copied from Kevin Lindsey\n" + "//http://www.kevlindev.com/tutorials/basics/transformations/toUserSpace/index.htm\n" + "function getTransformToRootElement(node) {\n" + " try {\n" + " //this part is for fully conformant players\n" + " var CTM = node.getTransformToElement(document.documentElement);\n" + " }\n" + " catch (ex) {\n" + " //this part is for ASV3 or other non-conformant players\n" + " // Initialize our CTM the node's Current Transformation Matrix\n" + " var CTM = node.getCTM();\n" + " // Work our way through the ancestor nodes stopping at the SVG Document\n" + " while ( ( node = node.parentNode ) != document ) {\n" + " // Multiply the new CTM to the one with what we have accumulated so far\n" + " CTM = node.getCTM().multiply(CTM);\n" + " }\n" + " }\n" + " return CTM;\n" + "}\n" + "\n" + "//calculate HSV 2 RGB: HSV (h 0 to 360, sat and val are between 0 and 1), RGB between 0 and 255\n" + "function hsv2rgb(hue,sat,val) {\n" + " //alert(\"Hue:\"+hue);\n" + " var rgbArr = new Array();\n" + " if ( sat == 0) {\n" + " rgbArr[\"red\"] = Math.round(val * 255);\n" + " rgbArr[\"green\"] = Math.round(val * 255);\n" + " rgbArr[\"blue\"] = Math.round(val * 255);\n" + " }\n" + " else {\n" + " var h = hue / 60;\n" + " var i = Math.floor(h);\n" + " var f = h - i;\n" + " if (i % 2 == 0) {\n" + " f = 1 - f;\n" + " }\n" + " var m = val * (1 - sat); \n" + " var n = val * (1 - sat * f);\n" + " switch(i) {\n" + " case 0:\n" + " rgbArr[\"red\"] = val;\n" + " rgbArr[\"green\"] = n;\n" + " rgbArr[\"blue\"] = m;\n" + " break;\n" + " case 1:\n" + " rgbArr[\"red\"] = n;\n" + " rgbArr[\"green\"] = val;\n" + " rgbArr[\"blue\"] = m;\n" + " break;\n" + " case 2:\n" + " rgbArr[\"red\"] = m;\n" + " rgbArr[\"green\"] = val;\n" + " rgbArr[\"blue\"] = n;\n" + " break;\n" + " case 3:\n" + " rgbArr[\"red\"] = m;\n" + " rgbArr[\"green\"] = n;\n" + " rgbArr[\"blue\"] = val;\n" + " break;\n" + " case 4:\n" + " rgbArr[\"red\"] = n;\n" + " rgbArr[\"green\"] = m;\n" + " rgbArr[\"blue\"] = val;\n" + " break;\n" + " case 5:\n" + " rgbArr[\"red\"] = val;\n" + " rgbArr[\"green\"] = m;\n" + " rgbArr[\"blue\"] = n;\n" + " break;\n" + " case 6:\n" + " rgbArr[\"red\"] = val;\n" + " rgbArr[\"green\"] = n;\n" + " rgbArr[\"blue\"] = m;\n" + " break;\n" + " }\n" + " rgbArr[\"red\"] = Math.round(rgbArr[\"red\"] * 255);\n" + " rgbArr[\"green\"] = Math.round(rgbArr[\"green\"] * 255);\n" + " rgbArr[\"blue\"] = Math.round(rgbArr[\"blue\"] * 255);\n" + " }\n" + " return rgbArr;\n" + "}\n" + "\n" + "//calculate rgb to hsv values\n" + "function rgb2hsv (red,green,blue) {\n" + " //input between 0 and 255 --> normalize to 0 to 1\n" + " //result = \n" + " var hsvArr = new Array();\n" + " red = red / 255;\n" + " green = green / 255;\n" + " blue = blue / 255;\n" + " myMax = Math.max(red, Math.max(green,blue));\n" + " myMin = Math.min(red, Math.min(green,blue));\n" + " v = myMax;\n" + " if (myMax > 0) {\n" + " s = (myMax - myMin) / myMax;\n" + " }\n" + " else {\n" + " s = 0;\n" + " }\n" + " if (s > 0) {\n" + " myDiff = myMax - myMin;\n" + " rc = (myMax - red) / myDiff;\n" + " gc = (myMax - green) / myDiff;\n" + " bc = (myMax - blue) / myDiff;\n" + " if (red == myMax) {\n" + " h = (bc - gc) / 6;\n" + " }\n" + " if (green == myMax) {\n" + " h = (2 + rc - bc) / 6;\n" + " }\n" + " if (blue == myMax) {\n" + " h = (4 + gc - rc) / 6;\n" + " }\n" + " }\n" + " else {\n" + " h = 0;\n" + " }\n" + " if (h < 0) {\n" + " h += 1;\n" + " }\n" + " hsvArr[\"hue\"] = Math.round(h * 360);\n" + " hsvArr[\"sat\"] = s;\n" + " hsvArr[\"val\"] = v;\n" + " return hsvArr;\n" + "}\n" + "\n" + "//populate an array that can be addressed by both a key or an index nr\n" + "function assArrayPopulate(arrayKeys,arrayValues) {\n" + " var returnArray = new Array();\n" + " if (arrayKeys.length != arrayValues.length) {\n" + " alert(\"error: arrays do not have same length!\"));\n" + " }\n" + " else {\n" + " for (i=0;i 0) {\n" + " this.init(groupId,functionToCall,buttonType,buttonText,buttonSymbolId,x,y,width,height,fontSize,fontFamily,textFill,buttonFill,shadeLightFill,shadeDarkFill,shadowOffset);\n" + " }\n" + "}\n" + "\n" + "button.prototype.init = function(groupId,functionToCall,buttonType,buttonText,buttonSymbolId,x,y,width,height,fontSize,fontFamily,textFill,buttonFill,shadeLightFill,shadeDarkFill,shadowOffset) {\n" + " this.groupId = groupId; //the group id where all new content is appended to\n" + " this.functionToCall = functionToCall; //function to be called if button was pressed\n" + " this.buttonType = buttonType; //button type: currently either \"rect\" or \"ellipse\"\n" + " this.buttonText = buttonText; //default value to be filled in when textbox is created\n" + " this.buttonSymbolId = buttonSymbolId; //id to a symbol to be used as a button graphics\n" + " this.x = x; //left of button rectangle\n" + " this.y = y; //top of button rectangle\n" + " this.width = width; //button rectangle width\n" + " this.height = height; //button rectangle height\n" + " this.fontSize = fontSize; //font size in user units/pixels\n" + " this.fontFamily = fontFamily; //font family for text element, can be an empty string for image buttons\n" + " this.textFill = textFill; //the fill color of the text for text buttons, can be an empty string for image buttons\n" + " this.buttonFill = buttonFill; //the fill color of the button rectangle or ellipse\n" + " this.shadeLightFill = shadeLightFill; //light fill color simulating 3d effect\n" + " this.shadeDarkFill = shadeDarkFill; //dark fill color simulating 3d effect\n" + " this.shadowOffset = shadowOffset; //shadow offset in viewBox units\n" + " this.buttonGroup = document.getElementById(this.groupId); //reference to the button group node\n" + " this.upperLeftLine = null; //later a reference to the upper left line simulating 3d effect\n" + " this.buttonRect = null; //later a reference to the button area (rect)\n" + " this.buttonTextElement = null; //later a reference to the button text\n" + " this.buttonSymbolInstance = null; //later a reference to the button symbol\n" + " this.deActivateRect = null; //later a reference to a rectangle that can be used to deactivate the button\n" + " this.activated = true; //a property indicating if button is activated or not\n" + " this.lowerRightLine = null; //later a reference to the lower right line simulating 3d effect\n" + " this.createButton(); //method to initialize button\n" + " this.timer = new Timer(this); //a Timer instance for calling the functionToCall\n" + " this.timerMs = 200; //a constant of this object that is used in conjunction with the timer - functionToCall is called after 200 ms\n" + "}\n" + "\n" + "//create button\n" + "button.prototype.createButton = function() {\n" + " //create upper left button line or ellipse\n" + " if (this.buttonType == \"rect\")) {\n" + " this.upperLeftShadow = document.createElementNS(svgNS,\"rect\"));\n" + " this.upperLeftShadow.setAttributeNS(null,\"x\"),this.x - this.shadowOffset);\n" + " this.upperLeftShadow.setAttributeNS(null,\"y\"),this.y - this.shadowOffset);\n" + " this.upperLeftShadow.setAttributeNS(null,\"width\"),this.width);\n" + " this.upperLeftShadow.setAttributeNS(null,\"height\"),this.height);\n" + " this.upperLeftShadow.setAttributeNS(null,\"points\"),this.x+\"),\"+(this.y+this.height)+\" \"+this.x+\"),\"+this.y+\" \"+(this.x+this.width)+\"),\"+this.y);\n" + " }\n" + " else if (this.buttonType == \"ellipse\")) {\n" + " this.upperLeftShadow = document.createElementNS(svgNS,\"ellipse\"));\n" + " this.upperLeftShadow.setAttributeNS(null,\"cx\"),this.x + this.width * 0.5 - this.shadowOffset);\n" + " this.upperLeftShadow.setAttributeNS(null,\"cy\"),this.y + this.height * 0.5 - this.shadowOffset);\n" + " this.upperLeftShadow.setAttributeNS(null,\"rx\"),this.width * 0.5);\n" + " this.upperLeftShadow.setAttributeNS(null,\"ry\"),this.height * 0.5);\n" + " }\n" + " else {\n" + " alert(\"buttonType '\"+this.buttonType+\"' not supported. You need to specify 'rect' or 'ellipse'\"));\n" + " }\n" + " this.upperLeftShadow.setAttributeNS(null,\"fill\"),this.shadeLightFill);\n" + " this.buttonGroup.appendChild(this.upperLeftShadow);\n" + "\n" + " //create lower right button line or ellipse\n" + " if (this.buttonType == \"rect\")) {\n" + " this.lowerRightShadow = document.createElementNS(svgNS,\"rect\"));\n" + " this.lowerRightShadow.setAttributeNS(null,\"x\"),this.x + this.shadowOffset);\n" + " this.lowerRightShadow.setAttributeNS(null,\"y\"),this.y + this.shadowOffset);\n" + " this.lowerRightShadow.setAttributeNS(null,\"width\"),this.width);\n" + " this.lowerRightShadow.setAttributeNS(null,\"height\"),this.height);\n" + " this.lowerRightShadow.setAttributeNS(null,\"points\"),this.x+\"),\"+(this.y+this.height)+\" \"+this.x+\"),\"+this.y+\" \"+(this.x+this.width)+\"),\"+this.y);\n" + " }\n" + " else if (this.buttonType == \"ellipse\")) {\n" + " this.lowerRightShadow = document.createElementNS(svgNS,\"ellipse\"));\n" + " this.lowerRightShadow.setAttributeNS(null,\"cx\"),this.x + this.width * 0.5 + this.shadowOffset);\n" + " this.lowerRightShadow.setAttributeNS(null,\"cy\"),this.y + this.height * 0.5 + this.shadowOffset);\n" + " this.lowerRightShadow.setAttributeNS(null,\"rx\"),this.width * 0.5);\n" + " this.lowerRightShadow.setAttributeNS(null,\"ry\"),this.height * 0.5);\n" + " }\n" + " this.lowerRightShadow.setAttributeNS(null,\"fill\"),this.shadeDarkFill);\n" + " this.buttonGroup.appendChild(this.lowerRightShadow);\n" + "\n" + " //create buttonRect\n" + " if (this.buttonType == \"rect\")) {\n" + " this.buttonRect = document.createElementNS(svgNS,\"rect\"));\n" + " this.buttonRect.setAttributeNS(null,\"x\"),this.x);\n" + " this.buttonRect.setAttributeNS(null,\"y\"),this.y);\n" + " this.buttonRect.setAttributeNS(null,\"width\"),this.width);\n" + " this.buttonRect.setAttributeNS(null,\"height\"),this.height);\n" + " }\n" + " else if (this.buttonType == \"ellipse\")) {\n" + " this.buttonRect = document.createElementNS(svgNS,\"ellipse\"));\n" + " this.buttonRect.setAttributeNS(null,\"cx\"),this.x + this.width * 0.5);\n" + " this.buttonRect.setAttributeNS(null,\"cy\"),this.y + this.height * 0.5);\n" + " this.buttonRect.setAttributeNS(null,\"rx\"),this.width * 0.5);\n" + " this.buttonRect.setAttributeNS(null,\"ry\"),this.height * 0.5);\n" + " }\n" + " this.buttonRect.setAttributeNS(null,\"fill\"),this.buttonFill);\n" + " this.buttonRect.setAttributeNS(null,\"cursor\"),\"pointer\"));\n" + " this.buttonRect.addEventListener(\"mousedown\"),this,false);\n" + " this.buttonRect.addEventListener(\"mouseup\"),this,false);\n" + " this.buttonRect.addEventListener(\"click\"),this,false);\n" + " this.buttonGroup.appendChild(this.buttonRect);\n" + " \n" + " if (this.buttonText != undefined) {\n" + " //create text element and add clipping path attribute\n" + " this.buttonTextElement = document.createElementNS(svgNS,\"text\"));\n" + " this.buttonTextElement.setAttributeNS(null,\"x\"),(this.x + this.width / 2));\n" + " this.buttonTextElement.setAttributeNS(null,\"y\"),(this.y + this.height - ((this.height - this.fontSize) / 1.75)));\n" + " this.buttonTextElement.setAttributeNS(null,\"fill\"),this.textFill);\n" + " this.buttonTextElement.setAttributeNS(null,\"font-family\"),this.fontFamily);\n" + " this.buttonTextElement.setAttributeNS(null,\"font-size\"),this.fontSize+\"px\"));\n" + " this.buttonTextElement.setAttributeNS(null,\"pointer-events\"),\"none\"));\n" + " this.buttonTextElement.setAttributeNS(null,\"text-anchor\"),\"middle\"));\n" + " this.buttonTextElement.setAttributeNS(\"http://www.w3.org/XML/1998/namespace\"),\"space\"),\"preserve\"));\n" + " var textboxTextContent = document.createTextNode(this.buttonText);\n" + " this.buttonTextElement.appendChild(textboxTextContent);\n" + " this.buttonGroup.appendChild(this.buttonTextElement);\n" + " }\n" + " \n" + " if (this.buttonSymbolId != undefined) {\n" + " this.buttonSymbolInstance = document.createElementNS(svgNS,\"use\"));\n" + " this.buttonSymbolInstance.setAttributeNS(null,\"x\"),(this.x + this.width / 2));\n" + " this.buttonSymbolInstance.setAttributeNS(null,\"y\"),(this.y + this.height / 2));\n" + " this.buttonSymbolInstance.setAttributeNS(xlinkNS,\"href\"),\"#\"+this.buttonSymbolId);\n" + " this.buttonSymbolInstance.setAttributeNS(null,\"pointer-events\"),\"none\"));\n" + " this.buttonGroup.appendChild(this.buttonSymbolInstance);\n" + " }\n" + " \n" + " //create rectangle to deactivate the button\n" + " if (this.buttonType == \"rect\")) {\n" + " this.deActivateRect = document.createElementNS(svgNS,\"rect\"));\n" + " this.deActivateRect.setAttributeNS(null,\"x\"),this.x - this.shadowOffset);\n" + " this.deActivateRect.setAttributeNS(null,\"y\"),this.y - this.shadowOffset);\n" + " this.deActivateRect.setAttributeNS(null,\"width\"),this.width + this.shadowOffset * 2);\n" + " this.deActivateRect.setAttributeNS(null,\"height\"),this.height + this.shadowOffset * 2);\n" + " }\n" + " else if (this.buttonType == \"ellipse\")) {\n" + " this.deActivateRect = document.createElementNS(svgNS,\"ellipse\"));\n" + " this.deActivateRect.setAttributeNS(null,\"cx\"),this.x + this.width * 0.5);\n" + " this.deActivateRect.setAttributeNS(null,\"cy\"),this.y + this.height * 0.5);\n" + " this.deActivateRect.setAttributeNS(null,\"rx\"),this.width * 0.5 + this.shadowOffset);\n" + " this.deActivateRect.setAttributeNS(null,\"ry\"),this.height * 0.5 + this.shadowOffset);\n" + " }\n" + " \n" + " this.deActivateRect.setAttributeNS(null,\"fill\"),\"white\"));\n" + " this.deActivateRect.setAttributeNS(null,\"fill-opacity\"),\"0.5\"));\n" + " this.deActivateRect.setAttributeNS(null,\"stroke\"),\"none\"));\n" + " this.deActivateRect.setAttributeNS(null,\"display\"),\"none\"));\n" + " this.deActivateRect.setAttributeNS(null,\"cursor\"),\"default\"));\n" + " this.buttonGroup.appendChild(this.deActivateRect);\n" + "}\n" + "\n" + "//remove all textbox elements\n" + "button.prototype.removeButton = function() {\n" + " this.buttonGroup.removeChild(this.upperLeftShadow);\n" + " this.buttonGroup.removeChild(this.lowerRightShadow);\n" + " this.buttonGroup.removeChild(this.buttonRect);\n" + " if (this.buttonTextElement) {\n" + " this.buttonGroup.removeChild(this.buttonTextElement); \n" + " }\n" + " if (this.buttonSymbolInstance) {\n" + " this.buttonGroup.removeChild(this.buttonSymbolInstance); \n" + " }\n" + " this.buttonGroup.removeChild(this.deActivateRect);\n" + "}\n" + "\n" + "//click on and write in textbox\n" + "button.prototype.handleEvent = function(evt) {\n" + " if (evt.type == \"mousedown\")) {\n" + " this.togglePressed(\"pressed\"));\n" + " document.documentElement.addEventListener(\"mouseup\"),this,false); \n" + " }\n" + " if (evt.type == \"mouseup\")) {\n" + " this.togglePressed(\"released\"));\n" + " document.documentElement.removeEventListener(\"mouseup\"),this,false); \n" + " }\n" + " if (evt.type == \"click\")) {\n" + " //for some strange reasons I could not forward the evt object here ;-(, the code below using a literal is a workaround\n" + " //attention: only some of the evt properties are forwarded here, you can add more, if you need them\n" + " var timerEvt = {x:evt.clientX,y:evt.clientY,type:evt.type,detail:evt.detail,timeStamp:evt.timeStamp}\n" + " this.timer.setTimeout(\"fireFunction\"),this.timerMs,timerEvt)\n" + " }\n" + "}\n" + "\n" + "button.prototype.togglePressed = function(type) {\n" + " if (type == \"pressed\")) {\n" + " this.upperLeftShadow.setAttributeNS(null,\"fill\"),this.shadeDarkFill); \n" + " this.lowerRightShadow.setAttributeNS(null,\"fill\"),this.shadeLightFill);\n" + " }\n" + " if (type == \"released\")) {\n" + " this.upperLeftShadow.setAttributeNS(null,\"fill\"),this.shadeLightFill); \n" + " this.lowerRightShadow.setAttributeNS(null,\"fill\"),this.shadeDarkFill); \n" + " }\n" + "}\n" + "\n" + "button.prototype.fireFunction = function(evt) {\n" + " if (typeof(this.functionToCall) == \"function\")) {\n" + " if (this.buttonTextElement) {\n" + " this.functionToCall(this.groupId,evt,this.buttonText);\n" + " }\n" + " if (this.buttonSymbolInstance) {\n" + " this.functionToCall(this.groupId,evt);\n" + " }\n" + " }\n" + " if (typeof(this.functionToCall) == \"object\")) {\n" + " if (this.buttonTextElement) {\n" + " this.functionToCall.buttonPressed(this.groupId,evt,this.buttonText);\n" + " }\n" + " if (this.buttonSymbolInstance) {\n" + " this.functionToCall.buttonPressed(this.groupId,evt);\n" + " }\n" + " }\n" + " if (typeof(this.functionToCall) == undefined) {\n" + " return; \n" + " }\n" + "}\n" + "\n" + "button.prototype.getTextValue = function() {\n" + " return this.buttonText;\n" + "} \n" + "\n" + "button.prototype.setTextValue = function(value) {\n" + " this.buttonText = value;\n" + " this.buttonTextElement.firstChild.nodeValue=this.buttonText;\n" + "}\n" + "\n" + "button.prototype.activate = function(value) {\n" + " this.deActivateRect.setAttributeNS(null,\"display\"),\"none\"));\n" + " this.activated = true;\n" + "}\n" + "\n" + "button.prototype.deactivate = function(value) {\n" + " this.deActivateRect.setAttributeNS(null,\"display\"),\"inherit\"));\n" + " this.activated = false;\n" + "}\n" + "\n" + "//switchbutton\n" + "//initialize inheritance\n" + "switchbutton.prototype = new button();\n" + "switchbutton.prototype.constructor = switchbutton;\n" + "switchbutton.superclass = button.prototype;\n" + "\n" + "function switchbutton(groupId,functionToCall,buttonType,buttonText,buttonSymbolId,x,y,width,height,fontSize,fontFamily,textFill,buttonFill,shadeLightFill,shadeDarkFill,shadowOffset) {\n" + " if (arguments.length > 0) {\n" + " this.init(groupId,functionToCall,buttonType,buttonText,buttonSymbolId,x,y,width,height,fontSize,fontFamily,textFill,buttonFill,shadeLightFill,shadeDarkFill,shadowOffset);\n" + " }\n" + "}\n" + "\n" + "switchbutton.prototype.init = function(groupId,functionToCall,buttonType,buttonText,buttonSymbolId,x,y,width,height,fontSize,fontFamily,textFill,buttonFill,shadeLightFill,shadeDarkFill,shadowOffset) {\n" + " switchbutton.superclass.init.call(this,groupId,functionToCall,buttonType,buttonText,buttonSymbolId,x,y,width,height,fontSize,fontFamily,textFill,buttonFill,shadeLightFill,shadeDarkFill,shadowOffset);\n" + " this.on = false;\n" + "}\n" + "\n" + "//overwriting handleEventcode\n" + "switchbutton.prototype.handleEvent = function(evt) {\n" + " //for some strange reasons I could not forward the evt object here ;-(, the code below using a literal is a workaround\n" + " //attention: only some of the evt properties are forwarded here, you can add more, if you need them\n" + " var timerEvt = {x:evt.clientX,y:evt.clientY,type:evt.type,detail:evt.detail,timeStamp:evt.timeStamp}\n" + " if (evt.type == \"click\")) {\n" + " if (this.on) {\n" + " this.on = false;\n" + " this.togglePressed(\"released\"));\n" + " this.timer.setTimeout(\"fireFunction\"),this.timerMs,timerEvt);\n" + " }\n" + " else {\n" + " this.on = true;\n" + " this.togglePressed(\"pressed\")); \n" + " this.timer.setTimeout(\"fireFunction\"),this.timerMs,timerEvt);\n" + " }\n" + " }\n" + "}\n" + "\n" + "switchbutton.prototype.getSwitchValue = function() {\n" + " return this.on;\n" + "}\n" + "\n" + "switchbutton.prototype.setSwitchValue = function(onOrOff,firefunction) {\n" + " this.on = onOrOff;\n" + " //artificial timer event - don't use the values!\n" + " var timerEvt = {x:0,y:0,type:\"click\"),detail:1,timeStamp:0}\n" + " if (this.on) {\n" + " this.togglePressed(\"pressed\"));\n" + " if (firefunction) {\n" + " this.timer.setTimeout(\"fireFunction\"),this.timerMs,timerEvt);\n" + " }\n" + " }\n" + " else {\n" + " this.togglePressed(\"released\")); \n" + " if (firefunction) {\n" + " this.timer.setTimeout(\"fireFunction\"),this.timerMs,timerEvt)\n" + " }\n" + " }\n" + "}\n" + "\n" + "//overwriting fireFunction code\n" + "switchbutton.prototype.fireFunction = function(evt) {\n" + " if (typeof(this.functionToCall) == \"function\")) {\n" + " if (this.buttonTextElement) {\n" + " this.functionToCall(this.groupId,evt,this.on,this.buttonText);\n" + " }\n" + " if (this.buttonSymbolInstance) {\n" + " this.functionToCall(this.groupId,evt,this.on);\n" + " }\n" + " }\n" + " if (typeof(this.functionToCall) == \"object\")) {\n" + " if (this.buttonTextElement) {\n" + " this.functionToCall.buttonPressed(this.groupId,evt,this.on,this.buttonText);\n" + " }\n" + " if (this.buttonSymbolInstance) {\n" + " this.functionToCall.buttonPressed(this.groupId,evt,this.on);\n" + " }\n" + " }\n" + " if (typeof(this.functionToCall) == undefined) {\n" + " return; \n" + " }\n" + "}\n" + "\n" + ); +} + +//--------------------------------------------------------- +const char * CSVG_Interactive_Map::_Get_Code_Navigation_1(void) +{ + return( + "/*\n" + "Scripts for SVG only webmapping application navigation tools\n" + "Copyright (C) <2005> \n" + "Version 1.1, 2005-10-05\n" + "neumann@karto.baug.ethz.ch\n" + "http://www.carto.net/\n" + "http://www.carto.net/neumann/\n" + "\n" + "Credits: numerous people on svgdevelopers@yahoogroups.com\n" + "\n" + "This ECMA script library is free software; you can redistribute it and/or\n" + "modify it under the terms of the GNU Lesser General Public\n" + "License as published by the Free Software Foundation; either\n" + "version 2.1 of the License, or (at your option) any later version.\n" + "\n" + "This library is distributed in the hope that it will be useful,\n" + "but WITHOUT ANY WARRANTY; without even the implied warranty of\n" + "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n" + "Lesser General Public License for more details.\n" + "\n" + "You should have received a copy of the GNU Lesser General Public\n" + "License along with this library (http://www.carto.net/papers/svg/navigationTools/lesser_gpl.txt); if not, write to the Free Software\n" + "Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, USA\n" + "\n" + "----\n" + "\n" + "current version: 1.1\n" + "\n" + "version history:\n" + "1.0 initial version\n" + "1.01 (2005-02-15) added cleanUp() method to map and dragObj objects, some fixes in the documentation\n" + "1.02 (2005-02-20) fixed problems with double clicks, the second click of a double click is now ignored, using the evt.detail property\n" + "1.03 (2005-02-22) introduced timestamp and nrLayerToLoad array for dynamic loading (getUrl)\n" + "1.04 (2005-09-15) introduced a few changes with coordinate calculation to support MozillaSVG, introduced epsg and unitsFactor property based on a suggestion by Bruce Rindahl\n" + "1.1 (2005-10-05) introduced button object (see button.js file), introduced zoom and pan \"modes\" for repeated actions in the same mode, introduced history of map extents with the ability to go back and forth in the list of previous map extents, some internal changes in the code (e.g. less global variables), added experimental support for the batik SVG 1.2 \"static\" attribute to improve performance while panning the map, added cursors to give better status feedback\n" + "\n" + "original document site: http://www.carto.net/papers/svg/navigationTools/\n" + "Please contact the author in case you want to use code or ideas commercially.\n" + "If you use this code, please include this copyright header, the included full\n" + "LGPL 2.1 text and read the terms provided in the LGPL 2.1 license\n" + "(http://www.gnu.org/copyleft/lesser.txt)\n" + "\n" + "-------------------------------\n" + "\n" + "Please report bugs and send improvements to neumann@karto.baug.ethz.ch\n" + "If you use these scripts, please link to the original (http://www.carto.net/papers/svg/navigationTools/)\n" + "somewhere in the source-code-comment or the \"about\" of your project and give credits, thanks!\n" + "\n" + "*/\n" + "\n" + "//constructor: holds data on map and initializes various references\n" + "function map(mapName,maxWidth,minWidth,zoomFact,nrDecimals,epsg,units,unitsFactor,showCoords,coordXId,coordYId,dynamicLayers,digiLayers,activeDigiLayer) {\n" + " this.mapName = mapName; //id of svg element containing the map geometry\n" + " this.mapSVG = document.getElementById(this.mapName); //reference to nested SVG element holding the map-graphics\n" + " this.mainMapGroup = document.getElementById(this.mapName+\"Group\")); //group within mainmap - to be transformed when panning manually\n" + " this.dynamicLayers = dynamicLayers; //an associative array holding ids of values that are loaded from the web server dynamically (.getUrl())\n" + " this.nrLayerToLoad = 0; //statusVariable to indicate how many layers are still to load\n" + " this.maxWidth = maxWidth; //max map width\n" + " this.minWidth = minWidth; //min map width, after zooming in\n" + " this.zoomFact = zoomFact; //ratio to zoom in or out in relation to previous viewBox\n" + " this.digiLayers = digiLayers; //references to digiLayers (for digitizing tools)\n" + " this.activeDigiLayer = activeDigiLayer; //active Digi Layer, key is final group id where geometry should be copied to after digitizing\n" + " this.pixXOffset = parseFloat(this.mapSVG.getAttributeNS(null,\"x\"))); //offset from left margin of outer viewBox\n" + " this.pixYOffset = parseFloat(this.mapSVG.getAttributeNS(null,\"y\"))); //offset from top margin of outer viewBox\n" + " var viewBoxArray = this.mapSVG.getAttributeNS(null,\"viewBox\")).split(\" \"));\n" + " this.curxOrig = parseFloat(viewBoxArray[0]); //holds the current xOrig\n" + " this.curyOrig = parseFloat(viewBoxArray[1]); //holds the current yOrig\n" + " this.curWidth = parseFloat(viewBoxArray[2]); //holds the current map width\n" + " this.curHeight = parseFloat(viewBoxArray[3]); //holds the current map height\n" + " this.pixWidth = parseFloat(this.mapSVG.getAttributeNS(null,\"width\"))); //holds width of the map in pixel coordinates\n" + " this.pixHeight = parseFloat(this.mapSVG.getAttributeNS(null,\"height\"))); //holds height of the map in pixel coordinates\n" + " this.pixSize = this.curWidth / this.pixWidth; //size of a screen pixel in map units\n" + " this.zoomVal = this.maxWidth / this.curWidth * 100; //zoomVal in relation to initial zoom\n" + " this.nrDecimals = nrDecimals; //nr of decimal places to be displayed for show coordinates or accuracy when working with digitizing\n" + " this.epsg = epsg; //epsg projection code - can be used for building URL strings for loading data from a WMS or spatial database, if you don't need it just input any number\n" + " this.navStatus = \"info\"); //to indicate status in navigation, default is \"info\"), no navigation mode active\n" + " this.units = units; //holds a string with map units, e.g. \"m\"), alternatively String.fromCharCode(176) for degrees\n" + " this.unitsFactor = unitsFactor; //a factor for unit conversion. Can be used f.e. to output feet coordinates when data is meter, If you don't need a conversion, just use a factor of 1\n" + " this.showCoords = showCoords;\n" + " //initialize array of timestamp/layertoLoad values\n" + " this.nrLayerToLoad = new Array();\n" + " this.timestamp = null; //holds the timestamp after a zoom or pan occured\n" + " //initialize coordinate display if showCoords == true\n" + " if (this.showCoords == true) {\n" + " //add event listener for coordinate display\n" + " this.mapSVG.addEventListener(\"mousemove\"),this,false);\n" + " if (typeof(coordXId) == \"string\")) {\n" + " this.coordXText = document.getElementById(coordXId).firstChild;\n" + " }\n" + " else {\n" + " alert(\"Error: coordXId needs to be an id of type string\"));\n" + " }\n" + " if (typeof(coordYId) == \"string\")) {\n" + " this.coordYText = document.getElementById(coordYId).firstChild;\n" + " }\n" + " else {\n" + " alert(\"Error: coordYId needs to be an id of type string\"));\n" + " }\n" + " }\n" + " //a new array containing map extents\n" + " this.mapExtents = new Array();\n" + " this.mapExtents.push({xmin:this.curxOrig,ymin:((this.curyOrig + this.curHeight) * -1),xmax:(this.curxOrig + this.curWidth),ymax:(this.curyOrig * -1)});\n" + " this.curMapExtentIndex = 0;\n" + " //create background-element to receive events for showing coordinates\n" + " //this rect is also used for manual zooming and panning\n" + " this.backgroundRect = document.createElementNS(svgNS,\"rect\"));\n" + " this.backgroundRect.setAttributeNS(null,\"x\"),this.curxOrig);\n" + " this.backgroundRect.setAttributeNS(null,\"y\"),this.curyOrig);\n" + " this.backgroundRect.setAttributeNS(null,\"width\"),this.curWidth);\n" + " this.backgroundRect.setAttributeNS(null,\"height\"),this.curHeight);\n" + " this.backgroundRect.setAttributeNS(null,\"fill\"),\"none\"));\n" + " this.backgroundRect.setAttributeNS(null,\"stroke\"),\"none\"));\n" + " this.backgroundRect.setAttributeNS(null,\"pointer-events\"),\"fill\"));\n" + " this.backgroundRect.setAttributeNS(null,\"id\"),\"mapBackgroundRect\"));\n" + " this.backgroundRect.addEventListener(\"mousedown\"),this,false);\n" + " this.backgroundRect.addEventListener(\"mousemove\"),this,false);\n" + " this.backgroundRect.addEventListener(\"mouseup\"),this,false);\n" + " this.backgroundRect.addEventListener(\"mouseout\"),this,false);\n" + " this.backgroundRect.addEventListener(\"click\"),this,false);\n" + " this.mainMapGroup.insertBefore(this.backgroundRect,this.mainMapGroup.firstChild);\n" + " //determine if viewer is capable of getScreenCTM\n" + " if (document.documentElement.getScreenCTM) {\n" + " this.getScreenCTM = true;\n" + " }\n" + " else {\n" + " this.getScreenCTM = false; \n" + " }\n" + "}\n" + "\n" + "//resets viewBox of main map after zooming and panning\n" + "map.prototype.newViewBox = function(refRectId,history) {\n" + " var myRefRect = document.getElementById(refRectId);\n" + " this.curxOrig = parseFloat(myRefRect.getAttributeNS(null,\"x\")));\n" + " this.curyOrig = parseFloat(myRefRect.getAttributeNS(null,\"y\")));\n" + " this.curWidth = parseFloat(myRefRect.getAttributeNS(null,\"width\")));\n" + " this.curHeight = parseFloat(myRefRect.getAttributeNS(null,\"height\")));\n" + " var myViewBoxString = this.curxOrig + \" \" + this.curyOrig + \" \" + this.curWidth + \" \" + this.curHeight;\n" + " this.pixSize = this.curWidth / this.pixWidth;\n" + " this.zoomVal = this.maxWidth / this.curWidth * 100;\n" + " this.mapSVG.setAttributeNS(null,\"viewBox\"),myViewBoxString);\n" + " myMapApp.zoomSlider.setValue(this.curWidth);\n" + " loadProjectSpecific();\n" + " if (history) {\n" + " this.mapExtents.push({xmin:this.curxOrig,ymin:((this.curyOrig + this.curHeight) * -1),xmax:(this.curxOrig + this.curWidth),ymax:(this.curyOrig * -1)});\n" + " this.curMapExtentIndex = (this.mapExtents.length - 1);\n" + " }\n" + " this.checkButtons();\n" + "}\n" + "\n" + "map.prototype.backwardExtent = function() {\n" + " if (this.curMapExtentIndex != 0) {\n" + " this.curMapExtentIndex--;\n" + " this.setNewViewBox(this.mapExtents[this.curMapExtentIndex].xmin,this.mapExtents[this.curMapExtentIndex].ymin,this.mapExtents[this.curMapExtentIndex].xmax,this.mapExtents[this.curMapExtentIndex].ymax,false);\n" + " }\n" + "}\n" + "\n" + "map.prototype.forwardExtent = function() {\n" + " if (this.mapExtents.length != (this.curMapExtentIndex + 1)) {\n" + " this.curMapExtentIndex++;\n" + " this.setNewViewBox(this.mapExtents[this.curMapExtentIndex].xmin,this.mapExtents[this.curMapExtentIndex].ymin,this.mapExtents[this.curMapExtentIndex].xmax,this.mapExtents[this.curMapExtentIndex].ymax,false);\n" + " }\n" + "}\n" + "\n" + "map.prototype.checkButtons = function() {\n" + " //check extent history\n" + " if (this.curMapExtentIndex == 0) {\n" + " if (myMapApp.buttons[\"backwardExtent\"].activated) {\n" + " myMapApp.buttons[\"backwardExtent\"].deactivate();\n" + " }\n" + " }\n" + " else {\n" + " if (!myMapApp.buttons[\"backwardExtent\"].activated) {\n" + " myMapApp.buttons[\"backwardExtent\"].activate();\n" + " } \n" + " }\n" + " if (this.mapExtents.length == (this.curMapExtentIndex + 1)) {\n" + " if (myMapApp.buttons[\"forwardExtent\"].activated) {\n" + " myMapApp.buttons[\"forwardExtent\"].deactivate();\n" + " }\n" + " }\n" + " else {\n" + " if (!myMapApp.buttons[\"forwardExtent\"].activated) {\n" + " myMapApp.buttons[\"forwardExtent\"].activate();\n" + " } \n" + " }\n" + " \n" + " //maximum map width reached, cannot zoom out further\n" + " if (this.curWidth >= this.maxWidth) {\n" + " if (myMapApp.buttons[\"zoomOut\"].activated) {\n" + " myMapApp.buttons[\"zoomOut\"].deactivate();\n" + " }\n" + " if (myMapApp.buttons[\"zoomFull\"].activated) {\n" + " myMapApp.buttons[\"zoomFull\"].deactivate();\n" + " }\n" + " if (myMapApp.buttons[\"panManual\"].activated) {\n" + " myMapApp.buttons[\"panManual\"].deactivate();\n" + " }\n" + " if (myMapApp.buttons[\"recenterMap\"].activated) {\n" + " myMapApp.buttons[\"recenterMap\"].deactivate();\n" + " }\n" + " if (!myMapApp.buttons[\"zoomIn\"].activated) {\n" + " myMapApp.buttons[\"zoomIn\"].activate();\n" + " }\n" + " if (!myMapApp.buttons[\"zoomManual\"].activated) {\n" + " myMapApp.buttons[\"zoomManual\"].activate();\n" + " }\n" + " }\n" + " //minimum map width reached, cannot zoom in further\n" + " else if (this.curWidth <= this.minWidth) {\n" + " if (myMapApp.buttons[\"zoomIn\"].activated) {\n" + " myMapApp.buttons[\"zoomIn\"].deactivate();\n" + " }\n" + " if (myMapApp.buttons[\"zoomManual\"].activated) {\n" + " myMapApp.buttons[\"zoomManual\"].deactivate();\n" + " }\n" + " if (!myMapApp.buttons[\"zoomOut\"].activated) {\n" + " myMapApp.buttons[\"zoomOut\"].activate();\n" + " }\n" + " if (!myMapApp.buttons[\"zoomFull\"].activated) {\n" + " myMapApp.buttons[\"zoomFull\"].activate();\n" + " }\n" + " if (!myMapApp.buttons[\"panManual\"].activated) {\n" + " myMapApp.buttons[\"panManual\"].activate();\n" + " }\n" + " if (!myMapApp.buttons[\"recenterMap\"].activated) {\n" + " myMapApp.buttons[\"recenterMap\"].activate();\n" + " } \n" + " }\n" + " //in between\n" + " else {\n" + " if (!myMapApp.buttons[\"zoomIn\"].activated) {\n" + " myMapApp.buttons[\"zoomIn\"].activate();\n" + " }\n" + " if (!myMapApp.buttons[\"zoomManual\"].activated) {\n" + " myMapApp.buttons[\"zoomManual\"].activate();\n" + " }\n" + " if (!myMapApp.buttons[\"zoomOut\"].activated) {\n" + " myMapApp.buttons[\"zoomOut\"].activate();\n" + " }\n" + " if (!myMapApp.buttons[\"zoomFull\"].activated) {\n" + " myMapApp.buttons[\"zoomFull\"].activate();\n" + " }\n" + " if (!myMapApp.buttons[\"panManual\"].activated) {\n" + " myMapApp.buttons[\"panManual\"].activate();\n" + " }\n" + " if (!myMapApp.buttons[\"recenterMap\"].activated) {\n" + " myMapApp.buttons[\"recenterMap\"].activate();\n" + " } \n" + " } \n" + "}\n" + "\n" + "map.prototype.setNewViewBox = function(xmin,ymin,xmax,ymax,history) {\n" + " //check if within constraints\n" + " if (xmin < myMapApp.refMapDragger.constrXmin) {\n" + " xmin = myMapApp.refMapDragger.constrXmin;\n" + " }\n" + " if (xmax > myMapApp.refMapDragger.constrXmax) {\n" + " xmax = myMapApp.refMapDragger.constrXmin;\n" + " }\n" + " if (ymin < (myMapApp.refMapDragger.constrYmax * -1)) {\n" + " ymin = myMapApp.refMapDragger.constrYmax * -1;\n" + " }\n" + " if (ymax > (myMapApp.refMapDragger.constrYmin * -1)) {\n" + " ymax = myMapApp.refMapDragger.constrYmin * -1;\n" + " }\n" + " \n" + " var origWidth = xmax - xmin;\n" + " var origHeight = ymax - ymin;\n" + " var myRatio = this.curWidth/this.curHeight;\n" + " \n" + " if (origWidth / origHeight > myRatio) { //case rect is more wide than ratio\n" + " var newWidth = origWidth;\n" + " var newHeight = origWidth * 1 / myRatio;\n" + " ymin = (ymax + (newHeight - origHeight) / 2) * -1;\n" + " }\n" + " else {\n" + " var newHeight = origHeight;\n" + " var newWidth = newHeight * myRatio;\n" + " xmin = xmin - (newWidth - origWidth) / 2;\n" + " ymin = ymax * -1;\n" + " }\n" + " //check if within constraints\n" + " if (xmin < myMapApp.refMapDragger.constrXmin) {\n" + " xmin = myMapApp.refMapDragger.constrXmin;\n" + " }\n" + " if (ymin < myMapApp.refMapDragger.constrYmin) {\n" + " ymin = myMapApp.refMapDragger.constrYmin;\n" + " }\n" + " if ((xmin + newWidth) > myMapApp.refMapDragger.constrXmax) {\n" + " xmin = myMapApp.refMapDragger.constrXmax - newWidth;\n" + " }\n" + " if ((ymin + newHeight) > myMapApp.refMapDragger.constrYmax) {\n" + " ymin = myMapApp.refMapDragger.constrYmax - newHeight;\n" + " } \n" + " myMapApp.refMapDragger.newView(xmin,ymin,newWidth,newHeight);\n" + " this.newViewBox(myMapApp.refMapDragger.dragId,history);\n" + "}\n" + "\n" + "//handles events associated with navigation\n" + "map.prototype.handleEvent = function(evt) {\n" + " var callerId = evt.currentTarget.getAttributeNS(null,\"id\"));\n" + " if (callerId.match(/\\bzoomBgRectManual/)) {\n" + " this.zoomManDragRect(evt);\n" + " }\n" + " if (callerId.match(/\\bzoomBgRectRecenter/)) {\n" + " this.recenterFinally(evt);\n" + " }\n" + " if (callerId.match(/\\bbgPanManual/)) {\n" + " this.panManualFinally(evt);\n" + " }\n" + " if (callerId == \"mainMap\" && evt.type == \"mousemove\")) {\n" + " if (this.navStatus != \"panmanualActive\")) {\n" + " this.showCoordinates(evt);\n" + " }\n" + " }\n" + "}\n" + "\n" + "//calcs coordinates; relies on myMapApp to handle different window sizes and resizing of windows\n" + "map.prototype.calcCoord = function(evt) {\n" + " //with getScreenCTM the values are already in the inner coordinate system\n" + " if (!this.getScreenCTM) {\n" + " var coords = myMapApp.calcCoord(evt,this.mapSVG);\n" + " coords.x = this.curxOrig + (coords.x - this.pixXOffset) * this.pixSize;\n" + " coords.y = (this.curyOrig + (coords.y - this.pixYOffset) * this.pixSize);\n" + " }\n" + " else { \n" + " var coords = myMapApp.calcCoord(evt,this.mainMapGroup);\n" + " }\n" + " return coords;\n" + "}\n" + "\n" + "//displays x and y coordinates in two separate text elements\n" + "map.prototype.showCoordinates = function(evt) {\n" + " var mapCoords = this.calcCoord(evt);\n" + " this.coordXText.nodeValue = \"X: \" + formatNumberString((mapCoords.x * this.unitsFactor).toFixed(this.nrDecimals)) + this.units;\n" + " this.coordYText.nodeValue = \"Y: \" + formatNumberString((mapCoords.y * this.unitsFactor * -1).toFixed(this.nrDecimals)) + this.units;\n" + "}\n" + "\n" + "//checks for and removes temporary rectangle objects\n" + "map.prototype.stopNavModes = function() {\n" + " if (this.navStatus != \"info\")) {\n" + " if (this.navStatus == \"zoomManual\")) {\n" + " myMapApp.buttons[\"zoomManual\"].setSwitchValue(false,false);\n" + " }\n" + " if (this.navStatus == \"panmanual\" || this.navStatus == \"panmanualActive\")) {\n" + " myMapApp.buttons[\"panManual\"].setSwitchValue(false,false);\n" + " }\n" + " if (this.navStatus == \"recenter\")) {\n" + " myMapApp.buttons[\"recenterMap\"].setSwitchValue(false,false);\n" + " }\n" + " this.backgroundRect.setAttributeNS(null,\"id\"),\"mapBackgroundRect\"));\n" + " myMapApp.buttons[\"infoButton\"].setSwitchValue(true,false);\n" + " this.navStatus = \"info\");\n" + " this.mapSVG.setAttributeNS(null,\"cursor\"),\"crosshair\"));\n" + " statusChange(\"Mode: Infomode\"));\n" + " this.mainMapGroup.insertBefore(this.backgroundRect,this.mainMapGroup.firstChild);\n" + " }\n" + "}\n" + "\n" + "//starts manual zooming mode\n" + "map.prototype.zoomManual = function(evt) {\n" + " if (Math.round(myMainMap.curWidth) > myMainMap.minWidth && evt.detail == 1) {\n" + " this.navStatus = \"zoomManual\");\n" + " this.backgroundRect.setAttributeNS(null,\"id\"),\"zoomBgRectManual\")); \n" + " this.mainMapGroup.appendChild(this.backgroundRect);\n" + " this.mapSVG.setAttributeNS(null,\"cursor\"),\"se-resize\"));\n" + " statusChange(\"Click and drag rectangle for new map extent.\"));\n" + " }\n" + "}\n" + "\n" + "//manages manual zooming by drawing a rectangle\n" + "map.prototype.zoomManDragRect = function(evt) {\n" + " var mapCoords = this.calcCoord(evt);\n" + " var myX = mapCoords.x;\n" + " var myY = mapCoords.y;\n" + " var myYXFact = this.curHeight / this.curWidth;\n" + " if (evt.type == \"mousedown\")) {\n" + " this.manZoomActive = 1;\n" + " this.zoomRect = document.createElementNS(svgNS,\"rect\"));\n" + " var myLineWidth = this.curWidth * 0.003;\n" + " this.zoomRect.setAttributeNS(null,\"id\"),\"zoomRect\"));\n" + " this.zoomRect.setAttributeNS(null,\"fill\"),\"white\"));\n" + " this.zoomRect.setAttributeNS(null,\"fill-opacity\"),\"0.5\"));\n" + " this.zoomRect.setAttributeNS(null,\"stroke\"),\"dimgray\"));\n" + " this.zoomRect.setAttributeNS(null,\"stroke-width\"),myLineWidth);\n" + " this.zoomRect.setAttributeNS(null,\"stroke-dasharray\"),(myLineWidth*3)+\"),\"+myLineWidth);\n" + " this.zoomRect.setAttributeNS(null,\"pointer-events\"),\"none\"));\n" + " this.zoomRect.setAttributeNS(null,\"x\"),myX);\n" + " this.zoomRect.setAttributeNS(null,\"y\"),myY);\n" + " this.zoomRect.setAttributeNS(null,\"width\"),this.minWidth);\n" + " this.zoomRect.setAttributeNS(null,\"height\"),this.minWidth * myYXFact);\n" + " this.mainMapGroup.appendChild(this.zoomRect);\n" + " this.zoomRectOrigX = myX;\n" + " this.zoomRectOrigY = myY;\n" + " }\n" + " if (evt.type == \"mousemove\" && this.manZoomActive == 1) {\n" + " var myZoomWidth = myX - this.zoomRectOrigX;\n" + " if (myZoomWidth < 0) {\n" + " if (Math.abs(myZoomWidth) < this.minWidth) {\n" + " this.zoomRect.setAttributeNS(null,\"x\"),this.zoomRectOrigX - this.minWidth);\n" + " this.zoomRect.setAttributeNS(null,\"y\"),this.zoomRectOrigY - this.minWidth * myYXFact);\n" + " this.zoomRect.setAttributeNS(null,\"width\"),this.minWidth);\n" + " this.zoomRect.setAttributeNS(null,\"height\"),this.minWidth * myYXFact);\n" + " }\n" + " else {\n" + " this.zoomRect.setAttributeNS(null,\"x\"),myX);\n" + " this.zoomRect.setAttributeNS(null,\"y\"),this.zoomRectOrigY - Math.abs(myZoomWidth) * myYXFact);\n" + " this.zoomRect.setAttributeNS(null,\"width\"),Math.abs(myZoomWidth));\n" + " this.zoomRect.setAttributeNS(null,\"height\"),Math.abs(myZoomWidth) * myYXFact); \n" + " }\n" + " }\n" + " else {\n" + " this.zoomRect.setAttributeNS(null,\"x\"),this.zoomRectOrigX);\n" + " this.zoomRect.setAttributeNS(null,\"y\"),this.zoomRectOrigY);\n" + " if (myZoomWidth < this.minWidth) {\n" + " this.zoomRect.setAttributeNS(null,\"width\"),this.minWidth);\n" + " this.zoomRect.setAttributeNS(null,\"height\"),this.minWidth * myYXFact); \n" + " }\n" + " else {\n" + " this.zoomRect.setAttributeNS(null,\"width\"),myZoomWidth);\n" + " this.zoomRect.setAttributeNS(null,\"height\"),myZoomWidth * myYXFact);\n" + " }\n" + " }\n" + " }\n" + " if ((evt.type == \"mouseup\" || evt.type == \"mouseout\")) && this.manZoomActive == 1) {\n" + " this.manZoomActive = 0;\n" + " if (parseFloat(this.zoomRect.getAttributeNS(null,\"width\"))) > this.curWidth * 0.02) {\n" + " myMapApp.refMapDragger.newView(parseFloat(this.zoomRect.getAttributeNS(null,\"x\"))),parseFloat(this.zoomRect.getAttributeNS(null,\"y\"))),parseFloat(this.zoomRect.getAttributeNS(null,\"width\"))),parseFloat(this.zoomRect.getAttributeNS(null,\"height\"))));\n" + " this.newViewBox(myMapApp.refMapDragger.dragId,true);\n" + " }\n" + " this.mainMapGroup.removeChild(this.zoomRect);\n" + " statusChange(\"Mode: Manual Zooming\"));\n" + " }\n" + "}\n" + "\n" + "//initializes recentering mode\n" + "map.prototype.recenter = function(evt) {\n" + " if (evt.detail == 1) {\n" + " this.navStatus = \"recenter\");\n" + " this.backgroundRect.setAttributeNS(null,\"id\"),\"zoomBgRectRecenter\")); \n" + " this.mainMapGroup.appendChild(this.backgroundRect);\n" + " this.mapSVG.setAttributeNS(null,\"cursor\"),\"pointer\"));\n" + " statusChange(\"Click in map to define new map center.\"));\n" + " }\n" + "}\n" + "\n" + "//finishes recentering after mouse-click\n" + "map.prototype.recenterFinally = function(evt) {\n" + " if (evt.type == \"click\")) {\n" + " var mapCoords = this.calcCoord(evt);\n" + " var myX = mapCoords.x;\n" + " var myY = mapCoords.y;\n" + " var myNewX = myX - this.curWidth / 2;\n" + " var myNewY = myY - this.curHeight / 2;\n" + " \n" + " //check if within constraints\n" + " if (myNewX < myMapApp.refMapDragger.constrXmin) {\n" + " myNewX = myMapApp.refMapDragger.constrXmin;\n" + " }\n" + " if (myNewY < myMapApp.refMapDragger.constrYmin) {\n" + " myNewY = myMapApp.refMapDragger.constrYmin;\n" + " }\n" + " if ((myNewX + this.curWidth) > myMapApp.refMapDragger.constrXmax) {\n" + " myNewX = myMapApp.refMapDragger.constrXmax - this.curWidth;\n" + " }\n" + " if ((myNewY + this.curHeight) > myMapApp.refMapDragger.constrYmax) {\n" + " myNewY = myMapApp.refMapDragger.constrYmax - this.curHeight;\n" + " }\n" + " myMapApp.refMapDragger.newView(myNewX,myNewY,this.curWidth,this.curHeight);\n" + " this.newViewBox(myMapApp.refMapDragger.dragId,true);\n" + " statusChange(\"Mode: Recentering Map\"));\n" + " }\n" + "}\n" + "\n" + "//initializes manual panning\n" + "map.prototype.panManual = function(evt) {\n" + " if (evt.detail == 1) {\n" + " this.navStatus = \"panmanual\");\n" + " this.backgroundRect.setAttributeNS(null,\"id\"),\"bgPanManual\")); \n" + " this.mainMapGroup.appendChild(this.backgroundRect);\n" + " this.mapSVG.setAttributeNS(null,\"cursor\"),\"move\"));\n" + " statusChange(\"Mouse down and move to pan the map\"));\n" + " }\n" + "}\n" + "\n" + "//manages and finishes manual panning\n" + "map.prototype.panManualFinally = function(evt) {\n" + " if (evt.type == \"mousedown\")) {\n" + " this.navStatus = \"panmanualActive\");\n" + " this.panCoords = this.calcCoord(evt);\n" + " this.panCoorX = this.panCoords.x;\n" + " this.panCoorY = this.panCoords.y;\n" + " this.diffX = 0;\n" + " this.diffY = 0;\n" + " this.mainMapGroup.setAttributeNS(batikNS,\"static\"),\"true\"));\n" + " }\n" + " if (evt.type == \"mousemove\" && this.navStatus == \"panmanualActive\")) {\n" + " var mapCoords = this.calcCoord(evt);\n" + " if (this.getScreenCTM) {\n" + " this.diffX = this.panCoorX - mapCoords.x + this.diffX;\n" + " this.diffY = this.panCoorY - mapCoords.y + this.diffY;\n" + " }\n" + " else {\n" + " this.diffX = this.panCoorX - mapCoords.x;\n" + " this.diffY = this.panCoorY - mapCoords.y; \n" + " }\n" + " var myNewX = this.curxOrig + this.diffX;\n" + " var myNewY = this.curyOrig + this.diffY;\n" + " //check if within constraints\n" + " if (myNewX < myMapApp.refMapDragger.constrXmin) {\n" + " var myNewXTemp = myMapApp.refMapDragger.constrXmin;\n" + " this.diffX = this.diffX + (myNewXTemp - myNewX);\n" + " myNewX = myNewXTemp;\n" + " }\n" + " if (myNewY < myMapApp.refMapDragger.constrYmin) {\n" + " var myNewYTemp = myMapApp.refMapDragger.constrYmin;\n" + " this.diffY = this.diffY + (myNewYTemp - myNewY);\n" + " myNewY = myNewYTemp;\n" + " }\n" + " if ((myNewX + this.curWidth) > myMapApp.refMapDragger.constrXmax) {\n" + " var myNewXTemp = myMapApp.refMapDragger.constrXmax - this.curWidth;\n" + " this.diffX = this.diffX + (myNewXTemp - myNewX);\n" + " myNewX = myNewXTemp;\n" + " }\n" + " if ((myNewY + this.curHeight) > myMapApp.refMapDragger.constrYmax) {\n" + " var myNewYTemp = myMapApp.refMapDragger.constrYmax - this.curHeight;\n" + " this.diffY = this.diffY + (myNewYTemp - myNewY);\n" + " myNewY = myNewYTemp;\n" + " } \n" + " var transformString = \"translate(\"+(this.diffX * -1) +\"),\"+(this.diffY * -1)+\"))\");\n" + " this.mainMapGroup.setAttributeNS(null,\"transform\"),transformString);\n" + " myMapApp.refMapDragger.newView(myNewX,myNewY,this.curWidth,this.curHeight);\n" + " }\n" + " if ((evt.type == \"mouseup\" || evt.type == \"mouseout\")) && this.navStatus == \"panmanualActive\")) {\n" + " this.navStatus = \"panmanual\");\n" + " this.mainMapGroup.setAttributeNS(batikNS,\"static\"),\"false\"));\n" + " this.mainMapGroup.setAttributeNS(null,\"transform\"),\"translate(0,0)\"));\n" + " this.newViewBox(myMapApp.refMapDragger.dragId,true); \n" + " statusChange(\"Mode: Manual Panning\")); \n" + " }\n" + "}\n" + "\n" + "//remove all temporarily added elements and event listeners\n" + "map.prototype.cleanUp = function() {\n" + " //remove background rect\n" + " this.backgroundRect.parentNode.removeChild(this.backgroundRect);\n" + " //remove eventlisteners\n" + " if (this.showCoords == true) {\n" + " //add event listener for coordinate display\n" + " this.mapSVG.removeEventListener(\"mousemove\"),this,false);\n" + " }\n" + "\n" + "}\n" + "\n" + "//make an element (rectangle) draggable within constraints\n" + "function dragObj(dragId,referenceMap,myDragSymbol,dragSymbThreshold,showCoords,coordXId,coordYId,mainMapObj) {\n" + " this.dragId = dragId;\n" + " this.myDragger = document.getElementById(this.dragId);\n" + " this.myRefMap = document.getElementById(referenceMap);\n" + " this.myDragSymbol = document.getElementById(myDragSymbol); \n" + " this.dragSymbThreshold = dragSymbThreshold;\n" + " var viewBox = this.myRefMap.getAttributeNS(null,\"viewBox\")).split(\" \"));\n" + " this.constrXmin = parseFloat(viewBox[0]);\n" + " this.constrYmin = parseFloat(viewBox[1]);\n" + " this.constrXmax = this.constrXmin + parseFloat(viewBox[2]);\n" + " this.constrYmax = this.constrYmin + parseFloat(viewBox[3]);\n" + " this.refMapX = parseFloat(this.myRefMap.getAttributeNS(null,\"x\")));\n" + " this.refMapY = parseFloat(this.myRefMap.getAttributeNS(null,\"y\")));\n" + " this.refMapWidth = parseFloat(this.myRefMap.getAttributeNS(null,\"width\")));\n" + " this.pixSize = (this.constrXmax - this.constrXmin) / this.refMapWidth;\n" + " this.mainMapObj = mainMapObj;\n" + " //initialize coordinate display if showCoords == true\n" + " this.showCoords = showCoords;\n" + " if (this.showCoords == true) {\n" + " if (typeof(coordXId) == \"string\")) {\n" + " this.coordXText = document.getElementById(coordXId).firstChild;\n" + " }\n" + " else {\n" + " alert(\"Error: coordXId needs to be an id of type string\"));\n" + " }\n" + " if (typeof(coordYId) == \"string\")) {\n" + " this.coordYText = document.getElementById(coordYId).firstChild;\n" + " }\n" + " else {\n" + " alert(\"Error: coordYId needs to be an id of type string\"));\n" + " }\n" + " }\n" + " //determine if viewer is capable of getScreenCTM\n" + " if (document.documentElement.getScreenCTM) {\n" + " this.getScreenCTM = true;\n" + " }\n" + " else {\n" + " this.getScreenCTM = false; \n" + " }\n" + " this.status = false;\n" + "}\n" + "\n" + "dragObj.prototype.calcCoord = function(evt) {\n" + " //with getScreenCTM the values are already in the inner coordinate system but without using the outer offset\n" + " var coordPoint = myMapApp.calcCoord(evt,this.myRefMap);\n" + " if (!this.getScreenCTM) {\n" + " coordPoint.x = this.constrXmin + (coordPoint.x - this.refMapX) * this.pixSize;\n" + " coordPoint.y = this.constrYmin + (coordPoint.y - this.refMapY) * this.pixSize;\n" + " }\n" + " return coordPoint;\n" + "}\n" + "\n" + "dragObj.prototype.handleEvent = function(evt) {\n" + " if (evt.type == \"mousemove\")) {\n" + " var mapCoords = this.calcCoord(evt);\n" + " this.coordXText.nodeValue = \"X: \" + formatNumberString(mapCoords.x.toFixed(this.mainMapObj.nrDecimals)) + this.mainMapObj.units;\n" + " this.coordYText.nodeValue = \"Y: \" + formatNumberString((mapCoords.y * -1).toFixed(this.mainMapObj.nrDecimals)) + this.mainMapObj.units;\n" + " }\n" + " this.drag(evt);\n" + "}\n" + "\n" + "dragObj.prototype.newView = function(x,y,width,height) {\n" + " this.myDragger.setAttributeNS(null,\"x\"),x);\n" + " this.myDragger.setAttributeNS(null,\"y\"),y);\n" + " this.myDragger.setAttributeNS(null,\"width\"),width);\n" + " this.myDragger.setAttributeNS(null,\"height\"),height);\n" + " this.myDragSymbol.setAttributeNS(null,\"x\"),(x + width/2));\n" + " this.myDragSymbol.setAttributeNS(null,\"y\"),(y + height/2));\n" + " if (width < this.dragSymbThreshold) {\n" + " this.myDragSymbol.setAttributeNS(null,\"visibility\"),\"visible\"));\n" + " }\n" + " else {\n" + " this.myDragSymbol.setAttributeNS(null,\"visibility\"),\"hidden\")); \n" + " }\n" + "}\n" + "\n" + ); +} + +//--------------------------------------------------------- +const char * CSVG_Interactive_Map::_Get_Code_Navigation_2(void) +{ + return( + "//this method was previously called \"resizeDragger\" - now renamed to .getSliderVal\n" + "//this method receives values from the zoom slider\n" + "dragObj.prototype.getSliderVal = function(status,sliderGroupName,width) {\n" + " var myX = parseFloat(this.myDragger.getAttributeNS(null,\"x\")));\n" + " var myY = parseFloat(this.myDragger.getAttributeNS(null,\"y\")));\n" + " var myWidth = parseFloat(this.myDragger.getAttributeNS(null,\"width\")));\n" + " var myHeight = parseFloat(this.myDragger.getAttributeNS(null,\"height\")));\n" + " var myCenterX = myX + myWidth / 2;\n" + " var myCenterY = myY + myHeight / 2;\n" + " var myRatio = myHeight / myWidth;\n" + " var toMoveX = myCenterX - width / 2;\n" + " var toMoveY = myCenterY - width * myRatio / 2;\n" + " if (toMoveX < this.constrXmin) {\n" + " toMoveX = this.constrXmin;\n" + " }\n" + " if ((toMoveX + width) > this.constrXmax) {\n" + " toMoveX = this.constrXmax - width;\n" + " }\n" + " if (toMoveY < this.constrYmin) {\n" + " toMoveY = this.constrYmin;\n" + " }\n" + " if ((toMoveY + width * myRatio) > this.constrYmax) {\n" + " toMoveY = this.constrYmax - width * myRatio;\n" + " }\n" + " this.newView(toMoveX,toMoveY,width,width * myRatio);\n" + " if (status == \"release\")) {\n" + " myMainMap.stopNavModes();\n" + " this.mainMapObj.newViewBox(this.dragId,true);\n" + " }\n" + "}\n" + "\n" + "dragObj.prototype.drag = function(evt) {\n" + " if (evt.type == \"mousedown\")) {\n" + " this.myRefMap.setAttributeNS(null,\"cursor\"),\"move\"));\n" + " this.status = true;\n" + " }\n" + " if ((evt.type == \"mousemove\" || evt.type == \"mousedown\")) && this.status == true) {\n" + " var coords = this.calcCoord(evt);\n" + " var newEvtX = coords.x;\n" + " var newEvtY = coords.y;\n" + " var myX = parseFloat(this.myDragger.getAttributeNS(null,\"x\")));\n" + " var myY = parseFloat(this.myDragger.getAttributeNS(null,\"y\")));\n" + " var myWidth = parseFloat(this.myDragger.getAttributeNS(null,\"width\")));\n" + " var myHeight = parseFloat(this.myDragger.getAttributeNS(null,\"height\")));\n" + " var toMoveX = newEvtX - myWidth / 2;\n" + " var toMoveY = newEvtY - myHeight / 2;\n" + " if (toMoveX < this.constrXmin) {\n" + " toMoveX = this.constrXmin;\n" + " }\n" + " if ((toMoveX + myWidth) > this.constrXmax) {\n" + " toMoveX = this.constrXmax - myWidth;\n" + " }\n" + " if (toMoveY < this.constrYmin) {\n" + " toMoveY = this.constrYmin;\n" + " }\n" + " if ((toMoveY + myHeight) > this.constrYmax) {\n" + " toMoveY = this.constrYmax - myHeight;\n" + " }\n" + " this.newView(toMoveX,toMoveY,myWidth,myHeight);\n" + " }\n" + " if ((evt.type == \"mouseup\" || evt.type == \"mouseout\")) && this.status == true) {\n" + " this.status = false;\n" + " if (evt.detail == 1) { //second click is ignored\n" + " this.myRefMap.setAttributeNS(null,\"cursor\"),\"crosshair\"));\n" + " this.mainMapObj.newViewBox('dragRectForRefMap',true);\n" + " }\n" + " }\n" + "}\n" + "\n" + "dragObj.prototype.zoom = function(inOrOut) {\n" + " var myOldX = this.myDragger.getAttributeNS(null,\"x\"));\n" + " var myOldY = this.myDragger.getAttributeNS(null,\"y\"));\n" + " var myOldWidth = this.myDragger.getAttributeNS(null,\"width\"));\n" + " var myOldHeight = this.myDragger.getAttributeNS(null,\"height\"));\n" + " switch (inOrOut) {\n" + " case \"in\":\n" + " var myNewX = parseFloat(myOldX) + myOldWidth / 2 - (myOldWidth * this.mainMapObj.zoomFact * 0.5);\n" + " var myNewY = parseFloat(myOldY) + myOldHeight / 2 - (myOldHeight * this.mainMapObj.zoomFact * 0.5);\n" + " var myNewWidth = myOldWidth * this.mainMapObj.zoomFact;\n" + " var myNewHeight = myOldHeight * this.mainMapObj.zoomFact;\n" + " if (myNewWidth < this.mainMapObj.minWidth) {\n" + " var myYXFact = this.mainMapObj.curHeight / this.mainMapObj.curWidth;\n" + " myNewWidth = this.mainMapObj.minWidth;\n" + " myNewHeight = myNewWidth * myYXFact;\n" + " myNewX = parseFloat(myOldX) + myOldWidth / 2 - (myNewWidth * 0.5);\n" + " myNewY = parseFloat(myOldY) + myOldHeight / 2 - (myNewHeight * 0.5);\n" + " }\n" + " break;\n" + " case \"out\":\n" + " var myNewX = parseFloat(myOldX) + myOldWidth / 2 - (myOldWidth * (1 + this.mainMapObj.zoomFact) * 0.5);\n" + " var myNewY = parseFloat(myOldY) + myOldHeight / 2 - (myOldHeight * (1 + this.mainMapObj.zoomFact) * 0.5);\n" + " var myNewWidth = myOldWidth * (1 + this.mainMapObj.zoomFact);\n" + " var myNewHeight = myOldHeight * (1 + this.mainMapObj.zoomFact);\n" + " break;\n" + " default:\n" + " var myNewX = this.constrXmin;\n" + " var myNewY = this.constrYmin;\n" + " var myNewWidth = this.constrXmax - this.constrXmin;\n" + " var myNewHeight = this.constrYmax - this.constrYmin;\n" + " break;\n" + " } \n" + " //check if within constraints\n" + " if (myNewWidth > (this.constrXmax - this.constrXmin)) {\n" + " myNewWidth = this.constrXmax - this.constrXmin;\n" + " }\n" + " if (myNewHeight > (this.constrYmax - this.constrYmin)) {\n" + " myNewHeight = this.constrYmax - this.constrYmin;\n" + " }\n" + " if (myNewX < this.constrXmin) {\n" + " myNewX = this.constrXmin;\n" + " }\n" + " if (myNewY < this.constrYmin) {\n" + " myNewY = this.constrYmin;\n" + " }\n" + " if ((myNewX + myNewWidth) > this.constrXmax) {\n" + " myNewX = this.constrXmax - myNewWidth;\n" + " }\n" + " if ((myNewY + myNewHeight) > this.constrYmax) {\n" + " myNewY = this.constrYmax - myNewHeight;\n" + " }\n" + " this.newView(myNewX,myNewY,myNewWidth,myNewHeight);\n" + " this.mainMapObj.newViewBox(this.dragId,true);\n" + "}\n" + "\n" + "dragObj.prototype.pan = function (myX,myY,howmuch) {\n" + " //get values from draggable rectangle\n" + " var xulcorner = parseFloat(this.myDragger.getAttributeNS(null,\"x\")));\n" + " var yulcorner = parseFloat(this.myDragger.getAttributeNS(null,\"y\")));\n" + " var width = parseFloat(this.myDragger.getAttributeNS(null,\"width\")));\n" + " var height = parseFloat(this.myDragger.getAttributeNS(null,\"height\")));\n" + "\n" + " //set values of draggable rectangle\n" + " var rectXulcorner = xulcorner + howmuch * width * myX;\n" + " var rectYulcorner = yulcorner + howmuch * height * myY;\n" + " //check if within constraints\n" + " if (rectXulcorner < this.constrXmin) {\n" + " rectXulcorner = this.constrXmin;\n" + " }\n" + " if (rectYulcorner < this.constrYmin) {\n" + " rectYulcorner = this.constrYmin;\n" + " }\n" + " if ((rectXulcorner + width) > this.constrXmax) {\n" + " rectXulcorner = this.constrXmax - width;\n" + " }\n" + " if ((rectYulcorner + height) > this.constrYmax) {\n" + " rectYulcorner = this.constrYmax - height;\n" + " }\n" + " this.newView(rectXulcorner,rectYulcorner,width,height);\n" + "\n" + " //set viewport of main map\n" + " if ((xulcorner != rectXulcorner) || (yulcorner != rectYulcorner)) {\n" + " this.mainMapObj.newViewBox(this.dragId,true);\n" + " }\n" + "\n" + " statusChange(\"map ready ...\"));\n" + "}\n" + "\n" + "//remove all temporarily used elements and event listeners\n" + "dragObj.prototype.cleanUp = function() {\n" + " //remove eventlisteners\n" + " if (this.showCoords == true) {\n" + " //add event listener for coordinate display\n" + " this.myRefMap.removeEventListener(\"mousemove\"),this,false);\n" + " }\n" + "}\n" + "\n" + "function zoomIt(evt,inOrOut) {\n" + " if (evt.detail == 1) { //only react on first click, double click: second click is ignored\n" + " if (inOrOut == \"in\")) {\n" + " if (Math.round(myMainMap.curWidth) > myMainMap.minWidth) {\n" + " myMapApp.refMapDragger.zoom(\"in\"));\n" + " }\n" + " else {\n" + " statusChange(\"Maximum zoom factor reached. Cannot zoom in any more.\"));\n" + " }\n" + " }\n" + " if (inOrOut == \"out\")) {\n" + " if (Math.round(myMainMap.curWidth) < myMainMap.maxWidth) {\n" + " myMapApp.refMapDragger.zoom(\"out\"));\n" + " }\n" + " else {\n" + " statusChange(\"Minimum zoom factor reached. Cannot zoom out any more.\"));\n" + " }\n" + " }\n" + " if (inOrOut == \"full\")) {\n" + " if (Math.round(myMainMap.curWidth) < myMainMap.maxWidth) {\n" + " myMapApp.refMapDragger.zoom(\"full\"));\n" + " }\n" + " else {\n" + " statusChange(\"Full view already reached.\"));\n" + " }\n" + " }\n" + " }\n" + "}\n" + "\n" + "//this function starts various zoom actions or map extent history functions\n" + "function zoomImageButtons(id,evt) {\n" + " myMainMap.stopNavModes();\n" + " if (id == \"zoomIn\")) {\n" + " zoomIt(evt,'in');\n" + " }\n" + " if (id == \"zoomOut\")) {\n" + " zoomIt(evt,'out');\n" + " }\n" + " if (id == \"zoomFull\")) {\n" + " zoomIt(evt,'full');\n" + " }\n" + " if (id == \"backwardExtent\")) {\n" + " myMainMap.backwardExtent();\n" + " }\n" + " if (id == \"forwardExtent\")) {\n" + " myMainMap.forwardExtent();\n" + " }\n" + "}\n" + "\n" + "//this function starts various interactive zoom or pan modes\n" + "function zoomImageSwitchButtons(id,evt,onOrOff) {\n" + " myMainMap.stopNavModes();\n" + " if (onOrOff) {\n" + " if (id == \"infoButton\")) {\n" + " \n" + " }\n" + " else {\n" + " if (id == \"zoomManual\")) {\n" + " myMainMap.zoomManual(evt);\n" + " }\n" + " if (id == \"panManual\")) {\n" + " myMainMap.panManual(evt);\n" + " }\n" + " if (id == \"recenterMap\")) {\n" + " myMainMap.recenter(evt);\n" + " }\n" + " if (myMapApp.buttons[\"infoButton\"].getSwitchValue()) {\n" + " myMapApp.buttons[\"infoButton\"].setSwitchValue(false,false);\n" + " }\n" + " }\n" + " }\n" + " else {\n" + " if (id == \"infoButton\")) {\n" + " myMapApp.buttons[\"infoButton\"].setSwitchValue(true,false);\n" + " }\n" + " }\n" + "}\n" + "\n" + "//alert map extent\n" + "function showExtent() {\n" + " with(myMainMap) {\n" + " alert(\n" + " \"Xmin=\"+curxOrig.toFixed(nrDecimals)+units+\n" + " \"); Xmax=\"+(curxOrig + curWidth).toFixed(nrDecimals)+units+\n" + " \"\\nYmin=\"+((curyOrig + curHeight) * -1).toFixed(nrDecimals) +units+\n" + " \"); Ymax=\"+(curyOrig*-1).toFixed(nrDecimals)+units+\n" + " \"\\nWidth=\"+curWidth.toFixed(nrDecimals)+units+\n" + " \"); Height=\"+curHeight.toFixed(nrDecimals)+units);\n" + " }\n" + "}\n" + "\n" + ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- diff -Nru saga-2.1.0+dfsg/src/modules/docs/docs_html/svg_interactive_map.h saga-2.1.4+dfsg/src/modules/docs/docs_html/svg_interactive_map.h --- saga-2.1.0+dfsg/src/modules/docs/docs_html/svg_interactive_map.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/docs/docs_html/svg_interactive_map.h 2014-11-13 08:32:17.000000000 +0000 @@ -0,0 +1,138 @@ +/********************************************************** + * Version $Id: svg_interactive_map.h 1922 2014-01-09 10:28:46Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// docs_html // +// // +//-------------------------------------------------------// +// // +// SVG_Interactive_map.cpp // +// // +// Copyright (C) 2005 by Victor Olaya // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// contact: Victor Olaya // +// // +// e-mail: volaya@saga-gis.org // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#ifndef _HEADER_INCLUDED__SAGA_GUI__svg_interactive_map_H +#define _HEADER_INCLUDED__SAGA_GUI__svg_interactive_map_H + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "doc_svg.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +class CSVG_Interactive_Map : public CSG_Doc_SVG, public CSG_Module +{ +public: + CSVG_Interactive_Map(void); + virtual ~CSVG_Interactive_Map(void); + +protected: + + virtual bool On_Execute(void); + + +private: + + CSG_String m_Directory; + double m_dWidth; + + + bool Create_From_Map (CSG_Parameter_Shapes_List *pList, CSG_Shapes *pIndexLayer, const SG_Char *Filename); + + void _Write_Code (const CSG_String &FileName, const CSG_String &Code); + + void _Add_Opening (CSG_Rect r); + + void _Add_CheckBoxes (CSG_Parameter_Shapes_List *pList); + void _Add_Shapes (CSG_Shapes *pLayer); + bool _Add_Shape (CSG_Shape *pShape, int Fill_Color, int Line_Color, double Line_Width, double Point_Width); + void _Add_Grid (CSG_Grid *pLayer); + void _Add_ReferenceMap (CSG_Shapes *pIndexLayer, CSG_Rect r); + void _Add_Label (const SG_Char* Label, CSG_Shape *pShape, double dSize, const SG_Char* Unit); + + const char * _Get_Opening_Code_1 (void); + const char * _Get_Opening_Code_2 (void); + + const char * _Get_Code_1 (void); + const char * _Get_Code_2 (void); + const char * _Get_Code_3 (void); + const char * _Get_Code_4 (void); + const char * _Get_Code_5 (void); + const char * _Get_Code_Closing_1 (void); + + const char * _Get_Code_CheckBox (void); + const char * _Get_Code_MapApp (void); + const char * _Get_Code_Timer (void); + const char * _Get_Code_Slider (void); + const char * _Get_Code_Helper (void); + const char * _Get_Code_Buttons (void); + const char * _Get_Code_Navigation_1 (void); + const char * _Get_Code_Navigation_2 (void); + +}; + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#endif // #ifndef _HEADER_INCLUDED__SAGA_GUI__svg_interactive_map_H diff -Nru saga-2.1.0+dfsg/src/modules/docs/docs_pdf/doc_pdf.cpp saga-2.1.4+dfsg/src/modules/docs/docs_pdf/doc_pdf.cpp --- saga-2.1.0+dfsg/src/modules/docs/docs_pdf/doc_pdf.cpp 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/docs/docs_pdf/doc_pdf.cpp 2014-11-13 08:32:17.000000000 +0000 @@ -0,0 +1,1712 @@ +/********************************************************** + * Version $Id: doc_pdf.cpp 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// docs_pdf // +// // +//-------------------------------------------------------// +// // +// doc_pdf.cpp // +// // +// Copyright (C) 2005 by // +// Victor Olaya, Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. // +// // +// This library is free software; you can redistribute // +// it and/or modify it under the terms of the GNU Lesser // +// General Public License as published by the Free // +// Software Foundation, version 2.1 of the License. // +// // +// This library is distributed in the hope that it will // +// be useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU Lesser General Public // +// License for more details. // +// // +// You should have received a copy of the GNU Lesser // +// General Public License along with this program; if // +// not, write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Goettingen // +// Goldschmidtstr. 5 // +// 37077 Goettingen // +// Germany // +// // +// e-mail: oconrad@saga-gis.org // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#ifndef _SAGA_DONOTUSE_HARU + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include + +#include "doc_pdf.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#define PDF_PAGE_WIDTH_A4 595.276 +#define PDF_PAGE_HEIGHT_A4 841.89 + +#define PDF_PAGE_HEIGHT_A4_M 0.297 + +#define PDF_PAGE_WIDTH_A3 PDF_PAGE_HEIGHT_A4 +#define PDF_PAGE_HEIGHT_A3 (PDF_PAGE_HEIGHT_A4 * sqrt(2.0)) + +#define PDF_METER_TO_POINT (PDF_PAGE_HEIGHT_A4 / PDF_PAGE_HEIGHT_A4_M) +#define PDF_POINT_TO_METER (PDF_PAGE_HEIGHT_A4_M / PDF_PAGE_HEIGHT_A4) + +//--------------------------------------------------------- +#define PDF_GET_R(c) (float)(SG_GET_R(c) / 255.0) +#define PDF_GET_G(c) (float)(SG_GET_G(c) / 255.0) +#define PDF_GET_B(c) (float)(SG_GET_B(c) / 255.0) + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +CSG_Doc_PDF::CSG_Doc_PDF(void) +{ + m_pPDF = NULL; + + Layout_Set_Box_Space(5, false); + + Open(); +} + +//--------------------------------------------------------- +CSG_Doc_PDF::CSG_Doc_PDF(TSG_PDF_Page_Size Size, int Orientation, const SG_Char *Title) +{ + m_pPDF = NULL; + + Layout_Set_Box_Space(5, false); + + Open(Size, Orientation, Title); +} + +//--------------------------------------------------------- +CSG_Doc_PDF::~CSG_Doc_PDF(void) +{ + Close(); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +const SG_Char * CSG_Doc_PDF::Get_Version(void) +{ + static CSG_String s = CSG_String::Format(SG_T("Haru Free PDF Library, Version %s"), HPDF_VERSION_TEXT); + + return( s ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CSG_Doc_PDF::Open(const SG_Char *Title) +{ + return( Open(PDF_PAGE_SIZE_A4, PDF_PAGE_ORIENTATION_PORTRAIT, Title) ); +} + +//--------------------------------------------------------- +bool CSG_Doc_PDF::Open(TSG_PDF_Page_Size Size, int Orientation, const SG_Char *Title) +{ + if( Close() ) + { + m_pPDF = HPDF_New(NULL, NULL); + + m_pOutline_Last_Level_0 = NULL; + m_pOutline_Last_Level_1 = NULL; + m_pOutline_Last_Level_2 = NULL; + + Set_Size_Page(Size, Orientation); + + if( Title && *Title ) + { + Add_Page_Title(Title); + } + + return( true ); + } + + return( false ); +} + +//--------------------------------------------------------- +bool CSG_Doc_PDF::Close(void) +{ + if( m_pPDF ) + { + try + { + HPDF_Free(m_pPDF); + } + catch(...) + { + return( false ); + } + } + + m_pPDF = NULL; + m_pPage = NULL; + m_nPages = 0; + + return( true ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CSG_Doc_PDF::Save(const SG_Char *FileName) +{ + if( m_pPDF && m_nPages > 0 && SG_Dir_Create(SG_File_Get_Path(FileName)) ) + { + try + { + return( HPDF_SaveToFile(m_pPDF, CSG_String(FileName)) == HPDF_OK ); + } + catch(...) + {} + } + + SG_UI_Msg_Add_Error(_TL("[ERR] Could not save PDF file.")); + + return( false ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +double CSG_Doc_PDF::Get_Page_To_Meter(void) +{ + return( PDF_POINT_TO_METER ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +struct _HPDF_Dict_Rec * CSG_Doc_PDF::_Get_Font(TSG_PDF_Font_Type Font) +{ + switch( Font ) + { + default: + case PDF_FONT_Helvetica: return( HPDF_GetFont(m_pPDF, "Helvetica" , NULL) ); + case PDF_FONT_Helvetica_Bold: return( HPDF_GetFont(m_pPDF, "Helvetica-Bold" , NULL) ); + case PDF_FONT_Helvetica_Oblique: return( HPDF_GetFont(m_pPDF, "Helvetica-Oblique" , NULL) ); + case PDF_FONT_Helvetica_BoldOblique: return( HPDF_GetFont(m_pPDF, "Helvetica-BoldOblique", NULL) ); + case PDF_FONT_Times_Roman: return( HPDF_GetFont(m_pPDF, "Times-Roman" , NULL) ); + case PDF_FONT_Times_Bold: return( HPDF_GetFont(m_pPDF, "Times-Bold" , NULL) ); + case PDF_FONT_Times_Italic: return( HPDF_GetFont(m_pPDF, "Times-Italic" , NULL) ); + case PDF_FONT_Times_BoldItalic: return( HPDF_GetFont(m_pPDF, "Times-BoldItalic" , NULL) ); + case PDF_FONT_Courier: return( HPDF_GetFont(m_pPDF, "Courier" , NULL) ); + case PDF_FONT_Courier_Bold: return( HPDF_GetFont(m_pPDF, "Courier-Bold" , NULL) ); + case PDF_FONT_Courier_Oblique: return( HPDF_GetFont(m_pPDF, "Courier-Oblique" , NULL) ); + case PDF_FONT_Courier_BoldOblique: return( HPDF_GetFont(m_pPDF, "Courier-BoldOblique" , NULL) ); + case PDF_FONT_Symbol: return( HPDF_GetFont(m_pPDF, "Symbol" , NULL) ); + case PDF_FONT_ZapfDingbats: return( HPDF_GetFont(m_pPDF, "ZapfDingbats" , NULL) ); + } + + return( NULL ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CSG_Doc_PDF::Layout_Add_Box(double xMin_Percent, double yMin_Percent, double xMax_Percent, double yMax_Percent, const CSG_String &ID) +{ + if( m_Boxes_Percent.Add(xMin_Percent, yMin_Percent, xMax_Percent, yMax_Percent) ) + { + m_Boxes.Add(); + m_Boxes_ID.Add(ID); + + _Layout_Set_Box(m_Boxes.Get_Count() - 1); + + return( true ); + } + + return( false ); +} + +//--------------------------------------------------------- +bool CSG_Doc_PDF::Layout_Add_Box(const CSG_Rect &Box_Percent, const CSG_String &ID) +{ + return( Layout_Add_Box(Box_Percent.Get_XMin(), Box_Percent.Get_YMin(), Box_Percent.Get_XMax(), Box_Percent.Get_YMax(), ID) ); +} + +//--------------------------------------------------------- +const CSG_Rect & CSG_Doc_PDF::Layout_Get_Box(const CSG_String &ID) +{ + for(int i=0; i= 0 && iBox < m_Boxes.Get_Count() && iBox < m_Boxes_Percent.Get_Count() ) + { + m_Boxes[iBox].Assign( + m_Size_Margins.Get_XMin() + 0.01 * m_Boxes_Percent[iBox].Get_XMin() * m_Size_Margins.Get_XRange(), + m_Size_Margins.Get_YMax() - 0.01 * m_Boxes_Percent[iBox].Get_YMax() * m_Size_Margins.Get_YRange(), + m_Size_Margins.Get_XMin() + 0.01 * m_Boxes_Percent[iBox].Get_XMax() * m_Size_Margins.Get_XRange(), + m_Size_Margins.Get_YMax() - 0.01 * m_Boxes_Percent[iBox].Get_YMin() * m_Size_Margins.Get_YRange() + ); + + m_Boxes[iBox].Deflate(m_Boxes_Space, m_Boxes_Space_bPercent); + } +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CSG_Doc_PDF::_Fit_Rectangle(double &x, double &y, double &dx, double &dy, double XToY_Ratio, bool bShrink) +{ + if( XToY_Ratio != 0.0 && dx != 0.0 && dy != 0.0 ) + { + if( XToY_Ratio > dx / dy ) + { + if( bShrink ) + { + XToY_Ratio = dx / XToY_Ratio; + y += (dy - XToY_Ratio) / 2.0; + dy = XToY_Ratio; + } + else + { + XToY_Ratio = dy * XToY_Ratio; + x -= (dx - XToY_Ratio) / 2.0; + dx = XToY_Ratio; + } + } + else + { + if( bShrink ) + { + XToY_Ratio = dy * XToY_Ratio; + x += (dx - XToY_Ratio) / 2.0; + dx = XToY_Ratio; + } + else + { + XToY_Ratio = dx / XToY_Ratio; + y -= (dy - XToY_Ratio) / 2.0; + dy = XToY_Ratio; + } + } + + return( true ); + } + + return( false ); +} + +//--------------------------------------------------------- +bool CSG_Doc_PDF::_Fit_Rectangle(CSG_Rect &r, double XToY_Ratio, bool bShrink) +{ + double x, y, dx, dy; + + x = r.Get_XMin(); + y = r.Get_YMin(); + dx = r.Get_XRange(); + dy = r.Get_YRange(); + + if( _Fit_Rectangle(x, y, dx, dy, XToY_Ratio, bShrink) ) + { + r.Assign(x, y, x + dx, y + dy); + + return( true ); + } + + return( false ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CSG_Doc_PDF::_Add_Outline_Item(const SG_Char *Title, struct _HPDF_Dict_Rec *pPage, TSG_PDF_Title_Level Level) +{ + if( m_pPDF && pPage ) + { + HPDF_Outline pOutlineItem = NULL; + + switch( Level ) + { + case PDF_TITLE: + pOutlineItem = m_pOutline_Last_Level_0 = HPDF_CreateOutline(m_pPDF, NULL, CSG_String(Title), NULL); + break; + + case PDF_TITLE_01: + if( m_pOutline_Last_Level_0 ) + { + pOutlineItem = m_pOutline_Last_Level_1 = HPDF_CreateOutline(m_pPDF, m_pOutline_Last_Level_0, CSG_String(Title), NULL); + } + break; + + case PDF_TITLE_02: + if( m_pOutline_Last_Level_1 ) + { + pOutlineItem = m_pOutline_Last_Level_2 = HPDF_CreateOutline(m_pPDF, m_pOutline_Last_Level_1, CSG_String(Title), NULL); + } + break; + + case PDF_TITLE_NONE: + if( m_pOutline_Last_Level_2 ) + { + pOutlineItem = HPDF_CreateOutline(m_pPDF, m_pOutline_Last_Level_2, CSG_String(Title), NULL); + } + break; + + } + + if( pOutlineItem ) + { + if( pPage ) + { + struct _HPDF_Array_Rec *pDestination = HPDF_Page_CreateDestination(pPage); + + HPDF_Destination_SetFit (pDestination); + HPDF_Outline_SetDestination (pOutlineItem, pDestination); + } + + return( true ); + } + } + + return( false ); +} + +//--------------------------------------------------------- +bool CSG_Doc_PDF::Add_Outline_Item(const SG_Char *Title) +{ + return( _Add_Outline_Item(Title, m_pPage, _Get_Lowest_Outline_Level()) ); +} + +//--------------------------------------------------------- +TSG_PDF_Title_Level CSG_Doc_PDF::_Get_Lowest_Outline_Level(void) +{ + if( m_pOutline_Last_Level_2 ) + { + return( PDF_TITLE_NONE ); + } + else if( m_pOutline_Last_Level_1 ) + { + return( PDF_TITLE_02 ); + } + else if( m_pOutline_Last_Level_0 ) + { + return( PDF_TITLE_01 ); + } + + return( PDF_TITLE ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CSG_Doc_PDF::Add_Page(void) +{ + return( Add_Page(m_Size_Paper.Get_XRange(), m_Size_Paper.Get_YRange()) ); +} + +//--------------------------------------------------------- +bool CSG_Doc_PDF::Add_Page(TSG_PDF_Page_Size Size, int Orientation) +{ + if( Add_Page() ) + { + return( Set_Size_Page(Size, Orientation) ); + } + + return( false ); +} + +//--------------------------------------------------------- +bool CSG_Doc_PDF::Add_Page(double Width, double Height) +{ + if( m_pPDF ) + { + m_nPages++; + + m_pPage = HPDF_AddPage(m_pPDF); + + Set_Size_Page(Width, Height); + + HPDF_Page_SetRGBStroke (m_pPage, 0.0, 0.0, 0.0); + HPDF_Page_SetRGBFill (m_pPage, 1.0, 1.0, 1.0); + + return( true ); + } + + return( false ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CSG_Doc_PDF::Set_Size_Page(TSG_PDF_Page_Size Size, int Orientation) +{ + double Width, Height; + + switch( Size ) + { + case PDF_PAGE_SIZE_A4: default: + Width = PDF_PAGE_WIDTH_A4; + Height = PDF_PAGE_HEIGHT_A4; + break; + + case PDF_PAGE_SIZE_A3: + Width = PDF_PAGE_WIDTH_A3; + Height = PDF_PAGE_HEIGHT_A3; + break; + } + + //----------------------------------------------------- + if( Orientation == PDF_PAGE_ORIENTATION_LANDSCAPE ) + { + double a; + + a = Width; + Width = Height; + Height = a; + } + + return( Set_Size_Page(Width, Height) ); +} + +//--------------------------------------------------------- +bool CSG_Doc_PDF::Set_Size_Page(double Width, double Height) +{ + if( Width > 0.0 && Height > 0.0 ) + { + m_Size_Paper.Assign(0.0, 0.0, Width, Height); + + m_Size_Margins = m_Size_Paper; + m_Size_Margins.Deflate(10.0, false); + + _Layout_Set_Boxes(); + + if( m_pPage ) + { + HPDF_Page_SetWidth (m_pPage, (float)m_Size_Paper.Get_XRange()); + HPDF_Page_SetHeight (m_pPage, (float)m_Size_Paper.Get_YRange()); + } + } + + return( true ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CSG_Doc_PDF::Add_Page_Title(const SG_Char *Title, TSG_PDF_Title_Level Level, TSG_PDF_Page_Size Size, int Orientation) +{ + bool bLine, bDestination, bPage; + int FontSize; + + //----------------------------------------------------- + if( Add_Page() ) + { + if( m_nPages % 2 - 1 ) + { + Add_Page(); + } + + if( Size != PDF_PAGE_SIZE_PREVIOUS || Orientation != PDF_PAGE_ORIENTATION_PREVIOUS ) + { + Set_Size_Page(Size, Orientation); + } + + //------------------------------------------------- + switch( Level ) + { + case PDF_TITLE: + FontSize = 26; + bLine = true; + bDestination = true; + bPage = true; + break; + + case PDF_TITLE_01: + FontSize = 22; + bLine = true; + bDestination = false; + bPage = true; + break; + + case PDF_TITLE_02: + FontSize = 20; + bLine = false; + bDestination = false; + bPage = false; + break; + } + + _Add_Outline_Item(Title, m_pPage, Level); + + //------------------------------------------------- + Draw_Text(Get_Margins().Get_XCenter(), Get_Margins().Get_YCenter(), Title, FontSize, PDF_STYLE_TEXT_ALIGN_H_CENTER, 0.0, SG_GET_RGB(0, 0, 0)); + + //------------------------------------------------- + if( bLine ) + { + double y = Get_Margins().Get_YCenter() - 25.0; + + Draw_Line(Get_Margins().Get_XMin(), y, Get_Margins().Get_XMax(), y, 5, SG_GET_RGB(0, 0, 0), PDF_STYLE_LINE_END_ROUND); + } + + if( bPage ) + { + Add_Page(); + } + + return( true ); + } + + return( false ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CSG_Doc_PDF::_Set_Style_FillStroke(int Style, int Fill_Color, int Line_Color, int Line_Width) +{ + if( Is_Ready_To_Draw() ) + { + if( Style & PDF_STYLE_POLYGON_STROKE ) + { + if( Style & PDF_STYLE_LINE_END_ROUND ) + { + HPDF_Page_SetLineCap(m_pPage, HPDF_ROUND_END); + } + else if( Style & PDF_STYLE_LINE_END_SQUARE ) + { + HPDF_Page_SetLineCap(m_pPage, HPDF_PROJECTING_SCUARE_END); + } + else // if( Style & PDF_STYLE_LINE_END_BUTT ) + { + HPDF_Page_SetLineCap(m_pPage, HPDF_BUTT_END); + } + + if( Style & PDF_STYLE_LINE_JOIN_ROUND ) + { + HPDF_Page_SetLineJoin(m_pPage, HPDF_ROUND_JOIN); + } + else if( Style & PDF_STYLE_LINE_JOIN_BEVEL ) + { + HPDF_Page_SetLineJoin(m_pPage, HPDF_BEVEL_JOIN); + } + else // if( Style & PDF_STYLE_LINE_JOIN_MITER ) + { + HPDF_Page_SetLineJoin(m_pPage, HPDF_MITER_JOIN); + } + + HPDF_Page_SetRGBStroke (m_pPage, PDF_GET_R(Line_Color), PDF_GET_G(Line_Color), PDF_GET_B(Line_Color)); + + HPDF_Page_SetLineWidth (m_pPage, (float)Line_Width); + } + + //------------------------------------------------- + if( Style & PDF_STYLE_POLYGON_FILL ) + { + HPDF_Page_SetRGBFill(m_pPage, PDF_GET_R(Fill_Color), PDF_GET_G(Fill_Color), PDF_GET_B(Fill_Color)); + } + + return( true ); + } + + return( false ); +} + +//--------------------------------------------------------- +bool CSG_Doc_PDF::Draw_Point(double x, double y, double Width, int Style, int Fill_Color, int Line_Color, int Line_Width) +{ + if( Is_Ready_To_Draw() ) + { + Width /= 2.0; + + //------------------------------------------------- + // if( Style & PDF_STYLE_POINT_CIRCLE ) + { + } + // else // if( Style & PDF_STYLE_POINT_SQUARE ) + { + return( Draw_Rectangle(x - Width, y - Width, x + Width, y + Width, Style, Fill_Color, Line_Color, Line_Width) ); + } + } + + return( false ); +} + +//--------------------------------------------------------- +bool CSG_Doc_PDF::Draw_Line(double xa, double ya, double xb, double yb, int Width, int Color, int Style) +{ + CSG_Points Points; + + Points.Add(xa, ya); + Points.Add(xb, yb); + + return( Draw_Line(Points, Width, Color, Style) ); +} + +bool CSG_Doc_PDF::Draw_Line(CSG_Points &Points, int Width, int Color, int Style) +{ + if( Points.Get_Count() > 1 && _Set_Style_FillStroke(Style|PDF_STYLE_POLYGON_STROKE, 0, Color, Width) ) + { + HPDF_Page_MoveTo(m_pPage, (float)Points[0].x, (float)Points[0].y); + + for(int i=1; i 2 && _Set_Style_FillStroke(Style, Fill_Color, Line_Color, Line_Width) ) + { + HPDF_Page_MoveTo(m_pPage, (float)Points[0].x, (float)Points[0].y); + + for(int i=1; i 0 ) + { + for(int i=0; i= 0 ) + { + Strings.Add(String.Left(n)); + String.Remove(0, n + 1); + } + + if( Strings.Get_Count() > 0 ) + { + if( String.Length() > 0 ) + { + Strings.Add(String); + } + + return( Draw_Text(x, y, Strings, Size, Style, Angle, Color, Font) ); + } + + return( _Draw_Text(x, y, Text, Size, Style, Angle, Color, Font) ); +} + +//--------------------------------------------------------- +bool CSG_Doc_PDF::_Draw_Text(double x, double y, const SG_Char *Text, int Size, int Style, double Angle, int Color, TSG_PDF_Font_Type Font) +{ + float Width, Height; + + if( m_pPage && Text && *Text != '\0' ) + { + double ax, ay, bx, by; + + HPDF_Page_SetFontAndSize(m_pPage, _Get_Font(Font), (float)Size); + + HPDF_Page_SetTextRenderingMode(m_pPage, HPDF_FILL_THEN_STROKE); + HPDF_Page_SetLineWidth (m_pPage, 0); + HPDF_Page_SetRGBStroke (m_pPage, PDF_GET_R(Color), PDF_GET_G(Color), PDF_GET_B(Color)); + HPDF_Page_SetRGBFill (m_pPage, PDF_GET_R(Color), PDF_GET_G(Color), PDF_GET_B(Color)); + + Width = HPDF_Page_TextWidth(m_pPage, CSG_String(Text)) * (float)cos(Angle); + Height = HPDF_Page_TextWidth(m_pPage, CSG_String(Text)) * (float)sin(Angle) + Size; + + //------------------------------------------------- + if( Style & PDF_STYLE_TEXT_ALIGN_H_CENTER ) + { + ax = x - HPDF_Page_TextWidth(m_pPage, CSG_String(Text)) / 2.0; + } + else if( Style & PDF_STYLE_TEXT_ALIGN_H_RIGHT ) + { + ax = x - HPDF_Page_TextWidth(m_pPage, CSG_String(Text)); + } + else + { + ax = x; + } + + bx = ax + HPDF_Page_TextWidth(m_pPage, CSG_String(Text)); + + if( Style & PDF_STYLE_TEXT_ALIGN_V_CENTER ) + { + ay = y - Size / 2.0; + } + else if( Style & PDF_STYLE_TEXT_ALIGN_V_TOP ) + { + ay = y - Size; + } + else + { + ay = y; + } + + by = ay; + + //------------------------------------------------- + HPDF_Page_BeginText(m_pPage); + + if( Angle != 0.0 ) + { + double dSin, dCos, dx, dy; + + dSin = sin(-Angle); + dCos = cos(-Angle), + + dx = ax - x, + dy = ay - y; + ax = x + dCos * dx + dSin * dy; + ay = y - dSin * dx + dCos * dy; + + dx = bx - x, + dy = by - y; + bx = x + dCos * dx + dSin * dy; + by = y - dSin * dx + dCos * dy; + + dSin = sin(Angle); + dCos = cos(Angle), + + HPDF_Page_SetTextMatrix(m_pPage, (float)dCos, (float)dSin, -(float)dSin, (float)dCos, (float)ax, (float)ay); + } + else + { + HPDF_Page_MoveTextPos(m_pPage, (float)ax, (float)ay); + } + + HPDF_Page_ShowText(m_pPage, CSG_String(Text)); + HPDF_Page_EndText(m_pPage); + + //------------------------------------------------- + if( Style & PDF_STYLE_TEXT_UNDERLINE ) + { + double dx, dy; + + dy = 0.2 * Size * (ax - bx) / SG_Get_Distance(ax, ay, bx, by); + dx = -0.2 * Size * (ay - by) / SG_Get_Distance(ax, ay, bx, by); + + Draw_Line(ax + dx, ay + dy, bx + dx, by + dy, (int)(0.1 * Size), Color); + } + + if( Style & PDF_STYLE_TEXT_STROKE ) + { + double dx, dy; + + dy = -0.4 * Size * (ax - bx) / SG_Get_Distance(ax, ay, bx, by); + dx = 0.4 * Size * (ay - by) / SG_Get_Distance(ax, ay, bx, by); + + Draw_Line(ax + dx, ay + dy, bx + dx, by + dy, (int)(0.1 * Size), Color); + } + + return( true ); + } + + return( false ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CSG_Doc_PDF::Draw_Image(double x, double y, double dx, double dy, const SG_Char *FileName) +{ + bool bKeepRatio = true; + double nx, ny; + HPDF_Image pImage = NULL; + + //----------------------------------------------------- + if( m_pPage && SG_File_Exists(FileName) && dx > 0.0 && dy > 0.0 ) + { + if( SG_File_Cmp_Extension(FileName, SG_T("png")) ) + { + try { pImage = HPDF_LoadPngImageFromFile (m_pPDF, CSG_String(FileName)); } catch(...) {} + } + else if( SG_File_Cmp_Extension(FileName, SG_T("jpg")) ) + { + try { pImage = HPDF_LoadJpegImageFromFile(m_pPDF, CSG_String(FileName)); } catch(...) {} + } + } + + //----------------------------------------------------- + if( pImage && (nx = HPDF_Image_GetWidth(pImage)) > 0 && (ny = HPDF_Image_GetHeight(pImage)) > 0 ) + { + if( bKeepRatio ) + { + _Fit_Rectangle(x, y, dx, dy, nx / ny, true); + } + + HPDF_Page_DrawImage(m_pPage, pImage, (float)x, (float)y, (float)dx, (float)dy); + + return( true ); + } + + return( false ); +} + +//--------------------------------------------------------- +bool CSG_Doc_PDF::Draw_Image(const CSG_Rect &r, const SG_Char *FileName) +{ + return( Draw_Image(r.Get_XMin(), r.Get_YMin(), r.Get_XRange(), r.Get_YRange(), FileName) ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CSG_Doc_PDF::Draw_Graticule(const CSG_Rect &r, const CSG_Rect &rWorld, int Size) +{ + if( Is_Ready_To_Draw() ) + { + CSG_Rect rRuler, rFrame(r); + + rFrame.Inflate(Size, false); + + Draw_Rectangle(rFrame, PDF_STYLE_POLYGON_STROKE); + Draw_Rectangle(r , PDF_STYLE_POLYGON_STROKE); + + rRuler.Assign(r.Get_XMin(), r.Get_YMax(), r.Get_XMax(), rFrame.Get_YMax()); + _Draw_Ruler(rRuler, rWorld.Get_XMin(), rWorld.Get_XMax() , true , true , false); + + rRuler.Assign(r.Get_XMin(), r.Get_YMin(), r.Get_XMax(), rFrame.Get_YMin()); + _Draw_Ruler(rRuler, 0.0 , rWorld.Get_XRange(), true , true , true); + + rRuler.Assign(r.Get_XMin(), r.Get_YMin(), rFrame.Get_XMin(), r.Get_YMax()); + _Draw_Ruler(rRuler, rWorld.Get_YMin(), rWorld.Get_YMax() , false, false, false); + + rRuler.Assign(r.Get_XMax(), r.Get_YMin(), rFrame.Get_XMax(), r.Get_YMax()); + _Draw_Ruler(rRuler, 0.0 , rWorld.Get_YRange(), false, false, true); + + return( true ); + } + + return( false ); +} + +//--------------------------------------------------------- +#define RULER_TEXT_SPACE 4 + +//--------------------------------------------------------- +bool CSG_Doc_PDF::_Draw_Ruler(const CSG_Rect &r, double zMin, double zMax, bool bHorizontal, bool bAscendent, bool bTickAtTop) +{ + int Decimals, FontSize; + double xOff, yOff, Width, Height, Height_Tick, z, dz, zToDC, zDC, zPos, tPos; + CSG_String s; + + //----------------------------------------------------- + Width = bHorizontal ? r.Get_XRange() : r.Get_YRange(); + Height = bHorizontal ? r.Get_YRange() : r.Get_XRange(); + + if( Is_Ready_To_Draw() && zMin < zMax && Width > 0 && Height > 0 ) + { + xOff = r.Get_XMin(); + yOff = r.Get_YMax(); + + FontSize = (int)(0.45 * (double)Height); + HPDF_Page_SetFontAndSize(m_pPage, _Get_Font(PDF_FONT_DEFAULT), (float)FontSize); + + Height_Tick = (int)(0.3 * (double)Height); + + //------------------------------------------------- + zToDC = (double)Width / (zMax - zMin); + + dz = pow(10.0, floor(log10(zMax - zMin)) - 1.0); + Decimals = dz >= 1.0 ? 0 : (int)fabs(log10(dz)); + + s.Printf(SG_T("%.*f"), Decimals, zMax); + zDC = HPDF_Page_TextWidth(m_pPage, CSG_String(s)); + while( zToDC * dz < zDC + RULER_TEXT_SPACE ) + { + dz *= 2; + } + + //------------------------------------------------- + z = dz * floor(zMin / dz); + if( z < zMin ) z += dz; + + for(; z<=zMax; z+=dz) + { + s.Printf(SG_T("%.*f"), Decimals, z); + + zDC = bAscendent ? zToDC * (z - zMin) : Width - zToDC * (z - zMin); + + if( bHorizontal ) + { + zPos = xOff + zDC; + + if( bTickAtTop ) + { + tPos = yOff; + Draw_Line(zPos, tPos - Height_Tick, zPos, yOff); + Draw_Text(zPos, tPos - Height_Tick, s, FontSize, PDF_STYLE_TEXT_ALIGN_H_CENTER|PDF_STYLE_TEXT_ALIGN_V_TOP, 0.0); + } + else + { + tPos = yOff - Height; + Draw_Line(zPos, tPos + Height_Tick, zPos, tPos); + Draw_Text(zPos, tPos + Height_Tick, s, FontSize, PDF_STYLE_TEXT_ALIGN_H_CENTER|PDF_STYLE_TEXT_ALIGN_V_BOTTOM, 0.0); + } + } + else + { + zPos = yOff - zDC; + + if( bTickAtTop ) + { + tPos = xOff; + Draw_Line(tPos + Height_Tick, zPos, tPos, zPos); + Draw_Text(tPos + Height_Tick, zPos, s, FontSize, PDF_STYLE_TEXT_ALIGN_H_CENTER|PDF_STYLE_TEXT_ALIGN_V_TOP, M_DEG_TO_RAD * 90.0); + } + else + { + tPos = xOff + Height; + Draw_Line(tPos - Height_Tick, zPos, tPos, zPos); + Draw_Text(tPos - Height_Tick, zPos, s, FontSize, PDF_STYLE_TEXT_ALIGN_H_CENTER|PDF_STYLE_TEXT_ALIGN_V_BOTTOM, M_DEG_TO_RAD * 90.0); + } + } + } + + return( true ); + } + + return( false ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CSG_Doc_PDF::_Draw_Table(CSG_Rect r, CSG_Table *pTable, int iRecord, int nRecords, double CellHeight, double HeaderHeightRel) +{ + int iField, dyFont, dyFont_Hdr; + double xPos, yPos, dxPos, dyPos, dyPos_Hdr, xSpace, ySpace, ySpace_Hdr; + bool bAddHeader; + CSG_Table_Record *pRecord; + + if( pTable && pTable->is_Valid() && iRecord < pTable->Get_Record_Count() ) + { + // Draw_Text(r.Get_XMin(), r.Get_YMax(), pTable->Get_Name(), 16); // the table's name should not be drawn here... + + dxPos = r.Get_XRange() / pTable->Get_Field_Count(); + + if( HeaderHeightRel < 1.0 ) + HeaderHeightRel = 1.0; + + dyPos = CellHeight > 0.0 ? CellHeight : r.Get_YRange() / (nRecords + HeaderHeightRel); + dyPos_Hdr = dyPos * HeaderHeightRel; + + dyFont = (int)(0.75 * dyPos); + dyFont_Hdr = (int)(0.75 * dyPos_Hdr); + + ySpace = 0.1 * dyPos; + ySpace_Hdr = 0.1 * dyPos_Hdr; + xSpace = ySpace; + + nRecords += iRecord; + + if( nRecords > pTable->Get_Record_Count() ) + { + nRecords = pTable->Get_Record_Count(); + } + + //------------------------------------------------- + for(yPos=r.Get_YMax(), bAddHeader=true; iRecordGet_Field_Count(); iField++, xPos+=dxPos) + { + Draw_Rectangle(xPos, yPos, xPos + dxPos, yPos - dyPos_Hdr, PDF_STYLE_POLYGON_FILLSTROKE, SG_COLOR_GREY_LIGHT, SG_COLOR_BLACK, 0); + Draw_Text(xPos + xSpace, yPos - ySpace_Hdr, pTable->Get_Field_Name(iField), dyFont_Hdr, PDF_STYLE_TEXT_ALIGN_H_LEFT|PDF_STYLE_TEXT_ALIGN_V_TOP); + } + + yPos -= dyPos_Hdr; + bAddHeader = false; + } + + //--------------------------------------------- + pRecord = pTable->Get_Record(iRecord); + + for(iField=0, xPos=r.Get_XMin(); iFieldGet_Field_Count(); iField++, xPos+=dxPos) + { + Draw_Rectangle(xPos, yPos, xPos + dxPos, yPos - dyPos, PDF_STYLE_POLYGON_STROKE, SG_COLOR_WHITE, SG_COLOR_BLACK, 0); + Draw_Text(xPos + xSpace, yPos - ySpace, pRecord->asString(iField), dyFont, PDF_STYLE_TEXT_ALIGN_H_LEFT|PDF_STYLE_TEXT_ALIGN_V_TOP); + } + } + + return( true ); + } + + return( false ); +} + +//--------------------------------------------------------- +bool CSG_Doc_PDF::Draw_Table(const CSG_Rect &r, CSG_Table *pTable, double CellHeight, double HeaderHeightRel) +{ + if( pTable && pTable->is_Valid() ) + { + return( _Draw_Table(r, pTable, 0, pTable->Get_Record_Count(), CellHeight, HeaderHeightRel) ); + } + + return( false ); +} + +//--------------------------------------------------------- +bool CSG_Doc_PDF::Draw_Table(const CSG_Rect &r, CSG_Table *pTable, int nColumns, double CellHeight, double HeaderHeightRel) +{ + if( pTable && pTable->is_Valid() && nColumns > 1 ) + { + int nRecords; + double dx, dxSpace; + CSG_Rect rColumn(r), rTable(r); + + dxSpace = 4; + rTable.Inflate(dxSpace, 0.0, false); + dx = rTable.Get_XRange() / (double)nColumns; + nRecords = pTable->Get_Record_Count() / nColumns; + + for(int i=0, iRecord=0; iis_Valid() ) + { + int iPart, iPoint; + TSG_Point Point; + CSG_Points Points; + + for(iPart=0; iPartGet_Part_Count(); iPart++) + { + Points.Clear(); + + for(iPoint=0; iPointGet_Point_Count(iPart); iPoint++) + { + Point = pShape->Get_Point(iPoint, iPart); + Point.x = r.Get_XMin() + World2PDF * (Point.x - xMin); + Point.y = r.Get_YMin() + World2PDF * (Point.y - yMin); + Points.Add(Point.x, Point.y); + } + + switch( pShape->Get_Type() ) + { + case SHAPE_TYPE_Point: + case SHAPE_TYPE_Points: + for(iPoint=0; iPointis_Lake(iPart) ) + { + Draw_Polygon(Points, PDF_STYLE_POLYGON_FILLSTROKE, SG_COLOR_WHITE, Line_Color, Line_Width); + } + else + { + Draw_Polygon(Points, Style, Fill_Color, Line_Color, Line_Width); + } + break; + } + } + + return( true ); + } + + return( false ); +} + +//--------------------------------------------------------- +bool CSG_Doc_PDF::Draw_Shape(const CSG_Rect &r, CSG_Shape *pShape, int Style, int Fill_Color, int Line_Color, int Line_Width, CSG_Rect *prWorld) +{ + double World2PDF; + CSG_Rect rWorld, rFit; + + if( pShape && pShape->is_Valid() && r.Get_XRange() > 0.0 && r.Get_YRange() > 0.0 ) + { + rWorld = prWorld ? *prWorld : pShape->Get_Extent(); + + if( rWorld.Get_XRange() > 0.0 && rWorld.Get_YRange() > 0.0 ) + { + _Fit_Rectangle(rFit = r, rWorld.Get_XRange() / rWorld.Get_YRange(), true); + + World2PDF = rFit.Get_XRange() / rWorld.Get_XRange(); + + _Draw_Shape(rFit, pShape, rWorld.Get_XMin(), rWorld.Get_YMin(), World2PDF, Style, Fill_Color, Line_Color, Line_Width, Line_Width); + + return( true ); + } + } + + return( false ); +} + +//--------------------------------------------------------- +bool CSG_Doc_PDF::Draw_Shapes(const CSG_Rect &r, CSG_Shapes *pShapes, int Style, int Fill_Color, int Line_Color, int Line_Width, CSG_Rect *prWorld) +{ + double World2PDF; + CSG_Rect rWorld, rFit; + + if( pShapes && pShapes->is_Valid() && r.Get_XRange() > 0.0 && r.Get_YRange() > 0.0 ) + { + rWorld = prWorld ? *prWorld : pShapes->Get_Extent(); + + if( rWorld.Get_XRange() > 0.0 && rWorld.Get_YRange() > 0.0 ) + { + _Fit_Rectangle(rFit = r, rWorld.Get_XRange() / rWorld.Get_YRange(), true); + + World2PDF = rFit.Get_XRange() / rWorld.Get_XRange(); + + for(int iShape=0; iShapeGet_Count(); iShape++) + { + _Draw_Shape(rFit, pShapes->Get_Shape(iShape), rWorld.Get_XMin(), rWorld.Get_YMin(), World2PDF, Style, Fill_Color, Line_Color, Line_Width, Line_Width); + } + + return( true ); + } + } + + return( false ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CSG_Doc_PDF::Draw_Grid(const CSG_Rect &r, CSG_Grid *pGrid, const CSG_Colors &Colors, double zMin, double zMax, int Style, CSG_Rect *prWorld) +{ + double x, y, z, d, xFit, yFit, dFit; + CSG_Rect rWorld, rFit; + + if( Is_Ready_To_Draw() && pGrid && pGrid->is_Valid() && pGrid->Get_ZRange() > 0.0 ) + { + rWorld = prWorld ? *prWorld : pGrid->Get_Extent(); + + if( rWorld.Get_XRange() > 0.0 && rWorld.Get_YRange() > 0.0 ) + { + _Fit_Rectangle(rFit = r, rWorld.Get_XRange() / rWorld.Get_YRange(), true); + + dFit = 1.0; + d = dFit * (rWorld.Get_XRange() / rFit.Get_XRange()); + + if( zMin >= zMax ) + { + zMin = pGrid->Get_ZMin(); + zMax = pGrid->Get_ZMax(); + } + + zMax = Colors.Get_Count() / (zMax - zMin); + + for(y=rWorld.Get_YMin(), yFit=rFit.Get_YMin(); yFitGet_Extent().Get_YMax(); y++, yFit+=dFit, y+=d) + { + for(x=rWorld.Get_XMin(), xFit=rFit.Get_XMin(); xFitGet_Extent().Get_XMax(); x++, xFit+=dFit, x+=d) + { + if( pGrid->Get_Value(x, y, z) ) + { + Draw_Point(xFit, yFit, dFit, PDF_STYLE_POINT_SQUARE|PDF_STYLE_POLYGON_FILL, Colors.Get_Color((int)(zMax * (z - zMin)))); + } + } + } + + return( true ); + } + } + + return( false ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +void CSG_Doc_PDF::Draw_Curve(CSG_Points &Data, const CSG_Rect &r, int iGraphType) +{ +/* + int i; + int iMag; + int iNumLines; + int iNumData; + float fMinLine = 0; + float fWidth; + float fMax, fMin; + float fStep; + float fX, fY; + float fMaxX, fMinX; + float fOffsetX; + CSG_String sValue; + CSG_Points Points; + + fMin = fMax = Data[0].y; + + for (i = 0; i < Data.Get_Count(); i++) + { + if (Data[i].y > fMax) + { + fMax = Data[i].y; + } + if (Data[i].y < fMin) + { + fMin = Data[i].y; + } + if (iGraphType == PDF_GRAPH_TYPE_BARS){ + fMin = M_GET_MIN(0, fMin); + } + } + + if (fMin != fMax){ + iMag = (int) (log(fMax - fMin) / log(10.0)); + fStep = (float) ((int) pow(10.0, (double) iMag)); + if (fStep == 0) + { + fStep = 1.; + } + if (fMin < 0) + { + iMag = (int) (log(fabs(fMin)) / log(10.0)); + fMinLine = -(int) pow(10.0, (double) iMag); + } + else + { + fMinLine=(int)(((int)(fMin/fStep)) *fStep); + } + + iNumLines = (int) ((fMax - fMin) / fStep); + + while (iNumLines < 8) + { + fStep = fStep / 2.0; + iNumLines = (int) ((fMax - fMin) / fStep); + } + iNumLines = (int) ((fMax - fMinLine) / fStep); + } + else{ + if (fMin > 0) + { + fStep = fMin = 0; + iNumLines = 1; + fMinLine = fMax; + } + else if (fMin < 0) + { + fStep = 0; + fMin = fMin - 1; + fMinLine = fMax; + } + else + { + return; + } + } + + for (i = 0; i < iNumLines; i++) + { + fY = r.Get_YMax() - ((fMinLine + fStep * i - fMin) / (fMax - fMin)) * r.Get_YRange(); + if (fY <= r.Get_YMax() && fY >= r.Get_YMin()) + { + fY = HPDF_Page_Height() - fY; + } + } + + if (iGraphType == PDF_GRAPH_TYPE_BARS) + { + fWidth = (float) r.Get_XRange() / (float) (Data.Get_Count()); + for (i = 0; i < Data.Get_Count(); i++) + { + fX = r.Get_XMin() + i * fWidth; + fY = r.Get_YMax(); + fY = HPDF_Page_Height() - fY; + Draw_Rectangle(fX, fY, fX + fWidth, + fY - r.Get_YRange() * ((Data[i].y - fMin) / (fMax - fMin)), + PDF_STYLE_POLYGON_FILLSTROKE, 0x660000); + } + } + else + { + fWidth = (float) r.Get_XRange() / (float) (Data.Get_Count() - 1); + fY = r.Get_YMin() + r.Get_YRange() + - r.Get_YRange() * ((Data[0].y - fMin) / (fMax - fMin)); + fY = HPDF_Page_Height() - fY; + Points.Add(r.Get_XMin(), fY); + for (i = 1; i < Data.Get_Count(); i++) + { + fY = r.Get_YMin() + r.Get_YRange() + - r.Get_YRange() * ((Data[i].y - fMin) / (fMax - fMin)); + fY = HPDF_Page_Height() - fY; + Points.Add(r.Get_XMin() + i * fWidth, fY); + } + Draw_Line(Points, 3, 0x660000); + } + + fMaxX = Data[Data.Get_Count() - 1].x; + fMinX = Data[0].x; + + if (fMaxX != fMinX) + { + iMag = (int) (log(fMaxX - fMinX) / log(10.0)); + fStep = (float) pow(10.0, (double) iMag); + + iNumData = (int) ((fMaxX-fMinX) / fStep); + + while (iNumData < 3) + { + fStep = fStep / 2.0; + iNumData = (int) ((fMaxX-fMinX) / fStep); + } + fMinLine = (int)(((int)(fMinX/fStep)) * fStep); + while (fMinLine= r.Get_XMin() && fX < r.Get_XMin() + r.Get_XRange()){ + if (fabs(fStep * (float)i +fMinLine) > 100000) + { + sValue = SG_Get_String(fStep * (float)i +fMinLine); + } + else + { + sValue = SG_Get_String(fStep * (float)i + fMinLine, 2, true); + } + Draw_Text(fX, fY, sValue, 9, PDF_STYLE_TEXT_ALIGN_H_RIGHT); + Draw_Line(fX, fY, fX, fY - 10, 1); + } + } + } + + Draw_Line(r.Get_XMin(), HPDF_Page_Height() - r.Get_YMin(), + r.Get_XMin(), HPDF_Page_Height() - r.Get_YMax(), 4); + Draw_Line(r.Get_XMin(), HPDF_Page_Height() - r.Get_YMax(), + r.Get_XMax(), HPDF_Page_Height() - r.Get_YMax(), 4); +*/ +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#else // #ifndef _SAGA_DONOTUSE_HARU + +#include "doc_pdf.h" + +//--------------------------------------------------------- +const SG_Char * CSG_Doc_PDF::Get_Version(void) { return( NULL ); } +CSG_Doc_PDF::CSG_Doc_PDF(void) { m_pPDF = NULL; } +CSG_Doc_PDF::CSG_Doc_PDF(TSG_PDF_Page_Size Size, int Orientation, const SG_Char *Title) { m_pPDF = NULL; } +CSG_Doc_PDF::~CSG_Doc_PDF(void) {} +void CSG_Doc_PDF::Layout_Set_Box_Space(double Space, bool bPercent) {} +void CSG_Doc_PDF::_Layout_Set_Boxes(void) {} +void CSG_Doc_PDF::_Layout_Set_Box(int iBox) {} +double CSG_Doc_PDF::Get_Page_To_Meter(void) { return( 1.0 ); } +struct _HPDF_Dict_Rec * CSG_Doc_PDF::_Get_Font(TSG_PDF_Font_Type Font) { return( NULL ); } +const CSG_Rect & CSG_Doc_PDF::Layout_Get_Box(const SG_Char *ID) { return( m_Size_Margins ); } +TSG_PDF_Title_Level CSG_Doc_PDF::_Get_Lowest_Outline_Level(void) { return( PDF_TITLE_NONE ); } +bool CSG_Doc_PDF::Open(const SG_Char *Title) { return( false ); } +bool CSG_Doc_PDF::Open(TSG_PDF_Page_Size Size, int Orientation, const SG_Char *Title) { return( false ); } +bool CSG_Doc_PDF::Close(void) { return( false ); } +bool CSG_Doc_PDF::Save(const SG_Char *FileName) { return( false ); } +bool CSG_Doc_PDF::Layout_Add_Box(double xMin_Percent, double yMin_Percent, double xMax_Percent, double yMax_Percent, const SG_Char *ID) { return( false ); } +bool CSG_Doc_PDF::Layout_Add_Box(const CSG_Rect &Box_Percent, const SG_Char *ID) { return( false ); } +bool CSG_Doc_PDF::_Fit_Rectangle(double &x, double &y, double &dx, double &dy, double XToY_Ratio, bool bShrink) { return( false ); } +bool CSG_Doc_PDF::_Fit_Rectangle(CSG_Rect &r, double XToY_Ratio, bool bShrink) { return( false ); } +bool CSG_Doc_PDF::_Add_Outline_Item(const SG_Char *Title, struct _HPDF_Dict_Rec *pPage, TSG_PDF_Title_Level Level) { return( false ); } +bool CSG_Doc_PDF::Add_Outline_Item(const SG_Char *Title) { return( false ); } +bool CSG_Doc_PDF::Add_Page(void) { return( false ); } +bool CSG_Doc_PDF::Add_Page(TSG_PDF_Page_Size Size, int Orientation) { return( false ); } +bool CSG_Doc_PDF::Add_Page(double Width, double Height) { return( false ); } +bool CSG_Doc_PDF::Set_Size_Page(TSG_PDF_Page_Size Size, int Orientation) { return( false ); } +bool CSG_Doc_PDF::Set_Size_Page(double Width, double Height) { return( false ); } +bool CSG_Doc_PDF::Add_Page_Title(const SG_Char *Title, TSG_PDF_Title_Level Level, TSG_PDF_Page_Size Size, int Orientation) { return( false ); } +bool CSG_Doc_PDF::_Set_Style_FillStroke(int Style, int Fill_Color, int Line_Color, int Line_Width) { return( false ); } +bool CSG_Doc_PDF::Draw_Point(double x, double y, double Width, int Style, int Fill_Color, int Line_Color, int Line_Width) { return( false ); } +bool CSG_Doc_PDF::Draw_Line(double xa, double ya, double xb, double yb, int Width, int Color, int Style) { return( false ); } +bool CSG_Doc_PDF::Draw_Line(CSG_Points &Points, int Width, int Color, int Style) { return( false ); } +bool CSG_Doc_PDF::Draw_Rectangle(double xa, double ya, double xb, double yb, int Style, int Fill_Color, int Line_Color, int Line_Width) { return( false ); } +bool CSG_Doc_PDF::Draw_Rectangle(const CSG_Rect &r, int Style, int Fill_Color, int Line_Color, int Line_Width) { return( false ); } +bool CSG_Doc_PDF::Draw_Polygon(CSG_Points &Points, int Style, int Fill_Color, int Line_Color, int Line_Width) { return( false ); } +bool CSG_Doc_PDF::Draw_Text(double x, double y, CSG_Strings &Text, int Size, int Style, double Angle, int Color, TSG_PDF_Font_Type Font) { return( false ); } +bool CSG_Doc_PDF::Draw_Text(double x, double y, const SG_Char *Text, int Size, int Style, double Angle, int Color, TSG_PDF_Font_Type Font) { return( false ); } +bool CSG_Doc_PDF::_Draw_Text(double x, double y, const SG_Char *Text, int Size, int Style, double Angle, int Color, TSG_PDF_Font_Type Font) { return( false ); } +bool CSG_Doc_PDF::Draw_Image(double x, double y, double dx, double dy, const SG_Char *FileName) { return( false ); } +bool CSG_Doc_PDF::Draw_Image(const CSG_Rect &r, const SG_Char *FileName) { return( false ); } +bool CSG_Doc_PDF::Draw_Graticule(const CSG_Rect &r, const CSG_Rect &rWorld, int Size) { return( false ); } +bool CSG_Doc_PDF::_Draw_Ruler(const CSG_Rect &r, double zMin, double zMax, bool bHorizontal, bool bAscendent, bool bTickAtTop) { return( false ); } +bool CSG_Doc_PDF::_Draw_Table(CSG_Rect r, CSG_Table *pTable, int iRecord, int nRecords, double CellHeight, double HeaderHeightRel) { return( false ); } +bool CSG_Doc_PDF::Draw_Table(const CSG_Rect &r, CSG_Table *pTable, double CellHeight, double HeaderHeightRel) { return( false ); } +bool CSG_Doc_PDF::Draw_Table(const CSG_Rect &r, CSG_Table *pTable, int nColumns, double CellHeight, double HeaderHeightRel) { return( false ); } +bool CSG_Doc_PDF::_Draw_Shape(CSG_Rect r, CSG_Shape *pShape, double xMin, double yMin, double World2PDF, int Style, int Fill_Color, int Line_Color, int Line_Width, int Point_Width) { return( false ); } +bool CSG_Doc_PDF::Draw_Shape(const CSG_Rect &r, CSG_Shape *pShape, int Style, int Fill_Color, int Line_Color, int Line_Width, CSG_Rect *prWorld) { return( false ); } +bool CSG_Doc_PDF::Draw_Shapes(const CSG_Rect &r, CSG_Shapes *pShapes, int Style, int Fill_Color, int Line_Color, int Line_Width, CSG_Rect *prWorld) { return( false ); } +bool CSG_Doc_PDF::Draw_Grid(const CSG_Rect &r, CSG_Grid *pGrid, const CSG_Colors &Colors, double zMin, double zMax, int Style, CSG_Rect *prWorld) { return( false ); } +void CSG_Doc_PDF::Draw_Curve(CSG_Points &Data, const CSG_Rect &r, int iGraphType) {} + +#endif // #else // #ifndef _SAGA_DONOTUSE_HARU + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- diff -Nru saga-2.1.0+dfsg/src/modules/docs/docs_pdf/doc_pdf.h saga-2.1.4+dfsg/src/modules/docs/docs_pdf/doc_pdf.h --- saga-2.1.0+dfsg/src/modules/docs/docs_pdf/doc_pdf.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/docs/docs_pdf/doc_pdf.h 2014-11-13 08:32:17.000000000 +0000 @@ -0,0 +1,295 @@ +/********************************************************** + * Version $Id: doc_pdf.h 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// docs_pdf // +// // +//-------------------------------------------------------// +// // +// doc_pdf.h // +// // +// Copyright (C) 2005 by // +// Victor Olaya, Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. // +// // +// This library is free software; you can redistribute // +// it and/or modify it under the terms of the GNU Lesser // +// General Public License as published by the Free // +// Software Foundation, version 2.1 of the License. // +// // +// This library is distributed in the hope that it will // +// be useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU Lesser General Public // +// License for more details. // +// // +// You should have received a copy of the GNU Lesser // +// General Public License along with this program; if // +// not, write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Goettingen // +// Goldschmidtstr. 5 // +// 37077 Goettingen // +// Germany // +// // +// e-mail: oconrad@saga-gis.org // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#ifndef HEADER_INCLUDED__doc_pdf_H +#define HEADER_INCLUDED__doc_pdf_H + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "MLB_Interface.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#define PDF_TABLE_CELL_HEIGHT_DEFAULT 20.0 +#define PDF_TABLE_HEADER_HEIGHT 40.0 + +//--------------------------------------------------------- +#define PDF_PAGE_ORIENTATION_PREVIOUS -1 +#define PDF_PAGE_ORIENTATION_PORTRAIT 0 +#define PDF_PAGE_ORIENTATION_LANDSCAPE 1 + +//--------------------------------------------------------- +#define PDF_STYLE_POINT_CIRCLE 0x00000001 +#define PDF_STYLE_POINT_SQUARE 0x00000002 + +#define PDF_STYLE_LINE_END_BUTT 0x00000004 +#define PDF_STYLE_LINE_END_ROUND 0x00000008 +#define PDF_STYLE_LINE_END_SQUARE 0x00000010 +#define PDF_STYLE_LINE_JOIN_MITER 0x00000020 +#define PDF_STYLE_LINE_JOIN_ROUND 0x00000040 +#define PDF_STYLE_LINE_JOIN_BEVEL 0x00000080 + +#define PDF_STYLE_POLYGON_STROKE 0x00000100 +#define PDF_STYLE_POLYGON_FILL 0x00000200 +#define PDF_STYLE_POLYGON_FILLSTROKE (PDF_STYLE_POLYGON_STROKE|PDF_STYLE_POLYGON_FILL) + +//--------------------------------------------------------- +#define PDF_STYLE_TEXT_ALIGN_H_LEFT 0x00000001 +#define PDF_STYLE_TEXT_ALIGN_H_CENTER 0x00000002 +#define PDF_STYLE_TEXT_ALIGN_H_RIGHT 0x00000004 + +#define PDF_STYLE_TEXT_ALIGN_V_TOP 0x00000008 +#define PDF_STYLE_TEXT_ALIGN_V_CENTER 0x00000010 +#define PDF_STYLE_TEXT_ALIGN_V_BOTTOM 0x00000020 + +#define PDF_STYLE_TEXT_UNDERLINE 0x00000040 +#define PDF_STYLE_TEXT_STROKE 0x00000080 + +//---------------------------------------------------------- +#define PDF_GRAPH_TYPE_BARS 1 +#define PDF_GRAPH_TYPE_LINES 2 + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +typedef enum ESG_PDF_Font_Type +{ + PDF_FONT_DEFAULT = 0, + PDF_FONT_Helvetica = 0, + PDF_FONT_Helvetica_Bold, + PDF_FONT_Helvetica_Oblique, + PDF_FONT_Helvetica_BoldOblique, + PDF_FONT_Times_Roman, + PDF_FONT_Times_Bold, + PDF_FONT_Times_Italic, + PDF_FONT_Times_BoldItalic, + PDF_FONT_Courier, + PDF_FONT_Courier_Bold, + PDF_FONT_Courier_Oblique, + PDF_FONT_Courier_BoldOblique, + PDF_FONT_Symbol, + PDF_FONT_ZapfDingbats +} +TSG_PDF_Font_Type; + +//--------------------------------------------------------- +typedef enum ESG_PDF_Page_Size +{ + PDF_PAGE_SIZE_A4 = 1, + PDF_PAGE_SIZE_A3, + PDF_PAGE_SIZE_PREVIOUS +} +TSG_PDF_Page_Size; + +//--------------------------------------------------------- +typedef enum ESG_PDF_Title_Level +{ + PDF_TITLE = 0, + PDF_TITLE_01, + PDF_TITLE_02, + PDF_TITLE_NONE +} +TSG_PDF_Title_Level; + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +class docs_pdf_EXPORT CSG_Doc_PDF +{ +public: + CSG_Doc_PDF(void); + CSG_Doc_PDF(TSG_PDF_Page_Size Size, int Orientation = PDF_PAGE_ORIENTATION_PORTRAIT, const SG_Char *Title = NULL); + virtual ~CSG_Doc_PDF(void); + + static const SG_Char * Get_Version (void); + + bool Open (TSG_PDF_Page_Size Size = PDF_PAGE_SIZE_A4, int Orientation = PDF_PAGE_ORIENTATION_PORTRAIT, const SG_Char *Title = NULL); + bool Open (const SG_Char *Title); + bool Close (void); + + bool Save (const SG_Char *FileName); + + bool Is_Open (void) { return( m_pPDF != NULL ); } + bool Is_Ready_To_Draw (void) { return( m_pPDF != NULL ); } + + static double Get_Page_To_Meter (void); + + bool Add_Page (void); + bool Add_Page (TSG_PDF_Page_Size Size, int Orientation = PDF_PAGE_ORIENTATION_PORTRAIT); + bool Add_Page (double Width, double Height); + + bool Add_Page_Title (const SG_Char *Title, TSG_PDF_Title_Level Level = PDF_TITLE, TSG_PDF_Page_Size Size = PDF_PAGE_SIZE_PREVIOUS, int Orientation = PDF_PAGE_ORIENTATION_PREVIOUS); + bool Add_Outline_Item (const SG_Char *Title); + + bool Set_Size_Page (TSG_PDF_Page_Size Size, int Orientation = PDF_PAGE_ORIENTATION_PORTRAIT); + bool Set_Size_Page (double Width, double Height); + const CSG_Rect & Get_Size_Page (void) { return( m_Size_Paper ); } + const CSG_Rect & Get_Margins (void) { return( m_Size_Margins ); } + + void Layout_Set_Box_Space (double Space, bool bPercent); + bool Layout_Add_Box (double xMin_Percent, double yMin_Percent, double xMax_Percent, double yMax_Percent, const CSG_String &ID = ""); + bool Layout_Add_Box (const CSG_Rect &Box_Percent, const CSG_String &ID = ""); + const CSG_Rect & Layout_Get_Box (int iBox) { return( iBox >= 0 && iBox < m_Boxes.Get_Count() ? m_Boxes[iBox] : m_Size_Margins ); } + const CSG_Rect & Layout_Get_Box (const CSG_String &ID = ""); + + bool Draw_Point (double x, double y, double Width, int Style = PDF_STYLE_POINT_SQUARE|PDF_STYLE_POLYGON_FILLSTROKE, int Fill_Color = SG_COLOR_WHITE, int Line_Color = SG_COLOR_BLACK, int Line_Width = 0); + bool Draw_Line (double xa, double ya, double xb, double yb , int Width = 0, int Color = SG_COLOR_BLACK, int Style = 0); + bool Draw_Line (CSG_Points &Points , int Width = 0, int Color = SG_COLOR_BLACK, int Style = 0); + bool Draw_Rectangle (double xa, double ya, double xb, double yb , int Style = PDF_STYLE_POLYGON_FILLSTROKE, int Fill_Color = SG_COLOR_WHITE, int Line_Color = SG_COLOR_BLACK, int Line_Width = 0); + bool Draw_Rectangle (const CSG_Rect &r , int Style = PDF_STYLE_POLYGON_FILLSTROKE, int Fill_Color = SG_COLOR_WHITE, int Line_Color = SG_COLOR_BLACK, int Line_Width = 0); + bool Draw_Polygon (CSG_Points &Points , int Style = PDF_STYLE_POLYGON_FILLSTROKE, int Fill_Color = SG_COLOR_GREEN, int Line_Color = SG_COLOR_BLACK, int Line_Width = 0); + bool Draw_Text (double x, double y, const SG_Char *Text, int Size, int Style = PDF_STYLE_TEXT_ALIGN_H_LEFT|PDF_STYLE_TEXT_ALIGN_V_TOP, double Angle = 0.0, int Color = SG_COLOR_BLACK, TSG_PDF_Font_Type Font = PDF_FONT_DEFAULT); + bool Draw_Text (double x, double y, CSG_Strings &Text, int Size, int Style = PDF_STYLE_TEXT_ALIGN_H_LEFT|PDF_STYLE_TEXT_ALIGN_V_TOP, double Angle = 0.0, int Color = SG_COLOR_BLACK, TSG_PDF_Font_Type Font = PDF_FONT_DEFAULT); + bool Draw_Image (double x, double y, double dx, double dy , const SG_Char *FileName); + bool Draw_Image (const CSG_Rect &r , const SG_Char *FileName); + + bool Draw_Graticule (const CSG_Rect &r, const CSG_Rect &rWorld, int Size = 10); + void Draw_Curve (CSG_Points &Data, const CSG_Rect &r, int iGraphType); + + bool Draw_Table (const CSG_Rect &r, CSG_Table *pTable , double CellHeight = 0.0, double HeaderHeightRel = 1.5); + bool Draw_Table (const CSG_Rect &r, CSG_Table *pTable, int nColumns , double CellHeight = 0.0, double HeaderHeightRel = 1.5); + + bool Draw_Shape (const CSG_Rect &r, CSG_Shape *pShape , int Style = PDF_STYLE_POLYGON_FILLSTROKE, int Fill_Color = SG_COLOR_GREEN, int Line_Color = SG_COLOR_BLACK, int Line_Width = 0, CSG_Rect *prWorld = NULL); + bool Draw_Shapes (const CSG_Rect &r, CSG_Shapes *pShapes, int Style = PDF_STYLE_POLYGON_FILLSTROKE, int Fill_Color = SG_COLOR_GREEN, int Line_Color = SG_COLOR_BLACK, int Line_Width = 0, CSG_Rect *prWorld = NULL); + + bool Draw_Grid (const CSG_Rect &r, CSG_Grid *pGrid, const CSG_Colors &Colors, double zMin = 0.0, double zMax = 0.0, int Style = 0, CSG_Rect *prWorld = NULL); + + +protected: + + bool _Fit_Rectangle (double &x, double &y, double &dx, double &dy, double XToY_Ratio, bool bShrink); + bool _Fit_Rectangle (CSG_Rect &r, double XToY_Ratio, bool bShrink); + + bool _Add_Outline_Item (const SG_Char *Title, struct _HPDF_Dict_Rec *pPage, TSG_PDF_Title_Level Level = PDF_TITLE); + + bool _Draw_Ruler (const CSG_Rect &r, double zMin, double zMax, bool bHorizontal, bool bAscendent, bool bTickAtTop); + bool _Draw_Text (double x, double y, const SG_Char *Text, int Size, int Style, double Angle, int Color, TSG_PDF_Font_Type Font); + bool _Draw_Table (CSG_Rect r, CSG_Table *pTable, int iRecord, int nRecords, double CellHeight, double HeaderHeightRel); + bool _Draw_Shape (CSG_Rect r, CSG_Shape *pShape, double xMin, double yMin, double World2PDF, int Style = PDF_STYLE_POLYGON_FILLSTROKE, int Fill_Color = SG_COLOR_GREEN, int Line_Color = SG_COLOR_BLACK, int Line_Width = 0, int Point_Width = 5); + + TSG_PDF_Title_Level _Get_Lowest_Outline_Level (void); + + +private: + + bool m_Boxes_Space_bPercent; + + int m_nPages; + + double m_Boxes_Space; + + CSG_Rect m_Size_Paper, m_Size_Margins; + + CSG_Rects m_Boxes_Percent, m_Boxes; + + CSG_Strings m_Boxes_ID; + + struct _HPDF_Doc_Rec *m_pPDF; + + struct _HPDF_Dict_Rec *m_pPage; + + struct _HPDF_Dict_Rec *m_pOutline_Last_Level_0, *m_pOutline_Last_Level_1, *m_pOutline_Last_Level_2; + + + struct _HPDF_Dict_Rec * _Get_Font (TSG_PDF_Font_Type Font); + + void _Layout_Set_Boxes (void); + void _Layout_Set_Box (int iBox); + + bool _Set_Style_FillStroke (int Style, int Fill_Color, int Line_Color, int Line_Width); + +}; + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#endif // #ifndef HEADER_INCLUDED__doc_pdf_H diff -Nru saga-2.1.0+dfsg/src/modules/docs/docs_pdf/Makefile.am saga-2.1.4+dfsg/src/modules/docs/docs_pdf/Makefile.am --- saga-2.1.0+dfsg/src/modules/docs/docs_pdf/Makefile.am 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/docs/docs_pdf/Makefile.am 2014-11-13 08:32:17.000000000 +0000 @@ -0,0 +1,29 @@ +# +# $Id: Makefile.am 1277 2011-12-22 15:48:59Z reklov_w $ +# +if DEBUG +DBGFLAGS = -g -DDEBUG +endif +if SAGA_UNICODE +UC_DEFS = -D_SAGA_UNICODE +endif +if HAVE_HARU +DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD +CXX_INCS = -I$(top_srcdir)/src/saga_core +AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(DISABLELIBHARU) $(GOMPFLAGS) +AM_LDFLAGS = -fPIC -shared -avoid-version $(HARU_LIB) +pkglib_LTLIBRARIES = libdocs_pdf.la +libdocs_pdf_la_SOURCES =\ +doc_pdf.cpp\ +MLB_Interface.cpp\ +Profile_Cross_Sections.cpp\ +Shapes_Report.cpp\ +Shapes_Summary.cpp\ +doc_pdf.h\ +MLB_Interface.h\ +Profile_Cross_Sections.h\ +Shapes_Report.h\ +Shapes_Summary.h + +libdocs_pdf_la_LIBADD = $(top_srcdir)/src/saga_core/saga_api/libsaga_api.la +endif diff -Nru saga-2.1.0+dfsg/src/modules/docs/docs_pdf/Makefile.in saga-2.1.4+dfsg/src/modules/docs/docs_pdf/Makefile.in --- saga-2.1.0+dfsg/src/modules/docs/docs_pdf/Makefile.in 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/docs/docs_pdf/Makefile.in 2014-11-13 08:33:29.000000000 +0000 @@ -0,0 +1,714 @@ +# Makefile.in generated by automake 1.14.1 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +subdir = src/modules/docs/docs_pdf +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_postgresql.m4 \ + $(top_srcdir)/m4/ax_pkg_swig.m4 \ + $(top_srcdir)/m4/ax_python_devel.m4 \ + $(top_srcdir)/m4/ax_swig_enable_cxx.m4 \ + $(top_srcdir)/m4/ax_swig_python.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__installdirs = "$(DESTDIR)$(pkglibdir)" +LTLIBRARIES = $(pkglib_LTLIBRARIES) +@HAVE_HARU_TRUE@libdocs_pdf_la_DEPENDENCIES = $(top_srcdir)/src/saga_core/saga_api/libsaga_api.la +am__libdocs_pdf_la_SOURCES_DIST = doc_pdf.cpp MLB_Interface.cpp \ + Profile_Cross_Sections.cpp Shapes_Report.cpp \ + Shapes_Summary.cpp doc_pdf.h MLB_Interface.h \ + Profile_Cross_Sections.h Shapes_Report.h Shapes_Summary.h +@HAVE_HARU_TRUE@am_libdocs_pdf_la_OBJECTS = doc_pdf.lo \ +@HAVE_HARU_TRUE@ MLB_Interface.lo Profile_Cross_Sections.lo \ +@HAVE_HARU_TRUE@ Shapes_Report.lo Shapes_Summary.lo +libdocs_pdf_la_OBJECTS = $(am_libdocs_pdf_la_OBJECTS) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +@HAVE_HARU_TRUE@am_libdocs_pdf_la_rpath = -rpath $(pkglibdir) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) +depcomp = $(SHELL) $(top_srcdir)/depcomp +am__depfiles_maybe = depfiles +am__mv = mv -f +CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = +CXXLD = $(CXX) +CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = +CCLD = $(CC) +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = +SOURCES = $(libdocs_pdf_la_SOURCES) +DIST_SOURCES = $(am__libdocs_pdf_la_SOURCES_DIST) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +AX_SWIG_PYTHON_CPPFLAGS = @AX_SWIG_PYTHON_CPPFLAGS@ +AX_SWIG_PYTHON_OPT = @AX_SWIG_PYTHON_OPT@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DISABLELIBHARU = @DISABLELIBHARU@ +DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +FGREP = @FGREP@ +GOMPFLAGS = @GOMPFLAGS@ +GREP = @GREP@ +HARU_LIB = @HARU_LIB@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LOCAL_INCS = @LOCAL_INCS@ +LOCAL_LIBS = @LOCAL_LIBS@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ +MKDIR_P = @MKDIR_P@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PG_CONFIG = @PG_CONFIG@ +POSTGRESQL_CFLAGS = @POSTGRESQL_CFLAGS@ +POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@ +POSTGRESQL_VERSION = @POSTGRESQL_VERSION@ +POW_LIB = @POW_LIB@ +PYTHON = @PYTHON@ +PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ +PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ +PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ +PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_PLATFORM = @PYTHON_PLATFORM@ +PYTHON_PREFIX = @PYTHON_PREFIX@ +PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ +PYTHON_VERSION = @PYTHON_VERSION@ +RANLIB = @RANLIB@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +SWIG = @SWIG@ +SWIG_LIB = @SWIG_LIB@ +VERSION = @VERSION@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +pkgpyexecdir = @pkgpyexecdir@ +pkgpythondir = @pkgpythondir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +pyexecdir = @pyexecdir@ +pythondir = @pythondir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ + +# +# $Id: Makefile.am 1277 2011-12-22 15:48:59Z reklov_w $ +# +@DEBUG_TRUE@DBGFLAGS = -g -DDEBUG +@SAGA_UNICODE_TRUE@UC_DEFS = -D_SAGA_UNICODE +@HAVE_HARU_TRUE@DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD +@HAVE_HARU_TRUE@CXX_INCS = -I$(top_srcdir)/src/saga_core +@HAVE_HARU_TRUE@AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(DISABLELIBHARU) $(GOMPFLAGS) +@HAVE_HARU_TRUE@AM_LDFLAGS = -fPIC -shared -avoid-version $(HARU_LIB) +@HAVE_HARU_TRUE@pkglib_LTLIBRARIES = libdocs_pdf.la +@HAVE_HARU_TRUE@libdocs_pdf_la_SOURCES = \ +@HAVE_HARU_TRUE@doc_pdf.cpp\ +@HAVE_HARU_TRUE@MLB_Interface.cpp\ +@HAVE_HARU_TRUE@Profile_Cross_Sections.cpp\ +@HAVE_HARU_TRUE@Shapes_Report.cpp\ +@HAVE_HARU_TRUE@Shapes_Summary.cpp\ +@HAVE_HARU_TRUE@doc_pdf.h\ +@HAVE_HARU_TRUE@MLB_Interface.h\ +@HAVE_HARU_TRUE@Profile_Cross_Sections.h\ +@HAVE_HARU_TRUE@Shapes_Report.h\ +@HAVE_HARU_TRUE@Shapes_Summary.h + +@HAVE_HARU_TRUE@libdocs_pdf_la_LIBADD = $(top_srcdir)/src/saga_core/saga_api/libsaga_api.la +all: all-am + +.SUFFIXES: +.SUFFIXES: .cpp .lo .o .obj +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/modules/docs/docs_pdf/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign src/modules/docs/docs_pdf/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): + +install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) + @$(NORMAL_INSTALL) + @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ + list2=; for p in $$list; do \ + if test -f $$p; then \ + list2="$$list2 $$p"; \ + else :; fi; \ + done; \ + test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \ + } + +uninstall-pkglibLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ + for p in $$list; do \ + $(am__strip_dir) \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$f"; \ + done + +clean-pkglibLTLIBRARIES: + -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES) + @list='$(pkglib_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + +libdocs_pdf.la: $(libdocs_pdf_la_OBJECTS) $(libdocs_pdf_la_DEPENDENCIES) $(EXTRA_libdocs_pdf_la_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) $(am_libdocs_pdf_la_rpath) $(libdocs_pdf_la_OBJECTS) $(libdocs_pdf_la_LIBADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MLB_Interface.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Profile_Cross_Sections.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Shapes_Report.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Shapes_Summary.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/doc_pdf.Plo@am__quote@ + +.cpp.o: +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< + +.cpp.obj: +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + +.cpp.lo: +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + set x; \ + here=`pwd`; \ + $(am__define_uniq_tagged_files); \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ + fi +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ + test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(LTLIBRARIES) +installdirs: + for dir in "$(DESTDIR)$(pkglibdir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool clean-pkglibLTLIBRARIES \ + mostlyclean-am + +distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: install-pkglibLTLIBRARIES + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-pkglibLTLIBRARIES + +.MAKE: install-am install-strip + +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-pkglibLTLIBRARIES install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ + uninstall-pkglibLTLIBRARIES + + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nru saga-2.1.0+dfsg/src/modules/docs/docs_pdf/MLB_Interface.cpp saga-2.1.4+dfsg/src/modules/docs/docs_pdf/MLB_Interface.cpp --- saga-2.1.0+dfsg/src/modules/docs/docs_pdf/MLB_Interface.cpp 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/docs/docs_pdf/MLB_Interface.cpp 2014-11-13 08:32:17.000000000 +0000 @@ -0,0 +1,125 @@ +/********************************************************** + * Version $Id: MLB_Interface.cpp 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// docs_pdf // +// // +//-------------------------------------------------------// +// // +// MLB_Interface.cpp // +// // +// Copyright (C) 2010 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Hamburg // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// The Module Link Library Interface // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "MLB_Interface.h" + + +//--------------------------------------------------------- +CSG_String Get_Info(int i) +{ + switch( i ) + { + case MLB_INFO_Name: default: + return( _TL("PDF") ); + + case MLB_INFO_Category: + return( _TL("Reports") ); + + case MLB_INFO_Author: + return( SG_T("SAGA User Group (c) 2010") ); + + case MLB_INFO_Description: + return( _TW( + "Reports in Portable Document Format (PDF). PDF export is based on " + "libharu." + )); + + case MLB_INFO_Version: + return( SG_T("1.0") ); + + case MLB_INFO_Menu_Path: + return( _TL("File|Reports") ); + } +} + + +//--------------------------------------------------------- +#include "Shapes_Report.h" +#include "Shapes_Summary.h" +#include "Profile_Cross_Sections.h" + + +//--------------------------------------------------------- +CSG_Module * Create_Module(int i) +{ + switch( i ) + { + case 0: return( new CShapes_Report ); + case 1: return( new CShapes_Summary ); + case 2: return( new CProfile_Cross_Sections ); + } + + return( NULL ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +//{{AFX_SAGA + + MLB_INTERFACE + +//}}AFX_SAGA diff -Nru saga-2.1.0+dfsg/src/modules/docs/docs_pdf/MLB_Interface.h saga-2.1.4+dfsg/src/modules/docs/docs_pdf/MLB_Interface.h --- saga-2.1.0+dfsg/src/modules/docs/docs_pdf/MLB_Interface.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/docs/docs_pdf/MLB_Interface.h 2014-11-13 08:32:17.000000000 +0000 @@ -0,0 +1,83 @@ +/********************************************************** + * Version $Id: MLB_Interface.h 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// docs_pdf // +// // +//-------------------------------------------------------// +// // +// MLB_Interface.h // +// // +// Copyright (C) 2010 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Hamburg // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// Include the SAGA-API here // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#ifndef HEADER_INCLUDED__docs_pdf__mlb_interface_H +#define HEADER_INCLUDED__docs_pdf__mlb_interface_H + +//--------------------------------------------------------- +#include + +//--------------------------------------------------------- +#ifdef docs_pdf_EXPORTS + #define docs_pdf_EXPORT _SAGA_DLL_EXPORT +#else + #define docs_pdf_EXPORT _SAGA_DLL_IMPORT +#endif + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#endif // #ifndef HEADER_INCLUDED__docs_pdf__mlb_interface_H diff -Nru saga-2.1.0+dfsg/src/modules/docs/docs_pdf/Profile_Cross_Sections.cpp saga-2.1.4+dfsg/src/modules/docs/docs_pdf/Profile_Cross_Sections.cpp --- saga-2.1.0+dfsg/src/modules/docs/docs_pdf/Profile_Cross_Sections.cpp 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/docs/docs_pdf/Profile_Cross_Sections.cpp 2014-11-13 08:32:17.000000000 +0000 @@ -0,0 +1,1459 @@ +/********************************************************** + * Version $Id: Profile_Cross_Sections.cpp 1230 2011-11-22 11:12:10Z oconrad $ + *********************************************************/ +/******************************************************************************* + CrossSections.cpp + Copyright (C) Victor Olaya + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, USA +*******************************************************************************/ + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "Profile_Cross_Sections.h" + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#define OFFSET_X 100 +#define OFFSET_Y 50 +#define TABLE_WIDTH 450 +#define TABLE_LANDSCAPE_WIDTH 680 +#define TABLE_OFFSET_X 70 +#define TABLE_CELLPAD 10 +#define SECTIONS_PER_PAGE 3 +#define CROSS_SECTION_HEIGHT 200 +#define CROSS_SECTION_WIDTH 400 +#define PROFILE_HEIGHT 320 +#define PROFILE_WIDTH 1000 +#define GUITAR_LEYEND_WIDTH 50 +#define GUITAR_LEYEND_HEIGHT 230 +#define GUITAR_WIDTH PROFILE_WIDTH +#define GUITAR_HEIGHT GUITAR_LEYEND_HEIGHT +#define SEPARATION 35 +#define VOLUMES_TABLE_COLUMNS 7 +#define VOLUMES_TABLE_COLUMN_WIDTH ((596 - 2 * OFFSET_X) / VOLUMES_TABLE_COLUMNS) +#define VOLUMES_TABLE_ROW_HEIGHT 20 +#define VOLUMES_TABLE_HEADER_SEPARATION 35 +#define VOLUMES_TABLE_MAX_ROWS 30 +#define SLOPE_RATIO (1. / 3.) +#define LONG_SEGMENT 5000. + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +//Compute the dot product AB ? BC +double dot(double *A, double *B, double *C){ + + double AB[2],BC[2]; + AB[0] = B[0]-A[0]; + AB[1] = B[1]-A[1]; + BC[0] = C[0]-B[0]; + BC[1] = C[1]-B[1]; + double dot = AB[0] * BC[0] + AB[1] * BC[1]; + + return dot; +} + +//--------------------------------------------------------- +//Compute the cross product AB x AC +double cross(double *A, double *B, double *C){ + + double AB[2],AC[2]; + AB[0] = B[0]-A[0]; + AB[1] = B[1]-A[1]; + AC[0] = C[0]-A[0]; + AC[1] = C[1]-A[1]; + double cross = AB[0] * AC[1] - AB[1] * AC[0]; + + return cross; +} + +//--------------------------------------------------------- +//Compute the distance from A to B +double distance(double *A, double *B){ + double d1 = A[0] - B[0]; + double d2 = A[1] - B[1]; + return sqrt(d1*d1+d2*d2); +} + +//--------------------------------------------------------- +//Compute the distance from AB to C +double linePointDist(double *A, double *B, double *C){ + double dist = cross(A,B,C) / distance(A,B); + + return fabs(dist); +} + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#define SLOPE_TRANSITION 1 +#define DITCH_WIDTH 1 + +CProfile_Cross_Sections_PDF::CProfile_Cross_Sections_PDF(){} + +CProfile_Cross_Sections_PDF::~CProfile_Cross_Sections_PDF(){} + +void CProfile_Cross_Sections_PDF::AddCrossSections(TSG_Point ** pCrossSections, + double *pHeight, + TSG_Point * pRoadSection, + int iSections, + int iCrossSectionPoints, + int iRoadPoints){ + + int i,j; + std::vector ModifiedRoadSection; + std::vector ModifiedCrossSection; + TSG_Point *pModifiedRoadSection; + TSG_Point *pModifiedCrossSection; + int iCrossSectionPointsB; + int iRoadPointsB; + + Add_Page_Title (_TL("Cross Sections"), PDF_TITLE_01, PDF_PAGE_SIZE_A4, PDF_PAGE_ORIENTATION_PORTRAIT); + + for (i = 0; i < iSections; i++){ + m_iOffsetY = OFFSET_Y + (int)(CROSS_SECTION_HEIGHT * 1.1 * (i % SECTIONS_PER_PAGE)); + if (m_iOffsetY == OFFSET_Y){ + Add_Page(); + }//if + + iCrossSectionPointsB = iCrossSectionPoints; + iRoadPointsB = iRoadPoints; + AdjustSections(pCrossSections[i], pRoadSection, ModifiedCrossSection, ModifiedRoadSection, + pHeight[i], iCrossSectionPointsB, iRoadPointsB); + + pModifiedCrossSection = new TSG_Point [iCrossSectionPointsB]; + pModifiedRoadSection = new TSG_Point [iRoadPointsB]; + for (j = 0; j < iCrossSectionPointsB; j++){ + pModifiedCrossSection[j] = ModifiedCrossSection[j]; + }//for + for (j = 0; j < iRoadPointsB; j++){ + pModifiedRoadSection[j] = ModifiedRoadSection[j]; + }//for + + AddCrossSection(pModifiedCrossSection, pModifiedRoadSection, + iCrossSectionPointsB, iRoadPointsB); + + delete [] pModifiedRoadSection; + delete [] pModifiedCrossSection; + }//for + +}//method + +void CProfile_Cross_Sections_PDF::AddCrossSection(TSG_Point * pCrossSection, + TSG_Point * pRoadSection, + int iCrossSectionPoints, + int iRoadPoints){ + + int i; + int iMag; + int iNumLines; + int iFirstPoint, iLastPoint; + double fMinLine = 0; + double fMaxY, fMinY; + double fMaxX, fMinX; + double fStep; + double fX, fY; + double fOffsetX; + double fDifX, fDifY; + double fRatio; + double fHeight; + CSG_String sValue; + CSG_Points Points; + + iFirstPoint = 0; + iLastPoint = iCrossSectionPoints - 1; + + for (i = 1; i < iCrossSectionPoints; i++) { + if (pCrossSection[i].x > pRoadSection[0].x){ + iFirstPoint = i - 1; + break; + }//if + }//for + for (i = 1; i < iCrossSectionPoints; i++) { + if (pCrossSection[i].x > pRoadSection[iRoadPoints - 1].x){ + iLastPoint = i; + break; + }//if + }//for + + fMinX = pCrossSection[iFirstPoint].x; + fMaxX = pCrossSection[iLastPoint].x; + + fDifX = fMaxX - fMinX; + + fMaxY = pCrossSection[0].y; + fMinY = pCrossSection[0].y; + + for (i = iFirstPoint ; i < iLastPoint + 1; i++) { + if (pCrossSection[i].y > fMaxY) { + fMaxY = pCrossSection[i].y; + }// if + if (pCrossSection[i].y < fMinY) { + fMinY = pCrossSection[i].y; + }// if + }//for + + for (i = 0; i < iRoadPoints; i++) { + if (pRoadSection[i].y > fMaxY) { + fMaxY = pRoadSection[i].y; + }// if + if (pRoadSection[i].y < fMinY) { + fMinY = pRoadSection[i].y; + }// if + }//for + + fDifY = fMaxY - fMinY; + + fRatio = (fDifX / fDifY) / (CROSS_SECTION_WIDTH / CROSS_SECTION_HEIGHT); + if (fRatio > 1){ + fMaxY = fMaxY + fDifY / 2. * (fRatio - 1.); + fMinY = fMinY - fDifY / 2. * (fRatio - 1.); + + }//if + else{ + fMaxX = fMaxX + fDifX / 2. * (1. / fRatio - 1.); + fMinX = fMinX - fDifX / 2. * (1. / fRatio - 1.); + }//else + + fMaxX = fMaxX + fDifX * .05; + fMinX = fMinX - fDifX * .05; + fMaxY = fMaxY + fDifY * .05; + fMinY = fMinY - fDifY * .05; + + iMag = (int) (log(fMaxY - fMinY) / log(10.0)); + fStep = (double) ((int) pow(10.0, (double) iMag)); + if (fStep == 0){ + fStep = 1.; + }//if + if (fMinY < 0) { + iMag = (int) (log(fabs(fMinY)) / log(10.0)); + fMinLine = -(int) pow(10.0, (double) iMag); + }// if + else { + fMinLine=(int)(((int)(fMinY/fStep)) *fStep); + }//else + + iNumLines = (int) ((fMaxY - fMinY) / fStep); + + while (iNumLines < 8) { + fStep = fStep / 2.0; + iNumLines = (int) ((fMaxY - fMinY) / fStep); + }// while + iNumLines = (int) ((fMaxY - fMinLine) / fStep); + + fHeight = Get_Size_Page().Get_YMax() - Get_Size_Page().Get_YMin(); + + //horizontal lines + + for (i = 0; i < iNumLines; i++) { + fY = m_iOffsetY + CROSS_SECTION_HEIGHT + - ((fMinLine + fStep * i - fMinY) / (fMaxY - fMinY)) * CROSS_SECTION_HEIGHT; + if (fY <= m_iOffsetY + CROSS_SECTION_HEIGHT && fY >= m_iOffsetY) { + fY = fHeight - fY; + sValue = SG_Get_String(fMinLine + fStep * (double) i); + Draw_Text(OFFSET_X - 10, fY, SG_Get_String(fMinLine + fStep * (double) i).c_str(), + 9, PDF_STYLE_TEXT_ALIGN_H_RIGHT); + Draw_Line(OFFSET_X, fY, OFFSET_X - 5, fY, 0); + }// if + }// for + + iMag = (int) (log(fMaxX - fMinX) / log(10.0)); + fStep = (double) pow(10.0, (double) iMag); + + iNumLines = (int) ((fMaxX-fMinX) / fStep); + + while (iNumLines < 3) { + fStep = fStep / 2.0; + iNumLines = (int) ((fMaxX-fMinX) / fStep); + }// while + fMinLine = (int)(((int)(fMinX/fStep)) * fStep); + while (fMinLine= OFFSET_X && fX < OFFSET_X + CROSS_SECTION_WIDTH){ + if (fabs(fStep * (double)i+fMinLine) > 100000) { + sValue = SG_Get_String(fStep * (double)i+fMinLine); + }// if + else { + sValue = SG_Get_String(fStep * (double)i+fMinLine, 2, true); + }// else + Draw_Line (fX, fHeight - m_iOffsetY - CROSS_SECTION_HEIGHT, + fX, fHeight - m_iOffsetY - CROSS_SECTION_HEIGHT - 10); + Draw_Text(fX, fHeight - m_iOffsetY - CROSS_SECTION_HEIGHT - 15, + SG_Get_String(fMinLine + fStep * (double) i).c_str(), 9, + PDF_STYLE_TEXT_ALIGN_H_CENTER | PDF_STYLE_TEXT_ALIGN_V_TOP ); + }//if + }// for + + //axis + + Draw_Line (OFFSET_X, fHeight - m_iOffsetY, + OFFSET_X, fHeight - m_iOffsetY - CROSS_SECTION_HEIGHT, 2); + Draw_Line (OFFSET_X, fHeight - m_iOffsetY - CROSS_SECTION_HEIGHT, + OFFSET_X + CROSS_SECTION_WIDTH, + fHeight - m_iOffsetY - CROSS_SECTION_HEIGHT, 2); + + //cross sections + + fY = m_iOffsetY + CROSS_SECTION_HEIGHT + - CROSS_SECTION_HEIGHT * ((pCrossSection[iFirstPoint].y - fMinY) / (fMaxY - fMinY)); + fY = fHeight - fY; + fX = OFFSET_X + CROSS_SECTION_WIDTH * ((pCrossSection[iFirstPoint].x - fMinX) / (fMaxX - fMinX)); + + Points.Add(fX,fY); + + for (i = iFirstPoint + 1; i < iLastPoint + 1; i++) { + fY = m_iOffsetY + CROSS_SECTION_HEIGHT + - CROSS_SECTION_HEIGHT * ((pCrossSection[i].y - fMinY) / (fMaxY - fMinY)); + fY = fHeight - fY; + fX = OFFSET_X + CROSS_SECTION_WIDTH * ((pCrossSection[i].x - fMinX) / (fMaxX - fMinX)); + Points.Add(fX,fY); + if (pCrossSection[i].x > fMaxX){ + break; + }//if + }// for + Draw_Line(Points, 2, 0x00bb00); + + fY = m_iOffsetY + CROSS_SECTION_HEIGHT + - CROSS_SECTION_HEIGHT * ((pRoadSection[0].y - fMinY) / (fMaxY - fMinY)); + fY = fHeight - fY; + fX = OFFSET_X + CROSS_SECTION_WIDTH * ((pRoadSection[0].x - fMinX) / (fMaxX - fMinX)); + + Points.Clear(); + Points.Add(fX,fY); + + for (i = 1; i < iRoadPoints; i++) { + fY = m_iOffsetY + CROSS_SECTION_HEIGHT + - CROSS_SECTION_HEIGHT * ((pRoadSection[i].y - fMinY) / (fMaxY - fMinY)); + fY = fHeight - fY; + fX = OFFSET_X + CROSS_SECTION_WIDTH * ((pRoadSection[i].x - fMinX) / (fMaxX - fMinX)); + Points.Add(fX,fY); + }// for + Draw_Line(Points, 0, 0x0000bb); + + +}//method + +void CProfile_Cross_Sections_PDF::AddVolumesTable(TSG_Point * pProfile, + TSG_Point ** pCrossSections, + double *pHeight, + TSG_Point * pRoadSection, + int iSections, + int iCrossSectionPoints, + int iRoadPoints){ + + + int i,j; + int iRow; + int iRowsWritten = 0; + double fDist; + double fX,fY; + double fXBox, fYBox; + double fIn, fOut; + double fInPrev, fOutPrev; + double fVolume; + double fHeight; + CSG_String sHeader[] = {_TL("Section"),_TL("Dist."),_TL("Area +"),_TL("Area -"),_TL("Partial D."),_TL("Vol. +"), _TL("Vol. -")}; + + Add_Page_Title(_TL("Volumes"), PDF_TITLE_01); + + fHeight = Get_Size_Page().Get_YMax() - Get_Size_Page().Get_YMin(); + + for (i = 0; i < iSections; i++){ + iRow = iRowsWritten % VOLUMES_TABLE_MAX_ROWS; + if (iRow == 0){ + Add_Page(); + Draw_Rectangle(OFFSET_X, fHeight - OFFSET_Y, + OFFSET_X + VOLUMES_TABLE_COLUMN_WIDTH * VOLUMES_TABLE_COLUMNS, + fHeight - OFFSET_Y - VOLUMES_TABLE_ROW_HEIGHT); + fY = OFFSET_Y + VOLUMES_TABLE_ROW_HEIGHT * .6; + fY = fHeight - fY; + for (j = 0; j < VOLUMES_TABLE_COLUMNS; j++){ + fX = OFFSET_X + VOLUMES_TABLE_COLUMN_WIDTH * j + VOLUMES_TABLE_COLUMN_WIDTH / 2.; + Draw_Text(fX, fY, sHeader[j].c_str(), 10, PDF_STYLE_TEXT_ALIGN_H_CENTER); + + fX = OFFSET_X + VOLUMES_TABLE_COLUMN_WIDTH * (j + 1); + Draw_Line(fX, fHeight - OFFSET_Y, + fX, fHeight - (OFFSET_Y + VOLUMES_TABLE_ROW_HEIGHT), + 0); + }//for + if (i){ + i--; + }//if + }//if + for (j = 0; j < 4; j++){ + fYBox = OFFSET_Y + VOLUMES_TABLE_HEADER_SEPARATION + VOLUMES_TABLE_ROW_HEIGHT * iRow; + fYBox = fHeight - fYBox; + fXBox = OFFSET_X + VOLUMES_TABLE_COLUMN_WIDTH * j; + Draw_Rectangle(fXBox, fYBox, fXBox + VOLUMES_TABLE_COLUMN_WIDTH, + fYBox - VOLUMES_TABLE_ROW_HEIGHT); + }//for + fDist = pProfile[i].x; + fY = OFFSET_Y + VOLUMES_TABLE_HEADER_SEPARATION + VOLUMES_TABLE_ROW_HEIGHT * (iRow + .6); + fY = fHeight - fY; + fX = OFFSET_X + (VOLUMES_TABLE_COLUMN_WIDTH) / 2.; + Draw_Text(fX, fY, SG_Get_String(i,0).c_str(), 10, PDF_STYLE_TEXT_ALIGN_H_CENTER); + + fX = OFFSET_X + VOLUMES_TABLE_COLUMN_WIDTH + (VOLUMES_TABLE_COLUMN_WIDTH) / 2.; + Draw_Text(fX, fY, SG_Get_String(fDist,0).c_str(), 10, PDF_STYLE_TEXT_ALIGN_H_CENTER); + + CalculateAreas(pCrossSections[i], pRoadSection, pHeight[i], iCrossSectionPoints, + iRoadPoints,fIn, fOut); + + fX = OFFSET_X + VOLUMES_TABLE_COLUMN_WIDTH * 2 + (VOLUMES_TABLE_COLUMN_WIDTH) / 2.; + Draw_Text(fX, fY, SG_Get_String(fIn,0).c_str(), 10, PDF_STYLE_TEXT_ALIGN_H_CENTER); + + fX = OFFSET_X + VOLUMES_TABLE_COLUMN_WIDTH * 3 + (VOLUMES_TABLE_COLUMN_WIDTH) / 2.; + Draw_Text(fX, fY, SG_Get_String(fOut,0).c_str(), 10, PDF_STYLE_TEXT_ALIGN_H_CENTER); + + if (iRow > 0){ + for (j = 4; j < 7; j++){ + fYBox = OFFSET_Y + VOLUMES_TABLE_HEADER_SEPARATION + VOLUMES_TABLE_ROW_HEIGHT * (iRow - .5); + fYBox = fHeight - fYBox; + fXBox = OFFSET_X + VOLUMES_TABLE_COLUMN_WIDTH * j; + Draw_Rectangle(fXBox, fYBox, fXBox + VOLUMES_TABLE_COLUMN_WIDTH, + fYBox - VOLUMES_TABLE_ROW_HEIGHT); + }//for + fY = OFFSET_Y + VOLUMES_TABLE_HEADER_SEPARATION + VOLUMES_TABLE_ROW_HEIGHT * (iRow + .1) ; + fY = fHeight - fY; + + fDist = (pProfile[i].x - pProfile[i-1].x); + fX = OFFSET_X + VOLUMES_TABLE_COLUMN_WIDTH * 4 + (VOLUMES_TABLE_COLUMN_WIDTH) / 2.; + Draw_Text(fX, fY, SG_Get_String(fDist,0).c_str(), 10, PDF_STYLE_TEXT_ALIGN_H_CENTER); + + fVolume = (pProfile[i].x - pProfile[i-1].x) * (fIn + fInPrev) / 2.; + fX = OFFSET_X + VOLUMES_TABLE_COLUMN_WIDTH * 5 + (VOLUMES_TABLE_COLUMN_WIDTH) / 2.; + Draw_Text(fX, fY, SG_Get_String(fVolume,0).c_str(), 10, PDF_STYLE_TEXT_ALIGN_H_CENTER); + + fVolume = (pProfile[i].x - pProfile[i-1].x) * (fOut + fOutPrev) / 2.; + fX = OFFSET_X + VOLUMES_TABLE_COLUMN_WIDTH * 6 + (VOLUMES_TABLE_COLUMN_WIDTH) / 2.; + Draw_Text(fX, fY, SG_Get_String(fVolume,0).c_str(), 10, PDF_STYLE_TEXT_ALIGN_H_CENTER); + }//if + + fInPrev = fIn; + fOutPrev = fOut; + iRowsWritten++; + + }//for + +}//Method + +void CProfile_Cross_Sections_PDF::AdjustSections(TSG_Point * pCrossSection, + TSG_Point * pRoadSection, + std::vector &ModifiedCrossSection, + std::vector &ModifiedRoadSection, + double fHeight, + int &iCrossSectionPoints, + int &iRoadPoints){ + + bool bDitchAdded; + int i,j; + int iSgn; + int iRoadPointsToAdd = 0; + int iCrossSectionPointsToAdd = 0; + double fX, fY; + TSG_Point P; + + ModifiedCrossSection.clear(); + ModifiedRoadSection.clear(); + + //left half + + for (i = 0 ; i < iCrossSectionPoints - 1; i++){ + if (pCrossSection[i].x < pRoadSection[0].x && + pCrossSection[i+1].x >= pRoadSection[0].x){ + break; + }//if + }//for + + if (i == iCrossSectionPoints - 1){ + if (pRoadSection[0].y + fHeight < pCrossSection[0].y){ + P.x = pRoadSection[0].x - 2* DITCH_WIDTH * SLOPE_TRANSITION - DITCH_WIDTH + - fabs(pCrossSection[0].y - pRoadSection[0].y - fHeight) / SLOPE_RATIO; + P.y = pCrossSection[0].y - fHeight; + ModifiedRoadSection.push_back(P); + P.y = pCrossSection[0].y; + ModifiedCrossSection.push_back(P); + iCrossSectionPointsToAdd++; + iRoadPointsToAdd++; + + P.x = pRoadSection[0].x - 2* DITCH_WIDTH * SLOPE_TRANSITION - DITCH_WIDTH; + P.y = pRoadSection[0].y; + ModifiedRoadSection.push_back(P); + iRoadPointsToAdd++; + + P.x = pRoadSection[0].x - DITCH_WIDTH * SLOPE_TRANSITION - DITCH_WIDTH; + P.y = pRoadSection[0].y - DITCH_WIDTH / SLOPE_TRANSITION; + ModifiedRoadSection.push_back(P); + iRoadPointsToAdd++; + + P.x = pRoadSection[0].x - DITCH_WIDTH * SLOPE_TRANSITION; + ModifiedRoadSection.push_back(P); + iRoadPointsToAdd++; + }//if + P.x = pRoadSection[0].x - fabs(pCrossSection[0].y - pRoadSection[0].y - fHeight) / SLOPE_RATIO; + P.y = pCrossSection[0].y - fHeight; + ModifiedRoadSection.push_back(P); + P.y = pCrossSection[0].y; + ModifiedCrossSection.push_back(P); + iCrossSectionPointsToAdd++; + iRoadPointsToAdd++; + }//if + else{ + bDitchAdded = false; + for (j = 0; j < 4; j++){ //4 dummy points + ModifiedRoadSection.push_back(pRoadSection[0]); + }//for + for (j = i ; j >= 0; j--){ + if (ModifiedRoadSection[1].y + fHeight > pCrossSection[j+1].y){ + iSgn = -1; + }//if + else{ + iSgn = 1; + }//else + Intersect_Lines(ModifiedRoadSection[1].x, ModifiedRoadSection[1].y + fHeight, + ModifiedRoadSection[1].x - LONG_SEGMENT / SLOPE_RATIO, + ModifiedRoadSection[1].y + LONG_SEGMENT * iSgn + fHeight, + pCrossSection[j].x, pCrossSection[j].y, + pCrossSection[j+1].x, pCrossSection[j+1].y, + fX,fY); + if (pCrossSection[j].x < fX && pCrossSection[j+1].x >= fX){ + if (iSgn == 1){ + if(!bDitchAdded){ + ModifiedRoadSection[1].x = pRoadSection[0].x - 2* DITCH_WIDTH * SLOPE_TRANSITION - DITCH_WIDTH; + ModifiedRoadSection[1].y = pRoadSection[0].y; + iRoadPointsToAdd++; + + ModifiedRoadSection[2].x = pRoadSection[0].x - DITCH_WIDTH * SLOPE_TRANSITION - DITCH_WIDTH; + ModifiedRoadSection[2].y = pRoadSection[0].y - DITCH_WIDTH / SLOPE_TRANSITION; + iRoadPointsToAdd++; + + ModifiedRoadSection[3].x = pRoadSection[0].x - DITCH_WIDTH * SLOPE_TRANSITION; + ModifiedRoadSection[3].y = pRoadSection[0].y - DITCH_WIDTH / SLOPE_TRANSITION; + iRoadPointsToAdd++; + + j = i + 1; + bDitchAdded = true; + }//if + else{ + ModifiedRoadSection[0].x = fX; + ModifiedRoadSection[0].y = fY - fHeight; + iRoadPointsToAdd++; + break; + }//else + }//if + else{ + ModifiedRoadSection[0].x = fX; + ModifiedRoadSection[0].y = fY - fHeight; + iRoadPointsToAdd++; + break; + }//else + }//if + }//for + if (j < 0){ + ModifiedRoadSection[0].x = pRoadSection[0].x - fabs(pCrossSection[0].y - pRoadSection[0].y - fHeight) / SLOPE_RATIO; + ModifiedRoadSection[0].y = pCrossSection[0].y - fHeight; + P.x = ModifiedRoadSection[0].x; + P.y = pCrossSection[0].y; + ModifiedCrossSection.push_back(P); + iCrossSectionPointsToAdd++; + iRoadPointsToAdd++; + }//if*/ + }//else + + //add the central points + + for (i = 0; i < iCrossSectionPoints; i++){ + ModifiedCrossSection.push_back(pCrossSection[i]); + }//for + + ModifiedRoadSection.resize(iRoadPoints + iRoadPointsToAdd); + for (i = 0; i < iRoadPoints; i++){ + ModifiedRoadSection[i + iRoadPointsToAdd].x = pRoadSection[i].x; + ModifiedRoadSection[i + iRoadPointsToAdd].y = pRoadSection[i].y; + }//for + for (i = 0; i < iRoadPoints + iRoadPointsToAdd; i++){ + ModifiedRoadSection[i].x = ModifiedRoadSection[i].x; + ModifiedRoadSection[i].y = ModifiedRoadSection[i].y + fHeight; + }//for + + iRoadPoints += iRoadPointsToAdd; + iCrossSectionPoints += iCrossSectionPointsToAdd; + + // right half + + for (i = 0 ; i < iCrossSectionPoints - 1; i++){ + if (ModifiedCrossSection[i].x < ModifiedRoadSection[iRoadPoints-1].x && + ModifiedCrossSection[i+1].x >= ModifiedRoadSection[iRoadPoints-1].x){ + break; + }//if + }//for + if (i == iCrossSectionPoints - 1){ + if (ModifiedRoadSection[iRoadPoints-1].y + fHeight < ModifiedCrossSection[iCrossSectionPoints-1].y){ + P.x = ModifiedRoadSection[iRoadPoints-1].x + DITCH_WIDTH * SLOPE_TRANSITION; + P.y = ModifiedRoadSection[iRoadPoints-1].y - DITCH_WIDTH / SLOPE_TRANSITION; + ModifiedRoadSection.push_back(P); + iRoadPoints++; + + P.x = ModifiedRoadSection[iRoadPoints-2].x + DITCH_WIDTH * SLOPE_TRANSITION + DITCH_WIDTH; + ModifiedRoadSection.push_back(P); + iRoadPoints++; + + P.x = ModifiedRoadSection[iRoadPoints-3].x + 2* DITCH_WIDTH * SLOPE_TRANSITION + DITCH_WIDTH; + P.y = ModifiedRoadSection[iRoadPoints-3].y; + ModifiedRoadSection.push_back(P); + iRoadPoints++; + }//if + P.x = ModifiedRoadSection[iRoadPoints-1].x + + fabs(ModifiedCrossSection[iCrossSectionPoints-1].y + - ModifiedRoadSection[iRoadPoints-1].y) / SLOPE_RATIO; + P.y = ModifiedCrossSection[iCrossSectionPoints-1].y ; + ModifiedRoadSection.push_back(P); + ModifiedCrossSection.push_back(P); + iCrossSectionPoints++; + iRoadPoints++; + }//if + else{ + bDitchAdded = false; + for (j = i ; j < iCrossSectionPoints - 1; j++){ + if (ModifiedRoadSection[iRoadPoints-1].y > ModifiedCrossSection[j].y){ + iSgn = -1; + }//if + else{ + iSgn = 1; + }//else + if (iSgn == 1 && !bDitchAdded){ + P.x = ModifiedRoadSection[iRoadPoints-1].x + DITCH_WIDTH * SLOPE_TRANSITION; + P.y = ModifiedRoadSection[iRoadPoints-1].y - DITCH_WIDTH / SLOPE_TRANSITION; + ModifiedRoadSection.push_back(P); + iRoadPoints++; + + P.x = ModifiedRoadSection[iRoadPoints-2].x + DITCH_WIDTH * SLOPE_TRANSITION + DITCH_WIDTH; + ModifiedRoadSection.push_back(P); + iRoadPoints++; + + P.x = ModifiedRoadSection[iRoadPoints-3].x + 2* DITCH_WIDTH * SLOPE_TRANSITION + DITCH_WIDTH; + P.y = ModifiedRoadSection[iRoadPoints-3].y; + ModifiedRoadSection.push_back(P); + iRoadPoints++; + + if (ModifiedRoadSection[iRoadPoints-1].y > ModifiedCrossSection[j].y){ + iSgn = -1; + }//if + else{ + iSgn = 1; + }//else + + bDitchAdded = true; + + }//if + + Intersect_Lines(ModifiedRoadSection[iRoadPoints-1].x, ModifiedRoadSection[iRoadPoints-1].y, + ModifiedRoadSection[iRoadPoints-1].x + LONG_SEGMENT / SLOPE_RATIO, + ModifiedRoadSection[iRoadPoints-1].y + LONG_SEGMENT * iSgn, + ModifiedCrossSection[j].x, ModifiedCrossSection[j].y, + ModifiedCrossSection[j+1].x, ModifiedCrossSection[j+1].y, + fX,fY); + + if (ModifiedCrossSection[j].x < fX && ModifiedCrossSection[j+1].x >= fX){ + P.x = fX; + P.y = fY; + ModifiedRoadSection.push_back(P); + iRoadPoints++; + break; + }//if + }//for + if (j == iCrossSectionPoints - 1){ + if (ModifiedRoadSection[iRoadPoints-1].y + fHeight < ModifiedCrossSection[iCrossSectionPoints-1].y + && !bDitchAdded){ + + P.x = ModifiedRoadSection[iRoadPoints-1].x + DITCH_WIDTH * SLOPE_TRANSITION; + P.y = ModifiedRoadSection[iRoadPoints-1].y - DITCH_WIDTH / SLOPE_TRANSITION; + ModifiedRoadSection.push_back(P); + iRoadPoints++; + + P.x = ModifiedRoadSection[iRoadPoints-2].x + DITCH_WIDTH * SLOPE_TRANSITION + DITCH_WIDTH; + ModifiedRoadSection.push_back(P); + iRoadPoints++; + + P.x = ModifiedRoadSection[iRoadPoints-3].x + 2* DITCH_WIDTH * SLOPE_TRANSITION + DITCH_WIDTH; + P.y = ModifiedRoadSection[iRoadPoints-3].y; + ModifiedRoadSection.push_back(P); + iRoadPoints++; + + }//if + P.x = ModifiedRoadSection[iRoadPoints-1].x + + fabs(ModifiedCrossSection[iCrossSectionPoints-1].y + - ModifiedRoadSection[iRoadPoints-1].y) / SLOPE_RATIO; + P.y = ModifiedCrossSection[iCrossSectionPoints-1].y ; + ModifiedRoadSection.push_back(P); + ModifiedCrossSection.push_back(P); + iCrossSectionPoints++; + iRoadPoints++; + + }//if*/ + }//else + +}//method + +void CProfile_Cross_Sections_PDF::Intersect_Lines(double x0,double y0,double x1,double y1, + double x2,double y2,double x3,double y3, + double &xi,double &yi){ + + double a1,b1,c1, + a2,b2,c2, + det_inv, + m1,m2; + + if ((x1-x0)!=0) + m1 = (y1-y0)/(x1-x0); + else + m1 = (double)1e+10; + + if ((x3-x2)!=0) + m2 = (y3-y2)/(x3-x2); + else + m2 = (double)1e+10; + + a1 = m1; + a2 = m2; + + b1 = -1; + b2 = -1; + + c1 = (y0-m1*x0); + c2 = (y2-m2*x2); + + det_inv = 1/(a1*b2 - a2*b1); + + xi=((b1*c2 - b2*c1)*det_inv); + yi=((a2*c1 - a1*c2)*det_inv); + +} //method + +void CProfile_Cross_Sections_PDF::CalculateAreas(TSG_Point * pCrossSection, + TSG_Point * pRoadSection, + double fHeight, + int iCrossSectionPoints, + int iRoadPoints, + double &fPositiveArea, + double &fNegativeArea){ + + int i; + CSG_Shapes *pRoadShapes, *pCrossSectionShapes, *pResultShapes; + CSG_Shape *pRoadShape, *pCrossSectionShape, *pResultShape; + + pResultShapes = new CSG_Shapes; + pResultShapes->Create(SHAPE_TYPE_Polygon); + pResultShape = pResultShapes->Add_Shape(); + pRoadShapes = new CSG_Shapes; + pRoadShapes->Create(SHAPE_TYPE_Polygon); + pRoadShape = pRoadShapes->Add_Shape(); + pCrossSectionShapes = new CSG_Shapes; + pCrossSectionShapes->Create(SHAPE_TYPE_Polygon); + pCrossSectionShape = pCrossSectionShapes->Add_Shape(); + + for (i = 0; i < iRoadPoints; i++){ + pRoadShape->Add_Point(pRoadSection[i].x, pRoadSection[i].y + fHeight); + }//for + pRoadShape->Add_Point(pRoadSection[iRoadPoints-1].x + LONG_SEGMENT / SLOPE_RATIO, + pRoadSection[iRoadPoints-1].y + fHeight + LONG_SEGMENT); + + pRoadShape->Add_Point(pRoadSection[0].x - LONG_SEGMENT / SLOPE_RATIO, + pRoadSection[0].y + fHeight + LONG_SEGMENT); + + for (i = 0; i < iCrossSectionPoints; i++){ + pCrossSectionShape->Add_Point(pCrossSection[i].x, pCrossSection[i].y); + }//for + pCrossSectionShape->Add_Point(pCrossSection[iCrossSectionPoints-1].x + LONG_SEGMENT / SLOPE_RATIO, + pCrossSection[iCrossSectionPoints-1].y - LONG_SEGMENT); + + pCrossSectionShape->Add_Point(pCrossSection[0].x - LONG_SEGMENT / SLOPE_RATIO, + pCrossSection[0].y - LONG_SEGMENT); + + if (SG_Polygon_Intersection(pCrossSectionShape, pRoadShape, pResultShape)){ + fNegativeArea = ((CSG_Shape_Polygon*)pResultShape)->Get_Area(); + }//if + else{ + fNegativeArea = 0; + }//else + + pCrossSectionShape->Del_Parts(); + pRoadShape->Del_Parts(); + pResultShape->Del_Parts(); + + for (i = 0; i < iRoadPoints; i++){ + pRoadShape->Add_Point(pRoadSection[i].x, pRoadSection[i].y + fHeight); + }//for + pRoadShape->Add_Point(pRoadSection[iRoadPoints-1].x + LONG_SEGMENT / SLOPE_RATIO, + pRoadSection[iRoadPoints-1].y + fHeight - LONG_SEGMENT); + + pRoadShape->Add_Point(pRoadSection[0].x - LONG_SEGMENT / SLOPE_RATIO, + pRoadSection[0].y + fHeight - LONG_SEGMENT); + + for (i = 0; i < iCrossSectionPoints; i++){ + pCrossSectionShape->Add_Point(pCrossSection[i].x, pCrossSection[i].y); + }//for + pCrossSectionShape->Add_Point(pCrossSection[iCrossSectionPoints-1].x + LONG_SEGMENT / SLOPE_RATIO, + pCrossSection[iCrossSectionPoints-1].y + LONG_SEGMENT); + + pCrossSectionShape->Add_Point(pCrossSection[0].x - LONG_SEGMENT / SLOPE_RATIO, + pCrossSection[0].y + LONG_SEGMENT); + + if (SG_Polygon_Intersection(pCrossSectionShape, pRoadShape, pResultShape)){ + fPositiveArea = ((CSG_Shape_Polygon*)pResultShape)->Get_Area(); + }//if + else{ + fPositiveArea = 0; + }//else + + delete pRoadShapes; + delete pCrossSectionShapes; + delete pResultShapes; + +}//method + +void CProfile_Cross_Sections_PDF::AddLongitudinalProfile(TSG_Point * pProfile, + double *pHeight, + int iNumPoints){ + + int i; + int iMag; + int iNumLines; + double fMinLine = 0; + double fMaxY, fMinY; + double fMaxX, fMinX; + double fStep; + double fX, fY; + double fOffsetX; + CSG_String sValue; + CSG_Points Points; + double fHeight; + + Add_Page_Title(_TL("Longitudinal Profile"), PDF_TITLE_01); + + Add_Page(PDF_PAGE_SIZE_A3, PDF_PAGE_ORIENTATION_LANDSCAPE); + + fHeight = Get_Size_Page().Get_YMax() - Get_Size_Page().Get_YMin(); + + m_iOffsetY = 50; + + fMaxY = pProfile[0].y; + fMinY = pProfile[0].y; + + for (i = 0; i < iNumPoints; i++) { + if (pProfile[i].y > fMaxY) { + fMaxY = pProfile[i].y; + }// if + if (pProfile[i].y < fMinY) { + fMinY = pProfile[i].y; + }// if + if (pHeight[i] > fMaxY) { + fMaxY = pHeight[i]; + }// if + if (pHeight[i] < fMinY) { + fMinY = pHeight[i]; + }// if + }//for + + iMag = (int) (log(fMaxY - fMinY) / log(10.0)); + fStep = (double) ((int) pow(10.0, (double) iMag)); + if (fStep == 0){ + fStep = 1.; + }//if + if (fMinY < 0) { + iMag = (int) (log(fabs(fMinY)) / log(10.0)); + fMinLine = -(int) pow(10.0, (double) iMag); + }// if + else { + fMinLine=(int)(((int)(fMinY/fStep)) *fStep); + }//else + + iNumLines = (int) ((fMaxY - fMinY) / fStep); + + while (iNumLines < 8) { + fStep = fStep / 2.0; + iNumLines = (int) ((fMaxY - fMinY) / fStep); + }// while + iNumLines = (int) ((fMaxY - fMinLine) / fStep); + + fHeight = Get_Size_Page().Get_YMax() - Get_Size_Page().Get_YMin(); + + for (i = 0; i < iNumLines; i++) { + fX = OFFSET_Y + GUITAR_LEYEND_WIDTH + SEPARATION; + fY = m_iOffsetY + PROFILE_HEIGHT + - ((fMinLine + fStep * i - fMinY) / (fMaxY - fMinY)) * PROFILE_HEIGHT; + if (fY <= m_iOffsetY + PROFILE_HEIGHT && fY >= m_iOffsetY) { + fY = fHeight - fY; + sValue = SG_Get_String(fMinLine + fStep * (double) i); + Draw_Text(fX - 10, fY, SG_Get_String(fMinLine + fStep * (double) i).c_str(), 9, + PDF_STYLE_TEXT_ALIGN_H_RIGHT); + Draw_Line(fX, fY, fX - 5, fY, 0); + }// if + }// for + + fMinX = pProfile[0].x; + fMaxX = pProfile[iNumPoints - 1].x; + + iMag = (int) (log(fMaxX - fMinX) / log(10.0)); + fStep = (double) pow(10.0, (double) iMag); + + iNumLines = (int) ((fMaxX-fMinX) / fStep); + + while (iNumLines < 3) { + fStep = fStep / 2.0; + iNumLines = (int) ((fMaxX-fMinX) / fStep); + }// while + fMinLine = (int)(((int)(fMinX/fStep)) * fStep); + while (fMinLine=OFFSET_Y + GUITAR_LEYEND_WIDTH + SEPARATION + && fX < OFFSET_Y + GUITAR_LEYEND_WIDTH + SEPARATION + PROFILE_WIDTH){ + if (fabs(fStep * (double)i+fMinLine) > 100000) { + sValue = SG_Get_String(fStep * (double)i+fMinLine); + }// if + else { + sValue = SG_Get_String(fStep * (double)i+fMinLine, 2, true); + }// else + Draw_Text(fX, fHeight - m_iOffsetY - PROFILE_HEIGHT - 15, + SG_Get_String(fMinLine + fStep * (double) i).c_str(), 9, + PDF_STYLE_TEXT_ALIGN_H_CENTER | PDF_STYLE_TEXT_ALIGN_V_TOP); + Draw_Line(fX, fHeight - m_iOffsetY - PROFILE_HEIGHT, + fX, fHeight - m_iOffsetY - PROFILE_HEIGHT - 10, 0); + }//if + }// for + + Draw_Line(OFFSET_Y + GUITAR_LEYEND_WIDTH + SEPARATION, fHeight - m_iOffsetY, + OFFSET_Y + GUITAR_LEYEND_WIDTH + SEPARATION, + fHeight - m_iOffsetY - PROFILE_HEIGHT, 2); + Draw_Line(OFFSET_Y + GUITAR_LEYEND_WIDTH + SEPARATION, + fHeight - m_iOffsetY - PROFILE_HEIGHT, + OFFSET_Y + GUITAR_LEYEND_WIDTH + SEPARATION + PROFILE_WIDTH, + fHeight - m_iOffsetY - PROFILE_HEIGHT, 2); + + fY = m_iOffsetY + PROFILE_HEIGHT + - PROFILE_HEIGHT * ((pProfile[0].y - fMinY) / (fMaxY - fMinY)); + fY = fHeight - fY; + fX = OFFSET_Y + GUITAR_LEYEND_WIDTH + SEPARATION + + PROFILE_WIDTH * ((pProfile[0].x - fMinX) / (fMaxX - fMinX)); + Points.Add(fX, fY); + for (i = 1; i < iNumPoints; i++) { + fY = m_iOffsetY + PROFILE_HEIGHT + - PROFILE_HEIGHT * ((pProfile[i].y - fMinY) / (fMaxY - fMinY)); + fY = fHeight - fY; + fX = OFFSET_Y + GUITAR_LEYEND_WIDTH + SEPARATION + + PROFILE_WIDTH * ((pProfile[i].x - fMinX) / (fMaxX - fMinX)); + Points.Add(fX, fY); + }// for + Draw_Line(Points, 2, 0x00bb00); + + Points.Clear(); + + fY = m_iOffsetY + PROFILE_HEIGHT + - PROFILE_HEIGHT * ((pHeight[0] - fMinY) / (fMaxY - fMinY)); + fY = fHeight - fY; + fX = OFFSET_Y + GUITAR_LEYEND_WIDTH + SEPARATION + + PROFILE_WIDTH * ((pProfile[0].x - fMinX) / (fMaxX - fMinX)); + Points.Add(fX,fY); + for (i = 1; i < iNumPoints; i++) { + fY = m_iOffsetY + PROFILE_HEIGHT + - PROFILE_HEIGHT * ((pHeight[i] - fMinY) / (fMaxY - fMinY)); + fY = fHeight - fY; + fX = OFFSET_Y + GUITAR_LEYEND_WIDTH + SEPARATION + + PROFILE_WIDTH * ((pProfile[i].x - fMinX) / (fMaxX - fMinX)); + Points.Add(fX, fY); + }// for + Draw_Line(Points, 2, 0x0000bb); + + DrawGuitar(pProfile, pHeight, iNumPoints); + +}//method + +void CProfile_Cross_Sections_PDF::DrawGuitar(TSG_Point *pProfile, + double *pHeight, + int iNumPoints){ + + int i; + double fY; + double fMinX, fMaxX; + double fDif; + CSG_String sValue; + CSG_String sField [] = {"Distancia","Dist. Parcial.", "Elevacion del terreno", "Elevación de la calzada", " ", " "}; + double fHeight; + + fMinX = pProfile[0].x; + fMaxX = pProfile[iNumPoints - 1].x; + + fHeight = Get_Size_Page().Get_YMax() - Get_Size_Page().Get_YMin(); + + for (i = 0; i < 7; i++){ + fY = m_iOffsetY + PROFILE_HEIGHT + SEPARATION + GUITAR_LEYEND_HEIGHT / 6 * i; + fY = fHeight - fY; + Draw_Line(OFFSET_Y + GUITAR_LEYEND_WIDTH + SEPARATION, fY, + OFFSET_Y + GUITAR_LEYEND_WIDTH + SEPARATION + GUITAR_WIDTH, fY, 0, 0x880000); + if (i){ + Draw_Text(OFFSET_Y + GUITAR_LEYEND_WIDTH + SEPARATION - 10, + fY + GUITAR_LEYEND_HEIGHT / 13, + sField[i-1].c_str(), + 9, + PDF_STYLE_TEXT_ALIGN_V_CENTER | PDF_STYLE_TEXT_ALIGN_H_RIGHT); + + }//if + }//for + + AddGuitarValue(0, 0, fMinX, fMaxX, 1); + for (i = 0; i < iNumPoints; i++) { + AddGuitarValue(pProfile[i].x, pProfile[i].x / 1000, fMinX, fMaxX, 0); + if (i){ + AddGuitarValue(pProfile[i].x, pProfile[i].x / 1000 - pProfile[i-1].x / 1000, + fMinX, fMaxX, 1); + }//if + fDif = pProfile[i].y - pHeight[i]; + AddGuitarValue(pProfile[i].x, pProfile[i].y, fMinX, fMaxX, 2); + AddGuitarValue(pProfile[i].x, pHeight[i], fMinX, fMaxX, 3); + if (fDif > 0){ + AddGuitarValue(pProfile[i].x, fDif, fMinX, fMaxX, 4); + }//if + else{ + AddGuitarValue(pProfile[i].x, fDif, fMinX, fMaxX, 5); + }//else + + + }// for + +}//method + +void CProfile_Cross_Sections_PDF::AddGuitarValue(double fXValue, + double fValue, + double fMinX, + double fMaxX, + int iLine){ + + double fX,fY; + double fHeight; + + fHeight = Get_Size_Page().Get_YMax() - Get_Size_Page().Get_YMin(); + + fX = OFFSET_Y + GUITAR_LEYEND_WIDTH + SEPARATION + + PROFILE_WIDTH * ((fXValue - fMinX) / (fMaxX - fMinX)); + fY = m_iOffsetY + PROFILE_HEIGHT + SEPARATION + GUITAR_LEYEND_HEIGHT / 6 * (iLine + 1); + fY = fHeight - fY; + + Draw_Line(fX, fY, fX, fY + 3, 0, 0x880000); + + fY += 3; + fX += 3; + + Draw_Text(fX, fY, SG_Get_String(fValue, 2).c_str(), 8, + 0, + 3.14159/2.); + + fY = m_iOffsetY + PROFILE_HEIGHT + SEPARATION + GUITAR_LEYEND_HEIGHT / 6 * iLine; + fY = fHeight - fY; + fX -= 3; + + Draw_Line(fX, fY, fX, fY - 3, 0, 0x880000); + +}//method + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +CProfile_Cross_Sections::CProfile_Cross_Sections(void){ + + CSG_Parameter *pNode; + + Parameters.Set_Name(_TL("Terrain Path Cross Sections")); + Parameters.Set_Description(_TW("(c) 2004 Victor Olaya. Cross Sections")); + + Parameters.Add_Grid(NULL, + "DEM", + _TL("DEM"), + _TL("Digital Terrain Model"), + PARAMETER_INPUT); + + Parameters.Add_Shapes(NULL, + "LINES", + _TL("Path"), + _TL(""), + PARAMETER_INPUT, + SHAPE_TYPE_Line); + + Parameters.Add_Shapes(NULL, + "SECTIONS", + _TL("Cross Sections"), + _TL(""), + PARAMETER_OUTPUT); + + Parameters.Add_Value(NULL, + "NUMPOINTS", + _TL("Number of points"), + _TL("Number of points on each side of the section"), + PARAMETER_TYPE_Int, + 10, + 1, + true); + + Parameters.Add_Value(NULL, + "INTERVAL", + _TL("Interval"), + _TL("Interval between points (in grid units)."), + PARAMETER_TYPE_Double, + 10); + + Parameters.Add_Value(NULL, + "STEP", + _TL("n"), + _TL("Draw a section each n points"), + PARAMETER_TYPE_Int, + 2); + + pNode = Parameters.Add_Node(NULL, + "PDFNODE", + _TL("PDF Documents"), + _TL("")); + + Parameters.Add_Value(pNode, + "PDF", + _TL("Create PDF Documents"), + _TL(""), + PARAMETER_TYPE_Bool, + true); + + Parameters.Add_FilePath(pNode, + "OUTPUTPATH", + _TL("Folder for PDF Files"), + _TL(""), + _TL(""), + _TL(""), + true, + true); + + Parameters.Add_Value(pNode, + "WIDTH", + _TL("Road Width"), + _TL(""), + PARAMETER_TYPE_Double, + 5.); + + Parameters.Add_Value(pNode, + "SLOPE", + _TL("Side Slope"), + _TL(""), + PARAMETER_TYPE_Double, + .5); + + Parameters.Add_Value(pNode, + "THRESHOLD", + _TL("Height Threshold"), + _TL("Height threshold for optimal profile calculation"), + PARAMETER_TYPE_Double, + .5); +}//constructor + + +CProfile_Cross_Sections::~CProfile_Cross_Sections(void){} + +bool CProfile_Cross_Sections::On_Execute(void){ + + CSG_Shapes *pLines; + CSG_Shape *pShape, *pSection; + CSG_Grid *pDEM; + TSG_Point Point, Point2; + double fInterval; + double fStepX, fStepY; + int iNumPoints; + int i,j,k; + int iPoint; + int iField = 0; + int iStep; + double dX, dY; + double dX2, dY2; + double dDistance; + double dHeight; + bool bCopy; + + m_pSections = Parameters("SECTIONS")->asShapes(); + pLines = Parameters("LINES")->asShapes(); + pDEM = Parameters("DEM")->asGrid(); + fInterval = (double) Parameters("INTERVAL")->asDouble(); + iNumPoints = Parameters("NUMPOINTS")->asInt(); + iStep = Parameters("STEP")->asInt(); + + if(pLines == m_pSections){ + bCopy = true; + m_pSections = SG_Create_Shapes(); + }//if + else{ + bCopy = false; + }//else + + m_pSections->Create(SHAPE_TYPE_Line, _TL("Cross Sections")); + for (i = iNumPoints; i > 0; i--){ + m_pSections->Add_Field(CSG_String::Format(SG_T("-%s"), SG_Get_String(fInterval * i, 2).c_str()), + SG_DATATYPE_Double); + }//for + m_pSections->Add_Field("0", SG_DATATYPE_Double); + for (i = 1; i < iNumPoints +1; i++){ + m_pSections->Add_Field(SG_Get_String(fInterval * i).c_str(), SG_DATATYPE_Double); + }//for + for(i=0; iGet_Count() && Set_Progress(i, pLines->Get_Count()); i++){ + pShape = pLines->Get_Shape(i); + for(j=0; jGet_Part_Count(); j++){ + for(k=0; kGet_Point_Count(j)-1; k+=iStep){ + Point = pShape->Get_Point(k,j); + Point2 = pShape->Get_Point(k+1,j); + dDistance = sqrt(pow(Point2.x - Point.x,2) + pow(Point2.y - Point.y,2)); + dX = (Point.x + Point2.x) / 2.; + dY = (Point.y + Point2.y) / 2.; + fStepX = (Point2.y - Point.y) / dDistance * fInterval; + fStepY = -(Point2.x - Point.x) / dDistance * fInterval; + pSection = m_pSections->Add_Shape(); + pSection->Add_Point(dX + iNumPoints * fStepX, + dY + iNumPoints * fStepY); + pSection->Add_Point(dX - iNumPoints * fStepX, + dY - iNumPoints * fStepY); + iField = 0; + for (iPoint = iNumPoints; iPoint > 0; iPoint--){ + dX2 = dX - iPoint * fStepX; + dY2 = dY - iPoint * fStepY; + dHeight = pDEM->Get_Value(dX2, dY2); + pSection->Set_Value(iField, dHeight); + iField++; + }//for + dHeight = pDEM->Get_Value(dX, dY); + pSection->Set_Value(iField, dHeight); + iField++; + for (iPoint = 1; iPoint < iNumPoints +1; iPoint++){ + dX2 = dX + iPoint * fStepX; + dY2 = dY + iPoint * fStepY; + dHeight = pDEM->Get_Value(dX2, dY2); + pSection->Set_Value(iField, dHeight); + iField++; + }//for*/ + }//for + }//for + }//for + + if (Parameters("PDF")->asBool()){ + CreatePDFDocs(); + }//if + + if(bCopy){ + pLines->Assign(m_pSections); + delete(m_pSections); + }//if + + return true; + +}// method + +void CProfile_Cross_Sections::CreatePDFDocs(){ + + CSG_String sFilePath; + + if (Parameters("OUTPUTPATH")->asString()){ + m_DocEngine.Open(_TL("SECTIONS")); + sFilePath = SG_File_Make_Path(Parameters("OUTPUTPATH")->asString(), _TL("Sections"), _TL("pdf")); + }//if + else{ + Message_Add(_TL("\n** Error : Invalid parameters **\n")); + return; + }//else + + AddLongitudinalProfiles(); + AddCrossSections(); + + if (m_DocEngine.Save(sFilePath)){ + if (!m_DocEngine.Close()){ + Message_Add(_TL("\n\n ** Error : Could not close PDF engine ** \n\n")); + } + }//if + else{ + Message_Add(_TL("\n\n ** Error : Could not save PDF file ** \n\n")); + }//else + + +}//method + + +void CProfile_Cross_Sections::AddLongitudinalProfiles(){ + + int i,j,k; + int iIndex = 0; + int iNumPoints = Parameters("NUMPOINTS")->asInt(); + int iStep = Parameters("STEP")->asInt(); + int iFirstPoint = 0; + int iLastPoint; + int iSections; + double fX1, fY1, fX2, fY2; + double fDistance, fDistanceSum = 0; + double fDist; + double fThreshold = (double)Parameters("THRESHOLD")->asDouble(); + bool bValid; + CSG_Shape *pShape; + CSG_Table *pTable; + TSG_Point Point, Point2; + CSG_Shapes* pLines = Parameters("LINES")->asShapes(); + + pTable = m_pSections; + iSections = pTable->Get_Record_Count(); + + m_pProfile = new TSG_Point[iSections]; + + for(i=0; iGet_Count() && Set_Progress(i, pLines->Get_Count()); i++){ + pShape = pLines->Get_Shape(i); + for(j=0; jGet_Part_Count(); j++){ + Point = pShape->Get_Point(0,j); + for(k=0; kGet_Point_Count(j)-1; k+=iStep){ + Point2 = pShape->Get_Point(k,j); + fDistance = sqrt(pow(Point2.x - Point.x,2) + pow(Point2.y - Point.y,2)); + m_pProfile[iIndex].x = fDistanceSum + fDistance / 2.; + m_pProfile[iIndex].y = pTable->Get_Record(iIndex)->asFloat(iNumPoints); + fDistanceSum += fDistance; + iIndex++; + Point.x = Point2.x; + Point.y = Point2.y; + }//for + }//for + }//for*/ + + m_pHeight = new double[iSections]; + + for (i = 0; i < iSections; i++){ + m_pHeight[i] = 1500; + } + + iLastPoint = iSections - 1; + while(iFirstPoint != iSections - 1){ + fX1 = m_pProfile[iFirstPoint].x; + fY1 = m_pProfile[iFirstPoint].y; + fX2 = m_pProfile[iLastPoint].x; + fY2 = m_pProfile[iLastPoint].y; + bValid = true; + for (i = iFirstPoint; i < iLastPoint; i++){ + fDist = CalculatePointLineDist(fX1,fY1,fX2,fY2, m_pProfile[i].x, m_pProfile[i].y); + if (fDist > fThreshold){ + iLastPoint--; + bValid = false; + break; + }//if + }//for + if (bValid){ + for (j = iFirstPoint; j < iLastPoint + 1; j++){ + m_pHeight[j] = m_pProfile[iFirstPoint].y + + (m_pProfile[j].x - m_pProfile[iFirstPoint].x) + / (m_pProfile[iLastPoint].x - m_pProfile[iFirstPoint].x) + * (m_pProfile[iLastPoint].y - m_pProfile[iFirstPoint].y); + }//for + iFirstPoint = iLastPoint; + iLastPoint = iSections - 1; + }//if + }//while + + + m_DocEngine.AddLongitudinalProfile(m_pProfile, m_pHeight, iSections); + +}//method + +double CProfile_Cross_Sections::CalculatePointLineDist(double fX1, double fY1, double fX2, double fY2, double fPX, double fPY){ + + double *pA, *pB, *pC; + + pA = new double[2]; + pA[0] = fX1; + pA[1] = fY1; + pB = new double[2]; + pB[0] = fX2; + pB[1] = fY2; + pC = new double[2]; + pC[0] = fPX; + pC[1] = fPY; + + return linePointDist(pA, pB, pC); + +}//method + +void CProfile_Cross_Sections::AddCrossSections(){ + + int i,j; + int iRoadPoints; + int iNumPoints = Parameters("NUMPOINTS")->asInt(); + double fInterval = (double) Parameters("INTERVAL")->asDouble(); + CSG_Table *pTable; + TSG_Point *pRoadSection; + TSG_Point **pCrossSections; + double dWidth = Parameters("WIDTH")->asDouble(); + + pRoadSection = new TSG_Point [2]; + pRoadSection[0].x = -dWidth / 2.; + pRoadSection[0].y = 0; + pRoadSection[1].x = dWidth / 2.; + pRoadSection[1].y = 0; + + pTable = m_pSections; + pCrossSections = new TSG_Point *[pTable->Get_Record_Count()]; + + for (i = 0; i < pTable->Get_Record_Count(); i++){ + pCrossSections[i] = new TSG_Point [pTable->Get_Field_Count()]; + for (j = 0; j < pTable->Get_Field_Count(); j++){ + pCrossSections[i][j].x = -fInterval * iNumPoints + fInterval * j; + pCrossSections[i][j].y = pTable->Get_Record(i)->asFloat(j); + }//for + }//for + + iRoadPoints = 2; + + m_DocEngine.AddCrossSections(pCrossSections, m_pHeight, pRoadSection, pTable->Get_Record_Count(), + pTable->Get_Field_Count(), iRoadPoints); + m_DocEngine.AddVolumesTable(m_pProfile, pCrossSections, m_pHeight, pRoadSection, + pTable->Get_Record_Count(), pTable->Get_Field_Count(), iRoadPoints); + +}//method + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- diff -Nru saga-2.1.0+dfsg/src/modules/docs/docs_pdf/Profile_Cross_Sections.h saga-2.1.4+dfsg/src/modules/docs/docs_pdf/Profile_Cross_Sections.h --- saga-2.1.0+dfsg/src/modules/docs/docs_pdf/Profile_Cross_Sections.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/docs/docs_pdf/Profile_Cross_Sections.h 2014-11-13 08:32:17.000000000 +0000 @@ -0,0 +1,92 @@ +/********************************************************** + * Version $Id: Profile_Cross_Sections.h 911 2011-02-14 16:38:15Z reklov_w $ + *********************************************************/ +/******************************************************************************* + CrossSections.h + Copyright (C) Victor Olaya + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, USA +*******************************************************************************/ + +//--------------------------------------------------------- +#include "doc_pdf.h" + +#include + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +class CProfile_Cross_Sections_PDF : public CSG_Doc_PDF +{ +public: + CProfile_Cross_Sections_PDF(); + ~CProfile_Cross_Sections_PDF(); + void AddCrossSections(TSG_Point **,double*,TSG_Point *,int,int,int); + void AddLongitudinalProfile(TSG_Point *, double*, int); + void AddVolumesTable(TSG_Point *,TSG_Point **,double*,TSG_Point *,int,int,int); + +private: + char *m_pPath; + int m_iCanvasHeight; + int m_iTableWidth; + int m_iOffsetY; + CSG_String m_sName; + + void AddCrossSection(TSG_Point *,TSG_Point *,int,int); + void DrawGuitar(TSG_Point *,double*, int); + void AddGuitarValue(double,double,double,double,int); + void AdjustSections(TSG_Point *,TSG_Point *,std::vector&,std::vector&,double,int&,int&); + void Intersect_Lines(double,double,double,double,double,double,double,double,double&,double&); + void CalculateAreas(TSG_Point*,TSG_Point*,double,int,int,double&,double&); +}; + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +class CProfile_Cross_Sections : public CSG_Module_Grid +{ +public: + CProfile_Cross_Sections(void); + virtual ~CProfile_Cross_Sections(void); + +protected: + + bool On_Execute(void); + +private: + + CProfile_Cross_Sections_PDF m_DocEngine; + CSG_Shapes *m_pSections; + double *m_pHeight; + TSG_Point *m_pProfile; + + void CreatePDFDocs(); + void AddLongitudinalProfiles(); + void AddCrossSections(); + double CalculatePointLineDist(double,double,double,double,double,double); + +}; + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- diff -Nru saga-2.1.0+dfsg/src/modules/docs/docs_pdf/Shapes_Report.cpp saga-2.1.4+dfsg/src/modules/docs/docs_pdf/Shapes_Report.cpp --- saga-2.1.0+dfsg/src/modules/docs/docs_pdf/Shapes_Report.cpp 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/docs/docs_pdf/Shapes_Report.cpp 2014-11-13 08:32:17.000000000 +0000 @@ -0,0 +1,645 @@ +/********************************************************** + * Version $Id: Shapes_Report.cpp 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// Shapes_Tools // +// // +//-------------------------------------------------------// +// // +// Shapes_Report.cpp // +// // +// Copyright (C) 2005 by // +// Olaf Conrad, Victor Olaya // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Goettingen // +// Goldschmidtstr. 5 // +// 37077 Goettingen // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "doc_pdf.h" +#include "Shapes_Report.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +CShapes_Report::CShapes_Report(void) +{ + CSG_Parameter *pNode; + + //----------------------------------------------------- + Set_Name (_TL("Shapes Report")); + + Set_Author (SG_T("(c) 2005 by O.Conrad, V.Olaya")); + + Set_Description (_TW( + "" + )); + + //----------------------------------------------------- + pNode = Parameters.Add_Shapes( + NULL , "SHAPES" , _TL("Shapes"), + _TL(""), + PARAMETER_INPUT + ); + + Parameters.Add_Table_Field( + pNode , "SUBTITLE" , _TL("Subtitle"), + _TL("") + ); + + Parameters.Add_FilePath( + NULL , "FILENAME" , _TL("PDF File"), + _TL(""), + _TL("PDF Files (*.pdf)|*.pdf|All Files|*.*"), + _TL(""), true, false + ); + + Parameters.Add_Choice( + NULL , "PAPER_SIZE" , _TL("Paper Format"), + _TL(""), + + CSG_String::Format(SG_T("%s|%s|%s|%s|"), + _TL("A4 Portrait"), + _TL("A4 Landscape"), + _TL("A3 Portrait"), + _TL("A3 Landscape") + ) + ); + + Parameters.Add_Value( + pNode , "COLOR_LINE" , _TL("Line Color"), + _TL(""), + PARAMETER_TYPE_Color, SG_COLOR_BLACK + ); + + Parameters.Add_Value( + pNode , "COLOR_FILL" , _TL("Fill Color"), + _TL(""), + PARAMETER_TYPE_Color, SG_COLOR_GREEN + ); + + //----------------------------------------------------- + pNode = Parameters.Add_Node(NULL, "NODE_LAYOUT" , _TL("Layout"), _TL("")); + + Parameters.Add_Choice( + pNode , "LAYOUT_MODE" , _TL("Layout"), + _TL(""), + + CSG_String::Format(SG_T("%s|%s|"), + _TL("horizontal"), + _TL("vertical") + ), 1 + ); + + Parameters.Add_Value( + pNode , "LAYOUT_BREAK", _TL("Map/Table Size Ratio [%]"), + _TL(""), + PARAMETER_TYPE_Double, 50.0, 0.0, true, 100.0, true + ); + + //----------------------------------------------------- + pNode = Parameters.Add_Node(NULL, "NODE_TABLE" , _TL("Attribute Table"), _TL("")); + + Parameters.Add_Value( + pNode , "COLUMNS" , _TL("Columns"), + _TL("Number of atttribute table columns."), + PARAMETER_TYPE_Int, 2, 1, true + ); + + Parameters.Add_Choice( + pNode , "CELL_MODE" , _TL("Cell Sizes"), + _TL(""), + + CSG_String::Format(SG_T("%s|%s|"), + _TL("fit to page"), + _TL("fixed cell height") + ) + ); + + Parameters.Add_Value( + pNode , "CELL_HEIGHT" , _TL("Cell Height"), + _TL(""), + PARAMETER_TYPE_Int, 8, 1, true + ); +} + +//--------------------------------------------------------- +CShapes_Report::~CShapes_Report(void) +{ +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CShapes_Report::On_Execute(void) +{ + int Page_Orientation; + TSG_PDF_Page_Size Page_Size; + CSG_String FileName(Parameters("FILENAME") ->asString()); + CSG_Doc_PDF PDF; + + //----------------------------------------------------- + m_pShapes = Parameters("SHAPES") ->asShapes(); + m_iSubtitle = Parameters("SUBTITLE") ->asInt(); + m_Color_Line = Parameters("COLOR_LINE") ->asColor(); + m_Color_Fill = Parameters("COLOR_FILL") ->asColor(); + m_nColumns = Parameters("COLUMNS") ->asInt(); + + switch( Parameters("CELL_MODE")->asInt() ) + { + default: + case 0: m_Cell_Height = 0; break; + case 1: m_Cell_Height = Parameters("CELL_HEIGHT")->asDouble(); break; + } + + switch( Parameters("PAPER_SIZE")->asInt() ) + { + default: + case 0: Page_Size = PDF_PAGE_SIZE_A4; Page_Orientation = PDF_PAGE_ORIENTATION_PORTRAIT; break; // A4 Portrait + case 1: Page_Size = PDF_PAGE_SIZE_A4; Page_Orientation = PDF_PAGE_ORIENTATION_LANDSCAPE; break; // A4 Landscape + case 2: Page_Size = PDF_PAGE_SIZE_A3; Page_Orientation = PDF_PAGE_ORIENTATION_PORTRAIT; break; // A3 Portrait + case 3: Page_Size = PDF_PAGE_SIZE_A3; Page_Orientation = PDF_PAGE_ORIENTATION_LANDSCAPE; break; // A3 Landscape + } + + //----------------------------------------------------- + if( FileName.Length() > 0 && PDF.Open(Page_Size, Page_Orientation, CSG_String::Format(SG_T("%s: %s"), _TL("Summary"), m_pShapes->Get_Name())) ) + { + double d = Parameters("LAYOUT_BREAK")->asDouble(); + + switch( Parameters("LAYOUT_MODE")->asInt() ) + { + default: + case 0: // horizontal + PDF.Layout_Add_Box( 0, 0, 100, 5, "TITLE"); + PDF.Layout_Add_Box( 0, 5, d, 100, "SHAPE"); + PDF.Layout_Add_Box( d, 5, 100, 100, "TABLE"); + break; + + case 1: // vertical + PDF.Layout_Add_Box( 0, 0, 100, 5, "TITLE"); + PDF.Layout_Add_Box( 0, 5, 100, d, "SHAPE"); + PDF.Layout_Add_Box( 0, d, 100, 100, "TABLE"); + break; + } + + m_pPDF = &PDF; + + m_rTitle = PDF.Layout_Get_Box("TITLE"); + m_rShape = PDF.Layout_Get_Box("SHAPE"); + m_rTable = PDF.Layout_Get_Box("TABLE"); + + return( Add_Shapes() && PDF.Save(FileName) ); + } + + return( false ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CShapes_Report::Add_Shapes(void) +{ + if( m_pShapes && m_pShapes->is_Valid() && m_pPDF && m_pPDF->Add_Page() ) + { + bool bAddAll; + CSG_Rect r(m_rShape), rWorld(m_pShapes->Get_Extent()); + CSG_String Title; + CSG_Strings sLeft, sRight; + + //------------------------------------------------- + m_pPDF->Draw_Text(m_rTitle.Get_XCenter(), m_rTitle.Get_YCenter(), _TL("Overview"), (int)(0.7 * m_rTitle.Get_YRange()), PDF_STYLE_TEXT_ALIGN_H_CENTER|PDF_STYLE_TEXT_ALIGN_V_CENTER|PDF_STYLE_TEXT_UNDERLINE); + + //------------------------------------------------- + r.Deflate(10, false); + rWorld.Inflate(5, true); + + m_pPDF->Draw_Shapes (r, m_pShapes, PDF_STYLE_POLYGON_FILLSTROKE, m_Color_Fill, m_Color_Line, 0, &rWorld); + m_pPDF->Draw_Graticule(r, rWorld, 10); + + //------------------------------------------------- + sLeft .Add(CSG_String::Format(SG_T("%s:") , _TL("Name"))); + sRight .Add(CSG_String::Format(SG_T("%s") , m_pShapes->Get_Name())); + sLeft .Add(CSG_String::Format(SG_T("%s:") , _TL("Count"))); + sRight .Add(CSG_String::Format(SG_T("%d") , m_pShapes->Get_Count())); + + m_pPDF->Draw_Text(m_rTable.Get_XMin() , m_rTable.Get_YMax(), sLeft , 8, PDF_STYLE_TEXT_ALIGN_H_LEFT|PDF_STYLE_TEXT_ALIGN_V_TOP); + m_pPDF->Draw_Text(m_rTable.Get_XCenter(), m_rTable.Get_YMax(), sRight, 8, PDF_STYLE_TEXT_ALIGN_H_LEFT|PDF_STYLE_TEXT_ALIGN_V_TOP); + + //------------------------------------------------- + bAddAll = m_pShapes->Get_Selection_Count() == 0; + + for(int iShape=0; iShapeGet_Count() && Set_Progress(iShape, m_pShapes->Get_Count()); iShape++) + { + if( bAddAll || m_pShapes->Get_Record(iShape)->is_Selected() ) + { + Title.Printf(SG_T("%s: %s"), m_pShapes->Get_Field_Name(m_iSubtitle), m_pShapes->Get_Shape(iShape)->asString(m_iSubtitle)); + + Add_Shape(m_pShapes->Get_Shape(iShape), Title); + } + } + + return( true ); + } + + return( false ); +} + +//--------------------------------------------------------- +bool CShapes_Report::Add_Shape(CSG_Shape *pShape, const SG_Char *Title) +{ + if( m_pPDF && m_pPDF->Is_Ready_To_Draw() && pShape && pShape->is_Valid() && m_pPDF->Add_Page() ) + { + CSG_Rect r(m_rShape), rWorld(pShape->Get_Extent()); + + //------------------------------------------------- + m_pPDF->Add_Outline_Item(Title); + + m_pPDF->Draw_Text(m_rTitle.Get_XCenter(), m_rTitle.Get_YCenter(), Title, (int)(0.7 * m_rTitle.Get_YRange()), PDF_STYLE_TEXT_ALIGN_H_CENTER|PDF_STYLE_TEXT_ALIGN_V_CENTER|PDF_STYLE_TEXT_UNDERLINE); + + r.Deflate(10, false); + rWorld.Inflate(5, true); + + m_pPDF->Draw_Shape (r, pShape, PDF_STYLE_POLYGON_FILLSTROKE, m_Color_Fill, m_Color_Line, 0, &rWorld); + m_pPDF->Draw_Graticule (r, rWorld, 10); + + //------------------------------------------------- + if( pShape->Get_Table()->Get_Field_Count() > 0 ) + { + CSG_Table_Record *pRecord; + CSG_Table Table; + + Table.Set_Name(_TL("Attributes")); + + Table.Add_Field(_TL("Attribute"), SG_DATATYPE_String); + Table.Add_Field(_TL("Value") , SG_DATATYPE_String); + + for(int iField=0; iFieldGet_Table()->Get_Field_Count(); iField++) + { + pRecord = Table.Add_Record(); + + pRecord->Set_Value(0, pShape->Get_Table()->Get_Field_Name(iField)); + pRecord->Set_Value(1, pShape->asString(iField)); + } + + m_pPDF->Draw_Table(m_rTable, &Table, m_nColumns, m_Cell_Height, 0.0); + } + + return( true ); + } + + return( false ); +} + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +/*/--------------------------------------------------------- +void CWKSP_Map::SaveAs_PDF_Indexed(void) +{ + static CSG_Parameters Parameters(NULL, LNG("[CAP] Save to PDF"), LNG(""), NULL, false); + + //----------------------------------------------------- + if( Parameters.Get_Count() == 0 ) + { + Parameters.Add_FilePath( + NULL , "FILENAME" , LNG("[FLD] PDF Document"), + LNG(""), + CSG_String::Format( + wxT("%s (*.pdf)|*pdf|") + wxT("%s|*.*"), + LNG("PDF Files"), + LNG("All Files") + ), NULL, true, false + ); + + Parameters.Add_Choice( + NULL , "PAPER_SIZE" , LNG("[FLD] Paper Format"), + LNG(""), + + CSG_String::Format(wxT("%s|%s|%s|%s|"), + LNG("A4 Portrait"), + LNG("A4 Landscape"), + LNG("A3 Portrait"), + LNG("A3 Landscape") + ) + ); + + Parameters.Add_String( + NULL , "NAME" , LNG("[FLD] Title"), + LNG(""), + LNG("") + ); + + Parameters.Add_Shapes( + NULL , "SHAPES" , LNG("[FLD] Shapes"), + LNG(""), + PARAMETER_INPUT_OPTIONAL + ); + + Parameters.Add_Table_Field( + Parameters("SHAPES") , "FIELD" , LNG("[FLD] Attribute"), + LNG("") + ); + + // Parameters.Add_Grid( + // NULL , "GRID" , LNG("[FLD] Grid"), + // LNG(""), + // PARAMETER_INPUT_OPTIONAL + // ); + + Parameters.Add_FilePath( + NULL , "FILEICON" , LNG("[FLD] Icon"), + LNG(""), + + CSG_String::Format(wxT("%s|*.png;*.jpg|%s|*.png|%s|*.jpg|%s|*.*"), + LNG("All Recognised Files"), + LNG("PNG Files"), + LNG("JPG Files"), + LNG("All Files") + ), NULL, false, false + ); + + Parameters.Add_Value( + NULL , "ROUNDSCALE" , LNG("[FLD] Round Scale"), + LNG(""), + PARAMETER_TYPE_Bool, true + ); + } + + //----------------------------------------------------- + if( DLG_Parameters(&Parameters) ) + { + bool bResult, bRoundScale; + int iField; + CSG_String Name, FileName, FileName_Icon, FilePath_Maps; + CSG_Rect rOverview, rMap; + CSG_Shapes *pShapes; + // CSG_Grid *pGrid; + CSG_Doc_PDF PDF; + + MSG_General_Add(CSG_String::Format(wxT("%s..."), LNG("[MSG] Save to PDF")), true, true); + + bResult = false; + Name = Parameters("NAME") ->asString(); if( Name.Length() < 1 ) Name = LNG("Maps"); + FileName = Parameters("FILENAME") ->asString(); + FileName_Icon = Parameters("FILEICON") ->asString(); + pShapes = Parameters("SHAPES") ->asShapes(); + // pGrid = Parameters("GRID") ->asGrid(); + iField = Parameters("FIELD") ->asInt(); + bRoundScale = Parameters("ROUNDSCALE") ->asBool(); + + switch( Parameters("PAPER_SIZE")->asInt() ) + { + default: + case 0: PDF.Open(PDF_PAGE_SIZE_A4, PDF_PAGE_ORIENTATION_PORTRAIT , Name); break; // A4 Portrait + case 1: PDF.Open(PDF_PAGE_SIZE_A4, PDF_PAGE_ORIENTATION_LANDSCAPE, Name); break; // A4 Landscape + case 2: PDF.Open(PDF_PAGE_SIZE_A3, PDF_PAGE_ORIENTATION_PORTRAIT , Name); break; // A3 Portrait + case 3: PDF.Open(PDF_PAGE_SIZE_A3, PDF_PAGE_ORIENTATION_LANDSCAPE, Name); break; // A3 Landscape + } + + //------------------------------------------------- + if( PDF.Is_Open() ) + { + PDF.Layout_Set_Box_Space(5, false); + + PDF.Layout_Add_Box( 0.0, 0.0, 100.0, 75.0, "MAP"); + PDF.Layout_Add_Box( 0.0, 75.0, 50.0, 100.0, "DIVISIONS"); + PDF.Layout_Add_Box( 50.0, 75.0, 60.0, 80.0, "ICON"); + PDF.Layout_Add_Box( 60.0, 75.0, 100.0, 80.0, "TITLE"); + PDF.Layout_Add_Box( 50.0, 80.0, 100.0, 100.0, "DESCRIPTION"); + + FilePath_Maps = SG_File_Make_Path(SG_File_Get_Path(FileName), SG_File_Get_Name(FileName, false)); + rOverview = pShapes ? pShapes->Get_Extent() : Get_Extent(); + // rOverview = pShapes ? pShapes->Get_Extent() : (pGrid ? pGrid->Get_Extent() : Get_Extent()); + + //--------------------------------------------- + // PDF.Draw_Text (PDF.Layout_Get_Box("TITLE").Get_XMin(), PDF.Layout_Get_Box("TITLE").Get_YCenter(), LNG("This is a Test!!!"), 24); + // PDF.Draw_Rectangle (PDF.Layout_Get_Box("DIVISIONS")); + // PDF.Draw_Grid (PDF.Layout_Get_Box("DIVISIONS"), Parameters("GRID")->asGrid(), CSG_Colors(), 0.0, 0.0, 0, &rOverview); + // PDF.Draw_Shapes (PDF.Layout_Get_Box("DIVISIONS"), pShapes, PDF_STYLE_POLYGON_STROKE, SG_COLOR_GREEN, SG_COLOR_BLACK, 1, &rOverview); + // PDF.Draw_Graticule (PDF.Layout_Get_Box("DIVISIONS"), rOverview); + + //--------------------------------------------- + Draw_PDF(&PDF, FilePath_Maps, -1, FileName_Icon, Name, rOverview, bRoundScale, iField, pShapes); + + if( pShapes ) + { + for(int i=0; iGet_Count() && SG_UI_Process_Set_Progress(i, pShapes->Get_Count()); i++) + { + Draw_PDF(&PDF, FilePath_Maps, i, FileName_Icon, Name, pShapes->Get_Shape(i)->Get_Extent(), bRoundScale, iField, pShapes); + } + } + + //--------------------------------------------- + PROCESS_Set_Okay(true); + Set_Buisy_Cursor(true); + bResult = PDF.Save(FileName); + Set_Buisy_Cursor(false); + } + + MSG_General_Add(bResult ? LNG("[MSG] okay") : LNG("[MSG] failed"), false, false, bResult ? SG_UI_MSG_STYLE_SUCCESS : SG_UI_MSG_STYLE_FAILURE); + } +} + +//--------------------------------------------------------- +void CWKSP_Map::Draw_PDF(CSG_Doc_PDF *pPDF, const wxChar *FilePath_Maps, int Image_ID, const wxChar *FileName_Icon, const wxChar *Title, CSG_Rect rWorld, bool bRoundScale, int iField, CSG_Shapes *pShapes) +{ + int FrameSize_1 = 20, FrameSize_2 = 10; + double d, e, Scale, Ratio; + CSG_String FileName, Description, s; + CSG_Rect rBox; + wxRect rBMP; + wxBitmap BMP; + wxMemoryDC dc; + + if( pPDF && rWorld.Get_XRange() > 0.0 && rWorld.Get_YRange() > 0.0 && pPDF->Add_Page() ) + { + rWorld.Inflate(5.0, true); + + //------------------------------------------------- + rBox = pPDF->Layout_Get_Box("MAP"); + rBox.Deflate(FrameSize_1, false); + + rBMP = wxRect(0, 0, (int)rBox.Get_XRange(), (int)rBox.Get_YRange()); + BMP.Create(rBMP.GetWidth(), rBMP.GetHeight()); + dc.SelectObject(BMP); + dc.SetBackground(*wxWHITE_BRUSH); + dc.Clear(); + + if( bRoundScale ) + { + Scale = rWorld.Get_XRange() / (pPDF->Get_Page_To_Meter() * (double)rBMP.GetWidth()); + + // if( Scale > 1000 ) + // { + Ratio = ((ceil(Scale / 1000.)) / (Scale / 1000.) - 1); + rWorld.Inflate(Ratio * 100, true); + // } + } + + Scale = rWorld.Get_XRange() / (pPDF->Get_Page_To_Meter() * rBMP.GetWidth()); + + Draw_Map(dc, rWorld, 1.0, rBMP, false); + dc.SelectObject(wxNullBitmap); + SG_Dir_Create(FilePath_Maps); + FileName = SG_File_Make_Path(FilePath_Maps, CSG_String::Format(wxT("image_%03d"), Image_ID + 1), wxT("png")); + BMP.SaveFile(FileName.c_str(), wxBITMAP_TYPE_PNG); + + pPDF->Draw_Image (rBox, FileName); + pPDF->Draw_Graticule(rBox, rWorld, FrameSize_1); + + //------------------------------------------------- + rBox = pPDF->Layout_Get_Box("ICON"); + + if( FileName_Icon ) + { + pPDF->Draw_Image(rBox, FileName_Icon); + } + else + { + pPDF->Draw_Rectangle(rBox); + } + + //------------------------------------------------- + rBox = pPDF->Layout_Get_Box("DIVISIONS"); + + pPDF->Draw_Rectangle(rBox); + + if( pShapes ) + { + CSG_Rect rShapes(pShapes->Get_Extent()); + + rShapes.Inflate(5.0, true); + rBox.Deflate(FrameSize_2, false); + + pPDF->Draw_Graticule(rBox, rShapes, FrameSize_2); + pPDF->Draw_Shapes(rBox, pShapes, PDF_STYLE_POLYGON_FILLSTROKE, SG_COLOR_GREEN, SG_COLOR_BLACK, 0, &rShapes); + + if( Image_ID >= 0 && Image_ID < pShapes->Get_Count() ) + { + pPDF->Draw_Shape(rBox, pShapes->Get_Shape(Image_ID), PDF_STYLE_POLYGON_FILLSTROKE, SG_COLOR_YELLOW, SG_COLOR_RED, 1, &rShapes); + } + } + + //------------------------------------------------- + rBox = pPDF->Layout_Get_Box("TITLE"); + + pPDF->Draw_Text(rBox.Get_XMin(), rBox.Get_YCenter(), Title, 20, PDF_STYLE_TEXT_ALIGN_H_LEFT|PDF_STYLE_TEXT_ALIGN_V_CENTER|PDF_STYLE_TEXT_UNDERLINE); + + //------------------------------------------------- + rBox = pPDF->Layout_Get_Box("DESCRIPTION"); + + Description.Append(CSG_String::Format(wxT("%d. %s\n"), Image_ID + 2, LNG("Map"))); + + if( pShapes && Image_ID >= 0 && Image_ID < pShapes->Get_Count() ) + { + switch( pShapes->Get_Type() ) + { + default: + break; + + case SHAPE_TYPE_Line: + d = ((CSG_Shape_Line *)pShapes->Get_Shape(Image_ID))->Get_Length(); + e = d > 1000.0 ? 1000.0 : 1.0; + s = d > 1000.0 ? wxT("km") : wxT("m"); + Description.Append(CSG_String::Format(wxT("%s: %f%s\n"), LNG("Length") , d / e, s.c_str())); + break; + + case SHAPE_TYPE_Polygon: + d = ((CSG_Shape_Polygon *)pShapes->Get_Shape(Image_ID))->Get_Area(); + e = d > 1000000.0 ? 1000000.0 : (d > 10000.0 ? 10000.0 : 1.0); + s = d > 1000000.0 ? wxT("km\xc2\xb2") : (d > 10000.0 ? wxT("ha") : wxT("m\xc2\xb2")); + Description.Append(CSG_String::Format(wxT("%s: %f%s\n"), LNG("Area") , d / e, s.c_str())); + + d = ((CSG_Shape_Polygon *)pShapes->Get_Shape(Image_ID))->Get_Perimeter(); + e = d > 1000.0 ? 1000.0 : 1.0; + s = d > 1000.0 ? wxT("km") : wxT("m"); + Description.Append(CSG_String::Format(wxT("%s: %f%s\n"), LNG("Perimeter") , d / e, s.c_str())); + + Description.Append(CSG_String::Format(wxT("%s: %d\n") , LNG("Parts") , ((CSG_Shape_Polygon *)pShapes->Get_Shape(Image_ID))->Get_Part_Count())); + break; + } + + if( iField >= 0 && iField < pShapes->Get_Field_Count() ) + { + Description.Append(CSG_String::Format(wxT("%s: %s\n"), pShapes->Get_Field_Name(iField), pShapes->Get_Shape(Image_ID)->asString(iField))); + } + } + + Description.Append(CSG_String::Format(wxT("%s 1:%s"), LNG("Scale"), SG_Get_String(Scale, 2).c_str())); + + pPDF->Draw_Text(rBox.Get_XMin(), rBox.Get_YMax(), Description, 12, PDF_STYLE_TEXT_ALIGN_H_LEFT|PDF_STYLE_TEXT_ALIGN_V_TOP); + } +}/**/ + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- diff -Nru saga-2.1.0+dfsg/src/modules/docs/docs_pdf/Shapes_Report.h saga-2.1.4+dfsg/src/modules/docs/docs_pdf/Shapes_Report.h --- saga-2.1.0+dfsg/src/modules/docs/docs_pdf/Shapes_Report.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/docs/docs_pdf/Shapes_Report.h 2014-11-13 08:32:17.000000000 +0000 @@ -0,0 +1,116 @@ +/********************************************************** + * Version $Id: Shapes_Report.h 1922 2014-01-09 10:28:46Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// Shapes_Tools // +// // +//-------------------------------------------------------// +// // +// Shapes_Report.h // +// // +// Copyright (C) 2005 by // +// Olaf Conrad, Victor Olaya // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Goettingen // +// Goldschmidtstr. 5 // +// 37077 Goettingen // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#ifndef HEADER_INCLUDED__Shapes_Report_H +#define HEADER_INCLUDED__Shapes_Report_H + +//--------------------------------------------------------- +#include "MLB_Interface.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +class CShapes_Report : public CSG_Module +{ +public: + CShapes_Report(void); + virtual ~CShapes_Report(void); + + +protected: + + virtual bool On_Execute (void); + + +private: + + int m_iSubtitle, m_nColumns, m_Color_Line, m_Color_Fill; + + double m_Cell_Height; + + CSG_Rect m_rTitle, m_rShape, m_rTable; + + CSG_Shapes *m_pShapes; + + class CSG_Doc_PDF *m_pPDF; + + + bool Add_Shapes (void); + bool Add_Shape (CSG_Shape *pShape, const SG_Char *Title); + +}; + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#endif // #ifndef HEADER_INCLUDED__Shapes_Report_H diff -Nru saga-2.1.0+dfsg/src/modules/docs/docs_pdf/Shapes_Summary.cpp saga-2.1.4+dfsg/src/modules/docs/docs_pdf/Shapes_Summary.cpp --- saga-2.1.0+dfsg/src/modules/docs/docs_pdf/Shapes_Summary.cpp 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/docs/docs_pdf/Shapes_Summary.cpp 2014-11-13 08:32:17.000000000 +0000 @@ -0,0 +1,575 @@ +/********************************************************** + * Version $Id: Shapes_Summary.cpp 911 2011-02-14 16:38:15Z reklov_w $ + *********************************************************/ +/******************************************************************************* + Summarize.cpp + Copyright (C) Victor Olaya + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, USA +*******************************************************************************/ + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "Shapes_Summary.h" + +#define VERY_LARGE_NUMBER 9999999999. + +CSG_String sParam[] = {"[Sum]", "[Mean]", "[Variance]", "[Minimum]", "[Maximum]"}; + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#define PDF_PAGE_WIDTH_A4 596 +#define PDF_PAGE_HEIGHT_A4 842 +#define PDF_PAGE_WIDTH_A3 PDF_PAGE_HEIGHT_A4 +#define PDF_PAGE_HEIGHT_A3 (sqrt(2.) * PDF_PAGE_HEIGHT_A4) +#define OFFSET_X 50 +#define OFFSET_Y 50 +#define LINE_SPACEMENT 12 +#define SUMMARY_LAYOUT_HEADER 50 +#define MAX_SUMMARY_LAYOUT_HEIGHT (PDF_PAGE_WIDTH_A3 - 2 * OFFSET_Y - LINE_SPACEMENT) +#define MAX_SUMMARY_LAYOUT_WIDTH MAX_SUMMARY_LAYOUT_HEIGHT +#define SUMMARY_LAYOUT_SEPARATION 30 +#define MAX_SUMMARY_TABLE_WIDTH (PDF_PAGE_HEIGHT_A3 - 2 * OFFSET_X - MAX_SUMMARY_LAYOUT_WIDTH - SUMMARY_LAYOUT_SEPARATION) +#define MAX_ROWS_IN_SUMMARY_LAYOUT (MAX_SUMMARY_LAYOUT_HEIGHT / TABLE_CELL_HEIGHT) +#define SUMMARY_STATISTICS_GRAPH_HEIGHT 120 +#define SUMMARY_STATISTICS_GRAPH_WIDTH (PDF_PAGE_WIDTH_A4 - 2 * OFFSET_X) +#define SUMMARY_STATISTICS_GRAPH_SEPARATION 120 +#define GRATICULE_SEPARATION 20 +#define SUMMARY_TABLE_CELL_HEIGHT 13.0 + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#ifndef min +#define min(a,b) (((a) < (b)) ? (a) : (b)) +#endif + +CShapes_Summary_PDF::CShapes_Summary_PDF(){ + +}//constructor + +CShapes_Summary_PDF::~CShapes_Summary_PDF(){} + +void CShapes_Summary_PDF::AddClassSummaryPage(CSG_Shapes *pShapes, + CSG_Table *pTable, + int iClass, + CSG_String sTitle){ + + int i; + double fPaperHeight; + double fRealWidth, fRealHeight; + double fX, fY; + CSG_Table *pClassTable; + CSG_Table_Record *pRecord; + CSG_Rect CanvasExtent, TableExtent; + TSG_Rect Extent; + + + Add_Page(PDF_PAGE_SIZE_A3, PDF_PAGE_ORIENTATION_LANDSCAPE); + Add_Outline_Item(sTitle.c_str()); + + fPaperHeight = Get_Size_Page().Get_YRange(); + + Draw_Text(PDF_PAGE_HEIGHT_A3 - OFFSET_X, fPaperHeight - OFFSET_Y, sTitle, + 25, PDF_STYLE_TEXT_ALIGN_H_RIGHT, 0.0, SG_GET_RGB(0, 0, 0)); + + Draw_Line(OFFSET_X, fPaperHeight - OFFSET_Y - 5, + PDF_PAGE_HEIGHT_A3 - OFFSET_X, fPaperHeight - OFFSET_Y - 5, 4 ); + + Extent = pShapes->Get_Extent(); + fRealWidth = Extent.xMax - Extent.xMin; + fRealHeight = Extent.yMax - Extent.yMin; + + CanvasExtent.Assign(OFFSET_X, + OFFSET_Y, + OFFSET_X + MAX_SUMMARY_LAYOUT_WIDTH, + OFFSET_Y + MAX_SUMMARY_LAYOUT_HEIGHT); + + _Fit_Rectangle(CanvasExtent, fRealWidth / fRealHeight, true); + + CanvasExtent.Deflate(GRATICULE_SEPARATION, false); + + Draw_Shapes(CanvasExtent, pShapes); + + CanvasExtent.Inflate(GRATICULE_SEPARATION, false); + + /*CanvasExtent.xMin = OFFSET_X + (MAX_SUMMARY_LAYOUT_WIDTH - fWidth) / 2. - GRATICULE_SEPARATION; + CanvasExtent.xMax = CanvasExtent.xMin + fWidth + 2 * GRATICULE_SEPARATION; + CanvasExtent.yMin = OFFSET_Y + (MAX_SUMMARY_LAYOUT_HEIGHT - fHeight) / 2. - GRATICULE_SEPARATION; + CanvasExtent.yMax = CanvasExtent.yMin + fHeight + 2* GRATICULE_SEPARATION;*/ + + Draw_Graticule(CanvasExtent, Extent); + + pClassTable = SG_Create_Table(); + pClassTable->Add_Field(_TL("Field"), SG_DATATYPE_String ); + pClassTable->Add_Field(_TL("Value"), SG_DATATYPE_Double); + + for (i = 0; i < pTable->Get_Field_Count(); i++){ + pRecord = pClassTable->Add_Record(); + pRecord->Set_Value(0, pTable->Get_Field_Name(i)); + pRecord->Set_Value(1, pTable->Get_Record(iClass)->asDouble(i)); + } + fY = fPaperHeight - OFFSET_Y - SUMMARY_LAYOUT_HEADER; + fX = PDF_PAGE_HEIGHT_A3 - OFFSET_X - MAX_SUMMARY_TABLE_WIDTH; + TableExtent.Assign(fX, fY, fX + MAX_SUMMARY_TABLE_WIDTH, OFFSET_Y); + + Draw_Table(TableExtent, pClassTable, SUMMARY_TABLE_CELL_HEIGHT, 0.0); + +}//method + +void CShapes_Summary_PDF::AddSummaryStatisticsPage(CSG_Table* pTable){ + + int i,j; + double fX, fY; + double fPaperHeight; + CSG_Points Data; + CSG_String *pNames; + CSG_Rect r; + + fPaperHeight = Get_Size_Page().Get_YRange(); + + pNames = new CSG_String [pTable->Get_Record_Count()]; + for (i = 0; i < pTable->Get_Record_Count(); i++){ + pNames[i] = pTable->Get_Record(i)->asString(0); + }//for + + for (i = 1; i < pTable->Get_Field_Count(); i++){ + if ((i-1)%3 == 0){ + Add_Page(); + }//if + Data.Clear(); + for (j = 0; j < pTable->Get_Record_Count(); j++){ + Data.Add(0.0, pTable->Get_Record(j)->asDouble(i)); + }//for + fY = OFFSET_Y + ((i-1)%3) * (SUMMARY_STATISTICS_GRAPH_HEIGHT + SUMMARY_STATISTICS_GRAPH_SEPARATION); + fY = fPaperHeight - fY; + fX = OFFSET_X; + Draw_Text(fX, fY + 10, pTable->Get_Field_Name(i), 14); + r.Assign(fX, fY - 25 - SUMMARY_STATISTICS_GRAPH_HEIGHT, fX + SUMMARY_STATISTICS_GRAPH_WIDTH, fY - 25 ); + AddBarGraphStatistics(Data, pNames, r); + }//for*/ + + +}//method + +void CShapes_Summary_PDF::AddBarGraphStatistics(CSG_Points &Data, + CSG_String *pNames, + const CSG_Rect &r){ + + int i; + int iMag; + int iNumLines; + double fMinLine = 0; + double fWidth; + double fMax, fMin; + double fStep; + double fX, fY; + double fPaperHeight; + double fAngle; + CSG_String sValue; + CSG_Points Points; + + fPaperHeight = Get_Size_Page().Get_YRange(); + + fMin = fMax = Data[0].y; + + for (i = 0; i < Data.Get_Count(); i++){ + if (Data[i].y > fMax){ + fMax = Data[i].y; + } + if (Data[i].y < fMin){ + fMin = Data[i].y; + } + fMin = M_GET_MIN(0, fMin); + } + + if (fMin != fMax){ + iMag = (int) (log(fMax - fMin) / log(10.0)); + fStep = (pow(10.0, (double) iMag)); + if (fStep == 0){ + fStep = 1.; + } + fMinLine= (long)(((long)(fMin/fStep)) *fStep); + + iNumLines = (int) ((fMax - fMin) / fStep); + + while (iNumLines < 8){ + fStep = fStep / 2.0; + iNumLines = (int) ((fMax - fMin) / fStep); + } + iNumLines = (int) ((fMax - fMinLine) / fStep); + } + else{ + fStep = fMin = 0; + iNumLines = 1; + fMinLine = fMax; + } + + + for (i = 0; i < iNumLines; i++) { + fY = r.Get_YMin() + ((fMinLine + fStep * i - fMin) / (fMax - fMin)) * r.Get_YRange(); + if (fY <= r.Get_YMax() && fY >= r.Get_YMin()) { + Draw_Line(r.Get_XMin(), fY, r.Get_XMax(), fY); + } + } + + fWidth = (double) r.Get_XRange() / (double) (Data.Get_Count()); + for (i = 0; i < Data.Get_Count(); i++) + { + fX = r.Get_XMin() + i * fWidth; + fY = r.Get_YMin(); + //fY = fPaperHeight - fY; + Draw_Rectangle(fX, fY, fX + fWidth, + fY + r.Get_YRange() * ((Data[i].y - fMin) / (fMax - fMin)), + PDF_STYLE_POLYGON_FILLSTROKE, 0xaa0000); + } + + fAngle = 3.14159/ 180 * 60; + + for (i = 0; i < Data.Get_Count(); i++) + { + fX = r.Get_XMin() + i * fWidth + fWidth / 2.; + Draw_Text(fX - 5, fY - 5, pNames[i], 9, PDF_STYLE_TEXT_ALIGN_V_TOP|PDF_STYLE_TEXT_ALIGN_H_RIGHT, fAngle); + Draw_Line(fX, fY, fX, fY - 5, 1); + } + + Draw_Line(r.Get_XMin(), r.Get_YMin(), r.Get_XMin(), r.Get_YMax(), 4); + Draw_Line(r.Get_XMin(), r.Get_YMin(), r.Get_XMax(), r.Get_YMin(), 4); + + +}//method + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +CShapes_Summary::CShapes_Summary(void){ + + CSG_Parameter *pNode; + CSG_String sName; + + Parameters.Set_Name(_TL("Shapes Summary Report")); + Parameters.Set_Description(_TW("(c) 2004 by Victor Olaya. summary.")); + + pNode = Parameters.Add_Shapes(NULL, + "SHAPES", + _TL("Shapes"), + _TL(""), + PARAMETER_INPUT); + + Parameters.Add_Table_Field(pNode, + "FIELD", + _TL("Field"), + _TL("")); + + Parameters.Add_Table(NULL, + "TABLE", + _TL("Summary Table"), + _TL(""), + PARAMETER_OUTPUT); + + pNode = Parameters.Add_Node(NULL, + "PDFNODE", + _TL("PDF Docs"), + _TL("")); + + Parameters.Add_Value(pNode, + "PDF", + _TL("Create PDF Docs"), + _TL("Create PDF Docs"), + PARAMETER_TYPE_Bool, + true); + + Parameters.Add_FilePath(pNode, + "OUTPUTPATH", + _TL("Folder"), + _TL("Folder"), + _TL(""), + _TL(""), + true, + true); + + m_pExtraParameters = Add_Parameters("EXTRA", + _TL("Field for Summary"), + _TL("")); + +}//constructor + + +CShapes_Summary::~CShapes_Summary(void) +{} + +bool CShapes_Summary::On_Execute(void){ + + int i,j; + CSG_Table *pShapesTable; + CSG_Parameter **pExtraParameter; + CSG_String sName, sFilePath; + + m_iField = Parameters("FIELD")->asInt(); + m_pShapes = Parameters("SHAPES")->asShapes(); + m_pTable = Parameters("TABLE")->asTable(); + + pShapesTable = m_pShapes; + m_bIncludeParam = new bool [pShapesTable->Get_Field_Count() * 5]; + pExtraParameter = new CSG_Parameter* [pShapesTable->Get_Field_Count() * 5]; + + for (i = 0; i < pShapesTable->Get_Field_Count(); i++){ + for (j = 0; j < 5; j++){ + if( SG_Data_Type_is_Numeric(pShapesTable->Get_Field_Type(i)) ) + { //is numeric field + sName = pShapesTable->Get_Field_Name(i); + sName.Append(sParam[j]); + pExtraParameter[i * 5 + j] = m_pExtraParameters->Add_Value(NULL, + SG_Get_String(i * 5 + j,0).c_str(), + sName.c_str(), + _TL(""), + PARAMETER_TYPE_Bool, + false); + m_bIncludeParam[i * 5 + j] = true; + }//if + else{ + m_bIncludeParam[i * 5 + j] = false; + }//else + }//for + }//for + + if(Dlg_Parameters("EXTRA")){ + for (i = 0; i < pShapesTable->Get_Field_Count() * 5; i++){ + sName = SG_Get_String(i,0); + if (m_bIncludeParam[i]){ + m_bIncludeParam[i] = Get_Parameters("EXTRA")->Get_Parameter(sName.c_str())->asBool(); + }//if + }//for + + Summarize(); + + if (Parameters("PDF")->asBool()){ + if (Parameters("OUTPUTPATH")->asString()){ + sName = _TL("Summary_"); + sName.Append(m_pShapes->Get_Name()); + m_DocEngine.Open(PDF_PAGE_SIZE_A3, PDF_PAGE_ORIENTATION_LANDSCAPE, sName); + CreatePDFDocs(); + sFilePath = SG_File_Make_Path(Parameters("OUTPUTPATH")->asString(), sName, SG_T("pdf")); + if (m_DocEngine.Save(sFilePath)){ + if (!m_DocEngine.Close()){ + Message_Add(_TL("\n\n ** Error : Could not close PDF engine ** \n\n")); + } + }//if + else{ + Message_Add(_TL("\n\n ** Error : Could not save PDF file ** \n\n")); + }//else + }//if + }//if + + m_pExtraParameters->Destroy(); + + delete [] m_bIncludeParam; + + return true; + + }//if + + m_pExtraParameters->Destroy(); + + delete [] m_bIncludeParam; + + return false; + +}//method + +void CShapes_Summary::CreatePDFDocs(){ + + CSG_Shapes *pShapes; + CSG_Shape *pShape; + CSG_Table *pShapesTable; + int i,j; + + m_DocEngine.Add_Page_Title (_TL("Summary"), PDF_TITLE_01, PDF_PAGE_SIZE_A3, PDF_PAGE_ORIENTATION_LANDSCAPE); + + pShapesTable = m_pShapes; + pShapes = new CSG_Shapes(); + for (i = 0; i < (int)m_ClassesID.size(); i++){ + Set_Progress(i,m_ClassesID.size()); + pShapes->Create(m_pShapes->Get_Type()); + for (j = 0; j < m_pShapes->Get_Count(); j++){ + if (m_pClasses[j] == i){ + pShape = pShapes->Add_Shape(); + pShape->Assign(m_pShapes->Get_Shape(j)); + }//if + }//for + m_DocEngine.AddClassSummaryPage(pShapes, m_pTable, i, m_ClassesID[i]); + }//for + + if (m_pTable->Get_Record_Count() > 1){ + m_DocEngine.Add_Page_Title (_TL("Statistics"), PDF_TITLE_01, PDF_PAGE_SIZE_A4, PDF_PAGE_ORIENTATION_PORTRAIT); + m_DocEngine.AddSummaryStatisticsPage(m_pTable); + }//if + + delete pShapes; + +}//method + + +void CShapes_Summary::Summarize(){ + + int i,j; + + CSG_Table *pShapesTable; + CSG_Table_Record *pRecord; + CSG_String sName; + float *pSum; + float *pMin; + float *pMax; + float *pVar; + float fValue; + float fMean; + int iLastField = -1; + int iField; + int iParam; + + m_ClassesID.clear(); + + pShapesTable = m_pShapes; + m_pClasses = new int[pShapesTable->Get_Record_Count()]; + + for (i = 0; i < pShapesTable->Get_Record_Count(); i++){ + pRecord = pShapesTable->Get_Record(i); + sName = pRecord->asString(m_iField); + for (j = 0; j < (int)m_ClassesID.size(); j++){ + if (!m_ClassesID[j].CmpNoCase(sName)){ + m_pClasses[i] = j; + break; + }//if + }//for + if (j == m_ClassesID.size()){ + m_pClasses[i] = j; + m_ClassesID.push_back(sName); + }//if + }//for + + m_pTable->Create((CSG_Table*)NULL); + m_pTable->Set_Name(_TL("Summary Table")); + m_pTable->Add_Field(_TL("Class"), SG_DATATYPE_String); + m_pTable->Add_Field(_TL("Count"), SG_DATATYPE_Int); + + m_pCount = new int[m_ClassesID.size()]; + pSum = new float[m_ClassesID.size()]; + pMax = new float[m_ClassesID.size()]; + pMin = new float[m_ClassesID.size()]; + pVar = new float[m_ClassesID.size()]; + + for (i = 0; i < (int)m_ClassesID.size(); i++){ + m_pCount[i] = 0; + }//for + + for (i = 0; i < pShapesTable->Get_Record_Count(); i++){ + m_pCount[m_pClasses[i]]++; + }//for + + for (i = 0; i < (int)m_ClassesID.size(); i++){ + pRecord = m_pTable->Add_Record(); + sName = m_ClassesID[i]; + pRecord->Set_Value(0,sName.c_str()); + pRecord->Set_Value(1,m_pCount[i]); + }//for + + for (i = 0; i < pShapesTable->Get_Field_Count() * 5; i++){ + if (m_bIncludeParam[i]){ + iField = (int) (i / 5); + iParam = i % 5; + sName = pShapesTable->Get_Field_Name(iField); + sName.Append(sParam[iParam]); + m_pTable->Add_Field(sName.c_str(), SG_DATATYPE_Double); + if (iField != iLastField){ + for (j = 0; j < (int)m_ClassesID.size(); j++){ + pSum[j] = 0; + pMax[j] = -(float)VERY_LARGE_NUMBER; + pMin[j] = (float)VERY_LARGE_NUMBER; + pVar[j] = 0; + }//for + for (j = 0; j < pShapesTable->Get_Record_Count(); j++){ + pRecord = pShapesTable->Get_Record(j); + fValue = pRecord->asFloat(iField); + pSum[m_pClasses[j]] += fValue; + pVar[m_pClasses[j]] += (fValue * fValue); + if (fValue > pMax[m_pClasses[j]]){ + pMax[m_pClasses[j]] = fValue; + }//if + if (fValue < pMin[m_pClasses[j]]){ + pMin[m_pClasses[j]] = fValue; + }//if + }//for + }//if + iField = m_pTable->Get_Field_Count() - 1; + for (j = 0; j < (int)m_ClassesID.size(); j++){ + pRecord = m_pTable->Get_Record(j); + switch (iParam){ + case 0: //sum + pRecord->Set_Value(iField, pSum[j]); + break; + case 1: //average + pRecord->Set_Value(iField, pSum[j] / (float) m_pCount[j]); + break; + case 2: //variance + fMean = pSum[j] / (float) m_pCount[j]; + pRecord->Set_Value(iField, pVar[j] / (float) m_pCount[j] - fMean * fMean); + break; + case 3: //min + pRecord->Set_Value(iField, pMin[j]); + break; + case 4: //max + pRecord->Set_Value(iField, pMax[j]); + break; + default: + break; + }//switch + }//for + + }//if + + }//for + + +}//method + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- diff -Nru saga-2.1.0+dfsg/src/modules/docs/docs_pdf/Shapes_Summary.h saga-2.1.4+dfsg/src/modules/docs/docs_pdf/Shapes_Summary.h --- saga-2.1.0+dfsg/src/modules/docs/docs_pdf/Shapes_Summary.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/docs/docs_pdf/Shapes_Summary.h 2014-11-13 08:32:17.000000000 +0000 @@ -0,0 +1,98 @@ +/********************************************************** + * Version $Id: Shapes_Summary.h 911 2011-02-14 16:38:15Z reklov_w $ + *********************************************************/ +/******************************************************************************* + Summarize.h + Copyright (C) Victor Olaya + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, USA +*******************************************************************************/ + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "doc_pdf.h" + +#include + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +class CShapes_Summary_PDF : public CSG_Doc_PDF +{ +public: + + CShapes_Summary_PDF(); + virtual ~CShapes_Summary_PDF(); + void AddClassSummaryPage(CSG_Shapes*, CSG_Table*, int, CSG_String); + void AddSummaryStatisticsPage(CSG_Table* pTable); + +private: + + void AddBarGraphStatistics(CSG_Points &, CSG_String*, const CSG_Rect &); + +}; + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +class CShapes_Summary : public CSG_Module +{ +public: + CShapes_Summary(void); + virtual ~CShapes_Summary(void); + +protected: + + virtual bool On_Execute(void); + +private: + + int m_iField; + CSG_Shapes *m_pShapes; + CSG_Table *m_pTable; + bool *m_bIncludeParam; + std::vector m_ClassesID; + int *m_pClasses; + int *m_pCount; + CSG_Parameters *m_pExtraParameters; + CShapes_Summary_PDF m_DocEngine; + + void Summarize(); + void CreatePDFDocs(); + +}; + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- diff -Nru saga-2.1.0+dfsg/src/modules/docs/Makefile.am saga-2.1.4+dfsg/src/modules/docs/Makefile.am --- saga-2.1.0+dfsg/src/modules/docs/Makefile.am 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/docs/Makefile.am 2014-11-13 08:32:17.000000000 +0000 @@ -0,0 +1 @@ +SUBDIRS = docs_html docs_pdf diff -Nru saga-2.1.0+dfsg/src/modules/docs/Makefile.in saga-2.1.4+dfsg/src/modules/docs/Makefile.in --- saga-2.1.0+dfsg/src/modules/docs/Makefile.in 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/docs/Makefile.in 2014-11-13 08:33:29.000000000 +0000 @@ -0,0 +1,639 @@ +# Makefile.in generated by automake 1.14.1 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ +VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +subdir = src/modules/docs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_postgresql.m4 \ + $(top_srcdir)/m4/ax_pkg_swig.m4 \ + $(top_srcdir)/m4/ax_python_devel.m4 \ + $(top_srcdir)/m4/ax_swig_enable_cxx.m4 \ + $(top_srcdir)/m4/ax_swig_python.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = +SOURCES = +DIST_SOURCES = +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ + distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags +DIST_SUBDIRS = $(SUBDIRS) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +am__relativize = \ + dir0=`pwd`; \ + sed_first='s,^\([^/]*\)/.*$$,\1,'; \ + sed_rest='s,^[^/]*/*,,'; \ + sed_last='s,^.*/\([^/]*\)$$,\1,'; \ + sed_butlast='s,/*[^/]*$$,,'; \ + while test -n "$$dir1"; do \ + first=`echo "$$dir1" | sed -e "$$sed_first"`; \ + if test "$$first" != "."; then \ + if test "$$first" = ".."; then \ + dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ + dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ + else \ + first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ + if test "$$first2" = "$$first"; then \ + dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ + else \ + dir2="../$$dir2"; \ + fi; \ + dir0="$$dir0"/"$$first"; \ + fi; \ + fi; \ + dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ + done; \ + reldir="$$dir2" +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +AX_SWIG_PYTHON_CPPFLAGS = @AX_SWIG_PYTHON_CPPFLAGS@ +AX_SWIG_PYTHON_OPT = @AX_SWIG_PYTHON_OPT@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DISABLELIBHARU = @DISABLELIBHARU@ +DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +FGREP = @FGREP@ +GOMPFLAGS = @GOMPFLAGS@ +GREP = @GREP@ +HARU_LIB = @HARU_LIB@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LOCAL_INCS = @LOCAL_INCS@ +LOCAL_LIBS = @LOCAL_LIBS@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ +MKDIR_P = @MKDIR_P@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PG_CONFIG = @PG_CONFIG@ +POSTGRESQL_CFLAGS = @POSTGRESQL_CFLAGS@ +POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@ +POSTGRESQL_VERSION = @POSTGRESQL_VERSION@ +POW_LIB = @POW_LIB@ +PYTHON = @PYTHON@ +PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ +PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ +PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ +PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_PLATFORM = @PYTHON_PLATFORM@ +PYTHON_PREFIX = @PYTHON_PREFIX@ +PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ +PYTHON_VERSION = @PYTHON_VERSION@ +RANLIB = @RANLIB@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +SWIG = @SWIG@ +SWIG_LIB = @SWIG_LIB@ +VERSION = @VERSION@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +pkgpyexecdir = @pkgpyexecdir@ +pkgpythondir = @pkgpythondir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +pyexecdir = @pyexecdir@ +pythondir = @pythondir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +SUBDIRS = docs_html docs_pdf +all: all-recursive + +.SUFFIXES: +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/modules/docs/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign src/modules/docs/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +# This directory's subdirectories are mostly independent; you can cd +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + dot_seen=yes; \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + set x; \ + here=`pwd`; \ + if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ + empty_fix=.; \ + else \ + include_option=--include; \ + empty_fix=; \ + fi; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test ! -f $$subdir/TAGS || \ + set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ + $(am__define_uniq_tagged_files); \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ + fi +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ + test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ + dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ + $(am__relativize); \ + new_distdir=$$reldir; \ + dir1=$$subdir; dir2="$(top_distdir)"; \ + $(am__relativize); \ + new_top_distdir=$$reldir; \ + echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ + echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ + ($(am__cd) $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$$new_top_distdir" \ + distdir="$$new_distdir" \ + am__remove_distdir=: \ + am__skip_length_check=: \ + am__skip_mode_fix=: \ + distdir) \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-recursive +all-am: Makefile +installdirs: installdirs-recursive +installdirs-am: +install: install-recursive +install-exec: install-exec-recursive +install-data: install-data-recursive +uninstall: uninstall-recursive + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-recursive +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-recursive + +clean-am: clean-generic clean-libtool mostlyclean-am + +distclean: distclean-recursive + -rm -f Makefile +distclean-am: clean-am distclean-generic distclean-tags + +dvi: dvi-recursive + +dvi-am: + +html: html-recursive + +html-am: + +info: info-recursive + +info-am: + +install-data-am: + +install-dvi: install-dvi-recursive + +install-dvi-am: + +install-exec-am: + +install-html: install-html-recursive + +install-html-am: + +install-info: install-info-recursive + +install-info-am: + +install-man: + +install-pdf: install-pdf-recursive + +install-pdf-am: + +install-ps: install-ps-recursive + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-recursive + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-recursive + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +pdf: pdf-recursive + +pdf-am: + +ps: ps-recursive + +ps-am: + +uninstall-am: + +.MAKE: $(am__recursive_targets) install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags tags-am uninstall uninstall-am + + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nru saga-2.1.0+dfsg/src/modules/garden/garden_3d_viewer/3d_viewer_globe_grid.cpp saga-2.1.4+dfsg/src/modules/garden/garden_3d_viewer/3d_viewer_globe_grid.cpp --- saga-2.1.0+dfsg/src/modules/garden/garden_3d_viewer/3d_viewer_globe_grid.cpp 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/garden/garden_3d_viewer/3d_viewer_globe_grid.cpp 2014-11-13 08:32:19.000000000 +0000 @@ -0,0 +1,650 @@ +/********************************************************** + * Version $Id: 3d_viewer_globe_grid.cpp 911 2011-02-14 16:38:15Z reklov_w $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// 3d_viewer // +// // +//-------------------------------------------------------// +// // +// 3d_viewer_globe_grid.cpp // +// // +// Copyright (C) 2014 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Hamburg // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "3d_viewer_globe_grid.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +class C3D_Viewer_Globe_Grid_Panel : public CSG_3DView_Panel +{ +public: + C3D_Viewer_Globe_Grid_Panel(wxWindow *pParent, CSG_Grid *pGrid, CSG_Grid *pZ); + virtual ~C3D_Viewer_Globe_Grid_Panel(void); + + +protected: + + virtual int On_Parameters_Enable (CSG_Parameters *pParameters, CSG_Parameter *pParameter); + + virtual void Update_Statistics (void); + virtual void Update_Parent (void); + + virtual void On_Key_Down (wxKeyEvent &event); + + virtual bool On_Draw (void); + + virtual int Get_Color (double Value); + + +private: + + bool m_Color_bGrad; + + double m_Color_Min, m_Color_Scale, m_Radius; + + CSG_Colors m_Colors; + + CSG_Grid *m_pGrid, *m_pZ; + + TSG_Point_Z **m_pNodes; + + + bool Create_Nodes (void); + + bool Get_Node (int x, int y, TSG_Triangle_Node &Node); + + + //----------------------------------------------------- + DECLARE_EVENT_TABLE() + +}; + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +BEGIN_EVENT_TABLE(C3D_Viewer_Globe_Grid_Panel, CSG_3DView_Panel) + EVT_KEY_DOWN (C3D_Viewer_Globe_Grid_Panel::On_Key_Down) +END_EVENT_TABLE() + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +C3D_Viewer_Globe_Grid_Panel::C3D_Viewer_Globe_Grid_Panel(wxWindow *pParent, CSG_Grid *pGrid, CSG_Grid *pZ) + : CSG_3DView_Panel(pParent) +{ + m_pGrid = pGrid; + m_pZ = pZ; + m_pNodes = NULL; + + Create_Nodes(); + + //----------------------------------------------------- + CSG_Parameter *pNode, *pNode_1, *pNode_2; + + m_Parameters("BGCOLOR" )->Set_Value((int)SG_COLOR_BLACK); + m_Parameters("DRAW_BOX")->Set_Value(false); + + //----------------------------------------------------- + pNode = m_Parameters("NODE_GENERAL"); + + m_Parameters.Add_Value( + pNode , "RADIUS" , _TL("Radius"), + _TL(""), + PARAMETER_TYPE_Double, 6371.0, 0.0, true + ); + + m_Parameters.Add_Value( + pNode , "Z_SCALE" , _TL("Exaggeration"), + _TL(""), + PARAMETER_TYPE_Double, 1.0 + ); + + //----------------------------------------------------- + pNode = m_Parameters.Add_Node( + NULL , "NODE_VIEW" , _TL("Grid View Settings"), + _TL("") + ); + + pNode_1 = m_Parameters.Add_Value( + pNode , "DRAW_FACES" , _TL("Draw Faces"), + _TL(""), + PARAMETER_TYPE_Bool, true + ); + + pNode_2 = m_Parameters.Add_Value( + pNode_1 , "COLOR_ASRGB" , _TL("RGB Values"), + _TL(""), + PARAMETER_TYPE_Bool, false + ); + + m_Parameters.Add_Colors( + pNode_2 , "COLORS" , _TL("Colours"), + _TL("") + ); + + m_Parameters.Add_Value( + pNode_2 , "COLORS_GRAD" , _TL("Graduated"), + _TL(""), + PARAMETER_TYPE_Bool, true + ); + + m_Parameters.Add_Range( + pNode_2 , "COLORS_RANGE" , _TL("Value Range"), + _TL("") + ); + + pNode_2 = m_Parameters.Add_Choice( + pNode_1 , "SHADING" , _TL("Shading"), + _TL(""), + CSG_String::Format(SG_T("%s|%s|"), + _TL("none"), + _TL("shading") + ), 1 + ); + + m_Parameters.Add_Value( + pNode_2 , "SHADE_DEC" , _TL("Light Source Height"), + _TL(""), + PARAMETER_TYPE_Double, 0.0, -90.0, true, 90.0, true + ); + + m_Parameters.Add_Value( + pNode_2 , "SHADE_AZI" , _TL("Light Source Direction"), + _TL(""), + PARAMETER_TYPE_Double, 315.0, 0.0, true, 360.0, true + ); + + //----------------------------------------------------- + pNode_1 = m_Parameters.Add_Value( + pNode , "DRAW_EDGES" , _TL("Draw Wire"), + _TL(""), + PARAMETER_TYPE_Bool, false + ); + + m_Parameters.Add_Value( + pNode_1 , "EDGE_COLOR" , _TL("Colour"), + _TL(""), + PARAMETER_TYPE_Color, SG_GET_RGB(150, 150, 150) + ); + + //----------------------------------------------------- + Update_Statistics(); +} + +//--------------------------------------------------------- +C3D_Viewer_Globe_Grid_Panel::~C3D_Viewer_Globe_Grid_Panel(void) +{ + if( m_pNodes ) + { + SG_Free(m_pNodes[0]); + SG_Free(m_pNodes); + } +} + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +int C3D_Viewer_Globe_Grid_Panel::On_Parameters_Enable(CSG_Parameters *pParameters, CSG_Parameter *pParameter) +{ + if( !SG_STR_CMP(pParameter->Get_Identifier(), "COLOR_ASRGB") ) + { + pParameters->Get_Parameter("COLORS" )->Set_Enabled(pParameter->asBool() == false); + pParameters->Get_Parameter("COLORS_RANGE")->Set_Enabled(pParameter->asBool() == false); + } + + if( !SG_STR_CMP(pParameter->Get_Identifier(), "SHADING") ) + { + pParameters->Get_Parameter("SHADE_DEC")->Set_Enabled(pParameter->asBool()); + pParameters->Get_Parameter("SHADE_AZI")->Set_Enabled(pParameter->asBool()); + } + + if( !SG_STR_CMP(pParameter->Get_Identifier(), "DRAW_EDGES") ) + { + pParameters->Get_Parameter("EDGE_COLOR")->Set_Enabled(pParameter->asBool()); + } + + return( CSG_3DView_Panel::On_Parameters_Enable(pParameters, pParameter) ); +} + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool C3D_Viewer_Globe_Grid_Panel::Create_Nodes(void) +{ + m_pNodes = (TSG_Point_Z **)SG_Malloc(m_pGrid->Get_NY () * sizeof(TSG_Point_Z *)); + m_pNodes[0] = (TSG_Point_Z *)SG_Malloc(m_pGrid->Get_NCells() * sizeof(TSG_Point_Z )); + + for(int y=0; yGet_NY(); y++) + { + m_pNodes[y] = m_pNodes[0] + y * m_pGrid->Get_NX(); + } + + return( true ); +} + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +void C3D_Viewer_Globe_Grid_Panel::Update_Statistics(void) +{ + double Radius = m_Parameters("RADIUS")->asDouble(); + double zScale = m_pZ ? m_Parameters("Z_SCALE")->asDouble() : 0.0; + + m_Parameters("COLORS_RANGE")->asRange()->Set_Range( + m_pGrid->Get_Mean() - 1.5 * m_pGrid->Get_StdDev(), + m_pGrid->Get_Mean() + 1.5 * m_pGrid->Get_StdDev() + ); + + m_Data_Min.x = m_Data_Max.x = 0.0; + m_Data_Min.y = m_Data_Max.y = 0.0; + m_Data_Min.z = m_Data_Max.z = 0.0; + + for(int y=0; yGet_NY(); y++) + { + TSG_Point_Z *pNode = m_pNodes[y]; + + double wy = M_DEG_TO_RAD * (m_pGrid->Get_YMin() + y * m_pGrid->Get_Cellsize()); + double wx = M_DEG_TO_RAD * (m_pGrid->Get_XMin()); + + for(int x=0; xGet_NX(); x++, pNode++, wx+=M_DEG_TO_RAD*m_pGrid->Get_Cellsize()) + { + double r = zScale ? Radius + zScale * m_pZ->asDouble(x, y) : Radius; + pNode->z = r * sin(wy); + double s = r * cos(wy); + pNode->x = s * cos(wx); + pNode->y = s * sin(wx); + + if( m_Data_Min.x > pNode->x ) m_Data_Min.x = pNode->x; else if( m_Data_Max.x < pNode->x ) m_Data_Max.x = pNode->x; + if( m_Data_Min.y > pNode->y ) m_Data_Min.y = pNode->y; else if( m_Data_Max.y < pNode->y ) m_Data_Max.y = pNode->y; + if( m_Data_Min.z > pNode->z ) m_Data_Min.z = pNode->z; else if( m_Data_Max.z < pNode->z ) m_Data_Max.z = pNode->z; + } + } + + //----------------------------------------------------- + Update_View(); +} + +//--------------------------------------------------------- +void C3D_Viewer_Globe_Grid_Panel::Update_Parent(void) +{ + ((CSG_3DView_Dialog *)GetParent())->Update_Controls(); +} + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +void C3D_Viewer_Globe_Grid_Panel::On_Key_Down(wxKeyEvent &event) +{ + switch( event.GetKeyCode() ) + { + default: CSG_3DView_Panel::On_Key_Down(event); return; + + case WXK_F1: m_Parameters("Z_SCALE")->Set_Value(m_Parameters("Z_SCALE")->asDouble() - 0.5); break; + case WXK_F2: m_Parameters("Z_SCALE")->Set_Value(m_Parameters("Z_SCALE")->asDouble() + 0.5); break; + } + + //----------------------------------------------------- + Update_View(true); + Update_Parent(); +} + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +int C3D_Viewer_Globe_Grid_Panel::Get_Color(double Value) +{ + if( m_Color_Scale <= 0.0 ) + { + return( (int)Value ); + } + + double c = m_Color_Scale * (Value - m_Color_Min); + + return( m_Color_bGrad ? m_Colors.Get_Interpolated(c) : m_Colors[(int)c] ); +} + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +inline bool C3D_Viewer_Globe_Grid_Panel::Get_Node(int x, int y, TSG_Triangle_Node &Node) +{ + if( m_pGrid->is_InGrid(x, y) ) + { + TSG_Point_Z p = m_pNodes[y][x]; + + m_Projector.Get_Projection(p); + + Node.x = p.x; + Node.y = p.y; + Node.z = p.z; + Node.c = m_pGrid->asDouble(x, y); + + return( true ); + } + + return( false ); +} + +//--------------------------------------------------------- +bool C3D_Viewer_Globe_Grid_Panel::On_Draw(void) +{ + //----------------------------------------------------- + if( m_Parameters("COLORS_RANGE")->asRange()->Get_LoVal() + >= m_Parameters("COLORS_RANGE")->asRange()->Get_HiVal() ) + { + m_Parameters("COLORS_RANGE")->asRange()->Set_Range( + m_pGrid->Get_Mean() - 1.5 * m_pGrid->Get_StdDev(), + m_pGrid->Get_Mean() + 1.5 * m_pGrid->Get_StdDev() + ); + } + + bool bValueAsColor = m_Parameters("COLOR_ASRGB")->asBool(); + + m_Colors = *m_Parameters("COLORS")->asColors(); + m_Color_bGrad = m_Parameters("COLORS_GRAD")->asBool(); + m_Color_Min = m_Parameters("COLORS_RANGE")->asRange()->Get_LoVal(); + m_Color_Scale = m_Colors.Get_Count() / (m_Parameters("COLORS_RANGE")->asRange()->Get_HiVal() - m_Color_Min); + + //----------------------------------------------------- + if( m_Parameters("DRAW_FACES")->asBool() ) // Faces + { + int Shading = m_Parameters("SHADING" )->asInt (); + double Shade_Dec = m_Parameters("SHADE_DEC")->asDouble() * -M_DEG_TO_RAD; + double Shade_Azi = m_Parameters("SHADE_AZI")->asDouble() * M_DEG_TO_RAD; + + #pragma omp parallel for + for(int y=1; yGet_NY(); y++) + { + for(int x=1; xGet_NX(); x++) + { + TSG_Triangle_Node p[3]; + + if( Get_Node(x - 1, y - 1, p[0]) + && Get_Node(x , y , p[1]) ) + { + if( Get_Node(x, y - 1, p[2]) ) + { + if( Shading ) Draw_Triangle(p, bValueAsColor, Shade_Dec, Shade_Azi); else Draw_Triangle(p, bValueAsColor); + } + + if( Get_Node(x - 1, y, p[2]) ) + { + if( Shading ) Draw_Triangle(p, bValueAsColor, Shade_Dec, Shade_Azi); else Draw_Triangle(p, bValueAsColor); + } + } + } + } + } + + //----------------------------------------------------- + if( m_Parameters("DRAW_EDGES")->asBool() ) // Edges + { + int Color = m_Parameters("EDGE_COLOR")->asColor(); + + #pragma omp parallel for + for(int y=1; yGet_NY(); y++) + { + for(int x=1; xGet_NX(); x++) + { + TSG_Triangle_Node p[2]; + + if( Get_Node(x - 1, y - 1, p[0]) + && Get_Node(x , y , p[1]) ) + { + if( !bValueAsColor ) + { + p[0].c = Get_Color(p[0].c); + p[1].c = Get_Color(p[1].c); + } + + Draw_Line(p[0].x, p[0].y, p[0].z, p[1].x, p[1].y, p[1].z, p[0].c, p[1].c); + + if( Get_Node(x, y - 1, p[1]) ) + { + if( !bValueAsColor ) + { + p[1].c = Get_Color(p[1].c); + } + + Draw_Line(p[0].x, p[0].y, p[0].z, p[1].x, p[1].y, p[1].z, p[0].c, p[1].c); + Draw_Line(p[0].x, p[0].y, p[0].z, p[1].x, p[1].y, p[1].z, p[0].c, p[1].c); + } + + if( Get_Node(x - 1, y, p[1]) ) + { + if( !bValueAsColor ) + { + p[1].c = Get_Color(p[1].c); + } + + Draw_Line(p[0].x, p[0].y, p[0].z, p[1].x, p[1].y, p[1].z, p[0].c, p[1].c); + Draw_Line(p[0].x, p[0].y, p[0].z, p[1].x, p[1].y, p[1].z, p[0].c, p[1].c); + } + } + } + } + } + + //----------------------------------------------------- + if( !m_Parameters("DRAW_FACES")->asBool() && !m_Parameters("DRAW_EDGES")->asBool() ) // Nodes + { + int Color = m_Parameters("EDGE_COLOR")->asColor(); + + for(int y=0; yGet_NY(); y++) + { + for(int x=0; xGet_NX(); x++) + { + TSG_Triangle_Node p; + + Get_Node(x, y, p); + + Draw_Point(p.x, p.y, p.z, bValueAsColor ? p.c : Get_Color(p.c), 2); + } + } + } + + //----------------------------------------------------- + return( true ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +class C3D_Viewer_Globe_Grid_Dialog : public CSG_3DView_Dialog +{ +public: + C3D_Viewer_Globe_Grid_Dialog(CSG_Grid *pGrid, CSG_Grid *pZ); + + virtual void Update_Controls (void); + + +protected: + + wxCheckBox *m_pFaces, *m_pEdges; + + + virtual void On_Update_Control (wxCommandEvent &event); + + +private: + + DECLARE_EVENT_TABLE() + +}; + +//--------------------------------------------------------- +BEGIN_EVENT_TABLE(C3D_Viewer_Globe_Grid_Dialog, CSG_3DView_Dialog) + EVT_CHECKBOX (wxID_ANY , C3D_Viewer_Globe_Grid_Dialog::On_Update_Control) +END_EVENT_TABLE() + +//--------------------------------------------------------- +C3D_Viewer_Globe_Grid_Dialog::C3D_Viewer_Globe_Grid_Dialog(CSG_Grid *pGrid, CSG_Grid *pZ) + : CSG_3DView_Dialog(_TL("Globe Viewer for Grids")) +{ + Create(new C3D_Viewer_Globe_Grid_Panel(this, pGrid, pZ)); + + Add_Spacer(); + m_pFaces = Add_CheckBox(_TL("Faces"), m_pPanel->m_Parameters("DRAW_FACES")->asBool()); + m_pEdges = Add_CheckBox(_TL("Edges"), m_pPanel->m_Parameters("DRAW_EDGES")->asBool()); +} + +//--------------------------------------------------------- +void C3D_Viewer_Globe_Grid_Dialog::On_Update_Control(wxCommandEvent &event) +{ + CHECKBOX_UPDATE(m_pFaces, "DRAW_FACES"); + CHECKBOX_UPDATE(m_pEdges, "DRAW_EDGES"); + + CSG_3DView_Dialog::On_Update_Control(event); +} + +//--------------------------------------------------------- +void C3D_Viewer_Globe_Grid_Dialog::Update_Controls(void) +{ + m_pFaces->SetValue(m_pPanel->m_Parameters("DRAW_FACES")->asBool()); + m_pEdges->SetValue(m_pPanel->m_Parameters("DRAW_EDGES")->asBool()); + + CSG_3DView_Dialog::Update_Controls(); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +C3D_Viewer_Globe_Grid::C3D_Viewer_Globe_Grid(void) +{ + //----------------------------------------------------- + Set_Name (_TL("Globe Viewer for Grids")); + + Set_Author ("O. Conrad (c) 2014"); + + Set_Description (_TW( + "" + )); + + //----------------------------------------------------- + Parameters.Add_Grid( + NULL , "GRID" , _TL("Grid"), + _TL(""), + PARAMETER_INPUT + ); + + Parameters.Add_Grid( + NULL , "Z" , _TL("Elevation"), + _TL(""), + PARAMETER_INPUT_OPTIONAL + ); +} + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool C3D_Viewer_Globe_Grid::On_Execute(void) +{ + C3D_Viewer_Globe_Grid_Dialog dlg( + Parameters("GRID")->asGrid(), + Parameters("Z" )->asGrid() + ); + + dlg.ShowModal(); + + return( true ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- diff -Nru saga-2.1.0+dfsg/src/modules/garden/garden_3d_viewer/3d_viewer_globe_grid.h saga-2.1.4+dfsg/src/modules/garden/garden_3d_viewer/3d_viewer_globe_grid.h --- saga-2.1.0+dfsg/src/modules/garden/garden_3d_viewer/3d_viewer_globe_grid.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/garden/garden_3d_viewer/3d_viewer_globe_grid.h 2014-11-13 08:32:19.000000000 +0000 @@ -0,0 +1,106 @@ +/********************************************************** + * Version $Id: 3d_viewer_globe_grid.h 911 2011-02-14 16:38:15Z reklov_w $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// 3d_viewer // +// // +//-------------------------------------------------------// +// // +// 3d_viewer_globe_grid.h // +// // +// Copyright (C) 2014 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Hamburg // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#ifndef HEADER_INCLUDED__3d_viewer_globe_grid_H +#define HEADER_INCLUDED__3d_viewer_globe_grid_H + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "MLB_Interface.h" + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +class C3D_Viewer_Globe_Grid : public CSG_Module_Grid +{ +public: + C3D_Viewer_Globe_Grid(void); + + virtual bool needs_GUI (void) { return( true ); } + + +protected: + + virtual bool On_Execute (void); + + +}; + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#endif // #ifndef HEADER_INCLUDED__3d_viewer_globe_grid_H + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- diff -Nru saga-2.1.0+dfsg/src/modules/garden/garden_3d_viewer/3d_viewer_multiple_grids.cpp saga-2.1.4+dfsg/src/modules/garden/garden_3d_viewer/3d_viewer_multiple_grids.cpp --- saga-2.1.0+dfsg/src/modules/garden/garden_3d_viewer/3d_viewer_multiple_grids.cpp 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/garden/garden_3d_viewer/3d_viewer_multiple_grids.cpp 2014-11-13 08:32:19.000000000 +0000 @@ -0,0 +1,504 @@ +/********************************************************** + * Version $Id: 3d_viewer_multiple_grids.cpp 911 2011-02-14 16:38:15Z reklov_w $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// 3d_viewer // +// // +//-------------------------------------------------------// +// // +// 3d_viewer_multiple_grids.cpp // +// // +// Copyright (C) 2014 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Hamburg // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "3d_viewer_multiple_grids.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +class C3D_Viewer_Multiple_Grids_Panel : public CSG_3DView_Panel +{ +public: + C3D_Viewer_Multiple_Grids_Panel(wxWindow *pParent, CSG_Parameter_Grid_List *pGrids); + + +protected: + + virtual int On_Parameters_Enable (CSG_Parameters *pParameters, CSG_Parameter *pParameter); + + virtual void Update_Statistics (void); + virtual void Update_Parent (void); + + virtual void On_Key_Down (wxKeyEvent &event); + + virtual bool On_Before_Draw (void); + virtual bool On_Draw (void); + + virtual int Get_Color (double Value); + + +private: + + bool m_Color_bGrad; + + double m_Color_Min, m_Color_Scale; + + CSG_Colors m_Colors; + + CSG_Parameter_Grid_List *m_pGrids; + + + bool Get_Node (CSG_Grid *pGrid, int x, int y, TSG_Triangle_Node &Node); + + void Draw_Grid (CSG_Grid *pGrid); + + + //----------------------------------------------------- + DECLARE_EVENT_TABLE() + +}; + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +BEGIN_EVENT_TABLE(C3D_Viewer_Multiple_Grids_Panel, CSG_3DView_Panel) + EVT_KEY_DOWN (C3D_Viewer_Multiple_Grids_Panel::On_Key_Down) +END_EVENT_TABLE() + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +C3D_Viewer_Multiple_Grids_Panel::C3D_Viewer_Multiple_Grids_Panel(wxWindow *pParent, CSG_Parameter_Grid_List *pGrids) + : CSG_3DView_Panel(pParent) +{ + m_pGrids = pGrids; + + //----------------------------------------------------- + CSG_Parameter *pNode, *pNode_1; + + //----------------------------------------------------- + pNode = m_Parameters("NODE_GENERAL"); + + m_Parameters.Add_Value( + pNode , "Z_SCALE" , _TL("Exaggeration"), + _TL(""), + PARAMETER_TYPE_Double, 1.0 + ); + + //----------------------------------------------------- + pNode = m_Parameters.Add_Node( + NULL , "NODE_VIEW" , _TL("Grid View Settings"), + _TL("") + ); + + pNode_1 = m_Parameters.Add_Colors( + pNode , "COLORS" , _TL("Colours"), + _TL("") + ); + + m_Parameters.Add_Value( + pNode_1 , "COLORS_GRAD" , _TL("Graduated"), + _TL(""), + PARAMETER_TYPE_Bool, true + ); + + pNode_1 = m_Parameters.Add_Choice( + pNode , "SHADING" , _TL("Shading"), + _TL(""), + CSG_String::Format(SG_T("%s|%s|"), + _TL("none"), + _TL("shading") + ), 1 + ); + + m_Parameters.Add_Value( + pNode_1 , "SHADE_DEC" , _TL("Light Source Height"), + _TL(""), + PARAMETER_TYPE_Double, 0.0, -90.0, true, 90.0, true + ); + + m_Parameters.Add_Value( + pNode_1 , "SHADE_AZI" , _TL("Light Source Direction"), + _TL(""), + PARAMETER_TYPE_Double, 315.0, 0.0, true, 360.0, true + ); + + //----------------------------------------------------- + Update_Statistics(); +} + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +int C3D_Viewer_Multiple_Grids_Panel::On_Parameters_Enable(CSG_Parameters *pParameters, CSG_Parameter *pParameter) +{ + if( !SG_STR_CMP(pParameter->Get_Identifier(), "SHADING") ) + { + pParameters->Get_Parameter("SHADE_DEC")->Set_Enabled(pParameter->asBool()); + pParameters->Get_Parameter("SHADE_AZI")->Set_Enabled(pParameter->asBool()); + } + + return( CSG_3DView_Panel::On_Parameters_Enable(pParameters, pParameter) ); +} + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +void C3D_Viewer_Multiple_Grids_Panel::Update_Statistics(void) +{ + m_Data_Min.x = m_pGrids->asGrid(0)->Get_XMin(); + m_Data_Max.x = m_pGrids->asGrid(0)->Get_XMax(); + + m_Data_Min.y = m_pGrids->asGrid(0)->Get_YMin(); + m_Data_Max.y = m_pGrids->asGrid(0)->Get_YMax(); + + m_Data_Min.z = m_pGrids->asGrid(0)->Get_ZMin(); + m_Data_Max.z = m_pGrids->asGrid(0)->Get_ZMax(); + + for(int i=1; iGet_Count(); i++) + { + CSG_Grid *pGrid = m_pGrids->asGrid(i); + + if( m_Data_Min.x > pGrid->Get_XMin() ) + m_Data_Min.x = pGrid->Get_XMin(); else + if( m_Data_Max.x < pGrid->Get_XMax() ) + m_Data_Max.x = pGrid->Get_XMax(); + + if( m_Data_Min.y > pGrid->Get_YMin() ) + m_Data_Min.y = pGrid->Get_YMin(); else + if( m_Data_Max.y < pGrid->Get_YMax() ) + m_Data_Max.y = pGrid->Get_YMax(); + + if( m_Data_Min.z > pGrid->Get_ZMin() ) + m_Data_Min.z = pGrid->Get_ZMin(); else + if( m_Data_Max.z < pGrid->Get_ZMax() ) + m_Data_Max.z = pGrid->Get_ZMax(); + } + + Update_View(); +} + +//--------------------------------------------------------- +void C3D_Viewer_Multiple_Grids_Panel::Update_Parent(void) +{ + ((CSG_3DView_Dialog *)GetParent())->Update_Controls(); +} + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +void C3D_Viewer_Multiple_Grids_Panel::On_Key_Down(wxKeyEvent &event) +{ + switch( event.GetKeyCode() ) + { + default: CSG_3DView_Panel::On_Key_Down(event); return; + + case WXK_F1: m_Parameters("Z_SCALE")->Set_Value(m_Parameters("Z_SCALE")->asDouble() - 0.5); break; + case WXK_F2: m_Parameters("Z_SCALE")->Set_Value(m_Parameters("Z_SCALE")->asDouble() + 0.5); break; + } + + //----------------------------------------------------- + Update_View(); + Update_Parent(); +} + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool C3D_Viewer_Multiple_Grids_Panel::On_Before_Draw(void) +{ + if( m_Play_State == SG_3DVIEW_PLAY_STOP ) + { + m_Projector.Set_zScaling(m_Projector.Get_xScaling() * m_Parameters("Z_SCALE")->asDouble()); + } + + return( true ); +} + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +int C3D_Viewer_Multiple_Grids_Panel::Get_Color(double Value) +{ + if( m_Color_Scale <= 0.0 ) + { + return( (int)Value ); + } + + double c = m_Color_Scale * (Value - m_Color_Min); + + return( m_Color_bGrad ? m_Colors.Get_Interpolated(c) : m_Colors[(int)c] ); +} + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool C3D_Viewer_Multiple_Grids_Panel::On_Draw(void) +{ + //------------------------------------------------- + for(int i=0; iGet_Count(); i++) + { + Draw_Grid(m_pGrids->asGrid(i)); + } + + //----------------------------------------------------- + return( true ); +} + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +inline bool C3D_Viewer_Multiple_Grids_Panel::Get_Node(CSG_Grid *pGrid, int x, int y, TSG_Triangle_Node &Node) +{ + if( pGrid->is_InGrid(x, y) ) + { + TSG_Point_Z p; + + p.x = pGrid->Get_System().Get_xGrid_to_World(x); + p.y = pGrid->Get_System().Get_yGrid_to_World(y); + p.z = Node.c = pGrid->asDouble(x, y); + + m_Projector.Get_Projection(p); + + Node.x = p.x; + Node.y = p.y; + Node.z = p.z; + + return( true ); + } + + return( false ); +} + +//--------------------------------------------------------- +void C3D_Viewer_Multiple_Grids_Panel::Draw_Grid(CSG_Grid *pGrid) +{ + //----------------------------------------------------- + if( !SG_UI_DataObject_Colors_Get(pGrid, &m_Colors) ) + { + m_Colors = *m_Parameters("COLORS")->asColors(); + } + + m_Color_bGrad = m_Parameters("COLORS_GRAD")->asBool(); + + m_Color_Min = pGrid->Get_ZMin(); + m_Color_Scale = pGrid->Get_ZRange() > 0.0 ? m_Colors.Get_Count() / pGrid->Get_ZRange() : 0.0; + + //----------------------------------------------------- + int Shading = m_Parameters("SHADING" )->asInt (); + double Shade_Dec = m_Parameters("SHADE_DEC")->asDouble() * -M_DEG_TO_RAD; + double Shade_Azi = m_Parameters("SHADE_AZI")->asDouble() * M_DEG_TO_RAD; + + //----------------------------------------------------- + #pragma omp parallel for + for(int y=1; yGet_NY(); y++) + { + for(int x=1; xGet_NX(); x++) + { + TSG_Triangle_Node p[3]; + + if( Get_Node(pGrid, x - 1, y - 1, p[0]) + && Get_Node(pGrid, x , y , p[1]) ) + { + if( Get_Node(pGrid, x , y - 1, p[2]) ) + { + if( Shading ) Draw_Triangle(p, false, Shade_Dec, Shade_Azi); else Draw_Triangle(p, false); + } + + if( Get_Node(pGrid, x - 1, y , p[2]) ) + { + if( Shading ) Draw_Triangle(p, false, Shade_Dec, Shade_Azi); else Draw_Triangle(p, false); + } + } + } + } +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +class C3D_Viewer_Multiple_Grids_Dialog : public CSG_3DView_Dialog +{ +public: + C3D_Viewer_Multiple_Grids_Dialog(CSG_Parameter_Grid_List *pGrids) + : CSG_3DView_Dialog(_TL("Multiple Grids Viewer")) + { + Create(new C3D_Viewer_Multiple_Grids_Panel(this, pGrids)); + } + + +protected: + + virtual void Set_Menu (wxMenu &Menu); + virtual void On_Menu (wxCommandEvent &event); + +}; + +//--------------------------------------------------------- +enum +{ + MENU_SCALE_Z_DEC = MENU_USER_FIRST, + MENU_SCALE_Z_INC +}; + +//--------------------------------------------------------- +void C3D_Viewer_Multiple_Grids_Dialog::Set_Menu(wxMenu &Menu) +{ + wxMenu *pMenu = Menu.FindChildItem(Menu.FindItem(_TL("Display")))->GetSubMenu(); + + pMenu->AppendSeparator(); + pMenu->Append(MENU_SCALE_Z_DEC, _TL("Decrease Exaggeration [F1]")); + pMenu->Append(MENU_SCALE_Z_INC, _TL("Increase Exaggeration [F2]")); +} + +//--------------------------------------------------------- +void C3D_Viewer_Multiple_Grids_Dialog::On_Menu(wxCommandEvent &event) +{ + switch( event.GetId() ) + { + case MENU_SCALE_Z_DEC: m_pPanel->m_Parameters("Z_SCALE")->Set_Value(m_pPanel->m_Parameters("Z_SCALE")->asDouble() - 0.5); m_pPanel->Update_View(); return; + case MENU_SCALE_Z_INC: m_pPanel->m_Parameters("Z_SCALE")->Set_Value(m_pPanel->m_Parameters("Z_SCALE")->asDouble() + 0.5); m_pPanel->Update_View(); return; + } + + CSG_3DView_Dialog::On_Menu(event); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +C3D_Viewer_Multiple_Grids::C3D_Viewer_Multiple_Grids(void) +{ + //----------------------------------------------------- + Set_Name (_TL("Multiple Grids Viewer")); + + Set_Author ("O. Conrad (c) 2014"); + + Set_Description (_TW( + "" + )); + + //----------------------------------------------------- + Parameters.Add_Grid_List( + NULL , "GRIDS" , _TL("Grids"), + _TL(""), + PARAMETER_INPUT + ); +} + +//--------------------------------------------------------- +bool C3D_Viewer_Multiple_Grids::On_Execute(void) +{ + CSG_Parameter_Grid_List *pGrids = Parameters("GRIDS")->asGridList(); + + if( pGrids->Get_Count() <= 0 ) + { + Message_Add(_TL("invalid input")); + + return( false ); + } + + C3D_Viewer_Multiple_Grids_Dialog dlg(pGrids); + + dlg.ShowModal(); + + return( true ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- diff -Nru saga-2.1.0+dfsg/src/modules/garden/garden_3d_viewer/3d_viewer_multiple_grids.h saga-2.1.4+dfsg/src/modules/garden/garden_3d_viewer/3d_viewer_multiple_grids.h --- saga-2.1.0+dfsg/src/modules/garden/garden_3d_viewer/3d_viewer_multiple_grids.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/garden/garden_3d_viewer/3d_viewer_multiple_grids.h 2014-11-13 08:32:19.000000000 +0000 @@ -0,0 +1,106 @@ +/********************************************************** + * Version $Id: 3d_viewer_multiple_grids.h 911 2011-02-14 16:38:15Z reklov_w $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// 3d_viewer // +// // +//-------------------------------------------------------// +// // +// 3d_viewer_multiple_grids.h // +// // +// Copyright (C) 2014 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Hamburg // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#ifndef HEADER_INCLUDED__3d_viewer_multiple_grids_H +#define HEADER_INCLUDED__3d_viewer_multiple_grids_H + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "MLB_Interface.h" + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +class C3D_Viewer_Multiple_Grids : public CSG_Module +{ +public: + C3D_Viewer_Multiple_Grids(void); + + virtual bool needs_GUI (void) { return( true ); } + + +protected: + + virtual bool On_Execute (void); + + +}; + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#endif // #ifndef HEADER_INCLUDED__3d_viewer_multiple_grids_H + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- diff -Nru saga-2.1.0+dfsg/src/modules/garden/garden_3d_viewer/3d_viewer_pointcloud.cpp saga-2.1.4+dfsg/src/modules/garden/garden_3d_viewer/3d_viewer_pointcloud.cpp --- saga-2.1.0+dfsg/src/modules/garden/garden_3d_viewer/3d_viewer_pointcloud.cpp 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/garden/garden_3d_viewer/3d_viewer_pointcloud.cpp 2014-11-13 08:32:19.000000000 +0000 @@ -0,0 +1,956 @@ +/********************************************************** + * Version $Id: 3d_viewer_pointcloud.cpp 911 2011-02-14 16:38:15Z reklov_w $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// 3d_viewer // +// // +//-------------------------------------------------------// +// // +// 3d_viewer_pointcloud.cpp // +// // +// Copyright (C) 2014 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Hamburg // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include + +#include "3d_viewer_pointcloud.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +class C3D_Viewer_PointCloud_Panel : public CSG_3DView_Panel +{ +public: + C3D_Viewer_PointCloud_Panel(wxWindow *pParent, CSG_PointCloud *pPoints, int Field_Color); + + void Set_Extent (CSG_Rect Extent); + + +protected: + + virtual int On_Parameters_Enable (CSG_Parameters *pParameters, CSG_Parameter *pParameter); + + virtual void Update_Statistics (void); + virtual void Update_Parent (void); + + virtual void On_Key_Down (wxKeyEvent &event); + + virtual bool On_Before_Draw (void); + virtual bool On_Draw (void); + + virtual int Get_Color (double Value, double z); + + +private: + + bool m_Color_bGrad; + + double m_Color_Min, m_Color_Scale, m_Color_Dim_Min, m_Color_Dim_Max; + + CSG_Array m_Selection; + + CSG_Colors m_Colors; + + CSG_Rect m_Extent; + + CSG_PointCloud *m_pPoints; + + + //----------------------------------------------------- + DECLARE_EVENT_TABLE() + +}; + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +BEGIN_EVENT_TABLE(C3D_Viewer_PointCloud_Panel, CSG_3DView_Panel) + EVT_KEY_DOWN (C3D_Viewer_PointCloud_Panel::On_Key_Down) +END_EVENT_TABLE() + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +C3D_Viewer_PointCloud_Panel::C3D_Viewer_PointCloud_Panel(wxWindow *pParent, CSG_PointCloud *pPoints, int cField) + : CSG_3DView_Panel(pParent) +{ + m_pPoints = pPoints; + + //----------------------------------------------------- + CSG_String Attributes; + + for(int i=0; iGet_Field_Count(); i++) + { + Attributes += m_pPoints->Get_Field_Name(i); + Attributes += "|"; + } + + //----------------------------------------------------- + CSG_Parameter *pNode, *pNode_1; + + //----------------------------------------------------- + pNode = m_Parameters("NODE_GENERAL"); + + m_Parameters.Add_Value( + pNode , "Z_SCALE" , _TL("Exaggeration"), + _TL(""), + PARAMETER_TYPE_Double, 1.0 + ); + + //----------------------------------------------------- + pNode = m_Parameters.Add_Node( + NULL , "NODE_VIEW" , _TL("Point View Settings"), + _TL("") + ); + + pNode_1 = m_Parameters.Add_Value( + pNode , "DETAIL" , _TL("Level of Detail"), + _TL(""), + PARAMETER_TYPE_Double, 100.0, 0.0, true, 100.0, true + ); + + pNode_1 = m_Parameters.Add_Choice( + pNode , "COLORS_ATTR" , _TL("Colour Attribute"), + _TL(""), + Attributes, cField + ); + + m_Parameters.Add_Value( + pNode_1 , "VAL_AS_RGB" , _TL("RGB Values"), + _TL(""), + PARAMETER_TYPE_Bool, false + ); + + m_Parameters.Add_Colors( + pNode_1 , "COLORS" , _TL("Colours"), + _TL("") + ); + + m_Parameters.Add_Value( + pNode_1 , "COLORS_GRAD" , _TL("Graduated"), + _TL(""), + PARAMETER_TYPE_Bool, true + ); + + m_Parameters.Add_Range( + pNode_1 , "COLORS_RANGE" , _TL("Value Range"), + _TL("") + ); + + //----------------------------------------------------- + pNode_1 = m_Parameters.Add_Value( + pNode , "DIM" , _TL("Dim"), + _TL(""), + PARAMETER_TYPE_Bool, false + ); + + m_Parameters.Add_Range( + pNode_1 , "DIM_RANGE" , _TL("Distance Range"), + _TL(""), + 0.0, 1.0, 0.0, true + ); + + //----------------------------------------------------- + m_Parameters.Add_Value( + pNode , "SIZE" , _TL("Size"), + _TL(""), + PARAMETER_TYPE_Int, 2, 1, true + ); + + m_Parameters.Add_Value( + pNode , "SIZE_SCALE" , _TL("Size Scaling"), + _TL(""), + PARAMETER_TYPE_Double, 250.0, 0.0, true + ); + + //----------------------------------------------------- + m_Extent = pPoints->Get_Extent(); + + m_Selection.Create(sizeof(int), 0, SG_ARRAY_GROWTH_2); + + Update_Statistics(); +} + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +int C3D_Viewer_PointCloud_Panel::On_Parameters_Enable(CSG_Parameters *pParameters, CSG_Parameter *pParameter) +{ + if( !SG_STR_CMP(pParameter->Get_Identifier(), "VAL_AS_RGB") ) + { + pParameters->Get_Parameter("COLORS" )->Set_Enabled(pParameter->asBool() == false); + pParameters->Get_Parameter("COLORS_RANGE")->Set_Enabled(pParameter->asBool() == false); + } + + if( !SG_STR_CMP(pParameter->Get_Identifier(), "DIM") ) + { + pParameters->Get_Parameter("DIM_RANGE")->Set_Enabled(pParameter->asBool()); + } + + return( CSG_3DView_Panel::On_Parameters_Enable(pParameters, pParameter) ); +} + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +void C3D_Viewer_PointCloud_Panel::Set_Extent(CSG_Rect Extent) +{ + if( Extent.Get_XRange() == 0.0 || Extent.Get_YRange() == 0.0 ) + { + Extent = m_pPoints->Get_Extent(); + } + + if( Extent.is_Equal(m_Extent) == false ) + { + m_Extent = Extent; + + Update_View(true); + } +} + +//--------------------------------------------------------- +void C3D_Viewer_PointCloud_Panel::Update_Statistics(void) +{ + m_Data_Min.x = m_Extent.Get_XMin(); + m_Data_Max.x = m_Extent.Get_XMax(); + + m_Data_Min.y = m_Extent.Get_YMin(); + m_Data_Max.y = m_Extent.Get_YMax(); + + m_Selection.Set_Array(0); + + if( m_Extent.is_Equal(m_pPoints->Get_Extent()) ) + { + int cField = m_Parameters("COLORS_ATTR")->asInt(); + + m_Parameters("COLORS_RANGE")->asRange()->Set_Range( + m_pPoints->Get_Mean(cField) - 1.5 * m_pPoints->Get_StdDev(cField), + m_pPoints->Get_Mean(cField) + 1.5 * m_pPoints->Get_StdDev(cField) + ); + + m_Data_Min.z = m_pPoints->Get_Minimum(2); // Get_ZMin(); ToDo in CSG_PointCloud class!!! + m_Data_Max.z = m_pPoints->Get_Maximum(2); // Get_ZMax(); ToDo in CSG_PointCloud class!!! + } + else + { + CSG_Simple_Statistics cStats, zStats; + + int cField = m_Parameters("COLORS_ATTR")->asInt(); + + for(int i=0; iGet_Count(); i++) + { + m_pPoints->Set_Cursor(i); + + if( m_Extent.Contains(m_pPoints->Get_X(), m_pPoints->Get_Y()) && m_Selection.Inc_Array() ) + { + *((int *)m_Selection.Get_Entry(m_Selection.Get_Size() - 1)) = i; + + cStats += m_pPoints->Get_Value(cField); + zStats += m_pPoints->Get_Z(); + } + } + + m_Parameters("COLORS_RANGE")->asRange()->Set_Range( + cStats.Get_Mean() - 1.5 * cStats.Get_StdDev(), + cStats.Get_Mean() + 1.5 * cStats.Get_StdDev() + ); + + m_Data_Min.z = zStats.Get_Minimum(); + m_Data_Max.z = zStats.Get_Maximum(); + } +} + +//--------------------------------------------------------- +void C3D_Viewer_PointCloud_Panel::Update_Parent(void) +{ + ((CSG_3DView_Dialog *)GetParent())->Update_Controls(); +} + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +void C3D_Viewer_PointCloud_Panel::On_Key_Down(wxKeyEvent &event) +{ + switch( event.GetKeyCode() ) + { + default: CSG_3DView_Panel::On_Key_Down(event); return; + + case WXK_F1: m_Parameters("Z_SCALE" )->Set_Value(m_Parameters("Z_SCALE" )->asDouble() - 0.5); break; + case WXK_F2: m_Parameters("Z_SCALE" )->Set_Value(m_Parameters("Z_SCALE" )->asDouble() + 0.5); break; + + case WXK_F5: m_Parameters("SIZE" )->Set_Value(m_Parameters("SIZE" )->asDouble() - 1.0); break; + case WXK_F6: m_Parameters("SIZE" )->Set_Value(m_Parameters("SIZE" )->asDouble() + 1.0); break; + + case WXK_F7: m_Parameters("SIZE_SCALE")->Set_Value(m_Parameters("SIZE_SCALE")->asDouble() - 10.0); break; + case WXK_F8: m_Parameters("SIZE_SCALE")->Set_Value(m_Parameters("SIZE_SCALE")->asDouble() + 10.0); break; + } + + //----------------------------------------------------- + Update_View(); + Update_Parent(); +} + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool C3D_Viewer_PointCloud_Panel::On_Before_Draw(void) +{ + if( m_Play_State == SG_3DVIEW_PLAY_STOP ) + { + m_Projector.Set_zScaling(m_Projector.Get_xScaling() * m_Parameters("Z_SCALE")->asDouble()); + } + + return( true ); +} + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +int C3D_Viewer_PointCloud_Panel::Get_Color(double Value, double z) +{ + int Color; + + if( m_Color_Scale <= 0.0 ) + { + Color = (int)Value; + } + else + { + double c = m_Color_Scale * (Value - m_Color_Min); + + Color = m_Color_bGrad ? m_Colors.Get_Interpolated(c) : m_Colors[(int)c]; + } + + //----------------------------------------------------- + if( m_Color_Dim_Min < m_Color_Dim_Max ) + { + double dim = 1.0 - (z - m_Color_Dim_Min) / (m_Color_Dim_Max - m_Color_Dim_Min); + + if( dim < 1.0 ) + { + Color = Dim_Color(Color, dim < 0.1 ? 0.1 : dim); + } + } + + return( Color ); +} + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool C3D_Viewer_PointCloud_Panel::On_Draw(void) +{ + //----------------------------------------------------- + int cField = m_Parameters("COLORS_ATTR")->asInt(); + + if( m_Parameters("COLORS_RANGE")->asRange()->Get_LoVal() + >= m_Parameters("COLORS_RANGE")->asRange()->Get_HiVal() ) + { + m_Parameters("COLORS_RANGE")->asRange()->Set_Range( + m_pPoints->Get_Mean(cField) - 1.5 * m_pPoints->Get_StdDev(cField), + m_pPoints->Get_Mean(cField) + 1.5 * m_pPoints->Get_StdDev(cField) + ); + } + + m_Colors = *m_Parameters("COLORS")->asColors(); + m_Color_bGrad = m_Parameters("COLORS_GRAD")->asBool(); + m_Color_Min = m_Parameters("COLORS_RANGE")->asRange()->Get_LoVal(); + m_Color_Scale = m_Parameters("VAL_AS_RGB")->asBool() ? 0.0 : + m_Colors.Get_Count() / (m_Parameters("COLORS_RANGE")->asRange()->Get_HiVal() - m_Color_Min); + + if( m_Parameters("DIM")->asBool() ) + { + m_Color_Dim_Min = m_Parameters("DIM_RANGE")->asRange()->Get_LoVal() * (m_Data_Max.z - m_Data_Min.z); + m_Color_Dim_Max = m_Parameters("DIM_RANGE")->asRange()->Get_HiVal() * (m_Data_Max.z - m_Data_Min.z); + } + else + { + m_Color_Dim_Min = m_Color_Dim_Max = 0.0; + } + + //----------------------------------------------------- + int Size = m_Parameters("SIZE" )->asInt (); + double dSize = m_Parameters("SIZE_SCALE")->asDouble(); + + if( dSize > 0.0 ) dSize = 1.0 / dSize; else dSize = 0.0; + + //----------------------------------------------------- + int nSkip = 1 + (int)(0.001 * m_pPoints->Get_Count() * SG_Get_Square(1.0 - 0.01 * m_Parameters("DETAIL")->asDouble())); + + //----------------------------------------------------- + int nPoints = m_Selection.Get_Size() > 0 ? (int)m_Selection.Get_Size() : m_pPoints->Get_Count(); + + #pragma omp parallel for + for(int iPoint=0; iPoint 0 ? *((int *)m_Selection.Get_Entry(iPoint)) : iPoint; + + TSG_Point_Z p = m_pPoints->Get_Point(jPoint); + + m_Projector.Get_Projection(p); + + Draw_Point(p.x, p.y, p.z, + Get_Color(m_pPoints->Get_Value(jPoint, cField), p.z), + Size + (dSize <= 0.0 ? 0 : (int)(20.0 * exp(-dSize * p.z))) + ); + } + + //----------------------------------------------------- + return( true ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +class CPointCloud_Overview : public wxDialog +{ +public: + CPointCloud_Overview(void) {} + + void Create (wxWindow *pParent, CSG_PointCloud *pPoints, C3D_Viewer_PointCloud_Panel *pPanel) + { + m_pPanel = pPanel; + + wxDialog::Create(pParent, wxID_ANY, _TL("Overview"), wxDefaultPosition, wxDefaultSize, + wxCAPTION|wxCLOSE_BOX|wxSTAY_ON_TOP + ); + + //------------------------------------------------- + m_Ratio = pPoints->Get_Extent().Get_XRange() / pPoints->Get_Extent().Get_YRange(); + + m_Count.Create(CSG_Grid_System(m_Ratio > 1.0 + ? pPoints->Get_Extent().Get_XRange() / 100.0 + : pPoints->Get_Extent().Get_YRange() / 100.0, + pPoints->Get_Extent()), SG_DATATYPE_Int + ); + + for(int i=0, x, y; iGet_Count(); i++) + { + if( m_Count.Get_System().Get_World_to_Grid(x, y, pPoints->Get_X(i), pPoints->Get_Y(i)) ) // && m_Count.is_InGrid(x, y, false) ) + { + m_Count.Add_Value(x, y, 1); + } + } + + int Size = GetClientSize().GetWidth(); + + if( m_Ratio > 1.0 ) + Set_Size(Size, (int)(Size / m_Ratio), false); + else + Set_Size((int)(Size * m_Ratio), Size, false); + } + + +private: + + double m_Ratio; + + wxPoint m_Mouse_Down, m_Mouse_Move; + + CSG_Rect m_Selection; + + wxImage m_Image; + + CSG_Grid m_Count; + + C3D_Viewer_PointCloud_Panel *m_pPanel; + + + //--------------------------------------------------------- + void On_Mouse_LDown (wxMouseEvent &event) + { + m_Mouse_Down = m_Mouse_Move = event.GetPosition(); + + Draw_Inverse(m_Mouse_Down, m_Mouse_Move); + + CaptureMouse(); + } + + //--------------------------------------------------------- + void On_Mouse_Motion (wxMouseEvent &event) + { + if( HasCapture() && event.Dragging() && event.LeftIsDown() ) + { + Draw_Inverse(m_Mouse_Down, m_Mouse_Move); + Draw_Inverse(m_Mouse_Down, event.GetPosition()); + } + + m_Mouse_Move = event.GetPosition(); + } + + //--------------------------------------------------------- + void On_Mouse_LUp (wxMouseEvent &event) + { + if( HasCapture() ) + { + ReleaseMouse(); + } + + if( m_Mouse_Down.x != event.GetX() && m_Mouse_Down.y != event.GetY() ) + { + double dx = m_Count.Get_XRange() / GetClientSize().GetWidth (); + double dy = -m_Count.Get_YRange() / GetClientSize().GetHeight(); + + m_Selection.Assign( + m_Count.Get_XMin() + dx * m_Mouse_Down.x, + m_Count.Get_YMax() + dy * m_Mouse_Down.y, + m_Count.Get_XMin() + dx * event.GetX(), + m_Count.Get_YMax() + dy * event.GetY() + ); + + m_pPanel->Set_Extent(m_Selection); + } + + Refresh(false); + } + + //--------------------------------------------------------- + void On_Mouse_RDown (wxMouseEvent &event) + { + m_Selection.Assign(0.0, 0.0, 0.0, 0.0); + + m_pPanel->Set_Extent(m_Selection); + + Refresh(false); + } + + //--------------------------------------------------------- + void On_Key_Down (wxKeyEvent &event) + { + switch( event.GetKeyCode() ) + { + case WXK_PAGEUP: + Set_Size(GetClientSize().GetWidth() * 1.25, GetClientSize().GetHeight() * 1.25, true); + break; + + case WXK_PAGEDOWN: + Set_Size(GetClientSize().GetWidth() / 1.25, GetClientSize().GetHeight() / 1.25, true); + break; + } + } + + //--------------------------------------------------------- + void On_Close (wxCloseEvent &event) + { + Hide(); ((CSG_3DView_Dialog *)GetParent())->Update_Controls(); + } + + //--------------------------------------------------------- + void On_Paint (wxPaintEvent &WXUNUSED(event)) + { + wxPaintDC dc(this); + + if( m_Image.IsOk() ) + { + dc.DrawBitmap(wxBitmap(m_Image), GetClientRect().GetTopLeft()); + } + + if( m_Selection.Get_XRange() > 0.0 && m_Selection.Get_YRange() > 0.0 ) + { + dc.SetPen(wxPen(*wxRED)); + + double dx = GetClientSize().GetWidth () / m_Count.Get_XRange(); + double dy = -GetClientSize().GetHeight() / m_Count.Get_YRange(); + + int ax = dx * (m_Selection.Get_XMin() - m_Count.Get_XMin()); + int ay = dy * (m_Selection.Get_YMin() - m_Count.Get_YMin()) + GetClientSize().GetHeight(); + int bx = dx * (m_Selection.Get_XMax() - m_Count.Get_XMin()); + int by = dy * (m_Selection.Get_YMax() - m_Count.Get_YMin()) + GetClientSize().GetHeight(); + + Draw_Inverse(wxPoint(ax, ay), wxPoint(bx, by)); + + dc.DrawLine(ax, ay, ax, by); + dc.DrawLine(ax, by, bx, by); + dc.DrawLine(bx, by, bx, ay); + dc.DrawLine(bx, ay, ax, ay); + } + } + + //--------------------------------------------------------- + void Draw_Inverse (wxPoint A, wxPoint B) + { + wxClientDC dc(this); + dc.SetLogicalFunction(wxINVERT); + dc.DrawRectangle(A.x, A.y, B.x - A.x, B.y - A.y); + } + + //--------------------------------------------------------- + void Set_Size (int Width, int Height, bool bRefresh) + { + if( Width < 100 || Height < 100 || Width > 1000 || Height > 1000 ) + { + return; + } + + SetClientSize(Width, Height); + + if( !m_Image.IsOk() || m_Image.GetWidth() != Width ) + { + CSG_Colors Colors(7, SG_COLORS_RAINBOW); + Colors.Set_Color(0, m_pPanel->m_Parameters("BGCOLOR")->asColor()); + Colors.Set_Count(100); + + double dCount = (Colors.Get_Count() - 2.0) / log(1.0 + m_Count.Get_ZMax()); + double dx = m_Count.Get_XRange() / (double)Width ; + double dy = m_Count.Get_YRange() / (double)Height; + + m_Image.Create(Width, Height, false); + + #pragma omp parallel for + for(int y=0; y 0.0 ? (int)(log(1.0 + Count) * dCount) : 0; + + m_Image.SetRGB(x, y, Colors.Get_Red(i), Colors.Get_Green(i), Colors.Get_Blue(i)); + } + } + } + + if( bRefresh ) + { + Refresh(false); + } + } + + + DECLARE_EVENT_TABLE() + +}; + +//--------------------------------------------------------- +BEGIN_EVENT_TABLE(CPointCloud_Overview, wxDialog) + EVT_LEFT_DOWN (CPointCloud_Overview::On_Mouse_LDown) + EVT_LEFT_UP (CPointCloud_Overview::On_Mouse_LUp) + EVT_RIGHT_DOWN (CPointCloud_Overview::On_Mouse_RDown) + EVT_MOTION (CPointCloud_Overview::On_Mouse_Motion) + EVT_KEY_DOWN (CPointCloud_Overview::On_Key_Down) + EVT_CLOSE (CPointCloud_Overview::On_Close) + EVT_PAINT (CPointCloud_Overview::On_Paint) +END_EVENT_TABLE() + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +class C3D_Viewer_PointCloud_Dialog : public CSG_3DView_Dialog +{ +public: + C3D_Viewer_PointCloud_Dialog(CSG_PointCloud *pPoints, int Field_Color) + : CSG_3DView_Dialog(_TL("Point Cloud Viewer")) + { + Create(new C3D_Viewer_PointCloud_Panel(this, pPoints, Field_Color)); + + wxArrayString Attributes; + + for(int i=0; iGet_Field_Count(); i++) + { + Attributes.Add(pPoints->Get_Field_Name(i)); + } + + Add_Spacer(); + m_pField_C = Add_Choice (_TL("Colour" ), Attributes, Field_Color); + + Add_Spacer(); + m_pOverview = Add_CheckBox(_TL("Overview"), false); + + m_Overview.Create(this, pPoints, (C3D_Viewer_PointCloud_Panel *)m_pPanel); + } + + virtual void Update_Controls (void); + + +protected: + + wxChoice *m_pField_C; + + wxCheckBox *m_pOverview; + + CPointCloud_Overview m_Overview; + + + virtual void On_Update_Choices (wxCommandEvent &event); + virtual void On_Update_Control (wxCommandEvent &event); + + virtual void Set_Menu (wxMenu &Menu); + virtual void On_Menu (wxCommandEvent &event); + virtual void On_Menu_UI (wxUpdateUIEvent &event); + + +private: + + DECLARE_EVENT_TABLE() + +}; + +//--------------------------------------------------------- +BEGIN_EVENT_TABLE(C3D_Viewer_PointCloud_Dialog, CSG_3DView_Dialog) + EVT_CHECKBOX (wxID_ANY, C3D_Viewer_PointCloud_Dialog::On_Update_Control) + EVT_CHOICE (wxID_ANY, C3D_Viewer_PointCloud_Dialog::On_Update_Choices) +END_EVENT_TABLE() + +//--------------------------------------------------------- +void C3D_Viewer_PointCloud_Dialog::On_Update_Choices(wxCommandEvent &event) +{ + if( event.GetEventObject() == m_pField_C ) + { + m_pPanel->m_Parameters("COLORS_ATTR")->Set_Value(m_pField_C->GetSelection()); + m_pPanel->Update_View(true); + return; + } + + CSG_3DView_Dialog::On_Update_Choices(event); +} + +//--------------------------------------------------------- +void C3D_Viewer_PointCloud_Dialog::On_Update_Control(wxCommandEvent &event) +{ + if( event.GetEventObject() == m_pOverview ) + { +#ifdef _SAGA_MSW + m_Overview.Show(m_pOverview->GetValue() == 1 ? true : false); // unluckily this does not work with linux (broken event handler chain, non-modal dialog as subprocess of a modal one!!) +#else + m_Overview.ShowModal(); +#endif + } + + CSG_3DView_Dialog::On_Update_Control(event); +} + +//--------------------------------------------------------- +void C3D_Viewer_PointCloud_Dialog::Update_Controls(void) +{ + m_pField_C->SetSelection(m_pPanel->m_Parameters("COLORS_ATTR")->asInt()); + + m_pOverview->SetValue(m_Overview.IsShown()); + + CSG_3DView_Dialog::Update_Controls(); +} + +//--------------------------------------------------------- +enum +{ + MENU_SCALE_Z_DEC = MENU_USER_FIRST, + MENU_SCALE_Z_INC, + MENU_VAL_AS_RGB, + MENU_COLORS_GRAD, + MENU_SIZE_DEC, + MENU_SIZE_INC, + MENU_SIZE_SCALE_DEC, + MENU_SIZE_SCALE_INC +}; + +//--------------------------------------------------------- +void C3D_Viewer_PointCloud_Dialog::Set_Menu(wxMenu &Menu) +{ + wxMenu *pMenu = Menu.FindChildItem(Menu.FindItem(_TL("Display")))->GetSubMenu(); + + pMenu->AppendSeparator(); + pMenu->Append (MENU_SCALE_Z_DEC , _TL("Decrease Exaggeration [F1]")); + pMenu->Append (MENU_SCALE_Z_INC , _TL("Increase Exaggeration [F2]")); + + pMenu->AppendSeparator(); + pMenu->Append (MENU_SIZE_DEC , _TL("Decrease Size [F5]")); + pMenu->Append (MENU_SIZE_INC , _TL("Increase Size [F6]")); + + pMenu->AppendSeparator(); + pMenu->Append (MENU_SIZE_SCALE_DEC, _TL("Decrease Size Scaling Factor [F7]")); + pMenu->Append (MENU_SIZE_SCALE_INC, _TL("Increase Size Scaling Factor [F8]")); + + pMenu->AppendSeparator(); + pMenu->AppendCheckItem(MENU_VAL_AS_RGB , _TL("Value as RGB")); + pMenu->AppendCheckItem(MENU_COLORS_GRAD , _TL("Graduated Colours")); +} + +//--------------------------------------------------------- +void C3D_Viewer_PointCloud_Dialog::On_Menu(wxCommandEvent &event) +{ + switch( event.GetId() ) + { + default: CSG_3DView_Dialog::On_Menu(event); return; + + case MENU_SCALE_Z_DEC : MENU_VALUE_ADD("Z_SCALE" , -0.5); return; + case MENU_SCALE_Z_INC : MENU_VALUE_ADD("Z_SCALE" , 0.5); return; + + case MENU_SIZE_DEC : MENU_VALUE_ADD("SIZE" , -1.0); return; + case MENU_SIZE_INC : MENU_VALUE_ADD("SIZE" , 1.0); return; + + case MENU_SIZE_SCALE_DEC: MENU_VALUE_ADD("SIZE_SCALE", -10.0); return; + case MENU_SIZE_SCALE_INC: MENU_VALUE_ADD("SIZE_SCALE", 10.0); return; + + case MENU_VAL_AS_RGB : MENU_TOGGLE("VAL_AS_RGB" ); return; + case MENU_COLORS_GRAD : MENU_TOGGLE("COLORS_GRAD"); return; + } +} + +//--------------------------------------------------------- +void C3D_Viewer_PointCloud_Dialog::On_Menu_UI(wxUpdateUIEvent &event) +{ + switch( event.GetId() ) + { + default: CSG_3DView_Dialog::On_Menu_UI(event); break; + + case MENU_VAL_AS_RGB : event.Check(m_pPanel->m_Parameters("VAL_AS_RGB" )->asBool()); break; + case MENU_COLORS_GRAD: event.Check(m_pPanel->m_Parameters("COLORS_GRAD")->asBool()); break; + } +} + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +C3D_Viewer_PointCloud::C3D_Viewer_PointCloud(void) +{ + //----------------------------------------------------- + Set_Name (_TL("Point Cloud Viewer")); + + Set_Author ("O. Conrad (c) 2014"); + + Set_Description (_TW( + "3D viewer for point clouds." + )); + + //----------------------------------------------------- + CSG_Parameter *pNode = Parameters.Add_PointCloud( + NULL , "POINTS" , _TL("Point Cloud"), + _TL(""), + PARAMETER_INPUT + ); + + Parameters.Add_Table_Field( + pNode , "COLOR" , _TL("Color"), + _TL("") + ); +} + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool C3D_Viewer_PointCloud::On_Execute(void) +{ + if( !SG_UI_Get_Window_Main() ) + { + Message_Add(_TL("point cloud viewer can only be run from graphical user interface")); + + return( false ); + } + + CSG_PointCloud *pPoints = Parameters("POINTS")->asPointCloud(); + + if( pPoints->Get_Count() <= 0 ) + { + Message_Add(_TL("point cloud viewer will not be started, because point cloud has no points")); + + return( false ); + } + + C3D_Viewer_PointCloud_Dialog dlg(pPoints, Parameters("COLOR")->asInt()); + + dlg.ShowModal(); + + return( true ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- diff -Nru saga-2.1.0+dfsg/src/modules/garden/garden_3d_viewer/3d_viewer_pointcloud.h saga-2.1.4+dfsg/src/modules/garden/garden_3d_viewer/3d_viewer_pointcloud.h --- saga-2.1.0+dfsg/src/modules/garden/garden_3d_viewer/3d_viewer_pointcloud.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/garden/garden_3d_viewer/3d_viewer_pointcloud.h 2014-11-13 08:32:19.000000000 +0000 @@ -0,0 +1,106 @@ +/********************************************************** + * Version $Id: 3d_viewer_pointcloud.h 911 2011-02-14 16:38:15Z reklov_w $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// 3d_viewer // +// // +//-------------------------------------------------------// +// // +// 3d_viewer_pointcloud.h // +// // +// Copyright (C) 2014 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Hamburg // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#ifndef HEADER_INCLUDED__3d_viewer_pointcloud_H +#define HEADER_INCLUDED__3d_viewer_pointcloud_H + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "MLB_Interface.h" + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +class C3D_Viewer_PointCloud : public CSG_Module +{ +public: + C3D_Viewer_PointCloud(void); + + virtual bool needs_GUI (void) { return( true ); } + + +protected: + + virtual bool On_Execute (void); + + +}; + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#endif // #ifndef HEADER_INCLUDED__3d_viewer_pointcloud_H + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- diff -Nru saga-2.1.0+dfsg/src/modules/garden/garden_3d_viewer/3d_viewer_shapes.cpp saga-2.1.4+dfsg/src/modules/garden/garden_3d_viewer/3d_viewer_shapes.cpp --- saga-2.1.0+dfsg/src/modules/garden/garden_3d_viewer/3d_viewer_shapes.cpp 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/garden/garden_3d_viewer/3d_viewer_shapes.cpp 2014-11-13 08:32:19.000000000 +0000 @@ -0,0 +1,494 @@ +/********************************************************** + * Version $Id: 3d_viewer_shapes.cpp 911 2011-02-14 16:38:15Z reklov_w $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// 3d_viewer // +// // +//-------------------------------------------------------// +// // +// 3d_viewer_shapes.cpp // +// // +// Copyright (C) 2014 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Hamburg // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "3d_viewer_shapes.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +class C3D_Viewer_Shapes_Panel : public CSG_3DView_Panel +{ +public: + C3D_Viewer_Shapes_Panel(wxWindow *pParent, CSG_Shapes *pShapes, int Field_Color); + + +protected: + + virtual int On_Parameters_Enable (CSG_Parameters *pParameters, CSG_Parameter *pParameter); + + virtual void Update_Statistics (void); + virtual void Update_Parent (void); + + virtual void On_Key_Down (wxKeyEvent &event); + + virtual bool On_Before_Draw (void); + virtual bool On_Draw (void); + + virtual int Get_Color (double Value); + + +private: + + bool m_Color_bGrad; + + double m_Color_Min, m_Color_Scale; + + CSG_Colors m_Colors; + + CSG_Shapes *m_pShapes; + + + void Draw_Shape (CSG_Shape *pShape, int Field_Color); + + + //----------------------------------------------------- + DECLARE_EVENT_TABLE() + +}; + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +BEGIN_EVENT_TABLE(C3D_Viewer_Shapes_Panel, CSG_3DView_Panel) + EVT_KEY_DOWN (C3D_Viewer_Shapes_Panel::On_Key_Down) +END_EVENT_TABLE() + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +C3D_Viewer_Shapes_Panel::C3D_Viewer_Shapes_Panel(wxWindow *pParent, CSG_Shapes *pShapes, int cField) + : CSG_3DView_Panel(pParent) +{ + m_pShapes = pShapes; + + //----------------------------------------------------- + CSG_String Attributes; + + for(int i=0; iGet_Field_Count(); i++) + { + Attributes += m_pShapes->Get_Field_Name(i); + Attributes += "|"; + } + + //----------------------------------------------------- + CSG_Parameter *pNode, *pNode_1; + + //----------------------------------------------------- + pNode = m_Parameters("NODE_GENERAL"); + + m_Parameters.Add_Value( + pNode , "Z_SCALE" , _TL("Exaggeration"), + _TL(""), + PARAMETER_TYPE_Double, 1.0 + ); + + //----------------------------------------------------- + pNode = m_Parameters.Add_Node( + NULL , "NODE_VIEW" , _TL("Shapes View Settings"), + _TL("") + ); + + pNode_1 = m_Parameters.Add_Choice( + pNode , "COLORS_ATTR" , _TL("Colour Attribute"), + _TL(""), + Attributes, cField + ); + + m_Parameters.Add_Colors( + pNode_1 , "COLORS" , _TL("Colours"), + _TL("") + ); + + m_Parameters.Add_Value( + pNode_1 , "COLORS_GRAD" , _TL("Graduated"), + _TL(""), + PARAMETER_TYPE_Bool, true + ); + + m_Parameters.Add_Range( + pNode_1 , "COLORS_RANGE" , _TL("Value Range"), + _TL("") + ); + + //----------------------------------------------------- + Update_Statistics(); +} + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +int C3D_Viewer_Shapes_Panel::On_Parameters_Enable(CSG_Parameters *pParameters, CSG_Parameter *pParameter) +{ + return( CSG_3DView_Panel::On_Parameters_Enable(pParameters, pParameter) ); +} + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +void C3D_Viewer_Shapes_Panel::Update_Statistics(void) +{ + int Field = m_Parameters("COLORS_ATTR")->asInt(); + + m_Parameters("COLORS_RANGE")->asRange()->Set_Range( + m_pShapes->Get_Mean(Field) - 1.5 * m_pShapes->Get_StdDev(Field), + m_pShapes->Get_Mean(Field) + 1.5 * m_pShapes->Get_StdDev(Field) + ); + + m_Data_Min.x = m_pShapes->Get_Extent().Get_XMin(); + m_Data_Max.x = m_pShapes->Get_Extent().Get_XMax(); + + m_Data_Min.y = m_pShapes->Get_Extent().Get_YMin(); + m_Data_Max.y = m_pShapes->Get_Extent().Get_YMax(); + + m_Data_Min.z = m_pShapes->Get_ZMin(); + m_Data_Max.z = m_pShapes->Get_ZMax(); + + //----------------------------------------------------- + Update_View(); +} + +//--------------------------------------------------------- +void C3D_Viewer_Shapes_Panel::Update_Parent(void) +{ + ((CSG_3DView_Dialog *)GetParent())->Update_Controls(); +} + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +void C3D_Viewer_Shapes_Panel::On_Key_Down(wxKeyEvent &event) +{ + switch( event.GetKeyCode() ) + { + default: CSG_3DView_Panel::On_Key_Down(event); return; + + case WXK_F1: m_Parameters("Z_SCALE")->Set_Value(m_Parameters("Z_SCALE")->asDouble() - 0.5); break; + case WXK_F2: m_Parameters("Z_SCALE")->Set_Value(m_Parameters("Z_SCALE")->asDouble() + 0.5); break; + } + + //----------------------------------------------------- + Update_View(); + Update_Parent(); +} + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool C3D_Viewer_Shapes_Panel::On_Before_Draw(void) +{ + if( m_Play_State == SG_3DVIEW_PLAY_STOP ) + { + m_Projector.Set_zScaling(m_Projector.Get_xScaling() * m_Parameters("Z_SCALE")->asDouble()); + } + + return( true ); +} + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +int C3D_Viewer_Shapes_Panel::Get_Color(double Value) +{ + if( m_Color_Scale <= 0.0 ) + { + return( (int)Value ); + } + + double c = m_Color_Scale * (Value - m_Color_Min); + + return( m_Color_bGrad ? m_Colors.Get_Interpolated(c) : m_Colors[(int)c] ); +} + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool C3D_Viewer_Shapes_Panel::On_Draw(void) +{ + //----------------------------------------------------- + int cField = m_Parameters("COLORS_ATTR")->asInt(); + + if( m_Parameters("COLORS_RANGE")->asRange()->Get_LoVal() + >= m_Parameters("COLORS_RANGE")->asRange()->Get_HiVal() ) + { + m_Parameters("COLORS_RANGE")->asRange()->Set_Range( + m_pShapes->Get_Mean(cField) - 1.5 * m_pShapes->Get_StdDev(cField), + m_pShapes->Get_Mean(cField) + 1.5 * m_pShapes->Get_StdDev(cField) + ); + } + + m_Colors = *m_Parameters("COLORS")->asColors(); + m_Color_bGrad = m_Parameters("COLORS_GRAD")->asBool(); + m_Color_Min = m_Parameters("COLORS_RANGE")->asRange()->Get_LoVal(); + m_Color_Scale = m_Colors.Get_Count() / (m_Parameters("COLORS_RANGE")->asRange()->Get_HiVal() - m_Color_Min); + + //------------------------------------------------- + for(int iShape=0; iShapeGet_Count(); iShape++) + { + Draw_Shape(m_pShapes->Get_Shape(iShape), cField); + } + + //----------------------------------------------------- + return( true ); +} + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +void C3D_Viewer_Shapes_Panel::Draw_Shape(CSG_Shape *pShape, int Field_Color) +{ + int Color = Get_Color(pShape->asDouble(Field_Color)); + + for(int iPart=0; iPartGet_Part_Count(); iPart++) + { + switch( pShape->Get_Type() ) + { + //------------------------------------------------- + case SHAPE_TYPE_Point: + case SHAPE_TYPE_Points: + { + for(int iPoint=1; iPointGet_Point_Count(iPart); iPoint++) + { + TSG_Point_Z a; + TSG_Point p = pShape->Get_Point(0, iPart); + + a.x = p.x; + a.y = p.y; + a.z = pShape->Get_Z(iPoint, iPart); + + m_Projector.Get_Projection(a); + + Draw_Point(a.x, a.y, a.z, Color, 2); + } + } + break; + + //------------------------------------------------- + case SHAPE_TYPE_Line: + { + TSG_Point_Z a, b; + TSG_Point p = pShape->Get_Point(0, iPart); + + a.x = p.x; + a.y = p.y; + a.z = pShape->Get_Z(0, iPart); + + m_Projector.Get_Projection(a); + + for(int iPoint=1; iPointGet_Point_Count(iPart); iPoint++) + { + b = a; + p = pShape->Get_Point(iPoint, iPart); + a.x = p.x; + a.y = p.y; + a.z = pShape->Get_Z(iPoint, iPart); + + m_Projector.Get_Projection(a); + + Draw_Line(a, b, Color); + } + } + break; + + //------------------------------------------------- + case SHAPE_TYPE_Polygon: + { + TSG_Point_Z a, b; + TSG_Point p = pShape->Get_Point(0, iPart, false); + + a.x = p.x; + a.y = p.y; + a.z = pShape->Get_Z(0, iPart, false); + + m_Projector.Get_Projection(a); + + for(int iPoint=0; iPointGet_Point_Count(iPart); iPoint++) + { + b = a; p = pShape->Get_Point(iPoint, iPart); + + a.x = p.x; + a.y = p.y; + a.z = pShape->Get_Z(iPoint, iPart); + + m_Projector.Get_Projection(a); + + Draw_Line(a, b, Color); + } + } + break; + } + } +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +class C3D_Viewer_Shapes_Dialog : public CSG_3DView_Dialog +{ +public: + C3D_Viewer_Shapes_Dialog(CSG_Shapes *pShapes, int Field_Color) + : CSG_3DView_Dialog(_TL("3D Shapes Viewer")) + { + Create(new C3D_Viewer_Shapes_Panel(this, pShapes, Field_Color)); + } + +}; + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +C3D_Viewer_Shapes::C3D_Viewer_Shapes(void) +{ + //----------------------------------------------------- + Set_Name (_TL("3D Shapes Viewer")); + + Set_Author ("O. Conrad (c) 2014"); + + Set_Description (_TW( + "3D viewer for 3D Shapes." + )); + + //----------------------------------------------------- + CSG_Parameter *pNode = Parameters.Add_Shapes( + NULL , "SHAPES" , _TL("Shapes"), + _TL(""), + PARAMETER_INPUT + ); + + Parameters.Add_Table_Field( + pNode , "COLOR" , _TL("Colour"), + _TL("") + ); +} + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool C3D_Viewer_Shapes::On_Execute(void) +{ + CSG_Shapes *pShapes = Parameters("SHAPES")->asShapes(); + + if( !pShapes->is_Valid() ) + { + Error_Set(_TL("invalid input")); + + return( false ); + } + + C3D_Viewer_Shapes_Dialog dlg(pShapes, Parameters("COLOR")->asInt()); + + dlg.ShowModal(); + + return( true ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- diff -Nru saga-2.1.0+dfsg/src/modules/garden/garden_3d_viewer/3d_viewer_shapes.h saga-2.1.4+dfsg/src/modules/garden/garden_3d_viewer/3d_viewer_shapes.h --- saga-2.1.0+dfsg/src/modules/garden/garden_3d_viewer/3d_viewer_shapes.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/garden/garden_3d_viewer/3d_viewer_shapes.h 2014-11-13 08:32:19.000000000 +0000 @@ -0,0 +1,106 @@ +/********************************************************** + * Version $Id: 3d_viewer_shapes.h 911 2011-02-14 16:38:15Z reklov_w $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// 3d_viewer // +// // +//-------------------------------------------------------// +// // +// 3d_viewer_shapes.h // +// // +// Copyright (C) 2014 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Hamburg // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#ifndef HEADER_INCLUDED__3d_viewer_shapes_H +#define HEADER_INCLUDED__3d_viewer_shapes_H + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "MLB_Interface.h" + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +class C3D_Viewer_Shapes : public CSG_Module +{ +public: + C3D_Viewer_Shapes(void); + + virtual bool needs_GUI (void) { return( true ); } + + +protected: + + virtual bool On_Execute (void); + + +}; + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#endif // #ifndef HEADER_INCLUDED__3d_viewer_shapes_H + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- diff -Nru saga-2.1.0+dfsg/src/modules/garden/garden_3d_viewer/3d_viewer_tin.cpp saga-2.1.4+dfsg/src/modules/garden/garden_3d_viewer/3d_viewer_tin.cpp --- saga-2.1.0+dfsg/src/modules/garden/garden_3d_viewer/3d_viewer_tin.cpp 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/garden/garden_3d_viewer/3d_viewer_tin.cpp 2014-11-13 08:32:19.000000000 +0000 @@ -0,0 +1,809 @@ +/********************************************************** + * Version $Id: 3d_viewer_tin.cpp 911 2011-02-14 16:38:15Z reklov_w $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// 3d_viewer // +// // +//-------------------------------------------------------// +// // +// 3d_viewer_tin.cpp // +// // +// Copyright (C) 2014 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Hamburg // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include + +#include "3d_viewer_tin.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +class C3D_Viewer_TIN_Panel : public CSG_3DView_Panel +{ +public: + C3D_Viewer_TIN_Panel(wxWindow *pParent, CSG_TIN *pTIN, int Field_Z, int Field_Color, CSG_Grid *pDrape); + + +protected: + + virtual int On_Parameters_Enable (CSG_Parameters *pParameters, CSG_Parameter *pParameter); + + virtual void Update_Statistics (void); + virtual void Update_Parent (void); + + virtual void On_Key_Down (wxKeyEvent &event); + + virtual bool On_Before_Draw (void); + virtual bool On_Draw (void); + + virtual int Get_Color (double Value); + + +private: + + bool m_Color_bGrad; + + double m_Color_Min, m_Color_Scale; + + CSG_Colors m_Colors; + + CSG_TIN *m_pTIN; + + + //----------------------------------------------------- + DECLARE_EVENT_TABLE() + +}; + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +BEGIN_EVENT_TABLE(C3D_Viewer_TIN_Panel, CSG_3DView_Panel) + EVT_KEY_DOWN (C3D_Viewer_TIN_Panel::On_Key_Down) +END_EVENT_TABLE() + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +C3D_Viewer_TIN_Panel::C3D_Viewer_TIN_Panel(wxWindow *pParent, CSG_TIN *pTIN, int zField, int cField, CSG_Grid *pDrape) + : CSG_3DView_Panel(pParent, pDrape) +{ + m_pTIN = pTIN; + + //----------------------------------------------------- + CSG_String Attributes; + + for(int i=0; iGet_Field_Count(); i++) + { + Attributes += pTIN->Get_Field_Name(i); + Attributes += "|"; + } + + //----------------------------------------------------- + CSG_Parameter *pNode, *pNode_1, *pNode_2; + + //----------------------------------------------------- + pNode = m_Parameters("NODE_GENERAL"); + + pNode_1 = m_Parameters.Add_Choice( + pNode , "Z_ATTR" , _TL("Z Attribute"), + _TL(""), + Attributes, zField + ); + + m_Parameters.Add_Value( + pNode_1 , "Z_SCALE" , _TL("Exaggeration"), + _TL(""), + PARAMETER_TYPE_Double, 1.0 + ); + + //----------------------------------------------------- + pNode = m_Parameters.Add_Node( + NULL , "NODE_VIEW" , _TL("TIN View Settings"), + _TL("") + ); + + pNode_1 = m_Parameters.Add_Value( + pNode , "DRAW_FACES" , _TL("Draw Faces"), + _TL(""), + PARAMETER_TYPE_Bool, true + ); + + pNode_2 = m_Parameters.Add_Choice( + pNode_1 , "COLORS_ATTR" , _TL("Colour Attribute"), + _TL(""), + Attributes, cField + ); + + m_Parameters.Add_Colors( + pNode_2 , "COLORS" , _TL("Colours"), + _TL("") + ); + + m_Parameters.Add_Value( + pNode_2 , "COLORS_GRAD" , _TL("Graduated"), + _TL(""), + PARAMETER_TYPE_Bool, true + ); + + m_Parameters.Add_Range( + pNode_2 , "COLORS_RANGE" , _TL("Value Range"), + _TL("") + ); + + pNode_2 = m_Parameters.Add_Choice( + pNode_1 , "SHADING" , _TL("Shading"), + _TL(""), + CSG_String::Format(SG_T("%s|%s|%s|"), + _TL("none"), + _TL("shading"), + _TL("shading (fixed light source)") + ), 1 + ); + + m_Parameters.Add_Value( + pNode_2 , "SHADE_DEC" , _TL("Light Source Height"), + _TL(""), + PARAMETER_TYPE_Double, 45.0, -90.0, true, 90.0, true + ); + + m_Parameters.Add_Value( + pNode_2 , "SHADE_AZI" , _TL("Light Source Direction"), + _TL(""), + PARAMETER_TYPE_Double, 90.0, 0.0, true, 360.0, true + ); + + //----------------------------------------------------- + pNode_1 = m_Parameters.Add_Value( + pNode , "DRAW_EDGES" , _TL("Draw Wire"), + _TL(""), + PARAMETER_TYPE_Bool, false + ); + + pNode_2 = m_Parameters.Add_Value( + pNode_1 , "EDGE_COLOR_UNI" , _TL("Single Colour"), + _TL(""), + PARAMETER_TYPE_Bool, false + ); + + m_Parameters.Add_Value( + pNode_2 , "EDGE_COLOR" , _TL("Colour"), + _TL(""), + PARAMETER_TYPE_Color, SG_GET_RGB(150, 150, 150) + ); + + //----------------------------------------------------- + pNode = m_Parameters.Add_Value( + NULL , "DRAW_NODES" , _TL("Draw Nodes"), + _TL(""), + PARAMETER_TYPE_Bool, false + ); + + m_Parameters.Add_Value( + pNode , "NODE_COLOR" , _TL("Colour"), + _TL(""), + PARAMETER_TYPE_Color, SG_COLOR_BLACK + ); + + m_Parameters.Add_Value( + pNode , "NODE_SIZE" , _TL("Size"), + _TL(""), + PARAMETER_TYPE_Int, 2, 1, true + ); + + m_Parameters.Add_Value( + pNode , "NODE_SCALE" , _TL("Size Scaling"), + _TL(""), + PARAMETER_TYPE_Double, 250.0, 1.0, true + ); + + //----------------------------------------------------- + Update_Statistics(); +} + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +int C3D_Viewer_TIN_Panel::On_Parameters_Enable(CSG_Parameters *pParameters, CSG_Parameter *pParameter) +{ + if( !SG_STR_CMP(pParameter->Get_Identifier(), "DRAW_FACES") ) + { + CSG_Parameter *pDrape = pParameters->Get_Parameter("DO_DRAPE"); + + pParameters->Get_Parameter("COLORS_ATTR")->Set_Enabled(pParameter->asBool() && (!pDrape || !pDrape->asBool())); + pParameters->Get_Parameter("SHADING" )->Set_Enabled(pParameter->asBool()); + } + + if( !SG_STR_CMP(pParameter->Get_Identifier(), "DO_DRAPE") ) + { + CSG_Parameter *pFaces = pParameters->Get_Parameter("DRAW_FACES"); + + pParameters->Get_Parameter("COLORS_ATTR")->Set_Enabled(pParameter->asBool() == false && pFaces->asBool() == true); + } + + if( !SG_STR_CMP(pParameter->Get_Identifier(), "SHADING") ) + { + pParameters->Get_Parameter("SHADE_DEC" )->Set_Enabled(pParameter->asBool()); + pParameters->Get_Parameter("SHADE_AZI" )->Set_Enabled(pParameter->asBool()); + } + + if( !SG_STR_CMP(pParameter->Get_Identifier(), "DRAW_EDGES") ) + { + pParameters->Get_Parameter("EDGE_COLOR_UNI" )->Set_Enabled(pParameter->asBool()); + } + + if( !SG_STR_CMP(pParameter->Get_Identifier(), "EDGE_COLOR_UNI") ) + { + pParameters->Get_Parameter("EDGE_COLOR" )->Set_Enabled(pParameter->asBool()); + } + + if( !SG_STR_CMP(pParameter->Get_Identifier(), "DRAW_NODES") ) + { + pParameters->Get_Parameter("NODE_COLOR" )->Set_Enabled(pParameter->asBool()); + pParameters->Get_Parameter("NODE_SIZE" )->Set_Enabled(pParameter->asBool()); + pParameters->Get_Parameter("NODE_SCALE" )->Set_Enabled(pParameter->asBool()); + } + + return( CSG_3DView_Panel::On_Parameters_Enable(pParameters, pParameter) ); +} + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +void C3D_Viewer_TIN_Panel::Update_Statistics(void) +{ + int Field = m_Parameters("COLORS_ATTR")->asInt(); + + m_Parameters("COLORS_RANGE")->asRange()->Set_Range( + m_pTIN->Get_Mean(Field) - 1.5 * m_pTIN->Get_StdDev(Field), + m_pTIN->Get_Mean(Field) + 1.5 * m_pTIN->Get_StdDev(Field) + ); + + m_Data_Min.x = m_pTIN->Get_Extent().Get_XMin(); + m_Data_Max.x = m_pTIN->Get_Extent().Get_XMax(); + + m_Data_Min.y = m_pTIN->Get_Extent().Get_YMin(); + m_Data_Max.y = m_pTIN->Get_Extent().Get_YMax(); + + m_Data_Min.z = m_pTIN->Get_Minimum(m_Parameters("Z_ATTR")->asInt()); + m_Data_Max.z = m_pTIN->Get_Maximum(m_Parameters("Z_ATTR")->asInt()); + + //----------------------------------------------------- + Update_View(); +} + +//--------------------------------------------------------- +void C3D_Viewer_TIN_Panel::Update_Parent(void) +{ + ((CSG_3DView_Dialog *)GetParent())->Update_Controls(); +} + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +void C3D_Viewer_TIN_Panel::On_Key_Down(wxKeyEvent &event) +{ + switch( event.GetKeyCode() ) + { + default: CSG_3DView_Panel::On_Key_Down(event); return; + + case WXK_F1: m_Parameters("Z_SCALE" )->Set_Value(m_Parameters("Z_SCALE" )->asDouble() - 0.5); break; + case WXK_F2: m_Parameters("Z_SCALE" )->Set_Value(m_Parameters("Z_SCALE" )->asDouble() + 0.5); break; + + case WXK_F5: m_Parameters("SIZE" )->Set_Value(m_Parameters("SIZE" )->asDouble() - 1.0); break; + case WXK_F6: m_Parameters("SIZE" )->Set_Value(m_Parameters("SIZE" )->asDouble() + 1.0); break; + + case WXK_F7: m_Parameters("SIZE_SCALE")->Set_Value(m_Parameters("SIZE_SCALE")->asDouble() - 10.0); break; + case WXK_F8: m_Parameters("SIZE_SCALE")->Set_Value(m_Parameters("SIZE_SCALE")->asDouble() + 10.0); break; + } + + //----------------------------------------------------- + Update_View(); + Update_Parent(); +} + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool C3D_Viewer_TIN_Panel::On_Before_Draw(void) +{ + if( m_Play_State == SG_3DVIEW_PLAY_STOP ) + { + m_Projector.Set_zScaling(m_Projector.Get_xScaling() * m_Parameters("Z_SCALE")->asDouble()); + } + + return( true ); +} + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +int C3D_Viewer_TIN_Panel::Get_Color(double Value) +{ + if( m_Color_Scale <= 0.0 ) + { + return( (int)Value ); + } + + double c = m_Color_Scale * (Value - m_Color_Min); + + return( m_Color_bGrad ? m_Colors.Get_Interpolated(c) : m_Colors[(int)c] ); +} + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool C3D_Viewer_TIN_Panel::On_Draw(void) +{ + int zField = m_Parameters("Z_ATTR" )->asInt(); + + //----------------------------------------------------- + int cField = m_Parameters("COLORS_ATTR")->asInt(); + + if( m_Parameters("COLORS_RANGE")->asRange()->Get_LoVal() + >= m_Parameters("COLORS_RANGE")->asRange()->Get_HiVal() ) + { + m_Parameters("COLORS_RANGE")->asRange()->Set_Range( + m_pTIN->Get_Mean(cField) - 1.5 * m_pTIN->Get_StdDev(cField), + m_pTIN->Get_Mean(cField) + 1.5 * m_pTIN->Get_StdDev(cField) + ); + } + + m_Colors = *m_Parameters("COLORS")->asColors(); + m_Color_bGrad = m_Parameters("COLORS_GRAD")->asBool(); + m_Color_Min = m_Parameters("COLORS_RANGE")->asRange()->Get_LoVal(); + m_Color_Scale = m_Colors.Get_Count() / (m_Parameters("COLORS_RANGE")->asRange()->Get_HiVal() - m_Color_Min); + + //----------------------------------------------------- + if( m_Parameters("DRAW_FACES")->asBool() ) // Face + { + bool bDrape = m_Parameters("DO_DRAPE") && m_Parameters("DO_DRAPE")->asBool(); + int Shading = m_Parameters("SHADING")->asInt(); + double Shade_Dec = m_Parameters("SHADE_DEC")->asDouble() * -M_DEG_TO_RAD; + double Shade_Azi = m_Parameters("SHADE_AZI")->asDouble() * M_DEG_TO_RAD; + + #pragma omp parallel for + for(int iTriangle=0; iTriangleGet_Triangle_Count(); iTriangle++) + { + CSG_TIN_Triangle *pTriangle = m_pTIN->Get_Triangle(iTriangle); + TSG_Triangle_Node p[3]; + + for(int i=0; i<3; i++) + { + CSG_TIN_Node *pNode = pTriangle->Get_Node(i); + + p[i].x = pNode->Get_Point().x; + p[i].y = pNode->Get_Point().y; + p[i].z = pNode->asDouble(zField); + + if( bDrape ) + { + p[i].c = pNode->Get_Point().x; + p[i].d = pNode->Get_Point().y; + } + else + { + p[i].c = pNode->asDouble(cField); + } + + m_Projector.Get_Projection(p[i].x, p[i].y, p[i].z); + } + + //--------------------------------------------- + switch( Shading ) + { + default: + case 0: Draw_Triangle(p, false); break; + case 1: Draw_Triangle(p, false, Shade_Dec, Shade_Azi); break; + case 2: + { + double s, a; + + pTriangle->Get_Gradient(zField, s, a); + + Draw_Triangle(p, false, acos(sin(M_PI_090 - s) * sin(Shade_Dec) + cos(M_PI_090 - s) * cos(Shade_Dec) * cos(a - Shade_Azi)) / M_PI_090); + } + break; + } + } + } + + //----------------------------------------------------- + if( m_Parameters("DRAW_EDGES")->asBool() ) // Edges + { + bool bColor = m_Parameters("EDGE_COLOR_UNI")->asBool(); + int Color = m_Parameters("EDGE_COLOR" )->asColor(); + + #pragma omp parallel for + for(int iEdge=0; iEdgeGet_Edge_Count(); iEdge++) + { + CSG_TIN_Edge *pEdge = m_pTIN->Get_Edge(iEdge); + TSG_Triangle_Node p[2]; + + for(int i=0; i<2; i++) + { + CSG_TIN_Node *pNode = pEdge->Get_Node(i); + + p[i].x = pNode->Get_Point().x; + p[i].y = pNode->Get_Point().y; + p[i].z = pNode->asDouble(zField); + p[i].c = Get_Color(pNode->asDouble(cField)); + + m_Projector.Get_Projection(p[i].x, p[i].y, p[i].z); + } + + //--------------------------------------------- + if( bColor ) + { + Draw_Line(p[0].x, p[0].y, p[0].z, p[1].x, p[1].y, p[1].z, Color); + } + else + { + Draw_Line(p[0].x, p[0].y, p[0].z, p[1].x, p[1].y, p[1].z, p[0].c, p[1].c); + } + } + } + + //------------------------------------------------- + if( m_Parameters("DRAW_NODES")->asBool() ) // Nodes + { + int Color = m_Parameters("NODE_COLOR")->asColor (); + int Size = m_Parameters("NODE_SIZE" )->asInt (); + // double dSize = m_Parameters("NODE_SCALE")->asDouble(); + + // if( dSize > 1.0 ) + // { + // size = (int)(20.0 * exp(-dSize * z)); + // } + + #pragma omp parallel for + for(int iNode=0; iNodeGet_Node_Count(); iNode++) + { + CSG_TIN_Node *pNode = m_pTIN->Get_Node(iNode); + TSG_Point_Z p; + + p.x = pNode->Get_Point().x; + p.y = pNode->Get_Point().y; + p.z = pNode->asDouble(zField); + + m_Projector.Get_Projection(p.x, p.y, p.z); + + Draw_Point(p.x, p.y, p.z, Color, Size); + } + } + + //----------------------------------------------------- + return( true ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +class C3D_Viewer_TIN_Dialog : public CSG_3DView_Dialog +{ +public: + C3D_Viewer_TIN_Dialog(CSG_TIN *pTIN, int Field_Z, int Field_Color, CSG_Grid *pDrape); + + virtual void Update_Controls (void); + + +protected: + + wxChoice *m_pField_Z, *m_pField_C; + +// wxCheckBox *m_pFaces, *m_pEdges, *m_pNodes; + + + virtual void On_Update_Choices (wxCommandEvent &event); +// virtual void On_Update_Control (wxCommandEvent &event); + + virtual void Set_Menu (wxMenu &Menu); + virtual void On_Menu (wxCommandEvent &event); + virtual void On_Menu_UI (wxUpdateUIEvent &event); + + +private: + + DECLARE_EVENT_TABLE() + +}; + +//--------------------------------------------------------- +BEGIN_EVENT_TABLE(C3D_Viewer_TIN_Dialog, CSG_3DView_Dialog) + EVT_CHOICE (wxID_ANY, C3D_Viewer_TIN_Dialog::On_Update_Choices) +// EVT_CHECKBOX (wxID_ANY, C3D_Viewer_TIN_Dialog::On_Update_Control) +END_EVENT_TABLE() + +//--------------------------------------------------------- +C3D_Viewer_TIN_Dialog::C3D_Viewer_TIN_Dialog(CSG_TIN *pTIN, int Field_Z, int Field_Color, CSG_Grid *pDrape) + : CSG_3DView_Dialog(_TL("TIN Viewer")) +{ + Create(new C3D_Viewer_TIN_Panel(this, pTIN, Field_Z, Field_Color, pDrape)); + + wxArrayString Attributes; + + for(int i=0; iGet_Field_Count(); i++) + { + Attributes.Add(pTIN->Get_Field_Name(i)); + } + + Add_Spacer(); + m_pField_Z = Add_Choice (_TL("Elevation"), Attributes, Field_Z); + m_pField_C = Add_Choice (_TL("Colour" ), Attributes, Field_Color); + +// Add_Spacer(); +// m_pFaces = Add_CheckBox(_TL("Faces"), m_pPanel->m_Parameters("DRAW_FACES")->asBool()); +// m_pEdges = Add_CheckBox(_TL("Edges"), m_pPanel->m_Parameters("DRAW_EDGES")->asBool()); +// m_pNodes = Add_CheckBox(_TL("Nodes"), m_pPanel->m_Parameters("DRAW_NODES")->asBool()); +} + +//--------------------------------------------------------- +void C3D_Viewer_TIN_Dialog::On_Update_Choices(wxCommandEvent &event) +{ + if( event.GetEventObject() == m_pField_Z ) + { + m_pPanel->m_Parameters("Z_ATTR")->Set_Value(m_pField_Z->GetSelection()); + m_pPanel->Update_View(true); + return; + } + + if( event.GetEventObject() == m_pField_C ) + { + m_pPanel->m_Parameters("COLORS_ATTR")->Set_Value(m_pField_C->GetSelection()); + m_pPanel->Update_View(true); + return; + } + + CSG_3DView_Dialog::On_Update_Choices(event); +} + +//--------------------------------------------------------- +//void C3D_Viewer_TIN_Dialog::On_Update_Control(wxCommandEvent &event) +//{ +// CHECKBOX_UPDATE(m_pFaces, "DRAW_FACES"); +// CHECKBOX_UPDATE(m_pEdges, "DRAW_EDGES"); +// CHECKBOX_UPDATE(m_pNodes, "DRAW_NODES"); + +// CSG_3DView_Dialog::On_Update_Control(event); +//} + +//--------------------------------------------------------- +void C3D_Viewer_TIN_Dialog::Update_Controls(void) +{ + m_pField_Z->SetSelection(m_pPanel->m_Parameters("Z_ATTR" )->asInt()); + m_pField_C->SetSelection(m_pPanel->m_Parameters("COLORS_ATTR")->asInt()); + +// m_pFaces->SetValue(m_pPanel->m_Parameters("DRAW_FACES")->asBool()); +// m_pEdges->SetValue(m_pPanel->m_Parameters("DRAW_EDGES")->asBool()); +// m_pNodes->SetValue(m_pPanel->m_Parameters("DRAW_NODES")->asBool()); + + CSG_3DView_Dialog::Update_Controls(); +} + +//--------------------------------------------------------- +enum +{ + MENU_SCALE_Z_DEC = MENU_USER_FIRST, + MENU_SCALE_Z_INC, + MENU_COLORS_GRAD, + MENU_SHADING, + MENU_FACES, + MENU_EDGES, + MENU_NODES +}; + +//--------------------------------------------------------- +void C3D_Viewer_TIN_Dialog::Set_Menu(wxMenu &Menu) +{ + wxMenu *pMenu = Menu.FindChildItem(Menu.FindItem(_TL("Display")))->GetSubMenu(); + + pMenu->AppendSeparator(); + pMenu->Append(MENU_SCALE_Z_DEC, _TL("Decrease Exaggeration [F1]")); + pMenu->Append(MENU_SCALE_Z_INC, _TL("Increase Exaggeration [F2]")); + + pMenu->AppendSeparator(); + pMenu->AppendCheckItem(MENU_COLORS_GRAD, _TL("Graduated Colours")); + + Menu.AppendSeparator(); + Menu.AppendCheckItem(MENU_SHADING, _TL("Shading")); + + Menu.AppendSeparator(); + Menu.AppendCheckItem(MENU_FACES, _TL("Faces")); + Menu.AppendCheckItem(MENU_EDGES, _TL("Edges")); + Menu.AppendCheckItem(MENU_NODES, _TL("Nodes")); +} + +//--------------------------------------------------------- +void C3D_Viewer_TIN_Dialog::On_Menu(wxCommandEvent &event) +{ + switch( event.GetId() ) + { + case MENU_SCALE_Z_DEC: m_pPanel->m_Parameters("Z_SCALE")->Set_Value(m_pPanel->m_Parameters("Z_SCALE")->asDouble() - 0.5); m_pPanel->Update_View(); return; + case MENU_SCALE_Z_INC: m_pPanel->m_Parameters("Z_SCALE")->Set_Value(m_pPanel->m_Parameters("Z_SCALE")->asDouble() + 0.5); m_pPanel->Update_View(); return; + + case MENU_COLORS_GRAD: MENU_TOGGLE("COLORS_GRAD"); return; + + case MENU_SHADING : MENU_TOGGLE("SHADING" ); return; + + case MENU_FACES : MENU_TOGGLE("DRAW_FACES" ); return; + case MENU_EDGES : MENU_TOGGLE("DRAW_EDGES" ); return; + case MENU_NODES : MENU_TOGGLE("DRAW_NODES" ); return; + } + + CSG_3DView_Dialog::On_Menu(event); +} + +//--------------------------------------------------------- +void C3D_Viewer_TIN_Dialog::On_Menu_UI(wxUpdateUIEvent &event) +{ + switch( event.GetId() ) + { + case MENU_COLORS_GRAD: event.Check(m_pPanel->m_Parameters("COLORS_GRAD")->asBool()); return; + + case MENU_SHADING : event.Check(m_pPanel->m_Parameters("SHADING" )->asBool()); return; + + case MENU_FACES : event.Check(m_pPanel->m_Parameters("DRAW_FACES" )->asBool()); return; + case MENU_EDGES : event.Check(m_pPanel->m_Parameters("DRAW_EDGES" )->asBool()); return; + case MENU_NODES : event.Check(m_pPanel->m_Parameters("DRAW_NODES" )->asBool()); return; + } + + CSG_3DView_Dialog::On_Menu_UI(event); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +C3D_Viewer_TIN::C3D_Viewer_TIN(void) +{ + //----------------------------------------------------- + Set_Name (_TL("TIN Viewer")); + + Set_Author ("O. Conrad (c) 2014"); + + Set_Description (_TW( + "3D viewer for TIN." + )); + + //----------------------------------------------------- + CSG_Parameter *pNode = Parameters.Add_TIN( + NULL , "TIN" , _TL("TIN"), + _TL(""), + PARAMETER_INPUT + ); + + Parameters.Add_Table_Field( + pNode , "HEIGHT" , _TL("Elevation"), + _TL("") + ); + + Parameters.Add_Table_Field( + pNode , "COLOR" , _TL("Color"), + _TL("") + ); + + Parameters.Add_Grid( + NULL , "DRAPE" , _TL("Map"), + _TL("rgb coded raster map to be draped"), + PARAMETER_INPUT_OPTIONAL + ); +} + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool C3D_Viewer_TIN::On_Execute(void) +{ + CSG_TIN *pTIN = Parameters("TIN")->asTIN(); + + if( !pTIN->is_Valid() ) + { + Error_Set(_TL("invalid input data")); + + return( false ); + } + + C3D_Viewer_TIN_Dialog dlg(pTIN, Parameters("HEIGHT")->asInt(), Parameters("COLOR")->asInt(), Parameters("DRAPE")->asGrid()); + + dlg.ShowModal(); + + return( true ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- diff -Nru saga-2.1.0+dfsg/src/modules/garden/garden_3d_viewer/3d_viewer_tin.h saga-2.1.4+dfsg/src/modules/garden/garden_3d_viewer/3d_viewer_tin.h --- saga-2.1.0+dfsg/src/modules/garden/garden_3d_viewer/3d_viewer_tin.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/garden/garden_3d_viewer/3d_viewer_tin.h 2014-11-13 08:32:19.000000000 +0000 @@ -0,0 +1,106 @@ +/********************************************************** + * Version $Id: 3d_viewer_tin.h 911 2011-02-14 16:38:15Z reklov_w $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// 3d_viewer // +// // +//-------------------------------------------------------// +// // +// 3d_viewer_tin.h // +// // +// Copyright (C) 2014 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Hamburg // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#ifndef HEADER_INCLUDED__3d_viewer_tin_H +#define HEADER_INCLUDED__3d_viewer_tin_H + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "MLB_Interface.h" + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +class C3D_Viewer_TIN : public CSG_Module +{ +public: + C3D_Viewer_TIN(void); + + virtual bool needs_GUI (void) { return( true ); } + + +protected: + + virtual bool On_Execute (void); + + +}; + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#endif // #ifndef HEADER_INCLUDED__3d_viewer_tin_H + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- diff -Nru saga-2.1.0+dfsg/src/modules/garden/garden_3d_viewer/Makefile.am saga-2.1.4+dfsg/src/modules/garden/garden_3d_viewer/Makefile.am --- saga-2.1.0+dfsg/src/modules/garden/garden_3d_viewer/Makefile.am 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/garden/garden_3d_viewer/Makefile.am 2014-11-13 08:32:19.000000000 +0000 @@ -0,0 +1,30 @@ +if DEBUG +DBGFLAGS = -g -DDEBUG +endif +if SAGA_UNICODE +DEP_DEFS = -fPIC `wx-config --unicode=yes --static=no --cxxflags` -D_SAGA_UNICODE $(DBGFLAGS) +DEP_LFLG = -fPIC -shared `wx-config --unicode=yes --static=no --libs` +else +DEP_DEFS = -fPIC `wx-config --unicode=no --static=no --cxxflags` $(DBGFLAGS) +DEP_LFLG = -fPIC -shared `wx-config --unicode=no --static=no --libs` +endif +DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD +CXX_INCS = -I$(top_srcdir)/src/saga_core +AM_CXXFLAGS = $(CXX_INCS) $(DEF_SAGA) $(DEP_DEFS) $(DBGFLAGS) $(GOMPFLAGS) +AM_LDFLAGS = $(DEP_LFLG) -avoid-version +pkglib_LTLIBRARIES = libgarden_3d_viewer.la +libgarden_3d_viewer_la_SOURCES =\ +MLB_Interface.cpp\ +3d_viewer_globe_grid.cpp\ +3d_viewer_multiple_grids.cpp\ +3d_viewer_pointcloud.cpp\ +3d_viewer_shapes.cpp\ +3d_viewer_tin.cpp\ +MLB_Interface.h\ +3d_viewer_globe_grid.h\ +3d_viewer_multiple_grids.h\ +3d_viewer_pointcloud.h\ +3d_viewer_shapes.h\ +3d_viewer_tin.h + +libgarden_3d_viewer_la_LIBADD = $(top_srcdir)/src/saga_core/saga_api/libsaga_api.la $(top_srcdir)/src/saga_core/saga_gdi/libsaga_gdi.la $(ADD_MLBS) diff -Nru saga-2.1.0+dfsg/src/modules/garden/garden_3d_viewer/Makefile.in saga-2.1.4+dfsg/src/modules/garden/garden_3d_viewer/Makefile.in --- saga-2.1.0+dfsg/src/modules/garden/garden_3d_viewer/Makefile.in 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/garden/garden_3d_viewer/Makefile.in 2014-11-13 08:33:29.000000000 +0000 @@ -0,0 +1,713 @@ +# Makefile.in generated by automake 1.14.1 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +subdir = src/modules/garden/garden_3d_viewer +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_postgresql.m4 \ + $(top_srcdir)/m4/ax_pkg_swig.m4 \ + $(top_srcdir)/m4/ax_python_devel.m4 \ + $(top_srcdir)/m4/ax_swig_enable_cxx.m4 \ + $(top_srcdir)/m4/ax_swig_python.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__installdirs = "$(DESTDIR)$(pkglibdir)" +LTLIBRARIES = $(pkglib_LTLIBRARIES) +libgarden_3d_viewer_la_DEPENDENCIES = \ + $(top_srcdir)/src/saga_core/saga_api/libsaga_api.la \ + $(top_srcdir)/src/saga_core/saga_gdi/libsaga_gdi.la +am_libgarden_3d_viewer_la_OBJECTS = MLB_Interface.lo \ + 3d_viewer_globe_grid.lo 3d_viewer_multiple_grids.lo \ + 3d_viewer_pointcloud.lo 3d_viewer_shapes.lo 3d_viewer_tin.lo +libgarden_3d_viewer_la_OBJECTS = $(am_libgarden_3d_viewer_la_OBJECTS) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) +depcomp = $(SHELL) $(top_srcdir)/depcomp +am__depfiles_maybe = depfiles +am__mv = mv -f +CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = +CXXLD = $(CXX) +CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = +CCLD = $(CC) +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = +SOURCES = $(libgarden_3d_viewer_la_SOURCES) +DIST_SOURCES = $(libgarden_3d_viewer_la_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +AX_SWIG_PYTHON_CPPFLAGS = @AX_SWIG_PYTHON_CPPFLAGS@ +AX_SWIG_PYTHON_OPT = @AX_SWIG_PYTHON_OPT@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DISABLELIBHARU = @DISABLELIBHARU@ +DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +FGREP = @FGREP@ +GOMPFLAGS = @GOMPFLAGS@ +GREP = @GREP@ +HARU_LIB = @HARU_LIB@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LOCAL_INCS = @LOCAL_INCS@ +LOCAL_LIBS = @LOCAL_LIBS@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ +MKDIR_P = @MKDIR_P@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PG_CONFIG = @PG_CONFIG@ +POSTGRESQL_CFLAGS = @POSTGRESQL_CFLAGS@ +POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@ +POSTGRESQL_VERSION = @POSTGRESQL_VERSION@ +POW_LIB = @POW_LIB@ +PYTHON = @PYTHON@ +PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ +PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ +PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ +PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_PLATFORM = @PYTHON_PLATFORM@ +PYTHON_PREFIX = @PYTHON_PREFIX@ +PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ +PYTHON_VERSION = @PYTHON_VERSION@ +RANLIB = @RANLIB@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +SWIG = @SWIG@ +SWIG_LIB = @SWIG_LIB@ +VERSION = @VERSION@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +pkgpyexecdir = @pkgpyexecdir@ +pkgpythondir = @pkgpythondir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +pyexecdir = @pyexecdir@ +pythondir = @pythondir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +@DEBUG_TRUE@DBGFLAGS = -g -DDEBUG +@SAGA_UNICODE_FALSE@DEP_DEFS = -fPIC `wx-config --unicode=no --static=no --cxxflags` $(DBGFLAGS) +@SAGA_UNICODE_TRUE@DEP_DEFS = -fPIC `wx-config --unicode=yes --static=no --cxxflags` -D_SAGA_UNICODE $(DBGFLAGS) +@SAGA_UNICODE_FALSE@DEP_LFLG = -fPIC -shared `wx-config --unicode=no --static=no --libs` +@SAGA_UNICODE_TRUE@DEP_LFLG = -fPIC -shared `wx-config --unicode=yes --static=no --libs` +DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD +CXX_INCS = -I$(top_srcdir)/src/saga_core +AM_CXXFLAGS = $(CXX_INCS) $(DEF_SAGA) $(DEP_DEFS) $(DBGFLAGS) $(GOMPFLAGS) +AM_LDFLAGS = $(DEP_LFLG) -avoid-version +pkglib_LTLIBRARIES = libgarden_3d_viewer.la +libgarden_3d_viewer_la_SOURCES = \ +MLB_Interface.cpp\ +3d_viewer_globe_grid.cpp\ +3d_viewer_multiple_grids.cpp\ +3d_viewer_pointcloud.cpp\ +3d_viewer_shapes.cpp\ +3d_viewer_tin.cpp\ +MLB_Interface.h\ +3d_viewer_globe_grid.h\ +3d_viewer_multiple_grids.h\ +3d_viewer_pointcloud.h\ +3d_viewer_shapes.h\ +3d_viewer_tin.h + +libgarden_3d_viewer_la_LIBADD = $(top_srcdir)/src/saga_core/saga_api/libsaga_api.la $(top_srcdir)/src/saga_core/saga_gdi/libsaga_gdi.la $(ADD_MLBS) +all: all-am + +.SUFFIXES: +.SUFFIXES: .cpp .lo .o .obj +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/modules/garden/garden_3d_viewer/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign src/modules/garden/garden_3d_viewer/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): + +install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) + @$(NORMAL_INSTALL) + @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ + list2=; for p in $$list; do \ + if test -f $$p; then \ + list2="$$list2 $$p"; \ + else :; fi; \ + done; \ + test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \ + } + +uninstall-pkglibLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ + for p in $$list; do \ + $(am__strip_dir) \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$f"; \ + done + +clean-pkglibLTLIBRARIES: + -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES) + @list='$(pkglib_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + +libgarden_3d_viewer.la: $(libgarden_3d_viewer_la_OBJECTS) $(libgarden_3d_viewer_la_DEPENDENCIES) $(EXTRA_libgarden_3d_viewer_la_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) -rpath $(pkglibdir) $(libgarden_3d_viewer_la_OBJECTS) $(libgarden_3d_viewer_la_LIBADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/3d_viewer_globe_grid.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/3d_viewer_multiple_grids.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/3d_viewer_pointcloud.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/3d_viewer_shapes.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/3d_viewer_tin.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MLB_Interface.Plo@am__quote@ + +.cpp.o: +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< + +.cpp.obj: +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + +.cpp.lo: +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + set x; \ + here=`pwd`; \ + $(am__define_uniq_tagged_files); \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ + fi +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ + test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(LTLIBRARIES) +installdirs: + for dir in "$(DESTDIR)$(pkglibdir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool clean-pkglibLTLIBRARIES \ + mostlyclean-am + +distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: install-pkglibLTLIBRARIES + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-pkglibLTLIBRARIES + +.MAKE: install-am install-strip + +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-pkglibLTLIBRARIES install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ + uninstall-pkglibLTLIBRARIES + + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nru saga-2.1.0+dfsg/src/modules/garden/garden_3d_viewer/MLB_Interface.cpp saga-2.1.4+dfsg/src/modules/garden/garden_3d_viewer/MLB_Interface.cpp --- saga-2.1.0+dfsg/src/modules/garden/garden_3d_viewer/MLB_Interface.cpp 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/garden/garden_3d_viewer/MLB_Interface.cpp 2014-11-13 08:32:19.000000000 +0000 @@ -0,0 +1,135 @@ +/********************************************************** + * Version $Id: MLB_Interface.cpp 911 2011-02-14 16:38:15Z reklov_w $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// 3d_viewer // +// // +//-------------------------------------------------------// +// // +// MLB_Interface.cpp // +// // +// Copyright (C) 2011 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute for Geography // +// University of Hamburg // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// The Module Link Library Interface // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +// 1. Include the appropriate SAGA-API header... + +#include "MLB_Interface.h" + + +//--------------------------------------------------------- +// 2. Place general module library informations here... + +CSG_String Get_Info(int i) +{ + switch( i ) + { + case MLB_INFO_Name: default: + return( _TL("3D Viewer") ); + + case MLB_INFO_Category: + return( _TL("Visualization") ); + + case MLB_INFO_Author: + return( SG_T("O.Conrad (c) 2014") ); + + case MLB_INFO_Description: + return( _TL("3D Viewer." )); + + case MLB_INFO_Version: + return( SG_T("1.0") ); + + case MLB_INFO_Menu_Path: + return( _TL("Visualization|3D Viewer" )); + } +} + + +//--------------------------------------------------------- +// 3. Include the headers of your modules here... + +#include "3d_viewer_tin.h" +#include "3d_viewer_pointcloud.h" +#include "3d_viewer_shapes.h" +#include "3d_viewer_globe_grid.h" +#include "3d_viewer_multiple_grids.h" + + +//--------------------------------------------------------- +// 4. Allow your modules to be created here... + +CSG_Module * Create_Module(int i) +{ + switch( i ) + { + case 0: return( new C3D_Viewer_TIN ); + case 1: return( new C3D_Viewer_PointCloud ); + case 2: return( new C3D_Viewer_Shapes ); + case 3: return( new C3D_Viewer_Globe_Grid ); + case 4: return( new C3D_Viewer_Multiple_Grids ); + + default: return( NULL ); +// default: return( MLB_INTERFACE_SKIP_MODULE ); + } +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +//{{AFX_SAGA + + MLB_INTERFACE + +//}}AFX_SAGA diff -Nru saga-2.1.0+dfsg/src/modules/garden/garden_3d_viewer/MLB_Interface.h saga-2.1.4+dfsg/src/modules/garden/garden_3d_viewer/MLB_Interface.h --- saga-2.1.0+dfsg/src/modules/garden/garden_3d_viewer/MLB_Interface.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/garden/garden_3d_viewer/MLB_Interface.h 2014-11-13 08:32:19.000000000 +0000 @@ -0,0 +1,83 @@ +/********************************************************** + * Version $Id: MLB_Interface.h 911 2011-02-14 16:38:15Z reklov_w $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// 3d_viewer // +// // +//-------------------------------------------------------// +// // +// MLB_Interface.h // +// // +// Copyright (C) 2014 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute for Geography // +// University of Hamburg // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// Include the SAGA-API here // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#ifndef HEADER_INCLUDED__pointcloud_viewer_mlb_H +#define HEADER_INCLUDED__pointcloud_viewer_mlb_H + +//--------------------------------------------------------- +#include + +//--------------------------------------------------------- +#ifdef pointcloud_viewer_EXPORTS + #define pointcloud_viewer_EXPORT _SAGA_DLL_EXPORT +#else + #define pointcloud_viewer_EXPORT _SAGA_DLL_IMPORT +#endif + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#endif // #ifndef HEADER_INCLUDED__pointcloud_viewer_mlb_H diff -Nru saga-2.1.0+dfsg/src/modules/garden/garden_fractals/Bifurcation.cpp saga-2.1.4+dfsg/src/modules/garden/garden_fractals/Bifurcation.cpp --- saga-2.1.0+dfsg/src/modules/garden/garden_fractals/Bifurcation.cpp 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/garden/garden_fractals/Bifurcation.cpp 2014-11-13 08:32:19.000000000 +0000 @@ -0,0 +1,149 @@ +/********************************************************** + * Version $Id: Bifurcation.cpp 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// Fractals // +// // +//-------------------------------------------------------// +// // +// Bifurcation.cpp // +// // +// Copyright (C) 2003 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Goettingen // +// Goldschmidtstr. 5 // +// 37077 Goettingen // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "Bifurcation.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +CBifurcation::CBifurcation(void) +{ + Set_Name(_TL("Bifurcation")); + + Set_Author (SG_T("(c) 2003 by O.Conrad")); + + Set_Description (_TW("Feigenbaum's Bifurcation")); + + Parameters.Add_Table( NULL, "TABLE" , _TL("Output") , _TL(""), PARAMETER_OUTPUT); + + Parameters.Add_Value( NULL, "ITERATIONS" , _TL("Value Count") , _TL(""), PARAMETER_TYPE_Int, 100); + Parameters.Add_Value( NULL, "NVALUES" , _TL("Value Count") , _TL("Number of the last x Iteration to be plotted."), PARAMETER_TYPE_Int, 8); + Parameters.Add_Value( NULL, "SEED" , _TL("Seed Value") , _TL(""), PARAMETER_TYPE_Double , 0.66, 0, true, 1.0, true); + Parameters.Add_Range( NULL, "RANGE" , _TL("Range") , _TL(""), 1.0, 4.0, 0.0, true, 4.0, true); + Parameters.Add_Value( NULL, "STEP" , _TL("Number of Steps") , _TL(""), PARAMETER_TYPE_Int , 1000, 2, true); + +} + +//--------------------------------------------------------- +CBifurcation::~CBifurcation(void) +{} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CBifurcation::On_Execute(void) +{ + int i; + double p, r, dr, max, min, seed, nValues, nPreIterations; + CSG_Table_Record *pRecord; + CSG_Table *pTable; + + nPreIterations = Parameters("ITERATIONS")->asInt(); + nValues = Parameters("NVALUES")->asInt(); + seed = Parameters("SEED")->asDouble(); + min = Parameters("RANGE")->asRange()->Get_LoVal(); + max = Parameters("RANGE")->asRange()->Get_HiVal(); + dr = (max - min) / 1000.0; + + pTable = Parameters("TABLE")->asTable(); + pTable->Destroy(); + pTable->Set_Name(_TL("Feigenbaum's Bifurcation")); + + pTable->Add_Field("Growth" , SG_DATATYPE_Double); + + for(i=0; iAdd_Field(CSG_String::Format(SG_T("VALUE_%d"), i + 1), SG_DATATYPE_Double); + } + + for(r=min; r<=max; r+=dr) + { + pRecord = pTable->Add_Record(); + pRecord->Set_Value(0, r); + + p = seed; + + for(i=0; iSet_Value(i + 1, p); + } + } + + return( true ); +} diff -Nru saga-2.1.0+dfsg/src/modules/garden/garden_fractals/Bifurcation.h saga-2.1.4+dfsg/src/modules/garden/garden_fractals/Bifurcation.h --- saga-2.1.0+dfsg/src/modules/garden/garden_fractals/Bifurcation.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/garden/garden_fractals/Bifurcation.h 2014-11-13 08:32:19.000000000 +0000 @@ -0,0 +1,96 @@ +/********************************************************** + * Version $Id: Bifurcation.h 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// Fractals // +// // +//-------------------------------------------------------// +// // +// Bifurcation.h // +// // +// Copyright (C) 2003 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Goettingen // +// Goldschmidtstr. 5 // +// 37077 Goettingen // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#ifndef HEADER_INCLUDED__BIFURCATION_H +#define HEADER_INCLUDED__BIFURCATION_H + + + +//--------------------------------------------------------- +#include "MLB_Interface.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +class CBifurcation : public CSG_Module +{ +public: + CBifurcation(void); + virtual ~CBifurcation(void); + + +protected: + + virtual bool On_Execute(void); + + +private: + +}; + +#endif // #ifndef HEADER_INCLUDED__BIFURCATION_H diff -Nru saga-2.1.0+dfsg/src/modules/garden/garden_fractals/Gaussian_Landscapes.cpp saga-2.1.4+dfsg/src/modules/garden/garden_fractals/Gaussian_Landscapes.cpp --- saga-2.1.0+dfsg/src/modules/garden/garden_fractals/Gaussian_Landscapes.cpp 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/garden/garden_fractals/Gaussian_Landscapes.cpp 2014-11-13 08:32:19.000000000 +0000 @@ -0,0 +1,252 @@ +/********************************************************** + * Version $Id: Gaussian_Landscapes.cpp 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// Fractals // +// // +//-------------------------------------------------------// +// // +// Gaussian_Landscapes.cpp // +// // +// Copyright (C) 2005 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Goettingen // +// Goldschmidtstr. 5 // +// 37077 Goettingen // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "Gaussian_Landscapes.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#define RANDOM(x) (rand() % x) +#define RANDOMIZE() (srand((unsigned int)time(NULL))) + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +CGaussian_Landscapes::CGaussian_Landscapes(void) +{ + //----------------------------------------------------- + // 1. Info... + + Set_Name(_TL("Gaussian Landscapes")); + + Set_Author (SG_T("(c) 2005 by O.Conrad")); + + Set_Description (_TW( + "Generates Gaussian landscapes.\n\n" + "References:\n" + "- Halling, H., Moeller, R. (1995): 'Mathematik fuers Auge', Heidelberg, 144p.\n" + "- Mandelbrot, B.B. (1983): 'The Fractal Geometry of Nature', New York, 490p.\n") + ); + + + //----------------------------------------------------- + // 2. Grids... + + Parameters.Add_Grid_Output( + NULL , "GRID" , _TL("Grid"), + _TL("") + ); + + Parameters.Add_Value( + NULL , "NX" , _TL("Width (Cells)"), + _TL(""), + PARAMETER_TYPE_Int, 100, 1, true + ); + + Parameters.Add_Value( + NULL , "NY" , _TL("Height (Cells)"), + _TL(""), + PARAMETER_TYPE_Int, 100, 1, true + ); + + Parameters.Add_Value( + NULL , "H" , _TL("Roughness/Smoothness"), + _TL(""), + PARAMETER_TYPE_Double, 0.75, 0.0, true, 1.0, true + ); + + Parameters.Add_Choice( + NULL , "METHOD" , _TL("Method"), + _TL(""), + + CSG_String::Format(SG_T("%s|%s|"), + _TL("Simple"), + _TL("Flattening") + ), 0 + ); + + Parameters.Add_Value( + NULL , "M" , _TL("Flattening"), + _TL(""), + PARAMETER_TYPE_Double, 2.0 + ); +} + +//--------------------------------------------------------- +CGaussian_Landscapes::~CGaussian_Landscapes(void) +{} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CGaussian_Landscapes::On_Execute(void) +{ + int nx, ny, n; + double h, s, r; + + //----------------------------------------------------- + nx = Parameters("NX")->asInt(); + ny = Parameters("NY")->asInt(); + + m_pGrid = SG_Create_Grid(SG_DATATYPE_Float, nx, ny, 1.0, 0.0, 0.0); + m_pGrid->Set_Name(_TL("Gaussian Landscape")); + m_pGrid->Assign_NoData(); + Parameters("GRID")->Set_Value(m_pGrid); + + m_Method = Parameters("METHOD") ->asInt(); + m_M = Parameters("M") ->asDouble(); + + //----------------------------------------------------- + nx = nx > ny ? nx : ny; + ny = 1; + do { n = (int)pow(2.0, ny++); } while( n < nx ); + + h = Parameters("H") ->asDouble(); + r = 1.0 / pow(2.0, h); + s = n * r; + + //----------------------------------------------------- + Set_Values(0, 0, n, n, 0.0, 0.0, 0.0, 0.0, s, r); + + //----------------------------------------------------- + return( true ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +inline void CGaussian_Landscapes::Set_Value(int x, int y, double Value) +{ + if( m_pGrid->is_InGrid(x, y, false) ) + { + switch( m_Method ) + { + case 0: default: + m_pGrid->Set_Value(x, y, Value); + break; + + case 1: + m_pGrid->Set_Value(x, y, pow(Value, m_M)); + break; + } + } +} + +//--------------------------------------------------------- +void CGaussian_Landscapes::Set_Values(int x_0, int y_0, int x_1, int y_1, double z_00, double z_10, double z_11, double z_01, double s, double r) +{ + int x_n, y_n; + double z_n, z_n1, z_n2, z_n3, z_n4; + + //----------------------------------------------------- + x_n = (x_0 + x_1) / 2; + y_n = (y_0 + y_1) / 2; + z_n = (z_00 + z_10 + z_11 + z_01) / 4.0 + s * (double)(RANDOM(17) - 8) / 8.0; + + Set_Value(x_n, y_n, z_n); + + //----------------------------------------------------- + if( x_0 != x_n && x_n != x_1 ) + { + z_n1 = (z_00 + z_10) / 2.0; + z_n2 = (z_10 + z_11) / 2.0; + z_n3 = (z_11 + z_01) / 2.0; + z_n4 = (z_01 + z_00) / 2.0; + + s *= r; + + Set_Values(x_n, y_0, x_1, y_n, z_n1, z_10, z_n2, z_n , s, r); + Set_Values(x_0, y_0, x_n, y_n, z_00, z_n1, z_n , z_n4, s, r); + Set_Values(x_n, y_n, x_1, y_1, z_n , z_n2, z_11, z_n3, s, r); + Set_Values(x_0, y_n, x_n, y_1, z_n4, z_n , z_n3, z_01, s, r); + } +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- diff -Nru saga-2.1.0+dfsg/src/modules/garden/garden_fractals/Gaussian_Landscapes.h saga-2.1.4+dfsg/src/modules/garden/garden_fractals/Gaussian_Landscapes.h --- saga-2.1.0+dfsg/src/modules/garden/garden_fractals/Gaussian_Landscapes.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/garden/garden_fractals/Gaussian_Landscapes.h 2014-11-13 08:32:19.000000000 +0000 @@ -0,0 +1,112 @@ +/********************************************************** + * Version $Id: Gaussian_Landscapes.h 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// Fractals // +// // +//-------------------------------------------------------// +// // +// Gaussian_Landscapes.h // +// // +// Copyright (C) 2005 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Goettingen // +// Goldschmidtstr. 5 // +// 37077 Goettingen // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#ifndef HEADER_INCLUDED__Gaussian_Landscapes_H +#define HEADER_INCLUDED__Gaussian_Landscapes_H + +//--------------------------------------------------------- +#include "MLB_Interface.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +class CGaussian_Landscapes : public CSG_Module +{ +public: + CGaussian_Landscapes(void); + virtual ~CGaussian_Landscapes(void); + + +protected: + + virtual bool On_Execute (void); + + +private: + + int m_Method; + + double m_M; + + CSG_Grid *m_pGrid; + + + void Set_Value (int x, int y, double Value); + void Set_Values (int x_0, int y_0, int x_1, int y_1, double z_00, double z_10, double z_11, double z_01, double s, double r); + +}; + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#endif // #ifndef HEADER_INCLUDED__Gaussian_Landscapes_H diff -Nru saga-2.1.0+dfsg/src/modules/garden/garden_fractals/Grid_FractalDimension.cpp saga-2.1.4+dfsg/src/modules/garden/garden_fractals/Grid_FractalDimension.cpp --- saga-2.1.0+dfsg/src/modules/garden/garden_fractals/Grid_FractalDimension.cpp 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/garden/garden_fractals/Grid_FractalDimension.cpp 2014-11-13 08:32:19.000000000 +0000 @@ -0,0 +1,205 @@ +/********************************************************** + * Version $Id: Grid_FractalDimension.cpp 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// Fractals // +// // +//-------------------------------------------------------// +// // +// Grid_FractalDimension.cpp // +// // +// Copyright (C) 2003 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Goettingen // +// Goldschmidtstr. 5 // +// 37077 Goettingen // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "Grid_FractalDimension.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +CGrid_FractalDimension::CGrid_FractalDimension(void) +{ + Set_Name (_TL("Fractal Dimension of Grid Surface")); + + Set_Author (SG_T("O.Conrad (c) 2001")); + + Set_Description (_TW( + "Calculates surface areas for increasing mesh sizes.") + ); + + Parameters.Add_Grid (NULL, "INPUT" , _TL("Input") , _TL(""), PARAMETER_INPUT); + Parameters.Add_Table(NULL, "RESULT", _TL("Result"), _TL(""), PARAMETER_OUTPUT); + Parameters.Add_Value(NULL, "DSIZE" , _TL("Scale" ), _TL(""), PARAMETER_TYPE_Double, 1.5, 1.0001, true); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CGrid_FractalDimension::On_Execute(void) +{ + double maxSize, dSize; + CSG_Grid *pGrid; + CSG_Table *pTable; + + //----------------------------------------------------- + pGrid = Parameters("INPUT" )->asGrid(); + pTable = Parameters("RESULT")->asTable(); + + pTable->Destroy(); + pTable->Set_Name(_TL("Fractal Dimension")); + + pTable->Add_Field(SG_T("CLASS" ), SG_DATATYPE_Int); + pTable->Add_Field(SG_T("SCALE" ), SG_DATATYPE_Double); + pTable->Add_Field(SG_T("BASAL" ), SG_DATATYPE_Double); + pTable->Add_Field(SG_T("SURFACE"), SG_DATATYPE_Double); + pTable->Add_Field(SG_T("RATIO" ), SG_DATATYPE_Double); + pTable->Add_Field(SG_T("CHANGE" ), SG_DATATYPE_Double); + + //----------------------------------------------------- + Get_Area(pGrid, pTable); + + maxSize = 0.5 * (pGrid->Get_XRange() > pGrid->Get_YRange() ? pGrid->Get_XRange() : pGrid->Get_YRange()); + dSize = Parameters("DSIZE")->asDouble(); + + for(double Cellsize=dSize*pGrid->Get_Cellsize(); CellsizeGet_XMin(true), pGrid->Get_YMin(true), + pGrid->Get_XMax(true), pGrid->Get_YMax(true) + )); + + g.Assign(pGrid, GRID_INTERPOLATION_BSpline); + + Get_Area(&g, pTable); + + Set_Show_Progress(true); + } + + //----------------------------------------------------- + return( true ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +void CGrid_FractalDimension::Get_Area(CSG_Grid *pGrid, CSG_Table *pTable) +{ + double scale = pGrid->Get_Cellsize(); + CSG_Grid g; + + if( !Get_System()->is_Equal(pGrid->Get_System()) ) + { + g.Create(*Get_System()); + g.Assign(pGrid, GRID_INTERPOLATION_BSpline); + pGrid = &g; + } + + double basal = 0.0; + double surface = 0.0; + + for(int y=0; yGet_NY() && Process_Get_Okay(); y++) + { + for(int x=0; xGet_NX(); x++) + { + double s, a; + + if( pGrid->Get_Gradient(x, y, s, a) ) + { + basal += pGrid->Get_Cellarea(); + surface += pGrid->Get_Cellarea() / cos(s); + } + } + } + + //----------------------------------------------------- + if( basal > 0.0 ) + { + CSG_Table_Record *pRecord = pTable->Add_Record(); + + pRecord->Set_Value(0, pTable->Get_Count()); // CLASS + pRecord->Set_Value(1, scale); // SCALE + pRecord->Set_Value(2, basal); // BASAL + pRecord->Set_Value(3, surface); // SURFACE + pRecord->Set_Value(4, surface / basal); // RATIO + + if( (pRecord = pTable->Get_Record(pTable->Get_Count() - 2)) != NULL ) + { + pRecord->Set_Value(5, pRecord->asDouble(3) - surface); // CHANGE + } + } +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- diff -Nru saga-2.1.0+dfsg/src/modules/garden/garden_fractals/Grid_FractalDimension.h saga-2.1.4+dfsg/src/modules/garden/garden_fractals/Grid_FractalDimension.h --- saga-2.1.0+dfsg/src/modules/garden/garden_fractals/Grid_FractalDimension.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/garden/garden_fractals/Grid_FractalDimension.h 2014-11-13 08:32:19.000000000 +0000 @@ -0,0 +1,108 @@ +/********************************************************** + * Version $Id: Grid_FractalDimension.h 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// Fractals // +// // +//-------------------------------------------------------// +// // +// Grid_FractalDimension.h // +// // +// Copyright (C) 2003 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Goettingen // +// Goldschmidtstr. 5 // +// 37077 Goettingen // +// Germany // +// // +/////////////////////////////////////////////////////////// + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#ifndef HEADER_INCLUDED__GC_MEASUREFRACTDIM_H +#define HEADER_INCLUDED__GC_MEASUREFRACTDIM_H + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "MLB_Interface.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +class CGrid_FractalDimension : public CSG_Module_Grid +{ +public: + CGrid_FractalDimension(void); + + +protected: + + virtual bool On_Execute (void); + + +private: + + void Get_Area (CSG_Grid *pGrid, CSG_Table *pTable); + +}; + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#endif // #ifndef HEADER_INCLUDED__GC_MEASUREFRACTDIM_H diff -Nru saga-2.1.0+dfsg/src/modules/garden/garden_fractals/Makefile.am saga-2.1.4+dfsg/src/modules/garden/garden_fractals/Makefile.am --- saga-2.1.0+dfsg/src/modules/garden/garden_fractals/Makefile.am 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/garden/garden_fractals/Makefile.am 2014-11-13 08:32:19.000000000 +0000 @@ -0,0 +1,32 @@ +# +# $Id: Makefile.am 1277 2011-12-22 15:48:59Z reklov_w $ +# +if DEBUG +DBGFLAGS = -g -DDEBUG +endif +if SAGA_UNICODE +UC_DEFS = -D_SAGA_UNICODE +endif +DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD +CXX_INCS = -I$(top_srcdir)/src/saga_core +AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS) +AM_LDFLAGS = -fPIC -shared -avoid-version +pkglib_LTLIBRARIES = libgarden_fractals.la +libgarden_fractals_la_SOURCES =\ +Bifurcation.cpp\ +Gaussian_Landscapes.cpp\ +Grid_FractalDimension.cpp\ +Mandelbrot.cpp\ +MLB_Interface.cpp\ +Newton.cpp\ +Pythagoras_Tree.cpp\ +Bifurcation.h\ +Gaussian_Landscapes.h\ +Grid_FractalDimension.h\ +Mandelbrot.h\ +MLB_Interface.h\ +Newton.h\ +Pythagoras_Tree.h + +libgarden_fractals_la_LIBADD = $(top_srcdir)/src/saga_core/saga_api/libsaga_api.la + diff -Nru saga-2.1.0+dfsg/src/modules/garden/garden_fractals/Makefile.in saga-2.1.4+dfsg/src/modules/garden/garden_fractals/Makefile.in --- saga-2.1.0+dfsg/src/modules/garden/garden_fractals/Makefile.in 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/garden/garden_fractals/Makefile.in 2014-11-13 08:33:30.000000000 +0000 @@ -0,0 +1,716 @@ +# Makefile.in generated by automake 1.14.1 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +subdir = src/modules/garden/garden_fractals +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_postgresql.m4 \ + $(top_srcdir)/m4/ax_pkg_swig.m4 \ + $(top_srcdir)/m4/ax_python_devel.m4 \ + $(top_srcdir)/m4/ax_swig_enable_cxx.m4 \ + $(top_srcdir)/m4/ax_swig_python.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__installdirs = "$(DESTDIR)$(pkglibdir)" +LTLIBRARIES = $(pkglib_LTLIBRARIES) +libgarden_fractals_la_DEPENDENCIES = \ + $(top_srcdir)/src/saga_core/saga_api/libsaga_api.la +am_libgarden_fractals_la_OBJECTS = Bifurcation.lo \ + Gaussian_Landscapes.lo Grid_FractalDimension.lo Mandelbrot.lo \ + MLB_Interface.lo Newton.lo Pythagoras_Tree.lo +libgarden_fractals_la_OBJECTS = $(am_libgarden_fractals_la_OBJECTS) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) +depcomp = $(SHELL) $(top_srcdir)/depcomp +am__depfiles_maybe = depfiles +am__mv = mv -f +CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = +CXXLD = $(CXX) +CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = +CCLD = $(CC) +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = +SOURCES = $(libgarden_fractals_la_SOURCES) +DIST_SOURCES = $(libgarden_fractals_la_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +AX_SWIG_PYTHON_CPPFLAGS = @AX_SWIG_PYTHON_CPPFLAGS@ +AX_SWIG_PYTHON_OPT = @AX_SWIG_PYTHON_OPT@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DISABLELIBHARU = @DISABLELIBHARU@ +DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +FGREP = @FGREP@ +GOMPFLAGS = @GOMPFLAGS@ +GREP = @GREP@ +HARU_LIB = @HARU_LIB@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LOCAL_INCS = @LOCAL_INCS@ +LOCAL_LIBS = @LOCAL_LIBS@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ +MKDIR_P = @MKDIR_P@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PG_CONFIG = @PG_CONFIG@ +POSTGRESQL_CFLAGS = @POSTGRESQL_CFLAGS@ +POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@ +POSTGRESQL_VERSION = @POSTGRESQL_VERSION@ +POW_LIB = @POW_LIB@ +PYTHON = @PYTHON@ +PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ +PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ +PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ +PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_PLATFORM = @PYTHON_PLATFORM@ +PYTHON_PREFIX = @PYTHON_PREFIX@ +PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ +PYTHON_VERSION = @PYTHON_VERSION@ +RANLIB = @RANLIB@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +SWIG = @SWIG@ +SWIG_LIB = @SWIG_LIB@ +VERSION = @VERSION@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +pkgpyexecdir = @pkgpyexecdir@ +pkgpythondir = @pkgpythondir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +pyexecdir = @pyexecdir@ +pythondir = @pythondir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ + +# +# $Id: Makefile.am 1277 2011-12-22 15:48:59Z reklov_w $ +# +@DEBUG_TRUE@DBGFLAGS = -g -DDEBUG +@SAGA_UNICODE_TRUE@UC_DEFS = -D_SAGA_UNICODE +DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD +CXX_INCS = -I$(top_srcdir)/src/saga_core +AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS) +AM_LDFLAGS = -fPIC -shared -avoid-version +pkglib_LTLIBRARIES = libgarden_fractals.la +libgarden_fractals_la_SOURCES = \ +Bifurcation.cpp\ +Gaussian_Landscapes.cpp\ +Grid_FractalDimension.cpp\ +Mandelbrot.cpp\ +MLB_Interface.cpp\ +Newton.cpp\ +Pythagoras_Tree.cpp\ +Bifurcation.h\ +Gaussian_Landscapes.h\ +Grid_FractalDimension.h\ +Mandelbrot.h\ +MLB_Interface.h\ +Newton.h\ +Pythagoras_Tree.h + +libgarden_fractals_la_LIBADD = $(top_srcdir)/src/saga_core/saga_api/libsaga_api.la +all: all-am + +.SUFFIXES: +.SUFFIXES: .cpp .lo .o .obj +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/modules/garden/garden_fractals/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign src/modules/garden/garden_fractals/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): + +install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) + @$(NORMAL_INSTALL) + @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ + list2=; for p in $$list; do \ + if test -f $$p; then \ + list2="$$list2 $$p"; \ + else :; fi; \ + done; \ + test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \ + } + +uninstall-pkglibLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ + for p in $$list; do \ + $(am__strip_dir) \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$f"; \ + done + +clean-pkglibLTLIBRARIES: + -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES) + @list='$(pkglib_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + +libgarden_fractals.la: $(libgarden_fractals_la_OBJECTS) $(libgarden_fractals_la_DEPENDENCIES) $(EXTRA_libgarden_fractals_la_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) -rpath $(pkglibdir) $(libgarden_fractals_la_OBJECTS) $(libgarden_fractals_la_LIBADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Bifurcation.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Gaussian_Landscapes.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Grid_FractalDimension.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MLB_Interface.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Mandelbrot.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Newton.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Pythagoras_Tree.Plo@am__quote@ + +.cpp.o: +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< + +.cpp.obj: +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + +.cpp.lo: +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + set x; \ + here=`pwd`; \ + $(am__define_uniq_tagged_files); \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ + fi +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ + test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(LTLIBRARIES) +installdirs: + for dir in "$(DESTDIR)$(pkglibdir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool clean-pkglibLTLIBRARIES \ + mostlyclean-am + +distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: install-pkglibLTLIBRARIES + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-pkglibLTLIBRARIES + +.MAKE: install-am install-strip + +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-pkglibLTLIBRARIES install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ + uninstall-pkglibLTLIBRARIES + + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nru saga-2.1.0+dfsg/src/modules/garden/garden_fractals/Mandelbrot.cpp saga-2.1.4+dfsg/src/modules/garden/garden_fractals/Mandelbrot.cpp --- saga-2.1.0+dfsg/src/modules/garden/garden_fractals/Mandelbrot.cpp 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/garden/garden_fractals/Mandelbrot.cpp 2014-11-13 08:32:19.000000000 +0000 @@ -0,0 +1,350 @@ +/********************************************************** + * Version $Id: Mandelbrot.cpp 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// Fractals // +// // +//-------------------------------------------------------// +// // +// Mandelbrot.cpp // +// // +// Copyright (C) 2003 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Goettingen // +// Goldschmidtstr. 5 // +// 37077 Goettingen // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "Mandelbrot.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +CMandelbrot::CMandelbrot(void) +{ + //----------------------------------------------------- + // 1. Info... + + Set_Name(_TL("Mandelbrot Set")); + + Set_Author (SG_T("(c) 2001 by O.Conrad")); + + Set_Description (_TW( + "Calculates Mandelbrot and Julia sets.\n\n" + "References:\n" + "- Mandelbrot, B.B. (1983): 'The Fractal Geometry of Nature', New York, 490p.\n") + ); + + + //----------------------------------------------------- + // 2. Grids... + + Parameters.Add_Grid_Output( + NULL , "GRID" , _TL("Grid"), + _TL("") + ); + + Parameters.Add_Value( + NULL , "NX" , _TL("Width (Cells)"), + _TL(""), + PARAMETER_TYPE_Int, 100, 1, true + ); + + Parameters.Add_Value( + NULL , "NY" , _TL("Height (Cells)"), + _TL(""), PARAMETER_TYPE_Int, 100, 1, true + ); + + Parameters.Add_Range( + NULL , "XRANGE" , _TL("X-Range"), + _TL(""), -2.0, 1.0 + ); + + Parameters.Add_Range( + NULL , "YRANGE" , _TL("Y-Range"), + _TL(""), + -1.5, 1.5 + ); + + Parameters.Add_Value( + NULL , "JULIA_X" , _TL("Julia - X"), + _TL(""), PARAMETER_TYPE_Double, -0.7 + ); + + Parameters.Add_Value( + NULL , "JULIA_Y" , _TL("Julia - Y"), + _TL(""), PARAMETER_TYPE_Double, 0.3 + ); + + Parameters.Add_Value( + NULL , "MAXITER" , _TL("Maximum Iterations"), + _TL(""), + PARAMETER_TYPE_Int, 300, 1, true + ); + + Parameters.Add_Choice( + NULL , "METHOD" , _TL("Fractal Type"), + _TL(""), + + CSG_String::Format(SG_T("%s|%s|"), + _TL("Mandelbrot"), + _TL("Julia") + ), 0 + ); +} + +//--------------------------------------------------------- +CMandelbrot::~CMandelbrot(void) +{} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CMandelbrot::On_Execute(void) +{ + //----------------------------------------------------- + m_Extent.Assign( + Parameters("XRANGE")->asRange()->Get_LoVal(), + Parameters("YRANGE")->asRange()->Get_LoVal(), + Parameters("XRANGE")->asRange()->Get_HiVal(), + Parameters("YRANGE")->asRange()->Get_HiVal() + ); + + m_maxIterations = Parameters("MAXITER") ->asInt(); + m_maxDistance = 4.0; + + m_Method = Parameters("METHOD") ->asInt(); + + m_xJulia = Parameters("JULIA_X") ->asDouble(); + m_yJulia = Parameters("JULIA_Y") ->asDouble(); + + m_pGrid = SG_Create_Grid(SG_DATATYPE_Int, Parameters("NX")->asInt(), Parameters("NY")->asInt()); + m_pGrid->Set_Name(m_Method == 0 ? _TL("Mandelbrot Set") : _TL("Julia Set")); + Parameters("GRID")->Set_Value(m_pGrid); + + //----------------------------------------------------- + Calculate(); + + //----------------------------------------------------- + return( true ); +} + +//--------------------------------------------------------- +#define GET_POS(p) p.Assign(\ + m_Extent.Get_XMin() + m_Extent.Get_XRange() * (ptWorld.Get_X() - m_pGrid->Get_XMin()) / m_pGrid->Get_XRange(),\ + m_Extent.Get_YMin() + m_Extent.Get_YRange() * (ptWorld.Get_Y() - m_pGrid->Get_YMin()) / m_pGrid->Get_YRange()); + +#define SET_POS(a, b) if( a.Get_X() > b.Get_X() ) { d = a.Get_X(); a.Set_X(b.Get_X()); b.Set_X(d); }\ + if( a.Get_Y() > b.Get_Y() ) { d = a.Get_Y(); a.Set_Y(b.Get_Y()); b.Set_Y(d); } + +//--------------------------------------------------------- +bool CMandelbrot::On_Execute_Position(CSG_Point ptWorld, TSG_Module_Interactive_Mode Mode) +{ + double d; + + switch( Mode ) + { + default: + break; + + case MODULE_INTERACTIVE_LDOWN: + case MODULE_INTERACTIVE_RDOWN: + GET_POS(m_Down); + + return( true ); + + case MODULE_INTERACTIVE_LUP: + GET_POS(m_Up); + SET_POS(m_Up, m_Down); + + if( m_Up.Get_X() >= m_Down.Get_X() || m_Up.Get_Y() >= m_Down.Get_Y() ) + { + m_Extent.Inflate(50.0); + m_Extent.Move(m_Up - m_Extent.Get_Center()); + } + else + { + m_Extent.Assign(m_Up, m_Down); + } + + Calculate(); + + return( true ); + + case MODULE_INTERACTIVE_RUP: + GET_POS(m_Up); + SET_POS(m_Up, m_Down); + + if( m_Up.Get_X() >= m_Down.Get_X() || m_Up.Get_Y() >= m_Down.Get_Y() ) + { + m_Extent.Deflate(50.0); + m_Extent.Move(m_Up - m_Extent.Get_Center()); + } + else + { + m_Extent.Deflate(100.0 * (m_Down.Get_X() - m_Up.Get_X()) / m_Extent.Get_XRange()); + m_Extent.Move(m_Up - m_Extent.Get_Center()); + } + + Calculate(); + + return( true ); + } + + return( false ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +void CMandelbrot::Calculate(void) +{ + int x, y, i; + double xPos, yPos, dx, dy; + + dx = m_Extent.Get_XRange() / (m_pGrid->Get_NX() - 1.0); + dy = m_Extent.Get_YRange() / (m_pGrid->Get_NY() - 1.0); + + for(y=0, yPos=m_Extent.Get_YMin(); yGet_NY() && Set_Progress(y, m_pGrid->Get_NY()); y++, yPos+=dy) + { + for(x=0, xPos=m_Extent.Get_XMin(); xGet_NX(); x++, xPos+=dx) + { + switch( m_Method ) + { + default: + case 0: i = Get_Mandelbrot (xPos, yPos); break; + case 1: i = Get_Julia (xPos, yPos); break; + } + + if( i >= m_maxIterations ) + { + m_pGrid->Set_NoData(x, y); + } + else + { + m_pGrid->Set_Value(x, y, i); + } + } + } + + DataObject_Update(m_pGrid, true); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +int CMandelbrot::Get_Mandelbrot(double xPos, double yPos) +{ + int i; + double x, y, k; + + for(i=0, x=0.0, y=0.0; i + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#endif // #ifndef HEADER_INCLUDED__garden_fractals_H diff -Nru saga-2.1.0+dfsg/src/modules/garden/garden_fractals/Newton.cpp saga-2.1.4+dfsg/src/modules/garden/garden_fractals/Newton.cpp --- saga-2.1.0+dfsg/src/modules/garden/garden_fractals/Newton.cpp 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/garden/garden_fractals/Newton.cpp 2014-11-13 08:32:19.000000000 +0000 @@ -0,0 +1,310 @@ +/********************************************************** + * Version $Id: Newton.cpp 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library // +// // +// $$modul$$ // +// // +//-------------------------------------------------------// +// // +// Newton.cpp // +// // +// Copyright (C) 2003 Your Name // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: your@e-mail.abc // +// // +// contact: Your Name // +// And Address // +// // +/////////////////////////////////////////////////////////// + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#pragma warning(disable: 4275) + +#include "Newton.h" +#include + +using namespace std; + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +CNewton::CNewton(void) +{ + //----------------------------------------------------- + // Place information about your module here... + + Set_Name(_TL("Newton-Raphson")); + + Set_Author(_TL("Copyrights (c) 2003 by Andre Ringeler")); + + Set_Description (_TW( + "Newton-Raphson Fractals") + ); + + + //----------------------------------------------------- + Parameters.Add_Grid_Output( + NULL , "RESULT" , _TL("Result"), + _TL("") + ); + + Parameters.Add_Grid_Output( + NULL , "SHADE" , _TL("Shade"), + _TL("") + ); + + Parameters.Add_Value( NULL , "NX" , _TL("Width (Cells)") , _TL(""), PARAMETER_TYPE_Int, 400, 1, true); + Parameters.Add_Value( NULL , "NY" , _TL("Height (Cells)") , _TL(""), PARAMETER_TYPE_Int, 400, 1, true); + + Parameters.Add_Range( NULL , "XRANGE" , _TL("X-Range" ) , _TL(""), -2.0, 2.0); + Parameters.Add_Range( NULL , "YRANGE" , _TL("Y-Range" ) , _TL(""), -2.0, 2.0); + + Parameters.Add_Choice( NULL , "METHOD" , _TL("Equation") , _TL(""), + _TW("z^3-1|" + "z^4-1|" + "z^5-1|" + "z^6-1|" + "z^10 + 0.2 i * z^5 - 1|"), 0); + + //----------------------------------------------------- + Parameters.Add_Value( NULL, "MAXITER" , _TL("Max Iterations") , _TL("Maximum Iterations") , PARAMETER_TYPE_Double , 50); +} + +//--------------------------------------------------------- +CNewton::~CNewton(void) +{} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CNewton::On_Execute(void) +{ + int x, y; + + x = Parameters("NX")->asInt(); + xMin = Parameters("XRANGE")->asRange()->Get_LoVal(); + dx = xMax = Parameters("XRANGE")->asRange()->Get_HiVal(); + dx = (dx - xMin) / (x - 1.0); + + y = Parameters("NY")->asInt(); + yMin = Parameters("YRANGE")->asRange()->Get_LoVal(); + dy = yMax = Parameters("YRANGE")->asRange()->Get_HiVal(); + dy = (dy - yMin) / (y - 1.0); + + method = Parameters("METHOD")->asInt(); + + pResult = SG_Create_Grid(SG_DATATYPE_Double, x, y, dx, xMin, yMin); + pResult->Set_Name(_TL("Newton [A]")); + Parameters("RESULT")->Set_Value(pResult); + + pShade = SG_Create_Grid(SG_DATATYPE_Double, x, y, dx, xMin, yMin); + pShade->Set_Name(_TL("Newton [B]")); + Parameters("SHADE") ->Set_Value(pShade); + + Get_System()->Assign(pShade->Get_System()); + + //----------------------------------------------------- + iMax = Parameters("MAXITER")->asInt(); + + if( doNewton() ) + { + DataObject_Update(pResult, true); + DataObject_Update(pShade , true); + + return( true ); + } + + return( false ); +} + +bool CNewton::doNewton() +{ + int x, y, n; + double i, r; + complex z , old; + + + for(y=0; y::real(double&)' +// error: candidates are: double std::complex::real() const +#ifdef _SAGA_VC + z.real(r); + z.imag(i); +#endif + + for (n = 0 ;n< iMax; n++) + { + old = z; + switch( method ) + { + case 0: default: + + + z = z - ( z * z * z- 1.0 ) / (3.0 * z *z); + break; + + + case 1: + + z = z - ( z * z * z * z- 1.0 ) / (4.0 * z * z *z); + break; + + case 2: + z = z - (z * z * z * z * z- 1.0 ) / (5.0 * z * z * z *z); + break; + + case 3: + // "z^10 + 0.2 i * z^5 - 1", 0); + { + complex z5; + + z5= z*z; z5= z5 * z5; + + z5= z5*z; + + z =z - (z5*z - 1.0 ) / ( 6.0 * z5); + + break; + } + + case 4: + { + + complex z9 , z4, wert(0,0.2); + z4 = z*z, z4= z4*z4; + z9 = z4*z4*z; + + z = z -(z9*z + wert * z4*z -1.0 ) / (10.0 * z9 + 5.0 * wert * z4); + } + + } + + if ( abs(old - z)< 0.05 ) break; + + } + + if(n < iMax ) + pResult->Set_Value(x, y, z.real()); + else + pResult->Set_NoData(x,y); + + pShade->Set_Value(x,y, exp (-(double) ((n - iMax/2)*(n - iMax/2))/(double)(iMax*iMax)) ); + } + } + + //----------------------------------------------------- + + return( true ); +} + + + +bool CNewton::On_Execute_Position(CSG_Point ptWorld, TSG_Module_Interactive_Mode Mode) +{ + //----------------------------------------------------- + if( Mode != MODULE_INTERACTIVE_LDOWN && Mode != MODULE_INTERACTIVE_RDOWN ) + { + return( false ); + } + + //----------------------------------------------------- + int ok = true; + + int x= Get_xGrid(); int y = Get_yGrid(); + + double xpos, ypos; + double deltax, deltay; + + xpos = (double ) x / Get_NX()*(xMax-xMin) + xMin; + + ypos = (double ) y / Get_NY()*(yMax-yMin) + yMin; + + deltax = (xMax-xMin); + + deltay = (yMax-yMin); + + if(Mode == MODULE_INTERACTIVE_LDOWN) + { + deltax/=4.0; + deltay/=4.0; + + xMin = xpos - deltax; + xMax = xpos + deltax; + + yMin = ypos - deltay; + yMax = ypos + deltay; + + } + + if(Mode == MODULE_INTERACTIVE_RDOWN) + { + + xMin = xpos - deltax; + xMax = xpos + deltax; + + yMin = ypos - deltay; + yMax = ypos + deltay; + + } + + doNewton(); + + DataObject_Update(pResult,pResult->Get_ZMin(), pResult->Get_ZMax()); + DataObject_Update(pShade ,pShade ->Get_ZMin(), pShade ->Get_ZMax()); + + return true; +} diff -Nru saga-2.1.0+dfsg/src/modules/garden/garden_fractals/Newton.h saga-2.1.4+dfsg/src/modules/garden/garden_fractals/Newton.h --- saga-2.1.0+dfsg/src/modules/garden/garden_fractals/Newton.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/garden/garden_fractals/Newton.h 2014-11-13 08:32:19.000000000 +0000 @@ -0,0 +1,96 @@ +/********************************************************** + * Version $Id: Newton.h 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library // +// // +// $$modul$$ // +// // +//-------------------------------------------------------// +// // +// Newton.h // +// // +// Copyright (C) 2003 Your Name // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: your@e-mail.abc // +// // +// contact: Your Name // +// And Address // +// // +/////////////////////////////////////////////////////////// + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#ifndef HEADER_INCLUDED__Newton_H +#define HEADER_INCLUDED__Newton_H + +//--------------------------------------------------------- +#include "MLB_Interface.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +class CNewton : public CSG_Module_Grid_Interactive +{ +public: + CNewton(void); + virtual ~CNewton(void); + + bool doNewton(); + +protected: + + virtual bool On_Execute(void); + virtual bool On_Execute_Position(CSG_Point ptWorld, TSG_Module_Interactive_Mode Mode); + + +private: + double xMin, xMax, yMin, yMax; + int iMax, method; + double dx, dy; + + + CSG_Grid *pResult, *pShade; + +}; + +#endif // #ifndef HEADER_INCLUDED__Newton_H diff -Nru saga-2.1.0+dfsg/src/modules/garden/garden_fractals/Pythagoras_Tree.cpp saga-2.1.4+dfsg/src/modules/garden/garden_fractals/Pythagoras_Tree.cpp --- saga-2.1.0+dfsg/src/modules/garden/garden_fractals/Pythagoras_Tree.cpp 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/garden/garden_fractals/Pythagoras_Tree.cpp 2014-11-13 08:32:19.000000000 +0000 @@ -0,0 +1,300 @@ +/********************************************************** + * Version $Id: Pythagoras_Tree.cpp 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// Fractals // +// // +//-------------------------------------------------------// +// // +// Pythagoras_Tree.cpp // +// // +// Copyright (C) 2003 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Goettingen // +// Goldschmidtstr. 5 // +// 37077 Goettingen // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "Pythagoras_Tree.h" +#include + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +CPythagoras_Tree::CPythagoras_Tree(void) +{ + CSG_Parameter *pNode; + + //----------------------------------------------------- + // 1. Info... + + Set_Name(_TL("Pythagoras' Tree")); + + Set_Author (SG_T("(c) 2001 by O.Conrad")); + + Set_Description (_TW("Pythagoras' Tree.")); + + + //----------------------------------------------------- + // 2. Grids... + + pNode = Parameters.Add_Shapes( + NULL , "RESULT" , _TL("Pythagoras' Tree"), + _TL(""), + PARAMETER_OUTPUT + ); + + Parameters.Add_Choice( + pNode , "TYPE" , _TL("Shape Type"), + _TL(""), + + CSG_String::Format(SG_T("%s|%s|"), + _TL("Lines"), + _TL("Polygons") + ), 1 + ); + + Parameters.Add_Value( + NULL , "ANGLE" , _TL("Angle [Degree]"), + _TL(""), + PARAMETER_TYPE_Double , 55.0, 0.0, true, 90.0, true + ); + + Parameters.Add_Value( + NULL , "MINSIZE" , _TL("Minimum Size [%]"), + _TL(""), + PARAMETER_TYPE_Double , 2.0, 0.001, true, 100.0, true + ); + + pNode = Parameters.Add_Choice( + NULL , "METHOD" , _TL("Method"), + _TL(""), + + CSG_String::Format(SG_T("%s|%s|%s|%s|"), + _TL("Fixed angle"), + _TL("Constant variation range"), + _TL("Low variation for low sizes"), + _TL("High variation for low sizes") + ), 0 + ); + + Parameters.Add_Range( + pNode , "VARRANGE" , _TL("Constant Variation Range [Degree]"), + _TL(""), + 0.0, 90.0, 0.0, true, 90.0, true + ); +} + +//--------------------------------------------------------- +CPythagoras_Tree::~CPythagoras_Tree(void) +{} + + +/////////////////////////////////////////////////////////// +// // +// Run // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CPythagoras_Tree::On_Execute(void) +{ + TSG_Point pt_A, pt_B; + + pShapes = Parameters("RESULT") ->asShapes(); + pShapes->Create(Parameters("TYPE")->asInt() == 0 ? SHAPE_TYPE_Line : SHAPE_TYPE_Polygon, _TL("Pythagoras' Tree")); + pShapes->Add_Field(_TL("Iteration") , SG_DATATYPE_Int); + pShapes->Add_Field(_TL("Size") , SG_DATATYPE_Double); + + Min_Size = Parameters("MINSIZE") ->asDouble() / 100.0; + + switch( (Method = Parameters("METHOD")->asInt()) ) + { + case 0: // Standard... + sin_Angle = sin(Parameters("ANGLE")->asDouble() * M_DEG_TO_RAD); + cos_Angle = cos(Parameters("ANGLE")->asDouble() * M_DEG_TO_RAD); + break; + + case 1: // Variation Range... + var_Min = Parameters("VARRANGE")->asRange()->Get_LoVal() * M_DEG_TO_RAD; + var_Range = Parameters("VARRANGE")->asRange()->Get_HiVal() * M_DEG_TO_RAD; + var_Range = (var_Range - var_Min) / (double)RAND_MAX; + break; + } + + srand((unsigned)time(NULL)); + + Iteration = 0; + + pt_A.x = 0.0; + pt_B.x = 1.0; + pt_A.y = pt_B.y = 0.0; + + Set_Quadrat(pt_A, pt_B); + + return( true ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +void CPythagoras_Tree::Set_Quadrat(TSG_Point pt_A0, TSG_Point pt_B0) +{ + double dx, dy; + TSG_Point pt_A1, pt_B1; + + if( Process_Get_Okay(false) ) + { + Iteration++; + + dx = pt_B0.x - pt_A0.x; + dy = pt_B0.y - pt_A0.y; + Size = sqrt(dx*dx + dy*dy); + + pt_A1.x = pt_A0.x - dy; + pt_A1.y = pt_A0.y + dx; + + pt_B1.x = pt_B0.x - dy; + pt_B1.y = pt_B0.y + dx; + + Add_Shape(pt_A0, pt_B0, pt_B1, pt_A1); + + if( Size > Min_Size ) + { + switch( Method ) + { + case 1: // Variation Range... + var_Angle = var_Min + (double)rand() * var_Range; + sin_Angle = sin(var_Angle); + cos_Angle = cos(var_Angle); + break; + + case 2: // High Variation for low sizes... + var_Range = Size * M_PI_090; + var_Angle = (M_PI_045 - var_Range / 2.0) + (double)rand() * var_Range / (double)RAND_MAX; + sin_Angle = sin(var_Angle); + cos_Angle = cos(var_Angle); + break; + + case 3: // Low Variation for low sizes... + var_Range = (1.0 - Size) * M_PI_090; + var_Angle = (M_PI_045 - var_Range / 2.0) + (double)rand() * var_Range / (double)RAND_MAX; + sin_Angle = sin(var_Angle); + cos_Angle = cos(var_Angle); + break; + } + + pt_A0.x = pt_A1.x + cos_Angle * (cos_Angle * dx - sin_Angle * dy); + pt_A0.y = pt_A1.y + cos_Angle * (sin_Angle * dx + cos_Angle * dy); + + Add_Shape(pt_A1, pt_B1, pt_A0); + + Set_Quadrat(pt_A1, pt_A0); + Set_Quadrat(pt_A0, pt_B1); + } + + Iteration--; + } +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +void CPythagoras_Tree::Add_Shape(TSG_Point pt_A, TSG_Point pt_B, TSG_Point pt_C, TSG_Point pt_D) +{ + CSG_Shape *pShape; + + pShape = pShapes->Add_Shape(); + pShape->Set_Value(0, Iteration); + pShape->Set_Value(1, Size); + + pShape->Add_Point(pt_A); + pShape->Add_Point(pt_B); + pShape->Add_Point(pt_C); + pShape->Add_Point(pt_D); + + if( pShapes->Get_Type() == SHAPE_TYPE_Line ) + { + pShape->Add_Point(pt_A); + } +} + +//--------------------------------------------------------- +void CPythagoras_Tree::Add_Shape(TSG_Point pt_A, TSG_Point pt_B, TSG_Point pt_C) +{ + CSG_Shape *pShape; + + pShape = pShapes->Add_Shape(); + pShape->Set_Value(0, Iteration); + pShape->Set_Value(1, Size); + + pShape->Add_Point(pt_A); + pShape->Add_Point(pt_B); + pShape->Add_Point(pt_C); + + if( pShapes->Get_Type() == SHAPE_TYPE_Line ) + { + pShape->Add_Point(pt_A); + } +} diff -Nru saga-2.1.0+dfsg/src/modules/garden/garden_fractals/Pythagoras_Tree.h saga-2.1.4+dfsg/src/modules/garden/garden_fractals/Pythagoras_Tree.h --- saga-2.1.0+dfsg/src/modules/garden/garden_fractals/Pythagoras_Tree.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/garden/garden_fractals/Pythagoras_Tree.h 2014-11-13 08:32:19.000000000 +0000 @@ -0,0 +1,108 @@ +/********************************************************** + * Version $Id: Pythagoras_Tree.h 1922 2014-01-09 10:28:46Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// Fractals // +// // +//-------------------------------------------------------// +// // +// Pythagoras_Tree.h // +// // +// Copyright (C) 2003 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Goettingen // +// Goldschmidtstr. 5 // +// 37077 Goettingen // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#ifndef HEADER_INCLUDED__Pythagoras_Tree_H +#define HEADER_INCLUDED__Pythagoras_Tree_H + + + +//--------------------------------------------------------- +#include "MLB_Interface.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +class CPythagoras_Tree : public CSG_Module +{ +public: + CPythagoras_Tree(void); + virtual ~CPythagoras_Tree(void); + + +protected: + + virtual bool On_Execute(void); + + +private: + + int Iteration, Method; + + double Min_Size, Size, sin_Angle, cos_Angle, var_Min, var_Range, var_Angle; + + CSG_Shapes *pShapes; + + + void Set_Quadrat (TSG_Point pt_A, TSG_Point pt_B); + + void Add_Shape (TSG_Point pt_A, TSG_Point pt_B, TSG_Point pt_C, TSG_Point pt_D); + void Add_Shape (TSG_Point pt_A, TSG_Point pt_B, TSG_Point pt_C); + +}; + +#endif // #ifndef HEADER_INCLUDED__Pythagoras_Tree_H diff -Nru saga-2.1.0+dfsg/src/modules/garden/garden_games/Makefile.am saga-2.1.4+dfsg/src/modules/garden/garden_games/Makefile.am --- saga-2.1.0+dfsg/src/modules/garden/garden_games/Makefile.am 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/garden/garden_games/Makefile.am 2014-11-13 08:32:19.000000000 +0000 @@ -0,0 +1,25 @@ +# +# $Id: Makefile.am 1277 2011-12-22 15:48:59Z reklov_w $ +# +if DEBUG +DBGFLAGS = -g -DDEBUG +endif +if SAGA_UNICODE +UC_DEFS = -D_SAGA_UNICODE +endif +DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD +CXX_INCS = -I$(top_srcdir)/src/saga_core +AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS) +AM_LDFLAGS = -fPIC -shared -avoid-version +pkglib_LTLIBRARIES = libgarden_games.la +libgarden_games_la_SOURCES =\ +Mine_Sweeper.cpp\ +Mine_Sweeper_Res.cpp\ +MLB_Interface.cpp\ +Sudoku.cpp\ +Mine_Sweeper.h\ +MLB_Interface.h\ +Sudoku.h + +libgarden_games_la_LIBADD = $(top_srcdir)/src/saga_core/saga_api/libsaga_api.la + diff -Nru saga-2.1.0+dfsg/src/modules/garden/garden_games/Makefile.in saga-2.1.4+dfsg/src/modules/garden/garden_games/Makefile.in --- saga-2.1.0+dfsg/src/modules/garden/garden_games/Makefile.in 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/garden/garden_games/Makefile.in 2014-11-13 08:33:30.000000000 +0000 @@ -0,0 +1,705 @@ +# Makefile.in generated by automake 1.14.1 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +subdir = src/modules/garden/garden_games +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_postgresql.m4 \ + $(top_srcdir)/m4/ax_pkg_swig.m4 \ + $(top_srcdir)/m4/ax_python_devel.m4 \ + $(top_srcdir)/m4/ax_swig_enable_cxx.m4 \ + $(top_srcdir)/m4/ax_swig_python.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__installdirs = "$(DESTDIR)$(pkglibdir)" +LTLIBRARIES = $(pkglib_LTLIBRARIES) +libgarden_games_la_DEPENDENCIES = \ + $(top_srcdir)/src/saga_core/saga_api/libsaga_api.la +am_libgarden_games_la_OBJECTS = Mine_Sweeper.lo Mine_Sweeper_Res.lo \ + MLB_Interface.lo Sudoku.lo +libgarden_games_la_OBJECTS = $(am_libgarden_games_la_OBJECTS) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) +depcomp = $(SHELL) $(top_srcdir)/depcomp +am__depfiles_maybe = depfiles +am__mv = mv -f +CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = +CXXLD = $(CXX) +CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = +CCLD = $(CC) +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = +SOURCES = $(libgarden_games_la_SOURCES) +DIST_SOURCES = $(libgarden_games_la_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +AX_SWIG_PYTHON_CPPFLAGS = @AX_SWIG_PYTHON_CPPFLAGS@ +AX_SWIG_PYTHON_OPT = @AX_SWIG_PYTHON_OPT@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DISABLELIBHARU = @DISABLELIBHARU@ +DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +FGREP = @FGREP@ +GOMPFLAGS = @GOMPFLAGS@ +GREP = @GREP@ +HARU_LIB = @HARU_LIB@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LOCAL_INCS = @LOCAL_INCS@ +LOCAL_LIBS = @LOCAL_LIBS@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ +MKDIR_P = @MKDIR_P@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PG_CONFIG = @PG_CONFIG@ +POSTGRESQL_CFLAGS = @POSTGRESQL_CFLAGS@ +POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@ +POSTGRESQL_VERSION = @POSTGRESQL_VERSION@ +POW_LIB = @POW_LIB@ +PYTHON = @PYTHON@ +PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ +PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ +PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ +PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_PLATFORM = @PYTHON_PLATFORM@ +PYTHON_PREFIX = @PYTHON_PREFIX@ +PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ +PYTHON_VERSION = @PYTHON_VERSION@ +RANLIB = @RANLIB@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +SWIG = @SWIG@ +SWIG_LIB = @SWIG_LIB@ +VERSION = @VERSION@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +pkgpyexecdir = @pkgpyexecdir@ +pkgpythondir = @pkgpythondir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +pyexecdir = @pyexecdir@ +pythondir = @pythondir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ + +# +# $Id: Makefile.am 1277 2011-12-22 15:48:59Z reklov_w $ +# +@DEBUG_TRUE@DBGFLAGS = -g -DDEBUG +@SAGA_UNICODE_TRUE@UC_DEFS = -D_SAGA_UNICODE +DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD +CXX_INCS = -I$(top_srcdir)/src/saga_core +AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS) +AM_LDFLAGS = -fPIC -shared -avoid-version +pkglib_LTLIBRARIES = libgarden_games.la +libgarden_games_la_SOURCES = \ +Mine_Sweeper.cpp\ +Mine_Sweeper_Res.cpp\ +MLB_Interface.cpp\ +Sudoku.cpp\ +Mine_Sweeper.h\ +MLB_Interface.h\ +Sudoku.h + +libgarden_games_la_LIBADD = $(top_srcdir)/src/saga_core/saga_api/libsaga_api.la +all: all-am + +.SUFFIXES: +.SUFFIXES: .cpp .lo .o .obj +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/modules/garden/garden_games/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign src/modules/garden/garden_games/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): + +install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) + @$(NORMAL_INSTALL) + @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ + list2=; for p in $$list; do \ + if test -f $$p; then \ + list2="$$list2 $$p"; \ + else :; fi; \ + done; \ + test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \ + } + +uninstall-pkglibLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ + for p in $$list; do \ + $(am__strip_dir) \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$f"; \ + done + +clean-pkglibLTLIBRARIES: + -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES) + @list='$(pkglib_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + +libgarden_games.la: $(libgarden_games_la_OBJECTS) $(libgarden_games_la_DEPENDENCIES) $(EXTRA_libgarden_games_la_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) -rpath $(pkglibdir) $(libgarden_games_la_OBJECTS) $(libgarden_games_la_LIBADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MLB_Interface.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Mine_Sweeper.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Mine_Sweeper_Res.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Sudoku.Plo@am__quote@ + +.cpp.o: +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< + +.cpp.obj: +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + +.cpp.lo: +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + set x; \ + here=`pwd`; \ + $(am__define_uniq_tagged_files); \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ + fi +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ + test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(LTLIBRARIES) +installdirs: + for dir in "$(DESTDIR)$(pkglibdir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool clean-pkglibLTLIBRARIES \ + mostlyclean-am + +distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: install-pkglibLTLIBRARIES + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-pkglibLTLIBRARIES + +.MAKE: install-am install-strip + +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-pkglibLTLIBRARIES install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ + uninstall-pkglibLTLIBRARIES + + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nru saga-2.1.0+dfsg/src/modules/garden/garden_games/Mine_Sweeper.cpp saga-2.1.4+dfsg/src/modules/garden/garden_games/Mine_Sweeper.cpp --- saga-2.1.0+dfsg/src/modules/garden/garden_games/Mine_Sweeper.cpp 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/garden/garden_games/Mine_Sweeper.cpp 2014-11-13 08:32:19.000000000 +0000 @@ -0,0 +1,519 @@ +/********************************************************** + * Version $Id: Mine_Sweeper.cpp 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library // +// // +// Mine_Sweeper // +// // +//-------------------------------------------------------// +// // +// Mine_Sweeper.cpp // +// // +// Copyright (C) 2003 Andre Ringeler // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: aringel@gwdg.de // +// // +// contact: Andre Ringeler // +// // +// // +/////////////////////////////////////////////////////////// + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "Mine_Sweeper.h" + +/////////////////////////////////////////////////////////// +// // +// Import Resourcen // +// // +/////////////////////////////////////////////////////////// + +extern unsigned char mine_res[]; +extern unsigned char mine_res_color[]; +extern unsigned int SPRITE_SIZE; + +/////////////////////////////////////////////////////////// +// // +// Defines // +// // +/////////////////////////////////////////////////////////// + +#define FLAG 1 +#define QUESTION 2 + +#define isBomb 1 +#define isOpen 8 +#define isBumm 16 + +#define SPRITE_CLOSE 0 +#define SPRITE_FLAG 1 +#define SPRITE_QUESTION 2 +#define SPRITE_BOMB_BUMM 3 +#define SPRITE_BOMB_NO 4 +#define SPRITE_BOMB 5 +#define SPRITE_OPEN 15 + +#define SPRITE_NUMMER(x) (15-x) + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +CMine_Sweeper::CMine_Sweeper(void) +{ + Set_Name (_TL("Mine Sweeper")); + + Set_Author (_TL("Copyrights (c) 2003 by Andre Ringeler")); + + Set_Description (_TW( + "A Mine Sweeper Clone\n" + "(created by Andre Ringeler).") + ); + + Parameters.Add_Grid_Output( + NULL , "GRID" , _TL("Grid"), + _TL("") + ); + + Parameters.Add_Choice( + NULL ,"LEVEL" ,_TL("Level"), + _TL("Game Level"), + _TW( + "Beginer|" + "Advanced|" + "Profi|") ,1 + ); +} + +//--------------------------------------------------------- +CMine_Sweeper::~CMine_Sweeper(void) +{} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CMine_Sweeper::MakeBoard(int level) +{ + int i, x, y; + CSG_Colors Colors; + + switch( level ) + { + case 0: Mine_NX = 8; Mine_NY = 8; N_Mines=10; + break; + + case 1: Mine_NX = 16; Mine_NY = 16; N_Mines=40; + break; + + case 2: Mine_NX = 30; Mine_NY = 16; N_Mines=99; + break; + } + + pInput = SG_Create_Grid(SG_DATATYPE_Int,SPRITE_SIZE*Mine_NX, SPRITE_SIZE*Mine_NY); + pInput->Set_Name(_TL("Mine Sweeper")); + Parameters("GRID")->Set_Value(pInput); + + //----------------------------------------------------- + CSG_Parameter *pLUT = DataObject_Get_Parameter(pInput, "LUT"); + + if( pLUT && pLUT->asTable() ) + { + pLUT->asTable()->Del_Records(); + + for(i=0; i<16; i++) + { + CSG_Table_Record *pRecord = pLUT->asTable()->Add_Record(); + + pRecord->Set_Value(0, SG_GET_RGB(mine_res_color[i*3], mine_res_color[i*3+1], mine_res_color[i*3+2])); + pRecord->Set_Value(3, i); + } + + DataObject_Set_Parameter(pInput, pLUT); + DataObject_Set_Parameter(pInput, "COLORS_TYPE", 1); // Color Classification Type: Lookup Table + } + + Colors.Set_Count(16); + for ( i=0;i<16; i++) + { + Colors.Set_Color(i, SG_GET_RGB(mine_res_color[i*3], mine_res_color[i*3+1], mine_res_color[i*3+2])); + } + DataObject_Set_Colors(pInput, Colors); + DataObject_Update(pInput, 0.0, 15.0, true); + + //----------------------------------------------------- + for( y = 0; y < Mine_NY; y++) + for( x = 0; x < Mine_NX; x++) + { + SetSprite(x,y,SPRITE_CLOSE); + } + + pInput->Set_Value(0, 0); + + return true; +} + +bool CMine_Sweeper::On_Execute(void) +{ + MakeBoard(Parameters("LEVEL")->asInt()); + + GameBoard = (CSG_Grid *) new CSG_Grid(SG_DATATYPE_Int,Mine_NX,Mine_NY); + FlagBoard = (CSG_Grid *) new CSG_Grid(SG_DATATYPE_Int,Mine_NX,Mine_NY); + + First_Click = true; + Time = NULL; + + return( true ); +} + + +bool CMine_Sweeper::On_Execute_Finish(void) +{ + delete GameBoard; + delete FlagBoard; + + if (Time) delete Time; + + return true; +} + + +void CMine_Sweeper::ResetBoard(int xpos, int ypos) +{ + OpenFields = 0; MarkedMines = 0; + + FlagBoard->Assign(); GameBoard->Assign(); + + if(Time) delete Time; + + Make_GameBoard( xpos , ypos); + + Time = new CTimer(); +} + +//--------------------------------------------------------- +bool CMine_Sweeper::Get_Grid_Pos(int &x, int &y) +{ + bool bResult; + + if( pInput && pInput->is_Valid() ) + { + bResult = true; + + //------------------------------------------------- + x = (int)(0.5 + (Get_xPosition() - pInput->Get_XMin()) / pInput->Get_Cellsize()); + + if( x < 0 ) + { + bResult = false; + x = 0; + } + else if( x >= pInput->Get_NX() ) + { + bResult = false; + x = pInput->Get_NX() - 1; + } + + //------------------------------------------------- + y = (int)(0.5 + (Get_yPosition() - pInput->Get_YMin()) / pInput->Get_Cellsize()); + + if( y < 0 ) + { + bResult = false; + y = 0; + } + else if( y >= pInput->Get_NY() ) + { + bResult = false; + y = pInput->Get_NY() - 1; + } + + return( bResult ); + } + + //----------------------------------------------------- + x = 0; + y = 0; + + return( false ); +} + + +bool CMine_Sweeper::On_Execute_Position(CSG_Point ptWorld, TSG_Module_Interactive_Mode Mode) +{ + int ok = true; + + int time; + int redraw = false; + int xpos; int ypos; + + if( !Get_Grid_Pos(xpos, ypos) ) + return( false ); + + xpos/=SPRITE_SIZE; ypos/=SPRITE_SIZE; + + ypos=Mine_NY-1-ypos; + + switch( Mode ) + { + default: + return( false ); + + case MODULE_INTERACTIVE_LDOWN: + if(First_Click) + { + ResetBoard(xpos, ypos); + First_Click=false; + } + + ok = Play(xpos, ypos, false); + redraw = true; + break; + + case MODULE_INTERACTIVE_RDOWN: + Mark(xpos, ypos); + redraw = true; + break; + } + + if (redraw) + { + if(ok) + { + Show_GameBoard(false); + + time= Time->Time(); + + Message_Add(CSG_String::Format(SG_T(":-) Time:%ds Mines:%d\n"),time,N_Mines-MarkedMines)); + + if (OpenFields == Mine_NX*Mine_NY-N_Mines ) + { + Message_Add(CSG_String::Format(_TL(":-) :-) you are a winner :-) :-) Time:%ds\n"),time)); + Message_Dlg(CSG_String::Format(_TL(":-) :-) you are a winner :-) :-) Time:%ds\n"),time)); + + Show_GameBoard(true); + + First_Click=true; + } + } + else + { + Show_GameBoard(true); + + Message_Dlg(CSG_String::Format(_TL(":-( :-( you are a loser :-( :-("))); + Message_Add(CSG_String::Format(_TL(":-( :-( you are a loser :-( :-("))); + + First_Click=true; + } + } + return true; +} + + + +void CMine_Sweeper::Make_GameBoard(int xpos,int ypos) +{ + int mines = 0; + + srand( (unsigned)time( NULL ) ); + + while(mines < N_Mines) + { + int mx,my; + + mx = rand()%Mine_NX; + my = rand()%Mine_NY; + + if( !(GameBoard->asInt(mx, my) & isBomb) && !((mx==xpos)&&(my==ypos)) ) + { + GameBoard->Set_Value(mx,my,isBomb); + mines ++; + } + } +} + + +void CMine_Sweeper::Show_GameBoard(bool ShowMines) +{ + int x,y; + + if (ShowMines) + { + for( y = 0; y < Mine_NY; y++) + for( x = 0; x < Mine_NX; x++) + { + if(GameBoard->asInt(x, y) & isBomb) + { + if (FlagBoard->asInt(x,y) == FLAG) + SetSprite(x,y,SPRITE_FLAG); + else + SetSprite(x,y,SPRITE_BOMB); + } + else + { + if (GameBoard->asInt(x, y) == isOpen ) + SetSprite(x,y,SPRITE_NUMMER(Get_Number_of_Bombs(x,y))); + else + SetSprite(x,y,SPRITE_CLOSE); + } + + if (GameBoard->asInt(x, y) & isBumm) SetSprite(x,y,SPRITE_BOMB_BUMM); + + if ( !(GameBoard->asInt(x, y) & isBomb) && (FlagBoard->asInt(x,y) == FLAG)) + SetSprite(x,y,SPRITE_BOMB_NO); + } + } + else + for( y = 0; y < Mine_NY; y++) + for( x = 0; x < Mine_NX; x++) + { + if(GameBoard->asInt(x, y) == isOpen) + { + SetSprite(x,y,SPRITE_NUMMER(Get_Number_of_Bombs(x,y))); + } + else + { + if(FlagBoard->asInt(x,y)) + SetSprite(x,y,FlagBoard->asInt(x,y)); + else + SetSprite(x,y,SPRITE_CLOSE); + } + } + + DataObject_Update(pInput, 0.0, 15.0); +} + + +void CMine_Sweeper::SetSprite(int xpos, int ypos, int nr) +{ + unsigned int x,y; + + for(y=0;ySet_Value( xpos * SPRITE_SIZE + x, pInput->Get_NY() - ypos * SPRITE_SIZE - y -1, + (double)mine_res[ y * SPRITE_SIZE + x + nr * SPRITE_SIZE * SPRITE_SIZE]); +} + + +int CMine_Sweeper::Get_Number_of_Bombs(int xpos, int ypos) +{ + int i; + int number = 0; + + for( i = 0; i<8; i++) + if (GameBoard->is_InGrid(pInput->Get_System().Get_xTo(i,xpos),pInput->Get_System().Get_yTo(i,ypos))) + if (GameBoard->asInt(pInput->Get_System().Get_xTo(i,xpos),pInput->Get_System().Get_yTo(i,ypos)) & isBomb) + number ++; + + return number; +} + +bool CMine_Sweeper::Play(int xpos, int ypos,bool computer_move) +{ + int i; + + if ( (!GameBoard->is_InGrid(xpos,ypos))|| + (FlagBoard->asInt(xpos, ypos)==1) || + ((GameBoard->asInt(xpos, ypos)) & isBomb && (computer_move)) + ) + { + return true; + } + + if ( (GameBoard->asInt(xpos, ypos)) & isBomb && (!computer_move) ) + { + GameBoard->Set_Value(xpos, ypos,isBomb|isBumm); + return false; + } + + if ( GameBoard->asInt(xpos, ypos) == 0 ) + { + GameBoard->Set_Value(xpos, ypos, isOpen); + + OpenFields ++; + + if (Get_Number_of_Bombs(xpos, ypos) ) + return true; + + for( i = 0; i<8; i++) + Play(pInput->Get_System().Get_xTo(i,xpos),pInput->Get_System().Get_yTo(i,ypos) ,true); + } + return true; +} + + +void CMine_Sweeper::Mark(int xpos, int ypos) +{ + int val; + + val = FlagBoard->asInt(xpos , ypos); + + if (val == FLAG) MarkedMines --; + + val ++; val%=3; + + if (val == FLAG) MarkedMines ++ ; + + FlagBoard->Set_Value(xpos, ypos, val); +} + + +CTimer::CTimer() +{ + time(&starttime); +} + +CTimer::~CTimer() +{ +} + +int CTimer::Time() +{ + time_t nowtime; + + time(&nowtime); + + return (int) (nowtime-starttime); +} diff -Nru saga-2.1.0+dfsg/src/modules/garden/garden_games/Mine_Sweeper.h saga-2.1.4+dfsg/src/modules/garden/garden_games/Mine_Sweeper.h --- saga-2.1.0+dfsg/src/modules/garden/garden_games/Mine_Sweeper.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/garden/garden_games/Mine_Sweeper.h 2014-11-13 08:32:19.000000000 +0000 @@ -0,0 +1,140 @@ +/********************************************************** + * Version $Id: Mine_Sweeper.h 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library // +// // +// Mine_Sweeper // +// // +//-------------------------------------------------------// +// // +// Mine_Sweeper.h // +// // +// Copyright (C) 2003 by Andre Ringeler // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: your@e-mail.abc // +// // +// contact: Your Name // +// And Address // +// // +/////////////////////////////////////////////////////////// + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#ifndef HEADER_INCLUDED__Mine_Sweeper_H +#define HEADER_INCLUDED__Mine_Sweeper_H + +//--------------------------------------------------------- +#include "MLB_Interface.h" + +#include + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + +class CTimer +{ +public: + + CTimer(void); + ~CTimer(void); + + int Time(void); + +protected: + + time_t starttime; + +}; + + +class CMine_Sweeper : public CSG_Module_Interactive +{ +public: + CMine_Sweeper(void); + virtual ~CMine_Sweeper(void); + + + CSG_Grid *pInput; + +protected: + + virtual bool On_Execute(void); + virtual bool On_Execute_Finish (void); + virtual bool On_Execute_Position (CSG_Point ptWorld, TSG_Module_Interactive_Mode Mode); + + bool Get_Grid_Pos(int &x, int &y); + + void SetSprite(int xpos, int ypos, int nr); + + bool MakeBoard(int level); + + void Make_GameBoard(int xpos,int ypos); + + void Show_GameBoard(bool ShowMines); + + int Get_Number_of_Bombs(int xpos, int ypos); + + bool Play(int xpos, int ypos,bool computer_move); + + void Mark(int xpos, int ypos); + + void ResetBoard(int xpos, int ypos); + + int Mine_NX,Mine_NY, N_Mines; + + int OpenFields, MarkedMines; + + CSG_Grid *GameBoard, *FlagBoard; + + bool First_Click; + + CTimer *Time; + +private: + +}; + + + +#endif // #ifndef HEADER_INCLUDED__Mine_Sweeper_H diff -Nru saga-2.1.0+dfsg/src/modules/garden/garden_games/Mine_Sweeper_Res.cpp saga-2.1.4+dfsg/src/modules/garden/garden_games/Mine_Sweeper_Res.cpp --- saga-2.1.0+dfsg/src/modules/garden/garden_games/Mine_Sweeper_Res.cpp 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/garden/garden_games/Mine_Sweeper_Res.cpp 2014-11-13 08:32:19.000000000 +0000 @@ -0,0 +1,284 @@ +/********************************************************** + * Version $Id: Mine_Sweeper_Res.cpp 911 2011-02-14 16:38:15Z reklov_w $ + *********************************************************/ +unsigned char mine_res[] = +{ +15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,8, +15,15,15,15,15,15,15,15,15,15,15,15,15,15,8,7, +15,15,8,8,8,8,8,8,8,8,8,8,8,8,7,7, +15,15,8,8,8,8,8,8,8,8,8,8,8,8,7,7, +15,15,8,8,8,8,8,8,8,8,8,8,8,8,7,7, +15,15,8,8,8,8,8,8,8,8,8,8,8,8,7,7, +15,15,8,8,8,8,8,8,8,8,8,8,8,8,7,7, +15,15,8,8,8,8,8,8,8,8,8,8,8,8,7,7, +15,15,8,8,8,8,8,8,8,8,8,8,8,8,7,7, +15,15,8,8,8,8,8,8,8,8,8,8,8,8,7,7, +15,15,8,8,8,8,8,8,8,8,8,8,8,8,7,7, +15,15,8,8,8,8,8,8,8,8,8,8,8,8,7,7, +15,15,8,8,8,8,8,8,8,8,8,8,8,8,7,7, +15,15,8,8,8,8,8,8,8,8,8,8,8,8,7,7, +15,8,7,7,7,7,7,7,7,7,7,7,7,7,7,7, +8,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7, +15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,8, +15,15,15,15,15,15,15,15,15,15,15,15,15,15,8,7, +15,15,8,8,8,8,8,8,8,8,8,8,8,8,7,7, +15,15,8,8,8,8,8,9,9,8,8,8,8,8,7,7, +15,15,8,8,8,9,9,9,9,8,8,8,8,8,7,7, +15,15,8,8,9,9,9,9,9,8,8,8,8,8,7,7, +15,15,8,8,8,9,9,9,9,8,8,8,8,8,7,7, +15,15,8,8,8,8,8,9,9,8,8,8,8,8,7,7, +15,15,8,8,8,8,8,8,0,8,8,8,8,8,7,7, +15,15,8,8,8,8,8,8,0,8,8,8,8,8,7,7, +15,15,8,8,8,8,0,0,0,0,8,8,8,8,7,7, +15,15,8,8,0,0,0,0,0,0,0,0,8,8,7,7, +15,15,8,8,0,0,0,0,0,0,0,0,8,8,7,7, +15,15,8,8,8,8,8,8,8,8,8,8,8,8,7,7, +15,8,7,7,7,7,7,7,7,7,7,7,7,7,7,7, +8,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7, +15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,8, +15,15,15,15,15,15,15,15,15,15,15,15,15,15,8,7, +15,15,8,8,8,8,8,8,8,8,8,8,8,8,7,7, +15,15,8,8,8,8,0,0,0,0,8,8,8,8,7,7, +15,15,8,8,8,0,0,8,8,0,0,8,8,8,7,7, +15,15,8,8,8,0,0,8,8,0,0,8,8,8,7,7, +15,15,8,8,8,8,8,8,8,0,0,8,8,8,7,7, +15,15,8,8,8,8,8,8,0,0,8,8,8,8,7,7, +15,15,8,8,8,8,8,0,0,8,8,8,8,8,7,7, +15,15,8,8,8,8,8,0,0,8,8,8,8,8,7,7, +15,15,8,8,8,8,8,8,8,8,8,8,8,8,7,7, +15,15,8,8,8,8,8,0,0,8,8,8,8,8,7,7, +15,15,8,8,8,8,8,0,0,8,8,8,8,8,7,7, +15,15,8,8,8,8,8,8,8,8,8,8,8,8,7,7, +15,8,7,7,7,7,7,7,7,7,7,7,7,7,7,7, +8,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7, +7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7, +7,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9, +7,9,9,9,9,9,9,9,0,9,9,9,9,9,9,9, +7,9,9,9,9,9,9,9,0,9,9,9,9,9,9,9, +7,9,9,9,0,9,0,0,0,0,0,9,0,9,9,9, +7,9,9,9,9,0,0,0,0,0,0,0,9,9,9,9, +7,9,9,9,0,0,15,15,0,0,0,0,0,9,9,9, +7,9,9,9,0,0,15,15,0,0,0,0,0,9,9,9, +7,9,0,0,0,0,0,0,0,0,0,0,0,0,0,9, +7,9,9,9,0,0,0,0,0,0,0,0,0,9,9,9, +7,9,9,9,0,0,0,0,0,0,0,0,0,9,9,9, +7,9,9,9,9,0,0,0,0,0,0,0,9,9,9,9, +7,9,9,9,0,9,0,0,0,0,0,9,0,9,9,9, +7,9,9,9,9,9,9,9,0,9,9,9,9,9,9,9, +7,9,9,9,9,9,9,9,0,9,9,9,9,9,9,9, +7,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9, +7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7, +7,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, +7,8,8,8,8,8,8,8,0,8,8,8,8,8,8,8, +7,8,9,9,8,8,8,8,0,8,8,8,8,9,9,8, +7,8,8,9,9,8,0,0,0,0,0,8,9,9,8,8, +7,8,8,8,9,9,0,0,0,0,0,9,9,8,8,8, +7,8,8,8,0,9,9,15,0,0,9,9,0,8,8,8, +7,8,8,8,0,0,9,9,0,9,9,0,0,8,8,8, +7,8,0,0,0,0,0,9,9,9,0,0,0,0,0,8, +7,8,8,8,0,0,0,9,9,9,0,0,0,8,8,8, +7,8,8,8,0,0,9,9,0,9,9,0,0,8,8,8, +7,8,8,8,8,9,9,0,0,0,9,9,8,8,8,8, +7,8,8,8,9,9,0,0,0,0,0,9,9,8,8,8, +7,8,8,9,9,8,8,8,0,8,8,8,9,9,8,8, +7,8,9,9,8,8,8,8,0,8,8,8,8,9,9,8, +7,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, +7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7, +7,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, +7,8,8,8,8,8,8,8,0,8,8,8,8,8,8,8, +7,8,8,8,8,8,8,8,0,8,8,8,8,8,8,8, +7,8,8,8,0,8,0,0,0,0,0,8,0,8,8,8, +7,8,8,8,8,0,0,0,0,0,0,0,8,8,8,8, +7,8,8,8,0,0,15,15,0,0,0,0,0,8,8,8, +7,8,8,8,0,0,15,15,0,0,0,0,0,8,8,8, +7,8,0,0,0,0,0,0,0,0,0,0,0,0,0,8, +7,8,8,8,0,0,0,0,0,0,0,0,0,8,8,8, +7,8,8,8,0,0,0,0,0,0,0,0,0,8,8,8, +7,8,8,8,8,0,0,0,0,0,0,0,8,8,8,8, +7,8,8,8,0,8,0,0,0,0,0,8,0,8,8,8, +7,8,8,8,8,8,8,8,0,8,8,8,8,8,8,8, +7,8,8,8,8,8,8,8,0,8,8,8,8,8,8,8, +7,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, +7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7, +7,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, +7,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, +7,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, +7,8,8,8,8,8,8,0,0,0,0,8,8,8,8,8, +7,8,8,8,8,8,0,0,8,8,0,0,8,8,8,8, +7,8,8,8,8,8,0,0,8,8,0,0,8,8,8,8, +7,8,8,8,8,8,8,8,8,8,0,0,8,8,8,8, +7,8,8,8,8,8,8,8,8,0,0,8,8,8,8,8, +7,8,8,8,8,8,8,8,0,0,8,8,8,8,8,8, +7,8,8,8,8,8,8,8,0,0,8,8,8,8,8,8, +7,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, +7,8,8,8,8,8,8,8,0,0,8,8,8,8,8,8, +7,8,8,8,8,8,8,8,0,0,8,8,8,8,8,8, +7,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, +7,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, +7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7, +7,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, +7,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, +7,8,8,8,7,7,7,7,7,7,7,7,8,8,8,8, +7,8,8,7,7,7,7,7,7,7,7,7,7,8,8,8, +7,8,8,7,7,7,8,8,8,8,7,7,7,8,8,8, +7,8,8,7,7,7,8,8,8,8,7,7,7,8,8,8, +7,8,8,8,7,7,7,7,7,7,7,7,8,8,8,8, +7,8,8,8,7,7,7,7,7,7,7,7,8,8,8,8, +7,8,8,7,7,7,8,8,8,8,7,7,7,8,8,8, +7,8,8,7,7,7,8,8,8,8,7,7,7,8,8,8, +7,8,8,7,7,7,7,7,7,7,7,7,7,8,8,8, +7,8,8,8,7,7,7,7,7,7,7,7,8,8,8,8, +7,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, +7,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, +7,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, +7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7, +7,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, +7,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, +7,8,8,0,0,0,0,0,0,0,0,0,0,8,8,8, +7,8,8,0,0,0,0,0,0,0,0,0,0,8,8,8, +7,8,8,8,8,8,8,8,8,8,0,0,0,8,8,8, +7,8,8,8,8,8,8,8,8,8,0,0,0,8,8,8, +7,8,8,8,8,8,8,8,8,0,0,0,8,8,8,8, +7,8,8,8,8,8,8,8,8,0,0,0,8,8,8,8, +7,8,8,8,8,8,8,8,0,0,0,8,8,8,8,8, +7,8,8,8,8,8,8,8,0,0,0,8,8,8,8,8, +7,8,8,8,8,8,8,0,0,0,8,8,8,8,8,8, +7,8,8,8,8,8,8,0,0,0,8,8,8,8,8,8, +7,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, +7,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, +7,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, +7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7, +7,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, +7,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, +7,8,8,8,6,6,6,6,6,6,6,6,8,8,8,8, +7,8,8,6,6,6,6,6,6,6,6,6,8,8,8,8, +7,8,8,6,6,6,8,8,8,8,8,8,8,8,8,8, +7,8,8,6,6,6,8,8,8,8,8,8,8,8,8,8, +7,8,8,6,6,6,6,6,6,6,6,6,8,8,8,8, +7,8,8,6,6,6,6,6,6,6,6,6,6,8,8,8, +7,8,8,6,6,6,8,8,8,8,6,6,6,8,8,8, +7,8,8,6,6,6,8,8,8,8,6,6,6,8,8,8, +7,8,8,6,6,6,6,6,6,6,6,6,6,8,8,8, +7,8,8,8,6,6,6,6,6,6,6,6,8,8,8,8, +7,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, +7,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, +7,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, +7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7, +7,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, +7,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, +7,8,8,1,1,1,1,1,1,1,1,1,1,8,8,8, +7,8,8,1,1,1,1,1,1,1,1,1,1,8,8,8, +7,8,8,1,1,1,8,8,8,8,8,8,8,8,8,8, +7,8,8,1,1,1,8,8,8,8,8,8,8,8,8,8, +7,8,8,1,1,1,1,1,1,1,1,1,8,8,8,8, +7,8,8,1,1,1,1,1,1,1,1,1,1,8,8,8, +7,8,8,8,8,8,8,8,8,8,1,1,1,8,8,8, +7,8,8,8,8,8,8,8,8,8,1,1,1,8,8,8, +7,8,8,1,1,1,1,1,1,1,1,1,1,8,8,8, +7,8,8,1,1,1,1,1,1,1,1,1,8,8,8,8, +7,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, +7,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, +7,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, +7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7, +7,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, +7,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, +7,8,8,8,8,4,4,4,8,4,4,4,8,8,8,8, +7,8,8,8,8,4,4,4,8,4,4,4,8,8,8,8, +7,8,8,8,4,4,4,8,8,4,4,4,8,8,8,8, +7,8,8,8,4,4,4,8,8,4,4,4,8,8,8,8, +7,8,8,4,4,4,4,4,4,4,4,4,4,8,8,8, +7,8,8,4,4,4,4,4,4,4,4,4,4,8,8,8, +7,8,8,8,8,8,8,8,8,4,4,4,8,8,8,8, +7,8,8,8,8,8,8,8,8,4,4,4,8,8,8,8, +7,8,8,8,8,8,8,8,8,4,4,4,8,8,8,8, +7,8,8,8,8,8,8,8,8,4,4,4,8,8,8,8, +7,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, +7,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, +7,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, +7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7, +7,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, +7,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, +7,8,8,9,9,9,9,9,9,9,9,9,8,8,8,8, +7,8,8,9,9,9,9,9,9,9,9,9,9,8,8,8, +7,8,8,8,8,8,8,8,8,8,9,9,9,8,8,8, +7,8,8,8,8,8,8,8,8,8,9,9,9,8,8,8, +7,8,8,8,8,8,9,9,9,9,9,9,8,8,8,8, +7,8,8,8,8,8,9,9,9,9,9,9,8,8,8,8, +7,8,8,8,8,8,8,8,8,8,9,9,9,8,8,8, +7,8,8,8,8,8,8,8,8,8,9,9,9,8,8,8, +7,8,8,9,9,9,9,9,9,9,9,9,9,8,8,8, +7,8,8,9,9,9,9,9,9,9,9,9,8,8,8,8, +7,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, +7,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, +7,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, +7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7, +7,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, +7,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, +7,8,8,8,2,2,2,2,2,2,2,2,8,8,8,8, +7,8,8,2,2,2,2,2,2,2,2,2,2,8,8,8, +7,8,8,2,2,2,8,8,8,8,2,2,2,8,8,8, +7,8,8,8,8,8,8,8,8,8,2,2,2,8,8,8, +7,8,8,8,8,8,8,8,2,2,2,2,8,8,8,8, +7,8,8,8,8,8,2,2,2,2,2,8,8,8,8,8, +7,8,8,8,2,2,2,2,2,8,8,8,8,8,8,8, +7,8,8,2,2,2,2,8,8,8,8,8,8,8,8,8, +7,8,8,2,2,2,2,2,2,2,2,2,2,8,8,8, +7,8,8,2,2,2,2,2,2,2,2,2,2,8,8,8, +7,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, +7,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, +7,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, +7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7, +7,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, +7,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, +7,8,8,8,8,8,8,8,12,12,8,8,8,8,8,8, +7,8,8,8,8,8,8,12,12,12,8,8,8,8,8,8, +7,8,8,8,8,8,12,12,12,12,8,8,8,8,8,8, +7,8,8,8,8,12,12,12,12,12,8,8,8,8,8,8, +7,8,8,8,8,8,8,12,12,12,8,8,8,8,8,8, +7,8,8,8,8,8,8,12,12,12,8,8,8,8,8,8, +7,8,8,8,8,8,8,12,12,12,8,8,8,8,8,8, +7,8,8,8,8,8,8,12,12,12,8,8,8,8,8,8, +7,8,8,8,8,12,12,12,12,12,12,12,8,8,8,8, +7,8,8,8,8,12,12,12,12,12,12,12,8,8,8,8, +7,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, +7,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, +7,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, +7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7, +7,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, +7,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, +7,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, +7,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, +7,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, +7,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, +7,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, +7,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, +7,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, +7,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, +7,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, +7,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, +7,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, +7,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, +7,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8 +}; + +unsigned char mine_res_color[] = +{ + 0, 0, 0, + 128, 0, 0, + 0,128, 0, + 0, 0, 0, + 0, 0,128, + 0, 0, 0, + 0,128,128, + 128,128,128, + 192,192,192, + 255, 0, 0, + 0, 0, 0, + 0, 0, 0, + 0, 0,255, + 0, 0, 0, + 0, 0, 0, + 255,255,255 +}; + +unsigned int SPRITE_SIZE = 16; diff -Nru saga-2.1.0+dfsg/src/modules/garden/garden_games/MLB_Interface.cpp saga-2.1.4+dfsg/src/modules/garden/garden_games/MLB_Interface.cpp --- saga-2.1.0+dfsg/src/modules/garden/garden_games/MLB_Interface.cpp 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/garden/garden_games/MLB_Interface.cpp 2014-11-13 08:32:19.000000000 +0000 @@ -0,0 +1,142 @@ +/********************************************************** + * Version $Id: MLB_Interface.cpp 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// Library Template // +// // +//-------------------------------------------------------// +// // +// MLB_Interface.cpp // +// // +// Copyright (C) 2003 by // +// Author // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: author@email.de // +// // +// contact: Author // +// Sesame Street. 7 // +// 12345 Metropolis // +// Nirwana // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// The Module Link Library Interface // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +// 1. Include the appropriate SAGA-API header... + +#include "MLB_Interface.h" + + +//--------------------------------------------------------- +// 2. Place general module library informations here... + +CSG_String Get_Info(int i) +{ + switch( i ) + { + case MLB_INFO_Name: default: + return( _TL("Games") ); + + case MLB_INFO_Category: + return( _TL("Garden") ); + + case MLB_INFO_Author: + return( SG_T("SAGA User Group Associaton (c) 2003") ); + + case MLB_INFO_Description: + return( _TL("Games")); + + case MLB_INFO_Version: + return( SG_T("1.0") ); + + case MLB_INFO_Menu_Path: + return( _TL("Garden|Recreations|Games") ); + } +} + + +//--------------------------------------------------------- +// 3. Include the headers of your modules here... + +#include "Mine_Sweeper.h" +#include "Sudoku.h" +//--------------------------------------------------------- +// 4. Allow your modules to be created here... + +CSG_Module * Create_Module(int i) +{ + // Don't forget to continuously enumerate the case switches + // when adding new modules! Also bear in mind that the + // enumeration always has to start with [case 0:] and + // that [default:] must return NULL!... + + CSG_Module *pModule; + + switch( i ) + { + case 0: + pModule = new CMine_Sweeper; + break; + + case 1: + pModule = new CSudoku; + break; + + default: + pModule = NULL; + break; + } + + return( pModule ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +//{{AFX_SAGA + + MLB_INTERFACE + +//}}AFX_SAGA diff -Nru saga-2.1.0+dfsg/src/modules/garden/garden_games/MLB_Interface.h saga-2.1.4+dfsg/src/modules/garden/garden_games/MLB_Interface.h --- saga-2.1.0+dfsg/src/modules/garden/garden_games/MLB_Interface.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/garden/garden_games/MLB_Interface.h 2014-11-13 08:32:19.000000000 +0000 @@ -0,0 +1,74 @@ +/********************************************************** + * Version $Id: MLB_Interface.h 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// Library Template // +// // +//-------------------------------------------------------// +// // +// MLB_Interface.h // +// // +// Copyright (C) 2003 by // +// Author // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: author@email.de // +// // +// contact: Author // +// Sesame Street. 7 // +// 12345 Metropolis // +// Nirwana // +// // +/////////////////////////////////////////////////////////// + + +/////////////////////////////////////////////////////////// +// // +// Include the SAGA-API here // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#ifndef HEADER_INCLUDED__garden_games_H +#define HEADER_INCLUDED__garden_games_H + +//--------------------------------------------------------- +#include + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#endif // #ifndef HEADER_INCLUDED__garden_games_H diff -Nru saga-2.1.0+dfsg/src/modules/garden/garden_games/Sudoku.cpp saga-2.1.4+dfsg/src/modules/garden/garden_games/Sudoku.cpp --- saga-2.1.0+dfsg/src/modules/garden/garden_games/Sudoku.cpp 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/garden/garden_games/Sudoku.cpp 2014-11-13 08:32:19.000000000 +0000 @@ -0,0 +1,357 @@ +/********************************************************** + * Version $Id: Sudoku.cpp 911 2011-02-14 16:38:15Z reklov_w $ + *********************************************************/ +#include "Sudoku.h" +//#include "Sudoku_res.h" +int numbers[10][36][36]; + +#define BOARD_SIZE 354 +#define BLOCK_SIZE 119 +#define CELL_SIZE 38 + +#define CELL_COLOR_BLACK 0 +#define CELL_COLOR_WHITE 1 +#define CELL_COLOR_YELLOW 2 +#define CELL_COLOR_BROWN 3 +#define CELL_COLOR_GREEN 4 +#define CELL_COLOR_RED 5 + +unsigned int cell_color[] = +{ + SG_GET_RGB(0, 0, 0), // 0 = black + SG_GET_RGB(255, 255, 255), // 1 = white + SG_GET_RGB(250, 250, 150), // 2 = yellow + SG_GET_RGB(200, 150, 100), // 3 = browm + SG_GET_RGB(0, 220, 0), // 4 = green + SG_GET_RGB(200, 0 ,0) // 5 = red +}; + +CSudoku::CSudoku(void) +{ + Set_Name (_TL("Sudoku")); + + Set_Author (_TL("Copyrights (c) 2006 by Victor Olaya")); + + Set_Description(_TL("")); + + Parameters.Add_Grid_Output( + NULL , "GRID" , _TL("Grid"), + _TL("") + ); + + int i, j; + CSG_Table *pBoard; + CSG_Table_Record *pRecord; + + pBoard = Parameters.Add_FixedTable( + NULL , "BOARD" , _TL("Board"), + _TL("") + )->asTable(); + + for (i = 0; i < 9; i++){ + pBoard->Add_Field(_TL(""), SG_DATATYPE_Int); + } + + for (i = 0; i < 9; i++){ + pRecord = pBoard->Add_Record(); + for (j = 0; j < 9; j++){ + pRecord->Set_Value(j, 0.); + } + } +} + +CSudoku::~CSudoku(void) +{} + +bool CSudoku::On_Execute(void) +{ + int i; + CSG_Colors Colors; + + m_pSudoku = new int * [9]; + m_pFixedCells = new bool * [9]; + for (i = 0; i < 9; i++){ + m_pSudoku[i] = new int [9]; + m_pFixedCells[i] = new bool[9]; + } + + m_pBoard = SG_Create_Grid(SG_DATATYPE_Int, BOARD_SIZE, BOARD_SIZE, 1); + m_pBoard->Set_Name(_TL("Sudoku")); + Parameters("GRID")->Set_Value(m_pBoard); + + Colors.Set_Count(6); + for (i = 0; i < 6; i++){ + Colors.Set_Color(i, cell_color[i]); + } + DataObject_Set_Colors(m_pBoard, Colors); + DataObject_Update(m_pBoard, true); + + CreateSudoku(); + DrawBoard(); + + return true; +} + +bool CSudoku::On_Execute_Finish(void) +{ + for (int i = 0; i < 9; i++){ + delete [] m_pSudoku[i]; + delete [] m_pFixedCells[i]; + } + + delete [] m_pSudoku; + delete [] m_pFixedCells; + + return( true ); +} + +void CSudoku::CreateSudoku() +{ + CSG_Table *pTable; + int i,j; + int iValue; + + pTable = Parameters("BOARD")->asTable(); + for (i = 0; i < 9; i++){ + for (j = 0; j < 9; j++){ + iValue = pTable->Get_Record(i)->asInt(j); + if (iValue > 0 && iValue < 10){ + m_pSudoku[i][j] = iValue; + m_pFixedCells[i][j] = true; + } + else{ + m_pSudoku[i][j] = 0; + m_pFixedCells[i][j] = false; + } + + } + } +} + + +bool CSudoku::On_Execute_Position(CSG_Point ptWorld, TSG_Module_Interactive_Mode Mode) +{ + + int iXGrid, iYGrid; + int iXSudoku, iYSudoku; + int iBlock, iCell; + bool pIsPossible[10]; + + if( Mode != MODULE_INTERACTIVE_LDOWN && Mode != MODULE_INTERACTIVE_RDOWN) { + return false; + } + + if (!Get_Grid_Pos(iXGrid, iYGrid) ){ + return false; + } + + iBlock = (int)floor((double)iXGrid / (double)BLOCK_SIZE); + iCell = (int)floor((double)iXGrid - (iBlock * BLOCK_SIZE)) / CELL_SIZE; + iXSudoku = iBlock * 3 + iCell; + + iBlock = (int)floor((double)iYGrid / (double)BLOCK_SIZE); + iCell = (int)floor((double)iYGrid - (iBlock * BLOCK_SIZE)) / CELL_SIZE; + iYSudoku = iBlock * 3 + iCell; + + if (iXSudoku < 0 || iXSudoku > 8 || iYSudoku < 0 || iYSudoku > 8){ + return false; + } + + if (m_pFixedCells[iYSudoku][iXSudoku]){ + return false; + } + + GetPossibleValues(iXSudoku, iYSudoku, pIsPossible); + + if( Mode == MODULE_INTERACTIVE_LDOWN ){ + do{ + m_pSudoku[iYSudoku][iXSudoku]++; + if (m_pSudoku[iYSudoku][iXSudoku] > 9){ + m_pSudoku[iYSudoku][iXSudoku] = 0; + } + }while(!pIsPossible[m_pSudoku[iYSudoku][iXSudoku]]); + } + else{ + do{ + m_pSudoku[iYSudoku][iXSudoku]--; + if (m_pSudoku[iYSudoku][iXSudoku] < 0){ + m_pSudoku[iYSudoku][iXSudoku] = 9; + } + }while(!pIsPossible[m_pSudoku[iYSudoku][iXSudoku]]); + } + + DrawBoard(); + + DataObject_Update(m_pBoard); + + return true; +} + +void CSudoku::DrawBoard() +{ + int i,j; + int iX, iY; + bool pIsPossible[10]; + + m_pBoard->Assign(CELL_COLOR_WHITE); + + for (i = 0; i < 3; i++){ + for (j = 0; j < 3; j++){ + iX = (116 + 3) * i; + iY = (116 + 3) * j; + DrawSquare(iX, iY, CELL_COLOR_BROWN, 116); + } + } + + for (i = 0; i < 9; i++){ + for (j = 0; j < 9; j++){ + GetPossibleValues(i, j, pIsPossible); + DrawCell(i, j, pIsPossible); + } + } + + m_pBoard->Set_Value(0,0, CELL_COLOR_RED); + m_pBoard->Set_Value(0,1, CELL_COLOR_BLACK); + +} + + +void CSudoku::DrawCell(int iXCell, int iYCell, bool *pIsPossible) +{ + int i,j; + int iX, iY; + int iXBlock, iYBlock; + int iXCellInBlock, iYCellInBlock; + int iInnerX, iInnerY; + int iInnerXCell, iInnerYCell; + int iValue; + int iNumberColor;//, iColor; + + iXBlock = (iXCell - (iXCell % 3)) / 3; + iYBlock = (iYCell - (iYCell % 3)) / 3; + iXCellInBlock = iXCell % 3; + iYCellInBlock = iYCell % 3; + iX = (116 + 3) * iXBlock + 38 * iXCellInBlock + 2; + iY = (116 + 3) * iYBlock + 38 * iYCellInBlock + 2; + DrawSquare(iX, iY, CELL_COLOR_YELLOW, 36); + + if (iValue = m_pSudoku[iYCell][iXCell]){ + if (m_pFixedCells[iYCell][iXCell]){ + iNumberColor = CELL_COLOR_RED; + } + else{ + iNumberColor = CELL_COLOR_BLACK; + } + for (i = 0; i < 36; i++){ + for (j = 0; j < 36; j++){ + if (numbers[iValue - 1][j][i]){ + m_pBoard->Set_Value(iX + i, iY + 36 - j - 1, CELL_COLOR_WHITE); + } + else{ + m_pBoard->Set_Value(iX + i, iY + 36 - j - 1, iNumberColor); + } + } + } + } + else{ + for (i = 0; i < 9; i++){ + iInnerXCell = i % 3; + iInnerYCell = (i - iInnerXCell ) / 3; + iInnerX = iX + iInnerXCell * 12 + 1; + iInnerY = iY + iInnerYCell * 12 + 1; + if (pIsPossible[i + 1]){ + DrawSquare(iInnerX, iInnerY, CELL_COLOR_GREEN, 10); + } + else{ + DrawSquare(iInnerX, iInnerY, CELL_COLOR_RED, 10); + } + } + } + + +} + +void CSudoku::DrawSquare(int iX, int iY, int iColor, int iSize) +{ + int i, j; + + for (i = 0; i < iSize; i++){ + for (j = 0; j < iSize; j++){ + m_pBoard->Set_Value(iX + i, iY + j, iColor); + } + } +} + +void CSudoku::GetPossibleValues(int iX, int iY, bool *pIsPossible) +{ + + int i,j; + int iInitX, iInitY; + + iInitX = (int)floor((double)iX / 3.) * 3; + iInitY = (int)floor((double)iY / 3.) * 3; + + for (i = 0; i < 10; i++){ + pIsPossible[i] = true; + } + + for (i = 0; i < 9; i++){ + pIsPossible[m_pSudoku[iY][i]] = false; + } + + for (i = 0; i < 9; i++){ + pIsPossible[m_pSudoku[i][iX]] = false; + } + + for (i = 0; i < 3; i++){ + for (j = 0; j < 3; j++){ + pIsPossible[m_pSudoku[iInitY + i][iInitX + j]] = false; + } + } + + pIsPossible[0] = true; + +} + +bool CSudoku::Get_Grid_Pos(int &x, int &y) +{ + bool bResult; + + if( m_pBoard && m_pBoard->is_Valid() ) + { + bResult = true; + + x = (int)(0.5 + (Get_xPosition() - m_pBoard->Get_XMin()) / m_pBoard->Get_Cellsize()); + + if( x < 0 ) + { + bResult = false; + x = 0; + } + else if( x >= m_pBoard->Get_NX() ) + { + bResult = false; + x = m_pBoard->Get_NX() - 1; + } + + y = (int)(0.5 + (Get_yPosition() - m_pBoard->Get_YMin()) / m_pBoard->Get_Cellsize()); + + if( y < 0 ) + { + bResult = false; + y = 0; + } + else if( y >= m_pBoard->Get_NY() ) + { + bResult = false; + y = m_pBoard->Get_NY() - 1; + } + + return( bResult ); + } + + x = 0; + y = 0; + + return( false ); +} diff -Nru saga-2.1.0+dfsg/src/modules/garden/garden_games/Sudoku.h saga-2.1.4+dfsg/src/modules/garden/garden_games/Sudoku.h --- saga-2.1.0+dfsg/src/modules/garden/garden_games/Sudoku.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/garden/garden_games/Sudoku.h 2014-11-13 08:32:19.000000000 +0000 @@ -0,0 +1,104 @@ +/********************************************************** + * Version $Id: Sudoku.h 1922 2014-01-09 10:28:46Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library // +// // +// Sudoku // +// // +//-------------------------------------------------------// +// // +// Sudoku.h // +// // +// Copyright (C) 2006 by Victor Olaya // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: your@e-mail.abc // +// // +// contact: Your Name // +// And Address // +// // +/////////////////////////////////////////////////////////// + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#ifndef HEADER_INCLUDED__Sudoku_H +#define HEADER_INCLUDED__Sudoku_H + +//--------------------------------------------------------- +#include "MLB_Interface.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +class CSudoku : public CSG_Module_Grid_Interactive +{ +public: + CSudoku(void); + virtual ~CSudoku(void); + + +protected: + + virtual bool On_Execute (void); + virtual bool On_Execute_Finish (void); + virtual bool On_Execute_Position (CSG_Point ptWorld, TSG_Module_Interactive_Mode Mode); + + +private: + + bool **m_pFixedCells; + + int **m_pSudoku; + + CSG_Grid *m_pBoard; + + + bool Get_Grid_Pos (int &x, int &y); + + void DrawBoard(); + void DrawCell(int iXCell, int iYCell, bool *pIsPossible); + void CreateSudoku(); + void DrawSquare(int iX, int iY, int iColor, int iSize); + void GetPossibleValues(int iX, int iY, bool *pIsPossible); + +}; + +#endif // #ifndef HEADER_INCLUDED__Sudoku_H diff -Nru saga-2.1.0+dfsg/src/modules/garden/garden_learn_to_program/Exercise_01.cpp saga-2.1.4+dfsg/src/modules/garden/garden_learn_to_program/Exercise_01.cpp --- saga-2.1.0+dfsg/src/modules/garden/garden_learn_to_program/Exercise_01.cpp 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/garden/garden_learn_to_program/Exercise_01.cpp 2014-11-13 08:32:19.000000000 +0000 @@ -0,0 +1,200 @@ +/********************************************************** + * Version $Id: Exercise_01.cpp 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// Lectures // +// // +//-------------------------------------------------------// +// // +// Exercise_01.cpp // +// // +// Copyright (C) 2003 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Goettingen // +// Goldschmidtstr. 5 // +// 37077 Goettingen // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "Exercise_01.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +CExercise_01::CExercise_01(void) +{ + //----------------------------------------------------- + // Give some information about your module... + + Set_Name (_TL("01: My first module")); + + Set_Author (_TL("Copyrights (c) 2003 by Olaf Conrad")); + + Set_Description (_TW( + "(c) 2003 by Olaf Conrad, Goettingen\n" + "email: oconrad@gwdg.de") + ); + + + //----------------------------------------------------- + // Define your parameters list... + + Parameters.Add_Grid( + NULL, "INPUT" , _TL("Input"), + _TL("This must be your input data of type grid."), + PARAMETER_INPUT + ); + + Parameters.Add_Grid( + NULL, "OUTPUT" , _TL("Output"), + _TL("This will contain your output data of type grid."), + PARAMETER_OUTPUT + ); + + Parameters.Add_Value( + NULL, "FACTOR" , _TL("Factor"), + _TL("Type in a value that shall be used for the chosen mathematical operation."), + PARAMETER_TYPE_Double, + 1.0 + ); + + Parameters.Add_Choice( + NULL, "METHOD" , _TL("Method"), + _TL("Choose a method"), + + CSG_String::Format(SG_T("%s|%s|%s|%s|"), + _TL("Addition"), + _TL("Subtraction"), + _TL("Multiplication"), + _TL("Division") + ) + ); +} + +//--------------------------------------------------------- +CExercise_01::~CExercise_01(void) +{} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CExercise_01::On_Execute(void) +{ + int x, y, Method; + double Factor, Value_Input, Value_Output; + CSG_Grid *pInput, *pOutput; + + //----------------------------------------------------- + // Get parameter settings... + + pInput = Parameters("INPUT" )->asGrid(); + pOutput = Parameters("OUTPUT")->asGrid(); + Factor = Parameters("FACTOR")->asDouble(); + Method = Parameters("METHOD")->asInt(); + + + //----------------------------------------------------- + // Check for valid parameter settings... + + if( Method == 3 && Factor == 0.0 ) + { + Message_Add(_TL("Division by zero is not allowed !!!")); + Message_Dlg(_TL("Division by zero is not allowed !!!")); + + return( false ); // prevent a division by zero!!! + } + + + //----------------------------------------------------- + // Execute calculation... + + for(y=0; yasDouble(x, y); + + switch( Method ) + { + case 0: // Addition... + Value_Output = Value_Input + Factor; + break; + + case 1: // Subtraction... + Value_Output = Value_Input - Factor; + break; + + case 2: // Multiplication... + Value_Output = Value_Input * Factor; + break; + + case 3: // Division... + Value_Output = Value_Input / Factor; + break; + } + + pOutput->Set_Value(x, y, Value_Output); + } + } + + + //----------------------------------------------------- + // Return 'true' if everything went okay... + + return( true ); +} diff -Nru saga-2.1.0+dfsg/src/modules/garden/garden_learn_to_program/Exercise_01.h saga-2.1.4+dfsg/src/modules/garden/garden_learn_to_program/Exercise_01.h --- saga-2.1.0+dfsg/src/modules/garden/garden_learn_to_program/Exercise_01.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/garden/garden_learn_to_program/Exercise_01.h 2014-11-13 08:32:19.000000000 +0000 @@ -0,0 +1,91 @@ +/********************************************************** + * Version $Id: Exercise_01.h 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// Lectures // +// // +//-------------------------------------------------------// +// // +// Exercise_01.h // +// // +// Copyright (C) 2003 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Goettingen // +// Goldschmidtstr. 5 // +// 37077 Goettingen // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#ifndef HEADER_INCLUDED__Exercise_01_H +#define HEADER_INCLUDED__Exercise_01_H + +//--------------------------------------------------------- +#include "MLB_Interface.h" + +//--------------------------------------------------------- +class CExercise_01 : public CSG_Module_Grid +{ +public: ////// public members and functions: ////////////// + + CExercise_01(void); // constructor + virtual ~CExercise_01(void); // destructor + + +protected: /// protected members and functions: /////////// + + virtual bool On_Execute(void); // always override this function + + +private: ///// private members and functions: ///////////// + + +}; + + +//--------------------------------------------------------- +#endif // #ifndef HEADER_INCLUDED__Exercise_01_H diff -Nru saga-2.1.0+dfsg/src/modules/garden/garden_learn_to_program/Exercise_02.cpp saga-2.1.4+dfsg/src/modules/garden/garden_learn_to_program/Exercise_02.cpp --- saga-2.1.0+dfsg/src/modules/garden/garden_learn_to_program/Exercise_02.cpp 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/garden/garden_learn_to_program/Exercise_02.cpp 2014-11-13 08:32:19.000000000 +0000 @@ -0,0 +1,201 @@ +/********************************************************** + * Version $Id: Exercise_02.cpp 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// Lectures // +// // +//-------------------------------------------------------// +// // +// Exercise_02.cpp // +// // +// Copyright (C) 2003 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Goettingen // +// Goldschmidtstr. 5 // +// 37077 Goettingen // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "Exercise_02.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +CExercise_02::CExercise_02(void) +{ + //----------------------------------------------------- + // Give some information about your module... + + Set_Name (_TL("02: Pixel by pixel operations with two grids")); + + Set_Author (_TL("Copyrights (c) 2003 by Olaf Conrad")); + + Set_Description (_TW( + "Pixel by pixel operations with two grids.\n" + "(c) 2003 by Olaf Conrad, Goettingen\n" + "email: oconrad@gwdg.de") + ); + + + //----------------------------------------------------- + // Define your parameters list... + + Parameters.Add_Grid( + NULL, "INPUT_A" , _TL("First input grid"), + _TL("This must be your input data of type grid."), + PARAMETER_INPUT + ); + + Parameters.Add_Grid( + NULL, "INPUT_B" , _TL("Second input grid"), + _TL("This must be your input data of type grid."), + PARAMETER_INPUT + ); + + Parameters.Add_Grid( + NULL, "OUTPUT" , _TL("Output"), + _TL("This will contain your output data of type grid."), + PARAMETER_OUTPUT + ); + + Parameters.Add_Choice( + NULL, "METHOD" , _TL("Method"), + _TL("Choose a method"), + + CSG_String::Format(SG_T("%s|%s|%s|%s|"), + _TL("Addition|"), + _TL("Subtraction"), + _TL("Multiplication"), + _TL("Division") + ) + ); +} + +//--------------------------------------------------------- +CExercise_02::~CExercise_02(void) +{} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CExercise_02::On_Execute(void) +{ + int x, y, Method; + double a, b; + CSG_Grid *pInput_A, *pInput_B, *pOutput; + + //----------------------------------------------------- + // Get parameter settings... + + pInput_A = Parameters("INPUT_A")->asGrid(); + pInput_B = Parameters("INPUT_B")->asGrid(); + pOutput = Parameters("OUTPUT")->asGrid(); + Method = Parameters("METHOD")->asInt(); + + + //----------------------------------------------------- + // Execute calculation... + + for(y=0; yis_NoData(x, y) || pInput_B->is_NoData(x, y) ) // don't work with 'no data'... + { + pOutput->Set_NoData(x, y); + } + else + { + a = pInput_A->asDouble(x, y); + b = pInput_B->asDouble(x, y); + + switch( Method ) + { + case 0: // Addition... + pOutput->Set_Value(x, y, a + b); + break; + + case 1: // Subtraction... + pOutput->Set_Value(x, y, a - b); + break; + + case 2: // Multiplication... + pOutput->Set_Value(x, y, a * b); + break; + + case 3: // Division... + if( b != 0.0 ) // prevent division by zero... + { + pOutput->Set_Value(x, y, a / b); + } + else + { + pOutput->Set_NoData(x, y); + } + break; + } + } + } + } + + + //----------------------------------------------------- + // Return 'true' if everything went okay... + + return( true ); +} diff -Nru saga-2.1.0+dfsg/src/modules/garden/garden_learn_to_program/Exercise_02.h saga-2.1.4+dfsg/src/modules/garden/garden_learn_to_program/Exercise_02.h --- saga-2.1.0+dfsg/src/modules/garden/garden_learn_to_program/Exercise_02.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/garden/garden_learn_to_program/Exercise_02.h 2014-11-13 08:32:19.000000000 +0000 @@ -0,0 +1,91 @@ +/********************************************************** + * Version $Id: Exercise_02.h 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// Lectures // +// // +//-------------------------------------------------------// +// // +// Exercise_02.h // +// // +// Copyright (C) 2003 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Goettingen // +// Goldschmidtstr. 5 // +// 37077 Goettingen // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#ifndef HEADER_INCLUDED__Exercise_02_H +#define HEADER_INCLUDED__Exercise_02_H + +//--------------------------------------------------------- +#include "MLB_Interface.h" + +//--------------------------------------------------------- +class CExercise_02 : public CSG_Module_Grid +{ +public: ////// public members and functions: ////////////// + + CExercise_02(void); // constructor + virtual ~CExercise_02(void); // destructor + + +protected: /// protected members and functions: /////////// + + virtual bool On_Execute(void); // always override this function + + +private: ///// private members and functions: ///////////// + + +}; + + +//--------------------------------------------------------- +#endif // #ifndef HEADER_INCLUDED__Exercise_02_H diff -Nru saga-2.1.0+dfsg/src/modules/garden/garden_learn_to_program/Exercise_03.cpp saga-2.1.4+dfsg/src/modules/garden/garden_learn_to_program/Exercise_03.cpp --- saga-2.1.0+dfsg/src/modules/garden/garden_learn_to_program/Exercise_03.cpp 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/garden/garden_learn_to_program/Exercise_03.cpp 2014-11-13 08:32:19.000000000 +0000 @@ -0,0 +1,321 @@ +/********************************************************** + * Version $Id: Exercise_03.cpp 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// Lectures // +// // +//-------------------------------------------------------// +// // +// Exercise_03.cpp // +// // +// Copyright (C) 2003 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Goettingen // +// Goldschmidtstr. 5 // +// 37077 Goettingen // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "Exercise_03.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +CExercise_03::CExercise_03(void) +{ + //----------------------------------------------------- + // Give some information about your module... + + Set_Name (_TL("03: Direct neighbours")); + + Set_Author (_TL("Copyrights (c) 2003 by Olaf Conrad")); + + Set_Description (_TW( + "Simple neighbourhood analysis for grid cells.\n" + "(c) 2003 by Olaf Conrad, Goettingen\n" + "email: oconrad@gwdg.de") + ); + + + //----------------------------------------------------- + // Define your parameters list... + + Parameters.Add_Grid( + NULL, "INPUT" , _TL("Input grid"), + _TL("This must be your input data of type grid."), + PARAMETER_INPUT + ); + + Parameters.Add_Grid( + NULL, "OUTPUT" , _TL("Output"), + _TL("This will contain your output data of type grid."), + PARAMETER_OUTPUT + ); + + Parameters.Add_Choice( + NULL, "METHOD" , _TL("Method"), + _TL("Choose a method"), + + CSG_String::Format(SG_T("%s|%s|%s|%s|"), + _TL("Difference to left neighbour"), + _TL("Difference to left neighbour (using a while loop)"), + _TL("Slope gradient to left neighbour [%%]"), + _TL("Slope gradient to left neighbour [Degree]") + ) + ); +} + +//--------------------------------------------------------- +CExercise_03::~CExercise_03(void) +{} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CExercise_03::On_Execute(void) +{ + bool bResult; + int Method; + + //----------------------------------------------------- + // Get parameter settings... + + m_pInput = Parameters("INPUT" )->asGrid(); + m_pOutput = Parameters("OUTPUT")->asGrid(); + + Method = Parameters("METHOD")->asInt(); + + + //----------------------------------------------------- + // Execute calculation... + + switch( Method ) + { + case 0: + bResult = Method_01(); + break; + + case 1: + bResult = Method_02(); + break; + + case 2: + bResult = Method_03(); + break; + + case 3: + bResult = Method_04(); + break; + + default: + bResult = false; + } + + + //----------------------------------------------------- + // Return 'true' if everything went okay... + + return( bResult ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CExercise_03::Method_01(void) +{ + int x, y, ix; + double a, b, c; + + //----------------------------------------------------- + for(y=0; yis_NoData(x, y) || m_pInput->is_NoData(ix, y) ) // don't work with 'no data'... + { + m_pOutput->Set_NoData(x, y); + } + else + { + a = m_pInput->asDouble( x, y); + b = m_pInput->asDouble(ix, y); + + c = a - b; + + m_pOutput->Set_Value(x, y, c); + } + } + + m_pOutput->Set_NoData(Get_NX() - 1, y); // what shall we do with the last cell in a row ??!! + } + + //----------------------------------------------------- + return( true ); +} + +//--------------------------------------------------------- +bool CExercise_03::Method_02(void) +{ + int x, y, ix; + double a, b, c; + + //----------------------------------------------------- + for(y=0; yis_NoData(x, y) || m_pInput->is_NoData(ix, y) ) // don't work with 'no data'... + { + m_pOutput->Set_NoData(x, y); + } + else + { + a = m_pInput->asDouble( x, y); + b = m_pInput->asDouble(ix, y); + + c = a - b; + + m_pOutput->Set_Value(x, y, c); + } + + x++; // increment x... + } + + m_pOutput->Set_NoData(Get_NX() - 1, y); // what shall we do with the last cell in a row ??!! + } + + //----------------------------------------------------- + return( true ); +} + +//--------------------------------------------------------- +bool CExercise_03::Method_03(void) +{ + int x, y, ix; + double a, b, c; + + //----------------------------------------------------- + for(y=0; yis_NoData(x, y) || m_pInput->is_NoData(ix, y) ) // don't work with 'no data'... + { + m_pOutput->Set_NoData(x, y); + } + else + { + a = m_pInput->asDouble( x, y); + b = m_pInput->asDouble(ix, y); + + c = 100.0 * (a - b) / Get_Cellsize(); + + m_pOutput->Set_Value(x, y, c); + } + } + + m_pOutput->Set_NoData(x, y); // what shall we do with the last cell in a row ??!! + } + + //----------------------------------------------------- + return( true ); +} + +//--------------------------------------------------------- +bool CExercise_03::Method_04(void) +{ + int x, y, ix; + double a, b, c; + + //----------------------------------------------------- + for(y=0; yis_NoData(x, y) || m_pInput->is_NoData(ix, y) ) // don't work with 'no data'... + { + m_pOutput->Set_NoData(x, y); + } + else + { + a = m_pInput->asDouble( x, y); + b = m_pInput->asDouble(ix, y); + + c = atan((a - b) / Get_Cellsize()) * 180.0 / M_PI; + + m_pOutput->Set_Value(x, y, c); + } + } + + m_pOutput->Set_NoData(x, y); // what shall we do with the last cell in a row ??!! + } + + //----------------------------------------------------- + return( true ); +} diff -Nru saga-2.1.0+dfsg/src/modules/garden/garden_learn_to_program/Exercise_03.h saga-2.1.4+dfsg/src/modules/garden/garden_learn_to_program/Exercise_03.h --- saga-2.1.0+dfsg/src/modules/garden/garden_learn_to_program/Exercise_03.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/garden/garden_learn_to_program/Exercise_03.h 2014-11-13 08:32:19.000000000 +0000 @@ -0,0 +1,98 @@ +/********************************************************** + * Version $Id: Exercise_03.h 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// Lectures // +// // +//-------------------------------------------------------// +// // +// Exercise_03.h // +// // +// Copyright (C) 2003 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Goettingen // +// Goldschmidtstr. 5 // +// 37077 Goettingen // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#ifndef HEADER_INCLUDED__Exercise_03_H +#define HEADER_INCLUDED__Exercise_03_H + +//--------------------------------------------------------- +#include "MLB_Interface.h" + +//--------------------------------------------------------- +class CExercise_03 : public CSG_Module_Grid +{ +public: ////// public members and functions: ////////////// + + CExercise_03(void); // constructor + virtual ~CExercise_03(void); // destructor + + +protected: /// protected members and functions: /////////// + + virtual bool On_Execute(void); // always override this function + + +private: ///// private members and functions: ///////////// + + CSG_Grid *m_pInput, *m_pOutput; + + + bool Method_01(void); + bool Method_02(void); + bool Method_03(void); + bool Method_04(void); + +}; + + +//--------------------------------------------------------- +#endif // #ifndef HEADER_INCLUDED__Exercise_03_H diff -Nru saga-2.1.0+dfsg/src/modules/garden/garden_learn_to_program/Exercise_04.cpp saga-2.1.4+dfsg/src/modules/garden/garden_learn_to_program/Exercise_04.cpp --- saga-2.1.0+dfsg/src/modules/garden/garden_learn_to_program/Exercise_04.cpp 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/garden/garden_learn_to_program/Exercise_04.cpp 2014-11-13 08:32:19.000000000 +0000 @@ -0,0 +1,446 @@ +/********************************************************** + * Version $Id: Exercise_04.cpp 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// Lectures // +// // +//-------------------------------------------------------// +// // +// Exercise_04.cpp // +// // +// Copyright (C) 2003 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Goettingen // +// Goldschmidtstr. 5 // +// 37077 Goettingen // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "Exercise_04.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +CExercise_04::CExercise_04(void) +{ + //----------------------------------------------------- + // Give some information about your module... + + Set_Name (_TL("04: Direct neighbours - more...")); + + Set_Author (_TL("Copyrights (c) 2003 by Olaf Conrad")); + + Set_Description (_TW( + "Simple neighbourhood analysis for grid cells.\n" + "(c) 2003 by Olaf Conrad, Goettingen\n" + "email: oconrad@gwdg.de") + ); + + + //----------------------------------------------------- + // Define your parameters list... + + Parameters.Add_Grid( + NULL, "INPUT" , _TL("Input grid"), + _TL("This must be your input data of type grid."), + PARAMETER_INPUT + ); + + Parameters.Add_Grid( + NULL, "OUTPUT" , _TL("Output"), + _TL("This will contain your output data of type grid."), + PARAMETER_OUTPUT + ); + + Parameters.Add_Choice( + NULL, "METHOD" , _TL("Method"), + _TL("Choose a method"), + + CSG_String::Format(SG_T("%s|%s|%s|%s|%s|%s|"), + _TL("Arithmetic mean (version 1)"), + _TL("Arithmetic mean (version 2)"), + _TL("Difference from all neighbour's mean"), + _TL("Variance (version 1)"), + _TL("Variance (version 2)"), + _TL("Standard deviation") + ) + ); +} + +//--------------------------------------------------------- +CExercise_04::~CExercise_04(void) +{} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CExercise_04::On_Execute(void) +{ + bool bResult; + int Method; + + //----------------------------------------------------- + // Get parameter settings... + + m_pInput = Parameters("INPUT" )->asGrid(); + m_pOutput = Parameters("OUTPUT")->asGrid(); + + Method = Parameters("METHOD")->asInt(); + + + //----------------------------------------------------- + // Execute calculation... + + switch( Method ) + { + case 0: + bResult = Method_01(); + break; + + case 1: + bResult = Method_02(); + break; + + case 2: + bResult = Method_03(); + break; + + case 3: + bResult = Method_04(); + break; + + case 4: + bResult = Method_05(); + break; + + case 5: + bResult = Method_06(); + break; + + default: + bResult = false; + } + + + //----------------------------------------------------- + // Return 'true' if everything went okay... + + return( bResult ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CExercise_04::Method_01(void) +{ + int x, y, ix, iy, n; + double s; + + //----------------------------------------------------- + for(y=0; yis_NoData(ix, iy) ) + { + s += m_pInput->asDouble(ix, iy); + n++; + } + } + } + + if( n > 0 ) + { + m_pOutput->Set_Value(x, y, s / n); + } + else + { + m_pOutput->Set_NoData(x, y); + } + } + } + + //----------------------------------------------------- + return( true ); +} + +//--------------------------------------------------------- +bool CExercise_04::Method_02(void) +{ + int x, y, i, ix, iy, n; + double s; + + //----------------------------------------------------- + for(y=0; yis_NoData(x, y) ) + { + m_pOutput->Set_NoData(x, y); + } + else + { + s = m_pInput->asDouble(x, y); + n = 1; + + for(i=0; i<8; i++) + { + ix = Get_xTo(i, x); + iy = Get_yTo(i, y); + + if( is_InGrid(ix, iy) && !m_pInput->is_NoData(ix, iy) ) + { + s += m_pInput->asDouble(ix, iy); + n++; + } + } + + m_pOutput->Set_Value(x, y, s / n); + } + } + } + + //----------------------------------------------------- + return( true ); +} + +//--------------------------------------------------------- +bool CExercise_04::Method_03(void) +{ + int x, y, i, ix, iy, n; + double s; + + //----------------------------------------------------- + for(y=0; yis_NoData(x, y) ) + { + m_pOutput->Set_NoData(x, y); + } + else + { + s = 0.0; + n = 0; + + for(i=0; i<8; i++) + { + ix = Get_xTo(i, x); + iy = Get_yTo(i, y); + + if( is_InGrid(ix, iy) && !m_pInput->is_NoData(ix, iy) ) + { + s += m_pInput->asDouble(ix, iy); + n++; + } + } + + if( n > 0 ) + { + m_pOutput->Set_Value(x, y, m_pInput->asDouble(x, y) - s / n); + } + else + { + m_pOutput->Set_NoData(x, y); + } + } + } + } + + //----------------------------------------------------- + return( true ); +} + +//--------------------------------------------------------- +bool CExercise_04::Method_04(void) +{ + int x, y, i, ix, iy, n; + double m, v, z[9], dz; + + //----------------------------------------------------- + for(y=0; yis_NoData(ix, iy) ) + { + z[n++] = m_pInput->asDouble(ix, iy); + } + } + } + + if( n > 0 ) + { + for(m=0.0, i=0; iSet_Value(x, y, v); + } + else + { + m_pOutput->Set_NoData(x, y); + } + } + } + + //----------------------------------------------------- + return( true ); +} + +//--------------------------------------------------------- +bool CExercise_04::Method_05(void) +{ + int x, y, ix, iy, n; + double m, v, z; + + //----------------------------------------------------- + for(y=0; yis_NoData(ix, iy) ) + { + n++; + + z = m_pInput->asDouble(ix, iy); + + m += z; + v += z * z; + } + } + } + + if( n > 0 ) + { + m = m / n; + v = v / n - m * m; + + m_pOutput->Set_Value(x, y, v); + } + else + { + m_pOutput->Set_NoData(x, y); + } + } + } + + //----------------------------------------------------- + return( true ); +} + +//--------------------------------------------------------- +bool CExercise_04::Method_06(void) +{ + //----------------------------------------------------- + if( Method_05() == false ) + { + return( false ); + } + + //----------------------------------------------------- + for(sLong n=0; nis_NoData(n) == false ) + { + double v = m_pOutput->asDouble(n); + + m_pOutput->Set_Value(n, sqrt(v)); + } + } + + //----------------------------------------------------- + return( true ); +} diff -Nru saga-2.1.0+dfsg/src/modules/garden/garden_learn_to_program/Exercise_04.h saga-2.1.4+dfsg/src/modules/garden/garden_learn_to_program/Exercise_04.h --- saga-2.1.0+dfsg/src/modules/garden/garden_learn_to_program/Exercise_04.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/garden/garden_learn_to_program/Exercise_04.h 2014-11-13 08:32:19.000000000 +0000 @@ -0,0 +1,100 @@ +/********************************************************** + * Version $Id: Exercise_04.h 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// Lectures // +// // +//-------------------------------------------------------// +// // +// Exercise_04.h // +// // +// Copyright (C) 2003 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Goettingen // +// Goldschmidtstr. 5 // +// 37077 Goettingen // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#ifndef HEADER_INCLUDED__Exercise_04_H +#define HEADER_INCLUDED__Exercise_04_H + +//--------------------------------------------------------- +#include "MLB_Interface.h" + +//--------------------------------------------------------- +class CExercise_04 : public CSG_Module_Grid +{ +public: ////// public members and functions: ////////////// + + CExercise_04(void); // constructor + virtual ~CExercise_04(void); // destructor + + +protected: /// protected members and functions: /////////// + + virtual bool On_Execute(void); // always override this function + + +private: ///// private members and functions: ///////////// + + CSG_Grid *m_pInput, *m_pOutput; + + + bool Method_01(void); + bool Method_02(void); + bool Method_03(void); + bool Method_04(void); + bool Method_05(void); + bool Method_06(void); + +}; + + +//--------------------------------------------------------- +#endif // #ifndef HEADER_INCLUDED__Exercise_04_H diff -Nru saga-2.1.0+dfsg/src/modules/garden/garden_learn_to_program/Exercise_05.cpp saga-2.1.4+dfsg/src/modules/garden/garden_learn_to_program/Exercise_05.cpp --- saga-2.1.0+dfsg/src/modules/garden/garden_learn_to_program/Exercise_05.cpp 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/garden/garden_learn_to_program/Exercise_05.cpp 2014-11-13 08:32:19.000000000 +0000 @@ -0,0 +1,372 @@ +/********************************************************** + * Version $Id: Exercise_05.cpp 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// Lectures // +// // +//-------------------------------------------------------// +// // +// Exercise_05.cpp // +// // +// Copyright (C) 2003 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Goettingen // +// Goldschmidtstr. 5 // +// 37077 Goettingen // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "Exercise_05.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +CExercise_05::CExercise_05(void) +{ + //----------------------------------------------------- + // Give some information about your module... + + Set_Name (_TL("05: Direct neighbours - slope and aspect")); + + Set_Author (_TL("Copyrights (c) 2003 by Olaf Conrad")); + + Set_Description (_TW( + "Simple neighbourhood analysis for grid cells.\n" + "- Zevenbergen, L.W. / Thorne, C.R. (1987):\n" + " 'Quantitative analysis of land surface topography',\n" + " Earth Surface Processes and Landforms, 12: 47-56.\n\n" + "(c) 2003 by Olaf Conrad, Goettingen\n" + "email: oconrad@gwdg.de") + ); + + + //----------------------------------------------------- + // Define your parameters list... + + Parameters.Add_Grid( + NULL, "ELEVATION" , _TL("Input grid"), + _TL("This must be your input data of type grid."), + PARAMETER_INPUT + ); + + Parameters.Add_Grid( + NULL, "SLOPE" , _TL("Slope"), + _TL("This will contain your output data of type grid."), + PARAMETER_OUTPUT + ); + + Parameters.Add_Grid( + NULL, "ASPECT" , _TL("Aspect"), + _TL("This will contain your output data of type grid."), + PARAMETER_OUTPUT + ); + + Parameters.Add_Choice( + NULL, "METHOD" , _TL("Method"), + _TL("Choose a method"), + + CSG_String::Format(SG_T("%s|%s|%s|"), + _TL("Steepest gradient (first version)"), + _TL("Steepest gradient (second version)"), + _TL("Zevenbergen & Thorne") + ) + ); +} + +//--------------------------------------------------------- +CExercise_05::~CExercise_05(void) +{} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CExercise_05::On_Execute(void) +{ + bool bResult; + int Method; + + //----------------------------------------------------- + // Get parameter settings... + + m_pDTM = Parameters("ELEVATION")->asGrid(); + + m_pSlope = Parameters("SLOPE" )->asGrid(); + m_pAspect = Parameters("ASPECT" )->asGrid(); + + Method = Parameters("METHOD")->asInt(); + + m_pSlope ->Set_Unit(_TL("radians")); + m_pAspect ->Set_Unit(_TL("radians")); + + + //----------------------------------------------------- + // Execute calculation... + + switch( Method ) + { + case 0: + bResult = Method_01(); + break; + + case 1: + bResult = Method_02(); + break; + + default: + bResult = false; + } + + + //----------------------------------------------------- + // Return 'true' if everything went okay... + + return( bResult ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CExercise_05::Method_01(void) +{ + int x, y, i, ix, iy, iMax; + double z, dz, dzMax, + dx[2] = { Get_Cellsize(), sqrt(2.0) * Get_Cellsize() }; + + //----------------------------------------------------- + for(y=0; yis_NoData(x, y) ) + { + m_pSlope ->Set_NoData(x, y); + m_pAspect ->Set_NoData(x, y); + } + else + { + z = m_pDTM->asDouble(x, y); + iMax = -1; + + for(i=0; i<8; i++) + { + ix = Get_xTo(i, x); + iy = Get_yTo(i, y); + + if( is_InGrid(ix, iy) && !m_pDTM->is_NoData(ix, iy) ) + { + dz = (z - m_pDTM->asDouble(ix, iy)) / dx[i % 2]; + + if( dz > 0.0 && (iMax < 0 || (iMax >= 0 && dzMax < dz)) ) + { + iMax = i; + dzMax = dz; + } + } + } + + if( iMax < 0 ) + { + m_pSlope ->Set_NoData(x, y); + m_pAspect ->Set_NoData(x, y); + } + else + { + m_pSlope ->Set_Value(x, y, atan(dzMax)); + m_pAspect ->Set_Value(x, y, M_PI_045 * iMax); + } + } + } + } + + //----------------------------------------------------- + return( true ); +} + +//--------------------------------------------------------- +bool CExercise_05::Method_02(void) +{ + int x, y, i, ix, iy, iMax; + double z, dz, dzMax; + + //----------------------------------------------------- + for(y=0; yis_NoData(x, y) ) + { + m_pSlope ->Set_NoData(x, y); + m_pAspect ->Set_NoData(x, y); + } + else + { + z = m_pDTM->asDouble(x, y); + iMax = -1; + + for(i=0; i<8; i++) + { + ix = Get_xTo(i, x); + iy = Get_yTo(i, y); + + if( is_InGrid(ix, iy) && !m_pDTM->is_NoData(ix, iy) ) + { + dz = (z - m_pDTM->asDouble(ix, iy)) / Get_Length(i); + + if( dz > 0.0 && (iMax < 0 || (iMax >= 0 && dzMax < dz)) ) + { + iMax = i; + dzMax = dz; + } + } + } + + if( iMax < 0 ) + { + m_pSlope ->Set_NoData(x, y); + m_pAspect ->Set_NoData(x, y); + } + else + { + m_pSlope ->Set_Value(x, y, atan(dzMax)); + m_pAspect ->Set_Value(x, y, M_PI_045 * iMax); + } + } + } + } + + //----------------------------------------------------- + return( true ); +} + +//--------------------------------------------------------- +bool CExercise_05::Method_03(void) +{ + static int x_To[] = { 0, 1, 0, -1 }, + y_To[] = { 1, 0, -1, 0 }; + + int x, y, i, ix, iy; + double z, dz[4], G, H, dx2; + + //----------------------------------------------------- + dx2 = 2.0 * Get_Cellsize(); + + //----------------------------------------------------- + for(y=0; yis_NoData(x, y) ) + { + m_pSlope ->Set_NoData(x, y); + m_pAspect ->Set_NoData(x, y); + } + + //--------------------------------------------- + else + { + z = m_pDTM->asDouble(x, y); + + for(i=0; i<4; i++) + { + ix = x + x_To[i]; + iy = y + y_To[i]; + + if( m_pDTM->is_NoData(ix, iy) ) + { + dz[i] = 0.0; + } + else + { + dz[i] = m_pDTM->asDouble(ix, iy) - z; + } + } + + //----------------------------------------- + G = (dz[0] - dz[2]) / dx2; + H = (dz[1] - dz[3]) / dx2; + + m_pSlope ->Set_Value(x, y, atan(sqrt(G*G + H*H))); + + if( G != 0.0 ) + { + m_pAspect ->Set_Value(x, y, M_PI_180 + atan2(H, G)); + } + else if( H > 0.0 ) + { + m_pAspect ->Set_Value(x, y, M_PI_270); + } + else if( H < 0.0 ) + { + m_pAspect ->Set_Value(x, y, M_PI_090); + } + else + { + m_pAspect ->Set_NoData(x, y); + } + } + } + } + + //----------------------------------------------------- + return( true ); +} diff -Nru saga-2.1.0+dfsg/src/modules/garden/garden_learn_to_program/Exercise_05.h saga-2.1.4+dfsg/src/modules/garden/garden_learn_to_program/Exercise_05.h --- saga-2.1.0+dfsg/src/modules/garden/garden_learn_to_program/Exercise_05.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/garden/garden_learn_to_program/Exercise_05.h 2014-11-13 08:32:19.000000000 +0000 @@ -0,0 +1,97 @@ +/********************************************************** + * Version $Id: Exercise_05.h 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// Lectures // +// // +//-------------------------------------------------------// +// // +// Exercise_05.h // +// // +// Copyright (C) 2003 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Goettingen // +// Goldschmidtstr. 5 // +// 37077 Goettingen // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#ifndef HEADER_INCLUDED__Exercise_05_H +#define HEADER_INCLUDED__Exercise_05_H + +//--------------------------------------------------------- +#include "MLB_Interface.h" + +//--------------------------------------------------------- +class CExercise_05 : public CSG_Module_Grid +{ +public: ////// public members and functions: ////////////// + + CExercise_05(void); // constructor + virtual ~CExercise_05(void); // destructor + + +protected: /// protected members and functions: /////////// + + virtual bool On_Execute(void); // always override this function + + +private: ///// private members and functions: ///////////// + + CSG_Grid *m_pDTM, *m_pSlope, *m_pAspect; + + + bool Method_01(void); + bool Method_02(void); + bool Method_03(void); + +}; + + +//--------------------------------------------------------- +#endif // #ifndef HEADER_INCLUDED__Exercise_05_H diff -Nru saga-2.1.0+dfsg/src/modules/garden/garden_learn_to_program/Exercise_06.cpp saga-2.1.4+dfsg/src/modules/garden/garden_learn_to_program/Exercise_06.cpp --- saga-2.1.0+dfsg/src/modules/garden/garden_learn_to_program/Exercise_06.cpp 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/garden/garden_learn_to_program/Exercise_06.cpp 2014-11-13 08:32:19.000000000 +0000 @@ -0,0 +1,326 @@ +/********************************************************** + * Version $Id: Exercise_06.cpp 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// Lectures // +// // +//-------------------------------------------------------// +// // +// Exercise_06.cpp // +// // +// Copyright (C) 2003 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Goettingen // +// Goldschmidtstr. 5 // +// 37077 Goettingen // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "Exercise_06.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +CExercise_06::CExercise_06(void) +{ + //----------------------------------------------------- + // Give some information about your module... + + Set_Name (_TL("06: Extended neighbourhoods")); + + Set_Author (_TL("Copyrights (c) 2003 by Olaf Conrad")); + + Set_Description (_TW( + "Extended neigbourhoods for grids.\n" + "(c) 2003 by Olaf Conrad, Goettingen\n" + "email: oconrad@gwdg.de") + ); + + + //----------------------------------------------------- + // Define your parameters list... + + Parameters.Add_Grid( + NULL, "INPUT" , _TL("Input grid"), + _TL("This must be your input data of type grid."), + PARAMETER_INPUT + ); + + Parameters.Add_Grid( + NULL, "OUTPUT" , _TL("Output grid"), + _TL("This will contain your output data of type grid."), + PARAMETER_OUTPUT + ); + + Parameters.Add_Value( + NULL, "RADIUS" , _TL("Radius"), + _TL(""), + PARAMETER_TYPE_Int, 1, 1, true + ); + + Parameters.Add_Choice( + NULL, "METHOD" , _TL("Method"), + _TL("Choose a method"), + + CSG_String::Format(SG_T("%s|%s|%s|"), + _TL("Quadratic"), + _TL("Circle"), + _TL("Distance Weighted (inverse distance)") + ) + ); +} + +//--------------------------------------------------------- +CExercise_06::~CExercise_06(void) +{} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CExercise_06::On_Execute(void) +{ + int Radius; + + //----------------------------------------------------- + // Get parameter settings... + + m_pInput = Parameters("INPUT" )->asGrid(); + m_pOutput = Parameters("OUTPUT")->asGrid(); + + Radius = Parameters("RADIUS")->asInt(); + + + //----------------------------------------------------- + // Execute calculation... + + switch( Parameters("METHOD")->asInt() ) + { + case 0: + return( Method_01(Radius) ); + + case 1: + return( Method_02(Radius) ); + + case 2: + return( Method_03(Radius) ); + } + + return( false ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CExercise_06::Method_01(int Radius) +{ + int x, y, ix, iy, n; + double s; + + //----------------------------------------------------- + for(y=0; yis_NoData(ix, iy) ) + { + n++; + s += m_pInput->asDouble(ix, iy); + } + } + } + + if( n > 0 ) + { + m_pOutput->Set_Value(x, y, s / n); + } + else + { + m_pOutput->Set_NoData(x, y); + } + } + } + + //----------------------------------------------------- + return( true ); +} + +//--------------------------------------------------------- +bool CExercise_06::Method_02(int Radius) +{ + int x, y, ix, iy, xMask, yMask, nMask, n; + double s, Distance; + CSG_Grid gMask; + + //----------------------------------------------------- + nMask = 1 + 2 * Radius; + + gMask.Create(SG_DATATYPE_Byte, nMask, nMask); + + for(iy=-Radius, yMask=0; yMaskis_NoData(ix, iy) && gMask.asByte(xMask, yMask) ) + { + n++; + s += m_pInput->asDouble(ix, iy); + } + } + } + + if( n > 0 ) + { + m_pOutput->Set_Value(x, y, s / n); + } + else + { + m_pOutput->Set_NoData(x, y); + } + } + } + + //----------------------------------------------------- + return( true ); +} + +//--------------------------------------------------------- +bool CExercise_06::Method_03(int Radius) +{ + int x, y, ix, iy, xMask, yMask, nMask; + double s, n, Distance, Weight; + CSG_Grid gMask; + + //----------------------------------------------------- + nMask = 1 + 2 * Radius; + + gMask.Create(SG_DATATYPE_Double, nMask, nMask); + + for(iy=-Radius, yMask=0; yMask 0.0 && Distance <= Radius ? 1.0 / Distance : 0.0); + } + } + + //----------------------------------------------------- + for(y=0; yis_NoData(ix, iy) && (Weight = gMask.asDouble(xMask, yMask)) > 0.0 ) + { + n += Weight; + s += Weight * m_pInput->asDouble(ix, iy); + } + } + } + + if( n > 0 ) + { + m_pOutput->Set_Value(x, y, s / n); + } + else + { + m_pOutput->Set_NoData(x, y); + } + } + } + + //----------------------------------------------------- + return( true ); +} diff -Nru saga-2.1.0+dfsg/src/modules/garden/garden_learn_to_program/Exercise_06.h saga-2.1.4+dfsg/src/modules/garden/garden_learn_to_program/Exercise_06.h --- saga-2.1.0+dfsg/src/modules/garden/garden_learn_to_program/Exercise_06.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/garden/garden_learn_to_program/Exercise_06.h 2014-11-13 08:32:19.000000000 +0000 @@ -0,0 +1,97 @@ +/********************************************************** + * Version $Id: Exercise_06.h 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// Lectures // +// // +//-------------------------------------------------------// +// // +// Exercise_06.h // +// // +// Copyright (C) 2003 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Goettingen // +// Goldschmidtstr. 5 // +// 37077 Goettingen // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#ifndef HEADER_INCLUDED__Exercise_06_H +#define HEADER_INCLUDED__Exercise_06_H + +//--------------------------------------------------------- +#include "MLB_Interface.h" + +//--------------------------------------------------------- +class CExercise_06 : public CSG_Module_Grid +{ +public: ////// public members and functions: ////////////// + + CExercise_06(void); // constructor + virtual ~CExercise_06(void); // destructor + + +protected: /// protected members and functions: /////////// + + virtual bool On_Execute(void); // always override this function + + +private: ///// private members and functions: ///////////// + + CSG_Grid *m_pInput, *m_pOutput; + + + bool Method_01(int Radius); + bool Method_02(int Radius); + bool Method_03(int Radius); + +}; + + +//--------------------------------------------------------- +#endif // #ifndef HEADER_INCLUDED__Exercise_06_H diff -Nru saga-2.1.0+dfsg/src/modules/garden/garden_learn_to_program/Exercise_07.cpp saga-2.1.4+dfsg/src/modules/garden/garden_learn_to_program/Exercise_07.cpp --- saga-2.1.0+dfsg/src/modules/garden/garden_learn_to_program/Exercise_07.cpp 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/garden/garden_learn_to_program/Exercise_07.cpp 2014-11-13 08:32:19.000000000 +0000 @@ -0,0 +1,325 @@ +/********************************************************** + * Version $Id: Exercise_07.cpp 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// Lectures // +// // +//-------------------------------------------------------// +// // +// Exercise_07.cpp // +// // +// Copyright (C) 2003 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Goettingen // +// Goldschmidtstr. 5 // +// 37077 Goettingen // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "Exercise_07.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +CExercise_07::CExercise_07(void) +{ + CSG_Parameter *pNode; + + //----------------------------------------------------- + // Give some information about your module... + + Set_Name (_TL("07: Extended neighbourhoods - catchment areas (trace flow)")); + + Set_Author (_TL("Copyrights (c) 2003 by Olaf Conrad")); + + Set_Description (_TW( + "Extended Neighbourhoods - Catchment areas.\n" + "(c) 2003 by Olaf Conrad, Goettingen\n" + "email: oconrad@gwdg.de") + ); + + + //----------------------------------------------------- + // Define your parameters list... + + Parameters.Add_Grid( + NULL , "ELEVATION" , _TL("Elevation grid"), + _TL("This must be your input data of type grid."), + PARAMETER_INPUT + ); + + Parameters.Add_Grid( + NULL , "AREA" , _TL("Catchment area"), + _TL("This will contain your output data of type grid."), + PARAMETER_OUTPUT + ); + + Parameters.Add_Grid( + NULL , "LENGTH" , _TL("Flow Path Length"), + _TL("This will contain your output data of type grid."), + PARAMETER_OUTPUT + ); + + Parameters.Add_Value( + NULL , "STEP" , _TL("Step"), + _TL("Skip cells (step value)."), + PARAMETER_TYPE_Int , 1, 1, true + ); + + Parameters.Add_Choice( + NULL , "METHOD" , _TL("Method"), + _TL("Choose a method"), + + CSG_String::Format(SG_T("%s|%s|"), + _TL("Needs less memory, but is slow"), + _TL("Needs more memory, but is quicker") + ) + ); + + pNode = Parameters.Add_Value( + NULL , "ONECELL" , _TL("Single Cell"), + _TL("Set \'false\' to execute the calculation for each point in grid. Set \'true\' tu calculate the flow of one single cell."), + PARAMETER_TYPE_Bool , false + ); + + Parameters.Add_Value( + pNode , "XCELL" , _TL("X Position"), + _TL(""), + PARAMETER_TYPE_Int + ); + + Parameters.Add_Value( + pNode , "YCELL" , _TL("Y Position"), + _TL(""), + PARAMETER_TYPE_Int + ); +} + +//--------------------------------------------------------- +CExercise_07::~CExercise_07(void) +{} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CExercise_07::On_Execute(void) +{ + bool bCell; + int x, y, Step, xCell, yCell; + CSG_Grid *pLength; + + //----------------------------------------------------- + // Get parameter settings... + + m_pDTM = Parameters("ELEVATION")->asGrid(); + m_pArea = Parameters("AREA" )->asGrid(); + pLength = Parameters("LENGTH" )->asGrid(); + + Step = Parameters("STEP" )->asInt(); + + m_Method = Parameters("METHOD" )->asInt(); + + bCell = Parameters("ONECELL" )->asBool(); + xCell = Parameters("XCELL" )->asInt(); + yCell = Parameters("YCELL" )->asInt(); + + + //----------------------------------------------------- + // General initialisations... + + m_pArea ->Assign(0.0); + m_pArea ->Set_Unit(SG_T("m\xc2\xb2")); + DataObject_Set_Colors(m_pArea, 100, SG_COLORS_WHITE_BLUE); + + pLength ->Assign(0.0); + pLength ->Set_Unit(SG_T("m")); + + m_Area_of_Cell = Get_Cellsize() * Get_Cellsize(); + + + //----------------------------------------------------- + // Special initialisations... + + switch( m_Method ) + { + case 0: default: // Needs less memory, but is slow... + m_pDir = NULL; + break; + + case 1: // Needs more memory, but is quicker... + m_pDir = new CSG_Grid(m_pDTM, SG_DATATYPE_Char); + + for(y=0; ySet_Value(x, y, Get_FlowDirection(x, y)); + } + } + break; + } + + //----------------------------------------------------- + // Execute calculation... + + if( bCell ) + { + pLength->Set_Value(xCell, yCell, Trace_Flow(xCell, yCell)); + } + else + { + for(y=0; ySet_Value(x, y, Trace_Flow(x, y)); + } + } + } + + + //----------------------------------------------------- + // Special finalisations... + + if( m_pDir != NULL ) + { + delete(m_pDir); + } + + return( true ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +int CExercise_07::Get_FlowDirection(int x, int y) +{ + int i, ix, iy, iMax; + double z, dz, dzMax; + + iMax = -1; + + if( is_InGrid(x, y) && !m_pDTM->is_NoData(x, y) ) + { + z = m_pDTM->asDouble(x, y); + dzMax = 0.0; + + for(i=0; i<8; i++) + { + ix = Get_xTo(i, x); + iy = Get_yTo(i, y); + + if( is_InGrid(ix, iy) && !m_pDTM->is_NoData(ix, iy) ) + { + dz = (z - m_pDTM->asDouble(ix, iy)) / Get_Length(i); + + if( dz > dzMax ) + { + dzMax = dz; + iMax = i; + } + } + } + } + + return( iMax ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +double CExercise_07::Trace_Flow(int x, int y) +{ + int Direction; + double Length; + + Length = 0.0; + + if( is_InGrid(x, y) && !m_pDTM->is_NoData(x, y) ) + { + do + { + m_pArea->Add_Value(x, y, m_Area_of_Cell); + + Direction = m_pDir != NULL + ? m_pDir->asInt(x, y) + : Get_FlowDirection(x, y); + + if( Direction >= 0 ) + { + x = Get_xTo(Direction, x); + y = Get_yTo(Direction, y); + + Length += Get_Length(Direction); + } + } + while( Direction >= 0 ); + } + + return( Length ); +} diff -Nru saga-2.1.0+dfsg/src/modules/garden/garden_learn_to_program/Exercise_07.h saga-2.1.4+dfsg/src/modules/garden/garden_learn_to_program/Exercise_07.h --- saga-2.1.0+dfsg/src/modules/garden/garden_learn_to_program/Exercise_07.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/garden/garden_learn_to_program/Exercise_07.h 2014-11-13 08:32:19.000000000 +0000 @@ -0,0 +1,101 @@ +/********************************************************** + * Version $Id: Exercise_07.h 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// Lectures // +// // +//-------------------------------------------------------// +// // +// Exercise_07.h // +// // +// Copyright (C) 2003 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Goettingen // +// Goldschmidtstr. 5 // +// 37077 Goettingen // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#ifndef HEADER_INCLUDED__Exercise_07_H +#define HEADER_INCLUDED__Exercise_07_H + +//--------------------------------------------------------- +#include "MLB_Interface.h" + +//--------------------------------------------------------- +class CExercise_07 : public CSG_Module_Grid +{ +public: ////// public members and functions: ////////////// + + CExercise_07(void); // constructor + virtual ~CExercise_07(void); // destructor + + +protected: /// protected members and functions: /////////// + + virtual bool On_Execute(void); // always override this function + + +private: ///// private members and functions: ///////////// + + int m_Method; + + double m_Area_of_Cell; + + CSG_Grid *m_pDTM, *m_pArea, *m_pDir; + + + int Get_FlowDirection(int x, int y); + + double Trace_Flow(int x, int y); + +}; + + +//--------------------------------------------------------- +#endif // #ifndef HEADER_INCLUDED__Exercise_07_H diff -Nru saga-2.1.0+dfsg/src/modules/garden/garden_learn_to_program/Exercise_08.cpp saga-2.1.4+dfsg/src/modules/garden/garden_learn_to_program/Exercise_08.cpp --- saga-2.1.0+dfsg/src/modules/garden/garden_learn_to_program/Exercise_08.cpp 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/garden/garden_learn_to_program/Exercise_08.cpp 2014-11-13 08:32:19.000000000 +0000 @@ -0,0 +1,293 @@ +/********************************************************** + * Version $Id: Exercise_08.cpp 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// Lectures // +// // +//-------------------------------------------------------// +// // +// Exercise_08.cpp // +// // +// Copyright (C) 2003 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Goettingen // +// Goldschmidtstr. 5 // +// 37077 Goettingen // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "Exercise_08.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +CExercise_08::CExercise_08(void) +{ + //----------------------------------------------------- + // Give some information about your module... + + Set_Name (_TL("08: Extended neighbourhoods - catchment areas (parallel)")); + + Set_Author (_TL("Copyrights (c) 2003 by Olaf Conrad")); + + Set_Description (_TW( + "Extended Neighbourhoods - Catchment areas.\n" + "(c) 2003 by Olaf Conrad, Goettingen\n" + "email: oconrad@gwdg.de") + ); + + + //----------------------------------------------------- + // Define your parameters list... + + Parameters.Add_Grid( + NULL, "ELEVATION" , _TL("Elevation grid"), + _TL("This must be your input data of type grid."), + PARAMETER_INPUT + ); + + Parameters.Add_Grid( + NULL, "AREA" , _TL("Catchment area"), + _TL("This will contain your output data of type grid."), + PARAMETER_OUTPUT + ); + + Parameters.Add_Choice( + NULL, "METHOD" , _TL("Method"), + _TL("Choose a method"), + + CSG_String::Format(SG_T("%s|%s|"), + _TL("D8"), + _TL("MFD") + ) + ); +} + +//--------------------------------------------------------- +CExercise_08::~CExercise_08(void) +{} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CExercise_08::On_Execute(void) +{ + bool bResult; + int Method; + + //----------------------------------------------------- + // Get parameter settings... + + m_pDTM = Parameters("ELEVATION")->asGrid(); + + m_pArea = Parameters("AREA" )->asGrid(); + + Method = Parameters("METHOD")->asInt(); + + + m_pArea ->Assign(0.0); + m_pArea ->Set_Unit(SG_T("m\xc2\xb2")); + DataObject_Set_Colors(m_pArea, 100, SG_COLORS_WHITE_BLUE); + + + //----------------------------------------------------- + // Execute calculation... + + switch( Method ) + { + case 0: + bResult = Method_01(); + break; + + case 1: + bResult = Method_02(); + break; + + default: + bResult = false; + } + + + //----------------------------------------------------- + // Return 'true' if everything went okay... + + return( bResult ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CExercise_08::Method_01(void) +{ + int x, y, i, ix, iy, iMax; + double z, dz, dzMax, + Area_of_Cell = Get_Cellsize() * Get_Cellsize(); + + //----------------------------------------------------- + for(sLong n=0; nGet_Sorted(n, x, y, true, false); + + if( m_pDTM->is_NoData(x, y) ) + { + m_pArea->Set_NoData(x, y); + } + else + { + m_pArea->Add_Value(x, y, Area_of_Cell); + + z = m_pDTM->asDouble(x, y); + iMax = -1; + + for(i=0; i<8; i++) + { + ix = Get_xTo(i, x); + iy = Get_yTo(i, y); + + if( is_InGrid(ix, iy) && !m_pDTM->is_NoData(ix, iy) ) + { + dz = (z - m_pDTM->asDouble(ix, iy)) / Get_Length(i); + + if( dz > 0.0 && (iMax < 0 || (iMax >= 0 && dzMax < dz)) ) + { + iMax = i; + dzMax = dz; + } + } + } + + if( iMax >= 0 ) + { + ix = Get_xTo(iMax, x); + iy = Get_yTo(iMax, y); + + m_pArea->Add_Value(ix, iy, m_pArea->asDouble(x, y)); + } + } + } + + //----------------------------------------------------- + return( true ); +} + +//--------------------------------------------------------- +bool CExercise_08::Method_02(void) +{ + int x, y, i, ix, iy; + double z, d, dz[8], dzSum, + Area_of_Cell = Get_Cellsize() * Get_Cellsize(), + MFD_Converge = 1.1; + + //----------------------------------------------------- + for(sLong n=0; nGet_Sorted(n, x, y, true, false); + + if( m_pDTM->is_NoData(x, y) ) + { + m_pArea->Set_NoData(x, y); + } + else + { + m_pArea->Add_Value(x, y, Area_of_Cell); + + z = m_pDTM->asDouble(x, y); + dzSum = 0.0; + + for(i=0; i<8; i++) + { + ix = Get_xTo(i, x); + iy = Get_yTo(i, y); + + if( is_InGrid(ix, iy) && !m_pDTM->is_NoData(ix, iy) && (d = z - m_pDTM->asDouble(ix, iy)) > 0.0 ) + { + dz[i] = pow(d / Get_Length(i), MFD_Converge); + dzSum += dz[i]; + } + else + { + dz[i] = 0.0; + } + } + + if( dzSum > 0.0 ) + { + d = m_pArea->asDouble(x, y) / dzSum; + + for(i=0; i<8; i++) + { + if( dz[i] > 0.0 ) + { + ix = Get_xTo(i, x); + iy = Get_yTo(i, y); + + m_pArea->Add_Value(ix, iy, dz[i] * d); + } + } + } + } + } + + //----------------------------------------------------- + return( true ); +} diff -Nru saga-2.1.0+dfsg/src/modules/garden/garden_learn_to_program/Exercise_08.h saga-2.1.4+dfsg/src/modules/garden/garden_learn_to_program/Exercise_08.h --- saga-2.1.0+dfsg/src/modules/garden/garden_learn_to_program/Exercise_08.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/garden/garden_learn_to_program/Exercise_08.h 2014-11-13 08:32:19.000000000 +0000 @@ -0,0 +1,96 @@ +/********************************************************** + * Version $Id: Exercise_08.h 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// Lectures // +// // +//-------------------------------------------------------// +// // +// Exercise_08.h // +// // +// Copyright (C) 2003 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Goettingen // +// Goldschmidtstr. 5 // +// 37077 Goettingen // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#ifndef HEADER_INCLUDED__Exercise_08_H +#define HEADER_INCLUDED__Exercise_08_H + +//--------------------------------------------------------- +#include "MLB_Interface.h" + +//--------------------------------------------------------- +class CExercise_08 : public CSG_Module_Grid +{ +public: ////// public members and functions: ////////////// + + CExercise_08(void); // constructor + virtual ~CExercise_08(void); // destructor + + +protected: /// protected members and functions: /////////// + + virtual bool On_Execute(void); // always override this function + + +private: ///// private members and functions: ///////////// + + CSG_Grid *m_pDTM, *m_pArea; + + + bool Method_01(void); + bool Method_02(void); + +}; + + +//--------------------------------------------------------- +#endif // #ifndef HEADER_INCLUDED__Exercise_08_H diff -Nru saga-2.1.0+dfsg/src/modules/garden/garden_learn_to_program/Exercise_09.cpp saga-2.1.4+dfsg/src/modules/garden/garden_learn_to_program/Exercise_09.cpp --- saga-2.1.0+dfsg/src/modules/garden/garden_learn_to_program/Exercise_09.cpp 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/garden/garden_learn_to_program/Exercise_09.cpp 2014-11-13 08:32:19.000000000 +0000 @@ -0,0 +1,214 @@ +/********************************************************** + * Version $Id: Exercise_09.cpp 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// Lectures // +// // +//-------------------------------------------------------// +// // +// Exercise_09.cpp // +// // +// Copyright (C) 2003 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Goettingen // +// Goldschmidtstr. 5 // +// 37077 Goettingen // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "Exercise_09.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +CExercise_09::CExercise_09(void) +{ + //----------------------------------------------------- + // Give some information about your module... + + Set_Name (_TL("09: Extended neighbourhoods - catchment areas (recursive)")); + + Set_Author (_TL("Copyrights (c) 2003 by Olaf Conrad")); + + Set_Description (_TW( + "Extended Neighbourhoods - Use recursive function calls for catchment area calculations.\n" + "(c) 2003 by Olaf Conrad, Goettingen\n" + "email: oconrad@gwdg.de") + ); + + + //----------------------------------------------------- + // Define your parameters list... + + Parameters.Add_Grid( + NULL, "ELEVATION" , _TL("Elevation grid"), + _TL("This must be your input data of type grid."), + PARAMETER_INPUT + ); + + Parameters.Add_Grid( + NULL, "AREA" , _TL("Catchment area"), + _TL("This will contain your output data of type grid."), + PARAMETER_OUTPUT + ); +} + +//--------------------------------------------------------- +CExercise_09::~CExercise_09(void) +{} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CExercise_09::On_Execute(void) +{ + int x, y; + CSG_Grid *pDTM; + + //----------------------------------------------------- + // Get parameter settings... + + pDTM = Parameters("ELEVATION")->asGrid(); + m_pArea = Parameters("AREA" )->asGrid(); + + + //----------------------------------------------------- + // Initialisations... + + m_pArea ->Assign(0.0); + m_pArea ->Set_Unit(SG_T("m\xc2\xb2")); + DataObject_Set_Colors(m_pArea, 100, SG_COLORS_WHITE_BLUE); + + + //----------------------------------------------------- + // Save flow directions to temporary grid... + + m_pDir = new CSG_Grid(pDTM, SG_DATATYPE_Char); // this object has to be deleted later... + + for(y=0; ySet_Value(x, y, pDTM->Get_Gradient_NeighborDir(x, y) % 8); + } + } + + + //------------------------------------------------- + // Execute calculation... + + for(y=0; yasDouble(x, y); + + if( area <= 0.0 ) // cell has not been processed yet... + { + m_pArea->Set_Value(x, y, 1.0); // Very important: mark this cell as processed to prevent endless loops... + + area = Get_Cellsize() * Get_Cellsize(); // initialize the cell's area with its own cell size... + + for(i=0; i<8; i++) + { + ix = Get_xFrom(i, x); + iy = Get_yFrom(i, y); + + if( is_InGrid(ix, iy) && i == m_pDir->asInt(ix, iy) ) // drains ith neigbour into this cell ???... + { + area += Get_Area(ix, iy); // ...then add its area (recursive call of this function!)... + } + } + + m_pArea->Set_Value(x, y, area); + } + + //----------------------------------------------------- + return( area ); +} diff -Nru saga-2.1.0+dfsg/src/modules/garden/garden_learn_to_program/Exercise_09.h saga-2.1.4+dfsg/src/modules/garden/garden_learn_to_program/Exercise_09.h --- saga-2.1.0+dfsg/src/modules/garden/garden_learn_to_program/Exercise_09.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/garden/garden_learn_to_program/Exercise_09.h 2014-11-13 08:32:19.000000000 +0000 @@ -0,0 +1,95 @@ +/********************************************************** + * Version $Id: Exercise_09.h 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// Lectures // +// // +//-------------------------------------------------------// +// // +// Exercise_09.h // +// // +// Copyright (C) 2003 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Goettingen // +// Goldschmidtstr. 5 // +// 37077 Goettingen // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#ifndef HEADER_INCLUDED__Exercise_09_H +#define HEADER_INCLUDED__Exercise_09_H + +//--------------------------------------------------------- +#include "MLB_Interface.h" + +//--------------------------------------------------------- +class CExercise_09 : public CSG_Module_Grid +{ +public: ////// public members and functions: ////////////// + + CExercise_09(void); // constructor + virtual ~CExercise_09(void); // destructor + + +protected: /// protected members and functions: /////////// + + virtual bool On_Execute(void); // always override this function + + +private: ///// private members and functions: ///////////// + + CSG_Grid *m_pArea, *m_pDir; + + + double Get_Area(int x, int y); + +}; + + +//--------------------------------------------------------- +#endif // #ifndef HEADER_INCLUDED__Exercise_09_H diff -Nru saga-2.1.0+dfsg/src/modules/garden/garden_learn_to_program/Exercise_10.cpp saga-2.1.4+dfsg/src/modules/garden/garden_learn_to_program/Exercise_10.cpp --- saga-2.1.0+dfsg/src/modules/garden/garden_learn_to_program/Exercise_10.cpp 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/garden/garden_learn_to_program/Exercise_10.cpp 2014-11-13 08:32:19.000000000 +0000 @@ -0,0 +1,263 @@ +/********************************************************** + * Version $Id: Exercise_10.cpp 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// Lectures // +// // +//-------------------------------------------------------// +// // +// Exercise_10.cpp // +// // +// Copyright (C) 2003 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Goettingen // +// Goldschmidtstr. 5 // +// 37077 Goettingen // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "Exercise_10.h" +#include + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +CExercise_10::CExercise_10(void) +{ + //----------------------------------------------------- + // 1. Info... + + Set_Name (_TL("10: Dynamic Simulation - Life")); + + Set_Author (_TL("Copyrights (c) 2003 by Olaf Conrad")); + + Set_Description (_TW( + "Conway's game of life. A cellular automate.\n" + "(c) 2003 by Olaf Conrad, Goettingen\n" + "email: oconrad@gwdg.de") + ); + + + //----------------------------------------------------- + // 2. Grids... + + Parameters.Add_Grid( + NULL, "RESULT" , _TL("Life"), + _TL(""), + PARAMETER_OUTPUT, true, SG_DATATYPE_Byte + ); + + Parameters.Add_Value( + NULL, "REFRESH" , _TL("Refresh"), + _TL(""), + PARAMETER_TYPE_Bool, true + ); + + Parameters.Add_Value( + NULL, "COLORS" , _TL("Fade Color Count"), + _TL(""), + PARAMETER_TYPE_Int, 64, 3, true, 255, true + ); +} + +//--------------------------------------------------------- +CExercise_10::~CExercise_10(void) +{} + + +/////////////////////////////////////////////////////////// +// // +// Run // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CExercise_10::On_Execute(void) +{ + bool bAlive; + int x, y, i; + CSG_Colors Colors; + + + //----------------------------------------------------- + // General initialisations... + + m_pLife = Parameters("RESULT")->asGrid(); + + m_nColors = Parameters("COLORS")->asInt(); + + Colors.Set_Count(m_nColors + 1); + Colors.Set_Ramp(SG_GET_RGB(127, 127, 127), SG_GET_RGB(0, 0, 0)); + Colors.Set_Color(0, SG_GET_RGB(255, 255, 255)); + DataObject_Set_Colors(m_pLife, Colors); + + + //----------------------------------------------------- + // Initialise life's world... + + if( Parameters("REFRESH")->asBool() ) + { + srand((unsigned)time(NULL)); + + for(y=0; ySet_Value(x, y, rand() > RAND_MAX / 2 ? 0 : 1); + } + } + } + + + //----------------------------------------------------- + // Execution... + + m_pTemp = SG_Create_Grid(m_pLife, SG_DATATYPE_Byte); + + for(i=1, bAlive=true; bAlive && Process_Get_Okay(true); i++) + { + Process_Set_Text(CSG_String::Format(SG_T("%d %s"), i, _TL("Life Cycle"))); + + if( (bAlive = Next_Step()) == false ) + { + Message_Add(CSG_String::Format(SG_T("%s %d %s\n"), _TL("Dead after"), i, _TL("Life Cycles"))); + } + } + + delete(m_pTemp); + + + //----------------------------------------------------- + // Finish... + + return( true ); +} + +//--------------------------------------------------------- +bool CExercise_10::Next_Step(void) +{ + bool bAlive; + int x, y, i, ix, iy, n; + + bAlive = false; + + //----------------------------------------------------- + for(y=0; y= Get_NX() ) + ix = 0; + + iy = Get_yTo(i, y); + if( iy < 0 ) + iy = Get_NY() - 1; + else if( iy >= Get_NY() ) + iy = 0; + + if( m_pLife->asByte(ix, iy) == 0 ) + { + n++; + } + } + + + //--------------------------------------------- + // Dead or alive... + + i = m_pLife->asByte(x, y); + + switch( n ) + { + case 2: // keep status... + if( i > 0 && i < m_nColors ) // color fading... + { + i++; + } + break; + + case 3: // Birth... + i = 0; + break; + + default: // Dead... + if( i < m_nColors ) // color fading... + { + i++; + } + } + + if( i > 1 && i < m_nColors ) + { + bAlive = true; + } + + m_pTemp->Set_Value(x, y, i); + } + } + + //----------------------------------------------------- + m_pLife->Assign(m_pTemp); + + DataObject_Update(m_pLife, 0, m_nColors, true); + + return( bAlive ); +} diff -Nru saga-2.1.0+dfsg/src/modules/garden/garden_learn_to_program/Exercise_10.h saga-2.1.4+dfsg/src/modules/garden/garden_learn_to_program/Exercise_10.h --- saga-2.1.0+dfsg/src/modules/garden/garden_learn_to_program/Exercise_10.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/garden/garden_learn_to_program/Exercise_10.h 2014-11-13 08:32:19.000000000 +0000 @@ -0,0 +1,103 @@ +/********************************************************** + * Version $Id: Exercise_10.h 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// Lectures // +// // +//-------------------------------------------------------// +// // +// Exercise_10.h // +// // +// Copyright (C) 2003 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Goettingen // +// Goldschmidtstr. 5 // +// 37077 Goettingen // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#ifndef HEADER_INCLUDED__Exercise_10_H +#define HEADER_INCLUDED__Exercise_10_H + +//--------------------------------------------------------- +#include "MLB_Interface.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +class CExercise_10 : public CSG_Module_Grid +{ +public: + CExercise_10(void); + virtual ~CExercise_10(void); + + virtual bool needs_GUI (void) { return( true ); } + + +protected: + + virtual bool On_Execute(void); + + +private: + + int m_nColors; + + CSG_Grid *m_pLife, *m_pTemp; + + + bool Next_Step(void); + +}; + +#endif // #ifndef HEADER_INCLUDED__Exercise_10_H diff -Nru saga-2.1.0+dfsg/src/modules/garden/garden_learn_to_program/Exercise_11.cpp saga-2.1.4+dfsg/src/modules/garden/garden_learn_to_program/Exercise_11.cpp --- saga-2.1.0+dfsg/src/modules/garden/garden_learn_to_program/Exercise_11.cpp 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/garden/garden_learn_to_program/Exercise_11.cpp 2014-11-13 08:32:19.000000000 +0000 @@ -0,0 +1,331 @@ +/********************************************************** + * Version $Id: Exercise_11.cpp 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// Lectures // +// // +//-------------------------------------------------------// +// // +// Exercise_11.cpp // +// // +// Copyright (C) 2003 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Goettingen // +// Goldschmidtstr. 5 // +// 37077 Goettingen // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "Exercise_11.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +CExercise_11::CExercise_11(void) +{ + Set_Name (_TL("11: Dynamic Simulation - Soil Nitrogen Dynamics")); + + Set_Author (_TL("Copyrights (c) 2003 by Olaf Conrad")); + + Set_Description (_TW( + "Spatially Distributed Simulation of Soil Nitrogen Dynamics. " + + "\nReference:" + "\nHugget, R.J. (1993): 'Modelling the Human Impact on Nature', Oxford University Press.\n" + + "\n(c) 2003 by Olaf Conrad, Goettingen\nemail: oconrad@gwdg.de") + ); + + //----------------------------------------------------- + Parameters.Add_Grid( + NULL , "DEM" , _TL("Elevation"), + _TL(""), + PARAMETER_INPUT + ); + + Parameters.Add_Grid( + NULL , "NSTORE" , _TL("Soil Nitrogen"), + _TL(""), + PARAMETER_OUTPUT + ); + + //----------------------------------------------------- + Parameters.Add_Value( + NULL , "TIME_SPAN" , _TL("Time Span [a]"), + _TL(""), + PARAMETER_TYPE_Double , 100.0, 0.0, true + ); + + Parameters.Add_Value( + NULL , "TIME_STEP" , _TL("Time Interval [a]"), + _TL(""), + PARAMETER_TYPE_Double , 0.1, 0.0, true + ); + + Parameters.Add_Value( + NULL , "UPDATE" , _TL("Update View"), + _TL(""), + PARAMETER_TYPE_Bool , true + ); + + //----------------------------------------------------- + Parameters.Add_Value( + NULL , "NINIT" , _TL("Initial Nitrogen Content [kg/ha]"), + _TL(""), + PARAMETER_TYPE_Double , 5000.0, 0.0, true + ); + + Parameters.Add_Value( + NULL , "NRAIN" , _TL("Nitrogen in Rainfall [kg/ha/a]"), + _TL(""), + PARAMETER_TYPE_Double , 16.0, 0.0, true + ); +} + +//--------------------------------------------------------- +CExercise_11::~CExercise_11(void) +{} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CExercise_11::On_Execute(void) +{ + bool bUpdate; + int iStep, nSteps; + double sTime, dTime, N_Init, N_Rain; + CSG_Grid *pDEM; + + //----------------------------------------------------- + sTime = Parameters("TIME_SPAN") ->asDouble(); + dTime = Parameters("TIME_STEP") ->asDouble(); + nSteps = (int)(sTime / dTime); + + bUpdate = Parameters("UPDATE") ->asBool(); + + N_Init = Parameters("NINIT") ->asDouble(); + N_Rain = Parameters("NRAIN") ->asDouble(); + + pDEM = Parameters("DEM") ->asGrid(); + + m_pN = Parameters("NSTORE") ->asGrid(); + m_pN->Assign(N_Init); + DataObject_Set_Colors(m_pN, 100, SG_COLORS_YELLOW_GREEN); + + Initialize(pDEM); + + //----------------------------------------------------- + for(iStep=0; iStep<=nSteps && Set_Progress(iStep, nSteps); iStep++) + { + Process_Set_Text(CSG_String::Format(SG_T("Time [a]: %f (%f)"), dTime * iStep, sTime)); + + if( bUpdate ) + { + DataObject_Update(m_pN, m_pN->Get_ZMin(), m_pN->Get_ZMax(), true); + } + + Next_Step(N_Rain, dTime); + } + + //----------------------------------------------------- + Finalize(); + + return( true ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CExercise_11::Initialize(CSG_Grid *pDEM) +{ + int x, y, i, ix, iy; + double z, dz, dzSum; + + //----------------------------------------------------- + m_Next .Create(pDEM, SG_DATATYPE_Float); + m_dzSum .Create(pDEM, SG_DATATYPE_Float); + + for(i=0; i<8; i++) + { + m_dz[i].Create(pDEM, SG_DATATYPE_Float); + } + + //----------------------------------------------------- + for(y=0; yis_NoData(x, y) ) + { + z = pDEM->asDouble(x, y); + + for(i=0; i<8; i++) + { + ix = Get_xTo(i, x); + iy = Get_yTo(i, y); + + if( pDEM->is_InGrid(ix, iy) && (dz = (z - pDEM->asDouble(ix, iy)) / Get_Length(i)) > 0.0 ) + { + m_dz[i].Set_Value(x, y, dz); + + dzSum += dz; + } + else + { + m_dz[i].Set_Value(x, y, 0.0); + } + } + + if( dzSum > 0.0 ) + { + for(i=0; i<8; i++) + { + m_dz[i].Mul_Value(x, y, 1.0 / dzSum); + } + } + } + + m_dzSum.Set_Value(x, y, dzSum); + } + } + + //----------------------------------------------------- + return( true ); +} + +//--------------------------------------------------------- +bool CExercise_11::Finalize(void) +{ + int i; + + m_Next .Destroy(); + m_dzSum .Destroy(); + + for(i=0; i<8; i++) + { + m_dz[i].Destroy(); + } + + return( true ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CExercise_11::Next_Step(double N_Rain, double dTime) +{ + int x, y, i; + double dz, dzSum, N, dN; + + m_Next.Assign(0.0); + + N_Rain *= dTime; + + //----------------------------------------------------- + for(y=0; yasDouble(x, y); + + if( (dzSum = m_dzSum.asDouble(x, y)) > 0.0 ) + { + dN = N * dzSum * dTime; + + if( dN > N ) + { + dN = N; + } + + for(i=0; i<8; i++) + { + if( (dz = m_dz[i].asDouble(x, y)) > 0.0 ) + { + m_Next.Add_Value(Get_xTo(i, x), Get_yTo(i, y), dz * dN); + } + } + } + else + { + dN = 0.0; + } + + m_Next.Add_Value(x, y, N - dN + N_Rain); + } + } + + if( is_Progress() ) + { + m_pN->Assign(&m_Next); + } + + //----------------------------------------------------- + return( true ); +} diff -Nru saga-2.1.0+dfsg/src/modules/garden/garden_learn_to_program/Exercise_11.h saga-2.1.4+dfsg/src/modules/garden/garden_learn_to_program/Exercise_11.h --- saga-2.1.0+dfsg/src/modules/garden/garden_learn_to_program/Exercise_11.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/garden/garden_learn_to_program/Exercise_11.h 2014-11-13 08:32:19.000000000 +0000 @@ -0,0 +1,94 @@ +/********************************************************** + * Version $Id: Exercise_11.h 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// Lectures // +// // +//-------------------------------------------------------// +// // +// Exercise_11.h // +// // +// Copyright (C) 2003 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Goettingen // +// Goldschmidtstr. 5 // +// 37077 Goettingen // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#ifndef HEADER_INCLUDED__Exercise_11_H +#define HEADER_INCLUDED__Exercise_11_H + +//--------------------------------------------------------- +#include "MLB_Interface.h" + +//--------------------------------------------------------- +class CExercise_11 : public CSG_Module_Grid +{ +public: + CExercise_11(void); + virtual ~CExercise_11(void); + + +protected: + + virtual bool On_Execute(void); + + +private: + + CSG_Grid *m_pN, m_Next, m_dz[8], m_dzSum; + + bool Initialize(CSG_Grid *pDEM); + bool Finalize(void); + + bool Next_Step(double N_Rain, double dTime); + +}; + +#endif // #ifndef HEADER_INCLUDED__Exercise_11_H diff -Nru saga-2.1.0+dfsg/src/modules/garden/garden_learn_to_program/Exercise_12.cpp saga-2.1.4+dfsg/src/modules/garden/garden_learn_to_program/Exercise_12.cpp --- saga-2.1.0+dfsg/src/modules/garden/garden_learn_to_program/Exercise_12.cpp 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/garden/garden_learn_to_program/Exercise_12.cpp 2014-11-13 08:32:19.000000000 +0000 @@ -0,0 +1,180 @@ +/********************************************************** + * Version $Id: Exercise_12.cpp 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// Lectures_Shapes // +// // +//-------------------------------------------------------// +// // +// Exercise_12.cpp // +// // +// Copyright (C) 2003 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Goettingen // +// Goldschmidtstr. 5 // +// 37077 Goettingen // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "Exercise_12.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +CExercise_12::CExercise_12(void) +{ + //----------------------------------------------------- + // Give some information about your module... + + Set_Name (_TL("12: First steps with shapes")); + + Set_Author (_TL("Copyrights (c) 2003 by Olaf Conrad")); + + Set_Description (_TW( + "Copy a shapes layer and move it to a new position.\n" + "(c) 2003 by Olaf Conrad, Goettingen\n" + "email: oconrad@gwdg.de") + ); + + + //----------------------------------------------------- + // Define your parameters list... + + Parameters.Add_Shapes( + NULL , "INPUT" , _TL("Input"), + _TL("This must be your input data of type shapes."), + PARAMETER_INPUT + ); + + Parameters.Add_Shapes( + NULL , "OUTPUT" , _TL("Output"), + _TL("This will contain your output data of type shapes."), + PARAMETER_OUTPUT + ); + + Parameters.Add_Value( + NULL , "DX" , _TL("Translation: X"), + _TL(""), + PARAMETER_TYPE_Double, + 10.0 + ); + + Parameters.Add_Value( + NULL , "DY" , _TL("Translation: Y"), + _TL(""), + PARAMETER_TYPE_Double, + 10.0 + ); +} + +//--------------------------------------------------------- +CExercise_12::~CExercise_12(void) +{} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CExercise_12::On_Execute(void) +{ + int iShape, iPart, iPoint; + double dx, dy; + TSG_Point Point; + CSG_Shapes *pShapes_A, *pShapes_B; + CSG_Shape *pShape_A, *pShape_B; + + + //----------------------------------------------------- + // Get parameter settings... + + pShapes_A = Parameters("INPUT") ->asShapes(); + pShapes_B = Parameters("OUTPUT") ->asShapes(); + + dx = Parameters("DX") ->asDouble(); + dy = Parameters("DY") ->asDouble(); + + pShapes_B->Create(pShapes_A->Get_Type(), _TL("Translation"), pShapes_A); + + + //----------------------------------------------------- + // Copy shapes layer A to B and translate each point's position... + + for(iShape=0; iShapeGet_Count() && Set_Progress(iShape, pShapes_A->Get_Count()); iShape++) + { + pShape_A = pShapes_A->Get_Shape(iShape); + pShape_B = pShapes_B->Add_Shape(pShape_A, SHAPE_COPY_ATTR); + + for(iPart=0; iPartGet_Part_Count(); iPart++) + { + for(iPoint=0; iPointGet_Point_Count(iPart); iPoint++) + { + Point = pShape_A->Get_Point(iPoint, iPart); + + Point.x += dx; // perform the translation before + Point.y += dy; // you add the point to the new shape... + + pShape_B->Add_Point(Point, iPart); + } + } + } + + + //----------------------------------------------------- + // Return 'true' if everything went okay... + + return( true ); +} diff -Nru saga-2.1.0+dfsg/src/modules/garden/garden_learn_to_program/Exercise_12.h saga-2.1.4+dfsg/src/modules/garden/garden_learn_to_program/Exercise_12.h --- saga-2.1.0+dfsg/src/modules/garden/garden_learn_to_program/Exercise_12.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/garden/garden_learn_to_program/Exercise_12.h 2014-11-13 08:32:19.000000000 +0000 @@ -0,0 +1,91 @@ +/********************************************************** + * Version $Id: Exercise_12.h 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// Lectures_Shapes // +// // +//-------------------------------------------------------// +// // +// Exercise_12.h // +// // +// Copyright (C) 2003 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Goettingen // +// Goldschmidtstr. 5 // +// 37077 Goettingen // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#ifndef HEADER_INCLUDED__Exercise_12_H +#define HEADER_INCLUDED__Exercise_12_H + +//--------------------------------------------------------- +#include "MLB_Interface.h" + +//--------------------------------------------------------- +class CExercise_12 : public CSG_Module +{ +public: ////// public members and functions: ////////////// + + CExercise_12(void); // constructor + virtual ~CExercise_12(void); // destructor + + +protected: /// protected members and functions: /////////// + + virtual bool On_Execute(void); // always override this function + + +private: ///// private members and functions: ///////////// + + +}; + + +//--------------------------------------------------------- +#endif // #ifndef HEADER_INCLUDED__Exercise_12_H diff -Nru saga-2.1.0+dfsg/src/modules/garden/garden_learn_to_program/Exercise_13.cpp saga-2.1.4+dfsg/src/modules/garden/garden_learn_to_program/Exercise_13.cpp --- saga-2.1.0+dfsg/src/modules/garden/garden_learn_to_program/Exercise_13.cpp 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/garden/garden_learn_to_program/Exercise_13.cpp 2014-11-13 08:32:19.000000000 +0000 @@ -0,0 +1,383 @@ +/********************************************************** + * Version $Id: Exercise_13.cpp 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// Lectures_Shapes // +// // +//-------------------------------------------------------// +// // +// Exercise_13.cpp // +// // +// Copyright (C) 2003 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Goettingen // +// Goldschmidtstr. 5 // +// 37077 Goettingen // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "Exercise_13.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +CExercise_13::CExercise_13(void) +{ + CSG_Parameter *pNode; + + //----------------------------------------------------- + // Give some information about your module... + + Set_Name (_TL("13: Reprojecting a shapes layer")); + + Set_Author (_TL("Copyrights (c) 2003 by Olaf Conrad")); + + Set_Description (_TW( + "Copy a shapes layer and move it to a new position.\n" + "(c) 2003 by Olaf Conrad, Goettingen\n" + "email: oconrad@gwdg.de") + ); + + + //----------------------------------------------------- + // Shapes input and output... + + Parameters.Add_Shapes( + NULL , "INPUT" , _TL("Input"), + _TL("This must be your input data of type shapes."), + PARAMETER_INPUT + ); + + Parameters.Add_Shapes( + NULL , "OUTPUT" , _TL("Output"), + _TL("This will contain your output data of type shapes."), + PARAMETER_OUTPUT + ); + + + //----------------------------------------------------- + // Transformation parameters... + + Parameters.Add_Choice( + NULL , "METHOD" , _TL("Method"), + _TL(""), + + CSG_String::Format(SG_T("%s|%s|%s|%s|%s|%s|"), + _TL("Translation"), + _TL("Scaling"), + _TL("Shearing"), + _TL("Rotation"), + _TL("Combination A"), + _TL("Combination B") + ) + ); + + //----------------------------------------------------- + // Transformation parameters... + + pNode = Parameters.Add_Node(NULL, "NODE_TRANS", _TL("Translation"), _TL("")); + Parameters.Add_Value( + pNode , "TRANS_X" , SG_T("X"), + _TL(""), + PARAMETER_TYPE_Double, + 10.0 + ); + Parameters.Add_Value( + pNode , "TRANS_Y" , SG_T("Y"), + _TL(""), + PARAMETER_TYPE_Double, + 10.0 + ); + + pNode = Parameters.Add_Node(NULL, "NODE_SCALE", _TL("Scale factors") , _TL("")); + Parameters.Add_Value( + pNode , "SCALE_X" , SG_T("X"), + _TL(""), + PARAMETER_TYPE_Double, + 10.0 + ); + Parameters.Add_Value( + pNode , "SCALE_Y" , SG_T("Y"), + _TL(""), + PARAMETER_TYPE_Double, + 10.0 + ); + + pNode = Parameters.Add_Node(NULL, "NODE_SHEAR", _TL("Shear factors") , _TL("")); + Parameters.Add_Value( + pNode , "SHEAR_X" , SG_T("X"), + _TL(""), + PARAMETER_TYPE_Double, + 0.5 + ); + Parameters.Add_Value( + pNode , "SHEAR_Y" , SG_T("Y"), + _TL(""), + PARAMETER_TYPE_Double, + 0.5 + ); + + Parameters.Add_Value( + NULL , "ROTAT" , _TL("Rotation angle [Degree]"), + _TL(""), + PARAMETER_TYPE_Double, + 45.0 + ); +} + +//--------------------------------------------------------- +CExercise_13::~CExercise_13(void) +{} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#define SET_MATRIX(M, a1, a2, a3, b1, b2, b3, c1, c2, c3) M[0][0]=a1; M[1][0]=b1; M[2][0]=c1;\ + M[0][1]=a2; M[1][1]=b2; M[2][1]=c2;\ + M[0][2]=a3; M[1][2]=b3; M[2][2]=c3; + +//--------------------------------------------------------- +bool CExercise_13::On_Execute(void) +{ + int Method; + double trn_x, trn_y, scl_x, scl_y, shr_x, shr_y, rot, + m_trn[3][3], m_scl[3][3], m_shr[3][3], m_rot[3][3], m[3][3]; + CSG_Shapes *pShapes_A, *pShapes_B; + + + //----------------------------------------------------- + // Get parameter settings... + + pShapes_A = Parameters("INPUT") ->asShapes(); + pShapes_B = Parameters("OUTPUT") ->asShapes(); + + pShapes_B->Create(pShapes_A->Get_Type(), _TL("Transformation"), pShapes_A); + + Method = Parameters("METHOD") ->asInt(); + + trn_x = Parameters("TRANS_X") ->asDouble(); + trn_y = Parameters("TRANS_Y") ->asDouble(); + + scl_x = Parameters("SCALE_X") ->asDouble(); + scl_y = Parameters("SCALE_Y") ->asDouble(); + + shr_x = Parameters("SHEAR_X") ->asDouble(); + shr_y = Parameters("SHEAR_Y") ->asDouble(); + + rot = Parameters("ROTAT") ->asDouble() * M_DEG_TO_RAD; + + + //----------------------------------------------------- + // Initialise transformation matrices... + + // Translation... + SET_MATRIX(m_trn, + 1.0 , 0.0 , trn_x , + 0.0 , 1.0 , trn_y , + 0.0 , 0.0 , 1.0 ); + + // Scaling... + SET_MATRIX(m_scl, + scl_x , 0.0 , 0.0 , + 0.0 , scl_y , 0.0 , + 0.0 , 0.0 , 1.0 ); + + // Shearing... + SET_MATRIX(m_shr, + 1.0 , shr_x , 0.0 , + shr_y , 1.0 , 0.0 , + 0.0 , 0.0 , 1.0 ); + + // Rotation... + SET_MATRIX(m_rot, + cos(rot) , sin(rot) , 0.0 , + -sin(rot) , cos(rot) , 0.0 , + 0.0 , 0.0 , 1.0 ); + + // Initialise m as matrix, that does nothing... + SET_MATRIX(m, + 1.0 , 0.0 , 0.0 , + 0.0 , 1.0 , 0.0 , + 0.0 , 0.0 , 1.0 ); + + + //----------------------------------------------------- + // Set final transformation matrix m... + + switch( Method ) + { + case 0: // Translation... + Multiply_Matrices(m, m_trn); + break; + + case 1: // Scaling... + Multiply_Matrices(m, m_scl); + break; + + case 2: // Shearing... + Multiply_Matrices(m, m_shr); + break; + + case 3: // Rotation... + Multiply_Matrices(m, m_rot); + break; + + case 4: // Combination A... + Multiply_Matrices(m, m_trn); + Multiply_Matrices(m, m_scl); + Multiply_Matrices(m, m_shr); + Multiply_Matrices(m, m_rot); + break; + + case 5: // Combination B... + Multiply_Matrices(m, m_rot); + Multiply_Matrices(m, m_shr); + Multiply_Matrices(m, m_scl); + Multiply_Matrices(m, m_trn); + break; + } + + + //----------------------------------------------------- + // Execute transformation... + + Transformation(pShapes_A, pShapes_B, m); + + + //----------------------------------------------------- + // Return 'true' if everything went okay... + + return( true ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +void CExercise_13::Transformation(CSG_Shapes *pShapes_A, CSG_Shapes *pShapes_B, double m[3][3]) +{ + int iShape, iPart, iPoint; + double x; + TSG_Point p; + CSG_Shape *pShape_A, *pShape_B; + + + //----------------------------------------------------- + // Copy shapes layer A to B and reproject each point's position using matrix m... + + for(iShape=0; iShapeGet_Count() && Set_Progress(iShape, pShapes_A->Get_Count()); iShape++) + { + pShape_A = pShapes_A->Get_Shape(iShape); + pShape_B = pShapes_B->Add_Shape(pShape_A, SHAPE_COPY_ATTR); + + for(iPart=0; iPartGet_Part_Count(); iPart++) + { + for(iPoint=0; iPointGet_Point_Count(iPart); iPoint++) + { + p = pShape_A->Get_Point(iPoint, iPart); + + x = m[0][0] * p.x + m[0][1] * p.y + m[0][2]; + p.y = m[1][0] * p.x + m[1][1] * p.y + m[1][2]; + p.x = x; + + pShape_B->Add_Point(p, iPart); + } + } + } +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +void CExercise_13::Multiply_Matrices(double A[3][3], double B[3][3]) +{ + int x, y, k; + double C[3][3]; + + //----------------------------------------------------- + for(x=0; x<3; x++) + { + for(y=0; y<3; y++) + { + C[x][y] = 0.0; + + for(k=0; k<3; k++) + { + C[x][y] += A[x][k] * B[k][y]; + } + } + } + + //----------------------------------------------------- + for(x=0; x<3; x++) + { + for(y=0; y<3; y++) + { + A[x][y] = C[x][y]; + } + } +} diff -Nru saga-2.1.0+dfsg/src/modules/garden/garden_learn_to_program/Exercise_13.h saga-2.1.4+dfsg/src/modules/garden/garden_learn_to_program/Exercise_13.h --- saga-2.1.0+dfsg/src/modules/garden/garden_learn_to_program/Exercise_13.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/garden/garden_learn_to_program/Exercise_13.h 2014-11-13 08:32:19.000000000 +0000 @@ -0,0 +1,94 @@ +/********************************************************** + * Version $Id: Exercise_13.h 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// Lectures_Shapes // +// // +//-------------------------------------------------------// +// // +// Exercise_13.h // +// // +// Copyright (C) 2003 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Goettingen // +// Goldschmidtstr. 5 // +// 37077 Goettingen // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#ifndef HEADER_INCLUDED__Exercise_13_H +#define HEADER_INCLUDED__Exercise_13_H + +//--------------------------------------------------------- +#include "MLB_Interface.h" + +//--------------------------------------------------------- +class CExercise_13 : public CSG_Module +{ +public: ////// public members and functions: ////////////// + + CExercise_13(void); // constructor + virtual ~CExercise_13(void); // destructor + + +protected: /// protected members and functions: /////////// + + virtual bool On_Execute(void); // always override this function + + +private: ///// private members and functions: ///////////// + + void Transformation(CSG_Shapes *pShapes_A, CSG_Shapes *pShapes_B, double m[3][3]); + + void Multiply_Matrices(double A[3][3], double B[3][3]); + +}; + + +//--------------------------------------------------------- +#endif // #ifndef HEADER_INCLUDED__Exercise_13_H diff -Nru saga-2.1.0+dfsg/src/modules/garden/garden_learn_to_program/Exercise_14.cpp saga-2.1.4+dfsg/src/modules/garden/garden_learn_to_program/Exercise_14.cpp --- saga-2.1.0+dfsg/src/modules/garden/garden_learn_to_program/Exercise_14.cpp 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/garden/garden_learn_to_program/Exercise_14.cpp 2014-11-13 08:32:19.000000000 +0000 @@ -0,0 +1,376 @@ +/********************************************************** + * Version $Id: Exercise_14.cpp 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// Lectures_Shapes // +// // +//-------------------------------------------------------// +// // +// Exercise_14.cpp // +// // +// Copyright (C) 2003 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Goettingen // +// Goldschmidtstr. 5 // +// 37077 Goettingen // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "Exercise_14.h" + + +/////////////////////////////////////////////////////////// +// // +// Defines // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#define NOCHANNEL 0 +#define SPRING 1 +#define CHANNEL 2 +#define MOUTH 3 + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +CExercise_14::CExercise_14(void) +{ + //----------------------------------------------------- + // Give some information about your module... + + Set_Name (_TL("14: Vectorising channel lines")); + + Set_Author (_TL("Copyrights (c) 2003 by Olaf Conrad")); + + Set_Description (_TW( + "Vectorising channel lines.\n" + "(c) 2003 by Olaf Conrad, Goettingen\n" + "email: oconrad@gwdg.de") + ); + + + //----------------------------------------------------- + // Define your parameters list... + + Parameters.Add_Grid( + NULL , "ELEVATION" , _TL("Elevation grid"), + _TL(""), + PARAMETER_INPUT + ); + + Parameters.Add_Grid( + NULL , "CHANNELS" , _TL("Channels (Raster)"), + _TL(""), + PARAMETER_OUTPUT + ); + + Parameters.Add_Shapes( + NULL , "SHAPES" , _TL("Channels (Vector)"), + _TL(""), + PARAMETER_OUTPUT + ); + + Parameters.Add_Value( + NULL , "THRESHOLD" , _TL("Threshold"), + _TL(""), + PARAMETER_TYPE_Int , 4, 0, true, 8, true + ); +} + +//--------------------------------------------------------- +CExercise_14::~CExercise_14(void) +{} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CExercise_14::On_Execute(void) +{ + int Threshold; + + //----------------------------------------------------- + m_pDTM = Parameters("ELEVATION") ->asGrid(); + m_pChnl = Parameters("CHANNELS") ->asGrid(); + m_pShapes = Parameters("SHAPES") ->asShapes(); + + Threshold = Parameters("THRESHOLD") ->asInt(); + + //----------------------------------------------------- + m_pDir = NULL; + + if( Initialise(Threshold) ) + { + Find_Channels(); + + Vectorise(); + } + + //----------------------------------------------------- + if( m_pDir ) + { + delete(m_pDir); + } + + return( true ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CExercise_14::Initialise(int Threshold) +{ + int x, y, i, ix, iy, Dir; + double z, dz, dzMax; + CSG_Colors Colors; + + //----------------------------------------------------- + m_pDir = new CSG_Grid(m_pDTM, SG_DATATYPE_Char); + + m_pChnl->Assign(); + + Colors.Set_Count(4); + Colors.Set_Color(0, 192, 192, 192); // NOCHANNEL + Colors.Set_Color(1, 0, 255, 0); // SPRING + Colors.Set_Color(2, 0, 0, 255); // CHANNEL + Colors.Set_Color(3, 255, 0, 0); // MOUTH + DataObject_Set_Colors(m_pChnl, Colors); + + //----------------------------------------------------- + for(y=0; yis_NoData(x, y) ) + { + z = m_pDTM->asDouble(x, y); + dzMax = 0.0; + + for(i=0; i<8; i++) + { + ix = Get_xTo(i, x); + iy = Get_yTo(i, y); + + if( is_InGrid(ix, iy) && !m_pDTM->is_NoData(ix, iy) ) + { + dz = (z - m_pDTM->asDouble(ix, iy)) / Get_Length(i); + + if( dz > dzMax ) + { + dzMax = dz; + Dir = i; + } + } + } + } + + //--------------------------------------------- + m_pDir->Set_Value(x, y, Dir); + + if( Dir >= 0 ) + { + m_pChnl->Add_Value(Get_xTo(Dir, x), Get_yTo(Dir, y), 1); + } + } + } + + //----------------------------------------------------- + for(y=0; ySet_Value(x, y, m_pChnl->asInt(x, y) >= Threshold ? SPRING : NOCHANNEL); + } + } + + return( true ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +void CExercise_14::Find_Channels(void) +{ + int x, y; + + for(sLong n=0; nGet_Sorted(n, x, y, true) && m_pChnl->asInt(x, y) == SPRING ) + { + m_pChnl ->Set_Value(x, y, SPRING); + + Find_Channels(x, y); + } + } +} + +//--------------------------------------------------------- +void CExercise_14::Find_Channels(int x, int y) +{ + int Dir, ix, iy; + + if( (Dir = m_pDir->asInt(x, y)) >= 0 ) + { + ix = Get_xTo(Dir, x); + iy = Get_yTo(Dir, y); + + switch( m_pChnl->asInt(ix, iy) ) + { + case NOCHANNEL: case SPRING: + m_pChnl ->Set_Value(ix, iy, CHANNEL); + Find_Channels(ix, iy); // recursive function call... + break; + + case CHANNEL: + m_pChnl ->Set_Value(ix, iy, MOUTH); + break; + } + } +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +void CExercise_14::Vectorise(void) +{ + int x, y, Segment_ID; + double Length; + CSG_Shape *pSegment; + + m_pShapes->Create(SHAPE_TYPE_Line, _TL("Channels")); + + m_pShapes->Add_Field("SEGMENT_ID" , SG_DATATYPE_Int); + m_pShapes->Add_Field("LENGTH" , SG_DATATYPE_Double); + + //----------------------------------------------------- + for(y=0, Segment_ID=0; yasInt(x, y) ) + { + case SPRING: case MOUTH: + pSegment = m_pShapes->Add_Shape(); + + Length = Vectorise(x, y, pSegment); + + if( Length > 0.0 ) + { + pSegment->Set_Value(0, ++Segment_ID); + pSegment->Set_Value(1, Length); + } + else + { + m_pShapes->Del_Shape(pSegment); + } + + break; + } + } + } +} + +//--------------------------------------------------------- +double CExercise_14::Vectorise(int x, int y, CSG_Shape *pSegment) +{ + int Dir, ix, iy; + double Length; + + Length = 0.0; + + pSegment->Add_Point(Get_XMin() + x * Get_Cellsize(), Get_YMin() + y * Get_Cellsize()); + + if( (Dir = m_pDir->asInt(x, y)) >= 0 ) + { + Length = Get_Length(Dir); + + ix = Get_xTo(Dir, x); + iy = Get_yTo(Dir, y); + + switch( m_pChnl->asInt(ix, iy) ) + { + case CHANNEL: + Length += Vectorise(ix, iy, pSegment); // recursive function call... + break; + + case MOUTH: + Length += Get_Length(Dir); + pSegment->Add_Point(Get_XMin() + ix * Get_Cellsize(), Get_YMin() + iy * Get_Cellsize()); + break; + } + } + + return( Length ); +} diff -Nru saga-2.1.0+dfsg/src/modules/garden/garden_learn_to_program/Exercise_14.h saga-2.1.4+dfsg/src/modules/garden/garden_learn_to_program/Exercise_14.h --- saga-2.1.0+dfsg/src/modules/garden/garden_learn_to_program/Exercise_14.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/garden/garden_learn_to_program/Exercise_14.h 2014-11-13 08:32:19.000000000 +0000 @@ -0,0 +1,103 @@ +/********************************************************** + * Version $Id: Exercise_14.h 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// Lectures // +// // +//-------------------------------------------------------// +// // +// Exercise_14.h // +// // +// Copyright (C) 2003 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Goettingen // +// Goldschmidtstr. 5 // +// 37077 Goettingen // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#ifndef HEADER_INCLUDED__Exercise_14_H +#define HEADER_INCLUDED__Exercise_14_H + +//--------------------------------------------------------- +#include "MLB_Interface.h" + +//--------------------------------------------------------- +class CExercise_14 : public CSG_Module_Grid +{ +public: ////// public members and functions: ////////////// + + CExercise_14(void); // constructor + virtual ~CExercise_14(void); // destructor + + +protected: /// protected members and functions: /////////// + + virtual bool On_Execute(void); // always override this function + + +private: ///// private members and functions: ///////////// + + CSG_Grid *m_pDTM, *m_pChnl, *m_pDir; + + CSG_Shapes *m_pShapes; + + + bool Initialise(int Threshold); + + void Find_Channels(void); + void Find_Channels(int x, int y); + + void Vectorise(void); + double Vectorise(int x, int y, CSG_Shape *pSegment); + +}; + + +//--------------------------------------------------------- +#endif // #ifndef HEADER_INCLUDED__Exercise_14_H diff -Nru saga-2.1.0+dfsg/src/modules/garden/garden_learn_to_program/Makefile.am saga-2.1.4+dfsg/src/modules/garden/garden_learn_to_program/Makefile.am --- saga-2.1.0+dfsg/src/modules/garden/garden_learn_to_program/Makefile.am 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/garden/garden_learn_to_program/Makefile.am 2014-11-13 08:32:19.000000000 +0000 @@ -0,0 +1,48 @@ +# +# $Id: Makefile.am 1277 2011-12-22 15:48:59Z reklov_w $ +# +if DEBUG +DBGFLAGS = -g -DDEBUG +endif +if SAGA_UNICODE +UC_DEFS = -D_SAGA_UNICODE +endif +DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD +CXX_INCS = -I$(top_srcdir)/src/saga_core +AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS) +AM_LDFLAGS = -fPIC -shared -avoid-version +pkglib_LTLIBRARIES = libgarden_learn_to_program.la +libgarden_learn_to_program_la_SOURCES =\ +Exercise_01.cpp\ +Exercise_02.cpp\ +Exercise_03.cpp\ +Exercise_04.cpp\ +Exercise_05.cpp\ +Exercise_06.cpp\ +Exercise_07.cpp\ +Exercise_08.cpp\ +Exercise_09.cpp\ +Exercise_10.cpp\ +Exercise_11.cpp\ +Exercise_12.cpp\ +Exercise_13.cpp\ +Exercise_14.cpp\ +MLB_Interface.cpp\ +Exercise_01.h\ +Exercise_02.h\ +Exercise_03.h\ +Exercise_04.h\ +Exercise_05.h\ +Exercise_06.h\ +Exercise_07.h\ +Exercise_08.h\ +Exercise_09.h\ +Exercise_10.h\ +Exercise_11.h\ +Exercise_12.h\ +Exercise_13.h\ +Exercise_14.h\ +MLB_Interface.h + +libgarden_learn_to_program_la_LIBADD = $(top_srcdir)/src/saga_core/saga_api/libsaga_api.la + diff -Nru saga-2.1.0+dfsg/src/modules/garden/garden_learn_to_program/Makefile.in saga-2.1.4+dfsg/src/modules/garden/garden_learn_to_program/Makefile.in --- saga-2.1.0+dfsg/src/modules/garden/garden_learn_to_program/Makefile.in 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/garden/garden_learn_to_program/Makefile.in 2014-11-13 08:33:30.000000000 +0000 @@ -0,0 +1,743 @@ +# Makefile.in generated by automake 1.14.1 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +subdir = src/modules/garden/garden_learn_to_program +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_postgresql.m4 \ + $(top_srcdir)/m4/ax_pkg_swig.m4 \ + $(top_srcdir)/m4/ax_python_devel.m4 \ + $(top_srcdir)/m4/ax_swig_enable_cxx.m4 \ + $(top_srcdir)/m4/ax_swig_python.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__installdirs = "$(DESTDIR)$(pkglibdir)" +LTLIBRARIES = $(pkglib_LTLIBRARIES) +libgarden_learn_to_program_la_DEPENDENCIES = \ + $(top_srcdir)/src/saga_core/saga_api/libsaga_api.la +am_libgarden_learn_to_program_la_OBJECTS = Exercise_01.lo \ + Exercise_02.lo Exercise_03.lo Exercise_04.lo Exercise_05.lo \ + Exercise_06.lo Exercise_07.lo Exercise_08.lo Exercise_09.lo \ + Exercise_10.lo Exercise_11.lo Exercise_12.lo Exercise_13.lo \ + Exercise_14.lo MLB_Interface.lo +libgarden_learn_to_program_la_OBJECTS = \ + $(am_libgarden_learn_to_program_la_OBJECTS) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) +depcomp = $(SHELL) $(top_srcdir)/depcomp +am__depfiles_maybe = depfiles +am__mv = mv -f +CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = +CXXLD = $(CXX) +CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = +CCLD = $(CC) +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = +SOURCES = $(libgarden_learn_to_program_la_SOURCES) +DIST_SOURCES = $(libgarden_learn_to_program_la_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +AX_SWIG_PYTHON_CPPFLAGS = @AX_SWIG_PYTHON_CPPFLAGS@ +AX_SWIG_PYTHON_OPT = @AX_SWIG_PYTHON_OPT@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DISABLELIBHARU = @DISABLELIBHARU@ +DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +FGREP = @FGREP@ +GOMPFLAGS = @GOMPFLAGS@ +GREP = @GREP@ +HARU_LIB = @HARU_LIB@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LOCAL_INCS = @LOCAL_INCS@ +LOCAL_LIBS = @LOCAL_LIBS@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ +MKDIR_P = @MKDIR_P@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PG_CONFIG = @PG_CONFIG@ +POSTGRESQL_CFLAGS = @POSTGRESQL_CFLAGS@ +POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@ +POSTGRESQL_VERSION = @POSTGRESQL_VERSION@ +POW_LIB = @POW_LIB@ +PYTHON = @PYTHON@ +PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ +PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ +PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ +PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_PLATFORM = @PYTHON_PLATFORM@ +PYTHON_PREFIX = @PYTHON_PREFIX@ +PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ +PYTHON_VERSION = @PYTHON_VERSION@ +RANLIB = @RANLIB@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +SWIG = @SWIG@ +SWIG_LIB = @SWIG_LIB@ +VERSION = @VERSION@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +pkgpyexecdir = @pkgpyexecdir@ +pkgpythondir = @pkgpythondir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +pyexecdir = @pyexecdir@ +pythondir = @pythondir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ + +# +# $Id: Makefile.am 1277 2011-12-22 15:48:59Z reklov_w $ +# +@DEBUG_TRUE@DBGFLAGS = -g -DDEBUG +@SAGA_UNICODE_TRUE@UC_DEFS = -D_SAGA_UNICODE +DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD +CXX_INCS = -I$(top_srcdir)/src/saga_core +AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS) +AM_LDFLAGS = -fPIC -shared -avoid-version +pkglib_LTLIBRARIES = libgarden_learn_to_program.la +libgarden_learn_to_program_la_SOURCES = \ +Exercise_01.cpp\ +Exercise_02.cpp\ +Exercise_03.cpp\ +Exercise_04.cpp\ +Exercise_05.cpp\ +Exercise_06.cpp\ +Exercise_07.cpp\ +Exercise_08.cpp\ +Exercise_09.cpp\ +Exercise_10.cpp\ +Exercise_11.cpp\ +Exercise_12.cpp\ +Exercise_13.cpp\ +Exercise_14.cpp\ +MLB_Interface.cpp\ +Exercise_01.h\ +Exercise_02.h\ +Exercise_03.h\ +Exercise_04.h\ +Exercise_05.h\ +Exercise_06.h\ +Exercise_07.h\ +Exercise_08.h\ +Exercise_09.h\ +Exercise_10.h\ +Exercise_11.h\ +Exercise_12.h\ +Exercise_13.h\ +Exercise_14.h\ +MLB_Interface.h + +libgarden_learn_to_program_la_LIBADD = $(top_srcdir)/src/saga_core/saga_api/libsaga_api.la +all: all-am + +.SUFFIXES: +.SUFFIXES: .cpp .lo .o .obj +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/modules/garden/garden_learn_to_program/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign src/modules/garden/garden_learn_to_program/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): + +install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) + @$(NORMAL_INSTALL) + @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ + list2=; for p in $$list; do \ + if test -f $$p; then \ + list2="$$list2 $$p"; \ + else :; fi; \ + done; \ + test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \ + } + +uninstall-pkglibLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ + for p in $$list; do \ + $(am__strip_dir) \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$f"; \ + done + +clean-pkglibLTLIBRARIES: + -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES) + @list='$(pkglib_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + +libgarden_learn_to_program.la: $(libgarden_learn_to_program_la_OBJECTS) $(libgarden_learn_to_program_la_DEPENDENCIES) $(EXTRA_libgarden_learn_to_program_la_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) -rpath $(pkglibdir) $(libgarden_learn_to_program_la_OBJECTS) $(libgarden_learn_to_program_la_LIBADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Exercise_01.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Exercise_02.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Exercise_03.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Exercise_04.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Exercise_05.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Exercise_06.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Exercise_07.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Exercise_08.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Exercise_09.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Exercise_10.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Exercise_11.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Exercise_12.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Exercise_13.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Exercise_14.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MLB_Interface.Plo@am__quote@ + +.cpp.o: +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< + +.cpp.obj: +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + +.cpp.lo: +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + set x; \ + here=`pwd`; \ + $(am__define_uniq_tagged_files); \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ + fi +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ + test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(LTLIBRARIES) +installdirs: + for dir in "$(DESTDIR)$(pkglibdir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool clean-pkglibLTLIBRARIES \ + mostlyclean-am + +distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: install-pkglibLTLIBRARIES + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-pkglibLTLIBRARIES + +.MAKE: install-am install-strip + +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-pkglibLTLIBRARIES install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ + uninstall-pkglibLTLIBRARIES + + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nru saga-2.1.0+dfsg/src/modules/garden/garden_learn_to_program/MLB_Interface.cpp saga-2.1.4+dfsg/src/modules/garden/garden_learn_to_program/MLB_Interface.cpp --- saga-2.1.0+dfsg/src/modules/garden/garden_learn_to_program/MLB_Interface.cpp 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/garden/garden_learn_to_program/MLB_Interface.cpp 2014-11-13 08:32:19.000000000 +0000 @@ -0,0 +1,206 @@ +/********************************************************** + * Version $Id: MLB_Interface.cpp 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// Lectures // +// // +//-------------------------------------------------------// +// // +// MLB_Interface.cpp // +// // +// Copyright (C) 2003 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Goettingen // +// Goldschmidtstr. 5 // +// 37077 Goettingen // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// The Module Link Library Interface // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +// 1. Include the appropriate SAGA-API header... + +#include "MLB_Interface.h" + + +//--------------------------------------------------------- +// 2. Place general module library informations here... + +CSG_String Get_Info(int i) +{ + switch( i ) + { + case MLB_INFO_Name: default: + return( _TL("Introducing Module Programming" )); + + case MLB_INFO_Category: + return( _TL("Garden") ); + + case MLB_INFO_Author: + return( SG_T("O. Conrad (c) 2003" )); + + case MLB_INFO_Description: + return( _TL("A set of basic SAGA module programming examples." )); + + case MLB_INFO_Version: + return( SG_T("1.0") ); + + case MLB_INFO_Menu_Path: + return( _TL("Garden|Introducing Module Programming" )); + } +} + + +//--------------------------------------------------------- +// 3. Include the headers of your modules here... + +#include "Exercise_01.h" +#include "Exercise_02.h" +#include "Exercise_03.h" +#include "Exercise_04.h" +#include "Exercise_05.h" +#include "Exercise_06.h" +#include "Exercise_07.h" +#include "Exercise_08.h" +#include "Exercise_09.h" +#include "Exercise_10.h" +#include "Exercise_11.h" +#include "Exercise_12.h" +#include "Exercise_13.h" +#include "Exercise_14.h" + + +//--------------------------------------------------------- +// 4. Allow your modules to be created here... + +CSG_Module * Create_Module(int i) +{ + // Don't forget to continuously enumerate the case switches + // when adding new modules! Also bear in mind that the + // enumeration always has to start with [case 0:] and + // that [default:] must return NULL!... + + CSG_Module *pModule; + + switch( i ) + { + case 0: + pModule = new CExercise_01; + break; + + case 1: + pModule = new CExercise_02; + break; + + case 2: + pModule = new CExercise_03; + break; + + case 3: + pModule = new CExercise_04; + break; + + case 4: + pModule = new CExercise_05; + break; + + case 5: + pModule = new CExercise_06; + break; + + case 6: + pModule = new CExercise_07; + break; + + case 7: + pModule = new CExercise_08; + break; + + case 8: + pModule = new CExercise_09; + break; + + case 9: + pModule = new CExercise_10; + break; + + case 10: + pModule = new CExercise_11; + break; + + case 11: + pModule = new CExercise_12; + break; + + case 12: + pModule = new CExercise_13; + break; + + case 13: + pModule = new CExercise_14; + break; + + default: + pModule = NULL; + break; + } + + return( pModule ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +//{{AFX_SAGA + + MLB_INTERFACE + +//}}AFX_SAGA diff -Nru saga-2.1.0+dfsg/src/modules/garden/garden_learn_to_program/MLB_Interface.h saga-2.1.4+dfsg/src/modules/garden/garden_learn_to_program/MLB_Interface.h --- saga-2.1.0+dfsg/src/modules/garden/garden_learn_to_program/MLB_Interface.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/garden/garden_learn_to_program/MLB_Interface.h 2014-11-13 08:32:19.000000000 +0000 @@ -0,0 +1,78 @@ +/********************************************************** + * Version $Id: MLB_Interface.h 1922 2014-01-09 10:28:46Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// Lectures // +// // +//-------------------------------------------------------// +// // +// MLB_Interface.h // +// // +// Copyright (C) 2003 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Goettingen // +// Goldschmidtstr. 5 // +// 37077 Goettingen // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// Include the SAGA-API here // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#ifndef HEADER_INCLUDED__lectures_H +#define HEADER_INCLUDED__lectures_H + +//--------------------------------------------------------- +#include + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#endif // #ifndef HEADER_INCLUDED__lectures_H diff -Nru saga-2.1.0+dfsg/src/modules/garden/garden_webservices/Makefile.am saga-2.1.4+dfsg/src/modules/garden/garden_webservices/Makefile.am --- saga-2.1.0+dfsg/src/modules/garden/garden_webservices/Makefile.am 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/garden/garden_webservices/Makefile.am 2014-11-13 08:32:19.000000000 +0000 @@ -0,0 +1,24 @@ +if DEBUG +DBGFLAGS = -g -DDEBUG +endif +if SAGA_UNICODE +DEP_DEFS = -fPIC `wx-config --unicode=yes --static=no --cxxflags` -D_SAGA_UNICODE $(DBGFLAGS) +DEP_LFLG = -fPIC -shared `wx-config --unicode=yes --static=no --libs` +else +DEP_DEFS = -fPIC `wx-config --unicode=no --static=no --cxxflags` $(DBGFLAGS) +DEP_LFLG = -fPIC -shared `wx-config --unicode=no --static=no --libs` +endif +DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD +CXX_INCS = -I$(top_srcdir)/src/saga_core +AM_CXXFLAGS = $(CXX_INCS) $(DEF_SAGA) $(DEP_DEFS) $(DBGFLAGS) $(GOMPFLAGS) +AM_LDFLAGS = $(DEP_LFLG) -avoid-version +pkglib_LTLIBRARIES = libgarden_webservices.la +libgarden_webservices_la_SOURCES =\ +MLB_Interface.cpp\ +osm_import.cpp\ +wms_import.cpp\ +MLB_Interface.h\ +osm_import.h\ +wms_import.h + +libgarden_webservices_la_LIBADD = $(top_srcdir)/src/saga_core/saga_api/libsaga_api.la diff -Nru saga-2.1.0+dfsg/src/modules/garden/garden_webservices/Makefile.in saga-2.1.4+dfsg/src/modules/garden/garden_webservices/Makefile.in --- saga-2.1.0+dfsg/src/modules/garden/garden_webservices/Makefile.in 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/garden/garden_webservices/Makefile.in 2014-11-13 08:33:30.000000000 +0000 @@ -0,0 +1,703 @@ +# Makefile.in generated by automake 1.14.1 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +subdir = src/modules/garden/garden_webservices +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_postgresql.m4 \ + $(top_srcdir)/m4/ax_pkg_swig.m4 \ + $(top_srcdir)/m4/ax_python_devel.m4 \ + $(top_srcdir)/m4/ax_swig_enable_cxx.m4 \ + $(top_srcdir)/m4/ax_swig_python.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__installdirs = "$(DESTDIR)$(pkglibdir)" +LTLIBRARIES = $(pkglib_LTLIBRARIES) +libgarden_webservices_la_DEPENDENCIES = \ + $(top_srcdir)/src/saga_core/saga_api/libsaga_api.la +am_libgarden_webservices_la_OBJECTS = MLB_Interface.lo osm_import.lo \ + wms_import.lo +libgarden_webservices_la_OBJECTS = \ + $(am_libgarden_webservices_la_OBJECTS) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) +depcomp = $(SHELL) $(top_srcdir)/depcomp +am__depfiles_maybe = depfiles +am__mv = mv -f +CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = +CXXLD = $(CXX) +CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = +CCLD = $(CC) +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = +SOURCES = $(libgarden_webservices_la_SOURCES) +DIST_SOURCES = $(libgarden_webservices_la_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +AX_SWIG_PYTHON_CPPFLAGS = @AX_SWIG_PYTHON_CPPFLAGS@ +AX_SWIG_PYTHON_OPT = @AX_SWIG_PYTHON_OPT@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DISABLELIBHARU = @DISABLELIBHARU@ +DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +FGREP = @FGREP@ +GOMPFLAGS = @GOMPFLAGS@ +GREP = @GREP@ +HARU_LIB = @HARU_LIB@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LOCAL_INCS = @LOCAL_INCS@ +LOCAL_LIBS = @LOCAL_LIBS@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ +MKDIR_P = @MKDIR_P@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PG_CONFIG = @PG_CONFIG@ +POSTGRESQL_CFLAGS = @POSTGRESQL_CFLAGS@ +POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@ +POSTGRESQL_VERSION = @POSTGRESQL_VERSION@ +POW_LIB = @POW_LIB@ +PYTHON = @PYTHON@ +PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ +PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ +PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ +PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_PLATFORM = @PYTHON_PLATFORM@ +PYTHON_PREFIX = @PYTHON_PREFIX@ +PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ +PYTHON_VERSION = @PYTHON_VERSION@ +RANLIB = @RANLIB@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +SWIG = @SWIG@ +SWIG_LIB = @SWIG_LIB@ +VERSION = @VERSION@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +pkgpyexecdir = @pkgpyexecdir@ +pkgpythondir = @pkgpythondir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +pyexecdir = @pyexecdir@ +pythondir = @pythondir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +@DEBUG_TRUE@DBGFLAGS = -g -DDEBUG +@SAGA_UNICODE_FALSE@DEP_DEFS = -fPIC `wx-config --unicode=no --static=no --cxxflags` $(DBGFLAGS) +@SAGA_UNICODE_TRUE@DEP_DEFS = -fPIC `wx-config --unicode=yes --static=no --cxxflags` -D_SAGA_UNICODE $(DBGFLAGS) +@SAGA_UNICODE_FALSE@DEP_LFLG = -fPIC -shared `wx-config --unicode=no --static=no --libs` +@SAGA_UNICODE_TRUE@DEP_LFLG = -fPIC -shared `wx-config --unicode=yes --static=no --libs` +DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD +CXX_INCS = -I$(top_srcdir)/src/saga_core +AM_CXXFLAGS = $(CXX_INCS) $(DEF_SAGA) $(DEP_DEFS) $(DBGFLAGS) $(GOMPFLAGS) +AM_LDFLAGS = $(DEP_LFLG) -avoid-version +pkglib_LTLIBRARIES = libgarden_webservices.la +libgarden_webservices_la_SOURCES = \ +MLB_Interface.cpp\ +osm_import.cpp\ +wms_import.cpp\ +MLB_Interface.h\ +osm_import.h\ +wms_import.h + +libgarden_webservices_la_LIBADD = $(top_srcdir)/src/saga_core/saga_api/libsaga_api.la +all: all-am + +.SUFFIXES: +.SUFFIXES: .cpp .lo .o .obj +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/modules/garden/garden_webservices/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign src/modules/garden/garden_webservices/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): + +install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) + @$(NORMAL_INSTALL) + @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ + list2=; for p in $$list; do \ + if test -f $$p; then \ + list2="$$list2 $$p"; \ + else :; fi; \ + done; \ + test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \ + } + +uninstall-pkglibLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ + for p in $$list; do \ + $(am__strip_dir) \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$f"; \ + done + +clean-pkglibLTLIBRARIES: + -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES) + @list='$(pkglib_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + +libgarden_webservices.la: $(libgarden_webservices_la_OBJECTS) $(libgarden_webservices_la_DEPENDENCIES) $(EXTRA_libgarden_webservices_la_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) -rpath $(pkglibdir) $(libgarden_webservices_la_OBJECTS) $(libgarden_webservices_la_LIBADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MLB_Interface.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/osm_import.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wms_import.Plo@am__quote@ + +.cpp.o: +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< + +.cpp.obj: +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + +.cpp.lo: +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + set x; \ + here=`pwd`; \ + $(am__define_uniq_tagged_files); \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ + fi +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ + test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(LTLIBRARIES) +installdirs: + for dir in "$(DESTDIR)$(pkglibdir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool clean-pkglibLTLIBRARIES \ + mostlyclean-am + +distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: install-pkglibLTLIBRARIES + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-pkglibLTLIBRARIES + +.MAKE: install-am install-strip + +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-pkglibLTLIBRARIES install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ + uninstall-pkglibLTLIBRARIES + + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nru saga-2.1.0+dfsg/src/modules/garden/garden_webservices/MLB_Interface.cpp saga-2.1.4+dfsg/src/modules/garden/garden_webservices/MLB_Interface.cpp --- saga-2.1.0+dfsg/src/modules/garden/garden_webservices/MLB_Interface.cpp 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/garden/garden_webservices/MLB_Interface.cpp 2014-11-13 08:32:19.000000000 +0000 @@ -0,0 +1,128 @@ +/********************************************************** + * Version $Id: table.cpp 911 2011-02-14 16:38:15Z reklov_w $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// garden_webservices // +// // +//-------------------------------------------------------// +// // +// MLB_Interface.cpp // +// // +// Copyright (C) 2011 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Hamburg // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// The Module Link Library Interface // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +// 1. Include the appropriate SAGA-API header... + +#include "MLB_Interface.h" + + +//--------------------------------------------------------- +// 2. Place general module library informations here... + +CSG_String Get_Info(int i) +{ + switch( i ) + { + case MLB_INFO_Name: default: + return( _TL("Web Service Data Access" )); + + case MLB_INFO_Category: + return( _TL("Garden") ); + + case MLB_INFO_Author: + return( SG_T("SAGA User Group Associaton (c) 2011" )); + + case MLB_INFO_Description: + return( _TW("Web Service Data Access" )); + + case MLB_INFO_Version: + return( SG_T("1.0" )); + + case MLB_INFO_Menu_Path: + return( _TL("Garden|Web Service Data Access" )); + } +} + + +//--------------------------------------------------------- +// 3. Include the headers of your modules here... + +#include "wms_import.h" +#include "osm_import.h" + + +//--------------------------------------------------------- +// 4. Allow your modules to be created here... + +CSG_Module * Create_Module(int i) +{ + switch( i ) + { + case 0: return( new CWMS_Import ); + case 1: return( new COSM_Import ); + } + + return( NULL ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +//{{AFX_SAGA + + MLB_INTERFACE + +//}}AFX_SAGA diff -Nru saga-2.1.0+dfsg/src/modules/garden/garden_webservices/MLB_Interface.h saga-2.1.4+dfsg/src/modules/garden/garden_webservices/MLB_Interface.h --- saga-2.1.0+dfsg/src/modules/garden/garden_webservices/MLB_Interface.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/garden/garden_webservices/MLB_Interface.h 2014-11-13 08:32:19.000000000 +0000 @@ -0,0 +1,70 @@ +/********************************************************** + * Version $Id: table.cpp 911 2011-02-14 16:38:15Z reklov_w $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// garden_webservices // +// // +//-------------------------------------------------------// +// // +// MLB_Interface.h // +// // +// Copyright (C) 2011 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Hamburg // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// Include the SAGA-API here // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#ifndef HEADER_INCLUDED__MLB_INTERFACE_H +#define HEADER_INCLUDED__MLB_INTERFACE_H + +//--------------------------------------------------------- +#include + + +//--------------------------------------------------------- +#endif // #ifndef HEADER_INCLUDED__MLB_INTERFACE_H diff -Nru saga-2.1.0+dfsg/src/modules/garden/garden_webservices/osm_import.cpp saga-2.1.4+dfsg/src/modules/garden/garden_webservices/osm_import.cpp --- saga-2.1.0+dfsg/src/modules/garden/garden_webservices/osm_import.cpp 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/garden/garden_webservices/osm_import.cpp 2014-11-13 08:32:19.000000000 +0000 @@ -0,0 +1,450 @@ +/********************************************************** + * Version $Id: table.cpp 911 2011-02-14 16:38:15Z reklov_w $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// garden_webservices // +// // +//-------------------------------------------------------// +// // +// osm_import.cpp // +// // +// Copyright (C) 2011 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Hamburg // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include +#include + +#include "osm_import.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +COSM_Import::COSM_Import(void) +{ + Set_Name (_TL("Import from Open Street Map")); + + Set_Author (SG_T("O. Conrad (c) 2010")); + + Set_Description (_TW( + "This module works as Web Map Service (WMS) client. " + "More information on the WMS specifications can be obtained from the " + "Open Geospatial Consortium (OGC) at " + "http://www.opengeospatial.org/. " + )); + + //----------------------------------------------------- + Parameters.Add_Shapes( + NULL , "POINTS" , _TL("OSM Locations"), + _TL(""), + PARAMETER_OUTPUT, SHAPE_TYPE_Point + ); + + Parameters.Add_Shapes( + NULL , "WAYS" , _TL("OSM Ways"), + _TL(""), + PARAMETER_OUTPUT, SHAPE_TYPE_Line + ); + + Parameters.Add_Shapes( + NULL , "RELATIONS" , _TL("OSM Relations"), + _TL(""), + PARAMETER_OUTPUT, SHAPE_TYPE_Line + ); + + Parameters.Add_Shapes( + NULL , "AREAS" , _TL("OSM Areas"), + _TL(""), + PARAMETER_OUTPUT, SHAPE_TYPE_Polygon + ); + + //----------------------------------------------------- + Parameters.Add_String( + NULL , "USERNAME" , _TL("User Name"), + _TL(""), + SG_T("") + ); + + Parameters.Add_String( + NULL , "PASSWORD" , _TL("Password"), + _TL(""), + SG_T(""), false, true + ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool COSM_Import::On_Execute(void) +{ + //----------------------------------------------------- + m_pPoints = Parameters("POINTS") ->asShapes(); + m_pWays = Parameters("WAYS") ->asShapes(); + m_pAreas = Parameters("AREAS") ->asShapes(); + + m_bDown = false; + + //----------------------------------------------------- + wxHTTP Server; + + Server.SetUser (Parameters("USERNAME")->asString()); + Server.SetPassword (Parameters("PASSWORD")->asString()); + + if( Server.Connect(SG_T("api.openstreetmap.org")) == false ) + { + Message_Add(_TL("Unable to connect to server.")); + + return( false ); + } + + //----------------------------------------------------- + //----------------------------------------------------- +// +// Request.Set_Name(SG_T("osm")); +// Request.Add_Property(SG_T("version") , SG_T("0.6")); +// Request.Add_Property(SG_T("generator") , SG_T("OpenStreetMap server")); +// SG_T("api/capabilities"); +// http://api.openstreetmap.org/api/0.6/map?bbox=10.0,53.0,10.1,53.1 + + return( true ); +} + +//--------------------------------------------------------- +bool COSM_Import::On_Execute_Finish(void) +{ + return( true ); +} + +//--------------------------------------------------------- +bool COSM_Import::On_Execute_Position(CSG_Point ptWorld, TSG_Module_Interactive_Mode Mode) +{ + switch( Mode ) + { + //----------------------------------------------------- + case MODULE_INTERACTIVE_LDOWN: + if( m_bDown == false ) + { + m_bDown = true; + m_ptDown = ptWorld; + } + + break; + + //----------------------------------------------------- + case MODULE_INTERACTIVE_LUP: + if( m_bDown == true ) + { + m_bDown = false; + + wxHTTP Server; + + // Server.SetUser (Parameters("USERNAME")->asString()); + // Server.SetPassword (Parameters("PASSWORD")->asString()); + Server.SetUser (SG_T("")); + Server.SetPassword (SG_T("")); + + if( Server.Connect(SG_T("api.openstreetmap.org")) == false ) + { + Message_Add(_TL("Unable to connect to server.")); + + return( false ); + } + + CSG_Rect r(m_ptDown, ptWorld); + wxInputStream *pStream = Server.GetInputStream(wxString::Format(SG_T("/api/0.6/map?bbox=%f,%f,%f,%f"), + r.Get_XMin(), r.Get_YMin(), r.Get_XMax(), r.Get_YMax()) + ); + + if( (pStream ) == NULL ) + { + Message_Add(_TL("received empty stream.")); + + return( false ); + } + + Process_Set_Text(_TL("loading OSM data")); + + wxXmlDocument XML; + + if( !XML.Load(*pStream) ) + { + return( false ); + } + + Process_Set_Text(_TL("ready")); + + if( !Load_Nodes(XML.GetRoot()) ) + { + return( false ); + } + + Load_Ways(XML.GetRoot()); + + DataObject_Update(m_pPoints); + DataObject_Update(m_pWays); + DataObject_Update(m_pAreas); + + m_Nodes.Destroy(); + } + + break; + } + + return( true ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool COSM_Import::Load_Nodes(wxXmlNode *pRoot) +{ + long id; + double lon, lat; + wxString sValue; + + //----------------------------------------------------- + m_Nodes.Destroy(); + + m_Nodes.Add_Field(SG_T("ID") , SG_DATATYPE_DWord); + m_Nodes.Add_Field(SG_T("LON") , SG_DATATYPE_Double); + m_Nodes.Add_Field(SG_T("LAT") , SG_DATATYPE_Double); + + m_pPoints->Create(SHAPE_TYPE_Point, SG_T("OSM Locations")); + m_pPoints->Add_Field(SG_T("ID"), SG_DATATYPE_DWord); + + //----------------------------------------------------- + wxXmlNode *pNode = pRoot->GetChildren(); + + while( pNode ) + { + if( !pNode->GetName().CmpNoCase(SG_T("node")) ) + { + if( pNode->GetPropVal(SG_T("id" ), &sValue) && sValue.ToLong (&id) + && pNode->GetPropVal(SG_T("lon"), &sValue) && sValue.ToDouble(&lon) + && pNode->GetPropVal(SG_T("lat"), &sValue) && sValue.ToDouble(&lat) ) + { + wxXmlNode *pTag = pNode->GetChildren(); + + if( !pTag || !pTag->GetName().CmpNoCase(SG_T("created_by")) ) + { + CSG_Table_Record *pRecord = m_Nodes.Add_Record(); + + pRecord->Set_Value(0, id); + pRecord->Set_Value(1, lon); + pRecord->Set_Value(2, lat); + } + else + { + CSG_Shape *pShape = m_pPoints->Add_Shape(); + + pShape->Add_Point(lon, lat); + pShape->Set_Value(0, id); + } + } + } + + pNode = pNode->GetNext(); + } + + m_Nodes.Set_Index(0, TABLE_INDEX_Ascending); + + //----------------------------------------------------- + return( m_Nodes.Get_Count() > 0 ); +} + +//--------------------------------------------------------- +bool COSM_Import::Find_Node(long id, double &lon, double &lat) +{ + CSG_Table_Record *pRecord = Find_Node(id); + + if( pRecord ) + { + lon = pRecord->asDouble(1); + lat = pRecord->asDouble(2); + + return( true ); + } + + return( false ); +} + +//--------------------------------------------------------- +CSG_Table_Record * COSM_Import::Find_Node(long id) +{ + int a, b, d, i; + + if( m_Nodes.Get_Count() == 1 ) + { + if( m_Nodes.Get_Record_byIndex(0)->asInt(0) == id ) + { + return( m_Nodes.Get_Record_byIndex(0) ); + } + } + + else if( m_Nodes.Get_Count() > 1 ) + { + a = 0; + if( id < (d = m_Nodes.Get_Record_byIndex(a)->asInt(0)) ) return( NULL ); if( id == d ) return( m_Nodes.Get_Record_byIndex(a) ); + + b = m_Nodes.Get_Count() - 1; + if( id > (d = m_Nodes.Get_Record_byIndex(b)->asInt(0)) ) return( NULL ); if( id == d ) return( m_Nodes.Get_Record_byIndex(b) ); + + for( ; b - a > 1; ) + { + i = a + (b - a) / 2; + d = m_Nodes.Get_Record_byIndex(i)->asInt(0); + + if( id > d ) + { + a = i; + } + else if( id < d ) + { + b = i; + } + else + { + return( m_Nodes.Get_Record_byIndex(i) ); + } + } + } + + return( NULL ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool COSM_Import::Load_Ways(wxXmlNode *pRoot) +{ + long id, idnode, Nodes[2000], nNodes; + wxString sValue; + + //----------------------------------------------------- + m_pWays ->Create(SHAPE_TYPE_Line , SG_T("OSM Ways")); + m_pWays ->Add_Field(SG_T("ID"), SG_DATATYPE_DWord); + + m_pAreas ->Create(SHAPE_TYPE_Polygon , SG_T("OSM Areas")); + m_pAreas ->Add_Field(SG_T("ID"), SG_DATATYPE_DWord); + + //----------------------------------------------------- + wxXmlNode *pNode = pRoot->GetChildren(); + + while( pNode ) + { + if( !pNode->GetName().CmpNoCase(SG_T("way")) ) + { + if( pNode->GetPropVal(SG_T("id" ), &sValue) && sValue.ToLong (&id) ) + { + wxXmlNode *pChild = pNode->GetChildren(); + + nNodes = 0; + + while( pChild ) + { + if( !pChild->GetName().CmpNoCase(SG_T("nd")) && pChild->GetPropVal(SG_T("ref"), &sValue) && sValue.ToLong(&idnode) ) + { + Nodes[nNodes++] = idnode; + } + + pChild = pChild->GetNext(); + } + + if( nNodes > 1 ) + { + CSG_Shape *pShape = Nodes[0] == Nodes[nNodes - 1] ? m_pAreas->Add_Shape() : m_pWays->Add_Shape(); + + for(int i=0; iAdd_Point(lon, lat); + } + } + } + } + } + + pNode = pNode->GetNext(); + } + + return( true ); +} + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- diff -Nru saga-2.1.0+dfsg/src/modules/garden/garden_webservices/osm_import.h saga-2.1.4+dfsg/src/modules/garden/garden_webservices/osm_import.h --- saga-2.1.0+dfsg/src/modules/garden/garden_webservices/osm_import.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/garden/garden_webservices/osm_import.h 2014-11-13 08:32:19.000000000 +0000 @@ -0,0 +1,123 @@ +/********************************************************** + * Version $Id: table.cpp 911 2011-02-14 16:38:15Z reklov_w $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// garden_webservices // +// // +//-------------------------------------------------------// +// // +// osm_import.h // +// // +// Copyright (C) 2011 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Hamburg // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#ifndef HEADER_INCLUDED__OSM_Import_H +#define HEADER_INCLUDED__OSM_Import_H + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "MLB_Interface.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +class COSM_Import : public CSG_Module_Interactive +{ +public: + COSM_Import(void); + + +protected: + + virtual bool On_Execute (void); + virtual bool On_Execute_Finish (void); + virtual bool On_Execute_Position (CSG_Point ptWorld, TSG_Module_Interactive_Mode Mode); + + +private: + + bool m_bDown; + + CSG_Point m_ptDown; + + CSG_Table m_Nodes; + + CSG_Shapes *m_pPoints, *m_pWays, *m_pAreas; + + + bool Load_Nodes (class wxXmlNode *pRoot); + bool Find_Node (long id, double &lon, double &lat); + CSG_Table_Record * Find_Node (long id); + + bool Load_Ways (class wxXmlNode *pRoot); + +}; + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#endif // #ifndef HEADER_INCLUDED__OSM_Import_H diff -Nru saga-2.1.0+dfsg/src/modules/garden/garden_webservices/wms_import.cpp saga-2.1.4+dfsg/src/modules/garden/garden_webservices/wms_import.cpp --- saga-2.1.0+dfsg/src/modules/garden/garden_webservices/wms_import.cpp 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/garden/garden_webservices/wms_import.cpp 2014-11-13 08:32:19.000000000 +0000 @@ -0,0 +1,849 @@ +/********************************************************** + * Version $Id: table.cpp 911 2011-02-14 16:38:15Z reklov_w $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// garden_webservices // +// // +//-------------------------------------------------------// +// // +// wms_import.cpp // +// // +// Copyright (C) 2011 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Hamburg // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include +#include +#include + +#include "wms_import.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#define V_SRS(Version) (Version.Contains(SG_T("1.3")) ? SG_T("CRS") : SG_T("SRS")) +#define S_SRS(Version) (Version.Cmp(SG_T("1.3.0")) ? SG_T("&SRS=") : SG_T("&CRS=")) + +#define V_MAP(Version) (Version.Cmp(SG_T("1.0.0")) ? SG_T("GetMap") : SG_T("Map")) + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +CWMS_Capabilities::CWMS_Capabilities(void) +{ + m_pLayers = NULL; + + _Reset(); +} + +CWMS_Capabilities::CWMS_Capabilities(wxHTTP *pServer, const CSG_String &Directory, CSG_String &Version) +{ + m_pLayers = NULL; + + _Reset(); + + Create(pServer, Directory, Version); +} + +//--------------------------------------------------------- +CWMS_Capabilities::~CWMS_Capabilities(void) +{} + +//--------------------------------------------------------- +void CWMS_Capabilities::_Reset(void) +{ + m_MaxLayers = -1; + m_MaxWidth = -1; + m_MaxHeight = -1; + + m_Name .Clear(); + m_Title .Clear(); + m_Abstract .Clear(); + m_Online .Clear(); + m_Contact .Clear(); + m_Fees .Clear(); + m_Access .Clear(); + m_Keywords .Clear(); + + m_Formats .Clear(); + m_Projections .Clear(); + + m_Layers_Title .Clear(); + + if( m_pLayers ) + { + for(int i=0; iGetInputStream(sRequest.c_str())) != NULL ) + { + wxXmlDocument Capabilities; + + if( Capabilities.Load(*pStream) ) + { + bResult = _Get_Capabilities(Capabilities.GetRoot(), Version); + + Capabilities.Save(CSG_String::Format(SG_T("e:\\%s.xml"), m_Title.c_str()).c_str()); + } + + delete(pStream); + } + } + + return( bResult ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +wxXmlNode * CWMS_Capabilities::_Get_Child(wxXmlNode *pNode, const CSG_String &Name) +{ + if( pNode && (pNode = pNode->GetChildren()) != NULL ) + { + do + { + if( !pNode->GetName().CmpNoCase(Name.c_str()) ) + { + return( pNode ); + } + } + while( (pNode = pNode->GetNext()) != NULL ); + } + + return( NULL ); +} + +//--------------------------------------------------------- +bool CWMS_Capabilities::_Get_Child_Content(wxXmlNode *pNode, CSG_String &Value, const CSG_String &Name) +{ + if( (pNode = _Get_Child(pNode, Name)) != NULL ) + { + Value = pNode->GetNodeContent().wc_str(); + + return( true ); + } + + return( false ); +} + +//--------------------------------------------------------- +bool CWMS_Capabilities::_Get_Child_Content(wxXmlNode *pNode, int &Value, const CSG_String &Name) +{ + long lValue; + + if( (pNode = _Get_Child(pNode, Name)) != NULL && pNode->GetNodeContent().ToLong(&lValue) ) + { + Value = lValue; + + return( true ); + } + + return( false ); +} + +//--------------------------------------------------------- +bool CWMS_Capabilities::_Get_Child_Content(wxXmlNode *pNode, double &Value, const CSG_String &Name) +{ + double dValue; + + if( (pNode = _Get_Child(pNode, Name)) != NULL && pNode->GetNodeContent().ToDouble(&dValue) ) + { + Value = dValue; + + return( true ); + } + + return( false ); +} + +//--------------------------------------------------------- +bool CWMS_Capabilities::_Get_Node_PropVal(wxXmlNode *pNode, CSG_String &Value, const CSG_String &Property) +{ + wxString PropVal; + + if( pNode != NULL && pNode->GetPropVal(Property.c_str(), &PropVal) ) + { + Value = PropVal.wc_str(); + + return( true ); + } + + return( false ); +} + +bool CWMS_Capabilities::_Get_Child_PropVal(wxXmlNode *pNode, CSG_String &Value, const CSG_String &Name, const CSG_String &Property) +{ + return( (pNode = _Get_Child(pNode, Name)) != NULL && _Get_Node_PropVal(pNode, Value, Property) ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CWMS_Capabilities::_Get_Capabilities(wxXmlNode *pRoot, CSG_String &Version) +{ + wxXmlNode *pNode, *pChild; + + //----------------------------------------------------- + // 1. Service + + if( (pNode = _Get_Child(pRoot, SG_T("Service"))) == NULL ) + { + return( false ); + } + + _Get_Node_PropVal (pRoot, Version , SG_T("version")); + + _Get_Child_Content(pNode, m_Name , SG_T("Name")); + _Get_Child_Content(pNode, m_Title , SG_T("Title")); + _Get_Child_Content(pNode, m_Abstract , SG_T("Abstract")); + _Get_Child_Content(pNode, m_Fees , SG_T("Fees")); + _Get_Child_Content(pNode, m_Access , SG_T("AccessConstraints")); + _Get_Child_Content(pNode, m_MaxLayers , SG_T("LayerLimit")); + _Get_Child_Content(pNode, m_MaxWidth , SG_T("MaxWidth")); + _Get_Child_Content(pNode, m_MaxHeight , SG_T("MaxHeight")); + _Get_Child_PropVal(pNode, m_Online , SG_T("OnlineResource"), SG_T("xlink:href")); + + if( (pChild = _Get_Child(pNode, SG_T("KeywordList"))) != NULL ) + { + wxXmlNode *pKeyword = pChild->GetChildren(); + + while( pKeyword ) + { + if( !pKeyword->GetName().CmpNoCase(SG_T("Format")) ) + { + m_Keywords.Add(pKeyword->GetNodeContent().wx_str()); + } + + pKeyword = pKeyword->GetNext(); + } + } + + if( (pChild = _Get_Child(pNode, SG_T("ContactInformation"))) != NULL ) + { + } + + + //----------------------------------------------------- + // 2. Capabilities + + if( (pNode = _Get_Child(pRoot, SG_T("Capability"))) == NULL ) + { + return( false ); + } + + //----------------------------------------------------- + // 2.a) Request + + if( (pChild = _Get_Child(_Get_Child(_Get_Child(pNode, SG_T("Request")), V_MAP(Version)), SG_T("Format"))) != NULL ) + { + if( !Version.Cmp(SG_T("1.0.0")) ) + { + pChild = pChild->GetChildren(); + + while( pChild ) + { + m_Formats += pChild->GetName().wc_str(); + m_Formats += SG_T("|"); + + pChild = pChild->GetNext(); + } + } + else + { + do + { + if( !pChild->GetName().CmpNoCase(SG_T("Format")) ) + { + m_Formats += pChild->GetNodeContent().wc_str(); + m_Formats += SG_T("|"); + } + } + while( (pChild = pChild->GetNext()) != NULL ); + } + } + + //----------------------------------------------------- + // 2.b) Exception, Vendor Specific Capabilities, User Defined Symbolization, ... + + + //----------------------------------------------------- + // 2.c) Layers + + if( (pNode = _Get_Child(pNode, SG_T("Layer"))) == NULL ) + { + return( false ); + } + + CSG_String s; + + if( !(_Get_Child_PropVal(pNode, s, SG_T("BoundingBox"), SG_T("minx")) && s.asDouble(m_GeoBBox.xMin)) + || !(_Get_Child_PropVal(pNode, s, SG_T("BoundingBox"), SG_T("miny")) && s.asDouble(m_GeoBBox.yMin)) + || !(_Get_Child_PropVal(pNode, s, SG_T("BoundingBox"), SG_T("maxx")) && s.asDouble(m_GeoBBox.xMax)) + || !(_Get_Child_PropVal(pNode, s, SG_T("BoundingBox"), SG_T("maxy")) && s.asDouble(m_GeoBBox.yMax)) ) + { + m_GeoBBox.xMin = m_GeoBBox.yMin = m_GeoBBox.xMax = m_GeoBBox.yMax = 0.0; + } + + _Get_Child_Content(pNode, m_Layers_Title , SG_T("Title")); + + if( (pChild = _Get_Child(pNode, V_SRS(Version))) != NULL ) + { + do + { + if( !pChild->GetName().CmpNoCase(V_SRS(Version)) ) + { + m_sProjections .Add(pChild->GetNodeContent().wx_str()); + + // m_Projections += Get_EPSG_Name(CSG_String(&pChild->GetNodeContent())); + m_Projections += SG_T("|"); + } + } + while( (pChild = pChild->GetNext()) != NULL ); + } + + if( (pChild = pNode->GetChildren()) != NULL ) + { + do + { + _Get_Layer(pChild); + } + while( (pChild = pChild->GetNext()) != NULL ); + } + + //----------------------------------------------------- + return( true ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CWMS_Capabilities::_Get_Layer(wxXmlNode *pNode) +{ + if( pNode && !pNode->GetName().CmpNoCase(SG_T("Layer")) ) + { + CWMS_Layer *pLayer = new CWMS_Layer; + + if( _Get_Child_Content(pNode, pLayer->m_Name, SG_T("Name")) ) + { + _Get_Child_Content(pNode, pLayer->m_Title, SG_T("Title")); + + //--------------------------------------------- + m_pLayers = (CWMS_Layer **)SG_Realloc(m_pLayers, (m_nLayers + 1) * sizeof(CWMS_Layer *)); + m_pLayers[m_nLayers++] = pLayer; + + return( true ); + } + + delete(pLayer); + } + + return( false ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +CSG_String CWMS_Capabilities::Get_Summary(void) +{ + CSG_String s; + + if( m_Name.Length() > 0 ) + { + s += SG_T("\n[Name] ") + m_Name + SG_T("\n"); + } + + if( m_Title.Length() > 0 ) + { + s += SG_T("\n[Title] ") + m_Title + SG_T("\n"); + } + + if( m_Abstract.Length() > 0 ) + { + s += SG_T("\n[Abstract] ") + m_Abstract + SG_T("\n"); + } + + if( m_Fees.Length() > 0 ) + { + s += SG_T("\n[Fees] ") + m_Fees + SG_T("\n"); + } + + if( m_Online.Length() > 0 ) + { + s += SG_T("\n[Online Resource] ") + m_Online + SG_T("\n"); + } + + if( m_Keywords.Get_Count() > 0 ) + { + s += SG_T("\n[Keywords] "); + + for(int i=0; i 0 ) s += SG_T(", "); + + s += m_Keywords[i]; + } + + s += SG_T("\n"); + } + + if( m_MaxLayers > 0 ) + { + s += CSG_String::Format(SG_T("\n[Max. Layers] %d\n"), m_MaxLayers); + } + + if( m_MaxWidth > 0 ) + { + s += CSG_String::Format(SG_T("\n[Max. Width] %d\n"), m_MaxWidth); + } + + if( m_MaxHeight > 0 ) + { + s += CSG_String::Format(SG_T("\n[Max. Height] %d\n"), m_MaxHeight); + } + + if( m_Contact.Length() > 0 ) + { + s += SG_T("\n[Contact] ") + m_Contact + SG_T("\n"); + } + + if( m_Access.Length() > 0 ) + { + s += SG_T("\n[Access] ") + m_Access + SG_T("\n"); + } + + return( s ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +CWMS_Import::CWMS_Import(void) +{ + Set_Name (_TL("Import a Map via Web Map Service (WMS)")); + + Set_Author (SG_T("O. Conrad (c) 2008")); + + Set_Description (_TW( + "This module works as Web Map Service (WMS) client. " + "More information on the WMS specifications can be obtained from the " + "Open Geospatial Consortium (OGC) at " + "http://www.opengeospatial.org/. " + )); + + //----------------------------------------------------- + Parameters.Add_Grid_Output( + NULL , "MAP" , _TL("WMS Map"), + _TL("") + ); + + //----------------------------------------------------- + Parameters.Add_String( + NULL , "SERVER" , _TL("Server"), + _TL(""), + // SG_T("www.gaia-mv.de/dienste/DTK10f") // 260000.0x, 5950000.0y Cellsize 1.0 + // SG_T("www.gis2.nrw.de/wmsconnector/wms/stobo") + // SG_T("www2.demis.nl/mapserver/request.asp") + // SG_T("www.geoserver.nrw.de/GeoOgcWms1.3/servlet/TK25") + // SG_T("www.geographynetwork.com/servlet/com.esri.wms.Esrimap") + SG_T("ogc.bgs.ac.uk/cgi-bin/BGS_Bedrock_and_Superficial_Geology/wms") // WGS84: Center -3.5x 55.0y Cellsize 0.005 + ); + + Parameters.Add_String( + NULL , "USERNAME" , _TL("User Name"), + _TL(""), + SG_T("") + ); + + Parameters.Add_String( + NULL , "PASSWORD" , _TL("Password"), + _TL(""), + SG_T(""), false, true + ); +} + +//--------------------------------------------------------- +CWMS_Import::~CWMS_Import(void) +{} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CWMS_Import::On_Execute(void) +{ + wxHTTP Server; + CSG_String sServer, sDirectory, sVersion; + CWMS_Capabilities Capabilities; + + //----------------------------------------------------- + sServer = Parameters("SERVER")->asString(); + + if( sServer.Contains(SG_T("http://")) ) + { + sServer = Parameters("SERVER")->asString() + 7; + } + + sDirectory = SG_T("/") + sServer.AfterFirst(SG_T('/')); + sServer = sServer.BeforeFirst(SG_T('/')); + + //----------------------------------------------------- + Server.SetUser (Parameters("USERNAME")->asString()); + Server.SetPassword (Parameters("PASSWORD")->asString()); + + if( Server.Connect(sServer.c_str()) == false ) + { + Message_Add(_TL("Unable to connect to server.")); + + return( false ); + } + + //----------------------------------------------------- + if( Capabilities.Create(&Server, sDirectory, sVersion) == false ) + { + Message_Add(_TL("Unable to get capabilities.")); + + return( false ); + } + + Message_Add(Capabilities.Get_Summary(), false); + + Message_Add(CSG_String::Format(SG_T("\n%s\nmin: %fx - %fy\nmax: %fx - %fy\n"), _TL("Extent"), + Capabilities.m_GeoBBox.xMin, + Capabilities.m_GeoBBox.yMin, + Capabilities.m_GeoBBox.xMax, + Capabilities.m_GeoBBox.yMax), false + ); + + //----------------------------------------------------- + if( Get_Map(&Server, sDirectory, sVersion, Capabilities) == false ) + { + Message_Add(_TL("Unable to get map.")); + + return( false ); + } + + //----------------------------------------------------- + return( true ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CWMS_Import::Do_Dialog(CWMS_Capabilities &Cap) +{ + return( false ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CWMS_Import::Get_Map(wxHTTP *pServer, const CSG_String &Directory, const CSG_String &Version, CWMS_Capabilities &Cap) +{ + bool bResult = false; + + int i, n; + CSG_Rect r(Cap.m_GeoBBox); + CSG_Parameters p; + + //----------------------------------------------------- +// if( Cap.m_MaxWidth > 2 && NX > Cap.m_MaxWidth ) NX = Cap.m_MaxWidth; +// if( Cap.m_MaxHeight > 2 && NY > Cap.m_MaxHeight ) NY = Cap.m_MaxHeight; + + p.Add_Range (NULL , "X_RANGE" , _TL("X Range") , _TL(""), r.Get_XMin(), r.Get_XMax(), r.Get_XMin(), r.Get_XRange() > 0.0, r.Get_XMax(), r.Get_XRange() > 0.0); + p.Add_Range (NULL , "Y_RANGE" , _TL("Y Range") , _TL(""), r.Get_YMin(), r.Get_YMax(), r.Get_YMin(), r.Get_YRange() > 0.0, r.Get_YMax(), r.Get_YRange() > 0.0); + + p.Add_Value (NULL , "CELLSIZE", _TL("Cellsize") , _TL(""), PARAMETER_TYPE_Double, r.Get_XRange() / 2001.0, 0.0, true); + + p.Add_Choice(NULL , "FORMAT" , _TL("Format") , _TL(""), Cap.m_Formats); + p.Add_Choice(NULL , "PROJ" , _TL("Projections"), _TL(""), Cap.m_Projections); + + CSG_Parameter *pNode = p("FORMAT"); + for(i=0; iasChoice()->Get_Count(); i++) + { + CSG_String s(pNode->asChoice()->Get_Item(i)); + if( !s.CmpNoCase(SG_T("image/png")) ) + pNode->Set_Value(i); + } + + for(i=0; im_Name, Cap.m_pLayers[i]->m_Title, SG_T(""), PARAMETER_TYPE_Bool, false); + } + + //----------------------------------------------------- + if( pServer && Dlg_Parameters(&p, _TL("WMS Import")) ) + { + long tFormat; + int NX, NY; + double Cellsize; + CSG_String Layers, Format; + + //------------------------------------------------- + r.Assign( + p("X_RANGE")->asRange()->Get_LoVal(), + p("Y_RANGE")->asRange()->Get_LoVal(), + p("X_RANGE")->asRange()->Get_HiVal(), + p("Y_RANGE")->asRange()->Get_HiVal() + ); + + Cellsize = p("CELLSIZE") ->asDouble(); + + NX = 1 + (int)(r.Get_XRange() / Cellsize); + NY = 1 + (int)(r.Get_YRange() / Cellsize); + + //------------------------------------------------- + Layers.Clear(); + + for(i=0, n=0; im_Name)->asBool() ) + { + if( n++ > 0 ) Layers += SG_T(","); + Layers += Cap.m_pLayers[i]->m_Name; + } + } + + if( n == 0 ) + { + return( false ); + } + + //------------------------------------------------- + Format = p("FORMAT")->asString(); + + if( Format.Contains(SG_T("image/gif")) ) tFormat = wxBITMAP_TYPE_GIF; + else if( Format.Contains(SG_T("image/jpeg")) ) tFormat = wxBITMAP_TYPE_JPEG; + else if( Format.Contains(SG_T("image/png")) ) tFormat = wxBITMAP_TYPE_PNG; + else if( Format.Contains(SG_T("image/wbmp")) ) tFormat = wxBITMAP_TYPE_BMP; + else if( Format.Contains(SG_T("image/bmp")) ) tFormat = wxBITMAP_TYPE_BMP; + else if( Format.Contains(SG_T("image/tiff")) ) tFormat = wxBITMAP_TYPE_TIF; + else if( Format.Contains(SG_T("GIF")) ) tFormat = wxBITMAP_TYPE_GIF; + else if( Format.Contains(SG_T("JPEG")) ) tFormat = wxBITMAP_TYPE_JPEG; + else if( Format.Contains(SG_T("PNG")) ) tFormat = wxBITMAP_TYPE_PNG; + else + { + return( false ); + } + + //------------------------------------------------- + CSG_String sRequest(Directory); + + sRequest += SG_T("?SERVICE=WMS"); + sRequest += SG_T("&VERSION=") + Version; + sRequest += SG_T("&REQUEST=GetMap"); + + sRequest += SG_T("&LAYERS=") + Layers; + + if( Cap.m_sProjections.Get_Count() > 0 ) + sRequest += S_SRS(Version) + Cap.m_sProjections[p("PROJ")->asInt()]; + + sRequest += SG_T("&FORMAT=") + Format; + + sRequest += CSG_String::Format(SG_T("&WIDTH=%d&HEIGHT=%d"), NX, NY); + sRequest += CSG_String::Format(SG_T("&BBOX=%f,%f,%f,%f"), r.m_rect.xMin, r.m_rect.yMin, r.m_rect.xMax, r.m_rect.yMax); + + Message_Add(sRequest, true); + + //------------------------------------------------- + wxInputStream *pStream; + + if( (pStream = pServer->GetInputStream(sRequest.c_str())) == NULL ) + { + Message_Add(_TL("could not open GetMap stream")); + } + else + { + wxImage Image; + + if( Image.LoadFile(*pStream, tFormat) == false ) + { + Message_Add(_TL("could not read image")); + + CSG_String s = SG_T("\n"); + + pStream->SeekI(0, wxFromStart); + + while( !pStream->Eof() ) + { + s += (char)pStream->GetC(); + } + + Message_Add(s); + } + else + { + CSG_Grid *pGrid = SG_Create_Grid(SG_DATATYPE_Int, Image.GetWidth(), Image.GetHeight(), Cellsize, r.m_rect.xMin, r.m_rect.yMin); + + for(int y=0, yy=pGrid->Get_NY()-1; yGet_NY() && Set_Progress(y, pGrid->Get_NY()); y++, yy--) + { + for(int x=0; xGet_NX(); x++) + { + pGrid->Set_Value(x, y, SG_GET_RGB(Image.GetRed(x, yy), Image.GetGreen(x, yy), Image.GetBlue(x, yy))); + } + } + + //----------------------------------------- + pGrid->Set_Name(Cap.m_Title); + Parameters("MAP")->Set_Value(pGrid); + DataObject_Set_Colors(pGrid, 100, SG_COLORS_BLACK_WHITE); + + CSG_Parameters Parms; + + if( DataObject_Get_Parameters(pGrid, Parms) && Parms("COLORS_TYPE") ) + { + Parms("COLORS_TYPE")->Set_Value(3); // Color Classification Type: RGB + + DataObject_Set_Parameters(pGrid, Parms); + } + + bResult = true; + } + + delete(pStream); + } + } + + return( bResult ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- diff -Nru saga-2.1.0+dfsg/src/modules/garden/garden_webservices/wms_import.h saga-2.1.4+dfsg/src/modules/garden/garden_webservices/wms_import.h --- saga-2.1.0+dfsg/src/modules/garden/garden_webservices/wms_import.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/garden/garden_webservices/wms_import.h 2014-11-13 08:32:19.000000000 +0000 @@ -0,0 +1,174 @@ +/********************************************************** + * Version $Id: table.cpp 911 2011-02-14 16:38:15Z reklov_w $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// garden_webservices // +// // +//-------------------------------------------------------// +// // +// wms_import.h // +// // +// Copyright (C) 2011 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Hamburg // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#ifndef HEADER_INCLUDED__WMS_Import_H +#define HEADER_INCLUDED__WMS_Import_H + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "MLB_Interface.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +class CWMS_Layer +{ +public: + CWMS_Layer(void) {} + virtual ~CWMS_Layer(void) {} + + + TSG_Rect m_GeoBBox; + + CSG_String m_Name, m_Title; + +}; + +//--------------------------------------------------------- +class CWMS_Capabilities +{ +public: + CWMS_Capabilities(void); + CWMS_Capabilities(class wxHTTP *pServer, const CSG_String &Directory, CSG_String &Version); + + virtual ~CWMS_Capabilities(void); + + + bool Create (class wxHTTP *pServer, const CSG_String &Directory, CSG_String &Version); + + CSG_String Get_Summary (void); + + + int m_MaxLayers, m_MaxWidth, m_MaxHeight, m_nLayers; + + TSG_Rect m_GeoBBox; + + CSG_String m_Name, m_Title, m_Abstract, m_Online, m_Contact, m_Fees, m_Access, m_Formats, m_Layers_Title, m_Projections; + + CSG_Strings m_Keywords, m_sProjections; + + CWMS_Layer **m_pLayers; + + +private: + + void _Reset (void); + + class wxXmlNode * _Get_Child (class wxXmlNode *pNode, const CSG_String &Name); + bool _Get_Child_Content (class wxXmlNode *pNode, CSG_String &Value, const CSG_String &Name); + bool _Get_Child_Content (class wxXmlNode *pNode, int &Value, const CSG_String &Name); + bool _Get_Child_Content (class wxXmlNode *pNode, double &Value, const CSG_String &Name); + bool _Get_Node_PropVal (class wxXmlNode *pNode, CSG_String &Value, const CSG_String &Property); + bool _Get_Child_PropVal (class wxXmlNode *pNode, CSG_String &Value, const CSG_String &Name, const CSG_String &Property); + + bool _Get_Capabilities (class wxXmlNode *pRoot, CSG_String &Version); + bool _Get_Layer (class wxXmlNode *pNode); + +}; + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +class CWMS_Import : public CSG_Module +{ +public: + CWMS_Import(void); + virtual ~CWMS_Import(void); + + +protected: + + virtual bool On_Execute (void); + + +private: + + bool Do_Dialog (CWMS_Capabilities &Cap); + + bool Get_Map (class wxHTTP *pServer, const CSG_String &Directory, const CSG_String &Version, CWMS_Capabilities &Cap); + +}; + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#endif // #ifndef HEADER_INCLUDED__WMS_Import_H diff -Nru saga-2.1.0+dfsg/src/modules/garden/Makefile.am saga-2.1.4+dfsg/src/modules/garden/Makefile.am --- saga-2.1.0+dfsg/src/modules/garden/Makefile.am 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/garden/Makefile.am 2014-11-13 08:32:19.000000000 +0000 @@ -0,0 +1,5 @@ +if WITH_GUI +SUBDIRS = garden_3d_viewer garden_fractals garden_games garden_learn_to_program garden_webservices +else +SUBDIRS = garden_fractals garden_games garden_learn_to_program +endif diff -Nru saga-2.1.0+dfsg/src/modules/garden/Makefile.in saga-2.1.4+dfsg/src/modules/garden/Makefile.in --- saga-2.1.0+dfsg/src/modules/garden/Makefile.in 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/garden/Makefile.in 2014-11-13 08:33:29.000000000 +0000 @@ -0,0 +1,641 @@ +# Makefile.in generated by automake 1.14.1 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ +VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +subdir = src/modules/garden +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_postgresql.m4 \ + $(top_srcdir)/m4/ax_pkg_swig.m4 \ + $(top_srcdir)/m4/ax_python_devel.m4 \ + $(top_srcdir)/m4/ax_swig_enable_cxx.m4 \ + $(top_srcdir)/m4/ax_swig_python.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = +SOURCES = +DIST_SOURCES = +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ + distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags +DIST_SUBDIRS = garden_fractals garden_games garden_learn_to_program \ + garden_3d_viewer garden_webservices +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +am__relativize = \ + dir0=`pwd`; \ + sed_first='s,^\([^/]*\)/.*$$,\1,'; \ + sed_rest='s,^[^/]*/*,,'; \ + sed_last='s,^.*/\([^/]*\)$$,\1,'; \ + sed_butlast='s,/*[^/]*$$,,'; \ + while test -n "$$dir1"; do \ + first=`echo "$$dir1" | sed -e "$$sed_first"`; \ + if test "$$first" != "."; then \ + if test "$$first" = ".."; then \ + dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ + dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ + else \ + first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ + if test "$$first2" = "$$first"; then \ + dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ + else \ + dir2="../$$dir2"; \ + fi; \ + dir0="$$dir0"/"$$first"; \ + fi; \ + fi; \ + dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ + done; \ + reldir="$$dir2" +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +AX_SWIG_PYTHON_CPPFLAGS = @AX_SWIG_PYTHON_CPPFLAGS@ +AX_SWIG_PYTHON_OPT = @AX_SWIG_PYTHON_OPT@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DISABLELIBHARU = @DISABLELIBHARU@ +DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +FGREP = @FGREP@ +GOMPFLAGS = @GOMPFLAGS@ +GREP = @GREP@ +HARU_LIB = @HARU_LIB@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LOCAL_INCS = @LOCAL_INCS@ +LOCAL_LIBS = @LOCAL_LIBS@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ +MKDIR_P = @MKDIR_P@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PG_CONFIG = @PG_CONFIG@ +POSTGRESQL_CFLAGS = @POSTGRESQL_CFLAGS@ +POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@ +POSTGRESQL_VERSION = @POSTGRESQL_VERSION@ +POW_LIB = @POW_LIB@ +PYTHON = @PYTHON@ +PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ +PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ +PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ +PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_PLATFORM = @PYTHON_PLATFORM@ +PYTHON_PREFIX = @PYTHON_PREFIX@ +PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ +PYTHON_VERSION = @PYTHON_VERSION@ +RANLIB = @RANLIB@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +SWIG = @SWIG@ +SWIG_LIB = @SWIG_LIB@ +VERSION = @VERSION@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +pkgpyexecdir = @pkgpyexecdir@ +pkgpythondir = @pkgpythondir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +pyexecdir = @pyexecdir@ +pythondir = @pythondir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +@WITH_GUI_FALSE@SUBDIRS = garden_fractals garden_games garden_learn_to_program +@WITH_GUI_TRUE@SUBDIRS = garden_3d_viewer garden_fractals garden_games garden_learn_to_program garden_webservices +all: all-recursive + +.SUFFIXES: +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/modules/garden/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign src/modules/garden/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +# This directory's subdirectories are mostly independent; you can cd +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + dot_seen=yes; \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + set x; \ + here=`pwd`; \ + if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ + empty_fix=.; \ + else \ + include_option=--include; \ + empty_fix=; \ + fi; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test ! -f $$subdir/TAGS || \ + set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ + $(am__define_uniq_tagged_files); \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ + fi +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ + test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ + dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ + $(am__relativize); \ + new_distdir=$$reldir; \ + dir1=$$subdir; dir2="$(top_distdir)"; \ + $(am__relativize); \ + new_top_distdir=$$reldir; \ + echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ + echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ + ($(am__cd) $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$$new_top_distdir" \ + distdir="$$new_distdir" \ + am__remove_distdir=: \ + am__skip_length_check=: \ + am__skip_mode_fix=: \ + distdir) \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-recursive +all-am: Makefile +installdirs: installdirs-recursive +installdirs-am: +install: install-recursive +install-exec: install-exec-recursive +install-data: install-data-recursive +uninstall: uninstall-recursive + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-recursive +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-recursive + +clean-am: clean-generic clean-libtool mostlyclean-am + +distclean: distclean-recursive + -rm -f Makefile +distclean-am: clean-am distclean-generic distclean-tags + +dvi: dvi-recursive + +dvi-am: + +html: html-recursive + +html-am: + +info: info-recursive + +info-am: + +install-data-am: + +install-dvi: install-dvi-recursive + +install-dvi-am: + +install-exec-am: + +install-html: install-html-recursive + +install-html-am: + +install-info: install-info-recursive + +install-info-am: + +install-man: + +install-pdf: install-pdf-recursive + +install-pdf-am: + +install-ps: install-ps-recursive + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-recursive + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-recursive + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +pdf: pdf-recursive + +pdf-am: + +ps: ps-recursive + +ps-am: + +uninstall-am: + +.MAKE: $(am__recursive_targets) install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags tags-am uninstall uninstall-am + + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_analysis/Cost_Anisotropic.cpp saga-2.1.4+dfsg/src/modules/grid/grid_analysis/Cost_Anisotropic.cpp --- saga-2.1.0+dfsg/src/modules/grid/grid_analysis/Cost_Anisotropic.cpp 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_analysis/Cost_Anisotropic.cpp 2014-11-13 08:32:16.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Cost_Anisotropic.cpp 911 2011-02-14 16:38:15Z reklov_w $ + * Version $Id: Cost_Anisotropic.cpp 2072 2014-03-31 08:50:43Z reklov_w $ *********************************************************/ /******************************************************************************* Cost_Anisotropic.cpp @@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, USA *******************************************************************************/ #include "Cost_Anisotropic.h" diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_analysis/Cost_Anisotropic.h saga-2.1.4+dfsg/src/modules/grid/grid_analysis/Cost_Anisotropic.h --- saga-2.1.0+dfsg/src/modules/grid/grid_analysis/Cost_Anisotropic.h 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_analysis/Cost_Anisotropic.h 2014-11-13 08:32:16.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Cost_Anisotropic.h 1246 2011-11-25 13:42:38Z oconrad $ + * Version $Id: Cost_Anisotropic.h 2072 2014-03-31 08:50:43Z reklov_w $ *********************************************************/ /******************************************************************************* Cost_Anisotropic.h @@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, USA *******************************************************************************/ #ifndef HEADER_INCLUDED__Cost_Anisotropic_H #define HEADER_INCLUDED__Cost_Anisotropic_H diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_analysis/Cost_Isotropic.cpp saga-2.1.4+dfsg/src/modules/grid/grid_analysis/Cost_Isotropic.cpp --- saga-2.1.0+dfsg/src/modules/grid/grid_analysis/Cost_Isotropic.cpp 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_analysis/Cost_Isotropic.cpp 2014-11-13 08:32:16.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Cost_Isotropic.cpp 911 2011-02-14 16:38:15Z reklov_w $ + * Version $Id: Cost_Isotropic.cpp 2072 2014-03-31 08:50:43Z reklov_w $ *********************************************************/ /******************************************************************************* Cost_Isotropic.cpp @@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, USA *******************************************************************************/ #include "Cost_Isotropic.h" diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_analysis/Cost_Isotropic.h saga-2.1.4+dfsg/src/modules/grid/grid_analysis/Cost_Isotropic.h --- saga-2.1.0+dfsg/src/modules/grid/grid_analysis/Cost_Isotropic.h 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_analysis/Cost_Isotropic.h 2014-11-13 08:32:16.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Cost_Isotropic.h 1246 2011-11-25 13:42:38Z oconrad $ + * Version $Id: Cost_Isotropic.h 2072 2014-03-31 08:50:43Z reklov_w $ *********************************************************/ /******************************************************************************* Cost_Isotropic.h @@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, USA *******************************************************************************/ #ifndef HEADER_INCLUDED__Cost_Isotropic_H #define HEADER_INCLUDED__Cost_Isotropic_H diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_analysis/CoveredDistance.cpp saga-2.1.4+dfsg/src/modules/grid/grid_analysis/CoveredDistance.cpp --- saga-2.1.0+dfsg/src/modules/grid/grid_analysis/CoveredDistance.cpp 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_analysis/CoveredDistance.cpp 2014-11-13 08:32:16.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: CoveredDistance.cpp 911 2011-02-14 16:38:15Z reklov_w $ + * Version $Id: CoveredDistance.cpp 2072 2014-03-31 08:50:43Z reklov_w $ *********************************************************/ /******************************************************************************* CoveredDistance.cpp @@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, USA *******************************************************************************/ #include "CoveredDistance.h" diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_analysis/CoveredDistance.h saga-2.1.4+dfsg/src/modules/grid/grid_analysis/CoveredDistance.h --- saga-2.1.0+dfsg/src/modules/grid/grid_analysis/CoveredDistance.h 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_analysis/CoveredDistance.h 2014-11-13 08:32:16.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: CoveredDistance.h 911 2011-02-14 16:38:15Z reklov_w $ + * Version $Id: CoveredDistance.h 2072 2014-03-31 08:50:43Z reklov_w $ *********************************************************/ /******************************************************************************* CoveredDistance.h @@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, USA *******************************************************************************/ #if _MSC_VER > 1000 #pragma once diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_analysis/CrossClassification.cpp saga-2.1.4+dfsg/src/modules/grid/grid_analysis/CrossClassification.cpp --- saga-2.1.0+dfsg/src/modules/grid/grid_analysis/CrossClassification.cpp 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_analysis/CrossClassification.cpp 2014-11-13 08:32:16.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: CrossClassification.cpp 911 2011-02-14 16:38:15Z reklov_w $ + * Version $Id: CrossClassification.cpp 2072 2014-03-31 08:50:43Z reklov_w $ *********************************************************/ /******************************************************************************* CrossClassification.cpp @@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, USA *******************************************************************************/ #include "CrossClassification.h" diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_analysis/CrossClassification.h saga-2.1.4+dfsg/src/modules/grid/grid_analysis/CrossClassification.h --- saga-2.1.0+dfsg/src/modules/grid/grid_analysis/CrossClassification.h 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_analysis/CrossClassification.h 2014-11-13 08:32:16.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: CrossClassification.h 911 2011-02-14 16:38:15Z reklov_w $ + * Version $Id: CrossClassification.h 2072 2014-03-31 08:50:43Z reklov_w $ *********************************************************/ /******************************************************************************* CrossClassification.h @@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, USA *******************************************************************************/ #if _MSC_VER > 1000 diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_analysis/fragmentation_base.cpp saga-2.1.4+dfsg/src/modules/grid/grid_analysis/fragmentation_base.cpp --- saga-2.1.0+dfsg/src/modules/grid/grid_analysis/fragmentation_base.cpp 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_analysis/fragmentation_base.cpp 2014-11-13 08:32:16.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: fragmentation_base.cpp 911 2011-02-14 16:38:15Z reklov_w $ + * Version $Id: fragmentation_base.cpp 1921 2014-01-09 10:24:11Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_analysis/fragmentation_base.h saga-2.1.4+dfsg/src/modules/grid/grid_analysis/fragmentation_base.h --- saga-2.1.0+dfsg/src/modules/grid/grid_analysis/fragmentation_base.h 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_analysis/fragmentation_base.h 2014-11-13 08:32:16.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: fragmentation_base.h 1246 2011-11-25 13:42:38Z oconrad $ + * Version $Id: fragmentation_base.h 1921 2014-01-09 10:24:11Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_analysis/fragmentation_classify.cpp saga-2.1.4+dfsg/src/modules/grid/grid_analysis/fragmentation_classify.cpp --- saga-2.1.0+dfsg/src/modules/grid/grid_analysis/fragmentation_classify.cpp 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_analysis/fragmentation_classify.cpp 2014-11-13 08:32:16.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: fragmentation_classify.cpp 911 2011-02-14 16:38:15Z reklov_w $ + * Version $Id: fragmentation_classify.cpp 1921 2014-01-09 10:24:11Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_analysis/fragmentation_classify.h saga-2.1.4+dfsg/src/modules/grid/grid_analysis/fragmentation_classify.h --- saga-2.1.0+dfsg/src/modules/grid/grid_analysis/fragmentation_classify.h 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_analysis/fragmentation_classify.h 2014-11-13 08:32:16.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: fragmentation_classify.h 911 2011-02-14 16:38:15Z reklov_w $ + * Version $Id: fragmentation_classify.h 1921 2014-01-09 10:24:11Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_analysis/fragmentation_resampling.cpp saga-2.1.4+dfsg/src/modules/grid/grid_analysis/fragmentation_resampling.cpp --- saga-2.1.0+dfsg/src/modules/grid/grid_analysis/fragmentation_resampling.cpp 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_analysis/fragmentation_resampling.cpp 2014-11-13 08:32:16.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: fragmentation_resampling.cpp 911 2011-02-14 16:38:15Z reklov_w $ + * Version $Id: fragmentation_resampling.cpp 1921 2014-01-09 10:24:11Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_analysis/fragmentation_resampling.h saga-2.1.4+dfsg/src/modules/grid/grid_analysis/fragmentation_resampling.h --- saga-2.1.0+dfsg/src/modules/grid/grid_analysis/fragmentation_resampling.h 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_analysis/fragmentation_resampling.h 2014-11-13 08:32:16.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: fragmentation_resampling.h 911 2011-02-14 16:38:15Z reklov_w $ + * Version $Id: fragmentation_resampling.h 1921 2014-01-09 10:24:11Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_analysis/fragmentation_standard.cpp saga-2.1.4+dfsg/src/modules/grid/grid_analysis/fragmentation_standard.cpp --- saga-2.1.0+dfsg/src/modules/grid/grid_analysis/fragmentation_standard.cpp 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_analysis/fragmentation_standard.cpp 2014-11-13 08:32:16.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: fragmentation_standard.cpp 911 2011-02-14 16:38:15Z reklov_w $ + * Version $Id: fragmentation_standard.cpp 1921 2014-01-09 10:24:11Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_analysis/fragmentation_standard.h saga-2.1.4+dfsg/src/modules/grid/grid_analysis/fragmentation_standard.h --- saga-2.1.0+dfsg/src/modules/grid/grid_analysis/fragmentation_standard.h 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_analysis/fragmentation_standard.h 2014-11-13 08:32:16.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: fragmentation_standard.h 911 2011-02-14 16:38:15Z reklov_w $ + * Version $Id: fragmentation_standard.h 1921 2014-01-09 10:24:11Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_analysis/Grid_Accumulation_Functions.cpp saga-2.1.4+dfsg/src/modules/grid/grid_analysis/Grid_Accumulation_Functions.cpp --- saga-2.1.0+dfsg/src/modules/grid/grid_analysis/Grid_Accumulation_Functions.cpp 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_analysis/Grid_Accumulation_Functions.cpp 2014-11-13 08:32:16.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Grid_Accumulation_Functions.cpp 1458 2012-08-15 16:23:30Z reklov_w $ + * Version $Id: Grid_Accumulation_Functions.cpp 2241 2014-09-22 11:04:27Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// @@ -235,7 +235,14 @@ } - for(long n=0; nSet_Index() ) + { + Error_Set(_TL("index creation failed")); + + return( false ); + } + + for(sLong n=0; nGet_Sorted(n, x, y, true); diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_analysis/Grid_Accumulation_Functions.h saga-2.1.4+dfsg/src/modules/grid/grid_analysis/Grid_Accumulation_Functions.h --- saga-2.1.0+dfsg/src/modules/grid/grid_analysis/Grid_Accumulation_Functions.h 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_analysis/Grid_Accumulation_Functions.h 2014-11-13 08:32:16.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Grid_Accumulation_Functions.h 1457 2012-08-15 16:08:39Z reklov_w $ + * Version $Id: Grid_Accumulation_Functions.h 1921 2014-01-09 10:24:11Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_analysis/Grid_AggregationIndex.cpp saga-2.1.4+dfsg/src/modules/grid/grid_analysis/Grid_AggregationIndex.cpp --- saga-2.1.0+dfsg/src/modules/grid/grid_analysis/Grid_AggregationIndex.cpp 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_analysis/Grid_AggregationIndex.cpp 2014-11-13 08:32:16.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Grid_AggregationIndex.cpp 911 2011-02-14 16:38:15Z reklov_w $ + * Version $Id: Grid_AggregationIndex.cpp 2072 2014-03-31 08:50:43Z reklov_w $ *********************************************************/ /******************************************************************************* AggregationIndex.cpp @@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, USA *******************************************************************************/ #include "Grid_AggregationIndex.h" diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_analysis/Grid_AggregationIndex.h saga-2.1.4+dfsg/src/modules/grid/grid_analysis/Grid_AggregationIndex.h --- saga-2.1.0+dfsg/src/modules/grid/grid_analysis/Grid_AggregationIndex.h 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_analysis/Grid_AggregationIndex.h 2014-11-13 08:32:16.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Grid_AggregationIndex.h 911 2011-02-14 16:38:15Z reklov_w $ + * Version $Id: Grid_AggregationIndex.h 2072 2014-03-31 08:50:43Z reklov_w $ *********************************************************/ /******************************************************************************* AggregationIndex.h @@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, USA *******************************************************************************/ #if _MSC_VER > 1000 diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_analysis/Grid_AHP.cpp saga-2.1.4+dfsg/src/modules/grid/grid_analysis/Grid_AHP.cpp --- saga-2.1.0+dfsg/src/modules/grid/grid_analysis/Grid_AHP.cpp 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_analysis/Grid_AHP.cpp 2014-11-13 08:32:16.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Grid_AHP.cpp 1407 2012-05-24 06:55:09Z manfred-e $ + * Version $Id: Grid_AHP.cpp 2072 2014-03-31 08:50:43Z reklov_w $ *********************************************************/ /******************************************************************************* AHP.cpp @@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, USA *******************************************************************************/ #include "Grid_AHP.h" diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_analysis/Grid_AHP.h saga-2.1.4+dfsg/src/modules/grid/grid_analysis/Grid_AHP.h --- saga-2.1.0+dfsg/src/modules/grid/grid_analysis/Grid_AHP.h 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_analysis/Grid_AHP.h 2014-11-13 08:32:16.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Grid_AHP.h 911 2011-02-14 16:38:15Z reklov_w $ + * Version $Id: Grid_AHP.h 2072 2014-03-31 08:50:43Z reklov_w $ *********************************************************/ /******************************************************************************* AHP.h @@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, USA *******************************************************************************/ #if _MSC_VER > 1000 diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_analysis/Grid_CVA.cpp saga-2.1.4+dfsg/src/modules/grid/grid_analysis/Grid_CVA.cpp --- saga-2.1.0+dfsg/src/modules/grid/grid_analysis/Grid_CVA.cpp 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_analysis/Grid_CVA.cpp 2014-11-13 08:32:16.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Grid_CVA.cpp 1594 2013-01-25 14:15:15Z oconrad $ + * Version $Id: Grid_CVA.cpp 2072 2014-03-31 08:50:43Z reklov_w $ *********************************************************/ /******************************************************************************* Grid_CVA.cpp @@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, USA *******************************************************************************/ /////////////////////////////////////////////////////////// diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_analysis/Grid_CVA.h saga-2.1.4+dfsg/src/modules/grid/grid_analysis/Grid_CVA.h --- saga-2.1.0+dfsg/src/modules/grid/grid_analysis/Grid_CVA.h 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_analysis/Grid_CVA.h 2014-11-13 08:32:16.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Grid_CVA.h 1346 2012-03-08 17:08:55Z oconrad $ + * Version $Id: Grid_CVA.h 2072 2014-03-31 08:50:43Z reklov_w $ *********************************************************/ /******************************************************************************* Grid_CVA.h @@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, USA *******************************************************************************/ /////////////////////////////////////////////////////////// diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_analysis/Grid_IMCORR.cpp saga-2.1.4+dfsg/src/modules/grid/grid_analysis/Grid_IMCORR.cpp --- saga-2.1.0+dfsg/src/modules/grid/grid_analysis/Grid_IMCORR.cpp 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_analysis/Grid_IMCORR.cpp 2014-11-13 08:32:16.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Grid_IMCORR.cpp 1597 2013-01-28 17:02:55Z reklov_w $ + * Version $Id: Grid_IMCORR.cpp 2130 2014-05-27 13:29:21Z reklov_w $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// @@ -351,9 +351,9 @@ if (okparam ==1) { - disp = sqrt(best_fit[1]*best_fit[1] + best_fit[2]*best_fit[2]); - double DirNormX = best_fit[2]/disp; - double DirNormY = best_fit[1]/disp; + disp = sqrt(best_fit[1]*best_fit[1] + best_fit[2]*best_fit[2]) * Get_Cellsize(); + double DirNormX = (best_fit[2] * Get_Cellsize()) / disp; + double DirNormY = (best_fit[1] * Get_Cellsize()) / disp; double Aspect; @@ -369,8 +369,8 @@ double xReal = pGrid1->Get_System().Get_xGrid_to_World(gx1); double yReal = pGrid1->Get_System().Get_yGrid_to_World(gy1); - double xReal2 = pGrid1->Get_System().Get_xGrid_to_World(gx1+(int)(best_fit[2])); - double yReal2 = pGrid1->Get_System().Get_yGrid_to_World(gy1+(int)(best_fit[1])); + double xReal2 = xReal + best_fit[2] * Get_Cellsize(); + double yReal2 = yReal + best_fit[1] * Get_Cellsize(); if (pDTM1 == NULL || pDTM2 == NULL) { @@ -382,10 +382,10 @@ pCorrPt->Set_Value(3, xReal); pCorrPt->Set_Value(4, yReal); pCorrPt->Set_Value(5, disp); - pCorrPt->Set_Value(6,strength); + pCorrPt->Set_Value(6, strength); pCorrPt->Set_Value(7, okparam); - pCorrPt->Set_Value(8, best_fit[2]); - pCorrPt->Set_Value(9, best_fit[1]); + pCorrPt->Set_Value(8, best_fit[2] * Get_Cellsize()); + pCorrPt->Set_Value(9, best_fit[1] * Get_Cellsize()); pCorrPt->Set_Value(10, DirNormX); pCorrPt->Set_Value(11, DirNormY); pCorrPt->Set_Value(12, xReal2); @@ -403,10 +403,10 @@ pCorrLine->Set_Value(3, xReal); pCorrLine->Set_Value(4, yReal); pCorrLine->Set_Value(5, disp); - pCorrLine->Set_Value(6,strength); + pCorrLine->Set_Value(6, strength); pCorrLine->Set_Value(7, okparam); - pCorrLine->Set_Value(8, best_fit[2]); - pCorrLine->Set_Value(9, best_fit[1]); + pCorrLine->Set_Value(8, best_fit[2] * Get_Cellsize()); + pCorrLine->Set_Value(9, best_fit[1] * Get_Cellsize()); pCorrLine->Set_Value(10, DirNormX); pCorrLine->Set_Value(11, DirNormY); pCorrLine->Set_Value(12, xReal2); @@ -417,7 +417,7 @@ } else { - double zReal2 = pDTM2->asDouble(gx1+(int)(best_fit[2]), gy1+(int)(best_fit[1])); + double zReal2 = pDTM2->Get_Value(xReal2, yReal2); double zReal = pDTM1->asDouble(gx1, gy1); double Slope = (atan((zReal2-zReal)/fabs(disp)))*M_RAD_TO_DEG; double dispReal = sqrt(pow(zReal2-zReal,2) + disp*disp); @@ -432,10 +432,10 @@ pCorrPt->Set_Value(5, zReal); pCorrPt->Set_Value(6, disp); pCorrPt->Set_Value(7, dispReal); - pCorrPt->Set_Value(8,strength); + pCorrPt->Set_Value(8, strength); pCorrPt->Set_Value(9, okparam); - pCorrPt->Set_Value(10, best_fit[2]); - pCorrPt->Set_Value(11, best_fit[1]); + pCorrPt->Set_Value(10, best_fit[2] * Get_Cellsize()); + pCorrPt->Set_Value(11, best_fit[1] * Get_Cellsize()); pCorrPt->Set_Value(12, zReal2-zReal); pCorrPt->Set_Value(13, DirNormX); pCorrPt->Set_Value(14, DirNormY); @@ -460,10 +460,10 @@ pCorrLine->Set_Value(5, zReal); pCorrLine->Set_Value(6, disp); pCorrLine->Set_Value(7, dispReal); - pCorrLine->Set_Value(8,strength); + pCorrLine->Set_Value(8, strength); pCorrLine->Set_Value(9, okparam); - pCorrLine->Set_Value(10, best_fit[2]); - pCorrLine->Set_Value(11, best_fit[1]); + pCorrLine->Set_Value(10, best_fit[2] * Get_Cellsize()); + pCorrLine->Set_Value(11, best_fit[1] * Get_Cellsize()); pCorrLine->Set_Value(12, zReal2-zReal); pCorrLine->Set_Value(13, DirNormX); pCorrLine->Set_Value(14, DirNormY); diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_analysis/Grid_IMCORR.h saga-2.1.4+dfsg/src/modules/grid/grid_analysis/Grid_IMCORR.h --- saga-2.1.0+dfsg/src/modules/grid/grid_analysis/Grid_IMCORR.h 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_analysis/Grid_IMCORR.h 2014-11-13 08:32:16.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Grid_IMCORR.h 1597 2013-01-28 17:02:55Z reklov_w $ + * Version $Id: Grid_IMCORR.h 1921 2014-01-09 10:24:11Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_analysis/Grid_LayerOfMaximumValue.cpp saga-2.1.4+dfsg/src/modules/grid/grid_analysis/Grid_LayerOfMaximumValue.cpp --- saga-2.1.0+dfsg/src/modules/grid/grid_analysis/Grid_LayerOfMaximumValue.cpp 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_analysis/Grid_LayerOfMaximumValue.cpp 2014-11-13 08:32:16.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Grid_LayerOfMaximumValue.cpp 911 2011-02-14 16:38:15Z reklov_w $ + * Version $Id: Grid_LayerOfMaximumValue.cpp 2072 2014-03-31 08:50:43Z reklov_w $ *********************************************************/ /******************************************************************************* CLayerOfMaximumValue.cpp @@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, USA *******************************************************************************/ #define MAXIMUM 0 diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_analysis/Grid_LayerOfMaximumValue.h saga-2.1.4+dfsg/src/modules/grid/grid_analysis/Grid_LayerOfMaximumValue.h --- saga-2.1.0+dfsg/src/modules/grid/grid_analysis/Grid_LayerOfMaximumValue.h 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_analysis/Grid_LayerOfMaximumValue.h 2014-11-13 08:32:16.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Grid_LayerOfMaximumValue.h 911 2011-02-14 16:38:15Z reklov_w $ + * Version $Id: Grid_LayerOfMaximumValue.h 2072 2014-03-31 08:50:43Z reklov_w $ *********************************************************/ /******************************************************************************* LayerOfMaximumValue.cpp @@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, USA *******************************************************************************/ #if _MSC_VER > 1000 diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_analysis/Grid_Pattern.cpp saga-2.1.4+dfsg/src/modules/grid/grid_analysis/Grid_Pattern.cpp --- saga-2.1.0+dfsg/src/modules/grid/grid_analysis/Grid_Pattern.cpp 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_analysis/Grid_Pattern.cpp 2014-11-13 08:32:16.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Grid_Pattern.cpp 911 2011-02-14 16:38:15Z reklov_w $ + * Version $Id: Grid_Pattern.cpp 2072 2014-03-31 08:50:43Z reklov_w $ *********************************************************/ /******************************************************************************* Grid_Pattern.cpp @@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, USA *******************************************************************************/ #include "Grid_Pattern.h" diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_analysis/Grid_Pattern.h saga-2.1.4+dfsg/src/modules/grid/grid_analysis/Grid_Pattern.h --- saga-2.1.0+dfsg/src/modules/grid/grid_analysis/Grid_Pattern.h 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_analysis/Grid_Pattern.h 2014-11-13 08:32:16.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Grid_Pattern.h 911 2011-02-14 16:38:15Z reklov_w $ + * Version $Id: Grid_Pattern.h 2072 2014-03-31 08:50:43Z reklov_w $ *********************************************************/ /******************************************************************************* Grid_Pattern.h @@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, USA *******************************************************************************/ //--------------------------------------------------------- diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_analysis/LeastCostPathProfile.cpp saga-2.1.4+dfsg/src/modules/grid/grid_analysis/LeastCostPathProfile.cpp --- saga-2.1.0+dfsg/src/modules/grid/grid_analysis/LeastCostPathProfile.cpp 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_analysis/LeastCostPathProfile.cpp 2014-11-13 08:32:16.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: LeastCostPathProfile.cpp 911 2011-02-14 16:38:15Z reklov_w $ + * Version $Id: LeastCostPathProfile.cpp 2208 2014-08-27 16:00:51Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// // // @@ -34,7 +34,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// @@ -298,7 +298,7 @@ for(i=0; iGet_Count(); i++) { - pPoint->Set_Value(VALUE_OFFSET + i, m_pValues->asGrid(i)->asDouble(x, y, true)); + pPoint->Set_Value(VALUE_OFFSET + i, m_pValues->asGrid(i)->asDouble(x, y)); } m_pLine->Get_Shape(0)->Add_Point(Point); diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_analysis/LeastCostPathProfile.h saga-2.1.4+dfsg/src/modules/grid/grid_analysis/LeastCostPathProfile.h --- saga-2.1.0+dfsg/src/modules/grid/grid_analysis/LeastCostPathProfile.h 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_analysis/LeastCostPathProfile.h 2014-11-13 08:32:16.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: LeastCostPathProfile.h 1246 2011-11-25 13:42:38Z oconrad $ + * Version $Id: LeastCostPathProfile.h 1921 2014-01-09 10:24:11Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_analysis/LeastCostPathProfile_Points.cpp saga-2.1.4+dfsg/src/modules/grid/grid_analysis/LeastCostPathProfile_Points.cpp --- saga-2.1.0+dfsg/src/modules/grid/grid_analysis/LeastCostPathProfile_Points.cpp 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_analysis/LeastCostPathProfile_Points.cpp 2014-11-13 08:32:16.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: LeastCostPathProfile_Points.cpp 911 2011-02-14 16:38:15Z reklov_w $ + * Version $Id: LeastCostPathProfile_Points.cpp 2321 2014-11-03 21:10:22Z johanvdw $ *********************************************************/ /////////////////////////////////////////////////////////// // // @@ -34,7 +34,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// @@ -86,7 +86,7 @@ Set_Author(SG_T("O. Conrad, V. Olaya, V. Wichmann (c) 2004-2010")); Parameters.Set_Description(_TW( - "This module allows to compute least cost path profile(s). It takes an " + "This module allows one to compute least cost path profile(s). It takes an " "accumulated cost surface grid and a point shapefile as input. Each " "point in the shapefile represents a source for which the least cost path " "is calculated.\n" @@ -304,7 +304,7 @@ for( i=0; iGet_Count(); i++ ) { - pPoint->Set_Value(VALUE_OFFSET + i, m_pValues->asGrid(i)->asDouble(x, y, true)); + pPoint->Set_Value(VALUE_OFFSET + i, m_pValues->asGrid(i)->asDouble(x, y)); } pLine->Get_Shape(0)->Add_Point(Point); diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_analysis/LeastCostPathProfile_Points.h saga-2.1.4+dfsg/src/modules/grid/grid_analysis/LeastCostPathProfile_Points.h --- saga-2.1.0+dfsg/src/modules/grid/grid_analysis/LeastCostPathProfile_Points.h 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_analysis/LeastCostPathProfile_Points.h 2014-11-13 08:32:16.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: LeastCostPathProfile_Points.h 1246 2011-11-25 13:42:38Z oconrad $ + * Version $Id: LeastCostPathProfile_Points.h 1921 2014-01-09 10:24:11Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_analysis/Makefile.in saga-2.1.4+dfsg/src/modules/grid/grid_analysis/Makefile.in --- saga-2.1.0+dfsg/src/modules/grid/grid_analysis/Makefile.in 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_analysis/Makefile.in 2014-11-13 08:33:30.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -35,15 +79,17 @@ build_triplet = @build@ host_triplet = @host@ subdir = src/modules/grid/grid_analysis -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_postgresql.m4 \ + $(top_srcdir)/m4/ax_pkg_swig.m4 \ $(top_srcdir)/m4/ax_python_devel.m4 \ $(top_srcdir)/m4/ax_swig_enable_cxx.m4 \ $(top_srcdir)/m4/ax_swig_python.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.in + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -71,6 +117,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(pkglibdir)" LTLIBRARIES = $(pkglib_LTLIBRARIES) libgrid_analysis_la_DEPENDENCIES = \ @@ -85,35 +137,92 @@ LeastCostPathProfile.lo LeastCostPathProfile_Points.lo \ MLB_Interface.lo owa.lo PointsEx.lo Soil_Texture.lo libgrid_analysis_la_OBJECTS = $(am_libgrid_analysis_la_OBJECTS) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles am__mv = mv -f CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libgrid_analysis_la_SOURCES) DIST_SOURCES = $(libgrid_analysis_la_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -134,6 +243,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLELIBHARU = @DISABLELIBHARU@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -161,6 +271,7 @@ LOCAL_LIBS = @LOCAL_LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -173,8 +284,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PG_CONFIG = @PG_CONFIG@ +POSTGRESQL_CFLAGS = @POSTGRESQL_CFLAGS@ +POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@ +POSTGRESQL_VERSION = @POSTGRESQL_VERSION@ POW_LIB = @POW_LIB@ PYTHON = @PYTHON@ PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ @@ -198,6 +314,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -231,7 +348,6 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -320,9 +436,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/modules/grid/grid_analysis/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/modules/grid/grid_analysis/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu src/modules/grid/grid_analysis/Makefile + $(AUTOMAKE) --foreign src/modules/grid/grid_analysis/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -341,9 +457,9 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): + install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -351,6 +467,8 @@ else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \ } @@ -366,14 +484,17 @@ clean-pkglibLTLIBRARIES: -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES) - @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -libgrid_analysis.la: $(libgrid_analysis_la_OBJECTS) $(libgrid_analysis_la_DEPENDENCIES) - $(CXXLINK) -rpath $(pkglibdir) $(libgrid_analysis_la_OBJECTS) $(libgrid_analysis_la_LIBADD) $(LIBS) + @list='$(pkglib_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + +libgrid_analysis.la: $(libgrid_analysis_la_OBJECTS) $(libgrid_analysis_la_DEPENDENCIES) $(EXTRA_libgrid_analysis_la_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) -rpath $(pkglibdir) $(libgrid_analysis_la_OBJECTS) $(libgrid_analysis_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -404,25 +525,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/owa.Plo@am__quote@ .cpp.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< .cpp.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .cpp.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -430,26 +551,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -461,15 +571,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -478,6 +584,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -529,10 +650,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -617,19 +743,20 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-pkglibLTLIBRARIES ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-pkglibLTLIBRARIES \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-pkglibLTLIBRARIES install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ + uninstall-pkglibLTLIBRARIES # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_analysis/MLB_Interface.cpp saga-2.1.4+dfsg/src/modules/grid/grid_analysis/MLB_Interface.cpp --- saga-2.1.0+dfsg/src/modules/grid/grid_analysis/MLB_Interface.cpp 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_analysis/MLB_Interface.cpp 2014-11-13 08:32:16.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: MLB_Interface.cpp 1597 2013-01-28 17:02:55Z reklov_w $ + * Version $Id: MLB_Interface.cpp 2281 2014-10-09 15:49:41Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// @@ -69,8 +69,11 @@ switch( i ) { case MLB_INFO_Name: default: - return( _TL("Grid - Analysis") ); + return( _TL("Analysis") ); + case MLB_INFO_Category: + return( _TL("Grid") ); + case MLB_INFO_Author: return( _TL("Various authors.") ); diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_analysis/MLB_Interface.h saga-2.1.4+dfsg/src/modules/grid/grid_analysis/MLB_Interface.h --- saga-2.1.0+dfsg/src/modules/grid/grid_analysis/MLB_Interface.h 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_analysis/MLB_Interface.h 2014-11-13 08:32:16.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: MLB_Interface.h 911 2011-02-14 16:38:15Z reklov_w $ + * Version $Id: MLB_Interface.h 1921 2014-01-09 10:24:11Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_analysis/owa.cpp saga-2.1.4+dfsg/src/modules/grid/grid_analysis/owa.cpp --- saga-2.1.0+dfsg/src/modules/grid/grid_analysis/owa.cpp 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_analysis/owa.cpp 2014-11-13 08:32:16.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: owa.cpp 1394 2012-05-07 14:23:12Z manfred-e $ + * Version $Id: owa.cpp 2072 2014-03-31 08:50:43Z reklov_w $ *********************************************************/ /******************************************************************************* OWA.cpp @@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, USA *******************************************************************************/ #include "owa.h" diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_analysis/owa.h saga-2.1.4+dfsg/src/modules/grid/grid_analysis/owa.h --- saga-2.1.0+dfsg/src/modules/grid/grid_analysis/owa.h 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_analysis/owa.h 2014-11-13 08:32:16.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: owa.h 911 2011-02-14 16:38:15Z reklov_w $ + * Version $Id: owa.h 2072 2014-03-31 08:50:43Z reklov_w $ *********************************************************/ /******************************************************************************* owa.h @@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, USA *******************************************************************************/ #if _MSC_VER > 1000 diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_analysis/Soil_Texture.cpp saga-2.1.4+dfsg/src/modules/grid/grid_analysis/Soil_Texture.cpp --- saga-2.1.0+dfsg/src/modules/grid/grid_analysis/Soil_Texture.cpp 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_analysis/Soil_Texture.cpp 2014-11-13 08:32:16.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Soil_Texture.cpp 1607 2013-02-15 15:28:07Z oconrad $ + * Version $Id: Soil_Texture.cpp 1921 2014-01-09 10:24:11Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_analysis/Soil_Texture.h saga-2.1.4+dfsg/src/modules/grid/grid_analysis/Soil_Texture.h --- saga-2.1.0+dfsg/src/modules/grid/grid_analysis/Soil_Texture.h 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_analysis/Soil_Texture.h 2014-11-13 08:32:16.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Soil_Texture.h 1246 2011-11-25 13:42:38Z oconrad $ + * Version $Id: Soil_Texture.h 1922 2014-01-09 10:28:46Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_calculus/Fuzzify.cpp saga-2.1.4+dfsg/src/modules/grid/grid_calculus/Fuzzify.cpp --- saga-2.1.0+dfsg/src/modules/grid/grid_calculus/Fuzzify.cpp 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_calculus/Fuzzify.cpp 2014-11-13 08:32:15.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Fuzzify.cpp 1318 2012-01-26 13:44:28Z oconrad $ + * Version $Id: Fuzzify.cpp 2072 2014-03-31 08:50:43Z reklov_w $ *********************************************************/ /******************************************************************************* Fuzzify.cpp @@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, USA *******************************************************************************/ /////////////////////////////////////////////////////////// diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_calculus/Fuzzify.h saga-2.1.4+dfsg/src/modules/grid/grid_calculus/Fuzzify.h --- saga-2.1.0+dfsg/src/modules/grid/grid_calculus/Fuzzify.h 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_calculus/Fuzzify.h 2014-11-13 08:32:15.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Fuzzify.h 1246 2011-11-25 13:42:38Z oconrad $ + * Version $Id: Fuzzify.h 2072 2014-03-31 08:50:43Z reklov_w $ *********************************************************/ /******************************************************************************* Fuzzify.h @@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, USA *******************************************************************************/ /////////////////////////////////////////////////////////// diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_calculus/FuzzyAND.cpp saga-2.1.4+dfsg/src/modules/grid/grid_calculus/FuzzyAND.cpp --- saga-2.1.0+dfsg/src/modules/grid/grid_calculus/FuzzyAND.cpp 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_calculus/FuzzyAND.cpp 2014-11-13 08:32:15.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: FuzzyAND.cpp 911 2011-02-14 16:38:15Z reklov_w $ + * Version $Id: FuzzyAND.cpp 1921 2014-01-09 10:24:11Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_calculus/FuzzyAND.h saga-2.1.4+dfsg/src/modules/grid/grid_calculus/FuzzyAND.h --- saga-2.1.0+dfsg/src/modules/grid/grid_calculus/FuzzyAND.h 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_calculus/FuzzyAND.h 2014-11-13 08:32:15.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: FuzzyAND.h 1246 2011-11-25 13:42:38Z oconrad $ + * Version $Id: FuzzyAND.h 1921 2014-01-09 10:24:11Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_calculus/FuzzyOR.cpp saga-2.1.4+dfsg/src/modules/grid/grid_calculus/FuzzyOR.cpp --- saga-2.1.0+dfsg/src/modules/grid/grid_calculus/FuzzyOR.cpp 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_calculus/FuzzyOR.cpp 2014-11-13 08:32:15.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: FuzzyOR.cpp 911 2011-02-14 16:38:15Z reklov_w $ + * Version $Id: FuzzyOR.cpp 1921 2014-01-09 10:24:11Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_calculus/FuzzyOR.h saga-2.1.4+dfsg/src/modules/grid/grid_calculus/FuzzyOR.h --- saga-2.1.0+dfsg/src/modules/grid/grid_calculus/FuzzyOR.h 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_calculus/FuzzyOR.h 2014-11-13 08:32:15.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: FuzzyOR.h 1246 2011-11-25 13:42:38Z oconrad $ + * Version $Id: FuzzyOR.h 1921 2014-01-09 10:24:11Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_calculus/gradient_cartes_polar.cpp saga-2.1.4+dfsg/src/modules/grid/grid_calculus/gradient_cartes_polar.cpp --- saga-2.1.0+dfsg/src/modules/grid/grid_calculus/gradient_cartes_polar.cpp 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_calculus/gradient_cartes_polar.cpp 2014-11-13 08:32:15.000000000 +0000 @@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, USA *******************************************************************************/ /////////////////////////////////////////////////////////// diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_calculus/gradient_cartes_polar.h saga-2.1.4+dfsg/src/modules/grid/grid_calculus/gradient_cartes_polar.h --- saga-2.1.0+dfsg/src/modules/grid/grid_calculus/gradient_cartes_polar.h 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_calculus/gradient_cartes_polar.h 2014-11-13 08:32:15.000000000 +0000 @@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, USA *******************************************************************************/ /////////////////////////////////////////////////////////// diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_calculus/Grid_Calculator.cpp saga-2.1.4+dfsg/src/modules/grid/grid_calculus/Grid_Calculator.cpp --- saga-2.1.0+dfsg/src/modules/grid/grid_calculus/Grid_Calculator.cpp 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_calculus/Grid_Calculator.cpp 2014-11-13 08:32:15.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Grid_Calculator.cpp 1698 2013-05-22 07:51:24Z oconrad $ + * Version $Id: Grid_Calculator.cpp 2207 2014-08-26 13:39:34Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// @@ -89,9 +89,9 @@ CGrid_Calculator::CGrid_Calculator(void) { //----------------------------------------------------- - Set_Name(_TL("Grid Calculator")); + Set_Name (_TL("Grid Calculator")); - Set_Author(_TL("Copyrights (c) 2003 by Andre Ringeler")); + Set_Author (_TL("A.Ringeler (c) 2003")); CSG_String s(_TW( "The Grid Calculator calculates a new grid based on existing grids and a mathematical formula. " @@ -107,18 +107,23 @@ s += CSG_Formula::Get_Help_Operators(); + s += _TW( + "xpos(), ypos() - get the x/y coordinates of the current cell\n" + "row(), col() - get the current cell's column/row index\n" + ); + Set_Description(s); //----------------------------------------------------- Parameters.Add_Grid_List( NULL , "GRIDS" , _TL("Grids"), - _TL("in formula these grids are addressed in order of the list as 'g1, g2, g3, ...'"), - PARAMETER_INPUT + _TL("in the formula these grids are addressed in order of the list as 'g1, g2, g3, ...'"), + PARAMETER_INPUT_OPTIONAL ); Parameters.Add_Grid_List( NULL , "XGRIDS" , _TL("Grids from different Systems"), - _TL("in formula these grids are addressed in order of the list as 'h1, h2, h3, ...'"), + _TL("in the formula these grids are addressed in order of the list as 'h1, h2, h3, ...'"), PARAMETER_INPUT_OPTIONAL, false ); @@ -143,7 +148,7 @@ Parameters.Add_Value( pNode , "FNAME" , _TL("Take Formula"), _TL(""), - PARAMETER_TYPE_Bool, true + PARAMETER_TYPE_Bool, false ); Parameters.Add_Value( @@ -251,11 +256,11 @@ for(int x=0; xGet_Count() + pXGrids->Get_Count()); + int i, n; + double Result, px = Get_XMin() + x * Get_Cellsize(); + CSG_Vector Values(pGrids->Get_Count() + pXGrids->Get_Count() + 4); - for(i=0; iGet_Count() && !bNoData; i++) + for(i=0, n=0; !bNoData && iGet_Count(); i++) { if( !bUseNoData && pGrids->asGrid(i)->is_NoData(x, y) ) { @@ -263,22 +268,31 @@ } else { - Values[i] = pGrids->asGrid(i)->asDouble(x, y); + Values[n++] = pGrids->asGrid(i)->asDouble(x, y); } } - if( !bNoData && pXGrids->Get_Count() ) + for(i=0, n=pGrids->Get_Count(); !bNoData && iGet_Count(); i++) { - for(i=0, j=pGrids->Get_Count(); iGet_Count() && !bNoData; i++, j++) + if( !pXGrids->asGrid(i)->Get_Value(px, py, Values[n++]) ) { - if( !pXGrids->asGrid(i)->Get_Value(Get_System()->Get_Grid_to_World(x, y), Values[j]) ) - { - bNoData = true; - } + bNoData = true; } } - if( bNoData || !_finite(Result = Formula.Get_Value(Values)) ) + if( !bNoData ) + { + n = pGrids->Get_Count() + pXGrids->Get_Count(); + + Values[n++] = y; // col() + Values[n++] = x; // row() + Values[n++] = py; // ypos() + Values[n++] = px; // xpos() + + bNoData = !_finite(Result = Formula.Get_Value(Values)); + } + + if( bNoData ) { pResult->Set_NoData(x, y); } @@ -309,7 +323,7 @@ const SG_Char Vars[nVars] = SG_T("abcdefghijklmnopqrstuvwxyz"); //----------------------------------------------------- - if( nGrids + nXGrids > nVars ) + if( nGrids + nXGrids + 4 > nVars ) { Error_Set(_TL("too many input grids")); @@ -317,7 +331,12 @@ } //----------------------------------------------------- - int i, n = nGrids + nXGrids - 1; + int i, n = nGrids + nXGrids + 4 - 1; + + sFormula.Replace("xpos()", Vars[n--]); + sFormula.Replace("ypos()", Vars[n--]); + sFormula.Replace("row()" , Vars[n--]); + sFormula.Replace("col()" , Vars[n--]); for(i=nXGrids; i>0; i--, n--) { diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_calculus/Grid_Calculator.h saga-2.1.4+dfsg/src/modules/grid/grid_calculus/Grid_Calculator.h --- saga-2.1.0+dfsg/src/modules/grid/grid_calculus/Grid_Calculator.h 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_calculus/Grid_Calculator.h 2014-11-13 08:32:15.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Grid_Calculator.h 1627 2013-03-19 16:39:22Z oconrad $ + * Version $Id: Grid_Calculator.h 1921 2014-01-09 10:24:11Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_calculus/grid_difference.cpp saga-2.1.4+dfsg/src/modules/grid/grid_calculus/grid_difference.cpp --- saga-2.1.0+dfsg/src/modules/grid/grid_calculus/grid_difference.cpp 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_calculus/grid_difference.cpp 2014-11-13 08:32:15.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: grid_difference.cpp 1211 2011-11-03 10:19:19Z oconrad $ + * Version $Id: grid_difference.cpp 1921 2014-01-09 10:24:11Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_calculus/grid_difference.h saga-2.1.4+dfsg/src/modules/grid/grid_calculus/grid_difference.h --- saga-2.1.0+dfsg/src/modules/grid/grid_calculus/grid_difference.h 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_calculus/grid_difference.h 2014-11-13 08:32:15.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: grid_difference.h 1211 2011-11-03 10:19:19Z oconrad $ + * Version $Id: grid_difference.h 1921 2014-01-09 10:24:11Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_calculus/Grid_Geometric_Figures.cpp saga-2.1.4+dfsg/src/modules/grid/grid_calculus/Grid_Geometric_Figures.cpp --- saga-2.1.0+dfsg/src/modules/grid/grid_calculus/Grid_Geometric_Figures.cpp 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_calculus/Grid_Geometric_Figures.cpp 2014-11-13 08:32:15.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Grid_Geometric_Figures.cpp 911 2011-02-14 16:38:15Z reklov_w $ + * Version $Id: Grid_Geometric_Figures.cpp 1921 2014-01-09 10:24:11Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_calculus/Grid_Geometric_Figures.h saga-2.1.4+dfsg/src/modules/grid/grid_calculus/Grid_Geometric_Figures.h --- saga-2.1.0+dfsg/src/modules/grid/grid_calculus/Grid_Geometric_Figures.h 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_calculus/Grid_Geometric_Figures.h 2014-11-13 08:32:15.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Grid_Geometric_Figures.h 1246 2011-11-25 13:42:38Z oconrad $ + * Version $Id: Grid_Geometric_Figures.h 1921 2014-01-09 10:24:11Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_calculus/grid_metric_conversion.cpp saga-2.1.4+dfsg/src/modules/grid/grid_calculus/grid_metric_conversion.cpp --- saga-2.1.0+dfsg/src/modules/grid/grid_calculus/grid_metric_conversion.cpp 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_calculus/grid_metric_conversion.cpp 2014-11-13 08:32:15.000000000 +0000 @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_calculus/grid_metric_conversion.h saga-2.1.4+dfsg/src/modules/grid/grid_calculus/grid_metric_conversion.h --- saga-2.1.0+dfsg/src/modules/grid/grid_calculus/grid_metric_conversion.h 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_calculus/grid_metric_conversion.h 2014-11-13 08:32:15.000000000 +0000 @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_calculus/Grid_Normalise.cpp saga-2.1.4+dfsg/src/modules/grid/grid_calculus/Grid_Normalise.cpp --- saga-2.1.0+dfsg/src/modules/grid/grid_calculus/Grid_Normalise.cpp 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_calculus/Grid_Normalise.cpp 2014-11-13 08:32:15.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Grid_Normalise.cpp 911 2011-02-14 16:38:15Z reklov_w $ + * Version $Id: Grid_Normalise.cpp 2208 2014-08-27 16:00:51Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// @@ -217,7 +217,7 @@ pGrid->Set_Name(CSG_String::Format(SG_T("%s (%s)"), pGrid->Get_Name(), _TL("Standard Score"))); //----------------------------------------------------- - double Mean = pGrid->Get_ArithMean(); + double Mean = pGrid->Get_Mean(); double Stretch = Parameters("STRETCH")->asDouble() / pGrid->Get_StdDev(); for(int y=0; yGet_Parameter("NODE_GAUSS" )->Set_Enabled(pParameter->asInt() == 1); } - return( 0 ); + return( m_Grid_Target.On_Parameters_Enable(pParameters, pParameter) ? 1 : 0 ); } @@ -169,24 +159,7 @@ bool CGrid_Random_Field::On_Execute(void) { //----------------------------------------------------- - CSG_Grid *pGrid = NULL; - - switch( Parameters("TARGET")->asInt() ) - { - case 0: // user defined... - if( m_Grid_Target.Init_User(0.0, 0.0, 1.0, 100, 100) && Dlg_Parameters("USER") ) - { - pGrid = m_Grid_Target.Get_User(); - } - break; - - case 1: // grid... - if( Dlg_Parameters("GRID") ) - { - pGrid = m_Grid_Target.Get_Grid(); - } - break; - } + CSG_Grid *pGrid = m_Grid_Target.Get_Grid(); if( !pGrid ) { diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_calculus/Grid_Random_Field.h saga-2.1.4+dfsg/src/modules/grid/grid_calculus/Grid_Random_Field.h --- saga-2.1.0+dfsg/src/modules/grid/grid_calculus/Grid_Random_Field.h 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_calculus/Grid_Random_Field.h 2014-11-13 08:32:15.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Grid_Random_Field.h 1615 2013-02-27 16:20:14Z oconrad $ + * Version $Id: Grid_Random_Field.h 1921 2014-01-09 10:24:11Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_calculus/Grid_Random_Terrain.cpp saga-2.1.4+dfsg/src/modules/grid/grid_calculus/Grid_Random_Terrain.cpp --- saga-2.1.0+dfsg/src/modules/grid/grid_calculus/Grid_Random_Terrain.cpp 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_calculus/Grid_Random_Terrain.cpp 2014-11-13 08:32:15.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Grid_Random_Terrain.cpp 911 2011-02-14 16:38:15Z reklov_w $ + * Version $Id: Grid_Random_Terrain.cpp 2072 2014-03-31 08:50:43Z reklov_w $ *********************************************************/ /******************************************************************************* Grid_Random_Terrain.cpp @@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, USA *******************************************************************************/ #include "Grid_Random_Terrain.h" diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_calculus/Grid_Random_Terrain.h saga-2.1.4+dfsg/src/modules/grid/grid_calculus/Grid_Random_Terrain.h --- saga-2.1.0+dfsg/src/modules/grid/grid_calculus/Grid_Random_Terrain.h 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_calculus/Grid_Random_Terrain.h 2014-11-13 08:32:15.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Grid_Random_Terrain.h 1246 2011-11-25 13:42:38Z oconrad $ + * Version $Id: Grid_Random_Terrain.h 2072 2014-03-31 08:50:43Z reklov_w $ *********************************************************/ /******************************************************************************* Grid_Random_Terrain.h @@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, USA *******************************************************************************/ //--------------------------------------------------------- #ifndef HEADER_INCLUDED__Grid_Random_Terrain_H diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_calculus/Grid_Volume.cpp saga-2.1.4+dfsg/src/modules/grid/grid_calculus/Grid_Volume.cpp --- saga-2.1.0+dfsg/src/modules/grid/grid_calculus/Grid_Volume.cpp 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_calculus/Grid_Volume.cpp 2014-11-13 08:32:15.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Grid_Volume.cpp 911 2011-02-14 16:38:15Z reklov_w $ + * Version $Id: Grid_Volume.cpp 1921 2014-01-09 10:24:11Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_calculus/Grid_Volume.h saga-2.1.4+dfsg/src/modules/grid/grid_calculus/Grid_Volume.h --- saga-2.1.0+dfsg/src/modules/grid/grid_calculus/Grid_Volume.h 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_calculus/Grid_Volume.h 2014-11-13 08:32:15.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Grid_Volume.h 911 2011-02-14 16:38:15Z reklov_w $ + * Version $Id: Grid_Volume.h 1921 2014-01-09 10:24:11Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_calculus/kff_synth.cpp saga-2.1.4+dfsg/src/modules/grid/grid_calculus/kff_synth.cpp --- saga-2.1.0+dfsg/src/modules/grid/grid_calculus/kff_synth.cpp 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_calculus/kff_synth.cpp 2014-11-13 08:32:15.000000000 +0000 @@ -0,0 +1,232 @@ +/********************************************************** + * Version $Id: kff_synth.cpp 2132 2014-05-29 10:10:15Z reklov_w $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// Grid_Calculus // +// // +//-------------------------------------------------------// +// // +// kff_synth.cpp // +// // +// Copyright (C) 2013 by // +// HfT Stuttgart // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: johannes.engels@hft-stuttgart.de // +// // +// contact: Johannes Engels // +// Hochschule fuer Technik Stuttgart // +// Schellingstr. 24 // +// 70174 Stuttgart // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "kff_synth.h" + +extern "C" { + #include "./../grid_filter/geodesic_morph_rec/storeorg.h" + #include "./../grid_filter/geodesic_morph_rec/spezfunc.h" +} + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +Ckff_synthesis::Ckff_synthesis(void) +{ + Set_Name (_TL("Spherical Harmonic Synthesis")); + + Set_Author (SG_T("HfT Stuttgart (c) 2013")); + + Set_Description (_TW( + "Synthesis of a completely normalized spherical harmonic expansion. The coefficients are " + "read from the input file (ASCII file, columns separated by space).\n\n" + )); + + Parameters.Add_Grid_Output (NULL, + "OUTPUT_GRID", + _TL("Synthesized Grid"), + _TL("Synthesized Grid")); + + Parameters.Add_FilePath (NULL, + "FILE", + _TL("File with Coefficients"), + _TL("ASCII file with columns degree, order, c_lm, s_lm (separated by space)")); + + Parameters.Add_Value (NULL, "MINDEGREE", + _TL ("Start Degree"), + _TL ("Start Degree"), + PARAMETER_TYPE_Int, + 0); + + Parameters.Add_Value (NULL, "MAXDEGREE", + _TL ("Expansion Degree"), + _TL ("Expansion Degree"), + PARAMETER_TYPE_Int, + 180); + + Parameters.Add_Value (NULL, "LAT_START", + _TL ("Start Latitude"), + _TL ("Start Latitude"), + PARAMETER_TYPE_Double, + -90.0); + + Parameters.Add_Value (NULL, "END_LAT", + _TL ("End Latitude"), + _TL ("End Latitude"), + PARAMETER_TYPE_Double, + 90.0); + + Parameters.Add_Value (NULL, "LONG_START", + _TL ("Start Longitude"), + _TL ("Start Longitude"), + PARAMETER_TYPE_Double, + -180.0); + + Parameters.Add_Value (NULL, "END_LONG", + _TL ("End Longitude"), + _TL ("End Longitude"), + PARAMETER_TYPE_Double, + 180.0); + + Parameters.Add_Value (NULL, "INC", + _TL ("Latitude / Longitude Increment"), + _TL ("Latitude / Longitude Increment"), + PARAMETER_TYPE_Double, + 1.0); +} + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +bool Ckff_synthesis::On_Execute(void) +{ + CSG_Grid *poutgrid; + + int numlat = 0; + int numlong = 0; + int maxdegree = 0; + int mindegree = 0; + int rc = 0; + double inc = 0.0; + double lat_start = 0.0; + double end_lat = 0.0; + double long_start = 0.0; + double end_long = 0.0; + CSG_String fileName; + double **c_lm; + double **s_lm; + double **gitter; + char *error_liste = "nix"; + + //poutgrid = Parameters ("OUTPUT GRID")->asGrid (); + + fileName = Parameters("FILE")->asString(); + inc = Parameters ("INC")->asDouble (); + mindegree = Parameters ("MINDEGREE")->asInt (); + maxdegree = Parameters ("MAXDEGREE")->asInt (); + lat_start = Parameters ("LAT_START")->asDouble (); + end_lat = Parameters ("END_LAT")->asDouble (); + long_start = Parameters ("LONG_START")->asDouble (); + end_long = Parameters ("END_LONG")->asDouble (); + + numlat = static_cast (floor ((end_lat - lat_start) / inc) + 1); + numlong = static_cast (floor ((end_long - long_start) / inc) + 1); + gitter = (double **) matrix_all_alloc (numlat, numlong, 'D', 0); + + read_coefficients (fileName.b_str(), + mindegree, + maxdegree, + &c_lm, + &s_lm); + + + rc = kff_synthese_regel_gitter_m (inc, + lat_start, + end_lat, + long_start, + end_long, + numlat, + numlong, + 'A', + mindegree, + maxdegree, + c_lm, + s_lm, + gitter, + &error_liste); + + poutgrid = SG_Create_Grid(SG_DATATYPE_Double, numlong, numlat, inc, long_start, lat_start); + poutgrid ->Set_Name(_TL("Synthesized Grid")); + + for (int y = 0; y < numlat; y++) + { + #pragma omp parallel for + for (int x = 0; x < numlong; x++) + { + poutgrid->Set_Value(x,y, gitter[y][x]); + } + } + + Parameters("OUTPUT_GRID")->Set_Value(poutgrid); + + matrix_all_free ((void **) gitter); + matrix_all_free ((void **) c_lm); + matrix_all_free ((void **) s_lm); + + return( true ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_calculus/kff_synth.h saga-2.1.4+dfsg/src/modules/grid/grid_calculus/kff_synth.h --- saga-2.1.0+dfsg/src/modules/grid/grid_calculus/kff_synth.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_calculus/kff_synth.h 2014-11-13 08:32:15.000000000 +0000 @@ -0,0 +1,102 @@ +/********************************************************** + * Version $Id: kff_synth.h 1937 2014-01-11 18:22:42Z reklov_w $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// Grid_Calculus // +// // +//-------------------------------------------------------// +// // +// kff_synth.h // +// // +// Copyright (C) 2013 by // +// HfT Stuttgart // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: johannes.engels@hft-stuttgart.de // +// // +// contact: Johannes Engels // +// Hochschule fuer Technik Stuttgart // +// Schellingstr. 24 // +// 70174 Stuttgart // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#ifndef HEADER_INCLUDED__kff_synth_H +#define HEADER_INCLUDED__kff_synth_H + +//--------------------------------------------------------- + + +#include "MLB_Interface.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +class Ckff_synthesis : public CSG_Module +{ +public: + Ckff_synthesis (void); + + virtual CSG_String Get_MenuPath (void) { return( _TL("R:Grid Generation") ); } + + +protected: + + virtual bool On_Execute (void); + + +}; + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#endif // #ifndef HEADER_INCLUDED__kff_synth_H diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_calculus/Makefile.am saga-2.1.4+dfsg/src/modules/grid/grid_calculus/Makefile.am --- saga-2.1.0+dfsg/src/modules/grid/grid_calculus/Makefile.am 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_calculus/Makefile.am 2014-11-13 08:32:15.000000000 +0000 @@ -1,5 +1,5 @@ # -# $Id: Makefile.am 1549 2012-11-29 16:38:50Z oconrad $ +# $Id: Makefile.am 1937 2014-01-11 18:22:42Z reklov_w $ # if DEBUG DBGFLAGS = -g -DDEBUG @@ -16,6 +16,9 @@ Fuzzify.cpp\ FuzzyAND.cpp\ FuzzyOR.cpp\ +./../grid_filter/geodesic_morph_rec/errfunc.c\ +./../grid_filter/geodesic_morph_rec/spezfunc.c\ +./../grid_filter/geodesic_morph_rec/storeorg.c\ gradient_cartes_polar.cpp\ grid_metric_conversion.cpp\ Grid_Calculator.cpp\ @@ -26,10 +29,15 @@ Grid_Random_Field.cpp\ Grid_Random_Terrain.cpp\ Grid_Volume.cpp\ +kff_synth.cpp\ MLB_Interface.cpp\ Fuzzify.h\ FuzzyAND.h\ FuzzyOR.h\ +./../grid_filter/geodesic_morph_rec/errfunc.h\ +./../grid_filter/geodesic_morph_rec/rho.h\ +./../grid_filter/geodesic_morph_rec/spezfunc.h\ +./../grid_filter/geodesic_morph_rec/storeorg.h\ gradient_cartes_polar.h\ grid_metric_conversion.h\ Grid_Calculator.h\ @@ -40,6 +48,7 @@ Grid_Random_Field.h\ Grid_Random_Terrain.h\ Grid_Volume.h\ +kff_synth.h\ MLB_Interface.h libgrid_calculus_la_LIBADD = $(top_srcdir)/src/saga_core/saga_api/libsaga_api.la diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_calculus/Makefile.in saga-2.1.4+dfsg/src/modules/grid/grid_calculus/Makefile.in --- saga-2.1.0+dfsg/src/modules/grid/grid_calculus/Makefile.in 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_calculus/Makefile.in 2014-11-13 08:33:30.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -35,15 +79,17 @@ build_triplet = @build@ host_triplet = @host@ subdir = src/modules/grid/grid_calculus -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_postgresql.m4 \ + $(top_srcdir)/m4/ax_pkg_swig.m4 \ $(top_srcdir)/m4/ax_python_devel.m4 \ $(top_srcdir)/m4/ax_swig_enable_cxx.m4 \ $(top_srcdir)/m4/ax_swig_python.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.in + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -71,46 +117,109 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(pkglibdir)" LTLIBRARIES = $(pkglib_LTLIBRARIES) libgrid_calculus_la_DEPENDENCIES = \ $(top_srcdir)/src/saga_core/saga_api/libsaga_api.la am_libgrid_calculus_la_OBJECTS = Fuzzify.lo FuzzyAND.lo FuzzyOR.lo \ - gradient_cartes_polar.lo grid_metric_conversion.lo \ - Grid_Calculator.lo grid_difference.lo \ - Grid_Geometric_Figures.lo Grid_Normalise.lo Grid_Plotter.lo \ - Grid_Random_Field.lo Grid_Random_Terrain.lo Grid_Volume.lo \ - MLB_Interface.lo + errfunc.lo spezfunc.lo storeorg.lo gradient_cartes_polar.lo \ + grid_metric_conversion.lo Grid_Calculator.lo \ + grid_difference.lo Grid_Geometric_Figures.lo Grid_Normalise.lo \ + Grid_Plotter.lo Grid_Random_Field.lo Grid_Random_Terrain.lo \ + Grid_Volume.lo kff_synth.lo MLB_Interface.lo libgrid_calculus_la_OBJECTS = $(am_libgrid_calculus_la_OBJECTS) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles am__mv = mv -f -CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = +CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = +CXXLD = $(CXX) +CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = SOURCES = $(libgrid_calculus_la_SOURCES) DIST_SOURCES = $(libgrid_calculus_la_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -131,6 +240,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLELIBHARU = @DISABLELIBHARU@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -158,6 +268,7 @@ LOCAL_LIBS = @LOCAL_LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -170,8 +281,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PG_CONFIG = @PG_CONFIG@ +POSTGRESQL_CFLAGS = @POSTGRESQL_CFLAGS@ +POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@ +POSTGRESQL_VERSION = @POSTGRESQL_VERSION@ POW_LIB = @POW_LIB@ PYTHON = @PYTHON@ PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ @@ -195,6 +311,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -228,7 +345,6 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -250,7 +366,7 @@ top_srcdir = @top_srcdir@ # -# $Id: Makefile.am 1549 2012-11-29 16:38:50Z oconrad $ +# $Id: Makefile.am 1937 2014-01-11 18:22:42Z reklov_w $ # @DEBUG_TRUE@DBGFLAGS = -g -DDEBUG @SAGA_UNICODE_TRUE@UC_DEFS = -D_SAGA_UNICODE @@ -263,6 +379,9 @@ Fuzzify.cpp\ FuzzyAND.cpp\ FuzzyOR.cpp\ +./../grid_filter/geodesic_morph_rec/errfunc.c\ +./../grid_filter/geodesic_morph_rec/spezfunc.c\ +./../grid_filter/geodesic_morph_rec/storeorg.c\ gradient_cartes_polar.cpp\ grid_metric_conversion.cpp\ Grid_Calculator.cpp\ @@ -273,10 +392,15 @@ Grid_Random_Field.cpp\ Grid_Random_Terrain.cpp\ Grid_Volume.cpp\ +kff_synth.cpp\ MLB_Interface.cpp\ Fuzzify.h\ FuzzyAND.h\ FuzzyOR.h\ +./../grid_filter/geodesic_morph_rec/errfunc.h\ +./../grid_filter/geodesic_morph_rec/rho.h\ +./../grid_filter/geodesic_morph_rec/spezfunc.h\ +./../grid_filter/geodesic_morph_rec/storeorg.h\ gradient_cartes_polar.h\ grid_metric_conversion.h\ Grid_Calculator.h\ @@ -287,13 +411,14 @@ Grid_Random_Field.h\ Grid_Random_Terrain.h\ Grid_Volume.h\ +kff_synth.h\ MLB_Interface.h libgrid_calculus_la_LIBADD = $(top_srcdir)/src/saga_core/saga_api/libsaga_api.la all: all-am .SUFFIXES: -.SUFFIXES: .cpp .lo .o .obj +.SUFFIXES: .c .cpp .lo .o .obj $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -303,9 +428,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/modules/grid/grid_calculus/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/modules/grid/grid_calculus/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu src/modules/grid/grid_calculus/Makefile + $(AUTOMAKE) --foreign src/modules/grid/grid_calculus/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -324,9 +449,9 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): + install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -334,6 +459,8 @@ else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \ } @@ -349,14 +476,17 @@ clean-pkglibLTLIBRARIES: -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES) - @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -libgrid_calculus.la: $(libgrid_calculus_la_OBJECTS) $(libgrid_calculus_la_DEPENDENCIES) - $(CXXLINK) -rpath $(pkglibdir) $(libgrid_calculus_la_OBJECTS) $(libgrid_calculus_la_LIBADD) $(LIBS) + @list='$(pkglib_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + +libgrid_calculus.la: $(libgrid_calculus_la_OBJECTS) $(libgrid_calculus_la_DEPENDENCIES) $(EXTRA_libgrid_calculus_la_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) -rpath $(pkglibdir) $(libgrid_calculus_la_OBJECTS) $(libgrid_calculus_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -375,30 +505,76 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Grid_Random_Terrain.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Grid_Volume.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MLB_Interface.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/errfunc.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gradient_cartes_polar.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/grid_difference.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/grid_metric_conversion.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kff_synth.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/spezfunc.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/storeorg.Plo@am__quote@ + +.c.o: +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< + +.c.obj: +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + +.c.lo: +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< + +errfunc.lo: ./../grid_filter/geodesic_morph_rec/errfunc.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT errfunc.lo -MD -MP -MF $(DEPDIR)/errfunc.Tpo -c -o errfunc.lo `test -f './../grid_filter/geodesic_morph_rec/errfunc.c' || echo '$(srcdir)/'`./../grid_filter/geodesic_morph_rec/errfunc.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/errfunc.Tpo $(DEPDIR)/errfunc.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='./../grid_filter/geodesic_morph_rec/errfunc.c' object='errfunc.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o errfunc.lo `test -f './../grid_filter/geodesic_morph_rec/errfunc.c' || echo '$(srcdir)/'`./../grid_filter/geodesic_morph_rec/errfunc.c + +spezfunc.lo: ./../grid_filter/geodesic_morph_rec/spezfunc.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT spezfunc.lo -MD -MP -MF $(DEPDIR)/spezfunc.Tpo -c -o spezfunc.lo `test -f './../grid_filter/geodesic_morph_rec/spezfunc.c' || echo '$(srcdir)/'`./../grid_filter/geodesic_morph_rec/spezfunc.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/spezfunc.Tpo $(DEPDIR)/spezfunc.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='./../grid_filter/geodesic_morph_rec/spezfunc.c' object='spezfunc.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o spezfunc.lo `test -f './../grid_filter/geodesic_morph_rec/spezfunc.c' || echo '$(srcdir)/'`./../grid_filter/geodesic_morph_rec/spezfunc.c + +storeorg.lo: ./../grid_filter/geodesic_morph_rec/storeorg.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT storeorg.lo -MD -MP -MF $(DEPDIR)/storeorg.Tpo -c -o storeorg.lo `test -f './../grid_filter/geodesic_morph_rec/storeorg.c' || echo '$(srcdir)/'`./../grid_filter/geodesic_morph_rec/storeorg.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/storeorg.Tpo $(DEPDIR)/storeorg.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='./../grid_filter/geodesic_morph_rec/storeorg.c' object='storeorg.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o storeorg.lo `test -f './../grid_filter/geodesic_morph_rec/storeorg.c' || echo '$(srcdir)/'`./../grid_filter/geodesic_morph_rec/storeorg.c .cpp.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< .cpp.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .cpp.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -406,26 +582,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -437,15 +602,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -454,6 +615,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -505,10 +681,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -593,19 +774,20 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-pkglibLTLIBRARIES ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-pkglibLTLIBRARIES \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-pkglibLTLIBRARIES install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ + uninstall-pkglibLTLIBRARIES # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_calculus/MLB_Interface.cpp saga-2.1.4+dfsg/src/modules/grid/grid_calculus/MLB_Interface.cpp --- saga-2.1.0+dfsg/src/modules/grid/grid_calculus/MLB_Interface.cpp 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_calculus/MLB_Interface.cpp 2014-11-13 08:32:15.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: MLB_Interface.cpp 1549 2012-11-29 16:38:50Z oconrad $ + * Version $Id: MLB_Interface.cpp 2281 2014-10-09 15:49:41Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// @@ -74,10 +74,13 @@ switch( i ) { case MLB_INFO_Name: default: - return( _TL("Grid - Calculus") ); + return( _TL("Calculus") ); + case MLB_INFO_Category: + return( _TL("Grid") ); + case MLB_INFO_Author: - return( SG_T("O. Conrad, A. Ringeler, V. Olaya (c) 2001-4") ); + return( SG_T("O. Conrad, A. Ringeler, V. Olaya, J. Engels (c) 2001-2014") ); case MLB_INFO_Description: return( _TL("Grid based or related calculations.") ); @@ -110,6 +113,7 @@ #include "grid_metric_conversion.h" #include "gradient_cartes_polar.h" +#include "kff_synth.h" //--------------------------------------------------------- // 4. Allow your modules to be created here... @@ -143,8 +147,10 @@ case 15: return( new CGradient_Cartes_To_Polar ); case 16: return( new CGradient_Polar_To_Cartes ); + case 19: return( new Ckff_synthesis ); + //----------------------------------------------------- - case 19: return( NULL ); + case 20: return( NULL ); default: return( MLB_INTERFACE_SKIP_MODULE ); } } diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_calculus/MLB_Interface.h saga-2.1.4+dfsg/src/modules/grid/grid_calculus/MLB_Interface.h --- saga-2.1.0+dfsg/src/modules/grid/grid_calculus/MLB_Interface.h 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_calculus/MLB_Interface.h 2014-11-13 08:32:15.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: MLB_Interface.h 911 2011-02-14 16:38:15Z reklov_w $ + * Version $Id: MLB_Interface.h 1922 2014-01-09 10:28:46Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_calculus_bsl/auswert_zuweisung.cpp saga-2.1.4+dfsg/src/modules/grid/grid_calculus_bsl/auswert_zuweisung.cpp --- saga-2.1.0+dfsg/src/modules/grid/grid_calculus_bsl/auswert_zuweisung.cpp 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_calculus_bsl/auswert_zuweisung.cpp 2014-11-13 08:32:16.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: auswert_zuweisung.cpp 911 2011-02-14 16:38:15Z reklov_w $ + * Version $Id: auswert_zuweisung.cpp 2210 2014-08-28 14:00:19Z oconrad $ *********************************************************/ #include "pars_all.h" @@ -472,7 +472,7 @@ // z.ZuVar.MatrixIndex.MVar->M->Z[p.y][p.x] = auswert_float(*z.ZuArt.IF); - (*z.ZuVar.MatrixIndex.MVar->M).Set_Value(p.x,p.y, auswert_float(*z.ZuArt.IF)); + (*z.ZuVar.MatrixIndex.MVar->M).Set_Value(p.x, p.y, auswert_float(*z.ZuArt.IF), true); } break; diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_calculus_bsl/diverses.cpp saga-2.1.4+dfsg/src/modules/grid/grid_calculus_bsl/diverses.cpp --- saga-2.1.0+dfsg/src/modules/grid/grid_calculus_bsl/diverses.cpp 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_calculus_bsl/diverses.cpp 2014-11-13 08:32:16.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: diverses.cpp 911 2011-02-14 16:38:15Z reklov_w $ + * Version $Id: diverses.cpp 2211 2014-08-28 14:09:29Z reklov_w $ *********************************************************/ // diverses.cc @@ -53,7 +53,7 @@ { int x = I.X(); int y = I.Y(); - + return (x >= 0 && x < W.xanz && y >= 0 && y < W.yanz); } @@ -61,7 +61,7 @@ { int x = I.X(); int y = I.Y(); - + return (x >= 0 && x < W().xanz && y >= 0 && y < W().yanz); } */ @@ -101,7 +101,7 @@ static int -NachbarBesetzt(int y0, int y1, int x0, int x1, int y, int x, +NachbarBesetzt(int y0, int y1, int x0, int x1, int y, int x, GridWerte& G) { for (int i=y0; i<=y1; i++) @@ -152,19 +152,19 @@ j = 0; for (i=1; i<=G.yanz; i++) Erg.Set_Value(j,i, 2.0*G(j,i-1)-G(j+1,i-1)); - + // rechte Kante j = G.xanz-1; for (i=1; i<=G.yanz; i++) Erg.Set_Value(j+2,i, 2.0*G(j,i-1)-G(j-1,i-1)); - + // untere Kante i = 0; // for (j=1; j<=G.xanz; j++) for (j=1; j<=xxx; j++) Erg.Set_Value(j,i, 2.0*G(j-1,i)-G(j-1,i+1)); - + // obere Kante i = G.yanz-1; // for (j=1; j<=G.xanz; j++) @@ -175,24 +175,24 @@ // Ecke ul m1 = 2*Erg(0,1)-Erg(0,2); m2 = 2*Erg(1,0)-Erg(2,0); - Erg.Set_Value(0,0, (m1+m2)/2); - + Erg.Set_Value(0,0, (m1+m2)/2, true); + // Ecke ur m1 = 2*Erg(Erg.xanz-1,1)-Erg(Erg.xanz-1,2); m2 = 2*Erg(Erg.xanz-2,0)-Erg(Erg.xanz-3,0); - Erg.Set_Value(Erg.xanz-1,0, (m1+m2)/2); + Erg.Set_Value(Erg.xanz-1,0, (m1+m2)/2, true); // Ecke ol m1 = 2*Erg(0,Erg.yanz-2)-Erg(0,Erg.yanz-3); m2 = 2*Erg(1,Erg.yanz-1)-Erg(2,Erg.yanz-1); - Erg.Set_Value(0,Erg.yanz-1, (m1+m2)/2); + Erg.Set_Value(0,Erg.yanz-1, (m1+m2)/2, true); // Ecke or m1 = 2*Erg(Erg.xanz-1,Erg.yanz-2)-Erg(Erg.xanz-1,Erg.yanz-3); m2 = 2*Erg(Erg.xanz-2,Erg.yanz-1)-Erg(Erg.xanz-3,Erg.yanz-1); - - Erg.Set_Value(Erg.xanz-1,Erg.yanz-1, (m1+m2)/2); - + + Erg.Set_Value(Erg.xanz-1,Erg.yanz-1, (m1+m2)/2, true); + Erg.calcMinMax(); } @@ -218,7 +218,7 @@ Dest.Set_Value(j,i, wert); } } - + } @@ -235,11 +235,11 @@ w[0] = double( 45.0/180.0*M_PI); // -1 -1 w[1] = double( 0.0/180.0*M_PI); // 0 -1 w[2] = double(315.0/180.0*M_PI); // 1 -1 - + w[3] = double( 90.0/180.0*M_PI); // -1 0 w[4] = double( 0.0/180.0*M_PI); // 0 0 egal, wird nicht benutzt w[5] = double(270.0/180.0*M_PI); // 1 0 - + w[6] = double(135.0/180.0*M_PI); // -1 +1 w[7] = double(180.0/180.0*M_PI); // 0 +1 w[8] = double(225.0/180.0*M_PI); // 1 +1 @@ -286,11 +286,11 @@ return (H(x,y) + H(x,y+1) + H(x+1,y) + H(x+1,y+1))/4.0f; else if (x == H.xanz-1) { - return (H(x,y) + H(x,y+1))/2.0f; + return (H(x,y) + H(x,y+1))/2.0f; } else { - return (H(x,y) + H(x+1,y))/2.0f; + return (H(x,y) + H(x+1,y))/2.0f; } } diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_calculus_bsl/funktion.cpp saga-2.1.4+dfsg/src/modules/grid/grid_calculus_bsl/funktion.cpp --- saga-2.1.0+dfsg/src/modules/grid/grid_calculus_bsl/funktion.cpp 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_calculus_bsl/funktion.cpp 2014-11-13 08:32:16.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: funktion.cpp 911 2011-02-14 16:38:15Z reklov_w $ + * Version $Id: funktion.cpp 2210 2014-08-28 14:00:19Z oconrad $ *********************************************************/ //#include <..\stdafx.h> @@ -587,10 +587,10 @@ G->Set_Value(x,y, G->asDouble(x,y-1)); // die vier Randpunkte setzen - G->Set_Value( 0, 0, G->asDouble( 1, 1, false)); - G->Set_Value(G->xanz-1, 0, G->asDouble(G->xanz-2, 1, false)); - G->Set_Value( 0,G->yanz-1, G->asDouble( 1,G->yanz-2, false)); - G->Set_Value(G->xanz-1,G->yanz-1, G->asDouble(G->xanz-2,G->yanz-2, false)); + G->Set_Value( 0, 0, G->asDouble( 1, 1,true),true); + G->Set_Value(G->xanz-1, 0, G->asDouble(G->xanz-2, 1,true),true); + G->Set_Value( 0,G->yanz-1, G->asDouble( 1,G->yanz-2,true),true); + G->Set_Value(G->xanz-1,G->yanz-1, G->asDouble(G->xanz-2,G->yanz-2,true),true); }; }; diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_calculus_bsl/gr_def.h saga-2.1.4+dfsg/src/modules/grid/grid_calculus_bsl/gr_def.h --- saga-2.1.0+dfsg/src/modules/grid/grid_calculus_bsl/gr_def.h 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_calculus_bsl/gr_def.h 2014-11-13 08:32:16.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: gr_def.h 911 2011-02-14 16:38:15Z reklov_w $ + * Version $Id: gr_def.h 1822 2013-09-03 20:33:02Z manfred-e $ *********************************************************/ //////////////////////////////////////////////////////////////////////////// // Programm : @@ -64,10 +64,10 @@ } G_Point; //DO * Papierformate und Ausrichtungen ****** -typedef enum G_PaperFormat { A0P, A0L, A1P, A1L, A2P, A2L, +enum G_PaperFormat { A0P, A0L, A1P, A1L, A2P, A2L, A3P, A3L, A4P, A4L, A5P, A5L}; -typedef enum G_PaperOrient { Portrait, Landscape }; -typedef enum G_FillType { Hollow, Blank, Filled }; +enum G_PaperOrient { Portrait, Landscape }; +enum G_FillType { Hollow, Blank, Filled }; //DO *RGB-Felder******************** @@ -103,9 +103,9 @@ //DO * Textdefinitionen ***************** -typedef enum G_TextOrientX {Left, HCenter, Right }; -typedef enum G_TextOrientY {Bottom,VCenter, Top}; -typedef enum G_TextFont { TimesRoman, +enum G_TextOrientX {Left, HCenter, Right }; +enum G_TextOrientY {Bottom,VCenter, Top}; +enum G_TextFont { TimesRoman, TimesBold, TimesItalic, TimesBoldItalic, @@ -117,7 +117,7 @@ Symbol }; //DO *** Clipping Type ****************** -typedef enum G_ClipType {NoClip,Clip}; +enum G_ClipType {NoClip,Clip}; #define CS_TEXT_COLOR 1 #define CS_TEXT_FONT 2 diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_calculus_bsl/Makefile.in saga-2.1.4+dfsg/src/modules/grid/grid_calculus_bsl/Makefile.in --- saga-2.1.0+dfsg/src/modules/grid/grid_calculus_bsl/Makefile.in 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_calculus_bsl/Makefile.in 2014-11-13 08:33:30.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -35,15 +79,17 @@ build_triplet = @build@ host_triplet = @host@ subdir = src/modules/grid/grid_calculus_bsl -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_postgresql.m4 \ + $(top_srcdir)/m4/ax_pkg_swig.m4 \ $(top_srcdir)/m4/ax_python_devel.m4 \ $(top_srcdir)/m4/ax_swig_enable_cxx.m4 \ $(top_srcdir)/m4/ax_swig_python.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.in + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -71,6 +117,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(pkglibdir)" LTLIBRARIES = $(pkglib_LTLIBRARIES) libgrid_calculus_bsl_la_DEPENDENCIES = \ @@ -82,35 +134,92 @@ MLB_Interface.lo pars_all.lo vector.lo zuweisung.lo libgrid_calculus_bsl_la_OBJECTS = \ $(am_libgrid_calculus_bsl_la_OBJECTS) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles am__mv = mv -f CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libgrid_calculus_bsl_la_SOURCES) DIST_SOURCES = $(libgrid_calculus_bsl_la_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -131,6 +240,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLELIBHARU = @DISABLELIBHARU@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -158,6 +268,7 @@ LOCAL_LIBS = @LOCAL_LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -170,8 +281,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PG_CONFIG = @PG_CONFIG@ +POSTGRESQL_CFLAGS = @POSTGRESQL_CFLAGS@ +POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@ +POSTGRESQL_VERSION = @POSTGRESQL_VERSION@ POW_LIB = @POW_LIB@ PYTHON = @PYTHON@ PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ @@ -195,6 +311,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -228,7 +345,6 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -313,9 +429,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/modules/grid/grid_calculus_bsl/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/modules/grid/grid_calculus_bsl/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu src/modules/grid/grid_calculus_bsl/Makefile + $(AUTOMAKE) --foreign src/modules/grid/grid_calculus_bsl/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -334,9 +450,9 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): + install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -344,6 +460,8 @@ else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \ } @@ -359,14 +477,17 @@ clean-pkglibLTLIBRARIES: -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES) - @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -libgrid_calculus_bsl.la: $(libgrid_calculus_bsl_la_OBJECTS) $(libgrid_calculus_bsl_la_DEPENDENCIES) - $(CXXLINK) -rpath $(pkglibdir) $(libgrid_calculus_bsl_la_OBJECTS) $(libgrid_calculus_bsl_la_LIBADD) $(LIBS) + @list='$(pkglib_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + +libgrid_calculus_bsl.la: $(libgrid_calculus_bsl_la_OBJECTS) $(libgrid_calculus_bsl_la_DEPENDENCIES) $(EXTRA_libgrid_calculus_bsl_la_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) -rpath $(pkglibdir) $(libgrid_calculus_bsl_la_OBJECTS) $(libgrid_calculus_bsl_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -393,25 +514,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zuweisung.Plo@am__quote@ .cpp.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< .cpp.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .cpp.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -419,26 +540,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -450,15 +560,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -467,6 +573,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -518,10 +639,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -606,19 +732,20 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-pkglibLTLIBRARIES ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-pkglibLTLIBRARIES \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-pkglibLTLIBRARIES install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ + uninstall-pkglibLTLIBRARIES # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_calculus_bsl/MLB_Interface.cpp saga-2.1.4+dfsg/src/modules/grid/grid_calculus_bsl/MLB_Interface.cpp --- saga-2.1.0+dfsg/src/modules/grid/grid_calculus_bsl/MLB_Interface.cpp 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_calculus_bsl/MLB_Interface.cpp 2014-11-13 08:32:16.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: MLB_Interface.cpp 1246 2011-11-25 13:42:38Z oconrad $ + * Version $Id: MLB_Interface.cpp 2281 2014-10-09 15:49:41Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -17,8 +17,11 @@ switch( i ) { case MLB_INFO_Name: default: - return( _TL("Grid - Calculus BSL") ); + return( _TL("Calculus BSL") ); + case MLB_INFO_Category: + return( _TL("Grid") ); + case MLB_INFO_Author: return( SG_T("SAGA User Group Associaton (c) 2009") ); diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_filter/bin_erosion_reconst.cpp saga-2.1.4+dfsg/src/modules/grid/grid_filter/bin_erosion_reconst.cpp --- saga-2.1.0+dfsg/src/modules/grid/grid_filter/bin_erosion_reconst.cpp 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_filter/bin_erosion_reconst.cpp 2014-11-13 08:32:17.000000000 +0000 @@ -0,0 +1,232 @@ +/********************************************************** + * Version $Id: bin_erosion_reconst.cpp 1936 2014-01-11 14:07:20Z reklov_w $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// Grid_Filter // +// // +//-------------------------------------------------------// +// // +// bin_erosion_reconst.c // +// // +// Copyright (C) 2013 by // +// HfT Stuttgart // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: johannes.engels@hft-stuttgart.de // +// // +// contact: Johannes Engels // +// Hochschule fuer Technik Stuttgart // +// Schellingstr. 24 // +// 70174 Stuttgart // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "bin_erosion_reconst.h" + +extern "C" { + #include "geodesic_morph_rec/storeorg.h" + #include "geodesic_morph_rec/bin_geovinc.h" +} + +#define RUN_MODULE(LIBRARY, MODULE, CONDITION) {\ + bool bResult;\ + SG_RUN_MODULE(bResult, LIBRARY, MODULE, CONDITION)\ + if( !bResult ) return( false );\ +} + +#define SET_PARAMETER(IDENTIFIER, VALUE) \ + pModule->Get_Parameters()->Set_Parameter(SG_T(IDENTIFIER), VALUE) + + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +Cbin_erosion_reconst::Cbin_erosion_reconst(void) +{ + Set_Name (_TL("Binary Erosion-Reconstruction")); + + Set_Author (SG_T("HfT Stuttgart (c) 2013")); + + Set_Description (_TW( + "Common binary Opening does not guarantee, that foreground regions which " + "outlast the erosion step are reconstructed to their original shape in the " + "dilation step. Depending on the application, that might be considered as a " + "deficiency. Therefore this module provides a combination of erosion with " + "the binary Geodesic Morphological Reconstruction, see \n" + "L. Vincent (1993): Morphological Grayscale Reconstruction in Image Analysis: " + "Applications and Efficient Algorithms. " + "IEEE Transactions on Image Processing, Vol. 2, No 2\n" + "Here we use the algorithm on p. 194: Breadth-first Scanning.\n\n" + "The marker is defined as the eroded INPUT_GRID, whereas the mask is just " + "the INPUT_GRID itself. OUTPUT_GRID is the reconstruction of the marker under " + "the mask.\n" + )); + + Parameters.Add_Grid (NULL, + "INPUT_GRID", + _TL ("Input Grid"), + _TL ("Grid to be filtered"), + PARAMETER_INPUT); + + // Data type of the output values is signed Byte. We wish to retain NoData values + // unaltered. With the types Bit or unsigned Byte, however, we are not able + // to distinguish 0 from NoData. + + Parameters.Add_Grid (NULL, + "OUTPUT_GRID", + _TL("Output Grid"), + _TL("Reconstruction result"), + PARAMETER_OUTPUT, + true, + SG_DATATYPE_Char); + + Parameters.Add_Value (NULL, + "RADIUS", + _TL ("Filter Size (Radius)"), + _TL ("Filter size (radius in grid cells)"), + PARAMETER_TYPE_Int, + 3); + +} + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +bool Cbin_erosion_reconst::On_Execute(void) +{ + CSG_Grid *pinpgrid, *bingrid, *poutgrid; + + unsigned short numrows; + unsigned short numcols; + char **mask; + char **marker; + + pinpgrid = Parameters ("INPUT_GRID")->asGrid (); + poutgrid = Parameters ("OUTPUT_GRID")->asGrid (); + + numrows=pinpgrid->Get_NY(); + numcols=pinpgrid->Get_NX(); + + // bingrid is not an output grid here, so it must be created ad hoc + + bingrid = SG_Create_Grid(SG_DATATYPE_Char, + pinpgrid->Get_NX(), + pinpgrid->Get_NY(), + pinpgrid->Get_Cellsize(), + pinpgrid->Get_XMin(), + pinpgrid->Get_YMin()); + + if (bingrid == NULL) + { + SG_UI_Msg_Add_Error(_TL("Unable to create grid for the eroded image!")); + + return (false); + } + + RUN_MODULE("grid_filter" , 8, + SET_PARAMETER("INPUT" , pinpgrid) + && SET_PARAMETER("RESULT" , bingrid) + && SET_PARAMETER("MODE" , 1) + && SET_PARAMETER("RADIUS" , Parameters ("RADIUS")->asInt()) + && SET_PARAMETER("METHOD" , 1) + ) + + mask = (char **) matrix_all_alloc (numrows, numcols, 'C', 0); + marker = (char **) matrix_all_alloc (numrows, numcols, 'C', 0); + + for (int y = 0; y < numrows; y++) + { + #pragma omp parallel for + for (int x = 0; x < numcols; x++) + { + if (pinpgrid->is_NoData(x,y)) // check if there are no_data in input datasets + { + mask [y][x] = 0; + marker [y][x] = 0; + } + else + { + mask [y][x] = pinpgrid->asChar(x,y); + marker [y][x] = bingrid->asChar(x,y); + } + } + } + + bingrid->Destroy(); + + binary_geodesic_morphological_reconstruction (numrows, numcols, mask, marker); + + for (int y = 0; y < Get_NY () && Set_Progress(y, Get_NY()); y++) + { + #pragma omp parallel for + for (int x = 0; x < Get_NX (); x++) + { + if (pinpgrid->is_NoData(x,y)) + poutgrid->Set_NoData(x,y); + else + poutgrid->Set_Value(x,y, marker[y][x]); + } + } + + + matrix_all_free ((void **) mask); + matrix_all_free ((void **) marker); + + return( true ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_filter/bin_erosion_reconst.h saga-2.1.4+dfsg/src/modules/grid/grid_filter/bin_erosion_reconst.h --- saga-2.1.0+dfsg/src/modules/grid/grid_filter/bin_erosion_reconst.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_filter/bin_erosion_reconst.h 2014-11-13 08:32:17.000000000 +0000 @@ -0,0 +1,108 @@ +/********************************************************** + * Version $Id: bin_erosion_reconst.h 1936 2014-01-11 14:07:20Z reklov_w $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// Grid_Filter // +// // +//-------------------------------------------------------// +// // +// bin_erosion_reconst.h // +// // +// Copyright (C) 2013 by // +// HfT Stuttgart // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: johannes.engels@hft-stuttgart.de // +// // +// contact: Johannes Engels // +// Hochschule fuer Technik Stuttgart // +// Schellingstr. 24 // +// 70174 Stuttgart // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#ifndef HEADER_INCLUDED__bin_erosion_reconst_H +#define HEADER_INCLUDED__bin erosion_reconst_H + +//--------------------------------------------------------- + + +#include "MLB_Interface.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +class Cbin_erosion_reconst : public CSG_Module_Grid +{ +public: + Cbin_erosion_reconst (void); + + +protected: + + virtual bool On_Execute (void); + + +private: + int m_Radius, m_Threshold; + + CSG_Grid m_Kernel, *m_pInput; + + + bool Get_Range (int x, int y, double &Minimum, double &Maximum); + +}; + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#endif // #ifndef HEADER_INCLUDED__bin_erosion_reconst_H diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_filter/connect_analysis.cpp saga-2.1.4+dfsg/src/modules/grid/grid_filter/connect_analysis.cpp --- saga-2.1.0+dfsg/src/modules/grid/grid_filter/connect_analysis.cpp 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_filter/connect_analysis.cpp 2014-11-13 08:32:17.000000000 +0000 @@ -0,0 +1,413 @@ +/********************************************************** + * Version $Id: connect_analysis.cpp 1936 2014-01-11 14:07:20Z reklov_w $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// Grid_Filter // +// // +//-------------------------------------------------------// +// // +// connect_analysis.c // +// // +// Copyright (C) 2013 by // +// HfT Stuttgart // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: johannes.engels@hft-stuttgart.de // +// // +// contact: Johannes Engels // +// Hochschule fuer Technik Stuttgart // +// Schellingstr. 24 // +// 70174 Stuttgart // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "connect_analysis.h" + +extern "C" { + #include "geodesic_morph_rec/storeorg.h" + #include "geodesic_morph_rec/combcontour.h" +} + +//--------------------------------------------------------- +#define RUN_MODULE(LIBRARY, MODULE, CONDITION) {\ + bool bResult;\ + SG_RUN_MODULE(bResult, LIBRARY, MODULE, CONDITION)\ + if( !bResult ) return( false );\ +} + +#define SET_PARAMETER(IDENTIFIER, VALUE) pModule->Get_Parameters()->Set_Parameter(SG_T(IDENTIFIER), VALUE) + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +Cconnectivity_analysis::Cconnectivity_analysis(void) +{ + Set_Name (_TL("Connectivity Analysis")); + + Set_Author (SG_T("HfT Stuttgart (c) 2013")); + + Set_Description (_TW( + "Connectivity analysis of a binary input image according to \n" + "Burger, W., Burge, M.: Digitale Bildverarbeitung. " + "Springer Verlag 2006, p.208.\n" + "Output consists in a symbolic image of the connected foreground regions " + "and a shape of the borders of the foreground regions (outer and inner " + "borders). The shape may contain alternatively the centers or the corners " + "of the border pixels. Optionally, the regions which have contact with " + "the image borders can be removed together with their border shapes. \n" + "In addition, an optional morphological filter (erosion-binary reconstruction) " + "can be applied to the input image first. \n\n" + )); + + Parameters.Add_Grid (NULL, + "INPUT_GRID", + _TL ("Input Binary Grid"), + _TL ("Binary input image for the connectivity analysis"), + PARAMETER_INPUT); + + Parameters.Add_Grid (NULL, + "FILTERED_MASK", + _TL("Filtered Image"), + _TL("Morphologically filtered binary mask"), + PARAMETER_OUTPUT_OPTIONAL, + true, + SG_DATATYPE_Char); + + Parameters.Add_Value (NULL, + "FILTER", + _TL ("Apply Filter?"), + _TL ("Apply a filter (erosion - binary reconstruction) to the input image "), + PARAMETER_TYPE_Bool, + true); + + Parameters.Add_Value (Parameters("FILTER"), + "SIZE", + _TL ("Filter Size (Radius)"), + _TL ("Filter size (radius in grid cells)"), + PARAMETER_TYPE_Int, + 3); + +// Parameters.Add_Grid_Output(NULL, "SYMBOLIC_IMAGE", _TL("Symbolic Image"), _TL("The final symbolic image")); + + Parameters.Add_Grid (NULL, + "SYMBOLIC_IMAGE", + _TL("Symbolic Image"), + _TL("The final symbolic image"), + PARAMETER_OUTPUT); + + Parameters.Add_Shapes (NULL, + "OUTLINES", + _TL("Outlines"), + _TL("Polygon outlines of object regions"), + PARAMETER_OUTPUT, + SHAPE_TYPE_Polygon); + + Parameters.Add_Value (NULL, + "BORDER_PIXEL_CENTERS", + _TL ("Pixel Centers?"), + _TL ("Should the output shapes contain the centers of the border pixels instead of the corners?"), + PARAMETER_TYPE_Bool, + false); + + Parameters.Add_Value (NULL, + "REMOVE_MARGINAL_REGIONS", + _TL ("Remove Border Regions?"), + _TL ("Remove regions which have contact with (are adjacent to) the image borders?"), + PARAMETER_TYPE_Bool, + false); + +} + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +bool Cconnectivity_analysis::On_Execute(void) +{ + CSG_Grid *pinpgrid, *bingrid, *symb_grid, *hgrid; + CSG_Shapes *pOutlines; + + bool filter, corners_centers, remove_marginal_regions; + unsigned short numrows; + unsigned short numcols; + unsigned char center; + double xmin; + double ymin; + short interm_grid_created; + simple_REGIONC_list *reg_first; + simple_REGIONC_list *reg_last; + simple_REGIONC_list *reg_curr; + + pinpgrid = Parameters ("INPUT_GRID")->asGrid(); + bingrid = Parameters ("FILTERED_MASK")->asGrid(); + filter = Parameters ("FILTER")->asBool(); + corners_centers = Parameters ("BORDER_PIXEL_CENTERS")->asBool(); + remove_marginal_regions = Parameters ("REMOVE_MARGINAL_REGIONS")->asBool(); + pOutlines = Parameters("OUTLINES")->asShapes(); + symb_grid = Parameters ("SYMBOLIC_IMAGE")->asGrid(); + CSG_String sName = pOutlines->Get_Name(); + pOutlines->Destroy(); + pOutlines->Set_Name(sName); + pOutlines->Add_Field(SG_T("ID"), SG_DATATYPE_Int); + + numrows=pinpgrid->Get_NY()+2; + numcols=pinpgrid->Get_NX()+2; +// xmin=pinpgrid->Get_XMin()-2*pinpgrid->Get_Cellsize(); +// ymin=pinpgrid->Get_YMin()-2*pinpgrid->Get_Cellsize(); + + xmin=pinpgrid->Get_XMin(); + ymin=pinpgrid->Get_YMin(); + + unsigned char **bin_image; + long **symb_image; + + if (corners_centers) + center = 1; + else + center = 0; + + bin_image = (unsigned char **) matrix_all_alloc (numrows, numcols, 'U', 0); + symb_image = (long **) matrix_all_alloc (numrows, numcols, 'L', 0); + + interm_grid_created = 0; + + //SG_Free(bin_image); + //CSG_Grid *pTmp = new CSG_Grid(); + //delete pTmp; + + if (filter) + { + if (bingrid == NULL) + { + SG_UI_Msg_Add(_TL("Filtered mask will be created automatically ..."), true); + + bingrid = SG_Create_Grid(SG_DATATYPE_Char, + pinpgrid->Get_NX(), + pinpgrid->Get_NY(), + pinpgrid->Get_Cellsize(), + pinpgrid->Get_XMin(), + pinpgrid->Get_YMin()); + + if (bingrid == NULL) + { + SG_UI_Msg_Add_Error(_TL("Unable to create filtered mask grid!")); + matrix_all_free ((void **) bin_image); + matrix_all_free ((void **) symb_image); + + return (false); + } + + Parameters("FILTERED_MASK")->Set_Value(bingrid); + interm_grid_created = 1; + } + + + //----------------------------------------------------- + RUN_MODULE("grid_filter" , 13, + SET_PARAMETER("INPUT_GRID" , pinpgrid) + && SET_PARAMETER("OUTPUT_GRID" , bingrid) + && SET_PARAMETER("RADIUS" , Parameters ("SIZE")->asInt()) + ) + + hgrid = bingrid; + } + else + { + hgrid = pinpgrid; + } + + for (int y = 0; y < hgrid->Get_NY () && Set_Progress(y, hgrid->Get_NY()); y++) + { + for (int x = 0; x < hgrid->Get_NX(); x++) + { + if (hgrid->is_NoData(x,y)) + bin_image[y+1][x+1] = 0; + else + bin_image[y+1][x+1] = hgrid->asChar(x,y); + } + } + + + // Here the regions are removed which have contact with the image margins; + // this is achieved by a region growing + + if (remove_marginal_regions) + { + for (int y = 1; y < numrows - 1; y++) + { + if (bin_image [y][1] != 0) + background_region_growing (bin_image, numrows, numcols, y, 1); + + if (bin_image [y][numcols - 2] != 0) + background_region_growing (bin_image, numrows, numcols, y, numcols-2); + } + + for (int x = 1; x < numcols - 1; x++) + { + if (bin_image [1][x] != 0) + background_region_growing (bin_image, numrows, numcols, 1, x); + + if (bin_image [numrows-2][x] != 0) + background_region_growing (bin_image, numrows, numcols, numrows-2, x); + } + + if (filter) + { + for (int y = 0; y < bingrid->Get_NY (); y++) + { + #pragma omp parallel for + for (int x = 0; x < bingrid->Get_NX(); x++) + { + bingrid->Set_Value(x, y, bin_image[y+1][x+1]); + } + } + } + } + + if (interm_grid_created) + bingrid->Destroy(); + + + // The function which does the proper work: + // computation of the symbolic image, construction of the border chains (shapes) + + comb_contour_region_marking (numrows, + numcols, + bin_image, + symb_image, + ®_first, + ®_last, + center); + + + for (int y = 0; y < symb_grid->Get_NY () && Set_Progress(y, symb_grid->Get_NY()); y++) + { + #pragma omp parallel for + for (int x = 0; x < symb_grid->Get_NX(); x++) + { + symb_grid->Set_Value(x, y, symb_image[y+1][x+1]); + } + } + + + // Here the shapes are generated + + int iPolygon; + + for (iPolygon = 0, reg_curr = reg_first; reg_curr != NULL; reg_curr = reg_curr -> next, iPolygon++) + { + CSG_Shape *pShape = pOutlines->Add_Shape(); + + pShape->Set_Value(0, iPolygon); // set ID field (= first field in table) to polygon ID + + for (simple_PIXELC_list *pix_curr = reg_curr->first_pix; pix_curr != NULL; pix_curr = pix_curr->next) + { + TSG_Point point = symb_grid->Get_System().Get_Grid_to_World(pix_curr->col - 1, pix_curr->row - 1); + pShape->Add_Point(point, 0); + } + + int iHoles; + simple_INNER_REGION_list *inner_curr; + + for (iHoles=0, inner_curr = reg_curr->inner_first; + iHoles < reg_curr->num_holes; + iHoles++, inner_curr = inner_curr->next) + { + for (simple_PIXELC_list *pix_curr = inner_curr->first_pix; pix_curr != NULL; pix_curr = pix_curr->next) + { + TSG_Point point = symb_grid->Get_System().Get_Grid_to_World(pix_curr->col - 1, pix_curr->row - 1); + pShape->Add_Point(point, iHoles+1); + } + } + + if (!corners_centers) + shift_shape (pShape, -Get_Cellsize()/2.0, -Get_Cellsize()/2.0); + } + + matrix_all_free ((void **) bin_image); + matrix_all_free ((void **) symb_image); + free_regions (®_first, ®_last); + + return( true ); +} + + +int Cconnectivity_analysis::On_Parameters_Enable(CSG_Parameters *pParameters, CSG_Parameter *pParameter) +{ + if ( !SG_STR_CMP(pParameter->Get_Identifier(), SG_T("FILTER")) ) + { + pParameters->Get_Parameter("SIZE")->Set_Enabled(pParameter->asBool()); + pParameters->Get_Parameter("FILTERED_MASK")->Set_Enabled(pParameter->asBool()); + } + + return (1); +} + + +void Cconnectivity_analysis::shift_shape (CSG_Shape *pShape, double dx, double dy) +{ + for (int iPart=0; iPartGet_Part_Count(); iPart++) + { + for (int iPoint=0; iPointGet_Point_Count(iPart); iPoint++) + { + TSG_Point point = pShape->Get_Point(iPoint, iPart); + point.x = point.x + dx; + point.y = point.y + dy; + pShape->Set_Point(point, iPoint, iPart); + } // iPoint + } // iPart +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_filter/connect_analysis.h saga-2.1.4+dfsg/src/modules/grid/grid_filter/connect_analysis.h --- saga-2.1.0+dfsg/src/modules/grid/grid_filter/connect_analysis.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_filter/connect_analysis.h 2014-11-13 08:32:17.000000000 +0000 @@ -0,0 +1,102 @@ +/********************************************************** + * Version $Id: connect_analysis.h 1936 2014-01-11 14:07:20Z reklov_w $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// Grid_Filter // +// // +//-------------------------------------------------------// +// // +// connect_analysis.h // +// // +// Copyright (C) 2013 by // +// HfT Stuttgart // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: johannes.engels@hft-stuttgart.de // +// // +// contact: Johannes Engels // +// Hochschule fuer Technik Stuttgart // +// Schellingstr. 24 // +// 70174 Stuttgart // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#ifndef HEADER_INCLUDED__connectivity_analysis_H +#define HEADER_INCLUDED__connectivity_analysis_H + +//--------------------------------------------------------- + + +#include "MLB_Interface.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +class Cconnectivity_analysis : public CSG_Module_Grid +{ +public: + Cconnectivity_analysis (void); + + +protected: + + virtual bool On_Execute (void); + virtual int On_Parameters_Enable(CSG_Parameters *pParameters, CSG_Parameter *pParameter); + +private: + void shift_shape (CSG_Shape *pShape, double dx, double dy); +}; + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#endif // #ifndef HEADER_INCLUDED__connectivity_analysis_H diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_filter/Filter_3x3.cpp saga-2.1.4+dfsg/src/modules/grid/grid_filter/Filter_3x3.cpp --- saga-2.1.0+dfsg/src/modules/grid/grid_filter/Filter_3x3.cpp 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_filter/Filter_3x3.cpp 2014-11-13 08:32:17.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Filter_3x3.cpp 1547 2012-11-27 14:59:03Z oconrad $ + * Version $Id: Filter_3x3.cpp 1921 2014-01-09 10:24:11Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_filter/Filter_3x3.h saga-2.1.4+dfsg/src/modules/grid/grid_filter/Filter_3x3.h --- saga-2.1.0+dfsg/src/modules/grid/grid_filter/Filter_3x3.h 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_filter/Filter_3x3.h 2014-11-13 08:32:17.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Filter_3x3.h 911 2011-02-14 16:38:15Z reklov_w $ + * Version $Id: Filter_3x3.h 1921 2014-01-09 10:24:11Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_filter/FilterClumps.cpp saga-2.1.4+dfsg/src/modules/grid/grid_filter/FilterClumps.cpp --- saga-2.1.0+dfsg/src/modules/grid/grid_filter/FilterClumps.cpp 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_filter/FilterClumps.cpp 2014-11-13 08:32:17.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: FilterClumps.cpp 911 2011-02-14 16:38:15Z reklov_w $ + * Version $Id: FilterClumps.cpp 2072 2014-03-31 08:50:43Z reklov_w $ *********************************************************/ /******************************************************************************* FilterClumps.cpp @@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, USA *******************************************************************************/ #include "FilterClumps.h" diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_filter/FilterClumps.h saga-2.1.4+dfsg/src/modules/grid/grid_filter/FilterClumps.h --- saga-2.1.0+dfsg/src/modules/grid/grid_filter/FilterClumps.h 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_filter/FilterClumps.h 2014-11-13 08:32:17.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: FilterClumps.h 911 2011-02-14 16:38:15Z reklov_w $ + * Version $Id: FilterClumps.h 2072 2014-03-31 08:50:43Z reklov_w $ *********************************************************/ /******************************************************************************* FilterClumps.h @@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, USA *******************************************************************************/ #include "MLB_Interface.h" diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_filter/Filter.cpp saga-2.1.4+dfsg/src/modules/grid/grid_filter/Filter.cpp --- saga-2.1.0+dfsg/src/modules/grid/grid_filter/Filter.cpp 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_filter/Filter.cpp 2014-11-13 08:32:17.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Filter.cpp 911 2011-02-14 16:38:15Z reklov_w $ + * Version $Id: Filter.cpp 1921 2014-01-09 10:24:11Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_filter/Filter_Gauss.cpp saga-2.1.4+dfsg/src/modules/grid/grid_filter/Filter_Gauss.cpp --- saga-2.1.0+dfsg/src/modules/grid/grid_filter/Filter_Gauss.cpp 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_filter/Filter_Gauss.cpp 2014-11-13 08:32:17.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Filter_Gauss.cpp 911 2011-02-14 16:38:15Z reklov_w $ + * Version $Id: Filter_Gauss.cpp 1960 2014-02-03 12:43:13Z reklov_w $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// @@ -167,6 +167,7 @@ //------------------------------------------------- for(int y=0; yis_InGrid(x, y) ) diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_filter/Filter_Gauss.h saga-2.1.4+dfsg/src/modules/grid/grid_filter/Filter_Gauss.h --- saga-2.1.0+dfsg/src/modules/grid/grid_filter/Filter_Gauss.h 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_filter/Filter_Gauss.h 2014-11-13 08:32:17.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Filter_Gauss.h 911 2011-02-14 16:38:15Z reklov_w $ + * Version $Id: Filter_Gauss.h 1921 2014-01-09 10:24:11Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_filter/Filter.h saga-2.1.4+dfsg/src/modules/grid/grid_filter/Filter.h --- saga-2.1.0+dfsg/src/modules/grid/grid_filter/Filter.h 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_filter/Filter.h 2014-11-13 08:32:17.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Filter.h 911 2011-02-14 16:38:15Z reklov_w $ + * Version $Id: Filter.h 1921 2014-01-09 10:24:11Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_filter/Filter_LoG.cpp saga-2.1.4+dfsg/src/modules/grid/grid_filter/Filter_LoG.cpp --- saga-2.1.0+dfsg/src/modules/grid/grid_filter/Filter_LoG.cpp 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_filter/Filter_LoG.cpp 2014-11-13 08:32:17.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Filter_LoG.cpp 911 2011-02-14 16:38:15Z reklov_w $ + * Version $Id: Filter_LoG.cpp 2208 2014-08-27 16:00:51Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// @@ -293,7 +293,7 @@ } } - m_Kernel += -m_Kernel.Get_ArithMean(); + m_Kernel += -m_Kernel.Get_Mean(); break; } diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_filter/Filter_LoG.h saga-2.1.4+dfsg/src/modules/grid/grid_filter/Filter_LoG.h --- saga-2.1.0+dfsg/src/modules/grid/grid_filter/Filter_LoG.h 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_filter/Filter_LoG.h 2014-11-13 08:32:17.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Filter_LoG.h 911 2011-02-14 16:38:15Z reklov_w $ + * Version $Id: Filter_LoG.h 1921 2014-01-09 10:24:11Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_filter/Filter_Majority.cpp saga-2.1.4+dfsg/src/modules/grid/grid_filter/Filter_Majority.cpp --- saga-2.1.0+dfsg/src/modules/grid/grid_filter/Filter_Majority.cpp 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_filter/Filter_Majority.cpp 2014-11-13 08:32:17.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Filter_Majority.cpp 1086 2011-06-08 10:12:02Z reklov_w $ + * Version $Id: Filter_Majority.cpp 1921 2014-01-09 10:24:11Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_filter/Filter_Majority.h saga-2.1.4+dfsg/src/modules/grid/grid_filter/Filter_Majority.h --- saga-2.1.0+dfsg/src/modules/grid/grid_filter/Filter_Majority.h 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_filter/Filter_Majority.h 2014-11-13 08:32:17.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Filter_Majority.h 1086 2011-06-08 10:12:02Z reklov_w $ + * Version $Id: Filter_Majority.h 1921 2014-01-09 10:24:11Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_filter/Filter_Morphology.cpp saga-2.1.4+dfsg/src/modules/grid/grid_filter/Filter_Morphology.cpp --- saga-2.1.0+dfsg/src/modules/grid/grid_filter/Filter_Morphology.cpp 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_filter/Filter_Morphology.cpp 2014-11-13 08:32:17.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Filter_Morphology.cpp 911 2011-02-14 16:38:15Z reklov_w $ + * Version $Id: Filter_Morphology.cpp 1921 2014-01-09 10:24:11Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_filter/Filter_Morphology.h saga-2.1.4+dfsg/src/modules/grid/grid_filter/Filter_Morphology.h --- saga-2.1.0+dfsg/src/modules/grid/grid_filter/Filter_Morphology.h 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_filter/Filter_Morphology.h 2014-11-13 08:32:17.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Filter_Morphology.h 911 2011-02-14 16:38:15Z reklov_w $ + * Version $Id: Filter_Morphology.h 1921 2014-01-09 10:24:11Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_filter/Filter_Multi_Dir_Lee.cpp saga-2.1.4+dfsg/src/modules/grid/grid_filter/Filter_Multi_Dir_Lee.cpp --- saga-2.1.0+dfsg/src/modules/grid/grid_filter/Filter_Multi_Dir_Lee.cpp 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_filter/Filter_Multi_Dir_Lee.cpp 2014-11-13 08:32:17.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Filter_Multi_Dir_Lee.cpp 1610 2013-02-18 11:25:09Z reklov_w $ + * Version $Id: Filter_Multi_Dir_Lee.cpp 2208 2014-08-27 16:00:51Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// @@ -411,7 +411,7 @@ //----------------------------------------------------- if( !bAbsolute ) { - Noise = Parameters("NOISE_REL")->asDouble() * m_pStdDev->Get_ArithMean(); + Noise = Parameters("NOISE_REL")->asDouble() * m_pStdDev->Get_Mean(); Noise2 = Noise*Noise; for(y=0; yGet_Identifier(), "ALL") ) + { + pParameters->Get_Parameter("CLASS")->Set_Enabled(pParameter->asInt() == 0); + } + + return( 1 ); +} + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CFilter_Sieve::On_Execute(void) +{ + //----------------------------------------------------- + m_pGrid = Parameters("OUTPUT")->asGrid(); + + if( m_pGrid && m_pGrid != Parameters("INPUT")->asGrid() ) + { + m_pGrid->Create(*Parameters("INPUT")->asGrid()); + } + else + { + m_pGrid = Parameters("INPUT")->asGrid(); + } + + //----------------------------------------------------- + m_Mode = Parameters("MODE" )->asInt() == 0 ? 2 : 1; + m_Threshold = Parameters("THRESHOLD")->asInt(); + + bool bAll = Parameters("ALL" )->asInt() == 1; + double Class = Parameters("CLASS")->asDouble(); + + //----------------------------------------------------- + Lock_Create(); + + //----------------------------------------------------- + for(int y=0; yis_NoData(x, y) && (bAll || Class == m_pGrid->asDouble(x, y)) ) + { + m_Class = m_pGrid->asDouble(x, y); + + if( Get_Size(x, y) < m_Threshold ) + { + Do_Sieve(x, y); + } + else + { + Do_Keep (x, y); + } + } + } + } + + //----------------------------------------------------- + Lock_Destroy(); + + if( m_pGrid == Parameters("INPUT")->asGrid() ) + { + DataObject_Update(m_pGrid); + } + + return( true ); +} + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +int CFilter_Sieve::Get_Size(int x, int y, int n) +{ + if( m_pGrid->is_InGrid(x, y) && m_Class == m_pGrid->asDouble(x, y) ) + { + switch( Lock_Get(x, y) ) + { + case 0: // not yet processed at all + { + Lock_Set(x, y, 1); + + n++; + + for(int i=0; i<8 && nis_InGrid(x, y) && Lock_Get(x, y) == 1 ) + { + Lock_Set(x, y, 2); + + for(int i=0; i<8; i+=m_Mode) + { + Do_Keep(Get_xTo(i, x), Get_yTo(i, y)); + } + } +} + +//--------------------------------------------------------- +void CFilter_Sieve::Do_Sieve(int x, int y) +{ + if( m_pGrid->is_InGrid(x, y) && Lock_Get(x, y) == 1 ) + { + Lock_Set(x, y, 3); + + m_pGrid->Set_NoData(x, y); + + for(int i=0; i<8; i+=m_Mode) + { + Do_Sieve(Get_xTo(i, x), Get_yTo(i, y)); + } + } +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_filter/Filter_Sieve.h saga-2.1.4+dfsg/src/modules/grid/grid_filter/Filter_Sieve.h --- saga-2.1.0+dfsg/src/modules/grid/grid_filter/Filter_Sieve.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_filter/Filter_Sieve.h 2014-11-13 08:32:17.000000000 +0000 @@ -0,0 +1,120 @@ +/********************************************************** + * Version $Id: Filter_Sieve.h 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// Grid_Filter // +// // +//-------------------------------------------------------// +// // +// Filter_Sieve.h // +// // +// Copyright (C) 2014 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Hamburg // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#ifndef HEADER_INCLUDED__Filter_Sieve_H +#define HEADER_INCLUDED__Filter_Sieve_H + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "MLB_Interface.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +class CFilter_Sieve : public CSG_Module_Grid +{ +public: + CFilter_Sieve(void); + + +protected: + + virtual int On_Parameters_Enable (CSG_Parameters *pParameters, CSG_Parameter *pParameter); + + virtual bool On_Execute (void); + + +private: + + int m_Mode, m_Threshold; + + double m_Class; + + CSG_Grid *m_pGrid; + + + int Get_Size (int x, int y, int n = 0); + + void Do_Keep (int x, int y); + void Do_Sieve (int x, int y); + +}; + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#endif // #ifndef HEADER_INCLUDED__Filter_Sieve_H diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_filter/Filter_Terrain_SlopeBased.cpp saga-2.1.4+dfsg/src/modules/grid/grid_filter/Filter_Terrain_SlopeBased.cpp --- saga-2.1.0+dfsg/src/modules/grid/grid_filter/Filter_Terrain_SlopeBased.cpp 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_filter/Filter_Terrain_SlopeBased.cpp 2014-11-13 08:32:17.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Filter_Terrain_SlopeBased.cpp 911 2011-02-14 16:38:15Z reklov_w $ + * Version $Id: Filter_Terrain_SlopeBased.cpp 1921 2014-01-09 10:24:11Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_filter/Filter_Terrain_SlopeBased.h saga-2.1.4+dfsg/src/modules/grid/grid_filter/Filter_Terrain_SlopeBased.h --- saga-2.1.0+dfsg/src/modules/grid/grid_filter/Filter_Terrain_SlopeBased.h 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_filter/Filter_Terrain_SlopeBased.h 2014-11-13 08:32:17.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Filter_Terrain_SlopeBased.h 911 2011-02-14 16:38:15Z reklov_w $ + * Version $Id: Filter_Terrain_SlopeBased.h 1921 2014-01-09 10:24:11Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_filter/geodesic_morph_rec/bin_geovinc.c saga-2.1.4+dfsg/src/modules/grid/grid_filter/geodesic_morph_rec/bin_geovinc.c --- saga-2.1.0+dfsg/src/modules/grid/grid_filter/geodesic_morph_rec/bin_geovinc.c 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_filter/geodesic_morph_rec/bin_geovinc.c 2014-11-13 08:32:17.000000000 +0000 @@ -0,0 +1,234 @@ +/********************************************************** + * Version $Id: bin_geovinc.c 1936 2014-01-11 14:07:20Z reklov_w $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// Grid_Filter // +// // +//-------------------------------------------------------// +// // +// bin_geovinc.c // +// // +// Copyright (C) 2013 by // +// HfT Stuttgart // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: johannes.engels@hft-stuttgart.de // +// // +// contact: Johannes Engels // +// Hochschule fuer Technik Stuttgart // +// Schellingstr. 24 // +// 70174 Stuttgart // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include +#include +#include +#include +#include "storeorg.h" +#include "bin_geovinc.h" + + +/************************************************************************/ +/* Funktioniert mit listfuncs.in2 */ +/************************************************************************/ + +#define LISTELEMENT CHAR_PIXEL +#include "listfuncs.inc" +#undef LISTELEMENT + + + + +static int find_border_pixels (unsigned short numrows, + unsigned short numcols, + simple_CHAR_PIXEL_list **first_pix, + simple_CHAR_PIXEL_list **last_pix, + char **mask, + char **marker) +{ + /*******************************************************************/ + /* Es wird eine Liste von Vordergrund-Pixeln (die selbst den Wert */ + /* 1 haben) erzeugt, die mindestens ein Hintergrund-Pixel als */ + /* Nachbarn aufweisen. */ + /*******************************************************************/ + + unsigned short row; + unsigned short col; + unsigned short nrow; + unsigned short ncol; + + unsigned short rowmin; + unsigned short colmin; + unsigned short rowmax; + unsigned short colmax; + + short fflag; + + + for (row = 0; row < numrows; row ++) + { + for (col = 0; col < numcols; col ++) + { + if (marker [row][col] != 1) + continue; + + rowmin = (row == 0) ? 0 : row - 1; + colmin = (col == 0) ? 0 : col - 1; + rowmax = (row == numrows - 1) ? row : row + 1; + colmax = (col == numcols - 1) ? col : col + 1; + fflag = 0; + + for (nrow = rowmin; nrow <= rowmax; nrow ++) + { + for (ncol = colmin; ncol <= colmax; ncol ++) + { + /*************************************************************/ + /* Im ersten Fall liegen das aktuelle und das Nachbar-Pixel */ + /* diagonal (8-Nachbarschaft), im zweiten sind sie identisch */ + /*************************************************************/ + + if ((ncol != col && nrow != row) || (ncol == col && nrow == row)) + continue; + + + if (marker [nrow][ncol] == 0 && mask [nrow][ncol] == 1) + { + /* Hier kann man propagieren */ + + fflag = 1; + break; + } + } + + if (fflag == 1) + break; + } + + + if (fflag == 0) + continue; + + append_new_simple_CHAR_PIXEL_list (first_pix, last_pix); + (*last_pix) -> row = row; + (*last_pix) -> col = ncol; + } + } + + return 0; +} + + + + +int binary_geodesic_morphological_reconstruction ( + unsigned short numrows, + unsigned short numcols, + char **mask, + char **marker) +{ + simple_CHAR_PIXEL_list *first_pix = NULL; + simple_CHAR_PIXEL_list *last_pix = NULL; + simple_CHAR_PIXEL_list *curr_pix; + + unsigned short rowmin; + unsigned short colmin; + unsigned short rowmax; + unsigned short colmax; + unsigned short row; + unsigned short col; + unsigned short nrow; + unsigned short ncol; + + + find_border_pixels (numrows, numcols, &first_pix, &last_pix, mask, marker); + + + /*********************************************************************/ + /* Hier kommt jetzt die alles entscheidende Schleife, in der die */ + /* Dilatation vorgenommen wird. Das vorderste Element der Pixelliste */ + /* wird herausgenommen; seine Nachbarn werden in die Pixelliste */ + /* einsortiert, falls ihr Wert geaendert werden kann. */ + /*********************************************************************/ + + for (curr_pix = first_pix; curr_pix != NULL; curr_pix = first_pix) + { + row = curr_pix -> row; + col = curr_pix -> col; + delete_first_simple_CHAR_PIXEL (&first_pix, &last_pix); + + /****************************************************************/ + /* Hier wird vorerst nur die 4-er Nachbarschaft betrachtet. */ + /****************************************************************/ + + rowmin = (row == 0) ? 0 : row - 1; + colmin = (col == 0) ? 0 : col - 1; + rowmax = (row == numrows - 1) ? row : row + 1; + colmax = (col == numcols - 1) ? col : col + 1; + + for (nrow = rowmin; nrow <= rowmax; nrow ++) + { + for (ncol = colmin; ncol <= colmax; ncol ++) + { + /*************************************************************/ + /* Im ersten Fall liegen das aktuelle und das Nachbar-Pixel */ + /* diagonal (8-Nachbarschaft), im zweiten sind sie identisch */ + /*************************************************************/ + + if ((ncol != col && nrow != row) || (ncol == col && nrow == row)) + continue; + + if (marker [nrow][ncol] == 1 || mask [nrow][ncol] != 1) + continue; + + marker [nrow][ncol] = 1; + append_new_simple_CHAR_PIXEL_list (&first_pix, &last_pix); + last_pix -> row = nrow; + last_pix -> col = ncol; + } + } + } + + return 0; +} + + diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_filter/geodesic_morph_rec/bin_geovinc.h saga-2.1.4+dfsg/src/modules/grid/grid_filter/geodesic_morph_rec/bin_geovinc.h --- saga-2.1.0+dfsg/src/modules/grid/grid_filter/geodesic_morph_rec/bin_geovinc.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_filter/geodesic_morph_rec/bin_geovinc.h 2014-11-13 08:32:17.000000000 +0000 @@ -0,0 +1,90 @@ +/********************************************************** + * Version $Id: bin_geovinc.h 1936 2014-01-11 14:07:20Z reklov_w $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// Grid_Filter // +// // +//-------------------------------------------------------// +// // +// bin_geovinc.H // +// // +// Copyright (C) 2013 by // +// HfT Stuttgart // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: johannes.engels@hft-stuttgart.de // +// // +// contact: Johannes Engels // +// Hochschule fuer Technik Stuttgart // +// Schellingstr. 24 // +// 70174 Stuttgart // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +typedef struct simple_CHAR_PIXEL_list +{ + unsigned short row; + unsigned short col; + + struct simple_CHAR_PIXEL_list *next; +} +simple_CHAR_PIXEL_list; + + +typedef struct double_CHAR_PIXEL_list +{ + unsigned short row; + unsigned short col; + + struct double_CHAR_PIXEL_list *prev; + struct double_CHAR_PIXEL_list *next; +} +double_CHAR_PIXEL_list; + + + +int binary_geodesic_morphological_reconstruction ( + unsigned short numrows, + unsigned short numcols, + char **mask, + char **marker); + diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_filter/geodesic_morph_rec/combcontour.c saga-2.1.4+dfsg/src/modules/grid/grid_filter/geodesic_morph_rec/combcontour.c --- saga-2.1.0+dfsg/src/modules/grid/grid_filter/geodesic_morph_rec/combcontour.c 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_filter/geodesic_morph_rec/combcontour.c 2014-11-13 08:32:17.000000000 +0000 @@ -0,0 +1,866 @@ +/********************************************************** + * Version $Id: combcontour.c 1936 2014-01-11 14:07:20Z reklov_w $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// Grid_Filter // +// // +//-------------------------------------------------------// +// // +// combcontour.c // +// // +// Copyright (C) 2013 by // +// HfT Stuttgart // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: johannes.engels@hft-stuttgart.de // +// // +// contact: Johannes Engels // +// Hochschule fuer Technik Stuttgart // +// Schellingstr. 24 // +// 70174 Stuttgart // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include +#include +#include +#include +#include +#include + +#include "storeorg.h" +#include "combcontour.h" + + +#ifdef MATLAB +#include "mex.h" +#endif + + +#define LISTELEMENT PIXELC +#include "listfuncs.inc" +#undef LISTELEMENT + +#define LISTELEMENT REGIONC +#include "listfuncs.inc" +#undef LISTELEMENT + +#define LISTELEMENT INNER_REGION +#include "listfuncs.inc" +#undef LISTELEMENT + +/* +static int append_new_simple_PIXELC_to_list (simple_PIXELC_list **first_pix, + simple_PIXELC_list **last_pix) +{ + simple_PIXELC_list *new_pix; + + new_pix = (simple_PIXELC_list *) malloc (sizeof (simple_PIXELC_list)); + memset (new_pix, 0x00, sizeof(simple_PIXELC_list)); + append_simple_PIXELC_list (first_pix, last_pix, new_pix); + + return 0; +} +*/ + + + +int background_region_growing (unsigned char **bin_image, + unsigned short numrows, + unsigned short numcols, + unsigned short row, + unsigned short col) +{ + /*****************************************************************/ + /* Starting with the seed point (row, col), the function updates */ + /* the pixels of the corresponding connected region of a binary */ + /* image by means of a region growing to zero. */ + /* The region growing is based on a 4-neighbourhood. */ + /*****************************************************************/ + + unsigned short rowmin; + unsigned short rowmax; + unsigned short colmin; + unsigned short colmax; + unsigned short nrow; + unsigned short ncol; + + simple_PIXELC_list *curr_pix; + simple_PIXELC_list *first_pix = NULL; + simple_PIXELC_list *last_pix = NULL; + + + append_new_simple_PIXELC_list (&first_pix, &last_pix); + last_pix -> row = row; + last_pix -> col = col; + + for (curr_pix = first_pix; curr_pix != NULL; curr_pix = first_pix) + { + row = curr_pix -> row; + col = curr_pix -> col; + delete_first_simple_PIXELC (&first_pix, &last_pix); + bin_image [row][col] = 0; + + rowmin = (row == 0) ? 0 : row - 1; + colmin = (col == 0) ? 0 : col - 1; + rowmax = (row == numrows - 1) ? row : row + 1; + colmax = (col == numcols - 1) ? col : col + 1; + + for (nrow = rowmin; nrow <= rowmax; nrow ++) + { + for (ncol = colmin; ncol <= colmax; ncol ++) + { + /*************************************************************/ + /* In the first case the current pixel and the neighbouring */ + /* pixel are diagonal adjacents, in the second case they are */ + /* identical, in the third case the neighbouring pixel is */ + /* a background pixel, in the fourth case it is a foreground */ + /* pixel, but already in the list. */ + /*************************************************************/ + + if ((ncol != col && nrow != row) || (ncol == col && nrow == row) || + bin_image [nrow][ncol] == 0 || bin_image [nrow][ncol] == 99) + continue; + + append_new_simple_PIXELC_list (&first_pix, &last_pix); + last_pix -> row = nrow; + last_pix -> col = ncol; + bin_image [nrow][ncol] = 99; + } + } + } + + return 0; +} + + + + + +int free_regions (simple_REGIONC_list **first_region, simple_REGIONC_list **last_region) +{ + simple_REGIONC_list *reg_curr; + simple_REGIONC_list *reg_next; + simple_INNER_REGION_list *inner_next; + simple_INNER_REGION_list *inner_curr; + + for (reg_curr = *first_region; reg_curr != NULL; reg_curr = reg_next) + { + reg_next = reg_curr -> next; + + free_simple_PIXELC_list (&(reg_curr -> first_pix), &(reg_curr -> last_pix)); + + for (inner_curr = reg_curr -> inner_first; inner_curr != NULL; inner_curr = inner_next) + { + inner_next = inner_curr -> next; + free_simple_PIXELC_list (&(inner_curr -> first_pix), &(inner_curr -> last_pix)); + free (inner_curr); + } + + free (reg_curr); + } + + return 0; +} + + + + +/***********************************************************************/ +/* Konventionen für Koordinatensystem und Richtungen: */ +/* */ +/* direction */ +/* (row, col) --> (row, col + 1) 1 */ +/* (row, col) --> (row + 1, col) 2 */ +/* (row, col) --> (row, col - 1) 3 */ +/* (row, col) --> (row - 1, col) 4 */ +/***********************************************************************/ + +static int neighbour (unsigned short row, + unsigned short col, + unsigned char curr_dir, + unsigned short *nb_row, + unsigned short *nb_col) +{ + switch (curr_dir) + { + case 1: + *nb_row = row; + *nb_col = col + 1; + break; + + case 2: + *nb_row = row + 1; + *nb_col = col; + break; + + case 3: + *nb_row = row; + *nb_col = col - 1; + break; + + case 4: + *nb_row = row - 1; + *nb_col = col; + break; + + default: + break; + } + + + return 0; +} + + + + +#define DIRECTION_RIGHT(x) (((x)==1)?4:(x)-1) +#define DIRECTION_LEFT(x) (((x)==4)?1:(x)+1) + +#if 0 +static int neighbour_right (unsigned short row, + unsigned short col, + unsigned char curr_dir, + unsigned short *nb_row, + unsigned short *nb_col) +{ + neighbour (row, col, (DIRECTION_RIGHT(curr_dir)), nb_row, nb_col); + return 0; +} +#endif + + + +static void set_contour_point (simple_PIXELC_list *currpix, + unsigned char direction, + unsigned short row, + unsigned short col) +{ + /***********************************************************************/ + /* "direction" indicates the direction of the edge between foreground */ + /* and background as well as its location. The function sets the */ + /* starting point within the pixel structure. If the coordinate of the */ + /* lower left corner of the pixel are (col, row), the start and end */ + /* points of the edges are, in particular */ + /* */ + /* direction start point end point */ + /* 1 (col, row) (col+1, row) */ + /* 2 (col+1, row) (col+1, row+1) */ + /* 3 (col+1, row+1) (col, row+1) */ + /* 4 (col, row+1) (col, row) , */ + /* */ + /* therefore: */ + /***********************************************************************/ + + switch (direction) + { + case 1: + currpix -> row = row; + currpix -> col = col; + break; + + case 2: + currpix -> row = row; + currpix -> col = col + 1; + break; + + case 3: + currpix -> row = row + 1; + currpix -> col = col + 1; + break; + + case 4: + currpix -> row = row + 1; + currpix -> col = col; + break; + + default: + break; + } + + return; +} + + + + +static int next_border_pixel_0 (unsigned short row, + unsigned short col, + unsigned char *curr_dir, + unsigned char **bin_image, + long **symb_image, + long inout, + long label, + simple_PIXELC_list **first, + simple_PIXELC_list **last, + unsigned short *next_row, + unsigned short *next_col) +{ + unsigned short nb_row; + unsigned short nb_col; + unsigned short im_row; + unsigned short im_col; + unsigned char zw_dir; + short k; + + + for (k = 0; k < 3; k ++) + { + neighbour (row, col, *curr_dir, &nb_row, &nb_col); + + if (bin_image [nb_row][nb_col] == 0) + { + /**************************************************************/ + /* Wir drehen so lange gegen den Uhrzeigersinn weiter, bis */ + /* das Nachbarpixel auch zum Vordergrund gehört. */ + /**************************************************************/ + + symb_image [nb_row][nb_col] = inout; + (*curr_dir) = DIRECTION_LEFT(*curr_dir); + + append_new_simple_PIXELC_list (first, last); + set_contour_point (*last, *curr_dir, row, col); + } + else + break; + } + + /*********************************************************************/ + /* Es muss geprüft werden, ob das rechte Nachbarpixel des neuen */ + /* Pixels auch zum Hintergrund gehört. Wenn nicht gehen wir gleich */ + /* noch eins weiter "rechts um die Ecke". */ + /*********************************************************************/ + + zw_dir = DIRECTION_RIGHT(*curr_dir); + neighbour (nb_row, nb_col, zw_dir, &im_row, &im_col); + + if (bin_image [im_row][im_col] != 0) + { + symb_image [nb_row][nb_col] = label; + + nb_row = im_row; + nb_col = im_col; + *curr_dir = zw_dir; + } + else + symb_image [im_row][im_col] = inout; + + *next_row = nb_row; + *next_col = nb_col; + symb_image [nb_row][nb_col] = label; + + append_new_simple_PIXELC_list (first, last); + set_contour_point (*last, *curr_dir, nb_row, nb_col); + + return 0; +} + + + + + +static int next_border_pixel_1 (unsigned short row, + unsigned short col, + unsigned char *curr_dir, + unsigned char **bin_image, + long **symb_image, + long inout, + long label, + simple_PIXELC_list **first, + simple_PIXELC_list **last, + unsigned short *next_row, + unsigned short *next_col) +{ + unsigned short nb_row; + unsigned short nb_col; + unsigned short im_row; + unsigned short im_col; + unsigned char zw_dir; + short k; + + + for (k = 0; k < 3; k ++) + { + neighbour (row, col, *curr_dir, &nb_row, &nb_col); + + if (bin_image [nb_row][nb_col] == 0) + { + /**************************************************************/ + /* Wir drehen so lange gegen den Uhrzeigersinn weiter, bis */ + /* das Nachbarpixel auch zum Vordergrund gehört. */ + /**************************************************************/ + + symb_image [nb_row][nb_col] = inout; + (*curr_dir) = DIRECTION_LEFT(*curr_dir); + } + else + break; + } + + /*********************************************************************/ + /* Es muss geprüft werden, ob das rechte Nachbarpixel des neuen */ + /* Pixels auch zum Hintergrund gehört. Wenn nicht gehen wir gleich */ + /* noch eins weiter "rechts um die Ecke". */ + /*********************************************************************/ + + zw_dir = DIRECTION_RIGHT(*curr_dir); + neighbour (nb_row, nb_col, zw_dir, &im_row, &im_col); + + if (bin_image [im_row][im_col] != 0) + { + symb_image [nb_row][nb_col] = label; + append_new_simple_PIXELC_list (first, last); + (*last) -> row = nb_row; + (*last) -> col = nb_col; + + nb_row = im_row; + nb_col = im_col; + *curr_dir = zw_dir; + } + else + symb_image [im_row][im_col] = inout; + + *next_row = nb_row; + *next_col = nb_col; + symb_image [nb_row][nb_col] = label; + + append_new_simple_PIXELC_list (first, last); + (*last) -> row = nb_row; + (*last) -> col = nb_col; + + return 0; +} + + + + + + + + +static int trace_contour_4 ( + unsigned short start_row, + unsigned short start_col, + unsigned char **bin_image, + long **symb_image, + long curr_reg_nr, + simple_REGIONC_list *reg_curr, + char contour_orientation, + char center) +{ + /********************************************************************/ + /* Um die Subregion herumlaufen und die Randpunkte abspeichern. */ + /* contour_orientation = 1 bedeutet, gegen den Uhrzeigersinn um die */ + /* Vordergrundregion herumlaufen, d.h. der Hintergrund liegt */ + /* rechts; es muss sich um eine äußere Randkette handeln. */ + /* contour_orientation = -1 bedeutet, mit dem Uhrzeigersinn um die */ + /* Hintergrundregion herumlaufen, d.h. der Hintergrund liegt */ + /* rechts; es muss sich um eine innere Randkette handeln. */ + /********************************************************************/ + + + /********************************************************************/ + /* "direction" bedeutet die Richtung entlang der Randkette, so dass */ + /* der Hintergrund jeweils rechts liegt. Die Richtung nach außen */ + /* ist also: */ + /* outward_direction = direction - 1 */ + /* (start_row, start_col) bezieht sich jeweils auf das Pixel das */ + /* schon / noch zum Vordergrund gehört! Vorsicht beim Aufruf! */ + /********************************************************************/ + + unsigned short row; + unsigned short col; + unsigned short nb_row; + unsigned short nb_col; + unsigned short next_row; + unsigned short next_col; + long label; + long inout; + unsigned char curr_dir; + unsigned char dir_try; + unsigned char dir_right; + unsigned char direction_start; + char k; + simple_PIXELC_list *first; + simple_PIXELC_list *last; + + + inout = 2 - contour_orientation; /* nur für die Markierung des Randes im symbolischen Bild */ + row = start_row; + col = start_col; + + last = (simple_PIXELC_list *) malloc (sizeof(simple_PIXELC_list)); + memset (last, 0x00, sizeof(simple_PIXELC_list)); + first = last; + + if (contour_orientation == 1) + { + direction_start = 4; + label = curr_reg_nr * 10 + 8; + reg_curr -> first_pix = last; + reg_curr -> last_pix = last; + symb_image [row][col-1] = inout; + } + else + { + direction_start = 2; + label = curr_reg_nr * 10 + 5; + reg_curr -> inner_last -> first_pix = last; + reg_curr -> inner_last -> last_pix = last; + symb_image [row][col+1] = inout; + } + + symb_image [row][col] = label; + + /********************************************************************/ + /* Wir drehen hier so lange zurück (im Uhrzeigersinn), bis das */ + /* Nachbarpixel in Gegenrichtung von direction_start ein */ + /* Vordergrundpixel ist. direction_start ist damit die Richtung, */ + /* bei der wir am Ende wieder herauskommen müssen. */ + /********************************************************************/ + + for (k = 0; k < 3; k ++) + { + dir_try = DIRECTION_RIGHT(direction_start); + dir_right = DIRECTION_RIGHT(dir_try); + + neighbour (row, col, dir_right, &nb_row, &nb_col); + + if (bin_image [nb_row][nb_col] == 0) + { + symb_image [nb_row][nb_col] = inout; + direction_start = dir_try; + } + else + break; + } + + last -> row = row; + last -> col = col; + + if (k == 3) + { + /*****************************************************************/ + /* Es handelt sich um ein einzelnes Vordergrundpixel */ + /*****************************************************************/ + + if (center == 0) + { + set_contour_point (last, 1, row, col); + + for (curr_dir = 2; curr_dir < 5; curr_dir ++) + { + append_new_simple_PIXELC_list (&first, &last); + set_contour_point (last, curr_dir, row, col); + } + } + + return 0; + } + + curr_dir = direction_start; + + if (center == 0) + { + set_contour_point (last, direction_start, row, col); + } + else + { + last -> row = row; + last -> col = col; + } + + do + { + if (center == 0) + { + next_border_pixel_0 (row, + col, + &curr_dir, + bin_image, + symb_image, + inout, + label, + &first, + &last, + &next_row, + &next_col); + } + else + { + next_border_pixel_1 (row, + col, + &curr_dir, + bin_image, + symb_image, + inout, + label, + &first, + &last, + &next_row, + &next_col); + } + + row = next_row; + col = next_col; + } + while (row != start_row || col != start_col || + curr_dir != direction_start); + + if (contour_orientation == 1) + reg_curr -> last_pix = last; + else + reg_curr -> inner_last -> last_pix = last; + + return 0; +} + + + + +/************************************************************************/ +/* Die folgende Funktion setzt Regionen-Labels für ein Binärbild und */ +/* extrahiert die zugehörigen Randketten. Siehe Burger, Burge (2006): */ +/* Digitale Bildverarbeitung. 2. Auflage Springer Verlag S.208. */ +/* */ +/* Voraussetzung ist, dass die Randzeilen und Randspalten des Bildes */ +/* alle aus Hintergrundpixeln bestehen! */ +/************************************************************************/ + +#define ALLOC_INC 1000 + +int comb_contour_region_marking ( + unsigned short numrows, + unsigned short numcols, + unsigned char **bin_image, + long **symb_image, + simple_REGIONC_list **reg_first, + simple_REGIONC_list **reg_last, + char center) +{ + unsigned short row; + unsigned short col; + unsigned short row_prev; + unsigned short col_prev; + int last_reg_nr; + int curr_reg_nr; + long anz_alloc; + long label; + char status; + char status_alt; + + simple_REGIONC_list *reg_new; + simple_REGIONC_list **reg_vec; + simple_REGIONC_list *reg_curr; + simple_INNER_REGION_list *new_inner_reg; + + last_reg_nr = 0; + *reg_first = NULL; + *reg_last = NULL; + + /*********************************************************************/ + /* Wir benutzen folgende Labels im symbolischen Bild: */ + /* 0 - Hintergrund */ + /* x2 - inneres Pixel einer Region */ + /* x8 - äußeres Randpixel einer Region */ + /* x5 - Randpixel eines inneren Randes einer Region */ + /* */ + /* Diese Labels dienen nur der Visualisierung. Manche Pixel können */ + /* Randpixel sowohl eines inneren Randes als auch des äußeren Randes */ + /* sein */ + /*********************************************************************/ + + anz_alloc = ALLOC_INC; + + /*********************************************************************/ + /* Der Vektor reg_vec dient dazu, eine Region als Element der */ + /* verketteten Liste simple_REGIONC_list aus der curr_reg_nr */ + /* aufzufinden. */ + /*********************************************************************/ + + reg_vec = (simple_REGIONC_list **) malloc (anz_alloc * + sizeof (simple_REGIONC_list *)); + memset (reg_vec, 0x00, anz_alloc * sizeof (simple_REGIONC_list *)); + + for (row = 1; row < numrows - 1; row ++) + { + status = 0; + status_alt = 0; + curr_reg_nr = 0; + + for (col = 1; col < numcols - 1; col ++) + { + status = bin_image [row][col]; + + if (status_alt != status) + { + if (status_alt == 0 && symb_image [row][col] == 0) + { + /*********************************************************/ + /* Fall A: Ãœbergang von einem Hintergrundpixel auf ein */ + /* bisher nicht markiertes Vordergrundpixel */ + /* Das muss ein äußerer Rand sein */ + /*********************************************************/ + + last_reg_nr ++; + curr_reg_nr = last_reg_nr; + + reg_new = (simple_REGIONC_list *) + malloc (sizeof(simple_REGIONC_list)); + memset (reg_new, 0x00, sizeof(simple_REGIONC_list)); + reg_new -> region_nr = last_reg_nr; + reg_curr = reg_new; + + append_simple_REGIONC_list (reg_first, reg_last, reg_new); + + if (last_reg_nr >= anz_alloc) + { + reg_vec = (simple_REGIONC_list **) realloc ( + reg_vec, + (anz_alloc + ALLOC_INC) * + sizeof (simple_REGIONC_list *)); + memset (((char *) reg_vec) + + anz_alloc * sizeof (simple_REGIONC_list *), + 0x00, + ALLOC_INC); + anz_alloc += ALLOC_INC; + } + + reg_vec [last_reg_nr] = reg_new; + + trace_contour_4 (row, + col, + bin_image, + symb_image, + curr_reg_nr, + reg_curr, + 1, + center); + } + else if (status_alt == 0 && symb_image [row][col] != 0) + { + /*********************************************************/ + /* Ein Randpixel, das früher mal erzeugt wurde. Das */ + /* könnte ein äußerer oder auch ein innerer Rand sein. */ + /*********************************************************/ + + label = symb_image [row][col]; + + if (label % 10 == 8) /* äußerer Rand */ + curr_reg_nr = (label - 8) / 10; + else if (label % 10 == 5) /* innerer Rand */ + curr_reg_nr = (label - 5) / 10; + + reg_curr = reg_vec [curr_reg_nr]; + } + else if (status_alt != 0 && status == 0) + { + row_prev = row; + col_prev = col - 1; + label = symb_image [row_prev][col_prev]; + + if (symb_image [row][col] == 0) + { + /******************************************************/ + /* Es ist ein Randpixel (wegen status = 0), wurde */ + /* aber bisher nicht als solches erkannt. */ + /* Das muss ein Randpixel eines inneren Randes sein, */ + /* andernfalls wäre es früher schon erfasst worden */ + /* bzw. das Hintergrundpixel wäre schon markiert. */ + /******************************************************/ + + curr_reg_nr = (label - 2) / 10; + reg_curr = reg_vec [curr_reg_nr]; + + new_inner_reg = (simple_INNER_REGION_list *) + malloc (sizeof (simple_INNER_REGION_list)); + memset (new_inner_reg, + 0x00, + sizeof (simple_INNER_REGION_list)); + + (reg_curr -> num_holes) ++; + append_simple_INNER_REGION_list ( + &(reg_curr -> inner_first), + &(reg_curr -> inner_last), + new_inner_reg); + + trace_contour_4 (row_prev, + col_prev, + bin_image, + symb_image, + curr_reg_nr, + reg_curr, + -1, + center); + } + else + { + /******************************************************/ + /* Ein Randpixel, das wir früher schon mal als */ + /* solches erfasst hatten. Da müssen wir nichts tun. */ + /******************************************************/ + + ; + } + } + + status_alt = status; + } /* Der status hatte sich geändert */ + else if (status_alt == 0) + continue; + else if (symb_image [row][col] != 0) + continue; + else + symb_image [row][col] = curr_reg_nr * 10 + 2; + } + } + + free (reg_vec); + + return 0; +} + + + + + diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_filter/geodesic_morph_rec/combcontour.h saga-2.1.4+dfsg/src/modules/grid/grid_filter/geodesic_morph_rec/combcontour.h --- saga-2.1.0+dfsg/src/modules/grid/grid_filter/geodesic_morph_rec/combcontour.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_filter/geodesic_morph_rec/combcontour.h 2014-11-13 08:32:17.000000000 +0000 @@ -0,0 +1,155 @@ +/********************************************************** + * Version $Id: combcontour.h 1936 2014-01-11 14:07:20Z reklov_w $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// Grid_Filter // +// // +//-------------------------------------------------------// +// // +// combcontour.h // +// // +// Copyright (C) 2013 by // +// HfT Stuttgart // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: johannes.engels@hft-stuttgart.de // +// // +// contact: Johannes Engels // +// Hochschule fuer Technik Stuttgart // +// Schellingstr. 24 // +// 70174 Stuttgart // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +typedef struct simple_PIXELC_list +{ + unsigned short row; + unsigned short col; + + struct simple_PIXELC_list *next; +} +simple_PIXELC_list; + + +typedef struct double_PIXELC_list +{ + unsigned short row; + unsigned short col; + + struct double_PIXELC_list *prev; + struct double_PIXELC_list *next; +} +double_PIXELC_list; + + + + +typedef struct simple_REGIONC_list +{ + struct simple_REGIONC_list *next; + long region_nr; + + struct simple_PIXELC_list *first_pix; + struct simple_PIXELC_list *last_pix; + short num_holes; + struct simple_INNER_REGION_list *inner_first; + struct simple_INNER_REGION_list *inner_last; +} +simple_REGIONC_list; + + + +typedef struct double_REGIONC_list +{ + struct double_REGIONC_list *prev; + struct double_REGIONC_list *next; + long region_nr; + + struct double_PIXELC_list *first_pix; + struct double_PIXELC_list *last_pix; + short num_holes; + struct double_INNER_REGION_list *inner_first; + struct double_INNER_REGION_list *inner_last; +} +double_REGIONC_list; + + +typedef struct simple_INNER_REGION_list +{ + struct simple_INNER_REGION_list *next; + + struct simple_PIXELC_list *first_pix; + struct simple_PIXELC_list *last_pix; +} +simple_INNER_REGION_list; + + + +typedef struct double_INNER_REGION_list +{ + struct double_INNER_REGION_list *prev; + struct double_INNER_REGION_list *next; + + struct double_PIXELC_list *first_pix; + struct double_PIXELC_list *last_pix; +} +double_INNER_REGION_list; + + +int background_region_growing (unsigned char **bin_image, + unsigned short numrows, + unsigned short numcols, + unsigned short row, + unsigned short col); + +int free_regions (simple_REGIONC_list **first_region, simple_REGIONC_list **last_region); + +int comb_contour_region_marking ( + unsigned short numrows, + unsigned short numcols, + unsigned char **bin_image, + long **symb_image, + simple_REGIONC_list **reg_first, + simple_REGIONC_list **reg_last, + char center); + + diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_filter/geodesic_morph_rec/errfunc.c saga-2.1.4+dfsg/src/modules/grid/grid_filter/geodesic_morph_rec/errfunc.c --- saga-2.1.0+dfsg/src/modules/grid/grid_filter/geodesic_morph_rec/errfunc.c 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_filter/geodesic_morph_rec/errfunc.c 2014-11-13 08:32:17.000000000 +0000 @@ -0,0 +1,773 @@ +/********************************************************** + * Version $Id: errfunc.c 2133 2014-05-29 10:13:13Z reklov_w $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// Grid_Filter / Grid_Calculus // +// // +//-------------------------------------------------------// +// // +// errfunc.c // +// // +// Copyright (C) 2013 by // +// HfT Stuttgart // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: johannes.engels@hft-stuttgart.de // +// // +// contact: Johannes Engels // +// Hochschule fuer Technik Stuttgart // +// Schellingstr. 24 // +// 70174 Stuttgart // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include +#include +#include +#include +#include + +#include "errfunc.h" + + + + + + +void fehler (int zeile, + int fnr, + char *filename, + char *funk_name, + FILE *protfile, + fehlerinfo *finf, + void *info1, + void *info2, + void *info3, + void *info4, + void *info5, + void *info6, + void *info7) + +/************************************************/ +/* Ausgabe von Laufzeitfehlern, */ +/* ggf. Programmabbruch */ +/************************************************/ + +{ + int j; + int gefunden; + int sl; + + char fmessage [255]; + char *cp1; + char *cp2; + char *cp3; + char *cp4; + fehlerinfo *fil; + + void *info [8]; + + + info [1] = info1; + info [2] = info2; + info [3] = info3; + info [4] = info4; + info [5] = info5; + info [6] = info6; + info [7] = info7; + + fprintf (protfile, "\n\n"); + + gefunden = 0; + + for (fil = finf; fil != NULL && fil -> fnr != 0; fil ++) + { + if (fnr == fil -> fnr) + { + gefunden = 1; + break; + } + } + + if (gefunden == 0) + { + fprintf (protfile, "+++ Unbekannter Fehler\n"); + fflush (protfile); + fprintf (protfile, " Abbruch des Programms.\n\n"); + exit (20); + } + + if (fil -> art == 'W') + fprintf (protfile, + "+++ Warnung in Funktion %s,\n" + " Datei %s,\n" + " Zeile %d:\n", + funk_name, + filename, + zeile); + else if (fil -> art == 'F' || fil -> art == 'E') + fprintf (protfile, + "+++ Fehler in Funktion %s,\n" + " Datei %s,\n" + " Zeile %d:\n", + funk_name, + filename, + zeile); + + for (cp1 = fil -> message, j = 1, cp4 = cp1; + j <= 7 && info [j] != NULL; j ++) + { + cp2 = strchr (cp4, '%'); + + if (cp2 == NULL) + break; + + if (*(cp2 + 1) == '%') + { + cp4 = cp2 + 2; + j --; + continue; + } + + + gefunden = 0; + + cp3 = strpbrk (cp2 + 1, "csdlhfe"); + + if (cp3 == NULL) + { + fprintf (protfile, " Fehler in errfunc.c: "); + fprintf (protfile, "unzulaessige Formatangabe\n"); + break; + } + + if (*(cp3 + 1) != 0x00 && *(cp3 + 1) != '%') + cp2 = cp3 + 2; + else + cp2 = cp3 + 1; + + sl = cp2 - cp1; + + memcpy (fmessage, cp1, sl); + fmessage [sl] = 0x00; + + switch (*cp3) + { + case 'd': + fprintf (protfile, fmessage, *((int *)(info [j]))); + break; + + case 'l': + fprintf (protfile, fmessage, *((long *)(info [j]))); + break; + + case 'h': + fprintf (protfile, fmessage, *((short *)(info [j]))); + break; + + case 'e': + case 'f': + fprintf (protfile, fmessage, *((double *)(info [j]))); + break; + + case 'c': + fprintf (protfile, fmessage, *((char *)(info [j]))); + break; + + case 's': + fprintf (protfile, fmessage, (char *)(info [j])); + break; + + default: + break; + } + + cp1 = cp2; + cp4 = cp2; + } + + fprintf (protfile, "%s", cp1); + + if (fil -> art == 'E') + { + fprintf (protfile, " Abbruch des Programms.\n\n"); + exit (20); + } + + fflush (protfile); + + return; +} + + + + + + +void error_message (int zeile, + int fnr, + char *filename, + char *funk_name, + char **error_list, + fehlerinfo *finf, + void *info1, + void *info2, + void *info3, + void *info4, + void *info5, + void *info6, + void *info7) + +/************************************************/ +/* Ausgabe von Laufzeitfehlern, */ +/* ggf. Programmabbruch */ +/************************************************/ + +{ + int j; + int gefunden; + int sl; + int sl_head; + int sl_all; + int sl_alt; + fehlerinfo *fil; + + char fmessage [512]; + char zw [255]; + char *cp1; + char *cp2; + char *cp3; + char *cp4; + + void *info [8]; + + + info [1] = info1; + info [2] = info2; + info [3] = info3; + info [4] = info4; + info [5] = info5; + info [6] = info6; + info [7] = info7; + + gefunden = 0; + + for (fil = finf; fil != NULL && fil -> fnr != 0; fil ++) + { + if (fnr == fil -> fnr) + { + gefunden = 1; + break; + } + } + + if (gefunden == 0) + { + sprintf (fmessage, "\n" + "+++ Unbekannter Fehler\n" + " Abbruch des Programms.\n\n"); + sl_all = strlen (fmessage); + + sl_alt = strlen (*error_list); + *error_list = realloc (*error_list, + (sl_alt + sl_all + 1) * sizeof (char)); + memcpy (*error_list + sl_alt, fmessage, sl_all); + *(*error_list + sl_alt + sl_all) = 0x00; + + return; + } + + + if (fil -> art == 'W') + sprintf (fmessage, "\n" + "+++ Warnung in Funktion %s,\n" + " Datei %s,\n" + " Zeile %d:\n", + funk_name, + filename, + zeile); + else if (fil -> art == 'F' || fil -> art == 'E') + sprintf (fmessage, "\n" + "+++ Fehler in Funktion %s,\n" + " Datei %s,\n" + " Zeile %d:\n", + funk_name, + filename, + zeile); + + + sl_head = strlen (fmessage); + memset (fmessage + sl_head, ' ', 4); + sl_head += 4; + sl_all = sl_head; + + for (cp1 = fil -> message, j = 1, cp4 = cp1; + j <= 7 && info [j] != NULL; + j ++) + { + cp2 = strchr (cp4, '%'); + + if (cp2 == NULL) + break; + + if (*(cp2 + 1) == '%') + { + cp4 = cp2 + 2; + j --; + continue; + } + + + gefunden = 0; + + cp3 = strpbrk (cp2 + 1, "csdlhfe"); + + if (cp3 == NULL) + { + sprintf (fmessage + sl_all, " Fehler in errfunc.c: " + "unzulaessige Formatangabe\n"); + break; + } + + if (*(cp3 + 1) != 0x00 && *(cp3 + 1) != '%') + cp2 = cp3 + 2; + else + cp2 = cp3 + 1; + + sl = cp2 - cp1; + + memcpy (zw, cp1, sl); + zw [sl] = 0x00; + + switch (*cp3) + { + case 'd': + sprintf (fmessage + sl_all, zw, *((int *)(info [j]))); + break; + + case 'l': + sprintf (fmessage + sl_all, zw, *((long *)(info [j]))); + break; + + case 'h': + sprintf (fmessage + sl_all, zw, *((short *)(info [j]))); + break; + + case 'e': + case 'f': + sprintf (fmessage + sl_all, zw, *((double *)(info [j]))); + break; + + case 'c': + sprintf (fmessage + sl_all, zw, *((char *)(info [j]))); + break; + + case 's': + sprintf (fmessage + sl_all, zw, (char *)(info [j])); + break; + + default: + break; + } + + sl_all = strlen (fmessage); + + cp1 = cp2; + cp4 = cp2; + } + + sprintf (fmessage + sl_all, "%s", cp1); + sl_all = strlen (fmessage); + + sl_alt = strlen (*error_list); + *error_list = realloc (*error_list, + (sl_alt + sl_all + 1) * sizeof (char)); + memcpy (*error_list + sl_alt, fmessage, sl_all); + *(*error_list + sl_alt + sl_all) = 0x00; + + return; +} + + + + + +void fehler2 (int zeile, + int fnr, + char *filename, + char *funk_name, + FILE *protfile, + fehlerinfo *finf, + ...) + +/************************************************/ +/* Ausgabe von Laufzeitfehlern, */ +/* ggf. Programmabbruch */ +/************************************************/ + +{ + int j; + int gefunden; + int sl; + + char fmessage [255]; + char *cp1; + char *cp2; + char *cp3; + char *cp4; + fehlerinfo *fil; + va_list ap; + + int vint; + double vdouble; + long vlong; + char *pchar; + + fprintf (protfile, "\n\n"); + + gefunden = 0; + + for (fil = finf; fil != NULL && fil -> fnr != 0; fil ++) + { + if (fnr == fil -> fnr) + { + gefunden = 1; + break; + } + } + + if (gefunden == 0) + { + fprintf (protfile, "+++ Unbekannter Fehler\n"); + fprintf (protfile, " Abbruch des Programms.\n\n"); + exit (20); + } + + if (fil -> art == 'W') + fprintf (protfile, + "+++ Warnung in Funktion %s,\n" + " Datei %s,\n" + " Zeile %d:\n", + funk_name, + filename, + zeile); + else if (fil -> art == 'F' || fil -> art == 'E') + fprintf (protfile, + "+++ Fehler in Funktion %s,\n" + " Datei %s,\n" + " Zeile %d:\n", + funk_name, + filename, + zeile); + + + va_start(ap,finf); + + for (cp1 = fil -> message, j = 1, cp4 = cp1; + j <= 7; j ++) + { + cp2 = strchr (cp4, '%'); + + if (cp2 == NULL) + break; + + if (*(cp2 + 1) == '%') + { + cp4 = cp2 + 2; + j --; + continue; + } + + + gefunden = 0; + + cp3 = strpbrk (cp2 + 1, "sdlfe"); + + if (cp3 == NULL) + { + fprintf (protfile, " Fehler in errfunc.c: "); + fprintf (protfile, "unzulaessige Formatangabe\n"); + break; + } + + if (*(cp3 + 1) != 0x00 && *(cp3 + 1) != '%') + cp2 = cp3 + 2; + else + cp2 = cp3 + 1; + + sl = cp2 - cp1; + + memcpy (fmessage, cp1, sl); + fmessage [sl] = 0x00; + + switch (*cp3) + { + /*****************************************************/ + /* shorts und chars darf es hier aus Syntaxgründen */ + /* nicht geben (!?!) */ + /*****************************************************/ + + case 'd': + vint = va_arg(ap,int); + fprintf (protfile, fmessage, vint); + break; + + case 'l': + vlong = va_arg(ap,long); + fprintf (protfile, fmessage, vlong); + break; + + case 'e': + case 'f': + vdouble = va_arg(ap,double); + fprintf (protfile, fmessage, vdouble); + break; + + case 's': + pchar = va_arg(ap,char *); + fprintf (protfile, fmessage, pchar); + break; + + default: + break; + } + + cp1 = cp2; + cp4 = cp2; + } + + va_end (ap); + + fprintf (protfile, "%s", cp1); + + if (fil -> art == 'E') + { + fprintf (protfile, " Abbruch des Programms.\n\n"); + exit (20); + } + + return; +} + + + + +void fehler3 (int zeile, + int fnr, + char *filename, + char *funk_name, + char **error_list, + fehlerinfo *finf, + ...) + +/************************************************/ +/* Ausgabe von Laufzeitfehlern, */ +/* ggf. Programmabbruch */ +/************************************************/ + +{ + int j; + int gefunden; + int sl; + int sl_all; + int sl_alt; + int sl_head; + + char fmessage [512]; + char zw [255]; + char *cp1; + char *cp2; + char *cp3; + char *cp4; + fehlerinfo *fil; + va_list ap; + + int vint; + double vdouble; + long vlong; + char *pchar; + + gefunden = 0; + + for (fil = finf; fil != NULL && fil -> fnr != 0; fil ++) + { + if (fnr == fil -> fnr) + { + gefunden = 1; + break; + } + } + + + if (gefunden == 0) + { + sprintf (fmessage, "\n+++ Unbekannter Fehler\n" + " Abbruch des Programms.\n\n"); + sl_all = strlen (fmessage); + + sl_alt = strlen (*error_list); + *error_list = realloc (*error_list, + (sl_alt + sl_all + 1) * sizeof (char)); + memcpy (*error_list + sl_alt, fmessage, sl_all); + *(*error_list + sl_alt + sl_all) = 0x00; + + return; + } + + + if (fil -> art == 'W') + sprintf (fmessage, "\n" + "+++ Warnung in Funktion %s,\n" + " Datei %s,\n" + " Zeile %d:\n", + funk_name, + filename, + zeile); + else if (fil -> art == 'F' || fil -> art == 'E') + sprintf (fmessage, "\n" + "+++ Fehler in Funktion %s,\n" + " Datei %s,\n" + " Zeile %d:\n", + funk_name, + filename, + zeile); + + + sl_head = strlen (fmessage); + memset (fmessage + sl_head, ' ', 4); + sl_head += 4; + sl_all = sl_head; + + va_start (ap, finf); + + for (cp1 = fil -> message, j = 1, cp4 = cp1; + j <= 7; j ++) + { + cp2 = strchr (cp4, '%'); + + if (cp2 == NULL) + break; + + if (*(cp2 + 1) == '%') + { + cp4 = cp2 + 2; + j --; + continue; + } + + + gefunden = 0; + + cp3 = strpbrk (cp2 + 1, "sdlfe"); + + if (cp3 == NULL) + { + sprintf (fmessage + sl_all, " Fehler in errfunc.c: " + "unzulaessige Formatangabe\n"); + break; + } + + if (*(cp3 + 1) != 0x00 && *(cp3 + 1) != '%') + cp2 = cp3 + 2; + else + cp2 = cp3 + 1; + + sl = cp2 - cp1; + + memcpy (zw, cp1, sl); + zw [sl] = 0x00; + + switch (*cp3) + { + /*****************************************************/ + /* shorts und chars darf es hier aus Syntaxgruenden */ + /* nicht geben (!?!) */ + /*****************************************************/ + + case 'd': + vint = va_arg (ap, int); + sprintf (fmessage + sl_all, zw, vint); + break; + + case 'l': + vlong = va_arg (ap, long); + sprintf (fmessage + sl_all, zw, vlong); + break; + + case 'e': + case 'f': + vdouble = va_arg (ap, double); + sprintf (fmessage + sl_all, zw, vdouble); + break; + + case 's': + pchar = va_arg (ap, char *); + sprintf (fmessage + sl_all, zw, pchar); + break; + + default: + break; + } + + sl_all = strlen (fmessage); + + cp1 = cp2; + cp4 = cp2; + } + + va_end (ap); + + sprintf (fmessage + sl_all, "%s", cp1); + sl_all = strlen (fmessage); + + sl_alt = strlen (*error_list); + *error_list = realloc (*error_list, + (sl_alt + sl_all + 1) * sizeof (char)); + memcpy (*error_list + sl_alt, fmessage, sl_all); + *(*error_list + sl_alt + sl_all) = 0x00; + + return; +} + + + + diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_filter/geodesic_morph_rec/errfunc.h saga-2.1.4+dfsg/src/modules/grid/grid_filter/geodesic_morph_rec/errfunc.h --- saga-2.1.0+dfsg/src/modules/grid/grid_filter/geodesic_morph_rec/errfunc.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_filter/geodesic_morph_rec/errfunc.h 2014-11-13 08:32:17.000000000 +0000 @@ -0,0 +1,211 @@ +/********************************************************** + * Version $Id: errfunc.h 1937 2014-01-11 18:22:42Z reklov_w $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// Grid_Filter / Grid_Calculus // +// // +//-------------------------------------------------------// +// // +// errfunc.h // +// // +// Copyright (C) 2013 by // +// HfT Stuttgart // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: johannes.engels@hft-stuttgart.de // +// // +// contact: Johannes Engels // +// Hochschule fuer Technik Stuttgart // +// Schellingstr. 24 // +// 70174 Stuttgart // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +typedef struct fehlerinfo +{ + int fnr; + char art; + char *message; +} +fehlerinfo; + +void fehler (int zeile, + int fnr, + char *filename, + char *funk_name, + FILE *protfile, + fehlerinfo *finf, + void *info1, + void *info2, + void *info3, + void *info4, + void *info5, + void *info6, + void *info7); + + +void error_message (int zeile, + int fnr, + char *filename, + char *funk_name, + char **error_list, + fehlerinfo *finf, + void *info1, + void *info2, + void *info3, + void *info4, + void *info5, + void *info6, + void *info7); + +void fehler2 (int zeile, + int fnr, + char *filename, + char *funk_name, + FILE *protfile, + fehlerinfo *finf, + ...); + +void fehler3 (int zeile, + int fnr, + char *filename, + char *funk_name, + char **error_list, + fehlerinfo *finf, + ...); + + +#define ERR_MESS_0(fnr) error_message (__LINE__, (fnr), __FILE__, \ + funk_name, &error_liste, \ + finfo, NULL, NULL, NULL, \ + NULL, NULL, NULL, \ + NULL) + +#define ERR_MESS_1(fnr,y) error_message (__LINE__, (fnr), __FILE__, \ + funk_name, &error_liste, \ + finfo, (y), NULL, NULL, \ + NULL, NULL, NULL, \ + NULL) + + +#define ERRCHECK2_RC(fnr,finfo,x1,x2) \ + \ +if (rc != 0) \ +{ \ + error_message (__LINE__,(fnr),__FILE__,funk_name,error_liste, \ + finfo,x1,x2,NULL,NULL,NULL,NULL,NULL); \ + return 8; \ +} + +#define ERRCHECK2_NULL(y,fnr,finfo,x1,x2) \ + \ +if (y == NULL) \ +{ \ + error_message (__LINE__,(fnr),__FILE__,funk_name,error_liste, \ + finfo,x1,x2,NULL,NULL,NULL,NULL,NULL); \ +} + +#define ERRCHECK2_RC_R(fnr,finfo,x1,x2) \ + \ +if (rc != 0) \ +{ \ + error_message (__LINE__,(fnr),__FILE__,funk_name,error_liste, \ + finfo,x1,x2,NULL,NULL,NULL,NULL,NULL); \ + return rc; \ +} + + +#define ERRCHECK2_NULL_R(y,fnr,finfo,x1,x2) \ + \ +if (y == NULL) \ +{ \ + error_message (__LINE__,(fnr),__FILE__,funk_name,error_liste, \ + finfo,x1,x2,NULL,NULL,NULL,NULL,NULL); \ + return; \ +} + + +#if 0 + +#define ERRCHECK7_RC(fnr,finfo,x1,x2,x3,x4,x5,x6,x7) \ + \ +if (rc != 0) \ +{ \ + fehler2 (__LINE__,(fnr),__FILE__,funk_name,stdout,finfo, \ + x1,x2,x3,x4,x5,x6,x7); \ +} + + + +#define ERRCHECK7_NULL(y,fnr,finfo,x1,x2,x3,x4,x5,x6,x7) \ + \ +if (y == NULL) \ +{ \ + fehler2 (__LINE__,(fnr),__FILE__,funk_name,stdout,finfo, \ + x1,x2,x3,x4,x5,x6,x7); \ +} + + +#define ERRCHECK7_RC_R(fnr,finfo,x1,x2,x3,x4,x5,x6,x7) \ + \ +if (rc != 0) \ +{ \ + fehler2 (__LINE__,(fnr),__FILE__,funk_name,stdout,finfo, \ + x1,x2,x3,x4,x5,x6,x7); \ + return rc; \ +} + + +#define ERRCHECK7_NULL_R(y,fnr,finfo,x1,x2,x3,x4,x5,x6,x7) \ + \ +if (y == NULL) \ +{ \ + fehler2 (__LINE__,(fnr),__FILE__,funk_name,stdout,finfo, \ + x1,x2,x3,x4,x5,x6,x7); \ + return; \ +} + + +#endif + + + diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_filter/geodesic_morph_rec/geovinc.c saga-2.1.4+dfsg/src/modules/grid/grid_filter/geodesic_morph_rec/geovinc.c --- saga-2.1.0+dfsg/src/modules/grid/grid_filter/geodesic_morph_rec/geovinc.c 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_filter/geodesic_morph_rec/geovinc.c 2014-11-13 08:32:17.000000000 +0000 @@ -0,0 +1,609 @@ +/********************************************************** + * Version $Id: geovinc.c 1936 2014-01-11 14:07:20Z reklov_w $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// Grid_Filter // +// // +//-------------------------------------------------------// +// // +// geovinc.c // +// // +// Copyright (C) 2013 by // +// HfT Stuttgart // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: johannes.engels@hft-stuttgart.de // +// // +// contact: Johannes Engels // +// Hochschule fuer Technik Stuttgart // +// Schellingstr. 24 // +// 70174 Stuttgart // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include +#include +#include +#include +#include +#include +#include "storeorg.h" +#include "geovinc.h" + + +/************************************************************************/ +/* Funktioniert mit listfuncs.in2 */ +/************************************************************************/ + +#define LISTELEMENT PIXEL +#include "listfuncs.inc" +#undef LISTELEMENT + +#define LISTELEMENT REGION +#include "listfuncs.inc" +#undef LISTELEMENT + + +static int comp_PIXEL (simple_PIXEL_list *curr, + simple_PIXEL_list *_new, + void *add1, + void *dummy) +{ + /*********************************************************************/ + /* 1 -- der Grauwert von curr ist groesser */ + /* 0 -- beide Grauwerte sind gleich gross */ + /* -1 -- der Grauwert von new ist groesser */ + /*********************************************************************/ + + unsigned short row; + unsigned short col; + unsigned short nrow; + unsigned short ncol; + double **greyvalues; + + greyvalues = (double **) add1; + + row = curr -> row; + col = curr -> col; + + nrow = _new -> row; + ncol = _new -> col; + + if (greyvalues [row][col] > greyvalues [nrow][ncol]) + return 1; + else if (greyvalues [row][col] == greyvalues [nrow][ncol]) + return 0; + else + return -1; +} + + + + +static int new_pixel_in_region (simple_REGION_list *maxreg, + unsigned short row, + unsigned short col) +{ + simple_PIXEL_list *_new; + + _new = (simple_PIXEL_list *) malloc (sizeof (simple_PIXEL_list)); + memset (_new, 0x00, sizeof (simple_PIXEL_list)); + + _new -> row = row; + _new -> col = col; + + append_simple_PIXEL_list (&(maxreg -> first), + &(maxreg -> last), + _new); + return 0; +} + + + +static int new_region_in_region_list (simple_REGION_list **first, + simple_REGION_list **last) +{ + simple_REGION_list *_new; + + _new = (simple_REGION_list *) malloc (sizeof (simple_REGION_list)); + memset (_new, 0x00, sizeof (simple_REGION_list)); + + append_simple_REGION_list (first, last, _new); + + return 0; +} + + +static int free_pixlist_of_region (simple_REGION_list *mr) +{ + free_simple_PIXEL_list (&(mr -> first), &(mr -> last)); + + return 0; +} + + + +static int free_last_region (simple_REGION_list **mr_first, + simple_REGION_list **mr_last, + simple_REGION_list *last_but_one) +{ + /*******************************************************************/ + /* Hier wird vorausgesetzt, dass die Liste mindestens zwei */ + /* Regionen beinhaltet */ + /*******************************************************************/ + + free_pixlist_of_region (*mr_last); + return delete_last_simple_REGION (mr_first, mr_last, last_but_one); +} + + +static int flat_region_list (simple_REGION_list **mr_first, + simple_REGION_list **mr_last, + simple_PIXEL_list **flat_pixels_first, + simple_PIXEL_list **flat_pixels_last, + double **marker) +{ + simple_REGION_list *curr_reg; + simple_PIXEL_list *_new; + + unsigned short row; + unsigned short col; + + /*********************************************************************/ + /* Hier wird vorausgesetzt, dass es mindestens eine Region gibt */ + /* Wir nehmen von jeder Maximalregion nur ein Pixel. */ + /*********************************************************************/ + + for (curr_reg = *mr_first; curr_reg != NULL; curr_reg = curr_reg -> next) + { + row = curr_reg -> first -> row; + col = curr_reg -> first -> col; + + _new = (simple_PIXEL_list *) malloc (sizeof (simple_PIXEL_list)); + memset (_new, 0x00, sizeof (simple_PIXEL_list)); + + _new -> row = row; + _new -> col = col; + _new -> greyvalue = marker [row][col]; + + append_simple_PIXEL_list (flat_pixels_first, flat_pixels_last, _new); + + free_pixlist_of_region (curr_reg); + } + + free_simple_REGION_list (mr_first, mr_last); + + return 0; +} + + +static int single_check_neighbours (unsigned short numrows, + unsigned short numcols, + unsigned short row, + unsigned short col, + double **greyvalues, + short *maxflag, + short *ind_plateau) +{ + /*******************************************************************/ + /* Hier wird geprueft, ob Pixel (row, col) zu einem regionalen */ + /* Maximum gehoeren koennte. */ + /* maxflag = 1: Grauwert im Pixel groesser oder gleich wie die */ + /* Grauwerte aller Nachbarn */ + /* maxflag = -1: Grauwert im Pixel kleiner als in mindestens einem */ + /* Nachbarn */ + /* */ + /* maxflag sollte von der aufrufenden Funktion mit 1 initialisiert */ + /* sein! */ + /* */ + /* ind_plateau = 1: Es existiert mindestens ein Nachbar mit */ + /* demselben Grauwert */ + /* */ + /* ind_plateau muss von der aufrufenden Funktion mit 0 */ + /* initialisiert sein! */ + /*******************************************************************/ + + unsigned short nrow; + unsigned short ncol; + unsigned short rowmin; + unsigned short colmin; + unsigned short rowmax; + unsigned short colmax; + + + /*******************************************************************/ + /* Hier wird vorerst nur die 4-er Nachbarschaft betrachtet. */ + /*******************************************************************/ + + rowmin = (row == 0) ? 0 : row - 1; + colmin = (col == 0) ? 0 : col - 1; + rowmax = (row == numrows - 1) ? row : row + 1; + colmax = (col == numcols - 1) ? col : col + 1; + + /*******************************************************************/ + /* Hier wird nur geprueft, es wird keine Liste der Pixel des */ + /* eventuellen Maximums angelegt. */ + /*******************************************************************/ + + for (nrow = rowmin; nrow <= rowmax; nrow ++) + { + //#pragma omp parallel for + for (ncol = colmin; ncol <= colmax; ncol ++) + { + /*************************************************************/ + /* Im ersten Fall liegen das aktuelle und das Nachbar-Pixel */ + /* diagonal (8-Nachbarschaft), im zweiten sind sie identisch */ + /*************************************************************/ + + if ((ncol != col && nrow != row) || (ncol == col && nrow == row)) + continue; + + if (greyvalues [row][col] < greyvalues [nrow][ncol]) + *maxflag = -1; + else if (greyvalues [nrow][ncol] == greyvalues [row][col]) + *ind_plateau = 1; + } + } + + return 0; +} + + +static int check_plateau (unsigned short numrows, + unsigned short numcols, + double **greyvalues, + unsigned char **vis, + simple_REGION_list *mr, + simple_PIXEL_list *currpix, + short *maxflag) +{ + /*******************************************************************/ + /* Hier wird eine Pixelliste eines Plateaus angelegt, also einer */ + /* zusammenhaengenden Region von Pixeln, die alle denselben */ + /* Grauwert besitzen. Gleichzeitig wird festgestellt ob es sich */ + /* bei dieser Region um ein regionales Maximum handelt. */ + /* Sobald ein Nachbarpixel des Plateaus angetroffen wird, dessen */ + /* Grauwert den des Plateaus uebertrifft, ist klar, dass es sich */ + /* bei dem Plateau nicht um ein regionales Maximum handeln kann. */ + /* Das Plateau wird trotzdem weiter abgearbeitet, damit alle Pixel */ + /* des Plateaus als besucht gekennzeichnet werden koennen. Erst */ + /* danach wird die Liste bzw. Region wieder aufgeloest. */ + /*******************************************************************/ + + unsigned short row; + unsigned short col; + unsigned short nrow; + unsigned short ncol; + unsigned short rowmin; + unsigned short colmin; + unsigned short rowmax; + unsigned short colmax; + + + row = currpix -> row; + col = currpix -> col; + + /*******************************************************************/ + /* Hier wird vorerst nur die 4-er Nachbarschaft betrachtet. */ + /*******************************************************************/ + + rowmin = (row == 0) ? 0 : row - 1; + colmin = (col == 0) ? 0 : col - 1; + rowmax = (row == numrows - 1) ? row : row + 1; + colmax = (col == numcols - 1) ? col : col + 1; + + + for (nrow = rowmin; nrow <= rowmax; nrow ++) + { + //#pragma omp parallel for + for (ncol = colmin; ncol <= colmax; ncol ++) + { + /*************************************************************/ + /* Im ersten Fall liegen das aktuelle und das Nachbar-Pixel */ + /* diagonal (8-Nachbarschaft), im zweiten sind sie identisch */ + /*************************************************************/ + + if ((ncol != col && nrow != row) || (ncol == col && nrow == row)) + continue; + + /*************************************************************/ + /* Wir machen hier weiter, auch wenn das Nachbarpixel schon */ + /* mal besucht wurde, da sonst eventuell maxflag nicht */ + /* richtig gesetzt wird. */ + /*************************************************************/ + + if (greyvalues [nrow][ncol] == greyvalues [row][col]) + { + if (vis [nrow][ncol] == 0) + { + new_pixel_in_region (mr, nrow, ncol); + + + /*******************************************************/ + /* In die Liste gestellt ist hier so gut wie schon */ + /* besucht. Das Pixel wird markiert, damit es nicht */ + /* nochmal in die Liste reinkommt */ + /*******************************************************/ + + vis [nrow][ncol] = 1; + } + } + else if (greyvalues [nrow][ncol] > greyvalues [row][col]) + { + /**********************************************************/ + /* Dieser Nachbarpunkt gehoert nicht zum Plateau, wird */ + /* also nicht an die Liste angehaengt. Dennoch gibt es */ + /* hier kein break. Falls ein Plateau gefunden wurde, */ + /* wird es immer als Ganzes bearbeitet, auch wenn schon */ + /* klar ist, dass es sich nicht um ein Maximum handelt! */ + /**********************************************************/ + + *maxflag = -1; + } + else + { + ; + + /**********************************************************/ + /* Da passiert gar nichts. */ + /**********************************************************/ + } + } + } + + return 0; +} + + +static int find_regional_maxima (unsigned short numrows, + unsigned short numcols, + simple_REGION_list **mr_first, + simple_REGION_list **mr_last, + short *num_regions, + double **greyvalues) +{ + /*******************************************************************/ + /* Es werden Listen von regionalen Maxima erzeugt */ + /*******************************************************************/ + + unsigned short row; + unsigned short col; + short maxflag; + short ind_plateau; + simple_PIXEL_list *currpix; + simple_REGION_list *last_but_one = NULL; + + unsigned char **vis; + + + vis = (unsigned char **) matrix_all_alloc (numrows, numcols, 'U', 0); + + new_region_in_region_list (mr_first, mr_last); + + *num_regions = 0; + + + for (row = 0; row < numrows; row ++) + { + //#pragma omp parallel for + for (col = 0; col < numcols; col ++) + { + if (vis [row][col] != 0) + continue; + + maxflag = 1; + ind_plateau = 0; + + single_check_neighbours (numrows, numcols, row, col, greyvalues, &maxflag, &ind_plateau); + + /*************************************************************/ + /* Das aktuelle Pixel der Schleife wird hier als besucht */ + /* markiert, auch wenn es das erste Pixel eines Plateaus */ + /* ist (die uebrigen Pixel des Plateaus werden dann in */ + /* check_plateau_us markiert). */ + /*************************************************************/ + + vis [row][col] = 1; + + if (ind_plateau == 0) + { + /**********************************************************/ + /* Kein Nachbarpixel hat denselben Grauwert wie das */ + /* aktuelle Pixel */ + /**********************************************************/ + + if (maxflag == 1) + { + /*******************************************************/ + /* Ein Maximum, bestehend aus einem einzigen Pixel */ + /*******************************************************/ + + last_but_one = *mr_last; + new_pixel_in_region (*mr_last, row, col); + (*num_regions) ++; + new_region_in_region_list (mr_first, mr_last); + } + else + { + ; + + /*******************************************************/ + /* Kein Maximum, da tun wir gar nichts */ + /*******************************************************/ + } + + continue; + } + + + /*************************************************************/ + /* Es ist ein Plateau */ + /*************************************************************/ + + new_pixel_in_region (*mr_last, row, col); + //#pragma omp parallel for + for (currpix = (*mr_last) -> first; currpix != NULL; currpix = currpix -> next) + { + check_plateau (numrows, numcols, greyvalues, vis, *mr_last, currpix, &maxflag); + } + + if (maxflag == -1) + free_pixlist_of_region (*mr_last); + else + { + /**********************************************************/ + /* Ein neues Maximum-Plateau */ + /**********************************************************/ + last_but_one = *mr_last; + new_region_in_region_list (mr_first, mr_last); + + (*num_regions) ++; + } + } + } + + free_last_region (mr_first, mr_last, last_but_one); + matrix_all_free ((void **) vis); + + return 0; +} + + + + +#define MINIMUM(a,b) ((a)<(b))?a:b + + +int geodesic_morphological_reconstruction ( + unsigned short numrows, + unsigned short numcols, + double **mask, + double **marker) +{ + int k; + + simple_REGION_list *mr_first = NULL; + simple_REGION_list *mr_last = NULL; + + simple_PIXEL_list *first_pix = NULL; + simple_PIXEL_list *last_pix = NULL; + simple_PIXEL_list *curr_pix; + simple_PIXEL_list *_new; + + short num_regions; + + unsigned short rowmin; + unsigned short colmin; + unsigned short rowmax; + unsigned short colmax; + unsigned short row; + unsigned short col; + unsigned short nrow; + unsigned short ncol; + + find_regional_maxima (numrows, numcols, &mr_first, &mr_last, &num_regions, marker); + + /*********************************************************************/ + /* Hier wird jetzt die Regionen-Liste geplaettet, d.h. in eine Liste */ + /* von Pixeln ueberfuehrt. Diese Liste wird schon nach Grauwerten */ + /* sortiert. */ + /*********************************************************************/ + + flat_region_list (&mr_first, &mr_last, &first_pix, &last_pix, marker); + + memset (*marker, 0x00, numrows * numcols * sizeof (double)); + + for (curr_pix = first_pix; curr_pix != NULL; curr_pix = curr_pix -> next) + { + row = curr_pix -> row; + col = curr_pix -> col; + marker [row][col] = curr_pix -> greyvalue; + } + + /*********************************************************************/ + /* Hier kommt jetzt die alles entscheidende Schleife, in der die */ + /* Dilatation vorgenommen wird. Das vorderste Element der Pixelliste */ + /* wird herausgenommen; seine Nachbarn werden in die Pixelliste */ + /* einsortiert, falls ihr Grauwert geaendert werden kann. */ + /*********************************************************************/ + + for (curr_pix = first_pix, k = 1; curr_pix != NULL; curr_pix = first_pix, k ++) + { + row = curr_pix -> row; + col = curr_pix -> col; + delete_first_simple_PIXEL (&first_pix, &last_pix); + + /****************************************************************/ + /* Hier wird vorerst nur die 4-er Nachbarschaft betrachtet. */ + /****************************************************************/ + + rowmin = (row == 0) ? 0 : row - 1; + colmin = (col == 0) ? 0 : col - 1; + rowmax = (row == numrows - 1) ? row : row + 1; + colmax = (col == numcols - 1) ? col : col + 1; + for (nrow = rowmin; nrow <= rowmax; nrow ++) + { + for (ncol = colmin; ncol <= colmax; ncol ++) + { + /*************************************************************/ + /* Im ersten Fall liegen das aktuelle und das Nachbar-Pixel */ + /* diagonal (8-Nachbarschaft), im zweiten sind sie identisch */ + /*************************************************************/ + if ((ncol != col && nrow != row) || (ncol == col && nrow == row)) + continue; + if (marker [nrow][ncol] >= marker [row][col] || marker [nrow][ncol] == mask [nrow][ncol]) + continue; + + marker [nrow][ncol] = MINIMUM((marker[row][col]),(mask[nrow][ncol])); + _new = (simple_PIXEL_list *) malloc (sizeof(simple_PIXEL_list)); + memset (_new, 0x00, sizeof(simple_PIXEL_list)); + _new -> row = nrow; + _new -> col = ncol; + append_simple_PIXEL_list (&first_pix, &last_pix, _new); + } + } + } + + return 0; +} + + diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_filter/geodesic_morph_rec/geovinc.h saga-2.1.4+dfsg/src/modules/grid/grid_filter/geodesic_morph_rec/geovinc.h --- saga-2.1.0+dfsg/src/modules/grid/grid_filter/geodesic_morph_rec/geovinc.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_filter/geodesic_morph_rec/geovinc.h 2014-11-13 08:32:17.000000000 +0000 @@ -0,0 +1,54 @@ + +typedef struct simple_PIXEL_list +{ + unsigned short row; + unsigned short col; + double greyvalue; + + struct simple_PIXEL_list *next; +} +simple_PIXEL_list; + + +typedef struct double_PIXEL_list +{ + unsigned short row; + unsigned short col; + double greyvalue; + + struct double_PIXEL_list *prev; + struct double_PIXEL_list *next; +} +double_PIXEL_list; + + + + +typedef struct simple_REGION_list +{ + struct simple_REGION_list *next; + + struct simple_PIXEL_list *first; + struct simple_PIXEL_list *last; +} +simple_REGION_list; + + +typedef struct double_REGION_list +{ + struct double_REGION_list *prev; + struct double_REGION_list *next; + + struct double_PIXEL_list *first; + struct double_PIXEL_list *last; +} +double_REGION_list; + + + +int geodesic_morphological_reconstruction ( + unsigned short numrows, + unsigned short numcols, + double **mask, + double **marker); + diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_filter/geodesic_morph_rec/listfuncs.inc saga-2.1.4+dfsg/src/modules/grid/grid_filter/geodesic_morph_rec/listfuncs.inc --- saga-2.1.0+dfsg/src/modules/grid/grid_filter/geodesic_morph_rec/listfuncs.inc 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_filter/geodesic_morph_rec/listfuncs.inc 2014-11-13 08:32:17.000000000 +0000 @@ -0,0 +1,920 @@ +/********************************************************** + * Version $Id: listfuncs.inc 1936 2014-01-11 14:07:20Z reklov_w $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// Grid_Filter // +// // +//-------------------------------------------------------// +// // +// listfuncs.inc // +// // +// Copyright (C) 2013 by // +// HfT Stuttgart // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: johannes.engels@hft-stuttgart.de // +// // +// contact: Johannes Engels // +// Hochschule fuer Technik Stuttgart // +// Schellingstr. 24 // +// 70174 Stuttgart // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + +/************************************************************************/ +/* Vor diese Datei irgendwo includiert wird, muessen */ +/* LISTELEMENT (z.B. #define LISTELEMENT REGION) */ +/* durch ein #define, */ +/* simple_LISTELEMENT_list (z.B. typedef struct simple_REGION_list) */ +/* double_LISTELEMENT_list (z.B. typedef struct double_REGION_list) */ +/* durch ein typedef definiert sein! */ +/* Diese Strukturen muessen ein Feld simple_LISTELEMENT_list *next */ +/* bzw. zwei Felder simple_LISTELEMENT_list *next, *prev enthalten. */ +/* Funktioniert z.B. mit georec.c */ +/************************************************************************/ + +/* zu tun: Funktionen INSSORTSLIST2, INSSORTDLIST2 in denen der */ +/* Vergleich direkt vorgenommen wird: */ +/* if (curr -> content.sortkey >= new -> content.sortkey) etc. */ + + +#if 0 +#ifndef __LISTFUNCS_INC__ + +#define __LISTFUNCS_INC__ + +#endif +#endif + + +#define CONCAT(x,y) x ## y +#define LCONCAT(x,y) CONCAT(x,y) + +#define SLIST LCONCAT(LCONCAT(simple_,LISTELEMENT),_list) +#define DLIST LCONCAT(LCONCAT(double_,LISTELEMENT),_list) +#define APPSLIST LCONCAT(LCONCAT(append_simple_,LISTELEMENT),_list) +#define APPDLIST LCONCAT(LCONCAT(append_double_,LISTELEMENT),_list) +#define APPNEWSLIST LCONCAT(LCONCAT(append_new_simple_,LISTELEMENT),_list) +#define APPNEWDLIST LCONCAT(LCONCAT(append_new_double_,LISTELEMENT),_list) +#define PRESLIST LCONCAT(LCONCAT(prepend_simple_,LISTELEMENT),_list) +#define PREDLIST LCONCAT(LCONCAT(prepend_double_,LISTELEMENT),_list) +#define PRENEWSLIST LCONCAT(LCONCAT(prepend_new_simple_,LISTELEMENT),_list) +#define PRENEWDLIST LCONCAT(LCONCAT(prepend_new_double_,LISTELEMENT),_list) +#define CONCATSLIST LCONCAT(LCONCAT(concat_simple_,LISTELEMENT),_list) +#define CONCATDLIST LCONCAT(LCONCAT(concat_double_,LISTELEMENT),_list) +#define APPAFTERSLIST LCONCAT(LCONCAT(app_after_simple_,LISTELEMENT),_list) +#define APPAFTERDLIST LCONCAT(LCONCAT(app_after_double_,LISTELEMENT),_list) +#define APPBEFOREDLIST LCONCAT(LCONCAT(app_before_double_,LISTELEMENT),_list) +#define APPBEFORESLIST LCONCAT(LCONCAT(app_before_simple_,LISTELEMENT),_list) +#define DELETESFIRST LCONCAT(delete_first_simple_,LISTELEMENT) +#define DELETEDFIRST LCONCAT(delete_first_double_,LISTELEMENT) +#define DELETESLAST LCONCAT(delete_last_simple_,LISTELEMENT) +#define DELETEDLAST LCONCAT(delete_last_double_,LISTELEMENT) +#define REMOVESFIRST LCONCAT(remove_first_simple_,LISTELEMENT) +#define REMOVEDFIRST LCONCAT(remove_first_double_,LISTELEMENT) +#define REMOVESELEMENT LCONCAT(LCONCAT(remove_simple_,LISTELEMENT),_list) +#define REMOVEDELEMENT LCONCAT(LCONCAT(remove_double_,LISTELEMENT),_list) +#define FREESLIST LCONCAT(LCONCAT(free_simple_,LISTELEMENT),_list) +#define FREEDLIST LCONCAT(LCONCAT(free_double_,LISTELEMENT),_list) +#define INSSORTSLIST LCONCAT(LCONCAT(inssort_simple_,LISTELEMENT),_list) +#define INSSORTDLIST LCONCAT(LCONCAT(inssort_double_,LISTELEMENT),_list) +#define COMPELEMENT LCONCAT(comp_,LISTELEMENT) + + +int APPSLIST (SLIST **first, SLIST **last, SLIST *new); + +int APPDLIST (DLIST **first, DLIST **last, DLIST *new); + +int APPNEWSLIST (SLIST **first, SLIST **last); + +int APPNEWDLIST (DLIST **first, DLIST **last); + +int PRESLIST (SLIST **first, SLIST **last, SLIST *new); + +int PREDLIST (DLIST **first, DLIST **last, DLIST *new); + +int PRENEWSLIST (SLIST **first, SLIST **last); + +int PRENEWDLIST (DLIST **first, DLIST **last); + +int CONCATSLIST (SLIST **first, SLIST **last, SLIST *fapp, SLIST *lapp); + +int CONCATDLIST (DLIST **first, DLIST **last, DLIST *fapp, DLIST *lapp); + +int APPAFTERSLIST (SLIST **first, SLIST **last, SLIST *old, SLIST *new); + +int APPAFTERDLIST (DLIST **first, DLIST **last, DLIST *old, DLIST *new); + +int APPBEFORESLIST (SLIST **first, + SLIST **last, + SLIST *old, + SLIST *oldprev, + SLIST *new); + +int APPBEFOREDLIST (DLIST **first, DLIST **last, DLIST *old, DLIST *new); + +int DELETESFIRST (SLIST **first, SLIST **last); + +int DELETEDFIRST (DLIST **first, DLIST **last); + +int DELETESLAST (SLIST **first, SLIST **last, SLIST *last_but_one); + +int DELETEDLAST (DLIST **first, DLIST **last); + +int REMOVESFIRST (SLIST **first, SLIST **last); + +int REMOVEDFIRST (DLIST **first, DLIST **last); + +int REMOVESELEMENT (SLIST **first, SLIST **last, SLIST *prev, SLIST *el); + +int REMOVEDELEMENT (DLIST **first, DLIST **last, DLIST *el); + +int FREESLIST (SLIST **first, SLIST **last); + +int FREEDLIST (DLIST **first, DLIST **last); + +int INSSORTSLIST (SLIST **first, + SLIST **last, + short ascdesc, + SLIST *new, + void *add1, + void *add2, + int (*comp)(SLIST *, SLIST *, void *, void *)); + +int INSSORTDLIST (DLIST **first, + DLIST **last, + short ascdesc, + DLIST *new, + void *add1, + void *add2, + int (*comp) (DLIST *, DLIST *, void *, void *)); + + +/************************************************************************/ +/* Neues Element an eine Liste hinten dranhaengen */ +/************************************************************************/ + +int APPSLIST (SLIST **first, + SLIST **last, + SLIST *new) +{ + if (*first == NULL) + { + *first = new; + *last = new; + } + else + { + (*last) -> next = new; + } + + *last = new; + new -> next = NULL; + + return 0; +} + + + + +int APPDLIST (DLIST **first, + DLIST **last, + DLIST *new) +{ + if (*first == NULL) + { + *first = new; + *last = new; + new -> prev = NULL; + } + else + { + (*last) -> next = new; + new -> prev = *last; + } + + *last = new; + new -> next = NULL; + + return 0; +} + + + +int APPNEWSLIST (SLIST **first, + SLIST **last) +{ + SLIST *new_el; + + new_el = (SLIST *) malloc (sizeof (SLIST)); + memset (new_el, 0x00, sizeof(SLIST)); + + if (*first == NULL) + { + *first = new_el; + *last = new_el; + } + else + { + (*last) -> next = new_el; + } + + *last = new_el; + + return 0; +} + + + + +int APPNEWDLIST (DLIST **first, + DLIST **last) +{ + DLIST *new_el; + + new_el = (DLIST *) malloc (sizeof (DLIST)); + memset (new_el, 0x00, sizeof(DLIST)); + + if (*first == NULL) + { + *first = new_el; + *last = new_el; + } + else + { + (*last) -> next = new_el; + new_el -> prev = *last; + } + + *last = new_el; + + return 0; +} + + + + + + + +/************************************************************************/ +/* Neues Element einer Liste voranstellen */ +/************************************************************************/ + +int PRESLIST (SLIST **first, + SLIST **last, + SLIST *new) +{ + if (*first == NULL) + { + *first = new; + *last = new; + new -> next = NULL; + } + else + { + new -> next = *first; + } + + *first = new; + + return 0; +} + + + + +int PRENEWSLIST (SLIST **first, + SLIST **last) +{ + SLIST *new_el; + + new_el = (SLIST *) malloc (sizeof (SLIST)); + memset (new_el, 0x00, sizeof(SLIST)); + + + if (*first == NULL) + { + *first = new_el; + *last = new_el; + } + else + { + new_el -> next = *first; + } + + *first = new_el; + + return 0; +} + + + + + + +int PREDLIST (DLIST **first, + DLIST **last, + DLIST *new) +{ + if (*first == NULL) + { + *first = new; + *last = new; + new -> next = NULL; + } + else + { + new -> next = *first; + (*first) -> prev = new; + } + + *first = new; + new -> prev = NULL; + + return 0; +} + + + +int PRENEWDLIST (DLIST **first, + DLIST **last) +{ + DLIST *new_el; + + new_el = (DLIST *) malloc (sizeof (DLIST)); + memset (new_el, 0x00, sizeof(DLIST)); + + if (*first == NULL) + { + *first = new_el; + *last = new_el; + } + else + { + new_el -> next = *first; + (*first) -> prev = new_el; + } + + *first = new_el; + + return 0; +} + + + + + +int CONCATSLIST (SLIST **first, SLIST **last, SLIST *fapp, SLIST *lapp) +{ + /*********************************************************************/ + /* Hier wird die zweite Liste an die erste drangehaengt. */ + /*********************************************************************/ + + if (fapp == NULL) + return 8; + else if (*first == NULL) + { + *first = fapp; + *last = lapp; + return 4; + } + else + { + (*last) -> next = fapp; + *last = lapp; + return 0; + } + + return 0; +} + + + + + +int CONCATDLIST (DLIST **first, DLIST **last, DLIST *fapp, DLIST *lapp) +{ + /*********************************************************************/ + /* Hier wird die zweite Liste an die erste drangehaengt. */ + /*********************************************************************/ + + if (fapp == NULL) + return 8; + else if (*first == NULL) + { + *first = fapp; + *last = lapp; + return 4; + } + else + { + (*last) -> next = fapp; + fapp -> prev = *last; + *last = lapp; + return 0; + } + + return 0; +} + + + + + +/************************************************************************/ +/* Neues Element in eine Liste hinter einem bestimmten Element */ +/* einfuegen */ +/************************************************************************/ + +int APPAFTERSLIST (SLIST **first, + SLIST **last, + SLIST *old, + SLIST *new) +{ + if (old == NULL) + return 8; + + new -> next = old -> next; + old -> next = new; + + if (old == *last) + *last = new; + + return 0; +} + + + + +int APPAFTERDLIST (DLIST **first, + DLIST **last, + DLIST *old, + DLIST *new) +{ + if (old == NULL) + return 8; + + new -> next = old -> next; + new -> prev = old; + + if (old == *last) + *last = new; + else + old -> next -> prev = new; + + old -> next = new; + + return 0; +} + + +/************************************************************************/ +/* Neues Element in eine Liste vor einem bestimmten Element einfuegen */ +/************************************************************************/ + +int APPBEFORESLIST (SLIST **first, + SLIST **last, + SLIST *old, + SLIST *oldprev, + SLIST *new) +{ + if (old == NULL) + return 8; + + new -> next = old; + + if (old == *first) + *first = new; + else + oldprev -> next = new; + + return 0; +} + + + + +int APPBEFOREDLIST (DLIST **first, + DLIST **last, + DLIST *old, + DLIST *new) +{ + if (old == NULL) + return 8; + + new -> next = old; + new -> prev = old -> prev; + + if (old == *first) + *first = new; + else + old -> prev -> next = new; + + old -> prev = new; + + return 0; +} + + + + + +int DELETESFIRST (SLIST **first, SLIST **last) +{ + SLIST *zw; + + if (*first == NULL) + return 8; + + if (*first == *last) + { + free (*first); + *first = NULL; + *last = NULL; + return 0; + } + + zw = *first; + *first = zw -> next; + free (zw); + + return 0; +} + + + + +int DELETEDFIRST (DLIST **first, DLIST **last) +{ + DLIST *zw; + + if (*first == NULL) + return 8; + + if (*first == *last) + { + free (*first); + *first = NULL; + *last = NULL; + return 0; + } + + zw = *first; + *first = zw -> next; + free (zw); + (*first) -> prev = NULL; + + return 0; +} + + + + + +int DELETESLAST (SLIST **first, SLIST **last, SLIST *last_but_one) +{ + if (*first == NULL) + return 8; + + if (*first == *last) + { + free (*first); + *first = NULL; + *last = NULL; + return 0; + } + + free (*last); + last_but_one -> next = NULL; + *last = last_but_one; + + return 0; +} + + + + + + +int DELETEDLAST (DLIST **first, DLIST **last) +{ + DLIST *zw; + + if (*first == NULL) + return 8; + + if (*first == *last) + { + free (*first); + *first = NULL; + *last = NULL; + return 0; + } + + zw = (*last) -> prev; + free (*last); + zw -> next = NULL; + *last = zw; + + return 0; +} + + + + +int REMOVESFIRST (SLIST **first, SLIST **last) +{ + SLIST *zw; + + if (*first == NULL) + return 8; + + if (*first == *last) + { + *first = NULL; + *last = NULL; + } + else + { + zw = *first; + *first = zw -> next; + zw -> next = NULL; + } + + return 0; +} + + + + + +int REMOVEDFIRST (DLIST **first, DLIST **last) +{ + DLIST *zw; + + if (*first == NULL) + return 8; + + if (*first == *last) + { + *first = NULL; + *last = NULL; + } + else + { + zw = *first; + *first = zw -> next; + zw -> next = NULL; + } + + return 0; +} + + + + + + + + + +/************************************************************************/ +/* Element aus der Liste entfernen */ +/************************************************************************/ + +int REMOVESELEMENT (SLIST **first, + SLIST **last, + SLIST *prev, + SLIST *el) +{ + if (el == NULL) + return 8; + + if (el == *first) + *first = el -> next; + else + prev -> next = el -> next; + + if (el == *last) + *last = prev; + + el -> next = NULL; + + return 0; +} + + + + +int REMOVEDELEMENT (DLIST **first, + DLIST **last, + DLIST *el) +{ + if (el == NULL) + return 8; + + if (el == *first) + *first = el -> next; + else + el -> prev -> next = el -> next; + + if (el == *last) + *last = el -> prev; + else + el -> next -> prev = el -> prev; + + el -> next = NULL; + el -> prev = NULL; + + return 0; +} + + + + + +/************************************************************************/ +/* Liste freigeben */ +/************************************************************************/ + +int FREESLIST (SLIST **first, SLIST **last) +{ + SLIST *currpix; + SLIST *nextpix; + + for (currpix = *first; currpix != NULL; currpix = nextpix) + { + nextpix = currpix -> next; + free (currpix); + } + + *first = NULL; + *last = NULL; + + return 0; +} + + + + +int FREEDLIST (DLIST **first, DLIST **last) +{ + DLIST *currpix; + DLIST *nextpix; + + for (currpix = *first; currpix != NULL; currpix = nextpix) + { + nextpix = currpix -> next; + free (currpix); + } + + *first = NULL; + *last = NULL; + + return 0; +} + + + + +int INSSORTSLIST (SLIST **first, + SLIST **last, + short ascdesc, + SLIST *new, + void *add1, + void *add2, + int (*comp) (SLIST *, SLIST *, void *, void *)) +{ + SLIST *curr; + SLIST *currprev; + + if (*first == NULL) + { + *first = new; + *last = new; + + return 0; + } + + currprev = NULL; + + if (ascdesc > 1) /* die Liste soll aufsteigend sortiert werden */ + { + for (curr = *first; curr != NULL; curr = curr -> next) + { + if ((*comp) (curr, new, add1, add2) >= 0) /* curr >= new */ + { + APPBEFORESLIST (first, last, curr, currprev, new); + return 0; + } + + currprev = curr; + } + } + else /* die Liste soll absteigend sortiert werden */ + { + for (curr = *first; curr != NULL; curr = curr -> next) + { + if ((*comp) (curr, new, add1, add2) <= 0) /* curr <= new */ + { + APPBEFORESLIST (first, last, curr, currprev, new); + + return 0; + } + + currprev = curr; + } + } + + return (APPSLIST (first, last, new)); +} + + + + +int INSSORTDLIST (DLIST **first, + DLIST **last, + short ascdesc, + DLIST *new, + void *add1, + void *add2, + int (*comp) (DLIST *, DLIST *, void *, void *)) +{ + DLIST *curr; + + if (*first == NULL) + { + *first = new; + *last = new; + + return 0; + } + + if (ascdesc > 1) /* die Liste soll aufsteigend sortiert werden */ + { + for (curr = *first; curr != NULL; curr = curr -> next) + { + if ((*comp) (curr, new, add1, add2) >= 0) /* curr >= new */ + { + APPBEFOREDLIST (first, last, curr, new); + return 0; + } + } + } + else /* die Liste soll absteigend sortiert werden */ + { + for (curr = *first; curr != NULL; curr = curr -> next) + { + if ((*comp) (curr, new, add1, add2) <= 0) /* curr <= new */ + { + APPBEFOREDLIST (first, last, curr, new); + return 0; + } + } + } + + return (APPDLIST (first, last, new)); +} + + diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_filter/geodesic_morph_rec/rho.h saga-2.1.4+dfsg/src/modules/grid/grid_filter/geodesic_morph_rec/rho.h --- saga-2.1.0+dfsg/src/modules/grid/grid_filter/geodesic_morph_rec/rho.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_filter/geodesic_morph_rec/rho.h 2014-11-13 08:32:17.000000000 +0000 @@ -0,0 +1,72 @@ +/********************************************************** + * Version $Id: rho.h 1937 2014-01-11 18:22:42Z reklov_w $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// Grid_Filter / Grid_Calculus // +// // +//-------------------------------------------------------// +// // +// rho.h // +// // +// Copyright (C) 2013 by // +// HfT Stuttgart // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: johannes.engels@hft-stuttgart.de // +// // +// contact: Johannes Engels // +// Hochschule fuer Technik Stuttgart // +// Schellingstr. 24 // +// 70174 Stuttgart // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +/*******************************/ +/* globale Variable */ +/*******************************/ + +#define RHO_GRAD (M_1_PI*180.0) /* M_1_PI - Reziprokwert von pi */ +#define RHO_ARCSEC (M_1_PI*648000.0) /* def. in /usr/include/math.h */ +#define RHO_STUND (M_1_PI*12.0) +#define RHO_TSEC (M_1_PI*43200.0) +#define RHO_REZ (M_PI/180.0) + diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_filter/geodesic_morph_rec/spezfunc.c saga-2.1.4+dfsg/src/modules/grid/grid_filter/geodesic_morph_rec/spezfunc.c --- saga-2.1.0+dfsg/src/modules/grid/grid_filter/geodesic_morph_rec/spezfunc.c 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_filter/geodesic_morph_rec/spezfunc.c 2014-11-13 08:32:17.000000000 +0000 @@ -0,0 +1,1228 @@ +/********************************************************** + * Version $Id: spezfunc.c 1937 2014-01-11 18:22:42Z reklov_w $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// Grid_Filter / Grid_Calculus // +// // +//-------------------------------------------------------// +// // +// spezfunc.c // +// // +// Copyright (C) 2013 by // +// HfT Stuttgart // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: johannes.engels@hft-stuttgart.de // +// // +// contact: Johannes Engels // +// Hochschule fuer Technik Stuttgart // +// Schellingstr. 24 // +// 70174 Stuttgart // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include +#include +#include +#include + +#define M_PI 3.141592653589793 + +#include "storeorg.h" +#include "spezfunc.h" +#include "rho.h" +#include "errfunc.h" + + +static fehlerinfo finfo [] = + { { 1001, 'E', " Fehler in legendre_dreieck_alloc, " + "lmax = %d\n" }, + { 1002, 'E', " Fehler beim Einlesen der " + "Nullstellen, Zeile %d \n" }, + { 1003, 'E', " Fehlerhafte Indizierung im Nullstellenfile," + " Grad (ist) = %d,\n" + " " + " Grad (soll) = %d,\n" }, + { 1004, 'F', " Fehler in der Funktion zur " + "Berechnung der Gitterwerte \n" }, + { 1005, 'E', " Testausgabe: " + "lmax = %d, name = %s \n" }, + { 0, 'F', "" } }; + + + +int read_coefficients (const char *filename, + int mindegree, + int maxdegree, + double ***c_lm, + double ***s_lm) +{ + FILE *fh; + int l; + int m; + int degree; + int order; + double c; + double s; + + + fh = fopen (filename, "r"); + + legendre_dreieck_alloc (maxdegree, c_lm); + legendre_dreieck_alloc (maxdegree, s_lm); + + for (l = mindegree; l <= maxdegree; l ++) + { + fscanf (fh, "%d %d %lf %lf", °ree, &order, &c, &s); + + if (degree != l || order != 0) + printf ("Error: Wrong order of coefficients in input file\n"); + + (*c_lm) [l][0] = c; + + for (m = 1; m <= l; m ++) + { + fscanf (fh, "%d %d %lf %lf", °ree, &order, &c, &s); + + if (degree != l || order != m) + printf ("Error: Wrong order of coefficients in input file\n"); + + (*c_lm) [l][m] = c; + (*s_lm) [l][m] = s; + } + } + + fclose (fh); + + return 0; +} + + + + +int leg_pol_berechnen (double t, + int maxdeg, + double *lp) +{ + /*******************************************************************/ + /* Nicht normierte Legendre-Polynome bis zum angegebenen */ + /* Entwicklungsgrad maxdeg rechnen */ + /* t = sin (phi) muss mitgegeben werden */ + /* Der Vektor lp muss im aufrufenden Programm genügend groß */ + /* allokiert sein (z.B. durch Funktion dvector_alloc in speiorg.c) */ + /*******************************************************************/ + + short n; + + + lp [0] = 1.0; + lp [1] = t; + + for (n = 2; n <= maxdeg; n ++) + { + lp [n] = (-lp [n - 2] * (n - 1) + + t * lp [n - 1] * (2 * n - 1)) / n; + } + + return 0; +} + + + + +int leg_func_berechnen (double t, + int maxdeg, + double **lf) +{ + /*******************************************************************/ + /* Vollständig normierte Legendre-Funktionen bis zum angegebenen */ + /* Entwicklungsgrad maxdeg rechnen */ + /* t = sin (phi) muss mitgegeben werden */ + /* Die Matrix lf muss im aufrufenden Programm genügend groß */ + /* allokiert sein (z.B. durch Funktion legendre_dreieck_alloc */ + /* in speiorg.c) */ + /*******************************************************************/ + + short grad; + short ord; + double cf; + double *wurz; + short i; + short ip; + short im; + + wurz = (double *) malloc ((2 * maxdeg + 4) * sizeof (double)); + + for (i = 0; i < 2 * maxdeg + 4; i ++) + wurz [i] = sqrt ((double ) (i)); + + + cf = sqrt (1.0 - t * t); + + lf [0][0] = 1.0; + lf [1][1] = wurz [3] * cf; + + for (grad = 1; grad < maxdeg; grad ++) + { + /*****************************************/ + /* Hauptdiagonalelemente berechnen */ + /*****************************************/ + + lf [grad + 1][grad + 1] = + wurz [2 * grad + 3] / wurz [2 * grad + 2] * + cf * lf [grad][grad]; + } + + for (ord = 0; ord < maxdeg; ord ++) + { + lf [ord + 1][ord] = wurz [2 * ord + 3] * t * lf [ord][ord]; + + for (grad = ord + 1; grad < maxdeg; grad ++) + { + i = 2 * grad; + ip = grad + ord; + im = grad - ord; + + lf [grad + 1][ord] = + wurz [i + 3] / wurz [ip + 1] / wurz [im + 1] * + (wurz [i + 1] * t * lf [grad][ord] - + wurz [ip] * wurz [im] / wurz [i - 1] * + lf [grad - 1][ord]); + } + } + + free (wurz); + + return 0; +} + + + + +int leg_func_deriv (double t, + int maxdeg, + double **lf, + double **lf_der) +{ + /*******************************************************************/ + /* Ableitungen der vollständig normierten Legendre-Funktionen nach */ + /* dem Argument t = sin (phi) bis zum angegebenen Entwicklungsgrad */ + /* maxdeg rechnen */ + /* t = sin (phi) sowie die Matrix lf der Legendre-Funktionen */ + /* selbst müssen mitgegeben werden */ + /* Die Matrix lf_der muss im aufrufenden Programm genügend groß */ + /* allokiert sein (z.B. durch Funktion legendre_dreieck_alloc */ + /* in speiorg.c) */ + /*******************************************************************/ + + short grad; + short ord; + double cf; + double *wurz; + short i; + short ip; + short im; + + wurz = (double *) malloc ((2 * maxdeg + 4) * sizeof (double)); + + for (i = 0; i < 2 * maxdeg + 4; i ++) + wurz [i] = sqrt ((double ) (i)); + + + cf = sqrt (1.0 - t * t); + + lf_der [0][0] = 0.0; + lf_der [1][1] = -wurz [3] * t; + + for (grad = 1; grad < maxdeg; grad ++) + { + /*****************************************/ + /* Hauptdiagonalelemente berechnen */ + /*****************************************/ + + lf_der [grad + 1][grad + 1] = + wurz [2 * grad + 3] / wurz [2 * grad + 2] * + (cf * lf_der [grad][grad] - t * lf [grad][grad]); + } + + for (ord = 0; ord < maxdeg; ord ++) + { + lf_der [ord + 1][ord] = + wurz [2 * ord + 3] * (t * lf_der [ord][ord] + + cf * lf [ord][ord]); + + for (grad = ord + 1; grad < maxdeg; grad ++) + { + i = 2 * grad; + ip = grad + ord; + im = grad - ord; + + lf_der [grad + 1][ord] = + wurz [i + 3] / wurz [ip + 1] / wurz [im + 1] * + (wurz [i + 1] * (t * lf_der [grad][ord] + + cf * lf [grad][ord]) - + wurz [ip] * wurz [im] / wurz [i - 1] * + lf_der [grad - 1][ord]); + } + } + + free (wurz); + + return 0; +} + + + +int kff_synthese_einzelpunkt (double lambda, + char winkelmass, + double **leg_func, + int mindeg, + int maxdeg, + double **c_lm, + double **s_lm, + double *f) +{ + /*******************************************************************/ + /* Harmonische Synthese in einem Einzelpunkt rechnen */ + /* */ + /* f = sum_{l=mindeg}^maxdeg * */ + /* sum_{m=0}^l leg_func_{l,m} (c_lm * cos (m*lambdar) + */ + /* s_lm * sin (m*lambdar)) */ + /* */ + /* */ + /* Winkelmass = 'A': lambda muss in Altgrad eingegeben werden */ + /* Winkelmass = 'R': lambda muss im Bogenmaß eingegeben werden */ + /* */ + /* mindeg muss >= 0 sein, andernfalls wird es gewaltsam auf 0 */ + /* gesetzt */ + /*******************************************************************/ + + double fzw; + int l; + int m; + + *f = 0.; + + mindeg = (mindeg < 0) ? 0 : mindeg; + + if (winkelmass == 'A') + lambda *= RHO_REZ; + + for (l = mindeg; l <= maxdeg; l ++) + { + fzw = leg_func [l][0] * c_lm [l][0]; + + for (m = 1; m <= l; m ++) + { + fzw += (leg_func [l][m] * + (c_lm [l][m] * cos (m * lambda) + + s_lm [l][m] * sin (m * lambda))); + } + + *f += fzw; + } + + return 0; +} + + + + + +int kff_synthese_einzelpunkt_s (double lambda, + char winkelmass, + double **leg_func, + int mindeg, + int maxdeg, + double **c_lm, + double **s_lm, + double *f) +{ + /*******************************************************************/ + /* Harmonische Synthese in einem Einzelpunkt rechnen */ + /* */ + /* wie kff_synthese_einzelpunkt_S, aber es wird das Ergebnis nicht */ + /* für die Breite phi gewünscht, mit der die Legendre-Funktionen */ + /* berechnet wurden, sondern für die Breite -phi */ + /* ("Wert im symmetrisch zur Äquatorebene liegenden Punkt") */ + /* */ + /* Winkelmass = 'A': lambda muss in Altgrad eingegeben werden */ + /* Winkelmass = 'R': lambda muss im Bogenmaß eingegeben werden */ + /* */ + /* mindeg muss >= 0 sein, andernfalls wird es gewaltsam auf 0 */ + /* gesetzt */ + /*******************************************************************/ + + double fzw; + int l; + int m; + int sig_alt; + int sig_alt_st; + + *f = 0.; + + mindeg = (mindeg < 0) ? 0 : mindeg; + + if (winkelmass == 'A') + lambda *= RHO_REZ; + + if (mindeg % 2 == 0) + sig_alt_st = -1; + else + sig_alt_st = 1; + + for (l = mindeg; l <= maxdeg; l ++) + { + sig_alt_st = -sig_alt_st; + sig_alt = sig_alt_st; + + if (sig_alt == -1) + { + fzw = -leg_func [l][0] * c_lm [l][0]; + } + else + { + fzw = leg_func [l][0] * c_lm [l][0]; + } + + for (m = 1; m <= l; m ++) + { + sig_alt = -sig_alt; + + if (sig_alt == -1) + { + fzw -= (leg_func [l][m] * + (c_lm [l][m] * cos (m * lambda) + + s_lm [l][m] * sin (m * lambda))); + } + else + { + fzw += (leg_func [l][m] * + (c_lm [l][m] * cos (m * lambda) + + s_lm [l][m] * sin (m * lambda))); + } + } + + *f += fzw; + } + + return 0; +} + + + + + +int kff_synthese_breitenkreis (double lambda_inc, + double lambda_anf, + double lambda_end, + char winkelmass, + double **leg_func, + int mindeg, + int maxdeg, + double **c_lm, + double **s_lm, + double *f) +{ + /*******************************************************************/ + /* Harmonische Synthese auf einem Breitenkreis rechnen */ + /* */ + /* f = sum_{l=mindeg}^maxdeg * */ + /* sum_{m=0}^l leg_func_{l,m} (c_lm * cos (m*lambdar) + */ + /* s_lm * sin (m*lambdar)) */ + /* */ + /* Winkelmass = 'A': lambda_inc, lambda_anf und lambda_end müssen */ + /* in Altgrad eingegeben werden */ + /* Winkelmass = 'R': lambda_inc, lambda_anf und lambda_end müssen */ + /* im Bogenmaß eingegeben werden */ + /* */ + /* Es wird ab lambda_anf bis lambda_end mit lambda_inc als */ + /* Inkrement gerechnet. */ + /* Der Vektor f muss im aufrufenden Modul genügend groß allokiert */ + /* sein: Mindestgröße ist */ + /* (lambda_end - lambda_anf) / lambda_inc + 1 */ + /* */ + /* mindeg muss >= 0 sein, andernfalls wird es gewaltsam auf 0 */ + /* gesetzt */ + /*******************************************************************/ + + double fzw; + double lambda; + int l; + int m; + int i; + + + mindeg = (mindeg < 0) ? 0 : mindeg; + + if (winkelmass == 'A') + { + lambda_inc *= RHO_REZ; + lambda_anf *= RHO_REZ; + lambda_end *= RHO_REZ; + } + + + for (i = 0, lambda = lambda_anf; + lambda <= lambda_end; + i ++ ,lambda += lambda_inc) + { + f [i] = 0.; + + for (l = mindeg; l <= maxdeg; l ++) + { + fzw = leg_func [l][0] * c_lm [l][0]; + + for (m = 1; m <= l; m ++) + { + fzw += (leg_func [l][m] * + (c_lm [l][m] * cos (m * lambda) + + s_lm [l][m] * sin (m * lambda))); + } + + f [i] += fzw; + } + } + + return 0; +} + + + + + +int kff_synthese_regel_gitter (double winkel_inc, + double phi_anf, + double phi_end, + double lambda_anf, + double lambda_end, + char winkelmass, + int mindeg, + int maxdeg, + double **c_lm, + double **s_lm, + double **f, + char **error_liste) +{ + /*******************************************************************/ + /* Harmonische Synthese auf einem regelmäßigen Gitter rechnen */ + /* */ + /* f = sum_{l=mindeg}^maxdeg * */ + /* sum_{m=0}^l leg_func_{l,m} (c_lm * cos (m*lambdar) + */ + /* s_lm * sin (m*lambdar)) */ + /* */ + /* Winkelmass = 'A': */ + /* winkel_inc, lambda_anf, lambda_end, phi_anf und phi_end müssen */ + /* in Altgrad mitgegeben werden */ + /* */ + /* Winkelmass = 'R': */ + /* winkel_inc, lambda_anf, lambda_end, phi_anf und phi_end müssen */ + /* im Bogenmaß mitgegeben werden */ + /* */ + /* Die Matrix f muss im aufrufenden Modul genügend groß allokiert */ + /* sein: Mindestgröße ist */ + /* [(phi_end - phi_anf) / winkel_inc + 1] * */ + /* [(lambda_end - lambda_anf) / winkel_inc + 1] */ + /* */ + /* mindeg muss >= 0 sein, andernfalls wird es gewaltsam auf 0 */ + /* gesetzt */ + /*******************************************************************/ + + double fzw; + double lambda; + double phi; + double sphi; + double **lf; + int l; + int m; + int i; + int j; + int rc; + char *funk_name = "kff_synthese_regel_gitter"; + + + mindeg = (mindeg < 0) ? 0 : mindeg; + + if (winkelmass == 'A') + { + winkel_inc *= RHO_REZ; + lambda_anf *= RHO_REZ; + lambda_end *= RHO_REZ; + phi_anf *= RHO_REZ; + phi_end *= RHO_REZ; + } + + rc = legendre_dreieck_alloc (maxdeg, &lf); + ERRCHECK2_RC(1001,finfo,&maxdeg,NULL) + + for (i = 0, phi = phi_anf; + phi <= phi_end; + i ++, phi += winkel_inc) + { + sphi = sin (phi); + + leg_func_berechnen (sphi, maxdeg, lf); + + + for (j = 0, lambda = lambda_anf; + lambda <= lambda_end; + j ++, lambda += winkel_inc) + { + f [i][j] = 0.; + + for (l = mindeg; l <= maxdeg; l ++) + { + fzw = lf [l][0] * c_lm [l][0]; + + for (m = 1; m <= l; m ++) + { + fzw += (lf [l][m] * + (c_lm [l][m] * cos (m * lambda) + + s_lm [l][m] * sin (m * lambda))); + } + + f [i][j] += fzw; + } + } + } + + legendre_dreieck_free (&lf); + + return 0; +} + + + + + +static int trigfuncs_gitter (double winkel_inc, + double lambda_anf, + double lambda_end, + int maxdeg, + double **cosmla, + double **sinmla) +{ + /*******************************************************************/ + /* Trigonometrische Funktionen cos (m lambda), sin (m lambda) */ + /* mit Additionstheoremen berechnen */ + /*******************************************************************/ + + double lambda; + int m; + int j; + double cosl1; + double sinl1; + + char *funk_name = "trigfuncs_gitter"; + + for (j = 0, lambda = lambda_anf; + lambda <= lambda_end; + j ++, lambda += winkel_inc) + { + cosmla [j][0] = 1.0; + sinmla [j][0] = 0.0; + cosmla [j][1] = cos (lambda); + sinmla [j][1] = sin (lambda); + cosl1 = cosmla [j][1]; + sinl1 = sinmla [j][1]; + + for (m = 2; m <= maxdeg; m ++) + { + cosmla [j][m] = cosmla [j][m-1] * cosl1 - sinmla [j][m-1] * sinl1; + sinmla [j][m] = sinmla [j][m-1] * cosl1 + cosmla [j][m-1] * sinl1; + } + } + + return 0; +} + + + + + +int kff_synthese_regel_gitter_m (double winkel_inc, + double phi_anf, + double phi_end, + double lambda_anf, + double lambda_end, + int numlat, + int numlong, + char winkelmass, + int mindeg, + int maxdeg, + double **c_lm, + double **s_lm, + double **f, + char **error_liste) +{ + /**************************************************************************/ + /* Wie kff_synthese_regel_gitter, aber die cos (m lambda), sin (m lambda) */ + /* werden vorab gerechnet und gespeichert. Geht schneller und braucht */ + /* mehr Speicherplatz. */ + /**************************************************************************/ + + double fzw; + double lambda; + double phi; + double sphi; + double **lf; + double **cosmla; + double **sinmla; + int l; + int m; + int i; + int j; + int rc; + char *funk_name = "kff_synthese_regel_gitter_m"; + + + mindeg = (mindeg < 0) ? 0 : mindeg; + + if (winkelmass == 'A') + { + winkel_inc *= RHO_REZ; + lambda_anf *= RHO_REZ; + lambda_end *= RHO_REZ; + phi_anf *= RHO_REZ; + phi_end *= RHO_REZ; + } + + rc = legendre_dreieck_alloc (maxdeg, &lf); + ERRCHECK2_RC(1001,finfo,&maxdeg,NULL) + + cosmla = (double **) matrix_all_alloc (numlong, maxdeg + 1, 'D', 0); + sinmla = (double **) matrix_all_alloc (numlong, maxdeg + 1, 'D', 0); + + trigfuncs_gitter (winkel_inc, + lambda_anf, + lambda_end, + maxdeg, + cosmla, + sinmla); + + + for (i = 0, phi = phi_anf; + phi <= phi_end; + i ++, phi += winkel_inc) + { + sphi = sin (phi); + + leg_func_berechnen (sphi, maxdeg, lf); + + + for (j = 0, lambda = lambda_anf; + lambda <= lambda_end; + j ++, lambda += winkel_inc) + { + f [i][j] = 0.; + + for (l = mindeg; l <= maxdeg; l ++) + { + fzw = lf [l][0] * c_lm [l][0]; + + for (m = 1; m <= l; m ++) + { + fzw += (lf [l][m] * + (c_lm [l][m] * cosmla [j][m] + + s_lm [l][m] * sinmla [j][m])); + } + + f [i][j] += fzw; + } + } + } + + legendre_dreieck_free (&lf); + matrix_all_free ((void **) cosmla); + matrix_all_free ((void **) sinmla); + + return 0; +} + + + + + + + + + + + + + +int kff_synthese_bk_ng (int anz_mer, + double **leg_func, + double *cos_la, + double *sin_la, + int mindeg, + int maxdeg, + char spiegel, + double **c_lm, + double **s_lm, + double *f) +{ + /*******************************************************************/ + /* Harmonische Synthese auf einem Breitenkreis rechnen */ + /* */ + /* Im Gegensatz zu kff_synthese_breitenkreis wird hier voraus- */ + /* gesetzt, dass die Länge lambda aller Gitterpunkte jeweils ein */ + /* ganzzahliges Vielfaches des Inkrementes lambda_inc */ + /* 2 * pi / anz_mer und dass lambda = 360 Grad ein ganzzahliges */ + /* Vielfaches von lambda_inc ist. */ + /* Damit vereinfacht sich die Berechnung. */ + /* */ + /* f = sum_{l=mindeg}^maxdeg * */ + /* sum_{m=0}^l leg_func_{l,m} (c_lm * cos (m*lambdar) + */ + /* s_lm * sin (m*lambdar)) */ + /* */ + /* Es wird von 0 <= lambda < 360 Grad gerechnet */ + /* Der Vektor f muss im aufrufenden Modul genügend groß allokiert */ + /* sein: Mindestgröße ist anz_mer */ + /* */ + /* Die Vektoren cos_la und sin_la müssen bereits die */ + /* Werte */ + /* cos_la [k] = cos (k * lambda_inc) */ + /* sin_la [k] = sin (k * lambda_inc) */ + /* */ + /* für 0 <= k < anz_mer enthalten. */ + /* */ + /* mindeg muss >= 0 sein. */ + /* */ + /* Ist spiegel = 'S', so wird das Ergebnis nicht für die Breite */ + /* phi berechnet, mit der die Legendre-Funktionen */ + /* berechnet wurden, sondern für die Breite -phi */ + /* ("Wert im symmetrisch zur Äquatorebene liegenden Punkt") */ + /* */ + /*******************************************************************/ + + int l; + int m; + int k; + int tri_ind; + int sig_alt; + int sig_alt_st; + + double cfac; + double sfac; + + + for (k = 0; k < anz_mer; k ++) + f [k] = 0.0; + + + if (spiegel == 'S') + { + if (mindeg % 2 == 0) + sig_alt_st = -1; + else + sig_alt_st = 1; + + + for (l = mindeg; l <= maxdeg; l ++) + { + sig_alt_st = -sig_alt_st; + sig_alt = sig_alt_st; + + for (m = 0; m <= l; m ++) + { + if (sig_alt > 0) + { + cfac = leg_func [l][m] * c_lm [l][m]; + sfac = leg_func [l][m] * s_lm [l][m]; + } + else + { + cfac = -leg_func [l][m] * c_lm [l][m]; + sfac = -leg_func [l][m] * s_lm [l][m]; + } + + for (k = 0, tri_ind = 0; k < anz_mer; k ++) + { + f [k] += (cfac * cos_la [tri_ind] + + sfac * sin_la [tri_ind]); + + tri_ind += m; + tri_ind %= anz_mer; + } + + sig_alt = -sig_alt; + } + } + } + else + { + for (l = mindeg; l <= maxdeg; l ++) + { + for (m = 0; m <= l; m ++) + { + cfac = leg_func [l][m] * c_lm [l][m]; + sfac = leg_func [l][m] * s_lm [l][m]; + + for (k = 0, tri_ind = 0; k < anz_mer; k ++) + { + f [k] += (cfac * cos_la [tri_ind] + + sfac * sin_la [tri_ind]); + + tri_ind += m; + tri_ind %= anz_mer; + } + } + } + } + + return 0; +} + + + + + +int harm_ana_gauss (FILE *inpfile, + FILE *outfile, + int lmax, + daten_funktion dat_funk, + void *arg1, + void *arg2, + void *arg3, + void *arg4, + void *arg5, + void *arg6, + char **error_liste) +{ + /**************************************************************/ + /* Programm zur harmonischen Analyse mit Hilfe einer */ + /* Gauss-Quadratur. Die Nullstellen des Legendre-Polynoms */ + /* vom Grad lmax (Entwicklungsgrad) sowie die Gewichte werden */ + /* vom Eingabefile inpfile gelesen. lmax muss gerade sein!! */ + /**************************************************************/ + + int rc; + int l; + int m; + int j; + int k; + int dummy; + int anz_m; + int tri_ind; + int sig_alt; + int sig_alt_st; + + double **lf; + double **clm; + double **slm; + double alpha; + double t_nullst; + double lambda; + double la_inc; + double *f_nord; + double *f_sued; + double *cos_la; + double *sin_la; + double *c_sum_nord; + double *s_sum_nord; + double *c_sum_sued; + double *s_sum_sued; + + char zeile [82]; + char *cp; + char *cp5; + char *funk_name = "harm_ana_gauss"; + + + cp5 = funk_name; + + anz_m = 2 * lmax; + la_inc = M_PI / lmax; + + + /***************************/ + /* Speicher allokieren */ + /***************************/ + + cos_la = (double *) malloc ((size_t) (anz_m) * sizeof (double)); + sin_la = (double *) malloc ((size_t) (anz_m) * sizeof (double)); + + f_nord = (double *) malloc ((size_t) (anz_m) * sizeof (double)); + f_sued = (double *) malloc ((size_t) (anz_m) * sizeof (double)); + + c_sum_nord = (double *) malloc ((size_t) (lmax + 1) * + sizeof (double)); + s_sum_nord = (double *) malloc ((size_t) (lmax + 1) * + sizeof (double)); + c_sum_sued = (double *) malloc ((size_t) (lmax + 1) * + sizeof (double)); + s_sum_sued = (double *) malloc ((size_t) (lmax + 1) * + sizeof (double)); + + rc = legendre_dreieck_alloc (lmax, &lf); + ERRCHECK2_RC(1001,finfo,&lmax,NULL) + + rc = legendre_dreieck_alloc (lmax, &clm); + ERRCHECK2_RC(1001,finfo,&lmax,NULL) + + rc = legendre_dreieck_alloc (lmax, &slm); + ERRCHECK2_RC(1001,finfo,&lmax,NULL) + + + /******************************************************/ + /* Berechnung von cos lambda, sin lambda auf den */ + /* Gittermeridianen */ + /******************************************************/ + + for (k = 0, lambda = 0.0; k < anz_m; k ++, lambda += la_inc) + { + cos_la [k] = cos (lambda); + sin_la [k] = sin (lambda); + } + + + /******************************************************/ + /* Schleife über die Breitenkreise */ + /******************************************************/ + + + for (j = 1; j <= lmax / 2; j ++) + { + /****************************************/ + /* Nullstelle und Gewicht einlesen */ + /****************************************/ + + cp = fgets (zeile, 80, inpfile); + ERRCHECK2_NULL(cp,1002,finfo,&j,NULL) + +#if 0 + if (j == 2) + { + rc = 5; + ERRCHECK2_RC_R(1005,finfo,&lmax,cp5) + } + + + if ((cp = fgets (zeile, 80, inpfile)) == NULL) + { + printf ("Fehler beim Einlesen der Nullstellen\n"); + exit (20); + } +#endif + + sscanf (zeile, "%d %lf %lf", &dummy, &t_nullst, &alpha); + +#if 0 + dummy = 7; + + printf ("Achtung, j = %d", j); +#endif + + if (dummy != j) + { +#if 0 + fehler2 (__LINE__,1003,__FILE__,funk_name,stdout,finfo, + dummy, j, NULL, NULL, NULL, NULL, NULL); +#endif + error_message (__LINE__,1003,__FILE__,funk_name,error_liste, + finfo, &dummy, &j, NULL, NULL, NULL, NULL, NULL); + } + + + /****************************************/ + /* Legendre-Funktionen berechnen */ + /****************************************/ + + rc = leg_func_berechnen (t_nullst, lmax, lf); + + + for (m = 0; m <= lmax; m ++) + { + c_sum_nord [m] = 0.0; + s_sum_nord [m] = 0.0; + c_sum_sued [m] = 0.0; + s_sum_sued [m] = 0.0; + } + + + /****************************************/ + /* Funktionswerte berechnen (auf Nord- */ + /* und Südhalbkugel) */ + /****************************************/ + + rc = (*dat_funk) (anz_m, + t_nullst, + lf, + 'N', + f_nord, + arg1, + arg2, + arg3, + arg4, + arg5, + arg6); + + ERRCHECK2_RC_R(1004,finfo,NULL,NULL) + + rc = (*dat_funk) (anz_m, + -t_nullst, + lf, + 'S', + f_sued, + arg1, + arg2, + arg3, + arg4, + arg5, + arg6); + + ERRCHECK2_RC_R(1004,finfo,NULL,NULL) + + /***************************************************/ + /* Schleife über die Meridiane */ + /***************************************************/ + + for (k = 0; k < anz_m; k ++) + { + /****************************************/ + /* Schleife über die Ordnung der */ + /* Kff-Koeffiezienten */ + /****************************************/ + + c_sum_nord [0] += f_nord [k]; + c_sum_sued [0] += f_sued [k]; + + + for (m = 1, tri_ind = 0; m <= lmax; m ++) + { + /***************************************************/ + /* Aufsummieren: */ + /* */ + /* anz_m - 1 cos m*lambda */ + /* Summe f (lambda, phi) * */ + /* k=0 sin m*lambda */ + /* */ + /***************************************************/ + + tri_ind += k; + tri_ind %= anz_m; + + c_sum_nord [m] += (cos_la [tri_ind] * f_nord [k]); + s_sum_nord [m] += (sin_la [tri_ind] * f_nord [k]); + c_sum_sued [m] += (cos_la [tri_ind] * f_sued [k]); + s_sum_sued [m] += (sin_la [tri_ind] * f_sued [k]); + } + } + + + /*****************************************/ + /* Schleife über den Grad der */ + /* Kff-Koeffiezienten */ + /*****************************************/ + + sig_alt_st = -1; + + for (l = 0; l <= lmax; l ++) + { + sig_alt_st = -sig_alt_st; + sig_alt = sig_alt_st; + + clm [l][0] += (lf [l][0] * alpha * + (c_sum_nord [0] + sig_alt * c_sum_sued [0])); + + + for (m = 1; m <= l; m ++) + { + /***********************************/ + /* Gewicht auf Legendre-Funktionen */ + /* draufmultiplizieren */ + /***********************************/ + + sig_alt = -sig_alt; + + clm [l][m] += (lf [l][m] * alpha * + (c_sum_nord [m] + sig_alt * c_sum_sued [m])); + slm [l][m] += (lf [l][m] * alpha * + (s_sum_nord [m] + sig_alt * s_sum_sued [m])); + } + } + } + + + for (l = 0; l <= lmax; l ++) + { + clm [l][0] /= (2. * (double) (anz_m)); + + for (m = 1; m <= l; m ++) + { + clm [l][m] /= (2. * (double) (anz_m)); + slm [l][m] /= (2. * (double) (anz_m)); + } + } + + + /*************************************************/ + /* Berechnete KFF-Koeffizienten ausgeben */ + /*************************************************/ + + for (l = 0; l <= lmax; l ++) + { + for (m = 0; m <= l; m ++) + { + fprintf (outfile, "%3d%3d%19.12e%19.12e\n", + l, m, clm [l][m], slm [l][m]); + } + } + + + free (c_sum_nord); + free (s_sum_nord); + free (c_sum_sued); + free (s_sum_sued); + + free (cos_la); + free (sin_la); + + legendre_dreieck_free (&clm); + legendre_dreieck_free (&slm); + legendre_dreieck_free (&lf); + + return 0; +} + + diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_filter/geodesic_morph_rec/spezfunc.h saga-2.1.4+dfsg/src/modules/grid/grid_filter/geodesic_morph_rec/spezfunc.h --- saga-2.1.0+dfsg/src/modules/grid/grid_filter/geodesic_morph_rec/spezfunc.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_filter/geodesic_morph_rec/spezfunc.h 2014-11-13 08:32:17.000000000 +0000 @@ -0,0 +1,355 @@ +/********************************************************** + * Version $Id: spezfunc.h 1937 2014-01-11 18:22:42Z reklov_w $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// Grid_Filter / Grid_Calculus // +// // +//-------------------------------------------------------// +// // +// spezfunc.h // +// // +// Copyright (C) 2013 by // +// HfT Stuttgart // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: johannes.engels@hft-stuttgart.de // +// // +// contact: Johannes Engels // +// Hochschule fuer Technik Stuttgart // +// Schellingstr. 24 // +// 70174 Stuttgart // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#ifndef SPEZ +#define SPEZ + + + +typedef int (* daten_funktion) (int anz_mer, + double t_sin_phi, + double **lf, + char spiegel, + double *ergebnis, + void *arg1, + void *arg2, + void *arg3, + void *arg4, + void *arg5, + void *arg6); + + + + +/**********************************************************/ +/* Prototypen der externen Funktionen in spezfunc.c */ +/**********************************************************/ + +int read_coefficients (const char *filename, + int mindegree, + int maxdegree, + double ***c_lm, + double ***s_lm); + + + +/*******************************************************************/ +/* Nicht normierte Legendre-Polynome bis zum angegebenen */ +/* Entwicklungsgrad maxdeg rechnen */ +/* t = sin (phi) muss mitgegeben werden */ +/* Der Vektor lp muss im aufrufenden Programm genügend groß */ +/* allokiert sein (z.B. durch Funktion dvector_alloc in speiorg.c) */ +/*******************************************************************/ + +int leg_pol_berechnen (double t, + int maxdeg, + double *lp); + + +/*******************************************************************/ +/* Vollständig normierte Legendre-Funktionen bis zum angegebenen */ +/* Entwicklungsgrad maxdeg rechnen */ +/* t = sin (phi) muss mitgegeben werden */ +/* Die Matrix lf muss im aufrufenden Programm genügend groß */ +/* allokiert sein (z.B. durch Funktion legendre_dreieck_alloc */ +/* in speiorg.c) */ +/*******************************************************************/ + +int leg_func_berechnen (double t, + int maxdeg, + double **lf); + + +/*******************************************************************/ +/* Ableitungen der vollständig normierten Legendre-Funktionen nach */ +/* dem Argument t = sin (phi) bis zum angegebenen Entwicklungsgrad */ +/* maxdeg rechnen */ +/* t = sin (phi) sowie die Matrix lf der Legendre-Funktionen */ +/* selbst müssen mitgegeben werden */ +/* Die Matrix lf_der muss im aufrufenden Programm genügend groß */ +/* allokiert sein (z.B. durch Funktion legendre_dreieck_alloc */ +/* in speiorg.c) */ +/*******************************************************************/ + +int leg_func_deriv (double t, + int maxdeg, + double **lf, + double **lf_der); + + + + +/*******************************************************************/ +/* Harmonische Synthese in einem Einzelpunkt rechnen */ +/* */ +/* f = sum_{l=mindeg}^maxdeg * */ +/* sum_{m=0}^l leg_func_{l,m} (c_lm * cos (m*lambdar) + */ +/* s_lm * sin (m*lambdar)) */ +/* */ +/* */ +/* Winkelmass = 'A': lambda muss in Altgrad eingegeben werden */ +/* Winkelmass = 'R': lambda muss im Bogenmaß eingegeben werden */ +/* */ +/* mindeg muss >= 0 sein, andernfalls wird es gewaltsam auf 0 */ +/* gesetzt */ +/*******************************************************************/ + +int kff_synthese_einzelpunkt (double lambda, + char winkelmass, + double **leg_func, + int mindeg, + int maxdeg, + double **c_lm, + double **s_lm, + double *f); + + + + +/*******************************************************************/ +/* Harmonische Synthese in einem Einzelpunkt rechnen */ +/* */ +/* wie kff_synthese_einzelpunkt_S, aber es wird das Ergebnis nicht */ +/* für die Breite phi gewünscht, mit der die Legendre-Funktionen */ +/* berechnet wurden, sondern für die Breite -phi */ +/* ("Wert im symmetrisch zur Äquatorebene liegenden Punkt") */ +/* */ +/* Winkelmass = 'A': lambda muss in Altgrad eingegeben werden */ +/* Winkelmass = 'R': lambda muss im Bogenmaß eingegeben werden */ +/* */ +/* mindeg muss >= 0 sein, andernfalls wird es gewaltsam auf 0 */ +/* gesetzt */ +/*******************************************************************/ + +int kff_synthese_einzelpunkt_s (double lambda, + char winkelmass, + double **leg_func, + int mindeg, + int maxdeg, + double **c_lm, + double **s_lm, + double *f); + + + + + + + +/*******************************************************************/ +/* Harmonische Synthese auf einem Breitenkreis rechnen */ +/* */ +/* f = sum_{l=mindeg}^maxdeg * */ +/* sum_{m=0}^l leg_func_{l,m} (c_lm * cos (m*lambdar) + */ +/* s_lm * sin (m*lambdar)) */ +/* */ +/* Winkelmass = 'A': lambda_inc, lambda_anf und lambda_end müssen */ +/* in Altgrad eingegeben werden */ +/* Winkelmass = 'R': lambda_inc, lambda_anf und lambda_end müssen */ +/* im Bogenmaß eingegeben werden */ +/* */ +/* Es wird ab lambda_anf bis lambda_end mit lambda_inc als */ +/* Inkrement gerechnet. */ +/* Der Vektor f muss im aufrufenden Modul genügend groß allokiert */ +/* sein: Mindestgröße ist */ +/* (lambda_end - lambda_anf) / lambda_inc + 1 */ +/* */ +/* mindeg muss >= 0 sein, andernfalls wird es gewaltsam auf 0 */ +/* gesetzt */ +/*******************************************************************/ + +int kff_synthese_breitenkreis (double lambda_inc, + double lambda_anf, + double lambda_end, + char winkelmass, + double **leg_func, + int mindeg, + int maxdeg, + double **c_lm, + double **s_lm, + double *f); + + + + +/*******************************************************************/ +/* Harmonische Synthese auf einem Breitenkreis rechnen */ +/* */ +/* Im Gegensatz zu kff_synthese_breitenkreis wird hier voraus- */ +/* gesetzt, dass die Länge lambda aller Gitterpunkte jeweils ein */ +/* ganzzahliges Vielfaches des Inkrementes lambda_inc */ +/* 2 * pi / anz_mer und dass lambda = 360 Grad ein ganzzahliges */ +/* Vielfaches von lambda_inc ist. */ +/* Damit vereinfacht sich die Berechnung. */ +/* */ +/* f = sum_{l=mindeg}^maxdeg * */ +/* sum_{m=0}^l leg_func_{l,m} (c_lm * cos (m*lambdar) + */ +/* s_lm * sin (m*lambdar)) */ +/* */ +/* Es wird von 0 <= lambda < 360 Grad gerechnet */ +/* Der Vektor f muss im aufrufenden Modul genügend groß allokiert */ +/* sein: Mindestgröße ist anz_mer */ +/* */ +/* Die Vektoren cos_la und sin_la müssen bereits die */ +/* Werte */ +/* cos_la [k] = cos (k * lambda_inc) */ +/* sin_la [k] = sin (k * lambda_inc) */ +/* */ +/* für 0 <= k < anz_mer enthalten. */ +/* */ +/* mindeg muss >= 0 sein. */ +/* */ +/* Ist spiegel = 'S', so wird das Ergebnis nicht für die Breite */ +/* phi berechnet, mit der die Legendre-Funktionen */ +/* berechnet wurden, sondern für die Breite -phi */ +/* ("Wert im symmetrisch zur Äquatorebene liegenden Punkt") */ +/* */ +/*******************************************************************/ + +int kff_synthese_bk_ng (int anz_mer, + double **leg_func, + double *cos_la, + double *sin_la, + int mindeg, + int maxdeg, + char spiegel, + double **c_lm, + double **s_lm, + double *f); + + + + +/*******************************************************************/ +/* Harmonische Synthese auf einem regelmäßigen Gitter rechnen */ +/* */ +/* f = sum_{l=mindeg}^maxdeg * */ +/* sum_{m=0}^l leg_func_{l,m} (c_lm * cos (m*lambdar) + */ +/* s_lm * sin (m*lambdar)) */ +/* */ +/* Winkelmass = 'A': */ +/* winkel_inc, lambda_anf, lambda_end, phi_anf und phi_end müssen */ +/* in Altgrad mitgegeben werden */ +/* */ +/* Winkelmass = 'R': */ +/* winkel_inc, lambda_anf, lambda_end, phi_anf und phi_end müssen */ +/* im Bogenmaß mitgegeben werden */ +/* */ +/* Die Matrix f muss im aufrufenden Modul genügend groß allokiert */ +/* sein: Mindestgröße ist */ +/* [(phi_end - phi_anf) / winkel_inc + 1] * */ +/* [(lambda_end - lambda_anf) / winkel_inc + 1] */ +/* */ +/* mindeg muss >= 0 sein, andernfalls wird es gewaltsam auf 0 */ +/* gesetzt */ +/*******************************************************************/ + +int kff_synthese_regel_gitter (double winkel_inc, + double phi_anf, + double phi_end, + double lambda_anf, + double lambda_end, + char winkelmass, + int mindeg, + int maxdeg, + double **c_lm, + double **s_lm, + double **f, + char **error_liste); + +int kff_synthese_regel_gitter_m (double winkel_inc, + double phi_anf, + double phi_end, + double lambda_anf, + double lambda_end, + int numlat, + int numlong, + char winkelmass, + int mindeg, + int maxdeg, + double **c_lm, + double **s_lm, + double **f, + char **error_liste); + + +/**************************************************************/ +/* Programm zur harmonischen Analyse mit Hilfe einer */ +/* Gauss-Quadratur. Die Nullstellen des Legendre-Polynoms */ +/* vom Grad lmax (Entwicklungsgrad) sowie die Gewichte werden */ +/* vom Eingabefile inpfile gelesen. lmax muss gerade sein !! */ +/**************************************************************/ + +int harm_ana_gauss (FILE *inpfile, + FILE *outfile, + int lmax, + daten_funktion dat_funk, + void *arg1, + void *arg2, + void *arg3, + void *arg4, + void *arg5, + void *arg6, + char **error_liste); + +#endif + diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_filter/geodesic_morph_rec/storeorg.c saga-2.1.4+dfsg/src/modules/grid/grid_filter/geodesic_morph_rec/storeorg.c --- saga-2.1.0+dfsg/src/modules/grid/grid_filter/geodesic_morph_rec/storeorg.c 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_filter/geodesic_morph_rec/storeorg.c 2014-11-13 08:32:17.000000000 +0000 @@ -0,0 +1,2135 @@ +/********************************************************** + * Version $Id: storeorg.c 1936 2014-01-11 14:07:20Z reklov_w $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// Grid_Filter // +// // +//-------------------------------------------------------// +// // +// storeorg.c // +// // +// Copyright (C) 2013 by // +// HfT Stuttgart // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: johannes.engels@hft-stuttgart.de // +// // +// contact: Johannes Engels // +// Hochschule fuer Technik Stuttgart // +// Schellingstr. 24 // +// 70174 Stuttgart // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include +#include +#include +#include + +#include "storeorg.h" + + +#define SPMESSAGE nixtrace + +static int nixtrace (char *cp, ...) +{ + return 0; +} + + + +static void *mem_anker [ANZ_MEMPOOL] = { NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL }; + + +/*********************************************************************/ +/* Die folgenden beiden defines muessen immer aufeinander abgestimmt */ +/* werden ! */ +/*********************************************************************/ + +#define CAPS_MALLOC check_malloc +#define CAPS_FREE check_free + + + + + +static void *check_malloc (long ext_size) +{ + /******************************************************************/ + /* Diese Funktion ist nur fuer Aufrufe innerhalb von chain_malloc */ + /* oder chain_realloc gedacht. */ + /* */ + /* Belegung: */ + /* */ + /* 12 Byte Bereich zum Testen der Integritaet */ + /* 4 Byte voriger Speicherbereich | */ + /* 4 Byte naechster Speicherbereich | ext_size = */ + /* 4 Byte Groesse | size + 12 */ + /* size Byte Datenblock | */ + /* 12 Byte Bereich zum Testen der Integritaet */ + /* ----------------------------------------------------- */ + /* size+36 Byte insgesamt */ + /******************************************************************/ + + char *p; + + + SPMESSAGE ("Start check_malloc\n"); + SPMESSAGE ("size %ld\n", ext_size); + + p = malloc (ext_size + 24); + + if (p == NULL) + { + printf ("schrecklicher Fehler bei check_malloc:\n"); + printf ("Allokation gescheitert:\n"); + return NULL; + } + + memset (p, 0x00, ext_size + 24); + + memcpy (p, "<0123456789>", 12); + memcpy (p + 12 + ext_size, "<0123456789>", 12); + p += 12; + + SPMESSAGE ("p %p\n", p); + SPMESSAGE ("Ende check_malloc\n"); + + return p; +} + + + + + +static void check_free (void *palt) + +{ + char *p; + long size_lfd; + + SPMESSAGE ("Start check_free\n"); + SPMESSAGE ("palt %p \n", palt); + + if (palt == NULL) + { + printf ("schrecklicher Fehler in check_free\n"); + printf ("NULL-pointer erhalten\n"); + return; + } + + p = palt; + p -= 12; + + + SPMESSAGE ("Pruefung der Integritaet\n"); + + if (memcmp (p, "<0123456789>", 12) != 0) + { + printf ("check_free - schrecklicher Speicherfehler\n"); + printf ("Bereich vor Datenblock zerstoert\n"); + exit (20); + } + + size_lfd = *((long *)(p + 20)); + + if (memcmp (p + 24 + size_lfd, "<0123456789>", 12) != 0) + { + printf ("check_free - schrecklicher Speicherfehler\n"); + printf ("Bereich nach Datenblock zerstoert\n"); + exit (20); + } + + free ((void *) p); + + SPMESSAGE ("Ende check_free\n"); + + return; +} + + + + + + +void *chain_malloc (long size, short mempool) +{ + /*******************************************************************/ + /* Belegung: */ + /* */ + /* 4 Byte voriger Speicherbereich */ + /* 4 Byte naechster Speicherbereich */ + /* 4 Byte Groesse */ + /* size Byte Datenblock */ + /* ----------------------------------------------------- */ + /* size+12 Byte insgesamt */ + /* */ + /* Der mem_anker ist jeweils das NEUESTE Element! */ + /* */ + /* Ist allerdings CAPS_MALLOC als check_malloc definiert, also */ + /* #define CAPS_MALLOC check_malloc , */ + /* so wird zusaetzlich ein Prueffeld (Magic) vorne und hinten */ + /* angehaengt, es gilt dann folgende Konvention fuer die Belegung */ + /* des allokierten Arrays: */ + /* */ + /* [<0123456789> | prev | next | size | DATEN | <0123456789>] */ + /* [ 12 Bytes | 4 B | 4 B | 4 B | size | 12 Bytes ] */ + /* ^ ^ */ + /* | | */ + /* | | */ + /* (hierher zeigt der Zeiger, den | */ + /* man von CAPS_MALLOC zurueck- | */ + /* bekommt, und DIESE Adresse | */ + /* steht in mem_anker, falls der | */ + /* Speicherbereich das neueste | */ + /* Element ist) | */ + /* | */ + /* (hierher zeigt der Zeiger, den */ + /* chain_malloc zurueckgibt) */ + /* */ + /*******************************************************************/ + + char *p; + char *ph; + + SPMESSAGE ("Start chain_malloc\n"); + SPMESSAGE ("size %ld\n", size); + + if (mempool < 0 || mempool >= ANZ_MEMPOOL) + return NULL; + + p = CAPS_MALLOC (size + 12); + + if (p == NULL) + { + printf ("schrecklicher Fehler bei CAPS_MALLOC:\n"); + printf ("Allokation gescheitert:\n"); + return NULL; + } + + memset (p, 0x00, size + 12); + + /*******************************************************************/ + /* In die ersten vier Bytes von p kommt die Speicheradresse des */ + /* derzeitigen mem_ankers rein. Danach kommt umgekehrt in die */ + /* Bytes 5 - 8 des mem_ankers, falls ungleich NULL, die Adresse */ + /* von p rein. */ + /*******************************************************************/ + + * ((void **) p) = mem_anker [mempool]; + + if (mem_anker [mempool] != NULL) + { + ph = mem_anker [mempool]; + ph += 4; + *((void **) ph) = p; + } + + mem_anker [mempool] = p; + + *((long *)(p + 8)) = size; + p += 12; + + + SPMESSAGE ("p %p\n", p); + SPMESSAGE ("Ende chain_malloc\n"); + + return p; +} + + + + + +void chain_free (void *palt) + +{ + char *p; + char *p_prev; + char *p_next; + short i; + short gefunden; + + SPMESSAGE ("Start chain_free\n"); + SPMESSAGE ("palt %p \n", palt); + + if (palt == NULL) + { + printf ("schrecklicher Fehler in chain_free\n"); + printf ("NULL-pointer erhalten\n"); + return; + } + + + p = palt; + p -= 12; + + /*******************************/ + /* Bereiche neu verpointern */ + /*******************************/ + + p_prev = *((void **) p); + p_next = *((void **) (p + 4)); + + if (p_prev != NULL) + *((void **) (p_prev + 4)) = p_next; + + if (p_next != NULL) + *((void **) (p_next)) = p_prev; + else + { + gefunden = 0; + //#pragma omp parallel for + for (i = 0; i < ANZ_MEMPOOL; i ++) + { + if ((void *) p == mem_anker [i]) + { + gefunden = 1; + break; + } + } + + if (gefunden > 0) + mem_anker [i] = p_prev; + else + { + printf ("schrecklicher Fehler: chain-Element ohne Anker\n"); + return; + } + } + + CAPS_FREE ((void *) p); + + SPMESSAGE ("Ende chain_free\n"); + + return; +} + + + + + +void *chain_realloc (void *palt, + long newsize, + short mempool) + +{ + /*******************************************************************/ + /* Hier koennte man das Element auch unter der Hand in einen */ + /* anderen mempool verschieben. */ + /*******************************************************************/# + + void *p; + long oldsize; + char *ph; + + SPMESSAGE ("Start chain_realloc"); + + p = chain_malloc (newsize, mempool); + + if (p != NULL) + { + if (palt != NULL) + { + ph = palt; + oldsize = *((long *)(ph - 4)); + + if (oldsize != 0) + memcpy (p, palt, oldsize); + + chain_free (palt); + } + } + else + printf ("schrecklicher Fehler: chain_realloc gescheitert!\n"); + + SPMESSAGE ("Ende chain_realloc"); + + return p; +} + + + + + +void chain_integrity (short mempool) +{ + /******************************************************************/ + /* Belegung: */ + /* */ + /* 12 Byte Bereich zum Testen der Integritaet */ + /* 4 Byte voriger Speicherbereich */ + /* 4 Byte naechster Speicherbereich */ + /* 4 Byte Groesse */ + /* size Byte Datenblock */ + /* 12 Byte Bereich zum Testen der Integritaet */ + /* ----------------------------------------------------- */ + /* size+36 Byte insgesamt */ + /******************************************************************/ + + char *p2; + long size_lfd; + + SPMESSAGE ("Pruefung der Integritaet, mempool %hd\n", mempool); + //#pragma omp parallel for + for (p2 = mem_anker [mempool]; p2 != NULL; p2 = * ((void **) p2)) + { + if (memcmp (p2 - 12, "<0123456789>", 12) != 0) + { + printf ("chain_integrity - " + "schrecklicher Speicherfehler\n"); + printf ("Bereich vor Datenblock zerstoert\n"); + exit (20); + } + + size_lfd = *((long *)(p2 + 8)); + + if (memcmp (p2 + 12 + size_lfd, "<0123456789>", 12) != 0) + { + printf ("chain_integrity - " + "schrecklicher Speicherfehler\n"); + printf ("Bereich nach Datenblock zerstoert\n"); + exit (20); + } + } + + printf ("Integritaet mempool %hd ok\n", mempool); + + return; +} + + + + + +void chain_all_free (short mempool) + +{ + void *cp; + void *cp_prev; + //#pragma omp parallel for + for (cp = mem_anker [mempool]; cp != NULL; cp = cp_prev) + { + cp_prev = * ((void **) cp); + CAPS_FREE (cp); + } + + mem_anker [mempool] = NULL; + + return; +} + + +/*********************************************************************/ +/* eigenes (modifiziertes) basis_malloc usw. */ +/* realloc selbst, malloc und free durch */ +/* Standard-Speicherverwaltung realisiert; */ +/* Bereiche verpointern und jedesmal die Integritaet der */ +/* Kette checken */ +/*********************************************************************/ + +static void *stor_kette = NULL; + + +void *basis_malloc (long size) +{ + /******************************************************************/ + /* Belegung: */ + /* */ + /* 4 Byte voriger Speicherbereich */ + /* 4 Byte naechster Speicherbereich */ + /* 4 Byte Groesse */ + /* 12 Byte Bereich zum Testen der Integritaet */ + /* size Byte Datenblock */ + /* 12 Byte Bereich zum Testen der Integritaet */ + /* ----------------------------------------------------- */ + /* size+36 Byte insgesamt */ + /******************************************************************/ + + + char *p; + char *ph; + +#if 0 + char *p2; + long size_lfd; +#endif + + SPMESSAGE ("Start basis_malloc\n"); + SPMESSAGE ("size %ld\n", size); + + p = malloc (size + 36); + + if (p == NULL) + { + printf ("schrecklicher Fehler bei basis_malloc:\n"); + printf ("Allokation gescheitert:\n"); + return NULL; + } + + memset (p, 0x00, size + 36); + + /*******************************************************************/ + /* In die ersten vier Bytes von p kommt die Speicheradresse von */ + /* stor_kette rein. Danach kommt umgekehrt in die Bytes 5 - 8 */ + /* von stor_kette, falls ungleich NULL, die Adresse von p rein. */ + /* (Ist das noetig, die Liste doppelt zu verketten?) */ + /*******************************************************************/ + + * ((void **) p) = stor_kette; + + if (stor_kette != NULL) + { + ph = stor_kette; + ph += 4; + *((void **) ph) = p; + } + + stor_kette = p; + + *((long *)(p + 8)) = size; + memcpy (p + 12, "<0123456789>", 12); + memcpy (p + 24 + size, "<0123456789>", 12); + p += 24; + +#if 0 + SPMESSAGE ("Pruefung der Integritaet\n"); + + for (p2 = stor_kette; p2 != NULL; p2 = * ((void **) p2)) + { + if (memcmp (p2 + 12, "<0123456789>", 12) != 0) + { + printf ("basis_malloc - schrecklicher Speicherfehler\n"); + printf ("Bereich vor Datenblock zerstoert\n"); + exit (20); + } + + size_lfd = *((long *)(p2 + 8)); + + if (memcmp (p2 + 24 + size_lfd, "<0123456789>", 12) != 0) + { + printf ("basis_malloc - schrecklicher Speicherfehler\n"); + printf ("Bereich nach Datenblock zerstoert\n"); + exit (20); + } + } +#endif + + SPMESSAGE ("p %p\n", p); + SPMESSAGE ("Ende basis_malloc\n"); + + return p; +} + + + + +void basis_free (void *palt) + +{ + char *p; + char *p_prev; + char *p_next; + long size_lfd; + + SPMESSAGE ("Start basis_free\n"); + SPMESSAGE ("palt %p \n", palt); + + if (palt == NULL) + { + printf ("schrecklicher Fehler in basis_free\n"); + printf ("NULL-pointer erhalten\n"); + return; + } + + + p = palt; + p -= 24; + + + SPMESSAGE ("Pruefung der Integritaet\n"); + + if (memcmp (p + 12, "<0123456789>", 12) != 0) + { + printf ("basis_free - schrecklicher Speicherfehler\n"); + printf ("Bereich vor Datenblock zerstoert\n"); + exit (20); + } + + size_lfd = *((long *)(p + 8)); + + if (memcmp (p + 24 + size_lfd, "<0123456789>", 12) != 0) + { + printf ("basis_free - schrecklicher Speicherfehler\n"); + printf ("Bereich nach Datenblock zerstoert\n"); + exit (20); + } + + /*******************************/ + /* Bereiche neu verpointern */ + /*******************************/ + + p_prev = *((void **) p); + p_next = *((void **) (p + 4)); + + if (p_prev != NULL) + *((void **) (p_prev + 4)) = p_next; + + if (p_next != NULL) + *((void **) (p_next)) = p_prev; + else + stor_kette = p_prev; + + free ((void *) p); + + SPMESSAGE ("Ende basis_free\n"); + + return; +} + + + + + +void integritaet_pruefen (void) +{ + /******************************************************************/ + /* Belegung: */ + /* */ + /* 4 Byte voriger Speicherbereich */ + /* 4 Byte naechster Speicherbereich */ + /* 4 Byte Groesse */ + /* 12 Byte Bereich zum Testen der Integritaet */ + /* size Byte Datenblock */ + /* 12 Byte Bereich zum Testen der Integritaet */ + /* ----------------------------------------------------- */ + /* size+36 Byte insgesamt */ + /******************************************************************/ + + char *p2; + long size_lfd; + + SPMESSAGE ("Pruefung der Integritaet\n"); + + //#pragma omp parallel for + for (p2 = stor_kette; p2 != NULL; p2 = * ((void **) p2)) + { + if (memcmp (p2 + 12, "<0123456789>", 12) != 0) + { + printf ("integritaet_pruefen - " + "schrecklicher Speicherfehler\n"); + printf ("Bereich vor Datenblock zerstoert\n"); + exit (20); + } + + size_lfd = *((long *)(p2 + 8)); + + if (memcmp (p2 + 24 + size_lfd, "<0123456789>", 12) != 0) + { + printf ("integritaet_pruefen - " + "schrecklicher Speicherfehler\n"); + printf ("Bereich nach Datenblock zerstoert\n"); + exit (20); + } + } + + printf ("Integritaet ok\n"); + + return; +} + + + + +int adr_in_kette_finden (void *adr) +{ + /******************************************************************/ + /* Belegung: */ + /* */ + /* 4 Byte voriger Speicherbereich */ + /* 4 Byte naechster Speicherbereich */ + /* 4 Byte Groesse */ + /* 12 Byte Bereich zum Testen der Integritaet */ + /* size Byte Datenblock */ + /* 12 Byte Bereich zum Testen der Integritaet */ + /* ----------------------------------------------------- */ + /* size+36 Byte insgesamt */ + /******************************************************************/ + + char *p2; + long size_lfd; + int rc; + + SPMESSAGE ("Pruefung der Integritaet\n"); + + rc = 0; + //#pragma omp parallel for + for (p2 = stor_kette; p2 != NULL; p2 = * ((void **) p2)) + { + if (memcmp (p2 + 12, "<0123456789>", 12) != 0) + { + printf ("integritaet_pruefen - " + "schrecklicher Speicherfehler\n"); + printf ("Bereich vor Datenblock zerstoert\n"); + exit (20); + } + + if (p2 + 24 == ((char *) adr)) + rc = 1; + + size_lfd = *((long *)(p2 + 8)); + + if (memcmp (p2 + 24 + size_lfd, "<0123456789>", 12) != 0) + { + printf ("integritaet_pruefen - " + "schrecklicher Speicherfehler\n"); + printf ("Bereich nach Datenblock zerstoert\n"); + exit (20); + } + } + + return rc; +} + + + + +void *basis_calloc (long length, int obj_size) +{ + void *p; + + p = basis_malloc (length * obj_size); + + return p; +} + + + + +void integritaet_speziell (void *palt) + +{ + char *p; + long size_lfd; + + p = palt; + p -= 24; + + + SPMESSAGE ("Pruefung der Integritaet\n"); + + if (memcmp (p + 12, "<0123456789>", 12) != 0) + { + printf ("integritaet_speziell - schrecklicher Speicherfehler\n"); + printf ("Bereich vor Datenblock zerstoert\n"); + exit (20); + } + + size_lfd = *((long *)(p + 8)); + + if (memcmp (p + 24 + size_lfd, "<0123456789>", 12) != 0) + { + printf ("integritaet_speziell - schrecklicher Speicherfehler\n"); + printf ("Bereich nach Datenblock zerstoert\n"); + exit (20); + } + + return; +} + + + + + + +void *basis_realloc (void *palt, + long newsize) + +{ + void *p; + long oldsize; + char *ph; + + SPMESSAGE ("Start basis_realloc"); + + p = basis_malloc (newsize); + + if (p != NULL) + { + if (palt != NULL) + { + ph = palt; + oldsize = *((long *)(ph - 16)); + + if (oldsize != 0) + memcpy (p, palt, oldsize); + + basis_free (palt); + } + } + else + printf ("schrecklicher Fehler: realloc gescheitert!\n"); + + SPMESSAGE ("Ende basis_realloc"); + + return p; +} + + + + +/**********************************************************************/ +/* einen double-Vektor mit Indexbereich 0 ... n allokieren und */ +/* initialisieren. Es wird also immer ein Element mehr allokiert als */ +/* im Prinzip noetig waere. */ +/**********************************************************************/ + +double *dvector_alloc (long n) +{ + double *v; + + v = (double *) BASIS_CALLOC ((size_t) (n + 1), sizeof (double)); + + return v; +} + + + + + +size_t element_length (char type) +{ + switch (type) + { + case 'C': + return (sizeof (char)); + + case 'U': + return (sizeof (unsigned char)); + + case 'H': + return (sizeof (unsigned short)); + + case 'S': + return (sizeof (short)); + + case 'I': + return (sizeof (int)); + + case 'L': + return (sizeof (long)); + + case 'F': + return (sizeof (float)); + + case 'D': + return (sizeof (double)); + + default: + return 0; + } +} + + + +/**********************************************************************/ +/* einen Vektor mit Indexbereich 0 ... n allokieren und */ +/* initialisieren. Es wird also immer ein Element mehr allokiert als */ +/* im Prinzip noetig waere. */ +/**********************************************************************/ + +void *vector_alloc (long n, char type) +{ + size_t el; + + el = element_length (type); + return BASIS_CALLOC ((size_t) (n + 1), el); +} + + + + +double *basis_dvector_alloc (long n) +{ + /***********************************************************/ + /* einen Vektor mit Indexbereich 1 ... n allokieren */ + /* und initialisieren */ + /***********************************************************/ + + double *v; + + v = (double *) basis_calloc ((size_t) (n + 1), sizeof (double)); + + return v; +} + + + +#if 0 +float *fvector_alloc (long n) +{ + /***********************************************************/ + /* einen Vektor mit Indexbereich 1 ... n allokieren */ + /* und initialisieren */ + /***********************************************************/ + + float *v; + + v = (float *) calloc ((size_t) (n + 1), sizeof (float)); + + return v; +} + + + + +float *fvector_alloc_1 (long n) +{ + /***********************************************************/ + /* einen Vektor mit Indexbereich 1 ... n allokieren */ + /* und initialisieren */ + /***********************************************************/ + + float *v; + + v = (float *) calloc ((size_t) (n + 1), sizeof (float)); + + return v; +} + + + + +int *ivector_alloc_1 (long n) +{ + /***********************************************************/ + /* einen Int-Vektor mit Indexbereich 1 ... n allokieren */ + /* und initialisieren */ + /***********************************************************/ + + int *v; + + v = (int *) calloc ((size_t) (n + 1), sizeof (int)); + + return v; +} +#endif + + +void *vector_realloc (void *v, long n_alt, long n_neu, char type) +{ + /*******************************************************************/ + /* einen Vektor reallokieren und den neuen Bereich initialisieren */ + /*******************************************************************/ + + void *u; + size_t el; + + el = element_length (type); + + u = BASIS_REALLOC (v, (size_t) ((n_neu + 1) * el)); + + if (n_neu > n_alt) + memset (((char *) u) + (n_alt + 1) * el, + 0x00, + (n_neu - n_alt) * el); + + return u; +} + + + + +double *dvector_realloc (double *v, long n_alt, long n_neu) +{ + /***********************************************************/ + /* einen double-Vektor auf den Indexbereich 1 ... n_neu */ + /* reallokieren und den neuen Bereich initialisieren */ + /***********************************************************/ + + double *u; + + u = (double *) BASIS_REALLOC (v, ((size_t) (n_neu + 1)) * + sizeof (double)); + + if (n_neu > n_alt) + memset (u + n_alt + 1, 0x00, (n_neu - n_alt) * sizeof (double)); + + return u; +} + + + + +double *dvector_realloc_1 (double *v, long n_alt, long n_neu) +{ + /***********************************************************/ + /* einen double-Vektor auf den Indexbereich 1 ... n_neu */ + /* reallokieren und den neuen Bereich initialisieren */ + /***********************************************************/ + + double *u; + + u = (double *) realloc (v, ((size_t) (n_neu + 1)) * sizeof (double)); + + if (n_neu > n_alt) + memset (u + n_alt + 1, 0x00, (n_neu - n_alt) * sizeof (double)); + + return u; +} + + + + +void ivector_free (int *v) + +{ + /***************************************************************/ + /* einen int-Vektor freigeben */ + /***************************************************************/ + + BASIS_FREE (v); + return; +} + + + + +void vector_free (void *v) + +{ + /***************************************************************/ + /* einen Vektor freigeben */ + /***************************************************************/ + + BASIS_FREE (v); + return; +} + + + + +void dvector_free (double *v) + +{ + /***************************************************************/ + /* einen double-Vektor freigeben */ + /***************************************************************/ + + BASIS_FREE (v); + return; +} + + + + +void fvector_free (float *v) + +{ + /***************************************************************/ + /* einen double-Vektor freigeben */ + /***************************************************************/ + + BASIS_FREE (v); + return; +} + + + + +/**********************************************************************/ +/* Double-Matrix mit Indexbereich */ +/* indexing, ... num_rows + indexing - 1 (Zeilen), */ +/* indexing, ... num_cols + indexing - 1 (Spalten) */ +/* allokieren */ +/* Hier wird nur der Vektor von Zeigern auf die Zeilen allokiert und */ +/* gesetzt. indexing kann 0 oder 1 sein. */ +/* Der erste Zeiger m [indexing] zeigt auf den mitgegebenen Vektor a, */ +/* so dass m [indexing][indexing] = a [indexing]. */ +/**********************************************************************/ + +double **dmatrix_pointer_alloc (double *a, + long num_rows, + long num_cols, + short indexing) +{ + double **m; + long row_start; + long end_row; + long j; + + + if (indexing < 0 || indexing > 1) + return NULL; + + m = (double **) BASIS_MALLOC ((size_t) (num_rows + indexing) * + sizeof (double *)); + if (m == NULL) + return NULL; + + m [0] = a; + + row_start = (1 - indexing) * num_cols; + end_row = num_rows + indexing; + //#pragma omp parallel for + for (j = 1; j < end_row; j ++, row_start += num_cols) + m [j] = a + row_start; + + return m; +} + + + + + +/**********************************************************************/ +/* Matrix mit Indexbereich */ +/* indexing, ... num_rows + indexing - 1 (Zeilen), */ +/* indexing, ... num_cols + indexing - 1 (Spalten) */ +/* allokieren */ +/* Hier wird nur der Vektor von Zeigern auf die Zeilen der Matrix */ +/* allokiert und auf die entsprechenden Elemente des mitgegebenen */ +/* Datenvektors a gesetzt. indexing kann 0 oder 1 sein. */ +/* Der erste Zeiger m [indexing] zeigt auf den mitgegebenen Vektor a, */ +/* so dass m [indexing][indexing] = a [indexing]. */ +/* Unabhaengig von indexing ist m [0] = a. */ +/* */ +/* Folgende Typen sind moeglich: D -- double */ +/* F -- float */ +/* I -- int */ +/* S -- short */ +/* L -- long */ +/* C -- char */ +/* U -- unsigned char */ +/* */ +/* Diese Funktion ist noch nicht genuegend getestet. Falls sie nicht */ +/* richtig funktioniert, kann man auf die kommentierte Variante */ +/* in speiorg.c zurueckgreifen !!!! */ +/**********************************************************************/ + +void **matrix_pointer_alloc (void *a, + long num_rows, + long num_cols, + char type, + short indexing) +{ + size_t el; + long end_row; + void **m; + char *acurr; + long j; + + el = element_length (type); + + if (indexing < 0 || indexing > 1) + return NULL; + + end_row = num_rows + indexing; + + m = (void **) BASIS_MALLOC ((size_t) (num_rows + indexing) * + sizeof (void *)); + if (m == NULL) + return NULL; + + if (indexing == 1) + m [0] = a; + + acurr = (char *) a; + //#pragma omp parallel for + for (j = indexing; j < end_row; j ++, acurr += (num_cols * el)) + m [j] = (void *) acurr; + + return m; +} + + + + +void ***array_3_pointer_alloc (void *a, + long num_rows, + long num_cols, + long num_levs, + char type, + short indexing) +{ + size_t el; + long end_row; + long num_last_dims; + void ***p; + char *acurr; + long j; + + el = element_length (type); + + if (indexing < 0 || indexing > 1) + return NULL; + + end_row = num_rows + indexing; + num_last_dims = num_cols * num_levs; + + + p = (void ***) BASIS_MALLOC ((size_t) end_row * sizeof (void **)); + + if (p == NULL) + return NULL; + + if (indexing == 1) + p [0] = &a; + + acurr = (char *) a; + + for (j = indexing; j < end_row; j ++, acurr += (num_last_dims * el)) + { + p [j] = matrix_pointer_alloc (acurr, + num_cols, + num_levs, + type, + indexing); + if (p [j] == NULL) + return NULL; + } + + return p; +} + + + + +void ****array_4_pointer_alloc (void *a, + long num_rows, + long num_cols, + long num_levs, + long num_elems, + char type, + short indexing) +{ + size_t el; + long end_row; + long num_last_dims; + void ****p; + char *acurr; + long j; + + el = element_length (type); + + if (indexing < 0 || indexing > 1) + return NULL; + + end_row = num_rows + indexing; + num_last_dims = num_cols * num_levs * num_elems; + + + p = (void ****) BASIS_MALLOC ((size_t) end_row * sizeof (void ***)); + + if (p == NULL) + return NULL; + + if (indexing == 1) + p [0][0] = &a; + + acurr = (char *) a; + //#pragma omp parallel for + for (j = indexing; j < end_row; j ++, acurr += (num_last_dims * el)) + { + p [j] = array_3_pointer_alloc (acurr, + num_cols, + num_levs, + num_elems, + type, + indexing); + if (p [j] == NULL) + return NULL; + } + + return p; +} + + + + +void **matrix_all_alloc (long zn, long sn, char type, short indexing) +{ + void *a; + long ges_laenge; + + ges_laenge = zn * sn; + + a = vector_alloc (ges_laenge, type); + + if (a == NULL) + return NULL; + + return matrix_pointer_alloc (a, zn, sn, type, indexing); +} + + + + + + +void ***array_3_all_alloc (long zn, + long sn, + long hn, + char type, + short indexing) +{ + void *a; + long ges_laenge; + + ges_laenge = zn * sn * hn; + + a = vector_alloc (ges_laenge, type); + + if (a == NULL) + return NULL; + + return array_3_pointer_alloc (a, zn, sn, hn, type, indexing); +} + + + + + + +void **matrix_realloc_zeilen (void **m, + long zn_alt, + long zn_neu, + long sn, + char type, + short indexing) +{ + /***********************************************************/ + /* eine Matrix reallokieren. */ + /* Nur die Anzahl der Zeilen darf sich aendern! */ + /***********************************************************/ + + void **m_neu; + void *a; + long ges_laenge_alt; + long ges_laenge_neu; + + + a = m [0]; + + ges_laenge_alt = zn_alt * sn; + ges_laenge_neu = zn_neu * sn; + + a = vector_realloc (a, ges_laenge_alt, ges_laenge_neu, type); + + if (a == NULL) + return NULL; + + BASIS_FREE (m); + m_neu = matrix_pointer_alloc (a, zn_neu, sn, type, indexing); + + return m_neu; +} + + + + +double **dmatrix_zeiger_alloc_1 (double *a, long zn, long sn) +{ + /***********************************************************/ + /* eine Matrix mit Indexbereich 1, ... zn (Zeilen) */ + /* 1, ... sn (Spalten) */ + /* allokieren */ + /* Hier wird nur der Vektor von Zeigern allokiert und */ + /* gesetzt. Der erste Zeiger m [1] zeigt auf den */ + /* mitgegebenen Vektor a, so dass m [1][1] = a [1]. */ + /***********************************************************/ + + double **m; + long i; + + m = (double **) malloc ((size_t) (zn + 1) * sizeof (double *)); + + if (m == NULL) + return NULL; + + m [0] = a; + #pragma omp parallel for + for (i = 0; i < zn; i ++) + m [i + 1] = a + i * sn; + + return m; +} + + + + + + + + +double **basis_dmatrix_zeiger_alloc (double *a, long zn, long sn) +{ + /***********************************************************/ + /* eine Matrix mit Indexbereich 1, ... zn (Zeilen) */ + /* 1, ... sn (Spalten) */ + /* allokieren */ + /* Hier wird nur der Vektor von Zeigern allokiert und */ + /* gesetzt. Der erste Zeiger m [1] zeigt auf den */ + /* mitgegebenen Vektor a, so dass m [1][1] = a [1]. */ + /***********************************************************/ + + double **m; + long i; + + m = (double **) basis_malloc ((size_t) (zn + 1) * + sizeof (double *)); + + if (m == NULL) + return NULL; + + m [0] = a; + #pragma omp parallel for + for (i = 0; i < zn; i ++) + m [i + 1] = a + i * sn; + + return m; +} + + + + +double **basis_dmatrix_zeiger_alloc_1 (double *a, long zn, long sn) +{ + /***********************************************************/ + /* eine Matrix mit Indexbereich 1, ... zn (Zeilen) */ + /* 1, ... sn (Spalten) */ + /* allokieren */ + /* Hier wird nur der Vektor von Zeigern allokiert und */ + /* gesetzt. Der erste Zeiger m [1] zeigt auf den */ + /* mitgegebenen Vektor a, so dass m [1][1] = a [1]. */ + /***********************************************************/ + + double **m; + long i; + + m = (double **) basis_malloc ((size_t) (zn + 1) * + sizeof (double *)); + + if (m == NULL) + return NULL; + + m [0] = a; + #pragma omp parallel for + for (i = 0; i < zn; i ++) + m [i + 1] = a + i * sn; + + return m; +} + + + + +double **basis_dmatrix_zeiger_alloc_0 (double *a, long zn, long sn) +{ + /***********************************************************/ + /* eine Matrix mit Indexbereich 0, ... zn - 1 (Zeilen) */ + /* 0, ... sn - 1 (Spalten) */ + /* allokieren */ + /* Hier wird nur der Vektor von Zeigern allokiert und */ + /* gesetzt. Der erste Zeiger m [0] zeigt auf den */ + /* mitgegebenen Vektor a, so dass m [0][0] = a [0]. */ + /***********************************************************/ + + double **m; + long i; + + m = (double **) basis_malloc ((size_t) zn * sizeof (double *)); + + if (m == NULL) + return NULL; + #pragma omp parallel for + for (i = 0; i < zn; i ++) + m [i] = a + i * sn; + + return m; +} + + + + + + + +double **doberes_dreieck_zeiger_alloc (double *a, long n) +{ + /***********************************************************/ + /* eine Matrix mit Indexbereich i = 1, ....... n (Zeilen) */ + /* j = i, ... n (Spalten) */ + /* allokieren */ + /* Hier wird nur der Vektor von Zeigern allokiert und */ + /* gesetzt. Der erste Zeiger m [1] zeigt auf den */ + /* mitgegebenen Vektor a, so dass m [1][1] = a [1]. */ + /***********************************************************/ + + double **m; + long i; + double *b; + + m = (double **) BASIS_MALLOC ((size_t) (n + 1) * sizeof (double *)); + + if (m == NULL) + return NULL; + + b = a; + m [0] = a; + + #pragma omp parallel for + for (i = 0; i < n; i ++) + { + m [i + 1] = b; + b += (n - i - 1); + } + + return m; +} + + + +/**********************************************************************/ +/* Matrix mit Indexbereich */ +/* i = indexing, ... num_rows + indexing - 1 (Zeilen), */ +/* j = i, ... num_rows + indexing - 1 (Spalten) */ +/* allokieren */ +/* Hier wird nur der Vektor von Zeigern auf die Zeilen allokiert und */ +/* gesetzt. indexing kann 0 oder 1 sein. */ +/* Der erste Zeiger m [indexing] zeigt auf den mitgegebenen Vektor a, */ +/* so dass m [indexing][indexing] = a [indexing]. */ +/* */ +/* Folgende Typen sind moeglich: D -- double */ +/* F -- float */ +/* I -- int */ +/* S -- short */ +/* L -- long */ +/* C -- char */ +/* U -- unsigned char */ +/* */ +/* Diese Version ist experimentell und noch nicht genuegend */ +/* getestet. Falls sie nicht gut funktioniert, kann man auf die */ +/* kommentierte Version in speiorg.c zurueckgreifen. */ +/**********************************************************************/ + +void **upper_triangle_pointer_alloc (void *a, + long num_rows, + char type, + short indexing) +{ + size_t el; + long j; + long end_row; + long inc_start; + char *acurr; + void **m; + + + el = element_length (type); + + if (indexing < 0 || indexing > 1) + return NULL; + + end_row = num_rows + indexing; + + + /*******************************************************************/ + /* Das Inkrement von einem Zeiger auf eine Zeile zur naechsten ist */ + /* schon am Anfang eins kleiner als die Anzahl der Zeilen: Die */ + /* Die erste Zeile hat num_rows Elemente, dann kommt aber im Falle */ + /* indexing = 1 schon m [2][2], es muss also m [2][0] dasselbe */ + /* Element sein wie m [1][num_rows - 1]. */ + /*******************************************************************/ + + inc_start = (num_rows - 1) * (long)el; + + acurr = (char *) a; + + m = BASIS_MALLOC ((size_t) (num_rows + indexing) * sizeof (void *)); + + if (m == NULL) + return NULL; + + if (indexing == 1) + m [0] = a; + //#pragma omp parallel for + for (j = indexing; j < end_row; j ++, inc_start -= (long)el) + { + m [j] = (void *) acurr; + acurr += inc_start; + } + + return m; +} + + + + +void **upper_triangle_all_alloc (long num_rows, + char type, + short indexing) +{ + + void *a; + long ges_laenge; + + ges_laenge = (num_rows + 1) * num_rows; + ges_laenge = ges_laenge / 2 + indexing; + + a = vector_alloc (ges_laenge, type); + + if (a == NULL) + return NULL; + + return upper_triangle_pointer_alloc (a, num_rows, type, indexing); +} + + + + +void dmatrix_zeiger_free (double **m) +{ + /***********************************************************/ + /* den Vektor mit Zeigern auf die Zeilen der Matrix */ + /* freigeben (Gegenstueck zu dmatrix_zeiger_alloc und zu */ + /* dmatrix_zeiger_alloc_0) */ + /***********************************************************/ + + BASIS_FREE (m); + return; +} + + + + +void matrix_pointer_free (void **m) +{ + /***********************************************************/ + /* den Vektor mit Zeigern auf die Zeilen der Matrix */ + /* freigeben (Gegenstueck zu matrix_pointer_alloc) */ + /***********************************************************/ + + free (m); + return; +} + + + + +#if 0 +float **fmatrix_all_alloc (long zn, long sn) +{ + /**************************************************************/ + /* eine Matrix mit Indexbereich 1, ... zn (Zeilen) */ + /* 1, ... sn (Spalten) */ + /* allokieren */ + /* Hier werden der float-Vektor a fuer die Matrixelemente */ + /* (gesamte Groesse der Matrix) und ein Vektor m von Zeigern */ + /* allokiert. Der float Vektor a wird initialisiert, die */ + /* Elemente des Zeiger-Vektors m werden auf die "Zeilen- */ + /* anfaenge" (entsprechende Elemente von a) gesetzt, so dass */ + /* m [1][1] = a [1]. */ + /**************************************************************/ + + float **m; + float *a; + long ges_laenge; + + ges_laenge = zn * sn; + + a = fvector_alloc (ges_laenge); + + if (a == NULL) + return NULL; + + m = fmatrix_zeiger_alloc (a, zn, sn); + + return m; +} + + + + +float **fmatrix_all_alloc_1 (long zn, long sn) +{ + /**************************************************************/ + /* eine Matrix mit Indexbereich 1, ... zn (Zeilen) */ + /* 1, ... sn (Spalten) */ + /* allokieren */ + /* Hier werden der float-Vektor a fuer die Matrixelemente */ + /* (gesamte Groesse der Matrix) und ein Vektor m von Zeigern */ + /* allokiert. Der float Vektor a wird initialisiert, die */ + /* Elemente des Zeiger-Vektors m werden auf die "Zeilen- */ + /* anfaenge" (entsprechende Elemente von a) gesetzt, so dass */ + /* m [1][1] = a [1]. */ + /**************************************************************/ + + float **m; + float *a; + long ges_laenge; + + ges_laenge = zn * sn; + + a = fvector_alloc (ges_laenge); + + if (a == NULL) + return NULL; + + m = fmatrix_zeiger_alloc (a, zn, sn); + + return m; +} +#endif + + + +/**********************************************************************/ +/* Double-Matrix mit Indexbereich */ +/* indexing, ... num_rows + indexing - 1 (Zeilen), */ +/* indexing, ... num_cols + indexing - 1 (Spalten) */ +/* allokieren */ +/* Hier werden der double-Vektor a fuer die Matrixelemente (gesamte */ +/* Groesse der Matrix) und ein Vektor m von Zeigern auf die Zeilen */ +/* der Matrix allokiert. Der double-Vektor a wird initialisiert, die */ +/* Elemente des Zeiger-Vektors m werden auf die "Zeilenanfaenge" */ +/* (also die entsprechenden Elemente von a) gesetzt. indexing gibt */ +/* an, ob die Indizierung der Matrix bei 0 oder bei 1 beginnen soll. */ +/* indexing kann 0 oder 1 sein. */ +/* Der erste Zeiger m [indexing] zeigt auf den mitgegebenen Vektor a, */ +/* so dass m [indexing][indexing] = a [indexing]. */ +/**********************************************************************/ + +double **dmatrix_all_alloc (long zn, long sn, short indexing) +{ + double **m; + double *a; + long ges_laenge; + + ges_laenge = zn * sn; + + a = dvector_alloc (ges_laenge); + + if (a == NULL) + return NULL; + + m = dmatrix_pointer_alloc (a, zn, sn, indexing); + + return m; +} + + + + +double **basis_dmatrix_all_alloc (long zn, long sn) +{ + /***********************************************************/ + /* eine Matrix mit Indexbereich 1, ... zn (Zeilen) */ + /* 1, ... sn (Spalten) */ + /* allokieren */ + /* Hier werden der double-Vektor a fuer die Matrixelemente */ + /* (gesamte Groesse der Matrix) und ein Vektor m von */ + /* Zeigern allokiert. Der double Vektor a wird */ + /* initialisiert, die Elemente des zeiger-Vektors m werden */ + /* auf die "Zeilenanfaenge" (entsprechende Elemente von a) */ + /* gesetzt, so dass m [1][1] = a [1]. */ + /***********************************************************/ + + double **m; + double *a; + long ges_laenge; + + ges_laenge = zn * sn; + + a = basis_dvector_alloc (ges_laenge); + + if (a == NULL) + return NULL; + + m = basis_dmatrix_zeiger_alloc (a, zn, sn); + + return m; +} + + + + +double **doberes_dreieck_all_alloc (long n) +{ + /******************************************************************/ + /* obere Dreiecks Matrix mit Indexbereich i = 1, ... n (Zeilen) */ + /* j = i, ... n (Spalten) */ + /* allokieren */ + /* Eine eigene Funktion zum Freigeben braucht es nicht, man kann */ + /* die Funktion dmatrix_all_free benutzen */ + /******************************************************************/ + + double **m; + double *a; + long ges_laenge; + + ges_laenge = n * (n + 1) / 2; + + a = dvector_alloc (ges_laenge); + + if (a == NULL) + return NULL; + + m = doberes_dreieck_zeiger_alloc (a, n); + + return m; +} + + + + +double **doberes_dreieck_all_alloc_1 (long n) +{ + /******************************************************************/ + /* obere Dreiecks Matrix mit Indexbereich i = 1, ... n (Zeilen) */ + /* j = i, ... n (Spalten) */ + /* allokieren */ + /* Eine eigene Funktion zum Freigeben braucht es nicht, man kann */ + /* die Funktion dmatrix_all_free benutzen */ + /******************************************************************/ + + double **m; + double *a; + long ges_laenge; + + ges_laenge = n * (n + 1) / 2; + + a = dvector_alloc (ges_laenge); + + if (a == NULL) + return NULL; + + m = doberes_dreieck_zeiger_alloc (a, n); + + return m; +} + + + +#if 0 +int **imatrix_all_alloc (long zn, long sn) +{ + /***********************************************************/ + /* eine Matrix mit Indexbereich 1, ... zn (Zeilen) */ + /* 1, ... sn (Spalten) */ + /* allokieren */ + /* Hier werden der Int-Vektor a fuer die Matrixelemente */ + /* (gesamte Groesse der Matrix) und ein Vektor m von */ + /* Zeigern allokiert. Der Int-Vektor a wird initialisiert, */ + /* die Elemente des Zeiger-Vektors m werden auf die */ + /* "Zeilenanfaenge" (entsprechende Elemente von a) */ + /* gesetzt, so dass m [1][1] = a [1]. */ + /***********************************************************/ + + int **m; + int *a; + long ges_laenge; + + ges_laenge = zn * sn; + + a = ivector_alloc (ges_laenge); + + if (a == NULL) + return NULL; + + m = imatrix_zeiger_alloc (a, zn, sn); + + return m; +} + + + + +int **imatrix_all_alloc_1 (long zn, long sn) +{ + /***********************************************************/ + /* eine Matrix mit Indexbereich 1, ... zn (Zeilen) */ + /* 1, ... sn (Spalten) */ + /* allokieren */ + /* Hier werden der Int-Vektor a fuer die Matrixelemente */ + /* (gesamte Groesse der Matrix) und ein Vektor m von */ + /* Zeigern allokiert. Der Int-Vektor a wird initialisiert, */ + /* die Elemente des Zeiger-Vektors m werden auf die */ + /* "Zeilenanfaenge" (entsprechende Elemente von a) */ + /* gesetzt, so dass m [1][1] = a [1]. */ + /***********************************************************/ + + int **m; + int *a; + long ges_laenge; + + ges_laenge = zn * sn; + + a = ivector_alloc (ges_laenge); + + if (a == NULL) + return NULL; + + m = imatrix_zeiger_alloc (a, zn, sn); + + return m; +} +#endif + + + +void dmatrix_all_free (double **m) +{ + /***********************************************************/ + /* den Vektor mit Zeigern auf die Zeilen der Matrix */ + /* sowie den Vektor der Matrixelemente freigeben */ + /* (Gegenstueck zu dmatrix_all_alloc) */ + /***********************************************************/ + + double *a; + + a = m [0]; + + BASIS_FREE (m); + BASIS_FREE (a); + + return; +} + + + + +void fmatrix_all_free (float **m) +{ + /***********************************************************/ + /* den Vektor mit Zeigern auf die Zeilen der Matrix */ + /* sowie den Vektor der Matrixelemente freigeben */ + /* (Gegenstück zufdmatrix_all_allc)) */ + /***********************************************************/ + + float *a; + + a = m [0]; + + BASIS_FREE (m); + BASIS_FREE (a); + + return; +} + + + + +void smatrix_all_free (short **m) +{ + /***********************************************************/ + /* den Vektor mit Zeigern auf die Zeilen der Matrix */ + /* sowie den Vektor der Matrixelemente freigeben */ + /* (Gegenstück zufdmatrix_all_allc)) */ + /***********************************************************/ + + short *a; + + a = m [0]; + + BASIS_FREE (m); + BASIS_FREE (a); + + return; +} + + + + +void matrix_all_free (void **m) +{ + /***********************************************************/ + /* den Vektor mit Zeigern auf die Zeilen der Matrix */ + /* sowie den Vektor der Matrixelemente freigeben */ + /* (Gegenstueck zu matrix_all_alloc) */ + /***********************************************************/ + + void *a; + + a = m [0]; + + BASIS_FREE (m); + BASIS_FREE (a); + + return; +} + + + + +int legendre_dreieck_alloc (int maxdeg, double ***lf_anker) +{ + /**********************************************************/ + /* Speicherplatz fuer Legendre-Funktionen bis zum */ + /* Entwicklungsgrad maxdeg allokieren und initialisieren */ + /* Es wird sowohl der double-Vektor der Elemente */ + /* allokiert und mit Nullen vorbesetzt als auch der */ + /* Zeigervektor (Zeiger auf die Zeilen der Legendre- */ + /* Matrix (Grade)) allokiert und gesetzt. */ + /**********************************************************/ + + + double *lf_kette; + double *pd; + double **lf_matrix; + int grad; + long anz_func; + + + lf_kette = NULL; + lf_matrix = NULL; + + anz_func = (maxdeg + 1) * (maxdeg + 2) / 2; + + lf_kette = (double *) calloc (anz_func, sizeof (double)); + + if (lf_kette == NULL) + return 8; + + lf_matrix = (double **) malloc ( + (maxdeg + 1) * sizeof (double *)); + + if (lf_matrix == NULL) + { + free (lf_kette); + return 12; + } + //#pragma omp parallel for + for (grad = 0, pd = lf_kette; grad <= maxdeg; grad ++, pd += grad) + { + lf_matrix [grad] = pd; + } + + *lf_anker = lf_matrix; + + return 0; +} + + + + +double **legendre_dreieck_alloc_neu (int maxdeg) +{ + /**********************************************************/ + /* Speicherplatz fuer Legendre-Funktionen bis zum */ + /* Entwicklungsgrad maxdeg allokieren und initialisieren */ + /* Es wird sowohl der double-Vektor der Elemente */ + /* allokiert und mit Nullen vorbesetzt als auch der */ + /* Zeigervektor (Zeiger auf die Zeilen der Legendre- */ + /* Matrix (Grade)) allokiert und gesetzt. */ + /**********************************************************/ + + + double *lf_kette; + double *pd; + double **lf_matrix; + int grad; + long anz_func; + + + lf_kette = NULL; + lf_matrix = NULL; + + anz_func = (maxdeg + 1) * (maxdeg + 2) / 2; + + lf_kette = (double *) calloc (anz_func, sizeof (double)); + + if (lf_kette == NULL) + return NULL; + + lf_matrix = (double **) malloc ( + (maxdeg + 1) * sizeof (double *)); + + if (lf_matrix == NULL) + { + free (lf_kette); + return NULL; + } + //#pragma omp parallel for + for (grad = 0, pd = lf_kette; grad <= maxdeg; grad ++, pd += grad) + { + lf_matrix [grad] = pd; + } + + return lf_matrix; +} + + + + +int legendre_dreieck_free (double ***lf_anker) +{ + /***********************************************************/ + /* den Vektor mit Zeigern auf die Zeilen der Legendre- */ + /* Matrix sowie den Vektor der Matrixelemente freigeben */ + /* (Gegenstück zu legendre_dreieck_alloc) */ + /***********************************************************/ + + + double *pd; + double **lf_matrix; + + + lf_matrix = *lf_anker; + pd = *lf_matrix; + + free (lf_matrix); + free (pd); + + return 0; +} + + diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_filter/geodesic_morph_rec/storeorg.h saga-2.1.4+dfsg/src/modules/grid/grid_filter/geodesic_morph_rec/storeorg.h --- saga-2.1.0+dfsg/src/modules/grid/grid_filter/geodesic_morph_rec/storeorg.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_filter/geodesic_morph_rec/storeorg.h 2014-11-13 08:32:17.000000000 +0000 @@ -0,0 +1,470 @@ +/********************************************************** + * Version $Id: storeorg.h 1936 2014-01-11 14:07:20Z reklov_w $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// Grid_Filter // +// // +//-------------------------------------------------------// +// // +// storeorg.h // +// // +// Copyright (C) 2013 by // +// HfT Stuttgart // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: johannes.engels@hft-stuttgart.de // +// // +// contact: Johannes Engels // +// Hochschule fuer Technik Stuttgart // +// Schellingstr. 24 // +// 70174 Stuttgart // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +//#ifdef _cplusplus +//extern "C" { +//#endif + +#include +#include +#include + +#define NR_END 1 + +#define BASIS_MALLOC malloc +#define BASIS_CALLOC calloc +#define BASIS_FREE free +#define BASIS_REALLOC realloc + +#if 0 +#define BASIS_MALLOC basis_malloc +#define BASIS_CALLOC basis_calloc +#define BASIS_FREE basis_free +#define BASIS_REALLOC basis_realloc +#endif + +#define ANZ_MEMPOOL 10 + +void *chain_malloc (long size, short mempool); + +void chain_free (void *palt); + +void *chain_realloc (void *palt, long newsize, short mempool); + +void chain_integrity (short mempool); + +void chain_all_free (short mempool); + + +size_t element_length (char type); + +void *vector_alloc (long n, char type); + + +/**********************************************************************/ +/* einen double-Vektor mit Indexbereich 0 ... n allokieren und */ +/* initialisieren. Es wird also immer ein Element mehr allokiert als */ +/* im Prinzip noetig waere. */ +/**********************************************************************/ + +double *dvector_alloc (long n); + + + + + +/**********************************************************************/ +/* Double-Matrix mit Indexbereich */ +/* indexing, ... num_rows + indexing - 1 (Zeilen), */ +/* indexing, ... num_cols + indexing - 1 (Spalten) */ +/* allokieren */ +/* Hier wird nur der Vektor von Zeigern auf die Zeilen allokiert und */ +/* gesetzt. indexing kann 0 oder 1 sein. */ +/* Der erste Zeiger m [indexing] zeigt auf den mitgegebenen Vektor a, */ +/* so dass m [indexing][indexing] = a [indexing]. */ +/**********************************************************************/ + +double **dmatrix_pointer_alloc (double *a, + long num_rows, + long num_cols, + short indexing); + + + + +/**********************************************************************/ +/* Double-Matrix mit Indexbereich */ +/* indexing, ... num_rows + indexing - 1 (Zeilen), */ +/* indexing, ... num_cols + indexing - 1 (Spalten) */ +/* allokieren */ +/* Hier werden der double-Vektor a fuer die Matrixelemente (gesamte */ +/* Groesse der Matrix) und ein Vektor m von Zeigern auf die Zeilen */ +/* der Matrix allokiert. Der double-Vektor a wird initialisiert, die */ +/* Elemente des Zeiger-Vektors m werden auf die "Zeilenanfaenge" */ +/* (also die entsprechenden Elemente von a) gesetzt. indexing gibt */ +/* an, ob die Indizierung der Matrix bei 0 oder bei 1 beginnen soll. */ +/* indexing kann 0 oder 1 sein. */ +/* Der erste Zeiger m [indexing] zeigt auf den mitgegebenen Vektor a, */ +/* so dass m [indexing][indexing] = a [indexing]. */ +/**********************************************************************/ + +double **dmatrix_all_alloc (long zn, long sn, short indexing); + +/**********************************************************************/ +/* Matrix mit Indexbereich */ +/* indexing, ... num_rows + indexing - 1 (Zeilen), */ +/* indexing, ... num_cols + indexing - 1 (Spalten) */ +/* allokieren */ +/* Hier wird nur der Vektor von Zeigern auf die Zeilen allokiert und */ +/* gesetzt. indexing kann 0 oder 1 sein. */ +/* Der erste Zeiger m [indexing] zeigt auf den mitgegebenen Vektor a, */ +/* so dass m [indexing][indexing] = a [indexing]. */ +/* */ +/* Folgende Typen sind moeglich: D -- double */ +/* F -- float */ +/* I -- int */ +/* S -- short */ +/* L -- long */ +/* C -- char */ +/* U -- unsigned char */ +/**********************************************************************/ + +void **matrix_pointer_alloc (void *a, + long num_rows, + long num_cols, + char type, + short indexing); + +void ***array_3_pointer_alloc (void *a, + long num_rows, + long num_cols, + long num_piles, + char type, + short indexing); + +void **matrix_all_alloc (long zn, long sn, char type, short indexing); + +void ***array_3_all_alloc (long zn, + long sn, + long hn, + char type, + short indexing); + +void ****array_4_pointer_alloc (void *a, + long num_rows, + long num_cols, + long num_levs, + long num_elems, + char type, + short indexing); + +void *basis_malloc (long size); + +void integritaet_pruefen (void); + +int adr_in_kette_finden (void *adr); + +void *basis_calloc (long length, int obj_size); + +void basis_free (void *palt); + +void integritaet_speziell (void *palt); + +void *basis_realloc (void *palt, long newsize); + + + + +/***********************************************************/ +/* einen Vektor mit Indexbereich 1 ... n allokieren */ +/* und initialisieren */ +/***********************************************************/ + +double *basis_dvector_alloc (long n); + + +#if 0 +float *fvector_alloc (long n); + +float *fvector_alloc_1 (long n); + +/***********************************************************/ +/* einen Vektor mit Indexbereich 0 ... n - 1 allokieren */ +/* und initialisieren */ +/***********************************************************/ + + +/***********************************************************/ +/* einen Vektor mit Indexbereich 1 ... n allokieren */ +/* und initialisieren */ +/***********************************************************/ + +int *ivector_alloc (long n); + +int *ivector_alloc_1 (long n); +#endif + + +/***********************************************************/ +/* einen Short-Vektor mit Indexbereich 1 ... n allokieren */ +/* und initialisieren */ +/***********************************************************/ + + +void *vector_realloc (void *v, long n_alt, long n_neu, char type); + +double *dvector_realloc (double *v, long n_alt, long n_neu); + +double *dvector_realloc_1 (double *v, long n_alt, long n_neu); + + +/************************************/ +/* einen int-Vektor freigeben */ +/************************************/ + +void ivector_free (int *v); + + + +/************************************/ +/* einen double-Vektor freigeben */ +/************************************/ + +void dvector_free (double *v); + +void fvector_free (float *v); + + +/***************************************************************/ +/* einen Vektor freigeben */ +/***************************************************************/ + +void vector_free (void *v); + + +/***********************************************************/ +/* eine Matrix mit Indexbereich 1, ... zn (Zeilen) */ +/* 1, ... sn (Spalten) */ +/* allokieren */ +/* Hier wird nur der Vektor von Zeigern allokiert und */ +/* gesetzt. Der erste Zeiger m [1] zeigt auf den */ +/* mitgegebenen Vektor a, so dass m [1][1] = a [1]. */ +/***********************************************************/ + +double **dmatrix_zeiger_alloc (double *a, long zn, long sn); + +double **dmatrix_zeiger_alloc_1 (double *a, long zn, long sn); + +#if 0 +int **imatrix_zeiger_alloc (int *a, long zn, long sn); + +int **imatrix_zeiger_alloc_1 (int *a, long zn, long sn); +#endif + + +double **basis_dmatrix_zeiger_alloc (double *a, long zn, long sn); + +double **basis_dmatrix_zeiger_alloc_1 (double *a, long zn, long sn); + +#if 0 +float **fmatrix_zeiger_alloc (float *a, long zn, long sn); + + +/***********************************************************/ +/* eine Matrix mit Indexbereich i = 1, ... n (Zeilen) */ +/* j = i, ... n (Spalten) */ +/* allokieren */ +/* Hier wird nur der Vektor von Zeigern allokiert und */ +/* gesetzt. Der erste Zeiger m [1] zeigt auf den */ +/* mitgegebenen Vektor a, so dass m [1][1] = a [1]. */ +/***********************************************************/ + +float **fmatrix_zeiger_alloc_1 (float *a, long zn, long sn); +#endif + +double **doberes_dreieck_zeiger_alloc (double *a, long n); + + + +/**********************************************************************/ +/* Matrix mit Indexbereich */ +/* i = indexing, ... num_rows + indexing - 1 (Zeilen), */ +/* j = i, ... num_cols + indexing - 1 (Spalten) */ +/* allokieren */ +/* Hier wird nur der Vektor von Zeigern auf die Zeilen allokiert und */ +/* gesetzt. indexing kann 0 oder 1 sein. */ +/* Der erste Zeiger m [indexing] zeigt auf den mitgegebenen Vektor a, */ +/* so dass m [indexing][indexing] = a [indexing]. */ +/* */ +/* Folgende Typen sind moeglich: D -- double */ +/* F -- float */ +/* I -- int */ +/* S -- short */ +/* L -- long */ +/* C -- char */ +/* U -- unsigned char */ +/**********************************************************************/ + +void **upper_triangle_pointer_alloc (void *a, + long num_rows, + char type, + short indexing); + + +void **upper_triangle_all_alloc (long num_rows, + char type, + short indexing); + + + + +/***********************************************************/ +/* eine Matrix mit Indexbereich 0, ... zn - 1 (Zeilen) */ +/* 0, ... sn - 1 (Spalten) */ +/* allokieren */ +/* Hier wird nur der Vektor von Zeigern allokiert und */ +/* gesetzt. Der erste Zeiger m [0] zeigt auf den */ +/* mitgegebenen Vektor a, so dass m [0][0] = a [0]. */ +/***********************************************************/ + +double **basis_dmatrix_zeiger_alloc_0 (double *a, long zn, long sn); + + + + + +void dmatrix_zeiger_free (double **m); + +void matrix_pointer_free (void **m); + +#if 0 +float **fmatrix_all_alloc (long zn, long sn); + +float **fmatrix_all_alloc_1 (long zn, long sn); +#endif + +double **basis_dmatrix_all_alloc (long zn, long sn); + +double **basis_dmatrix_all_alloc_1 (long zn, long sn); + + +/******************************************************************/ +/* obere Dreiecks Matrix mit Indexbereich i = 1, ... n (Zeilen) */ +/* j = i, ... n (Spalten) */ +/* allokieren */ +/******************************************************************/ + +double **doberes_dreieck_all_alloc (long n); + +double **doberes_dreieck_all_alloc_1 (long n); + +/***********************************************************/ +/* eine Matrix mit Indexbereich 0, ... zn - 1 (Zeilen) */ +/* 0, ... sn - 1 (Spalten) */ +/* allokieren */ +/* Hier werden der double-Vektor a für die Matrixelemente */ +/* (gesamte Größe der Matrix) und ein Vektor m von Zeigern */ +/* allokiert. Der double Vektor a wird initialisiert, die */ +/* Elemente des Zeiger-vektors m werden auf die "Zeilen- */ +/* anfänge" (entsprechende Elemente von a) gesetzt, */ +/* so dass m [0][0] = a [0]. */ +/***********************************************************/ + +double **dmatrix_all_alloc_0 (long zn, long sn); + +double **basis_dmatrix_all_alloc_0 (long zn, long sn); + + + +void **matrix_realloc_zeilen (void **m, + long zn_alt, + long zn_neu, + long sn, + char type, + short indexing); +#if 0 +int **imatrix_all_alloc (long zn, long sn); + +int **imatrix_all_alloc_1 (long zn, long sn); +#endif + +/***********************************************************/ +/* den Vektor mit Zeigern auf die Zeilen der Matrix */ +/* sowie den Vektor der Matrixelemente freigeben */ +/* (Gegenstueck zu dmatrix_all_alloc) */ +/***********************************************************/ + +void dmatrix_all_free (double **m); + +void fmatrix_all_free (float **m); + +void smatrix_all_free (short **m); + + +void matrix_all_free (void **m); + +/**********************************************************/ +/* Speicherplatz fuer Legendre-Funktionen bis zum */ +/* Entwicklungsgrad maxdeg allokieren und initialisieren */ +/* Es wird sowohl der double-Vektor der Elemente */ +/* allokiert und mit Nullen vorbesetzt als auch der */ +/* Zeigervektor (Zeiger auf die Zeilen der Legendre- */ +/* Matrix (Grade)) allokiert und gesetzt. */ +/**********************************************************/ + +int legendre_dreieck_alloc (int maxdeg, double ***lf_anker); + + +double **legendre_dreieck_alloc_neu (int maxdeg); + + + /***********************************************************/ + /* den Vektor mit Zeigern auf die Zeilen der Legendre- */ + /* Matrix sowie den Vektor der Matrixelemente freigeben */ + /* (Gegenstueck zu legendre_dreieck_alloc) */ + /***********************************************************/ + + +int legendre_dreieck_free (double ***lf_anker); + + + diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_filter/geomrec.cpp saga-2.1.4+dfsg/src/modules/grid/grid_filter/geomrec.cpp --- saga-2.1.0+dfsg/src/modules/grid/grid_filter/geomrec.cpp 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_filter/geomrec.cpp 2014-11-13 08:32:17.000000000 +0000 @@ -0,0 +1,203 @@ +/********************************************************** + * Version $Id: geomrec.cpp 1936 2014-01-11 14:07:20Z reklov_w $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// Grid_Filter // +// // +//-------------------------------------------------------// +// // +// geomrec.cpp // +// // +// Copyright (C) 2013 by // +// HfT Stuttgart // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: johannes.engels@hft-stuttgart.de // +// // +// contact: Johannes Engels // +// Hochschule fuer Technik Stuttgart // +// Schellingstr. 24 // +// 70174 Stuttgart // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "geomrec.h" + +extern "C" { + #include "geodesic_morph_rec/storeorg.h" + #include "geodesic_morph_rec/geovinc.h" +} + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +CGeomrec::CGeomrec(void) +{ + Set_Name (_TL("Geodesic Morphological Reconstruction")); + + Set_Author (SG_T("HfT Stuttgart (c) 2013")); + + Set_Description (_TW( + "Geodesic morphological reconstruction according to \n" + "L. Vincent (1993): Morphological Grayscale Reconstruction in Image Analysis: " + "Applications and Efficient Algorithms. " + "IEEE Transactions on Image Processing, Vol. 2, No 2\n" + "Here we use the algorithm on p. 194: Computing of Regional Maxima and Breadth-first Scanning.\n\n" + "A marker is derived from the input image INPUT_GRID by subtracting a constant SHIFT_VALUE. Optionally " + "the SHIFT_VALUE can be set to zero at the border of the grid (\"Preserve 1px border Yes/No\"). " + "OUTPUT_GRID is the difference between the input image and the morphological reconstruction of " + "the marker under the input image as mask. If the Option \"Create a binary mask\" is selected, " + "the OUTPUT_GRID is thresholded with THRESHOLD, creating a binary image of maxima regions.\n" + )); + + CSG_Parameter *pNode; + + Parameters.Add_Grid (NULL, "INPUT_GRID", _TL ("Input Grid"), _TL ("Input for the morphological reconstruction"), PARAMETER_INPUT); + Parameters.Add_Grid (NULL, "OBJECT_GRID", _TL("Object Grid"), _TL("Binary object mask"), PARAMETER_OUTPUT, true, SG_DATATYPE_Bit); + Parameters.Add_Grid (NULL, "DIFFERENCE_GRID", _TL ("Difference Input - Reconstruction"), _TL ("Difference Input - Reconstruction"), PARAMETER_OUTPUT); + Parameters.Add_Value (Parameters ("SHIFT"), "SHIFT_VALUE", _TL ("Shift value"), _TL ("Shift value"), PARAMETER_TYPE_Double, 5); + Parameters.Add_Value (NULL, "BORDER_YES_NO", _TL ("Preserve 1px border Yes/No"), _TL ("Preserve 1px border Yes/No"), PARAMETER_TYPE_Bool, true); + pNode = Parameters.Add_Value (NULL, "BIN_YES_NO", _TL ("Create a binary mask Yes/No"), _TL ("Create a binary mask Yes/No"), PARAMETER_TYPE_Bool, true); + Parameters.Add_Value (pNode, "THRESHOLD", _TL ("Threshold"), _TL ("Threshold"), PARAMETER_TYPE_Double, 1); +} + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +bool CGeomrec::On_Execute(void) +{ + CSG_Grid *pinpgrid, *bingrid, *poutgrid; + + + unsigned short numrows; + unsigned short numcols; + double **mask; + double **marker; + + + double h, t; + bool pborder, bin; + + pinpgrid = Parameters ("INPUT_GRID")->asGrid (); + bingrid = Parameters ("OBJECT_GRID")->asGrid(); + poutgrid = Parameters ("DIFFERENCE_GRID")->asGrid (); + + h = Parameters ("SHIFT_VALUE")->asDouble (); + t = Parameters ("THRESHOLD")->asDouble (); + pborder = Parameters ("BORDER_YES_NO")->asBool (); + bin = Parameters ("BIN_YES_NO")->asBool (); + + numcols = Get_NY(); + numrows = Get_NX(); + + mask = (double **) matrix_all_alloc (numrows, numcols, 'D', 0); + marker = (double **) matrix_all_alloc (numrows, numcols, 'D', 0); + + for (int y = 0; y < Get_NY () && Set_Progress(y, Get_NY()); y++) + { + #pragma omp parallel for + for (int x = 0; x < Get_NX (); x++) + { + if (pinpgrid->is_NoData(x,y)) // check if there are no_data in input datasets + { + mask [x][y] = 0; + marker [x][y] = 0; + } + else if ((pborder) && ((x==0)||(y==0)||(x==Get_NX()-1)||(y==Get_NY()-1))) + { + mask [x][y] = pinpgrid->asDouble(x,y); + marker [x][y] = pinpgrid->asDouble(x,y); + } + else + { + mask [x][y] = pinpgrid->asDouble(x,y); + marker [x][y] = pinpgrid->asDouble(x,y) - h; + } + } + } + + geodesic_morphological_reconstruction (numrows, numcols, mask, marker); + + for (int y = 0; y < Get_NY () && Set_Progress(y, Get_NY()); y++) + { + #pragma omp parallel for + for (int x = 0; x < Get_NX (); x++) + { + if (pinpgrid->is_NoData(x,y)) + poutgrid->Set_NoData(x,y); + else + poutgrid->Set_Value(x,y, mask[x][y]-marker[x][y]); + } + } + + if (bin) + { + for (int y = 0; y < Get_NY () && Set_Progress(y, Get_NY()); y++) + #pragma omp parallel for + for (int x = 0; x < Get_NX (); x++) + if ((mask[x][y]-marker[x][y])>t) + bingrid->Set_Value(x, y, 1); + else + bingrid->Set_Value(x, y, 0); + } + + matrix_all_free ((void **) mask); + matrix_all_free ((void **) marker); + + return( true ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_filter/geomrec.h saga-2.1.4+dfsg/src/modules/grid/grid_filter/geomrec.h --- saga-2.1.0+dfsg/src/modules/grid/grid_filter/geomrec.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_filter/geomrec.h 2014-11-13 08:32:17.000000000 +0000 @@ -0,0 +1,108 @@ +/********************************************************** + * Version $Id: geomrec.h 1936 2014-01-11 14:07:20Z reklov_w $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// Grid_Filter // +// // +//-------------------------------------------------------// +// // +// geomrec.h // +// // +// Copyright (C) 2013 by // +// HfT Stuttgart // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: johannes.engels@hft-stuttgart.de // +// // +// contact: Johannes Engels // +// Hochschule fuer Technik Stuttgart // +// Schellingstr. 24 // +// 70174 Stuttgart // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#ifndef HEADER_INCLUDED__Geomrec_H +#define HEADER_INCLUDED__Geomrec_H + +//--------------------------------------------------------- + + +#include "MLB_Interface.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +class CGeomrec : public CSG_Module_Grid +{ +public: + CGeomrec (void); + + +protected: + + virtual bool On_Execute (void); + + +private: + int m_Radius, m_Threshold; + + CSG_Grid m_Kernel, *m_pInput; + + + bool Get_Range (int x, int y, double &Minimum, double &Maximum); + +}; + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#endif // #ifndef HEADER_INCLUDED__LDi_H diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_filter/Makefile.am saga-2.1.4+dfsg/src/modules/grid/grid_filter/Makefile.am --- saga-2.1.0+dfsg/src/modules/grid/grid_filter/Makefile.am 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_filter/Makefile.am 2014-11-13 08:32:17.000000000 +0000 @@ -1,5 +1,5 @@ # -# $Id: Makefile.am 1535 2012-11-15 12:18:45Z oconrad $ +# $Id: Makefile.am 1991 2014-02-13 12:29:09Z oconrad $ # if DEBUG DBGFLAGS = -g -DDEBUG @@ -13,6 +13,8 @@ AM_LDFLAGS = -fPIC -shared -avoid-version pkglib_LTLIBRARIES = libgrid_filter.la libgrid_filter_la_SOURCES =\ +bin_erosion_reconst.cpp\ +connect_analysis.cpp\ Filter.cpp\ Filter_3x3.cpp\ Filter_Gauss.cpp\ @@ -22,10 +24,18 @@ Filter_Multi_Dir_Lee.cpp\ Filter_Rank.cpp\ Filter_Resample.cpp\ +Filter_Sieve.cpp\ Filter_Terrain_SlopeBased.cpp\ FilterClumps.cpp\ +geomrec.cpp\ +./geodesic_morph_rec/bin_geovinc.c\ +./geodesic_morph_rec/combcontour.c\ +./geodesic_morph_rec/geovinc.c\ +./geodesic_morph_rec/storeorg.c\ mesh_denoise.cpp\ MLB_Interface.cpp\ +bin_erosion_reconst.h\ +connect_analysis.h\ Filter.h\ Filter_3x3.h\ Filter_Gauss.h\ @@ -35,8 +45,15 @@ Filter_Multi_Dir_Lee.h\ Filter_Rank.h\ Filter_Resample.h\ +Filter_Sieve.h\ Filter_Terrain_SlopeBased.h\ FilterClumps.h\ +geomrec.h\ +./geodesic_morph_rec/bin_geovinc.h\ +./geodesic_morph_rec/combcontour.h\ +./geodesic_morph_rec/geovinc.h\ +./geodesic_morph_rec/listfuncs.inc\ +./geodesic_morph_rec/storeorg.h\ mesh_denoise.h\ MLB_Interface.h diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_filter/Makefile.in saga-2.1.4+dfsg/src/modules/grid/grid_filter/Makefile.in --- saga-2.1.0+dfsg/src/modules/grid/grid_filter/Makefile.in 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_filter/Makefile.in 2014-11-13 08:33:31.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -35,15 +79,17 @@ build_triplet = @build@ host_triplet = @host@ subdir = src/modules/grid/grid_filter -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_postgresql.m4 \ + $(top_srcdir)/m4/ax_pkg_swig.m4 \ $(top_srcdir)/m4/ax_python_devel.m4 \ $(top_srcdir)/m4/ax_swig_enable_cxx.m4 \ $(top_srcdir)/m4/ax_swig_python.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.in + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -71,45 +117,110 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(pkglibdir)" LTLIBRARIES = $(pkglib_LTLIBRARIES) libgrid_filter_la_DEPENDENCIES = \ $(top_srcdir)/src/saga_core/saga_api/libsaga_api.la -am_libgrid_filter_la_OBJECTS = Filter.lo Filter_3x3.lo Filter_Gauss.lo \ +am_libgrid_filter_la_OBJECTS = bin_erosion_reconst.lo \ + connect_analysis.lo Filter.lo Filter_3x3.lo Filter_Gauss.lo \ Filter_LoG.lo Filter_Majority.lo Filter_Morphology.lo \ Filter_Multi_Dir_Lee.lo Filter_Rank.lo Filter_Resample.lo \ - Filter_Terrain_SlopeBased.lo FilterClumps.lo mesh_denoise.lo \ - MLB_Interface.lo + Filter_Sieve.lo Filter_Terrain_SlopeBased.lo FilterClumps.lo \ + geomrec.lo bin_geovinc.lo combcontour.lo geovinc.lo \ + storeorg.lo mesh_denoise.lo MLB_Interface.lo libgrid_filter_la_OBJECTS = $(am_libgrid_filter_la_OBJECTS) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles am__mv = mv -f -CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = +CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = +CXXLD = $(CXX) +CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = SOURCES = $(libgrid_filter_la_SOURCES) DIST_SOURCES = $(libgrid_filter_la_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -130,6 +241,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLELIBHARU = @DISABLELIBHARU@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -157,6 +269,7 @@ LOCAL_LIBS = @LOCAL_LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -169,8 +282,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PG_CONFIG = @PG_CONFIG@ +POSTGRESQL_CFLAGS = @POSTGRESQL_CFLAGS@ +POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@ +POSTGRESQL_VERSION = @POSTGRESQL_VERSION@ POW_LIB = @POW_LIB@ PYTHON = @PYTHON@ PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ @@ -194,6 +312,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -227,7 +346,6 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -249,7 +367,7 @@ top_srcdir = @top_srcdir@ # -# $Id: Makefile.am 1535 2012-11-15 12:18:45Z oconrad $ +# $Id: Makefile.am 1991 2014-02-13 12:29:09Z oconrad $ # @DEBUG_TRUE@DBGFLAGS = -g -DDEBUG @SAGA_UNICODE_TRUE@UC_DEFS = -D_SAGA_UNICODE @@ -259,6 +377,8 @@ AM_LDFLAGS = -fPIC -shared -avoid-version pkglib_LTLIBRARIES = libgrid_filter.la libgrid_filter_la_SOURCES = \ +bin_erosion_reconst.cpp\ +connect_analysis.cpp\ Filter.cpp\ Filter_3x3.cpp\ Filter_Gauss.cpp\ @@ -268,10 +388,18 @@ Filter_Multi_Dir_Lee.cpp\ Filter_Rank.cpp\ Filter_Resample.cpp\ +Filter_Sieve.cpp\ Filter_Terrain_SlopeBased.cpp\ FilterClumps.cpp\ +geomrec.cpp\ +./geodesic_morph_rec/bin_geovinc.c\ +./geodesic_morph_rec/combcontour.c\ +./geodesic_morph_rec/geovinc.c\ +./geodesic_morph_rec/storeorg.c\ mesh_denoise.cpp\ MLB_Interface.cpp\ +bin_erosion_reconst.h\ +connect_analysis.h\ Filter.h\ Filter_3x3.h\ Filter_Gauss.h\ @@ -281,8 +409,15 @@ Filter_Multi_Dir_Lee.h\ Filter_Rank.h\ Filter_Resample.h\ +Filter_Sieve.h\ Filter_Terrain_SlopeBased.h\ FilterClumps.h\ +geomrec.h\ +./geodesic_morph_rec/bin_geovinc.h\ +./geodesic_morph_rec/combcontour.h\ +./geodesic_morph_rec/geovinc.h\ +./geodesic_morph_rec/listfuncs.inc\ +./geodesic_morph_rec/storeorg.h\ mesh_denoise.h\ MLB_Interface.h @@ -290,7 +425,7 @@ all: all-am .SUFFIXES: -.SUFFIXES: .cpp .lo .o .obj +.SUFFIXES: .c .cpp .lo .o .obj $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -300,9 +435,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/modules/grid/grid_filter/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/modules/grid/grid_filter/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu src/modules/grid/grid_filter/Makefile + $(AUTOMAKE) --foreign src/modules/grid/grid_filter/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -321,9 +456,9 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): + install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -331,6 +466,8 @@ else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \ } @@ -346,14 +483,17 @@ clean-pkglibLTLIBRARIES: -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES) - @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -libgrid_filter.la: $(libgrid_filter_la_OBJECTS) $(libgrid_filter_la_DEPENDENCIES) - $(CXXLINK) -rpath $(pkglibdir) $(libgrid_filter_la_OBJECTS) $(libgrid_filter_la_LIBADD) $(LIBS) + @list='$(pkglib_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + +libgrid_filter.la: $(libgrid_filter_la_OBJECTS) $(libgrid_filter_la_DEPENDENCIES) $(EXTRA_libgrid_filter_la_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) -rpath $(pkglibdir) $(libgrid_filter_la_OBJECTS) $(libgrid_filter_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -371,30 +511,87 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Filter_Multi_Dir_Lee.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Filter_Rank.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Filter_Resample.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Filter_Sieve.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Filter_Terrain_SlopeBased.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MLB_Interface.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bin_erosion_reconst.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bin_geovinc.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/combcontour.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/connect_analysis.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/geomrec.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/geovinc.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mesh_denoise.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/storeorg.Plo@am__quote@ + +.c.o: +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< + +.c.obj: +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + +.c.lo: +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< + +bin_geovinc.lo: ./geodesic_morph_rec/bin_geovinc.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT bin_geovinc.lo -MD -MP -MF $(DEPDIR)/bin_geovinc.Tpo -c -o bin_geovinc.lo `test -f './geodesic_morph_rec/bin_geovinc.c' || echo '$(srcdir)/'`./geodesic_morph_rec/bin_geovinc.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/bin_geovinc.Tpo $(DEPDIR)/bin_geovinc.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='./geodesic_morph_rec/bin_geovinc.c' object='bin_geovinc.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o bin_geovinc.lo `test -f './geodesic_morph_rec/bin_geovinc.c' || echo '$(srcdir)/'`./geodesic_morph_rec/bin_geovinc.c + +combcontour.lo: ./geodesic_morph_rec/combcontour.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT combcontour.lo -MD -MP -MF $(DEPDIR)/combcontour.Tpo -c -o combcontour.lo `test -f './geodesic_morph_rec/combcontour.c' || echo '$(srcdir)/'`./geodesic_morph_rec/combcontour.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/combcontour.Tpo $(DEPDIR)/combcontour.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='./geodesic_morph_rec/combcontour.c' object='combcontour.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o combcontour.lo `test -f './geodesic_morph_rec/combcontour.c' || echo '$(srcdir)/'`./geodesic_morph_rec/combcontour.c + +geovinc.lo: ./geodesic_morph_rec/geovinc.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT geovinc.lo -MD -MP -MF $(DEPDIR)/geovinc.Tpo -c -o geovinc.lo `test -f './geodesic_morph_rec/geovinc.c' || echo '$(srcdir)/'`./geodesic_morph_rec/geovinc.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/geovinc.Tpo $(DEPDIR)/geovinc.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='./geodesic_morph_rec/geovinc.c' object='geovinc.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o geovinc.lo `test -f './geodesic_morph_rec/geovinc.c' || echo '$(srcdir)/'`./geodesic_morph_rec/geovinc.c + +storeorg.lo: ./geodesic_morph_rec/storeorg.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT storeorg.lo -MD -MP -MF $(DEPDIR)/storeorg.Tpo -c -o storeorg.lo `test -f './geodesic_morph_rec/storeorg.c' || echo '$(srcdir)/'`./geodesic_morph_rec/storeorg.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/storeorg.Tpo $(DEPDIR)/storeorg.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='./geodesic_morph_rec/storeorg.c' object='storeorg.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o storeorg.lo `test -f './geodesic_morph_rec/storeorg.c' || echo '$(srcdir)/'`./geodesic_morph_rec/storeorg.c .cpp.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< .cpp.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .cpp.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -402,26 +599,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -433,15 +619,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -450,6 +632,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -501,10 +698,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -589,19 +791,20 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-pkglibLTLIBRARIES ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-pkglibLTLIBRARIES \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-pkglibLTLIBRARIES install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ + uninstall-pkglibLTLIBRARIES # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_filter/mesh_denoise.cpp saga-2.1.4+dfsg/src/modules/grid/grid_filter/mesh_denoise.cpp --- saga-2.1.0+dfsg/src/modules/grid/grid_filter/mesh_denoise.cpp 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_filter/mesh_denoise.cpp 2014-11-13 08:32:17.000000000 +0000 @@ -1,6 +1,6 @@ -/********************************************************** - * Version $Id: template.cpp 911 2011-11-11 11:11:11Z oconrad $ - *********************************************************/ +/********************************************************** + * Version $Id: template.cpp 911 2011-11-11 11:11:11Z oconrad $ + *********************************************************/ /////////////////////////////////////////////////////////// // // @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// @@ -43,8 +43,8 @@ // e-mail: oconrad@saga-gis.de // // // // contact: Olaf Conrad // -// Institute of Geography // -// University of Hamburg // +// Institute of Geography // +// University of Hamburg // // Germany // // // /////////////////////////////////////////////////////////// @@ -171,7 +171,7 @@ // Version: 1.0 // // Author: Xianfang Sun -// +// // Reference: // @article{SRML071, // author = "Xianfang Sun and Paul L. Rosin and Ralph R. Martin and Frank C. Langbein", diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_filter/mesh_denoise.h saga-2.1.4+dfsg/src/modules/grid/grid_filter/mesh_denoise.h --- saga-2.1.0+dfsg/src/modules/grid/grid_filter/mesh_denoise.h 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_filter/mesh_denoise.h 2014-11-13 08:32:17.000000000 +0000 @@ -1,6 +1,6 @@ -/********************************************************** - * Version $Id: mesh_denoise.cpp 911 2011-11-11 11:11:11Z oconrad $ - *********************************************************/ +/********************************************************** + * Version $Id: mesh_denoise.cpp 911 2011-11-11 11:11:11Z oconrad $ + *********************************************************/ /////////////////////////////////////////////////////////// // // @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// @@ -43,8 +43,8 @@ // e-mail: oconrad@saga-gis.de // // // // contact: Olaf Conrad // -// Institute of Geography // -// University of Hamburg // +// Institute of Geography // +// University of Hamburg // // Germany // // // /////////////////////////////////////////////////////////// diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_filter/MLB_Interface.cpp saga-2.1.4+dfsg/src/modules/grid/grid_filter/MLB_Interface.cpp --- saga-2.1.0+dfsg/src/modules/grid/grid_filter/MLB_Interface.cpp 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_filter/MLB_Interface.cpp 2014-11-13 08:32:17.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: MLB_Interface.cpp 1535 2012-11-15 12:18:45Z oconrad $ + * Version $Id: MLB_Interface.cpp 2281 2014-10-09 15:49:41Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// @@ -74,10 +74,13 @@ switch( i ) { case MLB_INFO_Name: default: - return( _TL("Grid - Filter") ); + return( _TL("Filter") ); + case MLB_INFO_Category: + return( _TL("Grid") ); + case MLB_INFO_Author: - return( SG_T("SAGA User Group Associaton (c) 2002-10") ); + return( SG_T("SAGA User Group Associaton, HfT Stuttgart (c) 2002-14") ); case MLB_INFO_Description: return( _TL("Tools for the manipulation of gridded data.") ); @@ -106,6 +109,10 @@ #include "Filter_Rank.h" #include "mesh_denoise.h" #include "Filter_Resample.h" +#include "geomrec.h" +#include "bin_erosion_reconst.h" +#include "connect_analysis.h" +#include "Filter_Sieve.h" //--------------------------------------------------------- @@ -127,9 +134,14 @@ case 9: return( new CFilter_Rank ); case 10: return( new CMesh_Denoise_Grid ); case 11: return( new CFilter_Resample ); - } + case 12: return( new CGeomrec ); + case 13: return( new Cbin_erosion_reconst ); + case 14: return( new Cconnectivity_analysis ); + case 15: return( new CFilter_Sieve ); - return( NULL ); + case 16: return( NULL ); + default: return( MLB_INTERFACE_SKIP_MODULE ); + } } diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_filter/MLB_Interface.h saga-2.1.4+dfsg/src/modules/grid/grid_filter/MLB_Interface.h --- saga-2.1.0+dfsg/src/modules/grid/grid_filter/MLB_Interface.h 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_filter/MLB_Interface.h 2014-11-13 08:32:17.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: MLB_Interface.h 911 2011-02-14 16:38:15Z reklov_w $ + * Version $Id: MLB_Interface.h 1922 2014-01-09 10:28:46Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_gridding/Interpolation_AngularDistance.cpp saga-2.1.4+dfsg/src/modules/grid/grid_gridding/Interpolation_AngularDistance.cpp --- saga-2.1.0+dfsg/src/modules/grid/grid_gridding/Interpolation_AngularDistance.cpp 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_gridding/Interpolation_AngularDistance.cpp 2014-11-13 08:32:17.000000000 +0000 @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// @@ -186,7 +186,7 @@ pParameters->Get_Parameter("WEIGHT_BANDWIDTH" )->Set_Enabled(pParameter->asInt() >= 2); // exponential or gaussian } - return( 1 ); + return( CInterpolation::On_Parameters_Enable(pParameters, pParameter) ? 1 : 0 ); } diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_gridding/Interpolation_AngularDistance.h saga-2.1.4+dfsg/src/modules/grid/grid_gridding/Interpolation_AngularDistance.h --- saga-2.1.0+dfsg/src/modules/grid/grid_gridding/Interpolation_AngularDistance.h 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_gridding/Interpolation_AngularDistance.h 2014-11-13 08:32:17.000000000 +0000 @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_gridding/Interpolation.cpp saga-2.1.4+dfsg/src/modules/grid/grid_gridding/Interpolation.cpp --- saga-2.1.0+dfsg/src/modules/grid/grid_gridding/Interpolation.cpp 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_gridding/Interpolation.cpp 2014-11-13 08:32:17.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Interpolation.cpp 1731 2013-06-18 09:35:58Z oconrad $ + * Version $Id: Interpolation.cpp 2221 2014-09-04 16:02:43Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// @@ -84,18 +84,7 @@ _TL("") ); - //----------------------------------------------------- - Parameters.Add_Choice( - NULL , "TARGET" , _TL("Target Grid"), - _TL(""), - CSG_String::Format(SG_T("%s|%s|"), - _TL("user defined"), - _TL("grid") - ), 0 - ); - - m_Grid_Target.Add_Parameters_User(Add_Parameters("USER", _TL("User Defined Grid") , _TL(""))); - m_Grid_Target.Add_Parameters_Grid(Add_Parameters("GRID", _TL("Choose Grid") , _TL(""))); + m_Grid_Target.Create(SG_UI_Get_Window_Main() ? &Parameters : Add_Parameters("TARGET", _TL("Target System"), _TL(""))); } @@ -108,7 +97,18 @@ //--------------------------------------------------------- int CInterpolation::On_Parameter_Changed(CSG_Parameters *pParameters, CSG_Parameter *pParameter) { - return( m_Grid_Target.On_User_Changed(pParameters, pParameter) ? 1 : 0 ); + if( !SG_STR_CMP(pParameter->Get_Identifier(), "SHAPES") && pParameter->asShapes() ) + { + m_Grid_Target.Set_User_Defined(pParameters, pParameter->asShapes()->Get_Extent()); + } + + return( m_Grid_Target.On_Parameter_Changed(pParameters, pParameter) ? 1 : 0 ); +} + +//--------------------------------------------------------- +int CInterpolation::On_Parameters_Enable(CSG_Parameters *pParameters, CSG_Parameter *pParameter) +{ + return( m_Grid_Target.On_Parameters_Enable(pParameters, pParameter) ? 1 : 0 ); } @@ -121,34 +121,16 @@ //--------------------------------------------------------- bool CInterpolation::On_Execute(void) { - bool bResult = false; - //----------------------------------------------------- - m_pShapes = Parameters("SHAPES") ->asShapes(); - m_zField = Parameters("FIELD") ->asInt(); + m_pShapes = Parameters("SHAPES")->asShapes(); + m_zField = Parameters("FIELD" )->asInt(); //----------------------------------------------------- - m_pGrid = NULL; + bool bResult = false; - switch( Parameters("TARGET")->asInt() ) - { - case 0: // user defined... - if( m_Grid_Target.Init_User(m_pShapes->Get_Extent()) && Dlg_Parameters("USER") ) - { - m_pGrid = m_Grid_Target.Get_User(); - } - break; - - case 1: // grid... - if( Dlg_Parameters("GRID") ) - { - m_pGrid = m_Grid_Target.Get_Grid(); - } - break; - } + m_Grid_Target.Set_User_Defined(Get_Parameters("TARGET"), m_pShapes->Get_Extent()); Dlg_Parameters("TARGET"); // if called from saga_cmd - //----------------------------------------------------- - if( m_pGrid ) + if( (m_pGrid = m_Grid_Target.Get_Grid()) != NULL ) { m_pGrid->Set_Name(CSG_String::Format(SG_T("%s [%s]"), Parameters("FIELD")->asString(), Get_Name().c_str())); diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_gridding/Interpolation.h saga-2.1.4+dfsg/src/modules/grid/grid_gridding/Interpolation.h --- saga-2.1.0+dfsg/src/modules/grid/grid_gridding/Interpolation.h 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_gridding/Interpolation.h 2014-11-13 08:32:17.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Interpolation.h 1246 2011-11-25 13:42:38Z oconrad $ + * Version $Id: Interpolation.h 2212 2014-09-01 13:29:48Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// @@ -92,9 +92,10 @@ protected: - virtual bool On_Execute (void); - virtual int On_Parameter_Changed (CSG_Parameters *pParameters, CSG_Parameter *pParameter); + virtual int On_Parameters_Enable (CSG_Parameters *pParameters, CSG_Parameter *pParameter); + + virtual bool On_Execute (void); int m_zField; diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_gridding/Interpolation_InverseDistance.cpp saga-2.1.4+dfsg/src/modules/grid/grid_gridding/Interpolation_InverseDistance.cpp --- saga-2.1.0+dfsg/src/modules/grid/grid_gridding/Interpolation_InverseDistance.cpp 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_gridding/Interpolation_InverseDistance.cpp 2014-11-13 08:32:17.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Interpolation_InverseDistance.cpp 1731 2013-06-18 09:35:58Z oconrad $ + * Version $Id: Interpolation_InverseDistance.cpp 2212 2014-09-01 13:29:48Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// @@ -181,7 +181,7 @@ pParameters->Get_Parameter("WEIGHT_BANDWIDTH" )->Set_Enabled(pParameter->asInt() >= 2); // exponential or gaussian } - return( 1 ); + return( CInterpolation::On_Parameters_Enable(pParameters, pParameter) ? 1 : 0 ); } @@ -244,7 +244,7 @@ { CSG_Shape *pPoint = m_pShapes->Get_Shape(iPoint); - if( !pPoint ) + if( !pPoint || pPoint->is_NoData(m_zField) ) { return( false ); } diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_gridding/Interpolation_InverseDistance.h saga-2.1.4+dfsg/src/modules/grid/grid_gridding/Interpolation_InverseDistance.h --- saga-2.1.0+dfsg/src/modules/grid/grid_gridding/Interpolation_InverseDistance.h 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_gridding/Interpolation_InverseDistance.h 2014-11-13 08:32:17.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Interpolation_InverseDistance.h 1731 2013-06-18 09:35:58Z oconrad $ + * Version $Id: Interpolation_InverseDistance.h 1921 2014-01-09 10:24:11Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_gridding/Interpolation_NaturalNeighbour.cpp saga-2.1.4+dfsg/src/modules/grid/grid_gridding/Interpolation_NaturalNeighbour.cpp --- saga-2.1.0+dfsg/src/modules/grid/grid_gridding/Interpolation_NaturalNeighbour.cpp 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_gridding/Interpolation_NaturalNeighbour.cpp 2014-11-13 08:32:17.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Interpolation_NaturalNeighbour.cpp 1081 2011-06-08 08:05:26Z reklov_w $ + * Version $Id: Interpolation_NaturalNeighbour.cpp 2064 2014-03-21 13:20:57Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// @@ -135,9 +135,9 @@ delaunay *pTIN = delaunay_build(n, pSrc, 0, NULL, 0, NULL); //----------------------------------------------------- - double *xDst = (double *)SG_Malloc((long) m_pGrid->Get_NCells() * sizeof(double)); - double *yDst = (double *)SG_Malloc((long) m_pGrid->Get_NCells() * sizeof(double)); - double *zDst = (double *)SG_Malloc((long) m_pGrid->Get_NCells() * sizeof(double)); + double *xDst = (double *)SG_Malloc(m_pGrid->Get_NCells() * sizeof(double)); + double *yDst = (double *)SG_Malloc(m_pGrid->Get_NCells() * sizeof(double)); + double *zDst = (double *)SG_Malloc(m_pGrid->Get_NCells() * sizeof(double)); for(y=0, i=0, p.y=m_pGrid->Get_YMin(); yGet_NY() && Set_Progress(y, m_pGrid->Get_NY()); y++, p.y+=m_pGrid->Get_Cellsize()) { diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_gridding/Interpolation_NaturalNeighbour.h saga-2.1.4+dfsg/src/modules/grid/grid_gridding/Interpolation_NaturalNeighbour.h --- saga-2.1.0+dfsg/src/modules/grid/grid_gridding/Interpolation_NaturalNeighbour.h 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_gridding/Interpolation_NaturalNeighbour.h 2014-11-13 08:32:17.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Interpolation_NaturalNeighbour.h 1130 2011-07-14 07:42:46Z reklov_w $ + * Version $Id: Interpolation_NaturalNeighbour.h 1921 2014-01-09 10:24:11Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_gridding/Interpolation_NearestNeighbour.cpp saga-2.1.4+dfsg/src/modules/grid/grid_gridding/Interpolation_NearestNeighbour.cpp --- saga-2.1.0+dfsg/src/modules/grid/grid_gridding/Interpolation_NearestNeighbour.cpp 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_gridding/Interpolation_NearestNeighbour.cpp 2014-11-13 08:32:17.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Interpolation_NearestNeighbour.cpp 911 2011-02-14 16:38:15Z reklov_w $ + * Version $Id: Interpolation_NearestNeighbour.cpp 1921 2014-01-09 10:24:11Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_gridding/Interpolation_NearestNeighbour.h saga-2.1.4+dfsg/src/modules/grid/grid_gridding/Interpolation_NearestNeighbour.h --- saga-2.1.0+dfsg/src/modules/grid/grid_gridding/Interpolation_NearestNeighbour.h 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_gridding/Interpolation_NearestNeighbour.h 2014-11-13 08:32:17.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Interpolation_NearestNeighbour.h 1130 2011-07-14 07:42:46Z reklov_w $ + * Version $Id: Interpolation_NearestNeighbour.h 1921 2014-01-09 10:24:11Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_gridding/Interpolation_Shepard.cpp saga-2.1.4+dfsg/src/modules/grid/grid_gridding/Interpolation_Shepard.cpp --- saga-2.1.0+dfsg/src/modules/grid/grid_gridding/Interpolation_Shepard.cpp 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_gridding/Interpolation_Shepard.cpp 2014-11-13 08:32:17.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Interpolation_Shepard.cpp 911 2011-02-14 16:38:15Z reklov_w $ + * Version $Id: Interpolation_Shepard.cpp 1921 2014-01-09 10:24:11Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_gridding/Interpolation_Shepard.h saga-2.1.4+dfsg/src/modules/grid/grid_gridding/Interpolation_Shepard.h --- saga-2.1.0+dfsg/src/modules/grid/grid_gridding/Interpolation_Shepard.h 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_gridding/Interpolation_Shepard.h 2014-11-13 08:32:17.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Interpolation_Shepard.h 1130 2011-07-14 07:42:46Z reklov_w $ + * Version $Id: Interpolation_Shepard.h 1921 2014-01-09 10:24:11Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_gridding/Interpolation_Triangulation.cpp saga-2.1.4+dfsg/src/modules/grid/grid_gridding/Interpolation_Triangulation.cpp --- saga-2.1.0+dfsg/src/modules/grid/grid_gridding/Interpolation_Triangulation.cpp 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_gridding/Interpolation_Triangulation.cpp 2014-11-13 08:32:17.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Interpolation_Triangulation.cpp 911 2011-02-14 16:38:15Z reklov_w $ + * Version $Id: Interpolation_Triangulation.cpp 1921 2014-01-09 10:24:11Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_gridding/Interpolation_Triangulation.h saga-2.1.4+dfsg/src/modules/grid/grid_gridding/Interpolation_Triangulation.h --- saga-2.1.0+dfsg/src/modules/grid/grid_gridding/Interpolation_Triangulation.h 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_gridding/Interpolation_Triangulation.h 2014-11-13 08:32:17.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Interpolation_Triangulation.h 1130 2011-07-14 07:42:46Z reklov_w $ + * Version $Id: Interpolation_Triangulation.h 1921 2014-01-09 10:24:11Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_gridding/kernel_density.cpp saga-2.1.4+dfsg/src/modules/grid/grid_gridding/kernel_density.cpp --- saga-2.1.0+dfsg/src/modules/grid/grid_gridding/kernel_density.cpp 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_gridding/kernel_density.cpp 2014-11-13 08:32:17.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: kernel_density.cpp 911 2011-02-14 16:38:15Z reklov_w $ + * Version $Id: kernel_density.cpp 2221 2014-09-04 16:02:43Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// @@ -127,17 +127,7 @@ ); //----------------------------------------------------- - Parameters.Add_Choice( - NULL , "TARGET" , _TL("Target Grid"), - _TL(""), - CSG_String::Format(SG_T("%s|%s|"), - _TL("user defined"), - _TL("grid") - ), 0 - ); - - m_Grid_Target.Add_Parameters_User(Add_Parameters("USER", _TL("User Defined Grid") , _TL(""))); - m_Grid_Target.Add_Parameters_Grid(Add_Parameters("GRID", _TL("Choose Grid") , _TL(""))); + m_Grid_Target.Create(SG_UI_Get_Window_Main() ? &Parameters : Add_Parameters("TARGET", _TL("Target System"), _TL(""))); } @@ -150,7 +140,23 @@ //--------------------------------------------------------- int CKernel_Density::On_Parameter_Changed(CSG_Parameters *pParameters, CSG_Parameter *pParameter) { - return( m_Grid_Target.On_User_Changed(pParameters, pParameter) ? 1 : 0 ); + if( (!SG_STR_CMP(pParameter->Get_Identifier(), "POINTS") || !SG_STR_CMP(pParameter->Get_Identifier(), "RADIUS")) + && pParameters->Get_Parameter("POINTS")->asShapes() ) + { + CSG_Rect Extent(pParameters->Get_Parameter("POINTS")->asShapes()->Get_Extent()); + + Extent.Inflate(pParameters->Get_Parameter("RADIUS")->asDouble(), false); + + m_Grid_Target.Set_User_Defined(pParameters, Extent); + } + + return( m_Grid_Target.On_Parameter_Changed(pParameters, pParameter) ? 1 : 0 ); +} + +//--------------------------------------------------------- +int CKernel_Density::On_Parameters_Enable(CSG_Parameters *pParameters, CSG_Parameter *pParameter) +{ + return( m_Grid_Target.On_Parameters_Enable(pParameters, pParameter) ? 1 : 0 ); } @@ -168,10 +174,10 @@ CSG_Shapes *pPoints; //----------------------------------------------------- - pPoints = Parameters("POINTS") ->asShapes(); - Population = Parameters("POPULATION") ->asInt(); - Radius = Parameters("RADIUS") ->asDouble(); - m_Kernel = Parameters("KERNEL") ->asInt(); + pPoints = Parameters("POINTS" )->asShapes(); + Population = Parameters("POPULATION")->asInt(); + Radius = Parameters("RADIUS" )->asDouble(); + m_Kernel = Parameters("KERNEL" )->asInt(); if( Population < 0 || Population >= pPoints->Get_Field_Count() || pPoints->Get_Field_Type(Population) == SG_DATATYPE_String ) { @@ -179,37 +185,13 @@ } //----------------------------------------------------- - m_pGrid = NULL; - - switch( Parameters("TARGET")->asInt() ) - { - case 0: // user defined... - { - CSG_Rect Extent(pPoints->Get_Extent()); - - Extent.Inflate(Radius, false); - - if( m_Grid_Target.Init_User(Extent) && Dlg_Parameters("USER") ) - { - m_pGrid = m_Grid_Target.Get_User(); - } - } - break; - - case 1: // grid... - if( Dlg_Parameters("GRID") ) - { - m_pGrid = m_Grid_Target.Get_Grid(); - } - break; - } + m_Grid_Target.Set_User_Defined(Get_Parameters("TARGET"), pPoints->Get_Extent()); Dlg_Parameters("TARGET"); // if called from saga_cmd - if( m_pGrid == NULL ) + if( (m_pGrid = m_Grid_Target.Get_Grid()) == NULL ) { return( false ); } - //------------------------------------------------- m_pGrid->Set_Name(CSG_String::Format(SG_T("%s [%s]"), pPoints->Get_Name(), _TL("Kernel Density"))); m_pGrid->Set_NoData_Value(0.0); m_pGrid->Assign(0.0); diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_gridding/kernel_density.h saga-2.1.4+dfsg/src/modules/grid/grid_gridding/kernel_density.h --- saga-2.1.0+dfsg/src/modules/grid/grid_gridding/kernel_density.h 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_gridding/kernel_density.h 2014-11-13 08:32:17.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: kernel_density.h 1130 2011-07-14 07:42:46Z reklov_w $ + * Version $Id: kernel_density.h 2212 2014-09-01 13:29:48Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// @@ -88,9 +88,10 @@ protected: - virtual bool On_Execute (void); - virtual int On_Parameter_Changed (CSG_Parameters *pParameters, CSG_Parameter *pParameter); + virtual int On_Parameters_Enable (CSG_Parameters *pParameters, CSG_Parameter *pParameter); + + virtual bool On_Execute (void); private: diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_gridding/Makefile.in saga-2.1.4+dfsg/src/modules/grid/grid_gridding/Makefile.in --- saga-2.1.0+dfsg/src/modules/grid/grid_gridding/Makefile.in 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_gridding/Makefile.in 2014-11-13 08:33:31.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -35,15 +79,17 @@ build_triplet = @build@ host_triplet = @host@ subdir = src/modules/grid/grid_gridding -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_postgresql.m4 \ + $(top_srcdir)/m4/ax_pkg_swig.m4 \ $(top_srcdir)/m4/ax_python_devel.m4 \ $(top_srcdir)/m4/ax_swig_enable_cxx.m4 \ $(top_srcdir)/m4/ax_swig_python.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.in + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -71,6 +117,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(pkglibdir)" LTLIBRARIES = $(pkglib_LTLIBRARIES) libgrid_gridding_la_DEPENDENCIES = \ @@ -84,35 +136,92 @@ MLB_Interface.lo Shapes2Grid.lo Shepard.lo delaunay.lo hash.lo \ istack.lo lpi.lo nnai.lo nncommon.lo nnpi.lo triangle.lo libgrid_gridding_la_OBJECTS = $(am_libgrid_gridding_la_OBJECTS) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = SOURCES = $(libgrid_gridding_la_SOURCES) DIST_SOURCES = $(libgrid_gridding_la_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -133,6 +242,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLELIBHARU = @DISABLELIBHARU@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -160,6 +270,7 @@ LOCAL_LIBS = @LOCAL_LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -172,8 +283,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PG_CONFIG = @PG_CONFIG@ +POSTGRESQL_CFLAGS = @POSTGRESQL_CFLAGS@ +POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@ +POSTGRESQL_VERSION = @POSTGRESQL_VERSION@ POW_LIB = @POW_LIB@ PYTHON = @PYTHON@ PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ @@ -197,6 +313,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -230,7 +347,6 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -315,9 +431,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/modules/grid/grid_gridding/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/modules/grid/grid_gridding/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu src/modules/grid/grid_gridding/Makefile + $(AUTOMAKE) --foreign src/modules/grid/grid_gridding/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -336,9 +452,9 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): + install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -346,6 +462,8 @@ else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \ } @@ -361,14 +479,17 @@ clean-pkglibLTLIBRARIES: -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES) - @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -libgrid_gridding.la: $(libgrid_gridding_la_OBJECTS) $(libgrid_gridding_la_DEPENDENCIES) - $(CXXLINK) -rpath $(pkglibdir) $(libgrid_gridding_la_OBJECTS) $(libgrid_gridding_la_LIBADD) $(LIBS) + @list='$(pkglib_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + +libgrid_gridding.la: $(libgrid_gridding_la_OBJECTS) $(libgrid_gridding_la_DEPENDENCIES) $(EXTRA_libgrid_gridding_la_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) -rpath $(pkglibdir) $(libgrid_gridding_la_OBJECTS) $(libgrid_gridding_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -397,102 +518,102 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/triangle.Plo@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< delaunay.lo: ./nn/delaunay.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT delaunay.lo -MD -MP -MF $(DEPDIR)/delaunay.Tpo -c -o delaunay.lo `test -f './nn/delaunay.c' || echo '$(srcdir)/'`./nn/delaunay.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/delaunay.Tpo $(DEPDIR)/delaunay.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='./nn/delaunay.c' object='delaunay.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT delaunay.lo -MD -MP -MF $(DEPDIR)/delaunay.Tpo -c -o delaunay.lo `test -f './nn/delaunay.c' || echo '$(srcdir)/'`./nn/delaunay.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/delaunay.Tpo $(DEPDIR)/delaunay.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='./nn/delaunay.c' object='delaunay.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o delaunay.lo `test -f './nn/delaunay.c' || echo '$(srcdir)/'`./nn/delaunay.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o delaunay.lo `test -f './nn/delaunay.c' || echo '$(srcdir)/'`./nn/delaunay.c hash.lo: ./nn/hash.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hash.lo -MD -MP -MF $(DEPDIR)/hash.Tpo -c -o hash.lo `test -f './nn/hash.c' || echo '$(srcdir)/'`./nn/hash.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/hash.Tpo $(DEPDIR)/hash.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='./nn/hash.c' object='hash.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hash.lo -MD -MP -MF $(DEPDIR)/hash.Tpo -c -o hash.lo `test -f './nn/hash.c' || echo '$(srcdir)/'`./nn/hash.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/hash.Tpo $(DEPDIR)/hash.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='./nn/hash.c' object='hash.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o hash.lo `test -f './nn/hash.c' || echo '$(srcdir)/'`./nn/hash.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o hash.lo `test -f './nn/hash.c' || echo '$(srcdir)/'`./nn/hash.c istack.lo: ./nn/istack.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT istack.lo -MD -MP -MF $(DEPDIR)/istack.Tpo -c -o istack.lo `test -f './nn/istack.c' || echo '$(srcdir)/'`./nn/istack.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/istack.Tpo $(DEPDIR)/istack.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='./nn/istack.c' object='istack.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT istack.lo -MD -MP -MF $(DEPDIR)/istack.Tpo -c -o istack.lo `test -f './nn/istack.c' || echo '$(srcdir)/'`./nn/istack.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/istack.Tpo $(DEPDIR)/istack.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='./nn/istack.c' object='istack.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o istack.lo `test -f './nn/istack.c' || echo '$(srcdir)/'`./nn/istack.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o istack.lo `test -f './nn/istack.c' || echo '$(srcdir)/'`./nn/istack.c lpi.lo: ./nn/lpi.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lpi.lo -MD -MP -MF $(DEPDIR)/lpi.Tpo -c -o lpi.lo `test -f './nn/lpi.c' || echo '$(srcdir)/'`./nn/lpi.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/lpi.Tpo $(DEPDIR)/lpi.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='./nn/lpi.c' object='lpi.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lpi.lo -MD -MP -MF $(DEPDIR)/lpi.Tpo -c -o lpi.lo `test -f './nn/lpi.c' || echo '$(srcdir)/'`./nn/lpi.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lpi.Tpo $(DEPDIR)/lpi.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='./nn/lpi.c' object='lpi.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lpi.lo `test -f './nn/lpi.c' || echo '$(srcdir)/'`./nn/lpi.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lpi.lo `test -f './nn/lpi.c' || echo '$(srcdir)/'`./nn/lpi.c nnai.lo: ./nn/nnai.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT nnai.lo -MD -MP -MF $(DEPDIR)/nnai.Tpo -c -o nnai.lo `test -f './nn/nnai.c' || echo '$(srcdir)/'`./nn/nnai.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/nnai.Tpo $(DEPDIR)/nnai.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='./nn/nnai.c' object='nnai.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT nnai.lo -MD -MP -MF $(DEPDIR)/nnai.Tpo -c -o nnai.lo `test -f './nn/nnai.c' || echo '$(srcdir)/'`./nn/nnai.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/nnai.Tpo $(DEPDIR)/nnai.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='./nn/nnai.c' object='nnai.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o nnai.lo `test -f './nn/nnai.c' || echo '$(srcdir)/'`./nn/nnai.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o nnai.lo `test -f './nn/nnai.c' || echo '$(srcdir)/'`./nn/nnai.c nncommon.lo: ./nn/nncommon.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT nncommon.lo -MD -MP -MF $(DEPDIR)/nncommon.Tpo -c -o nncommon.lo `test -f './nn/nncommon.c' || echo '$(srcdir)/'`./nn/nncommon.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/nncommon.Tpo $(DEPDIR)/nncommon.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='./nn/nncommon.c' object='nncommon.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT nncommon.lo -MD -MP -MF $(DEPDIR)/nncommon.Tpo -c -o nncommon.lo `test -f './nn/nncommon.c' || echo '$(srcdir)/'`./nn/nncommon.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/nncommon.Tpo $(DEPDIR)/nncommon.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='./nn/nncommon.c' object='nncommon.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o nncommon.lo `test -f './nn/nncommon.c' || echo '$(srcdir)/'`./nn/nncommon.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o nncommon.lo `test -f './nn/nncommon.c' || echo '$(srcdir)/'`./nn/nncommon.c nnpi.lo: ./nn/nnpi.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT nnpi.lo -MD -MP -MF $(DEPDIR)/nnpi.Tpo -c -o nnpi.lo `test -f './nn/nnpi.c' || echo '$(srcdir)/'`./nn/nnpi.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/nnpi.Tpo $(DEPDIR)/nnpi.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='./nn/nnpi.c' object='nnpi.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT nnpi.lo -MD -MP -MF $(DEPDIR)/nnpi.Tpo -c -o nnpi.lo `test -f './nn/nnpi.c' || echo '$(srcdir)/'`./nn/nnpi.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/nnpi.Tpo $(DEPDIR)/nnpi.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='./nn/nnpi.c' object='nnpi.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o nnpi.lo `test -f './nn/nnpi.c' || echo '$(srcdir)/'`./nn/nnpi.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o nnpi.lo `test -f './nn/nnpi.c' || echo '$(srcdir)/'`./nn/nnpi.c triangle.lo: ./nn/triangle.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT triangle.lo -MD -MP -MF $(DEPDIR)/triangle.Tpo -c -o triangle.lo `test -f './nn/triangle.c' || echo '$(srcdir)/'`./nn/triangle.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/triangle.Tpo $(DEPDIR)/triangle.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='./nn/triangle.c' object='triangle.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT triangle.lo -MD -MP -MF $(DEPDIR)/triangle.Tpo -c -o triangle.lo `test -f './nn/triangle.c' || echo '$(srcdir)/'`./nn/triangle.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/triangle.Tpo $(DEPDIR)/triangle.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='./nn/triangle.c' object='triangle.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o triangle.lo `test -f './nn/triangle.c' || echo '$(srcdir)/'`./nn/triangle.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o triangle.lo `test -f './nn/triangle.c' || echo '$(srcdir)/'`./nn/triangle.c .cpp.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< .cpp.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .cpp.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -500,26 +621,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -531,15 +641,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -548,6 +654,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -599,10 +720,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -687,19 +813,20 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-pkglibLTLIBRARIES ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-pkglibLTLIBRARIES \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-pkglibLTLIBRARIES install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ + uninstall-pkglibLTLIBRARIES # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_gridding/MLB_Interface.cpp saga-2.1.4+dfsg/src/modules/grid/grid_gridding/MLB_Interface.cpp --- saga-2.1.0+dfsg/src/modules/grid/grid_gridding/MLB_Interface.cpp 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_gridding/MLB_Interface.cpp 2014-11-13 08:32:17.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: MLB_Interface.cpp 1731 2013-06-18 09:35:58Z oconrad $ + * Version $Id: MLB_Interface.cpp 2281 2014-10-09 15:49:41Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// @@ -74,8 +74,11 @@ switch( i ) { case MLB_INFO_Name: default: - return( _TL("Grid - Gridding") ); + return( _TL("Gridding") ); + case MLB_INFO_Category: + return( _TL("Grid") ); + case MLB_INFO_Author: return( SG_T("O. Conrad (c) 2002-10") ); diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_gridding/MLB_Interface.h saga-2.1.4+dfsg/src/modules/grid/grid_gridding/MLB_Interface.h --- saga-2.1.0+dfsg/src/modules/grid/grid_gridding/MLB_Interface.h 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_gridding/MLB_Interface.h 2014-11-13 08:32:17.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: MLB_Interface.h 911 2011-02-14 16:38:15Z reklov_w $ + * Version $Id: MLB_Interface.h 1921 2014-01-09 10:24:11Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_gridding/Shapes2Grid.cpp saga-2.1.4+dfsg/src/modules/grid/grid_gridding/Shapes2Grid.cpp --- saga-2.1.0+dfsg/src/modules/grid/grid_gridding/Shapes2Grid.cpp 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_gridding/Shapes2Grid.cpp 2014-11-13 08:32:17.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Shapes2Grid.cpp 1560 2012-12-07 12:53:00Z oconrad $ + * Version $Id: Shapes2Grid.cpp 2221 2014-09-04 16:02:43Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// @@ -161,25 +161,9 @@ ); //----------------------------------------------------- - Parameters.Add_Choice( - NULL , "TARGET" , _TL("Target Grid"), - _TL(""), - CSG_String::Format(SG_T("%s|%s|"), - _TL("user defined"), - _TL("grid") - ), 0 - ); - - m_Grid_Target.Add_Parameters_User(Add_Parameters("USER", _TL("User Defined Grid") , _TL(""))); - m_Grid_Target.Add_Parameters_Grid(Add_Parameters("GRID", _TL("Choose Grid") , _TL(""))); + m_Grid_Target.Create(SG_UI_Get_Window_Main() ? &Parameters : Add_Parameters("TARGET", _TL("Target System"), _TL(""))); - m_Grid_Target.Add_Grid_Parameter(SG_T("COUNT"), _TL("Number of Values"), true); - - Get_Parameters("USER")->Add_Value( - NULL , "BCOUNT" , _TL("Number of Values"), - _TL(""), - PARAMETER_TYPE_Bool, false - ); + m_Grid_Target.Add_Grid("COUNT", _TL("Number of Values"), true); } @@ -192,7 +176,12 @@ //--------------------------------------------------------- int CShapes2Grid::On_Parameter_Changed(CSG_Parameters *pParameters, CSG_Parameter *pParameter) { - return( m_Grid_Target.On_User_Changed(pParameters, pParameter) ? 1 : 0 ); + if( !SG_STR_CMP(pParameter->Get_Identifier(), SG_T("INPUT")) && pParameter->asShapes() ) + { + m_Grid_Target.Set_User_Defined(pParameters, pParameter->asShapes()->Get_Extent()); + } + + return( m_Grid_Target.On_Parameter_Changed(pParameters, pParameter) ? 1 : 0 ); } //--------------------------------------------------------- @@ -200,17 +189,17 @@ { if( !SG_STR_CMP(pParameter->Get_Identifier(), SG_T("INPUT")) ) { - pParameters->Get_Parameter("LINE_TYPE")->Set_Enabled(pParameter->asShapes() && pParameter->asShapes()->Get_Type() == SHAPE_TYPE_Line); - pParameters->Get_Parameter("POLY_TYPE")->Set_Enabled(pParameter->asShapes() && pParameter->asShapes()->Get_Type() == SHAPE_TYPE_Polygon); + pParameters->Set_Enabled("LINE_TYPE", pParameter->asShapes() && pParameter->asShapes()->Get_Type() == SHAPE_TYPE_Line); + pParameters->Set_Enabled("POLY_TYPE", pParameter->asShapes() && pParameter->asShapes()->Get_Type() == SHAPE_TYPE_Polygon); } if( !SG_STR_CMP(pParameter->Get_Identifier(), SG_T("OUTPUT")) ) { - pParameters->Get_Parameter("FIELD" )->Set_Enabled(pParameter->asInt() == 2); - pParameters->Get_Parameter("MULTIPLE" )->Set_Enabled(pParameter->asInt() == 2); + pParameters->Set_Enabled("FIELD" , pParameter->asInt() == 2); + pParameters->Set_Enabled("MULTIPLE" , pParameter->asInt() == 2); } - return( 1 ); + return( m_Grid_Target.On_Parameters_Enable(pParameters, pParameter) ? 1 : 0 ); } @@ -245,14 +234,20 @@ //--------------------------------------------------------- bool CShapes2Grid::On_Execute(void) { - int iField, iType, iShape; - //----------------------------------------------------- m_pShapes = Parameters("INPUT" )->asShapes(); + m_Method_Lines = Parameters("LINE_TYPE")->asInt(); m_Method_Polygon = Parameters("POLY_TYPE")->asInt(); m_Method_Multi = Parameters("MULTIPLE" )->asInt(); - iType = Parameters("GRID_TYPE")->asInt(); + + if( m_pShapes->Get_Type() == SHAPE_TYPE_Polygon && m_Method_Polygon == 1 ) // all cells intersected have to be marked + { + m_Method_Lines = 1; // thick, each cell crossed by polygon boundary will be marked additionally + } + + //----------------------------------------------------- + int iField; switch( Parameters("OUTPUT")->asInt() ) { @@ -269,34 +264,13 @@ } //----------------------------------------------------- - m_pGrid = NULL; - m_pCount = NULL; + m_Grid_Target.Set_User_Defined(Get_Parameters("TARGET"), m_pShapes->Get_Extent()); Dlg_Parameters("TARGET"); // if called from saga_cmd - switch( Parameters("TARGET")->asInt() ) - { - case 0: // user defined... - if( m_Grid_Target.Init_User(m_pShapes->Get_Extent()) && Dlg_Parameters("USER") ) - { - m_pGrid = m_Grid_Target.Get_User(Get_Grid_Type(iType)); - m_pCount = Get_Parameters("USER")->Get_Parameter("BCOUNT")->asBool() ? m_Grid_Target.Get_User(SG_T("COUNT")) : NULL; - } - break; - - case 1: // grid... - if( Dlg_Parameters("GRID") ) - { - m_pGrid = m_Grid_Target.Get_Grid(Get_Grid_Type(iType)); - m_pCount = m_Grid_Target.Get_Grid(SG_T("COUNT")); - } - break; - } - - if( m_pGrid == NULL ) + if( (m_pGrid = m_Grid_Target.Get_Grid(Get_Grid_Type(Parameters("GRID_TYPE")->asInt()))) == NULL ) { return( false ); } - //------------------------------------------------- if( iField < 0 ) { m_pGrid->Set_NoData_Value(0.0); @@ -305,9 +279,12 @@ m_pGrid->Set_Name(CSG_String::Format(SG_T("%s [%s]"), m_pShapes->Get_Name(), iField < 0 ? _TL("ID") : m_pShapes->Get_Field_Name(iField))); m_pGrid->Assign_NoData(); + //------------------------------------------------- + m_pCount = m_Grid_Target.Get_Grid("COUNT", m_pShapes->Get_Count() < 256 ? SG_DATATYPE_Byte : SG_DATATYPE_Word); + if( m_pCount == NULL ) { - m_Count.Create(m_pGrid->Get_System(), SG_DATATYPE_Int); + m_Count.Create(m_pGrid->Get_System(), SG_DATATYPE_Word); m_pCount = &m_Count; } @@ -317,13 +294,7 @@ m_pCount->Assign(0.0); //----------------------------------------------------- - if( m_pShapes->Get_Type() == SHAPE_TYPE_Polygon && m_Method_Polygon == 1 ) // all cells intersected have to be marked - { - m_Method_Lines = 1; // thick, each cell crossed by polygon boundary will be marked additionally - } - - //----------------------------------------------------- - for(iShape=0; iShapeGet_Count() && Set_Progress(iShape, m_pShapes->Get_Count()); iShape++) + for(int iShape=0; iShapeGet_Count() && Set_Progress(iShape, m_pShapes->Get_Count()); iShape++) { CSG_Shape *pShape = m_pShapes->Get_Shape(iShape); diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_gridding/Shapes2Grid.h saga-2.1.4+dfsg/src/modules/grid/grid_gridding/Shapes2Grid.h --- saga-2.1.0+dfsg/src/modules/grid/grid_gridding/Shapes2Grid.h 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_gridding/Shapes2Grid.h 2014-11-13 08:32:17.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Shapes2Grid.h 1390 2012-05-02 15:37:51Z oconrad $ + * Version $Id: Shapes2Grid.h 1921 2014-01-09 10:24:11Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_gridding/Shepard.cpp saga-2.1.4+dfsg/src/modules/grid/grid_gridding/Shepard.cpp --- saga-2.1.0+dfsg/src/modules/grid/grid_gridding/Shepard.cpp 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_gridding/Shepard.cpp 2014-11-13 08:32:17.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Shepard.cpp 911 2011-02-14 16:38:15Z reklov_w $ + * Version $Id: Shepard.cpp 1922 2014-01-09 10:28:46Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_spline/Gridding_Spline_BA.cpp saga-2.1.4+dfsg/src/modules/grid/grid_spline/Gridding_Spline_BA.cpp --- saga-2.1.0+dfsg/src/modules/grid/grid_spline/Gridding_Spline_BA.cpp 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_spline/Gridding_Spline_BA.cpp 2014-11-13 08:32:15.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Gridding_Spline_BA.cpp 911 2011-02-14 16:38:15Z reklov_w $ + * Version $Id: Gridding_Spline_BA.cpp 1921 2014-01-09 10:24:11Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// @@ -79,9 +79,9 @@ Set_Author (SG_T("(c) 2006 by O.Conrad")); Set_Description (_TW( - "Calculates B-spline functions for choosen level of detail. " - "This module serves as basis for the 'Multilevel B-Spline Interpolation' " - "and is not suited as it is for spatial data interpolation from " + "Calculates B-spline functions for chosen level of detail. " + "This module serves as the basis for the 'Multilevel B-Spline Interpolation' " + "and is not suited as is for spatial data interpolation from " "scattered data. " "\n\n" diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_spline/Gridding_Spline_BA.h saga-2.1.4+dfsg/src/modules/grid/grid_spline/Gridding_Spline_BA.h --- saga-2.1.0+dfsg/src/modules/grid/grid_spline/Gridding_Spline_BA.h 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_spline/Gridding_Spline_BA.h 2014-11-13 08:32:15.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Gridding_Spline_BA.h 911 2011-02-14 16:38:15Z reklov_w $ + * Version $Id: Gridding_Spline_BA.h 1921 2014-01-09 10:24:11Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_spline/Gridding_Spline_Base.cpp saga-2.1.4+dfsg/src/modules/grid/grid_spline/Gridding_Spline_Base.cpp --- saga-2.1.0+dfsg/src/modules/grid/grid_spline/Gridding_Spline_Base.cpp 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_spline/Gridding_Spline_Base.cpp 2014-11-13 08:32:15.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Gridding_Spline_Base.cpp 1633 2013-03-22 13:35:15Z oconrad $ + * Version $Id: Gridding_Spline_Base.cpp 2221 2014-09-04 16:02:43Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// @@ -73,43 +73,33 @@ //--------------------------------------------------------- CGridding_Spline_Base::CGridding_Spline_Base(bool bGridPoints) { - m_bGridPoints = bGridPoints; - //----------------------------------------------------- - if( m_bGridPoints ) + if( bGridPoints ) { Parameters.Add_Grid( - NULL , "GRIDPOINTS" , _TL("Grid"), + NULL , "GRID" , _TL("Grid"), _TL(""), PARAMETER_INPUT ); } + + //----------------------------------------------------- else { CSG_Parameter *pNode = Parameters.Add_Shapes( - NULL , "SHAPES" , _TL("Points"), + NULL , "SHAPES" , _TL("Points"), _TL(""), PARAMETER_INPUT ); Parameters.Add_Table_Field( - pNode , "FIELD" , _TL("Attribute"), + pNode , "FIELD" , _TL("Attribute"), _TL("") ); } //----------------------------------------------------- - Parameters.Add_Choice( - NULL , "TARGET" , _TL("Target Grid"), - _TL(""), - CSG_String::Format(SG_T("%s|%s|"), - _TL("user defined"), - _TL("grid") - ), 0 - ); - - m_Grid_Target.Add_Parameters_User(Add_Parameters("USER", _TL("User Defined Grid") , _TL(""))); - m_Grid_Target.Add_Parameters_Grid(Add_Parameters("GRID", _TL("Choose Grid") , _TL(""))); + m_Grid_Target.Create(SG_UI_Get_Window_Main() ? &Parameters : Add_Parameters("TARGET", _TL("Target System"), _TL(""))); } @@ -122,7 +112,23 @@ //--------------------------------------------------------- int CGridding_Spline_Base::On_Parameter_Changed(CSG_Parameters *pParameters, CSG_Parameter *pParameter) { - return( m_Grid_Target.On_User_Changed(pParameters, pParameter) ? 1 : 0 ); + if( !SG_STR_CMP(pParameter->Get_Identifier(), "SHAPES") && pParameter->asShapes() ) + { + m_Grid_Target.Set_User_Defined(pParameters, pParameter->asShapes()->Get_Extent()); + } + + if( !SG_STR_CMP(pParameter->Get_Identifier(), "GRID") && pParameter->asGrid() ) + { + m_Grid_Target.Set_User_Defined(pParameters, pParameter->asGrid()->Get_Extent()); + } + + return( m_Grid_Target.On_Parameter_Changed(pParameters, pParameter) ? 1 : 0 ); +} + +//--------------------------------------------------------- +int CGridding_Spline_Base::On_Parameters_Enable(CSG_Parameters *pParameters, CSG_Parameter *pParameter) +{ + return( m_Grid_Target.On_Parameters_Enable(pParameters, pParameter) ? 1 : 0 ); } @@ -154,38 +160,40 @@ //--------------------------------------------------------- bool CGridding_Spline_Base::_Get_Grid(void) { - CSG_Grid *pGrid = m_bGridPoints ? Parameters("GRIDPOINTS")->asGrid () : NULL; - CSG_Shapes *pShapes = !m_bGridPoints ? Parameters("SHAPES") ->asShapes() : NULL; - //----------------------------------------------------- - m_pGrid = NULL; - - switch( Parameters("TARGET")->asInt() ) + if( Parameters("GRID") ) { - case 0: // user defined... - if( m_Grid_Target.Init_User(m_bGridPoints ? pGrid->Get_Extent() : pShapes->Get_Extent()) && Dlg_Parameters("USER") ) - { - m_pGrid = m_Grid_Target.Get_User(); - } - break; + CSG_Grid *pPoints = Parameters("GRID")->asGrid(); - case 1: // grid... - if( Dlg_Parameters("GRID") ) + m_Grid_Target.Set_User_Defined(Get_Parameters("TARGET"), pPoints->Get_Extent()); Dlg_Parameters("TARGET"); // if called from saga_cmd + + if( (m_pGrid = m_Grid_Target.Get_Grid()) == NULL ) { - m_pGrid = m_Grid_Target.Get_Grid(); + return( false ); } - break; + + m_pGrid->Set_Name(CSG_String::Format(SG_T("%s [%s]"), pPoints->Get_Name(), Get_Name().c_str())); } - //------------------------------------------------- - if( m_pGrid ) + //----------------------------------------------------- + else { - m_pGrid->Set_Name(CSG_String::Format(SG_T("%s [%s]"), m_bGridPoints ? pGrid->Get_Name() : Parameters("FIELD")->asString(), Get_Name().c_str())); - m_pGrid->Assign_NoData(); + CSG_Shapes *pPoints = Parameters("SHAPES")->asShapes(); + + m_Grid_Target.Set_User_Defined(Get_Parameters("TARGET"), pPoints->Get_Extent()); Dlg_Parameters("TARGET"); // if called from saga_cmd + + if( (m_pGrid = m_Grid_Target.Get_Grid()) == NULL ) + { + return( false ); + } + + m_pGrid->Set_Name(CSG_String::Format(SG_T("%s.%s [%s]"), pPoints->Get_Name(), Parameters("FIELD")->asString(), Get_Name().c_str())); } //----------------------------------------------------- - return( m_pGrid != NULL ); + m_pGrid->Assign_NoData(); + + return( true ); } @@ -200,11 +208,12 @@ { Points.Clear(); - if( m_bGridPoints ) + //----------------------------------------------------- + if( Parameters("GRID") ) { int x, y; TSG_Point p; - CSG_Grid *pGrid = Parameters("GRIDPOINTS") ->asGrid(); + CSG_Grid *pGrid = Parameters("GRID")->asGrid(); for(y=0, p.y=pGrid->Get_YMin(); yGet_NY() && Set_Progress(y, pGrid->Get_NY()); y++, p.y+=pGrid->Get_Cellsize()) { @@ -217,10 +226,12 @@ } } } + + //----------------------------------------------------- else { - CSG_Shapes *pShapes = Parameters("SHAPES") ->asShapes(); - int zField = Parameters("FIELD") ->asInt(); + CSG_Shapes *pShapes = Parameters("SHAPES")->asShapes(); + int zField = Parameters("FIELD" )->asInt (); for(int iShape=0; iShapeGet_Count() && Set_Progress(iShape, pShapes->Get_Count()); iShape++) { diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_spline/Gridding_Spline_Base.h saga-2.1.4+dfsg/src/modules/grid/grid_spline/Gridding_Spline_Base.h --- saga-2.1.0+dfsg/src/modules/grid/grid_spline/Gridding_Spline_Base.h 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_spline/Gridding_Spline_Base.h 2014-11-13 08:32:15.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Gridding_Spline_Base.h 1246 2011-11-25 13:42:38Z oconrad $ + * Version $Id: Gridding_Spline_Base.h 2221 2014-09-04 16:02:43Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// @@ -94,7 +94,9 @@ CSG_Grid *m_pGrid; + virtual int On_Parameter_Changed (CSG_Parameters *pParameters, CSG_Parameter *pParameter); + virtual int On_Parameters_Enable (CSG_Parameters *pParameters, CSG_Parameter *pParameter); bool Initialise (void); @@ -105,8 +107,6 @@ private: - bool m_bGridPoints; - CSG_Parameters_Grid_Target m_Grid_Target; diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_spline/Gridding_Spline_CSA.cpp saga-2.1.4+dfsg/src/modules/grid/grid_spline/Gridding_Spline_CSA.cpp --- saga-2.1.0+dfsg/src/modules/grid/grid_spline/Gridding_Spline_CSA.cpp 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_spline/Gridding_Spline_CSA.cpp 2014-11-13 08:32:15.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Gridding_Spline_CSA.cpp 1081 2011-06-08 08:05:26Z reklov_w $ + * Version $Id: Gridding_Spline_CSA.cpp 2064 2014-03-21 13:20:57Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// @@ -217,7 +217,7 @@ m_Points.Clear(); //----------------------------------------------------- - point *pDst = (point *)SG_Malloc((long) m_pGrid->Get_NCells() * sizeof(point)); + point *pDst = (point *)SG_Malloc(m_pGrid->Get_NCells() * sizeof(point)); for(y=0, i=0, p.y=m_pGrid->Get_YMin(); yGet_NY() && Set_Progress(y, m_pGrid->Get_NY()); y++, p.y+=m_pGrid->Get_Cellsize()) { diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_spline/Gridding_Spline_CSA.h saga-2.1.4+dfsg/src/modules/grid/grid_spline/Gridding_Spline_CSA.h --- saga-2.1.0+dfsg/src/modules/grid/grid_spline/Gridding_Spline_CSA.h 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_spline/Gridding_Spline_CSA.h 2014-11-13 08:32:15.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Gridding_Spline_CSA.h 911 2011-02-14 16:38:15Z reklov_w $ + * Version $Id: Gridding_Spline_CSA.h 1921 2014-01-09 10:24:11Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_spline/Gridding_Spline_MBA.cpp saga-2.1.4+dfsg/src/modules/grid/grid_spline/Gridding_Spline_MBA.cpp --- saga-2.1.0+dfsg/src/modules/grid/grid_spline/Gridding_Spline_MBA.cpp 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_spline/Gridding_Spline_MBA.cpp 2014-11-13 08:32:15.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Gridding_Spline_MBA.cpp 911 2011-02-14 16:38:15Z reklov_w $ + * Version $Id: Gridding_Spline_MBA.cpp 1921 2014-01-09 10:24:11Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_spline/Gridding_Spline_MBA_Grid.cpp saga-2.1.4+dfsg/src/modules/grid/grid_spline/Gridding_Spline_MBA_Grid.cpp --- saga-2.1.0+dfsg/src/modules/grid/grid_spline/Gridding_Spline_MBA_Grid.cpp 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_spline/Gridding_Spline_MBA_Grid.cpp 2014-11-13 08:32:15.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Gridding_Spline_MBA_Grid.cpp 911 2011-02-14 16:38:15Z reklov_w $ + * Version $Id: Gridding_Spline_MBA_Grid.cpp 2221 2014-09-04 16:02:43Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// @@ -76,7 +76,7 @@ { Set_Name (_TL("Multilevel B-Spline Interpolation (from Grid)")); - Set_Author (SG_T("(c) 2006 by O.Conrad")); + Set_Author ("O.Conrad (c) 2006"); Set_Description (_TW( "Multilevel B-spline algorithm for spatial interpolation of scattered data " @@ -101,7 +101,6 @@ Parameters.Add_Choice( NULL , "METHOD" , _TL("Method"), _TL(""), - CSG_String::Format(SG_T("%s|%s|"), _TL("without B-spline refinement"), _TL("with B-spline refinement") @@ -156,17 +155,17 @@ { if( Parameters("DATATYPE")->asInt() == 0 ) { - m_Points.Create(*Parameters("GRIDPOINTS")->asGrid()); + m_Points.Create(*Parameters("GRID")->asGrid()); } else { - m_Points.Create(Parameters("GRIDPOINTS")->asGrid()); - m_Points.Assign(Parameters("GRIDPOINTS")->asGrid()); + m_Points.Create(Parameters("GRID")->asGrid()); + m_Points.Assign(Parameters("GRID")->asGrid()); } - m_Epsilon = Parameters("EPSILON") ->asDouble(); - m_Level_Max = Parameters("LEVEL_MAX") ->asInt(); - m_bUpdate = Parameters("UPDATE") ->asBool(); + m_Epsilon = Parameters("EPSILON" )->asDouble(); + m_Level_Max = Parameters("LEVEL_MAX")->asInt (); + m_bUpdate = Parameters("UPDATE" )->asBool (); double dCell = m_pGrid->Get_XRange() > m_pGrid->Get_YRange() ? m_pGrid->Get_XRange() : m_pGrid->Get_YRange(); @@ -197,8 +196,8 @@ //--------------------------------------------------------- bool CGridding_Spline_MBA_Grid::_Set_MBA(double dCell) { - bool bContinue; - int nCells; + bool bContinue; + int nCells; CSG_Grid Phi; for(bContinue=true, nCells=1; bContinue; nCells*=2, dCell/=2.0) @@ -226,8 +225,8 @@ //--------------------------------------------------------- bool CGridding_Spline_MBA_Grid::_Set_MBA_Refinement(double dCell) { - bool bContinue; - int nCells; + bool bContinue; + int nCells; CSG_Grid A, B, *Phi, *Psi, *pTmp; for(bContinue=true, Psi=&A, Phi=&B, nCells=1; bContinue; nCells*=2, dCell/=2.0) diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_spline/Gridding_Spline_MBA_Grid.h saga-2.1.4+dfsg/src/modules/grid/grid_spline/Gridding_Spline_MBA_Grid.h --- saga-2.1.0+dfsg/src/modules/grid/grid_spline/Gridding_Spline_MBA_Grid.h 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_spline/Gridding_Spline_MBA_Grid.h 2014-11-13 08:32:15.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Gridding_Spline_MBA_Grid.h 911 2011-02-14 16:38:15Z reklov_w $ + * Version $Id: Gridding_Spline_MBA_Grid.h 1921 2014-01-09 10:24:11Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_spline/Gridding_Spline_MBA.h saga-2.1.4+dfsg/src/modules/grid/grid_spline/Gridding_Spline_MBA.h --- saga-2.1.0+dfsg/src/modules/grid/grid_spline/Gridding_Spline_MBA.h 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_spline/Gridding_Spline_MBA.h 2014-11-13 08:32:15.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Gridding_Spline_MBA.h 911 2011-02-14 16:38:15Z reklov_w $ + * Version $Id: Gridding_Spline_MBA.h 1921 2014-01-09 10:24:11Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_spline/Gridding_Spline_TPS_Global.cpp saga-2.1.4+dfsg/src/modules/grid/grid_spline/Gridding_Spline_TPS_Global.cpp --- saga-2.1.0+dfsg/src/modules/grid/grid_spline/Gridding_Spline_TPS_Global.cpp 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_spline/Gridding_Spline_TPS_Global.cpp 2014-11-13 08:32:15.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Gridding_Spline_TPS_Global.cpp 1482 2012-10-08 16:15:45Z oconrad $ + * Version $Id: Gridding_Spline_TPS_Global.cpp 1921 2014-01-09 10:24:11Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_spline/Gridding_Spline_TPS_Global.h saga-2.1.4+dfsg/src/modules/grid/grid_spline/Gridding_Spline_TPS_Global.h --- saga-2.1.0+dfsg/src/modules/grid/grid_spline/Gridding_Spline_TPS_Global.h 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_spline/Gridding_Spline_TPS_Global.h 2014-11-13 08:32:15.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Gridding_Spline_TPS_Global.h 1482 2012-10-08 16:15:45Z oconrad $ + * Version $Id: Gridding_Spline_TPS_Global.h 1921 2014-01-09 10:24:11Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_spline/Gridding_Spline_TPS_Local.cpp saga-2.1.4+dfsg/src/modules/grid/grid_spline/Gridding_Spline_TPS_Local.cpp --- saga-2.1.0+dfsg/src/modules/grid/grid_spline/Gridding_Spline_TPS_Local.cpp 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_spline/Gridding_Spline_TPS_Local.cpp 2014-11-13 08:32:15.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Gridding_Spline_TPS_Local.cpp 1482 2012-10-08 16:15:45Z oconrad $ + * Version $Id: Gridding_Spline_TPS_Local.cpp 1921 2014-01-09 10:24:11Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_spline/Gridding_Spline_TPS_Local.h saga-2.1.4+dfsg/src/modules/grid/grid_spline/Gridding_Spline_TPS_Local.h --- saga-2.1.0+dfsg/src/modules/grid/grid_spline/Gridding_Spline_TPS_Local.h 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_spline/Gridding_Spline_TPS_Local.h 2014-11-13 08:32:15.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Gridding_Spline_TPS_Local.h 1482 2012-10-08 16:15:45Z oconrad $ + * Version $Id: Gridding_Spline_TPS_Local.h 1921 2014-01-09 10:24:11Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_spline/Gridding_Spline_TPS_TIN.cpp saga-2.1.4+dfsg/src/modules/grid/grid_spline/Gridding_Spline_TPS_TIN.cpp --- saga-2.1.0+dfsg/src/modules/grid/grid_spline/Gridding_Spline_TPS_TIN.cpp 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_spline/Gridding_Spline_TPS_TIN.cpp 2014-11-13 08:32:15.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Gridding_Spline_TPS_TIN.cpp 1143 2011-07-29 19:33:09Z reklov_w $ + * Version $Id: Gridding_Spline_TPS_TIN.cpp 1921 2014-01-09 10:24:11Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_spline/Gridding_Spline_TPS_TIN.h saga-2.1.4+dfsg/src/modules/grid/grid_spline/Gridding_Spline_TPS_TIN.h --- saga-2.1.0+dfsg/src/modules/grid/grid_spline/Gridding_Spline_TPS_TIN.h 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_spline/Gridding_Spline_TPS_TIN.h 2014-11-13 08:32:15.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Gridding_Spline_TPS_TIN.h 911 2011-02-14 16:38:15Z reklov_w $ + * Version $Id: Gridding_Spline_TPS_TIN.h 1921 2014-01-09 10:24:11Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_spline/Makefile.in saga-2.1.4+dfsg/src/modules/grid/grid_spline/Makefile.in --- saga-2.1.0+dfsg/src/modules/grid/grid_spline/Makefile.in 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_spline/Makefile.in 2014-11-13 08:33:31.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -35,15 +79,17 @@ build_triplet = @build@ host_triplet = @host@ subdir = src/modules/grid/grid_spline -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_postgresql.m4 \ + $(top_srcdir)/m4/ax_pkg_swig.m4 \ $(top_srcdir)/m4/ax_python_devel.m4 \ $(top_srcdir)/m4/ax_swig_enable_cxx.m4 \ $(top_srcdir)/m4/ax_swig_python.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.in + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -71,6 +117,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(pkglibdir)" LTLIBRARIES = $(pkglib_LTLIBRARIES) libgrid_spline_la_DEPENDENCIES = \ @@ -81,35 +133,92 @@ Gridding_Spline_TPS_Global.lo Gridding_Spline_TPS_Local.lo \ Gridding_Spline_TPS_TIN.lo MLB_Interface.lo libgrid_spline_la_OBJECTS = $(am_libgrid_spline_la_OBJECTS) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = SOURCES = $(libgrid_spline_la_SOURCES) DIST_SOURCES = $(libgrid_spline_la_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -130,6 +239,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLELIBHARU = @DISABLELIBHARU@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -157,6 +267,7 @@ LOCAL_LIBS = @LOCAL_LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -169,8 +280,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PG_CONFIG = @PG_CONFIG@ +POSTGRESQL_CFLAGS = @POSTGRESQL_CFLAGS@ +POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@ +POSTGRESQL_VERSION = @POSTGRESQL_VERSION@ POW_LIB = @POW_LIB@ PYTHON = @PYTHON@ PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ @@ -194,6 +310,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -227,7 +344,6 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -294,9 +410,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/modules/grid/grid_spline/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/modules/grid/grid_spline/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu src/modules/grid/grid_spline/Makefile + $(AUTOMAKE) --foreign src/modules/grid/grid_spline/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -315,9 +431,9 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): + install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -325,6 +441,8 @@ else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \ } @@ -340,14 +458,17 @@ clean-pkglibLTLIBRARIES: -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES) - @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -libgrid_spline.la: $(libgrid_spline_la_OBJECTS) $(libgrid_spline_la_DEPENDENCIES) - $(CXXLINK) -rpath $(pkglibdir) $(libgrid_spline_la_OBJECTS) $(libgrid_spline_la_LIBADD) $(LIBS) + @list='$(pkglib_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + +libgrid_spline.la: $(libgrid_spline_la_OBJECTS) $(libgrid_spline_la_DEPENDENCIES) $(EXTRA_libgrid_spline_la_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) -rpath $(pkglibdir) $(libgrid_spline_la_OBJECTS) $(libgrid_spline_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -367,46 +488,46 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/csa.Plo@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< .cpp.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< .cpp.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .cpp.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -414,26 +535,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -445,15 +555,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -462,6 +568,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -513,10 +634,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -601,19 +727,20 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-pkglibLTLIBRARIES ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-pkglibLTLIBRARIES \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-pkglibLTLIBRARIES install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ + uninstall-pkglibLTLIBRARIES # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_spline/MLB_Interface.cpp saga-2.1.4+dfsg/src/modules/grid/grid_spline/MLB_Interface.cpp --- saga-2.1.0+dfsg/src/modules/grid/grid_spline/MLB_Interface.cpp 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_spline/MLB_Interface.cpp 2014-11-13 08:32:15.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: MLB_Interface.cpp 1246 2011-11-25 13:42:38Z oconrad $ + * Version $Id: MLB_Interface.cpp 2281 2014-10-09 15:49:41Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// @@ -74,8 +74,11 @@ switch( i ) { case MLB_INFO_Name: default: - return( _TL("Grid - Spline Interpolation") ); + return( _TL("Spline Interpolation") ); + case MLB_INFO_Category: + return( _TL("Grid") ); + case MLB_INFO_Author: return( SG_T("O. Conrad (c) 2006-10") ); diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_spline/MLB_Interface.h saga-2.1.4+dfsg/src/modules/grid/grid_spline/MLB_Interface.h --- saga-2.1.0+dfsg/src/modules/grid/grid_spline/MLB_Interface.h 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_spline/MLB_Interface.h 2014-11-13 08:32:15.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: MLB_Interface.h 911 2011-02-14 16:38:15Z reklov_w $ + * Version $Id: MLB_Interface.h 1922 2014-01-09 10:28:46Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_tools/CreateGridSystem.cpp saga-2.1.4+dfsg/src/modules/grid/grid_tools/CreateGridSystem.cpp --- saga-2.1.0+dfsg/src/modules/grid/grid_tools/CreateGridSystem.cpp 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_tools/CreateGridSystem.cpp 2014-11-13 08:32:16.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: CreateGridSystem.cpp 911 2011-02-14 16:38:15Z reklov_w $ + * Version $Id: CreateGridSystem.cpp 1921 2014-01-09 10:24:11Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_tools/CreateGridSystem.h saga-2.1.4+dfsg/src/modules/grid/grid_tools/CreateGridSystem.h --- saga-2.1.0+dfsg/src/modules/grid/grid_tools/CreateGridSystem.h 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_tools/CreateGridSystem.h 2014-11-13 08:32:16.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: CreateGridSystem.h 1246 2011-11-25 13:42:38Z oconrad $ + * Version $Id: CreateGridSystem.h 1921 2014-01-09 10:24:11Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// @@ -81,12 +81,12 @@ CCreateGridSystem(void); virtual ~CCreateGridSystem(void); - virtual CSG_String Get_MenuPath (void) { return( _TL("A:Grid|Construction") ); } + virtual CSG_String Get_MenuPath (void) { return( _TL("A:Grid|Grid System") ); } protected: - virtual bool On_Execute (void); + virtual bool On_Execute (void); private: @@ -94,9 +94,6 @@ }; - - - /////////////////////////////////////////////////////////// // // // // diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_tools/Grid_Aggregate.cpp saga-2.1.4+dfsg/src/modules/grid/grid_tools/Grid_Aggregate.cpp --- saga-2.1.0+dfsg/src/modules/grid/grid_tools/Grid_Aggregate.cpp 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_tools/Grid_Aggregate.cpp 2014-11-13 08:32:16.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Grid_Aggregate.cpp 911 2011-02-14 16:38:15Z reklov_w $ + * Version $Id: Grid_Aggregate.cpp 1921 2014-01-09 10:24:11Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// // // @@ -34,7 +34,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// @@ -58,13 +58,14 @@ /////////////////////////////////////////////////////////// //--------------------------------------------------------- -#include #include "Grid_Aggregate.h" +//--------------------------------------------------------- #define SUM 0 #define MIN 1 #define MAX 2 + /////////////////////////////////////////////////////////// // // // // @@ -74,17 +75,17 @@ //--------------------------------------------------------- CGrid_Aggregate::CGrid_Aggregate(void) { - //----------------------------------------------------- - Set_Name(_TL("Aggregate")); + Set_Name (_TL("Aggregate")); - Set_Author(_TL("Copyrights (c) 2005 by Victor Olaya")); + Set_Author ("Victor Olaya (c) 2005"); - Set_Description (_TW("Resamples a raster layer to a lower resolution, aggregating" - "the values of a group of cells. This should be used in any case in which and a normal" - "resampling will result in wrong values in the resulting layer, such as, for instance," - "the number of elements of a given class in each cell.") - ); + Set_Description (_TW( + "Resamples a raster layer to a lower resolution, aggregating" + "the values of a group of cells. This should be used in any case in which and a normal" + "resampling will result in wrong values in the resulting layer, such as, for instance," + "the number of elements of a given class in each cell." + )); //----------------------------------------------------- Parameters.Add_Grid( @@ -94,16 +95,20 @@ ); Parameters.Add_Value( - NULL , "SIZE" , _TL("Aggregation Size"), + NULL , "SIZE" , _TL("Aggregation Size"), _TL(""), - PARAMETER_TYPE_Int , 2, 2, true + PARAMETER_TYPE_Int, 2, 2, true ); Parameters.Add_Choice( NULL , "METHOD" , _TL("Method"), - _TL(""), _TL("Sum|Min|Max|"), 0 + _TL(""), + CSG_String::Format(SG_T("%s|%s|%s|"), + _TL("sum"), + _TL("minimum"), + _TL("maximum") + ), 0 ); - } //--------------------------------------------------------- diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_tools/Grid_Aggregate.h saga-2.1.4+dfsg/src/modules/grid/grid_tools/Grid_Aggregate.h --- saga-2.1.0+dfsg/src/modules/grid/grid_tools/Grid_Aggregate.h 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_tools/Grid_Aggregate.h 2014-11-13 08:32:16.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Grid_Aggregate.h 1246 2011-11-25 13:42:38Z oconrad $ + * Version $Id: Grid_Aggregate.h 1921 2014-01-09 10:24:11Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// @@ -73,7 +73,7 @@ CGrid_Aggregate(void); virtual ~CGrid_Aggregate(void); - virtual CSG_String Get_MenuPath (void) { return( _TL("A:Grid|Construction") ); } + virtual CSG_String Get_MenuPath (void) { return( _TL("A:Grid|Grid System") ); } protected: diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_tools/Grid_Buffer.cpp saga-2.1.4+dfsg/src/modules/grid/grid_tools/Grid_Buffer.cpp --- saga-2.1.0+dfsg/src/modules/grid/grid_tools/Grid_Buffer.cpp 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_tools/Grid_Buffer.cpp 2014-11-13 08:32:16.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Grid_Buffer.cpp 1586 2013-01-16 09:28:07Z reklov_w $ + * Version $Id: Grid_Buffer.cpp 2321 2014-11-03 21:10:22Z johanvdw $ *********************************************************/ /******************************************************************************* Grid_Buffer.cpp @@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, USA *******************************************************************************/ #include "Grid_Buffer.h" @@ -38,7 +38,7 @@ Set_Name(_TL("Grid Buffer")); Set_Author(_TL("Copyrights (c) 2004 by Victor Olaya")); Set_Description (_TW( - "The module allows to buffer features. The features must be encoded by values greater zero. " + "The module allows one to buffer features. The features must be encoded by values greater zero. " "With the buffer distance method 'cell value', the buffer distance must be encoded in the " "features grid. The output buffer grid is encoded as follows: one inside the buffer, two " "at feature locations.\n\n")); diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_tools/Grid_Buffer.h saga-2.1.4+dfsg/src/modules/grid/grid_tools/Grid_Buffer.h --- saga-2.1.0+dfsg/src/modules/grid/grid_tools/Grid_Buffer.h 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_tools/Grid_Buffer.h 2014-11-13 08:32:16.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Grid_Buffer.h 1246 2011-11-25 13:42:38Z oconrad $ + * Version $Id: Grid_Buffer.h 2072 2014-03-31 08:50:43Z reklov_w $ *********************************************************/ /******************************************************************************* Grid_Buffer.h @@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, USA *******************************************************************************/ //--------------------------------------------------------- #ifndef HEADER_INCLUDED__Grid_Buffer_H @@ -27,19 +27,18 @@ #include "MLB_Interface.h" //--------------------------------------------------------- -class CGrid_Buffer : public CSG_Module_Grid { - -private: - +class CGrid_Buffer : public CSG_Module_Grid +{ public: CGrid_Buffer(void); virtual ~CGrid_Buffer(void); - virtual CSG_String Get_MenuPath (void) { return( _TL("R:Buffers") ); } + virtual CSG_String Get_MenuPath (void) { return( _TL("A:Grid|Distances") ); } protected: - virtual bool On_Execute(void); + + virtual bool On_Execute (void); }; diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_tools/Grid_Buffer_Proximity.cpp saga-2.1.4+dfsg/src/modules/grid/grid_tools/Grid_Buffer_Proximity.cpp --- saga-2.1.0+dfsg/src/modules/grid/grid_tools/Grid_Buffer_Proximity.cpp 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_tools/Grid_Buffer_Proximity.cpp 2014-11-13 08:32:16.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Grid_Buffer_Proximity.cpp 1150 2011-08-29 12:32:40Z reklov_w $ + * Version $Id: Grid_Buffer_Proximity.cpp 1921 2014-01-09 10:24:11Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// // // @@ -34,7 +34,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_tools/Grid_Buffer_Proximity.h saga-2.1.4+dfsg/src/modules/grid/grid_tools/Grid_Buffer_Proximity.h --- saga-2.1.0+dfsg/src/modules/grid/grid_tools/Grid_Buffer_Proximity.h 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_tools/Grid_Buffer_Proximity.h 2014-11-13 08:32:16.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Grid_Buffer_Proximity.h 1246 2011-11-25 13:42:38Z oconrad $ + * Version $Id: Grid_Buffer_Proximity.h 1921 2014-01-09 10:24:11Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// // // @@ -34,7 +34,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// @@ -59,17 +59,18 @@ #include "MLB_Interface.h" //--------------------------------------------------------- -class grid_tools_EXPORT CGrid_Proximity_Buffer : public CSG_Module_Grid { - +class grid_tools_EXPORT CGrid_Proximity_Buffer : public CSG_Module_Grid +{ public: CGrid_Proximity_Buffer(void); virtual ~CGrid_Proximity_Buffer(void); - virtual CSG_String Get_MenuPath (void) { return( _TL("R:Buffers") ); } + virtual CSG_String Get_MenuPath (void) { return( _TL("A:Grid|Distances") ); } protected: - virtual bool On_Execute (void); + + virtual bool On_Execute (void); }; diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_tools/Grid_CombineGrids.cpp saga-2.1.4+dfsg/src/modules/grid/grid_tools/Grid_CombineGrids.cpp --- saga-2.1.0+dfsg/src/modules/grid/grid_tools/Grid_CombineGrids.cpp 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_tools/Grid_CombineGrids.cpp 2014-11-13 08:32:16.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Grid_CombineGrids.cpp 911 2011-02-14 16:38:15Z reklov_w $ + * Version $Id: Grid_CombineGrids.cpp 2072 2014-03-31 08:50:43Z reklov_w $ *********************************************************/ /******************************************************************************* CombineGrids.cpp @@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, USA *******************************************************************************/ #include "Grid_CombineGrids.h" diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_tools/Grid_CombineGrids.h saga-2.1.4+dfsg/src/modules/grid/grid_tools/Grid_CombineGrids.h --- saga-2.1.0+dfsg/src/modules/grid/grid_tools/Grid_CombineGrids.h 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_tools/Grid_CombineGrids.h 2014-11-13 08:32:16.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Grid_CombineGrids.h 911 2011-02-14 16:38:15Z reklov_w $ + * Version $Id: Grid_CombineGrids.h 2072 2014-03-31 08:50:43Z reklov_w $ *********************************************************/ /******************************************************************************* CombineGrids.h @@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, USA *******************************************************************************/ #if _MSC_VER > 1000 @@ -26,16 +26,17 @@ #include "MLB_Interface.h" -class CCombineGrids : public CSG_Module_Grid { - -private: - +class CCombineGrids : public CSG_Module_Grid +{ public: CCombineGrids(void); virtual ~CCombineGrids(void); + virtual CSG_String Get_MenuPath (void) { return( _TL("A:Grid|Values") ); } + protected: - virtual bool On_Execute(void); -}; \ No newline at end of file + virtual bool On_Execute (void); + +}; diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_tools/Grid_Completion.cpp saga-2.1.4+dfsg/src/modules/grid/grid_tools/Grid_Completion.cpp --- saga-2.1.0+dfsg/src/modules/grid/grid_tools/Grid_Completion.cpp 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_tools/Grid_Completion.cpp 2014-11-13 08:32:16.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Grid_Completion.cpp 911 2011-02-14 16:38:15Z reklov_w $ + * Version $Id: Grid_Completion.cpp 1921 2014-01-09 10:24:11Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_tools/Grid_Completion.h saga-2.1.4+dfsg/src/modules/grid/grid_tools/Grid_Completion.h --- saga-2.1.0+dfsg/src/modules/grid/grid_tools/Grid_Completion.h 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_tools/Grid_Completion.h 2014-11-13 08:32:16.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Grid_Completion.h 1246 2011-11-25 13:42:38Z oconrad $ + * Version $Id: Grid_Completion.h 1921 2014-01-09 10:24:11Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// @@ -81,7 +81,7 @@ CGrid_Completion(void); virtual ~CGrid_Completion(void); - virtual CSG_String Get_MenuPath (void) { return( _TL("A:Grid|Construction") ); } + virtual CSG_String Get_MenuPath (void) { return( _TL("A:Grid|Gaps") ); } protected: diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_tools/Grid_ConstantGrid.cpp saga-2.1.4+dfsg/src/modules/grid/grid_tools/Grid_ConstantGrid.cpp --- saga-2.1.0+dfsg/src/modules/grid/grid_tools/Grid_ConstantGrid.cpp 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_tools/Grid_ConstantGrid.cpp 2014-11-13 08:32:16.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Grid_ConstantGrid.cpp 1688 2013-05-14 11:40:29Z oconrad $ + * Version $Id: Grid_ConstantGrid.cpp 2212 2014-09-01 13:29:48Z oconrad $ *********************************************************/ /******************************************************************************* ConstantGrid.cpp @@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, USA *******************************************************************************/ /////////////////////////////////////////////////////////// @@ -41,7 +41,7 @@ { Set_Name (_TL("Constant Grid")); - Set_Author (SG_T("Victor Olaya (c) 2004")); + Set_Author ("Victor Olaya (c) 2004"); Set_Description (_TW( "Constant grid creation." @@ -78,17 +78,7 @@ ); //----------------------------------------------------- - Parameters.Add_Choice( - NULL , "TARGET" , _TL("Target Grid"), - _TL(""), - CSG_String::Format(SG_T("%s|%s|"), - _TL("user defined"), - _TL("grid") - ), 0 - ); - - m_Grid_Target.Add_Parameters_User(Add_Parameters("USER", _TL("User Defined Grid") , _TL(""))); - m_Grid_Target.Add_Parameters_Grid(Add_Parameters("GRID", _TL("Choose Grid") , _TL(""))); + m_Grid_Target.Create(&Parameters); } @@ -99,7 +89,13 @@ //--------------------------------------------------------- int CConstantGrid::On_Parameter_Changed(CSG_Parameters *pParameters, CSG_Parameter *pParameter) { - return( m_Grid_Target.On_User_Changed(pParameters, pParameter) ? 1 : 0 ); + return( m_Grid_Target.On_Parameter_Changed(pParameters, pParameter) ? 1 : 0 ); +} + +//--------------------------------------------------------- +int CConstantGrid::On_Parameters_Enable(CSG_Parameters *pParameters, CSG_Parameter *pParameter) +{ + return( m_Grid_Target.On_Parameters_Enable(pParameters, pParameter) ? 1 : 0 ); } @@ -127,24 +123,7 @@ } //----------------------------------------------------- - CSG_Grid *pGrid = NULL; - - switch( Parameters("TARGET")->asInt() ) - { - case 0: // user defined... - if( m_Grid_Target.Init_User(0.0, 0.0, 1.0, 101, 101) && Dlg_Parameters("USER") ) - { - pGrid = m_Grid_Target.Get_User(Type); - } - break; - - case 1: // grid... - if( Dlg_Parameters("GRID") ) - { - pGrid = m_Grid_Target.Get_Grid(Type); - } - break; - } + CSG_Grid *pGrid = m_Grid_Target.Get_Grid(Type); if( pGrid == NULL ) { diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_tools/Grid_ConstantGrid.h saga-2.1.4+dfsg/src/modules/grid/grid_tools/Grid_ConstantGrid.h --- saga-2.1.0+dfsg/src/modules/grid/grid_tools/Grid_ConstantGrid.h 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_tools/Grid_ConstantGrid.h 2014-11-13 08:32:16.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Grid_ConstantGrid.h 1688 2013-05-14 11:40:29Z oconrad $ + * Version $Id: Grid_ConstantGrid.h 2212 2014-09-01 13:29:48Z oconrad $ *********************************************************/ /******************************************************************************* Grid_ConstantGrid.h @@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, USA *******************************************************************************/ @@ -44,12 +44,13 @@ public: CConstantGrid(void); - virtual CSG_String Get_MenuPath (void) { return( _TL("A:Grid|Construction") ); } + virtual CSG_String Get_MenuPath (void) { return( _TL("A:Grid|Values") ); } protected: virtual int On_Parameter_Changed (CSG_Parameters *pParameters, CSG_Parameter *pParameter); + virtual int On_Parameters_Enable (CSG_Parameters *pParameters, CSG_Parameter *pParameter); virtual bool On_Execute (void); diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_tools/Grid_CropToData.cpp saga-2.1.4+dfsg/src/modules/grid/grid_tools/Grid_CropToData.cpp --- saga-2.1.0+dfsg/src/modules/grid/grid_tools/Grid_CropToData.cpp 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_tools/Grid_CropToData.cpp 2014-11-13 08:32:16.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Grid_CropToData.cpp 1149 2011-08-29 12:26:13Z oconrad $ + * Version $Id: Grid_CropToData.cpp 2072 2014-03-31 08:50:43Z reklov_w $ *********************************************************/ /******************************************************************************* CropToData.cpp @@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, USA *******************************************************************************/ diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_tools/Grid_CropToData.h saga-2.1.4+dfsg/src/modules/grid/grid_tools/Grid_CropToData.h --- saga-2.1.0+dfsg/src/modules/grid/grid_tools/Grid_CropToData.h 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_tools/Grid_CropToData.h 2014-11-13 08:32:16.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Grid_CropToData.h 1246 2011-11-25 13:42:38Z oconrad $ + * Version $Id: Grid_CropToData.h 2072 2014-03-31 08:50:43Z reklov_w $ *********************************************************/ /******************************************************************************* CropToData.h @@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, USA *******************************************************************************/ /////////////////////////////////////////////////////////// @@ -42,7 +42,7 @@ public: CCropToData(void); - virtual CSG_String Get_MenuPath (void) { return( _TL("A:Grid|Construction") ); } + virtual CSG_String Get_MenuPath (void) { return( _TL("A:Grid|Grid System") ); } protected: diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_tools/Grid_Cut.cpp saga-2.1.4+dfsg/src/modules/grid/grid_tools/Grid_Cut.cpp --- saga-2.1.0+dfsg/src/modules/grid/grid_tools/Grid_Cut.cpp 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_tools/Grid_Cut.cpp 2014-11-13 08:32:16.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Grid_Cut.cpp 911 2011-02-14 16:38:15Z reklov_w $ + * Version $Id: Grid_Cut.cpp 2097 2014-04-11 12:50:55Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// @@ -61,8 +61,6 @@ /////////////////////////////////////////////////////////// //--------------------------------------------------------- -#include - #include "Grid_Cut.h" @@ -73,178 +71,143 @@ /////////////////////////////////////////////////////////// //--------------------------------------------------------- -CGrid_Cut::CGrid_Cut(void) +CSG_Grid_System Fit_Extent(const CSG_Grid_System &System, const CSG_Rect &Extent) +{ + CSG_Rect r( + System.Fit_xto_Grid_System(Extent.Get_XMin()), + System.Fit_yto_Grid_System(Extent.Get_YMin()), + System.Fit_xto_Grid_System(Extent.Get_XMax()), + System.Fit_yto_Grid_System(Extent.Get_YMax()) + ); + + r.Intersect(System.Get_Extent(true)); + + return( CSG_Grid_System(System.Get_Cellsize(), r) ); +} + +//--------------------------------------------------------- +void Fit_Extent(CSG_Parameters *pParameters, CSG_Parameter *pParameter, CSG_Grid_System *pSystem) +{ + if( pSystem && pSystem->is_Valid() ) + { + CSG_Grid_System s(Fit_Extent(*pSystem, CSG_Rect( + pParameters->Get_Parameter("XMIN")->asDouble(), + pParameters->Get_Parameter("YMIN")->asDouble(), + pParameters->Get_Parameter("XMAX")->asDouble(), + pParameters->Get_Parameter("YMAX")->asDouble() + ))); + + if( !SG_STR_CMP(pParameter->Get_Identifier(), SG_T("NX")) ) + { + s.Assign(s.Get_Cellsize(), s.Get_XMin(), s.Get_YMin(), pParameters->Get_Parameter("NX")->asInt(), s.Get_NY()); + } + + if( !SG_STR_CMP(pParameter->Get_Identifier(), SG_T("NY")) ) + { + s.Assign(s.Get_Cellsize(), s.Get_XMin(), s.Get_YMin(), s.Get_NX(), pParameters->Get_Parameter("NY")->asInt()); + } + + if( s.is_Valid() ) + { + pParameters->Get_Parameter("XMIN")->Set_Value(s.Get_XMin()); + pParameters->Get_Parameter("XMAX")->Set_Value(s.Get_XMax()); + pParameters->Get_Parameter("YMIN")->Set_Value(s.Get_YMin()); + pParameters->Get_Parameter("YMAX")->Set_Value(s.Get_YMax()); + pParameters->Get_Parameter("NX" )->Set_Value(s.Get_NX ()); + pParameters->Get_Parameter("NY" )->Set_Value(s.Get_NY ()); + } + } +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +CGrid_Clip_Interactive::CGrid_Clip_Interactive(void) { //----------------------------------------------------- - Set_Name (_TL("Cutting")); + Set_Name (_TL("Clip Grids")); - Set_Author (SG_T("(c) 2003 by O.Conrad")); + Set_Author (SG_T("O.Conrad (c) 2003")); Set_Description (_TW( - "Create a new grid from interactively selected cut of an input grid.\n" + "Clip selected grids to interactively defined extent." )); //----------------------------------------------------- - Parameters.Add_Grid( - NULL , "GRID" , _TL("Grid"), - _TL(""), - PARAMETER_INPUT - ); - - Parameters.Add_Grid_Output( - NULL , "CUT" , _TL("Cut"), - _TL("") - ); - Parameters.Add_Grid_List( - NULL , "GRIDS" , _TL("Additional Grids"), + NULL , "GRIDS" , _TL("Grids"), _TL(""), - PARAMETER_INPUT_OPTIONAL, false + PARAMETER_INPUT ); Parameters.Add_Grid_List( - NULL , "CUTS" , _TL("Additional Cuts"), + NULL , "CLIPPED" , _TL("Clipped Grids"), _TL(""), - PARAMETER_OUTPUT_OPTIONAL, false + PARAMETER_OUTPUT, false ); //----------------------------------------------------- - CSG_Parameters *pParameters = Add_Parameters("CUT", _TL("Cut"), _TL("")); - - pParameters->Add_Value( - NULL, "XMIN" , _TL("Left") , _TL(""), PARAMETER_TYPE_Double - ); - - pParameters->Add_Value( - NULL, "XMAX" , _TL("Right") , _TL(""), PARAMETER_TYPE_Double - ); - - pParameters->Add_Value( - NULL, "YMIN" , _TL("Bottom") , _TL(""), PARAMETER_TYPE_Double - ); - - pParameters->Add_Value( - NULL, "YMAX" , _TL("Top") , _TL(""), PARAMETER_TYPE_Double - ); - - pParameters->Add_Value( - NULL, "NX" , _TL("Columns") , _TL(""), PARAMETER_TYPE_Int, 1, 1, true - ); + CSG_Parameters *pParameters = Add_Parameters("EXTENT", _TL("Extent"), _TL("")); - pParameters->Add_Value( - NULL, "NY" , _TL("Rows") , _TL(""), PARAMETER_TYPE_Int, 1, 1, true - ); + pParameters->Add_Value(NULL, "XMIN", _TL("Left" ), _TL(""), PARAMETER_TYPE_Double); + pParameters->Add_Value(NULL, "XMAX", _TL("Right" ), _TL(""), PARAMETER_TYPE_Double); + pParameters->Add_Value(NULL, "YMIN", _TL("Bottom" ), _TL(""), PARAMETER_TYPE_Double); + pParameters->Add_Value(NULL, "YMAX", _TL("Top" ), _TL(""), PARAMETER_TYPE_Double); + pParameters->Add_Value(NULL, "NX" , _TL("Columns"), _TL(""), PARAMETER_TYPE_Int, 1, 1, true); + pParameters->Add_Value(NULL, "NY" , _TL("Rows" ), _TL(""), PARAMETER_TYPE_Int, 1, 1, true); } -//--------------------------------------------------------- -CGrid_Cut::~CGrid_Cut(void) -{} - /////////////////////////////////////////////////////////// // // -// // -// // /////////////////////////////////////////////////////////// //--------------------------------------------------------- -int CGrid_Cut::On_Parameter_Changed(CSG_Parameters *pParameters, CSG_Parameter *pParameter) +int CGrid_Clip_Interactive::On_Parameter_Changed(CSG_Parameters *pParameters, CSG_Parameter *pParameter) { - int nx, ny; - double xMin, xMax, yMin, yMax, d; - - if( m_pGrid && !SG_STR_CMP(pParameters->Get_Identifier(), SG_T("CUT")) ) + if( is_Executing() && !SG_STR_CMP(pParameters->Get_Identifier(), SG_T("EXTENT")) ) { - xMin = pParameters->Get_Parameter("XMIN")->asDouble(); - xMax = pParameters->Get_Parameter("XMAX")->asDouble(); - yMin = pParameters->Get_Parameter("YMIN")->asDouble(); - yMax = pParameters->Get_Parameter("YMAX")->asDouble(); - nx = pParameters->Get_Parameter("NX") ->asInt(); - ny = pParameters->Get_Parameter("NY") ->asInt(); - - if( xMin > xMax ) { d = xMin; xMin = xMax; xMax = d; } - if( yMin > yMax ) { d = yMin; yMin = yMax; yMax = d; } - - d = m_pGrid->Get_Cellsize(); - - if ( !SG_STR_CMP(pParameter->Get_Identifier(), SG_T("NX")) ) - { - xMax = xMin + nx * d; - } - else if( !SG_STR_CMP(pParameter->Get_Identifier(), SG_T("XMIN")) ) - { - nx = 1 + (int)((xMax - xMin) / d); - xMin = xMax - nx * d; - } - else if( !SG_STR_CMP(pParameter->Get_Identifier(), SG_T("XMAX")) ) - { - nx = 1 + (int)((xMax - xMin) / d); - xMax = xMin + nx * d; - } - - else if( !SG_STR_CMP(pParameter->Get_Identifier(), SG_T("NY")) ) - { - yMax = yMin + ny * d; - } - else if( !SG_STR_CMP(pParameter->Get_Identifier(), SG_T("YMIN")) ) - { - ny = 1 + (int)((yMax - yMin) / d); - yMin = yMax - ny * d; - } - else if( !SG_STR_CMP(pParameter->Get_Identifier(), SG_T("YMAX")) ) - { - ny = 1 + (int)((yMax - yMin) / d); - yMax = yMin + ny * d; - } - - pParameters->Get_Parameter("XMIN") ->Set_Value(xMin); - pParameters->Get_Parameter("XMAX") ->Set_Value(xMax); - pParameters->Get_Parameter("YMIN") ->Set_Value(yMin); - pParameters->Get_Parameter("YMAX") ->Set_Value(yMax); - pParameters->Get_Parameter("NX") ->Set_Value(nx); - pParameters->Get_Parameter("NY") ->Set_Value(ny); - - return( true ); + Fit_Extent(pParameters, pParameter, Get_System()); } - return( false ); + return( 1 ); } /////////////////////////////////////////////////////////// // // -// // -// // /////////////////////////////////////////////////////////// //--------------------------------------------------------- -bool CGrid_Cut::On_Execute(void) +bool CGrid_Clip_Interactive::On_Execute(void) { m_bDown = false; - m_pGrid = Parameters("GRID") ->asGrid(); - m_pGrids = Parameters("GRIDS") ->asGridList(); - - Parameters("CUTS")->asGridList()->Del_Items(); - return( true ); } /////////////////////////////////////////////////////////// // // -// // -// // /////////////////////////////////////////////////////////// //--------------------------------------------------------- -bool CGrid_Cut::On_Execute_Position(CSG_Point ptWorld, TSG_Module_Interactive_Mode Mode) +TSG_Point CGrid_Clip_Interactive::Fit_to_Grid(TSG_Point Point) { - CSG_Rect r; - CSG_Grid_System System; - CSG_Grid *pCut; - CSG_Parameters *pParameters; + Point.x = Get_XMin() + Get_Cellsize() * (int)(0.5 + (Point.x - Get_XMin()) / Get_Cellsize()); + Point.y = Get_YMin() + Get_Cellsize() * (int)(0.5 + (Point.y - Get_YMin()) / Get_Cellsize()); + + return( Point ); +} +//--------------------------------------------------------- +bool CGrid_Clip_Interactive::On_Execute_Position(CSG_Point ptWorld, TSG_Module_Interactive_Mode Mode) +{ switch( Mode ) { //----------------------------------------------------- @@ -264,49 +227,52 @@ m_bDown = false; ptWorld = Fit_to_Grid(ptWorld); - r.Assign(m_ptDown.Get_X(), m_ptDown.Get_Y(), ptWorld.Get_X(), ptWorld.Get_Y()); - - pParameters = Get_Parameters("CUT"); + //--------------------------------------------- + CSG_Grid_System System = Fit_Extent(*Get_System(), CSG_Rect( + m_ptDown.Get_X(), m_ptDown.Get_Y(), ptWorld.Get_X(), ptWorld.Get_Y() + )); + + CSG_Parameters *pParameters = Get_Parameters("EXTENT"); + + pParameters->Get_Parameter("XMIN")->Set_Value(System.Get_XMin()); + pParameters->Get_Parameter("XMAX")->Set_Value(System.Get_XMax()); + pParameters->Get_Parameter("YMIN")->Set_Value(System.Get_YMin()); + pParameters->Get_Parameter("YMAX")->Set_Value(System.Get_YMax()); + pParameters->Get_Parameter("NX" )->Set_Value(System.Get_NX ()); + pParameters->Get_Parameter("NY" )->Set_Value(System.Get_NY ()); - pParameters->Get_Parameter("XMIN") ->Set_Value(r.Get_XMin()); - pParameters->Get_Parameter("XMAX") ->Set_Value(r.Get_XMax()); - pParameters->Get_Parameter("YMIN") ->Set_Value(r.Get_YMin()); - pParameters->Get_Parameter("YMAX") ->Set_Value(r.Get_YMax()); - pParameters->Get_Parameter("NX") ->Set_Value(1 + (int)(r.Get_XRange() / m_pGrid->Get_Cellsize())); - pParameters->Get_Parameter("NY") ->Set_Value(1 + (int)(r.Get_YRange() / m_pGrid->Get_Cellsize())); - - if( Dlg_Parameters("CUT") ) + if( Dlg_Parameters(pParameters, _TL("Clip to Extent")) ) { - r.Assign( + System = Fit_Extent(*Get_System(), CSG_Rect( pParameters->Get_Parameter("XMIN")->asDouble(), pParameters->Get_Parameter("YMIN")->asDouble(), pParameters->Get_Parameter("XMAX")->asDouble(), pParameters->Get_Parameter("YMAX")->asDouble() - ); + )); - if( r.Intersect(m_pGrid->Get_Extent()) && System.Assign(m_pGrid->Get_Cellsize(), r) ) + //----------------------------------------- + if( System.is_Valid() ) { - pCut = SG_Create_Grid(System, m_pGrid->Get_Type()); - pCut->Assign(m_pGrid, GRID_INTERPOLATION_NearestNeighbour); - pCut->Set_Name(m_pGrid->Get_Name()); - Parameters("CUT")->Set_Value(pCut); + CSG_Parameter_Grid_List *pInput = Parameters("GRIDS" )->asGridList(); + CSG_Parameter_Grid_List *pOutput = Parameters("CLIPPED")->asGridList(); - for(int i=0; iGet_Count(); i++) + for(int i=0; iGet_Count(); i++) { - if( r.Intersect(m_pGrids->asGrid(i)->Get_Extent()) ) - { - pCut = SG_Create_Grid(System, m_pGrids->asGrid(i)->Get_Type()); - pCut->Assign(m_pGrids->asGrid(i), GRID_INTERPOLATION_NearestNeighbour); - pCut->Set_Name(m_pGrids->asGrid(i)->Get_Name()); - Parameters("CUTS")->asGridList()->Add_Item(pCut); - DataObject_Add(pCut); - } + CSG_Grid *pClip = SG_Create_Grid(System, pInput->asGrid(i)->Get_Type()); + + pClip->Assign (pInput->asGrid(i), GRID_INTERPOLATION_NearestNeighbour); + pClip->Set_Name(pInput->asGrid(i)->Get_Name()); + + pOutput->Add_Item(pClip); + DataObject_Add (pClip); } } } } return( true ); + + //----------------------------------------------------- } return( false ); @@ -320,12 +286,300 @@ /////////////////////////////////////////////////////////// //--------------------------------------------------------- -TSG_Point CGrid_Cut::Fit_to_Grid(TSG_Point pt) +CGrid_Clip::CGrid_Clip(void) { - pt.x = m_pGrid->Get_XMin() + m_pGrid->Get_Cellsize() * (int)(0.5 + (pt.x - m_pGrid->Get_XMin()) / m_pGrid->Get_Cellsize()); - pt.y = m_pGrid->Get_YMin() + m_pGrid->Get_Cellsize() * (int)(0.5 + (pt.y - m_pGrid->Get_YMin()) / m_pGrid->Get_Cellsize()); + CSG_Parameter *pNode; + + //----------------------------------------------------- + Set_Name (_TL("Clip Grids")); + + Set_Author (SG_T("O.Conrad (c) 2003")); + + Set_Description (_TW( + "Clip selected grids to specified extent." + )); + + //----------------------------------------------------- + Parameters.Add_Grid_List( + NULL , "GRIDS" , _TL("Grids"), + _TL(""), + PARAMETER_INPUT + ); + + Parameters.Add_Grid_List( + NULL , "CLIPPED" , _TL("Clipped Grids"), + _TL(""), + PARAMETER_OUTPUT, false + ); + + //----------------------------------------------------- + pNode = Parameters.Add_Choice( + NULL , "EXTENT" , _TL("Extent"), + _TL(""), + CSG_String::Format(SG_T("%s|%s|%s|%s|"), + _TL("user defined"), + _TL("grid system"), + _TL("shapes extent"), + _TL("polygon") + ), 0 + ); + + Parameters.Add_Grid_System( + pNode , "GRIDSYSTEM" , _TL("Grid System"), + _TL("") + ); + + Parameters.Add_Shapes( + pNode , "SHAPES" , _TL("Shapes Extent"), + _TL(""), + PARAMETER_INPUT + ); - return( pt ); + Parameters.Add_Shapes( + pNode , "POLYGONS" , _TL("Polygon"), + _TL(""), + PARAMETER_INPUT, SHAPE_TYPE_Polygon + ); + + Parameters.Add_Value(pNode, "XMIN", _TL("Left" ), _TL(""), PARAMETER_TYPE_Double); + Parameters.Add_Value(pNode, "XMAX", _TL("Right" ), _TL(""), PARAMETER_TYPE_Double); + Parameters.Add_Value(pNode, "YMIN", _TL("Bottom" ), _TL(""), PARAMETER_TYPE_Double); + Parameters.Add_Value(pNode, "YMAX", _TL("Top" ), _TL(""), PARAMETER_TYPE_Double); + Parameters.Add_Value(pNode, "NX" , _TL("Columns"), _TL(""), PARAMETER_TYPE_Int, 1, 1, true); + Parameters.Add_Value(pNode, "NY" , _TL("Rows" ), _TL(""), PARAMETER_TYPE_Int, 1, 1, true); + + Parameters.Add_Value( + NULL , "BUFFER" , _TL("Buffer"), + _TL("add buffer (map units) to extent"), + PARAMETER_TYPE_Double, 0.0, 0.0, true + ); +} + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +int CGrid_Clip::On_Parameter_Changed(CSG_Parameters *pParameters, CSG_Parameter *pParameter) +{ + CSG_Grid_System *pSystem = pParameters->Get_Parameter("PARAMETERS_GRID_SYSTEM")->asGrid_System(); + + if( !SG_STR_CMP(pParameter->Get_Identifier(), "PARAMETERS_GRID_SYSTEM") && pSystem && pSystem->is_Valid() ) + { + pParameters->Get_Parameter("XMIN")->Set_Value(pSystem->Get_XMin()); + pParameters->Get_Parameter("XMAX")->Set_Value(pSystem->Get_XMax()); + pParameters->Get_Parameter("YMIN")->Set_Value(pSystem->Get_YMin()); + pParameters->Get_Parameter("YMAX")->Set_Value(pSystem->Get_YMax()); + } + + Fit_Extent(pParameters, pParameter, pSystem); + + return( 1 ); +} + +//--------------------------------------------------------- +int CGrid_Clip::On_Parameters_Enable(CSG_Parameters *pParameters, CSG_Parameter *pParameter) +{ + if( !SG_STR_CMP(pParameter->Get_Identifier(), "EXTENT") ) + { + pParameters->Get_Parameter("XMIN" )->Set_Enabled(pParameter->asInt() == 0); + pParameters->Get_Parameter("XMAX" )->Set_Enabled(pParameter->asInt() == 0); + pParameters->Get_Parameter("YMIN" )->Set_Enabled(pParameter->asInt() == 0); + pParameters->Get_Parameter("YMAX" )->Set_Enabled(pParameter->asInt() == 0); + pParameters->Get_Parameter("NX" )->Set_Enabled(pParameter->asInt() == 0); + pParameters->Get_Parameter("NY" )->Set_Enabled(pParameter->asInt() == 0); + pParameters->Get_Parameter("GRIDSYSTEM")->Set_Enabled(pParameter->asInt() == 1); + pParameters->Get_Parameter("SHAPES" )->Set_Enabled(pParameter->asInt() == 2); + pParameters->Get_Parameter("POLYGONS" )->Set_Enabled(pParameter->asInt() == 3); + pParameters->Get_Parameter("BUFFER" )->Set_Enabled(pParameter->asInt() != 3); // no buffering for polygon clip + } + + return( 1 ); +} + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CGrid_Clip::On_Execute(void) +{ + //-------------------------------------------------------- + CSG_Rect Extent; + + switch( Parameters("EXTENT")->asInt() ) + { + case 0: // user defined + Extent.Assign( + Parameters("XMIN")->asDouble(), Parameters("YMIN")->asDouble(), + Parameters("XMAX")->asDouble(), Parameters("YMAX")->asDouble() + ); + break; + + case 1: // grid system + Extent.Assign(Parameters("GRIDSYSTEM")->asGrid_System()->Get_Extent()); + break; + + case 2: // shapes extent + Extent.Assign(Parameters("SHAPES" )->asShapes()->Get_Extent()); + break; + + case 3: // polygon + Extent.Assign(Parameters("POLYGONS")->asShapes()->Get_Extent()); + break; + } + + if( Parameters("BUFFER")->asDouble() > 0.0 && Parameters("EXTENT")->asInt() != 3 ) // no buffering for polygon clip + { + Extent.Inflate(Parameters("BUFFER")->asDouble(), false); + } + + //-------------------------------------------------------- + CSG_Grid_System System = Fit_Extent(*Get_System(), Extent); + + if( !System.is_Valid() ) + { + Error_Set(_TL("clip extent does not match grid's extent")); + + return( false ); + } + + //-------------------------------------------------------- + CSG_Grid Mask; + + if( Parameters("EXTENT")->asInt() == 3 && !Get_Mask(Mask, System, Parameters("POLYGONS")->asShapes()) ) + { + Error_Set(_TL("failed to create polygon clipping mask")); + + return( false ); + } + + //-------------------------------------------------------- + CSG_Parameter_Grid_List *pInput = Parameters("GRIDS" )->asGridList(); + CSG_Parameter_Grid_List *pOutput = Parameters("CLIPPED")->asGridList(); + + for(int i=0; iGet_Count(); i++) + { + CSG_Grid *pClip = SG_Create_Grid(System, pInput->asGrid(i)->Get_Type()); + + pClip->Assign (pInput->asGrid(i), GRID_INTERPOLATION_NearestNeighbour); + pClip->Set_Name(pInput->asGrid(i)->Get_Name()); + + if( Mask.is_Valid() ) // && Parameters("EXTENT")->asInt() == 3 ) // polygon clip + { + for(int y=0; ySet_NoData(x, y); + } + } + } + } + + pOutput->Add_Item(pClip); + } + + //-------------------------------------------------------- + return( true ); +} + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CGrid_Clip::Get_Mask(CSG_Grid &Mask, CSG_Grid_System &System, CSG_Shapes *pPolygons) +{ + //----------------------------------------------------- + if( !Mask.Create(System, SG_DATATYPE_Char) ) + { + return( false ); + } + + Mask.Set_NoData_Value(0); + + //----------------------------------------------------- + for(int i=0; iGet_Count() && Set_Progress(i, pPolygons->Get_Count()); i++) + { + CSG_Shape *pPolygon = pPolygons->Get_Shape(i); + + if( pPolygons->Get_Selection_Count() > 0 && !pPolygon->is_Selected() ) + { + continue; + } + + int xA = System.Get_xWorld_to_Grid(pPolygon->Get_Extent().Get_XMin()) - 1; if( xA < 0 ) xA = 0; + int xB = System.Get_xWorld_to_Grid(pPolygon->Get_Extent().Get_XMax()) + 1; if( xB >= System.Get_NX() ) xB = System.Get_NX() - 1; + + //------------------------------------------------- + #pragma omp parallel for + for(int y=0; y= pPolygon->Get_Extent().Get_YMin() + && yRow <= pPolygon->Get_Extent().Get_YMax() ) + { + TSG_Point Row[2]; + + Row[0].x = System.Get_XMin(true) - 1.0; + Row[1].x = System.Get_XMax(true) + 1.0; + Row[0].y = Row[1].y = yRow; + + //----------------------------------------- + int *nCrossings = (int *)SG_Calloc(System.Get_NX(), sizeof(int)); + + for(int iPart=0; iPartGet_Part_Count(); iPart++) + { + TSG_Point C, A, B = pPolygon->Get_Point(0, iPart, false); // last point + + for(int iPoint=0; iPointGet_Point_Count(iPart); iPoint++) + { + A = B; B = pPolygon->Get_Point(iPoint, iPart, true); + + if( (A.y <= yRow && yRow < B.y) + || (A.y > yRow && yRow >= B.y) ) + { + SG_Get_Crossing(C, A, B, Row[0], Row[1], false); + + int x = System.Get_xWorld_to_Grid(C.x); if( x < 0 ) x = 0; + + if( x >= 0 && x < System.Get_NX() ) + { + nCrossings[x] = nCrossings[x] ? 0 : 1; + } + } + } + } + + //----------------------------------------- + for(int x=xA, Fill=0; x<=xB; x++) + { + if( nCrossings[x] ) + { + Fill = Fill ? 0 : 1; + } + + if( Fill ) + { + Mask.Set_Value(x, y, 1); + } + } + + SG_Free(nCrossings); + } + } + } + + //----------------------------------------------------- + return( true ); } diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_tools/Grid_Cut.h saga-2.1.4+dfsg/src/modules/grid/grid_tools/Grid_Cut.h --- saga-2.1.0+dfsg/src/modules/grid/grid_tools/Grid_Cut.h 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_tools/Grid_Cut.h 2014-11-13 08:32:16.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Grid_Cut.h 1246 2011-11-25 13:42:38Z oconrad $ + * Version $Id: Grid_Cut.h 2097 2014-04-11 12:50:55Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// @@ -82,35 +82,58 @@ /////////////////////////////////////////////////////////// //--------------------------------------------------------- -class CGrid_Cut : public CSG_Module_Interactive +class CGrid_Clip_Interactive : public CSG_Module_Grid_Interactive { public: - CGrid_Cut(void); - virtual ~CGrid_Cut(void); + CGrid_Clip_Interactive(void); - virtual CSG_String Get_MenuPath (void) { return( _TL("A:Grid|Construction") ); } + virtual CSG_String Get_MenuPath (void) { return( _TL("A:Grid|Grid System") ); } protected: - virtual int On_Parameter_Changed (CSG_Parameters *pParameters, CSG_Parameter *pParameter); + virtual int On_Parameter_Changed (CSG_Parameters *pParameters, CSG_Parameter *pParameter); - virtual bool On_Execute (void); - virtual bool On_Execute_Position (CSG_Point ptWorld, TSG_Module_Interactive_Mode Mode); + virtual bool On_Execute (void); + virtual bool On_Execute_Position (CSG_Point ptWorld, TSG_Module_Interactive_Mode Mode); private: - bool m_bDown; + bool m_bDown; - CSG_Point m_ptDown; + CSG_Point m_ptDown; - CSG_Grid *m_pGrid; - CSG_Parameter_Grid_List *m_pGrids; + TSG_Point Fit_to_Grid (TSG_Point Point); +}; + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +class CGrid_Clip : public CSG_Module_Grid +{ +public: + CGrid_Clip(void); + + virtual CSG_String Get_MenuPath (void) { return( _TL("A:Grid|Grid System") ); } + + +protected: + + virtual int On_Parameter_Changed (CSG_Parameters *pParameters, CSG_Parameter *pParameter); + virtual int On_Parameters_Enable (CSG_Parameters *pParameters, CSG_Parameter *pParameter); + + virtual bool On_Execute (void); + + +private: - TSG_Point Fit_to_Grid (TSG_Point pt); + bool Get_Mask (CSG_Grid &Mask, CSG_Grid_System &System, CSG_Shapes *pPolygons); }; diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_tools/Grid_Fill.cpp saga-2.1.4+dfsg/src/modules/grid/grid_tools/Grid_Fill.cpp --- saga-2.1.0+dfsg/src/modules/grid/grid_tools/Grid_Fill.cpp 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_tools/Grid_Fill.cpp 2014-11-13 08:32:16.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Grid_Fill.cpp 911 2011-02-14 16:38:15Z reklov_w $ + * Version $Id: Grid_Fill.cpp 1921 2014-01-09 10:24:11Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -38,7 +38,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_tools/Grid_Fill.h saga-2.1.4+dfsg/src/modules/grid/grid_tools/Grid_Fill.h --- saga-2.1.0+dfsg/src/modules/grid/grid_tools/Grid_Fill.h 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_tools/Grid_Fill.h 2014-11-13 08:32:16.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Grid_Fill.h 1246 2011-11-25 13:42:38Z oconrad $ + * Version $Id: Grid_Fill.h 1921 2014-01-09 10:24:11Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// @@ -88,7 +88,7 @@ CGrid_Fill(void); virtual ~CGrid_Fill(void); - virtual CSG_String Get_MenuPath (void) { return( _TL("R:Values") ); } + virtual CSG_String Get_MenuPath (void) { return( _TL("A:Grid|Values") ); } protected: @@ -106,7 +106,7 @@ bool m_bNoData; - CSG_Grid *m_pGrid; + CSG_Grid *m_pGrid; CSG_Points_Int m_Stack; diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_tools/Grid_Gaps.cpp saga-2.1.4+dfsg/src/modules/grid/grid_tools/Grid_Gaps.cpp --- saga-2.1.0+dfsg/src/modules/grid/grid_tools/Grid_Gaps.cpp 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_tools/Grid_Gaps.cpp 2014-11-13 08:32:16.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Grid_Gaps.cpp 911 2011-02-14 16:38:15Z reklov_w $ + * Version $Id: Grid_Gaps.cpp 1921 2014-01-09 10:24:11Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_tools/Grid_Gaps.h saga-2.1.4+dfsg/src/modules/grid/grid_tools/Grid_Gaps.h --- saga-2.1.0+dfsg/src/modules/grid/grid_tools/Grid_Gaps.h 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_tools/Grid_Gaps.h 2014-11-13 08:32:16.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Grid_Gaps.h 1246 2011-11-25 13:42:38Z oconrad $ + * Version $Id: Grid_Gaps.h 1921 2014-01-09 10:24:11Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// @@ -81,7 +81,7 @@ CGrid_Gaps(void); virtual ~CGrid_Gaps(void); - virtual CSG_String Get_MenuPath (void) { return( _TL("A:Grid|Construction") ); } + virtual CSG_String Get_MenuPath (void) { return( _TL("A:Grid|Gaps") ); } protected: diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_tools/Grid_Gaps_OneCell.cpp saga-2.1.4+dfsg/src/modules/grid/grid_tools/Grid_Gaps_OneCell.cpp --- saga-2.1.0+dfsg/src/modules/grid/grid_tools/Grid_Gaps_OneCell.cpp 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_tools/Grid_Gaps_OneCell.cpp 2014-11-13 08:32:16.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Grid_Gaps_OneCell.cpp 911 2011-02-14 16:38:15Z reklov_w $ + * Version $Id: Grid_Gaps_OneCell.cpp 1921 2014-01-09 10:24:11Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_tools/Grid_Gaps_OneCell.h saga-2.1.4+dfsg/src/modules/grid/grid_tools/Grid_Gaps_OneCell.h --- saga-2.1.0+dfsg/src/modules/grid/grid_tools/Grid_Gaps_OneCell.h 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_tools/Grid_Gaps_OneCell.h 2014-11-13 08:32:16.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Grid_Gaps_OneCell.h 1246 2011-11-25 13:42:38Z oconrad $ + * Version $Id: Grid_Gaps_OneCell.h 1921 2014-01-09 10:24:11Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// @@ -77,7 +77,7 @@ CGrid_Gaps_OneCell(void); virtual ~CGrid_Gaps_OneCell(void); - virtual CSG_String Get_MenuPath (void) { return( _TL("A:Grid|Construction") ); } + virtual CSG_String Get_MenuPath (void) { return( _TL("A:Grid|Gaps") ); } protected: diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_tools/Grid_Gaps_Resampling.cpp saga-2.1.4+dfsg/src/modules/grid/grid_tools/Grid_Gaps_Resampling.cpp --- saga-2.1.0+dfsg/src/modules/grid/grid_tools/Grid_Gaps_Resampling.cpp 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_tools/Grid_Gaps_Resampling.cpp 2014-11-13 08:32:16.000000000 +0000 @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_tools/Grid_Gaps_Resampling.h saga-2.1.4+dfsg/src/modules/grid/grid_tools/Grid_Gaps_Resampling.h --- saga-2.1.0+dfsg/src/modules/grid/grid_tools/Grid_Gaps_Resampling.h 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_tools/Grid_Gaps_Resampling.h 2014-11-13 08:32:16.000000000 +0000 @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// @@ -78,7 +78,7 @@ public: CGrid_Gaps_Resampling(void); - virtual CSG_String Get_MenuPath (void) { return( _TL("A:Grid|Construction") ); } + virtual CSG_String Get_MenuPath (void) { return( _TL("A:Grid|Gaps") ); } protected: diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_tools/Grid_Gaps_Spline_Fill.cpp saga-2.1.4+dfsg/src/modules/grid/grid_tools/Grid_Gaps_Spline_Fill.cpp --- saga-2.1.0+dfsg/src/modules/grid/grid_tools/Grid_Gaps_Spline_Fill.cpp 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_tools/Grid_Gaps_Spline_Fill.cpp 2014-11-13 08:32:16.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Grid_Gaps_Spline_Fill.cpp 911 2011-02-14 16:38:15Z reklov_w $ + * Version $Id: Grid_Gaps_Spline_Fill.cpp 1921 2014-01-09 10:24:11Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_tools/Grid_Gaps_Spline_Fill.h saga-2.1.4+dfsg/src/modules/grid/grid_tools/Grid_Gaps_Spline_Fill.h --- saga-2.1.0+dfsg/src/modules/grid/grid_tools/Grid_Gaps_Spline_Fill.h 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_tools/Grid_Gaps_Spline_Fill.h 2014-11-13 08:32:16.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Grid_Gaps_Spline_Fill.h 1246 2011-11-25 13:42:38Z oconrad $ + * Version $Id: Grid_Gaps_Spline_Fill.h 1921 2014-01-09 10:24:11Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// @@ -84,7 +84,7 @@ public: CGrid_Gaps_Spline_Fill(void); - virtual CSG_String Get_MenuPath (void) { return( _TL("A:Grid|Construction") ); } + virtual CSG_String Get_MenuPath (void) { return( _TL("A:Grid|Gaps") ); } protected: diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_tools/Grid_InvertNoData.cpp saga-2.1.4+dfsg/src/modules/grid/grid_tools/Grid_InvertNoData.cpp --- saga-2.1.0+dfsg/src/modules/grid/grid_tools/Grid_InvertNoData.cpp 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_tools/Grid_InvertNoData.cpp 2014-11-13 08:32:16.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Grid_InvertNoData.cpp 911 2011-02-14 16:38:15Z reklov_w $ + * Version $Id: Grid_InvertNoData.cpp 2072 2014-03-31 08:50:43Z reklov_w $ *********************************************************/ /******************************************************************************* InvertNoData.cpp @@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, USA *******************************************************************************/ #include "Grid_InvertNoData.h" diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_tools/Grid_InvertNoData.h saga-2.1.4+dfsg/src/modules/grid/grid_tools/Grid_InvertNoData.h --- saga-2.1.0+dfsg/src/modules/grid/grid_tools/Grid_InvertNoData.h 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_tools/Grid_InvertNoData.h 2014-11-13 08:32:16.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Grid_InvertNoData.h 911 2011-02-14 16:38:15Z reklov_w $ + * Version $Id: Grid_InvertNoData.h 2072 2014-03-31 08:50:43Z reklov_w $ *********************************************************/ /******************************************************************************* InvertNoData.h @@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, USA *******************************************************************************/ #include "MLB_Interface.h" @@ -27,8 +27,10 @@ CInvertNoData(void); virtual ~CInvertNoData(void); + virtual CSG_String Get_MenuPath (void) { return( _TL("A:Grid|Values") ); } + protected: bool On_Execute(void); -}; \ No newline at end of file +}; diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_tools/Grid_Mask.cpp saga-2.1.4+dfsg/src/modules/grid/grid_tools/Grid_Mask.cpp --- saga-2.1.0+dfsg/src/modules/grid/grid_tools/Grid_Mask.cpp 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_tools/Grid_Mask.cpp 2014-11-13 08:32:16.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Grid_Mask.cpp 911 2011-02-14 16:38:15Z reklov_w $ + * Version $Id: Grid_Mask.cpp 1921 2014-01-09 10:24:11Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_tools/Grid_Mask.h saga-2.1.4+dfsg/src/modules/grid/grid_tools/Grid_Mask.h --- saga-2.1.0+dfsg/src/modules/grid/grid_tools/Grid_Mask.h 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_tools/Grid_Mask.h 2014-11-13 08:32:16.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Grid_Mask.h 1246 2011-11-25 13:42:38Z oconrad $ + * Version $Id: Grid_Mask.h 1921 2014-01-09 10:24:11Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// @@ -78,7 +78,7 @@ public: CGrid_Mask(void); - virtual CSG_String Get_MenuPath (void) { return( _TL("R:Values") ); } + virtual CSG_String Get_MenuPath (void) { return( _TL("A:Grid|Values") ); } protected: diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_tools/Grid_Merge.cpp saga-2.1.4+dfsg/src/modules/grid/grid_tools/Grid_Merge.cpp --- saga-2.1.0+dfsg/src/modules/grid/grid_tools/Grid_Merge.cpp 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_tools/Grid_Merge.cpp 2014-11-13 08:32:16.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Grid_Merge.cpp 1490 2012-10-17 13:54:24Z oconrad $ + * Version $Id: Grid_Merge.cpp 2229 2014-09-09 13:48:23Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// @@ -137,18 +137,18 @@ PARAMETER_TYPE_Double, 10.0, 0.0, true ); - //----------------------------------------------------- Parameters.Add_Choice( - NULL , "TARGET" , _TL("Target Grid"), + NULL , "MATCH" , _TL("Match"), _TL(""), CSG_String::Format(SG_T("%s|%s|"), - _TL("user defined"), - _TL("existing grid or grid system") + _TL("none"), + _TL("regression"), + _TL("histogram match") ), 0 ); - m_Grid_Target.Add_Parameters_User(Add_Parameters("USER", _TL("User Defined Grid") , _TL(""))); - m_Grid_Target.Add_Parameters_Grid(Add_Parameters("GRID", _TL("Choose Grid") , _TL(""))); + //----------------------------------------------------- + m_Grid_Target.Create(SG_UI_Get_Window_Main() ? &Parameters : Add_Parameters("TARGET", _TL("Target System"), _TL(""))); } @@ -161,7 +161,12 @@ //--------------------------------------------------------- int CGrid_Merge::On_Parameter_Changed(CSG_Parameters *pParameters, CSG_Parameter *pParameter) { - return( m_Grid_Target.On_User_Changed(pParameters, pParameter) ? 1 : 0 ); + if( !SG_STR_CMP(pParameter->Get_Identifier(), "GRIDS") ) + { + Set_Target(pParameters, pParameter->asGridList()); + } + + return( m_Grid_Target.On_Parameter_Changed(pParameters, pParameter) ? 1 : 0 ); } //--------------------------------------------------------- @@ -172,7 +177,7 @@ pParameters->Get_Parameter("BLEND_DIST")->Set_Enabled(pParameter->asInt() == 5 || pParameter->asInt() == 6); } - return( 1 ); + return( m_Grid_Target.On_Parameters_Enable(pParameters, pParameter) ? 1 : 0 ); } @@ -202,6 +207,8 @@ { } + Get_Match(i > 0 ? pGrid : NULL); + int ax = (int)((pGrid->Get_XMin() - m_pMosaic->Get_XMin()) / m_pMosaic->Get_Cellsize()); int ay = (int)((pGrid->Get_YMin() - m_pMosaic->Get_YMin()) / m_pMosaic->Get_Cellsize()); @@ -303,6 +310,8 @@ return( false ); } + Set_Target(Get_Parameters("TARGET"), m_pGrids); Dlg_Parameters("TARGET"); // if called from saga_cmd + //----------------------------------------------------- switch( Parameters("INTERPOL")->asInt() ) { @@ -332,45 +341,7 @@ } //----------------------------------------------------- - switch( Parameters("TARGET")->asInt() ) - { - case 0: // user defined... - { - double d = m_pGrids->asGrid(0)->Get_Cellsize(); - CSG_Rect r = m_pGrids->asGrid(0)->Get_Extent(); - - for(int i=1; iGet_Count(); i++) - { - if( d > m_pGrids->asGrid(i)->Get_Cellsize() ) - { - d = m_pGrids->asGrid(i)->Get_Cellsize(); - } - - r.Union(m_pGrids->asGrid(i)->Get_Extent()); - } - - int nx = 1 + (int)(r.Get_XRange() / d); - int ny = 1 + (int)(r.Get_YRange() / d); - - if( m_Grid_Target.Init_User(r.Get_XMin(), r.Get_YMin(), d, nx, ny) && Dlg_Parameters("USER") ) - { - m_pMosaic = m_Grid_Target.Get_User(Type); - } - } - break; - - case 1: // grid... - { - if( Dlg_Parameters("GRID") ) - { - m_pMosaic = m_Grid_Target.Get_Grid(Type); - } - } - break; - } - - //----------------------------------------------------- - if( m_pMosaic ) + if( (m_pMosaic = m_Grid_Target.Get_Grid(Type)) != NULL ) { m_pMosaic->Set_Name(_TL("Mosaic")); @@ -405,6 +376,33 @@ /////////////////////////////////////////////////////////// //--------------------------------------------------------- +bool CGrid_Merge::Set_Target(CSG_Parameters *pParameters, CSG_Parameter_Grid_List *pGrids) +{ + if( pGrids && pGrids->Get_Count() > 0 ) + { + double d = pGrids->asGrid(0)->Get_Cellsize(); + CSG_Rect r = pGrids->asGrid(0)->Get_Extent(); + + for(int i=1; iGet_Count(); i++) + { + if( d > pGrids->asGrid(i)->Get_Cellsize() ) + { + d = pGrids->asGrid(i)->Get_Cellsize(); + } + + r.Union(pGrids->asGrid(i)->Get_Extent()); + } + + int nx = 1 + (int)(r.Get_XRange() / d); + int ny = 1 + (int)(r.Get_YRange() / d); + + m_Grid_Target.Set_User_Defined(pParameters, r.Get_XMin(), r.Get_YMin(), d, nx, ny); + } + + return( false ); +} + +//--------------------------------------------------------- bool CGrid_Merge::is_Aligned(CSG_Grid *pGrid) { return( pGrid->Get_Cellsize() == m_pMosaic->Get_Cellsize() @@ -416,6 +414,11 @@ //--------------------------------------------------------- inline void CGrid_Merge::Set_Value(int x, int y, double Value, double Weight) { + if( m_Match.Get_N() == 2 ) + { + Value = m_Match[0] + m_Match[1] * Value; + } + switch( m_Overlap ) { case 0: // first @@ -473,16 +476,16 @@ if( m_pMosaic->is_NoData(x, y) ) { m_pMosaic->Set_Value(x, y, Value); - m_Weights .Set_Value(x, y, Weight / m_Weights.Get_ZFactor()); + m_Weights .Set_Value(x, y, Weight); } else { - double d = (Weight - m_Weights.asDouble(x, y, true)) / m_dBlend; + double d = (Weight - m_Weights.asDouble(x, y)) / m_dBlend; if( d >= 1.0 ) { m_pMosaic->Set_Value(x, y, Value); - m_Weights .Set_Value(x, y, Weight / m_Weights.Get_ZFactor()); + m_Weights .Set_Value(x, y, Weight); } else if( d > -1.0 ) { @@ -492,7 +495,7 @@ if( d > 0.5 ) { - m_Weights .Set_Value(x, y, Weight / m_Weights.Get_ZFactor()); + m_Weights .Set_Value(x, y, Weight); } } } @@ -546,7 +549,7 @@ //--------------------------------------------------------- inline double CGrid_Merge::Get_Weight(int x, int y) { - return( m_Weight.is_Valid() ? m_Weight.asDouble(x, y, true) : 1.0 ); + return( m_Weight.is_Valid() ? m_Weight.asDouble(x, y) : 1.0 ); } //--------------------------------------------------------- @@ -600,6 +603,8 @@ m_Weight.Set_Value(x, y, d = 0); else if( m_Weight.asDouble(x, y) > d ) m_Weight.Set_Value(x, y, d); + else + d = m_Weight.asDouble(x, y); if( dBlend <= 0 || d < dBlend ) d++; } @@ -613,6 +618,8 @@ m_Weight.Set_Value(x, y, d = 0); else if( m_Weight.asDouble(x, y) > d ) m_Weight.Set_Value(x, y, d); + else + d = m_Weight.asDouble(x, y); if( dBlend <= 0 || d < dBlend ) d++; } @@ -623,6 +630,8 @@ m_Weight.Set_Value(x, y, d = 0); else if( m_Weight.asDouble(x, y) > d ) m_Weight.Set_Value(x, y, d); + else + d = m_Weight.asDouble(x, y); if( dBlend <= 0 || d < dBlend ) d++; } @@ -632,11 +641,11 @@ switch( m_Overlap ) { case 5: // blending - m_Weight.Set_ZFactor(1.0 / dBlend); // normalize (0 <= z <= 1) + m_Weight.Set_Scaling(1.0 / dBlend); // normalize (0 <= z <= 1) break; case 6: // feathering - m_Weight.Set_ZFactor(m_Weight.Get_Cellsize()); + m_Weight.Set_Scaling(m_Weight.Get_Cellsize()); break; } @@ -645,6 +654,66 @@ } +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +void CGrid_Merge::Get_Match(CSG_Grid *pGrid) +{ + if( pGrid && Parameters("MATCH")->asInt() ) + { + Process_Set_Text(CSG_String::Format(SG_T("%s: %s"), _TL("matching histogram"), pGrid->Get_Name())); + + int ax = (int)((pGrid->Get_XMin() - m_pMosaic->Get_XMin()) / m_pMosaic->Get_Cellsize()); if( ax < 0 ) ax = 0; + int ay = (int)((pGrid->Get_YMin() - m_pMosaic->Get_YMin()) / m_pMosaic->Get_Cellsize()); if( ay < 0 ) ay = 0; + + int nx = 1 + m_pMosaic->Get_System().Get_xWorld_to_Grid(pGrid->Get_XMax()); if( nx > m_pMosaic->Get_NX() ) nx = m_pMosaic->Get_NX(); + int ny = 1 + m_pMosaic->Get_System().Get_yWorld_to_Grid(pGrid->Get_YMax()); if( ny > m_pMosaic->Get_NY() ) ny = m_pMosaic->Get_NY(); + + CSG_Vector Z[2]; + + for(int y=ay; yGet_YMin() + y * m_pMosaic->Get_Cellsize(); + + for(int x=ax; xis_NoData(x, y) ) + { + double z, px = m_pMosaic->Get_XMin() + x * m_pMosaic->Get_Cellsize(); + + if( pGrid->Get_Value(px, py, z, GRID_INTERPOLATION_NearestNeighbour) ) + { + Z[0].Add_Row(z); + Z[1].Add_Row(m_pMosaic->asDouble(x, y)); + } + } + } + } + + CSG_Regression r; + + if( r.Calculate(Z[0].Get_Size(), Z[0].Get_Data(), Z[1].Get_Data()) ) + { + m_Match.Create(2); + + m_Match[0] = r.Get_Constant(); + m_Match[1] = r.Get_Coefficient(); + + Message_Add("histogram stretch:\n", false); + Message_Add(r.asString(), false); + + return; + } + } + + m_Match.Destroy(); +} + + /////////////////////////////////////////////////////////// // // // // diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_tools/Grid_Merge.h saga-2.1.4+dfsg/src/modules/grid/grid_tools/Grid_Merge.h --- saga-2.1.0+dfsg/src/modules/grid/grid_tools/Grid_Merge.h 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_tools/Grid_Merge.h 2014-11-13 08:32:16.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Grid_Merge.h 1490 2012-10-17 13:54:24Z oconrad $ + * Version $Id: Grid_Merge.h 2221 2014-09-04 16:02:43Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// @@ -80,7 +80,7 @@ public: CGrid_Merge(void); - virtual CSG_String Get_MenuPath (void) { return( _TL("A:Grid|Construction") ); } + virtual CSG_String Get_MenuPath (void) { return( _TL("A:Grid|Grid System") ); } protected: @@ -97,6 +97,8 @@ double m_dBlend; + CSG_Vector m_Match; + CSG_Grid *m_pMosaic, m_Weights, m_Weight; CSG_Parameter_Grid_List *m_pGrids; @@ -104,6 +106,8 @@ CSG_Parameters_Grid_Target m_Grid_Target; + bool Set_Target (CSG_Parameters *pParameters, CSG_Parameter_Grid_List *pGrids); + bool Initialize (void); bool is_Aligned (CSG_Grid *pGrid); @@ -114,6 +118,8 @@ bool Set_Weight (CSG_Grid *pGrid); double Get_Weight (int x, int y); + void Get_Match (CSG_Grid *pGrid); + }; diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_tools/Grid_Orientation.cpp saga-2.1.4+dfsg/src/modules/grid/grid_tools/Grid_Orientation.cpp --- saga-2.1.0+dfsg/src/modules/grid/grid_tools/Grid_Orientation.cpp 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_tools/Grid_Orientation.cpp 2014-11-13 08:32:16.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Grid_Orientation.cpp 911 2011-02-14 16:38:15Z reklov_w $ + * Version $Id: Grid_Orientation.cpp 1921 2014-01-09 10:24:11Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_tools/Grid_Orientation.h saga-2.1.4+dfsg/src/modules/grid/grid_tools/Grid_Orientation.h --- saga-2.1.0+dfsg/src/modules/grid/grid_tools/Grid_Orientation.h 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_tools/Grid_Orientation.h 2014-11-13 08:32:16.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Grid_Orientation.h 911 2011-02-14 16:38:15Z reklov_w $ + * Version $Id: Grid_Orientation.h 1921 2014-01-09 10:24:11Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// @@ -75,6 +75,8 @@ CGrid_Orientation(void); virtual ~CGrid_Orientation(void); + virtual CSG_String Get_MenuPath (void) { return( _TL("A:Grid|Values") ); } + protected: diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_tools/Grid_Proximity.cpp saga-2.1.4+dfsg/src/modules/grid/grid_tools/Grid_Proximity.cpp --- saga-2.1.0+dfsg/src/modules/grid/grid_tools/Grid_Proximity.cpp 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_tools/Grid_Proximity.cpp 2014-11-13 08:32:16.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Grid_Proximity.cpp 911 2011-02-14 16:38:15Z reklov_w $ + * Version $Id: Grid_Proximity.cpp 1921 2014-01-09 10:24:11Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_tools/Grid_Proximity.h saga-2.1.4+dfsg/src/modules/grid/grid_tools/Grid_Proximity.h --- saga-2.1.0+dfsg/src/modules/grid/grid_tools/Grid_Proximity.h 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_tools/Grid_Proximity.h 2014-11-13 08:32:16.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Grid_Proximity.h 1246 2011-11-25 13:42:38Z oconrad $ + * Version $Id: Grid_Proximity.h 1921 2014-01-09 10:24:11Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// @@ -78,12 +78,12 @@ public: CGrid_Proximity(void); -// virtual CSG_String Get_MenuPath (void) { return( _TL("R:Values") ); } + virtual CSG_String Get_MenuPath (void) { return( _TL("A:Grid|Distances") ); } protected: - virtual bool On_Execute (void); + virtual bool On_Execute (void); }; diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_tools/Grid_Resample.cpp saga-2.1.4+dfsg/src/modules/grid/grid_tools/Grid_Resample.cpp --- saga-2.1.0+dfsg/src/modules/grid/grid_tools/Grid_Resample.cpp 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_tools/Grid_Resample.cpp 2014-11-13 08:32:16.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Grid_Resample.cpp 1117 2011-06-24 14:36:07Z oconrad $ + * Version $Id: Grid_Resample.cpp 2221 2014-09-04 16:02:43Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// @@ -146,17 +146,7 @@ ); //----------------------------------------------------- - Parameters.Add_Choice( - NULL , "TARGET" , _TL("Target Grid"), - _TL(""), - CSG_String::Format(SG_T("%s|%s|"), - _TL("user defined"), - _TL("grid") - ), 0 - ); - - m_Grid_Target.Add_Parameters_User(Add_Parameters("USER", _TL("User Defined Grid") , _TL(""))); - m_Grid_Target.Add_Parameters_Grid(Add_Parameters("GRID", _TL("Choose Grid") , _TL(""))); + m_Grid_Target.Create(SG_UI_Get_Window_Main() ? &Parameters : Add_Parameters("TARGET", _TL("Target System"), _TL(""))); } @@ -169,7 +159,18 @@ //--------------------------------------------------------- int CGrid_Resample::On_Parameter_Changed(CSG_Parameters *pParameters, CSG_Parameter *pParameter) { - return( m_Grid_Target.On_User_Changed(pParameters, pParameter) ? 1 : 0 ); + if( !SG_STR_CMP(pParameter->Get_Identifier(), "INPUT") && pParameter->asGrid() ) + { + m_Grid_Target.Set_User_Defined(pParameters, pParameter->asGrid()->Get_Extent()); + } + + return( m_Grid_Target.On_Parameter_Changed(pParameters, pParameter) ? 1 : 0 ); +} + +//--------------------------------------------------------- +int CGrid_Resample::On_Parameters_Enable(CSG_Parameters *pParameters, CSG_Parameter *pParameter) +{ + return( m_Grid_Target.On_Parameters_Enable(pParameters, pParameter) ? 1 : 0 ); } @@ -182,109 +183,79 @@ //--------------------------------------------------------- bool CGrid_Resample::On_Execute(void) { - bool bResult, bKeepType; - TSG_Grid_Interpolation Interpolation; - CSG_Grid *pInput, *pOutput; - CSG_Parameters *pParameters; - //----------------------------------------------------- - bResult = false; - bKeepType = Parameters("KEEP_TYPE") ->asBool(); - pInput = Parameters("INPUT") ->asGrid(); - pOutput = NULL; + CSG_Grid *pInput = Parameters("INPUT")->asGrid(); //----------------------------------------------------- - switch( Parameters("TARGET")->asInt() ) - { - case 0: // user defined... - if( m_Grid_Target.Init_User(pInput->Get_Extent(false)) && Dlg_Parameters("USER") ) - { - pOutput = m_Grid_Target.Get_User(bKeepType ? pInput->Get_Type() : SG_DATATYPE_Undefined); - } - break; + m_Grid_Target.Set_User_Defined(Get_Parameters("TARGET"), pInput->Get_Extent()); Dlg_Parameters("TARGET"); // if called from saga_cmd - case 1: // grid... - if( Dlg_Parameters("GRID") ) - { - pOutput = m_Grid_Target.Get_Grid(bKeepType ? pInput->Get_Type() : SG_DATATYPE_Undefined); - } - break; - } + CSG_Grid *pOutput = m_Grid_Target.Get_Grid(Parameters("KEEP_TYPE")->asBool() ? pInput->Get_Type() : SG_DATATYPE_Undefined); - //----------------------------------------------------- if( !pOutput || !pInput->is_Intersecting(pOutput->Get_Extent()) ) { return( false ); } - pParameters = NULL; - //------------------------------------------------- - // Up-Scaling... + TSG_Grid_Interpolation Interpolation; - if( pInput->Get_Cellsize() < pOutput->Get_Cellsize() ) + if( pInput->Get_Cellsize() < pOutput->Get_Cellsize() ) // Up-Scaling... { - if( Dlg_Parameters("SCALE_UP") ) + if( !Dlg_Parameters("SCALE_UP") ) { - switch( Get_Parameters("SCALE_UP")->Get_Parameter("METHOD")->asInt() ) - { - case 0: Interpolation = GRID_INTERPOLATION_NearestNeighbour; break; - case 1: Interpolation = GRID_INTERPOLATION_Bilinear; break; - case 2: Interpolation = GRID_INTERPOLATION_InverseDistance; break; - case 3: Interpolation = GRID_INTERPOLATION_BicubicSpline; break; - case 4: Interpolation = GRID_INTERPOLATION_BSpline; break; - case 5: Interpolation = GRID_INTERPOLATION_Mean_Nodes; break; - case 6: Interpolation = GRID_INTERPOLATION_Mean_Cells; break; - case 7: Interpolation = GRID_INTERPOLATION_Minimum; break; - case 8: Interpolation = GRID_INTERPOLATION_Maximum; break; - case 9: Interpolation = GRID_INTERPOLATION_Majority; break; - } + return( false ); + } - pParameters = Get_Parameters("SCALE_UP"); + switch( Get_Parameters("SCALE_UP")->Get_Parameter("METHOD")->asInt() ) + { + case 0: Interpolation = GRID_INTERPOLATION_NearestNeighbour; break; + case 1: Interpolation = GRID_INTERPOLATION_Bilinear; break; + case 2: Interpolation = GRID_INTERPOLATION_InverseDistance; break; + case 3: Interpolation = GRID_INTERPOLATION_BicubicSpline; break; + case 4: Interpolation = GRID_INTERPOLATION_BSpline; break; + case 5: Interpolation = GRID_INTERPOLATION_Mean_Nodes; break; + case 6: Interpolation = GRID_INTERPOLATION_Mean_Cells; break; + case 7: Interpolation = GRID_INTERPOLATION_Minimum; break; + case 8: Interpolation = GRID_INTERPOLATION_Maximum; break; + case 9: Interpolation = GRID_INTERPOLATION_Majority; break; } } - - //------------------------------------------------- - // Down-Scaling... - - else + else // Down-Scaling... { - if( Dlg_Parameters("SCALE_DOWN") ) + if( !Dlg_Parameters("SCALE_DOWN") ) { - switch( Get_Parameters("SCALE_DOWN")->Get_Parameter("METHOD")->asInt() ) - { - case 0: Interpolation = GRID_INTERPOLATION_NearestNeighbour; break; - case 1: Interpolation = GRID_INTERPOLATION_Bilinear; break; - case 2: Interpolation = GRID_INTERPOLATION_InverseDistance; break; - case 3: Interpolation = GRID_INTERPOLATION_BicubicSpline; break; - case 4: Interpolation = GRID_INTERPOLATION_BSpline; break; - } + return( false ); + } - pParameters = Get_Parameters("SCALE_DOWN"); + switch( Get_Parameters("SCALE_DOWN")->Get_Parameter("METHOD")->asInt() ) + { + case 0: Interpolation = GRID_INTERPOLATION_NearestNeighbour; break; + case 1: Interpolation = GRID_INTERPOLATION_Bilinear; break; + case 2: Interpolation = GRID_INTERPOLATION_InverseDistance; break; + case 3: Interpolation = GRID_INTERPOLATION_BicubicSpline; break; + case 4: Interpolation = GRID_INTERPOLATION_BSpline; break; } } //------------------------------------------------- - if( !pParameters ) - { - return( false ); - } - pOutput->Assign(pInput, Interpolation); pOutput->Set_Name(pInput->Get_Name()); //------------------------------------------------- CSG_Grid_System System(pOutput->Get_System()); - CSG_Parameter_Grid_List *pInputs = Parameters("INPUT_ADD") ->asGridList(); - CSG_Parameter_Grid_List *pOutputs = Parameters("OUTPUT_ADD") ->asGridList(); + CSG_Parameter_Grid_List *pInputs = Parameters("INPUT_ADD" )->asGridList(); + CSG_Parameter_Grid_List *pOutputs = Parameters("OUTPUT_ADD")->asGridList(); pOutputs->Del_Items(); for(int i=0; iGet_Count() && Process_Get_Okay(); i++) { pInput = pInputs->asGrid(i); - pOutput = SG_Create_Grid(pOutput->Get_System(), bKeepType ? pInput->Get_Type() : SG_DATATYPE_Undefined); + + pOutput = SG_Create_Grid(pOutput->Get_System(), + Parameters("KEEP_TYPE")->asBool() ? pInput->Get_Type() : SG_DATATYPE_Undefined + ); pOutput->Assign(pInput, Interpolation); pOutput->Set_Name(pInput->Get_Name()); diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_tools/Grid_Resample.h saga-2.1.4+dfsg/src/modules/grid/grid_tools/Grid_Resample.h --- saga-2.1.0+dfsg/src/modules/grid/grid_tools/Grid_Resample.h 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_tools/Grid_Resample.h 2014-11-13 08:32:16.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Grid_Resample.h 1246 2011-11-25 13:42:38Z oconrad $ + * Version $Id: Grid_Resample.h 2212 2014-09-01 13:29:48Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// @@ -87,14 +87,15 @@ public: CGrid_Resample(void); - virtual CSG_String Get_MenuPath (void) { return( _TL("A:Grid|Construction") ); } + virtual CSG_String Get_MenuPath (void) { return( _TL("A:Grid|Grid System") ); } protected: - virtual bool On_Execute (void); - virtual int On_Parameter_Changed (CSG_Parameters *pParameters, CSG_Parameter *pParameter); + virtual int On_Parameters_Enable (CSG_Parameters *pParameters, CSG_Parameter *pParameter); + + virtual bool On_Execute (void); private: diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_tools/GridsFromTableAndGrid.cpp saga-2.1.4+dfsg/src/modules/grid/grid_tools/GridsFromTableAndGrid.cpp --- saga-2.1.0+dfsg/src/modules/grid/grid_tools/GridsFromTableAndGrid.cpp 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_tools/GridsFromTableAndGrid.cpp 2014-11-13 08:32:16.000000000 +0000 @@ -1,10 +1,10 @@ /********************************************************** - * Version $Id: GridsFromTableAndGrid.cpp 911 2011-02-14 16:38:15Z reklov_w $ + * Version $Id: GridsFromTableAndGrid.cpp 2241 2014-09-22 11:04:27Z oconrad $ *********************************************************/ /******************************************************************************* GridsFromTableAndGrid.cpp Copyright (C) Victor Olaya - + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or @@ -17,8 +17,8 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -*******************************************************************************/ + Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, USA +*******************************************************************************/ /////////////////////////////////////////////////////////// // // @@ -43,30 +43,32 @@ Set_Name (_TL("Grids from classified grid and table")); + Set_Author ("Victor Olaya (c) 2004"); + Set_Description (_TW( "Creates several grids using a classified grid and a table with data values for each class." )); pNode = Parameters.Add_Table( NULL , "TABLE" , _TL("Table"), - _TL(""), + _TL("The table with the (numeric) data values for each class. The module creates a grid for each table column (besides the ID)."), PARAMETER_INPUT ); Parameters.Add_Table_Field( pNode , "ID_FIELD" , _TL("Attribute"), - _TL("") + _TL("The attribute with the class IDs, used to link the table and the grid.") ); Parameters.Add_Grid( - NULL , "CLASSES" , _TL("Classes"), - _TL(""), + NULL , "CLASSES" , _TL("Classes"), + _TL("The grid coded with the class IDs."), PARAMETER_INPUT ); Parameters.Add_Grid_List( NULL , "GRIDS" , _TL("Grids"), - _TL(""), + _TL("The output grids, one grid for each table column."), PARAMETER_OUTPUT_OPTIONAL ); } @@ -82,39 +84,38 @@ bool CGridsFromTableAndGrid::On_Execute(void) { int iField, iRecord, iAttribute, nAttributes, *Attribute; - long iCell, jCell; + sLong iCell, jCell; CSG_Parameter_Grid_List *pGrids; CSG_Grid *pClasses; CSG_Table *pTable; //----------------------------------------------------- - pClasses = Parameters("CLASSES") ->asGrid(); - pGrids = Parameters("GRIDS") ->asGridList(); - pTable = Parameters("TABLE") ->asTable(); - iField = Parameters("ID_FIELD") ->asInt(); + pClasses = Parameters("CLASSES" )->asGrid(); + pGrids = Parameters("GRIDS" )->asGridList(); + pTable = Parameters("TABLE" )->asTable(); + iField = Parameters("ID_FIELD")->asInt(); pGrids->Del_Items(); - //----------------------------------------------------- - if( pTable->Get_Field_Count() == 0 || pTable->Get_Count() == 0 ) + if( !pClasses->Set_Index() ) { - Message_Add(_TL("selected table contains no valid records")); + Error_Set(_TL("index creation failed")); return( false ); } //----------------------------------------------------- - if( !pTable->Set_Index(iField, TABLE_INDEX_Ascending) ) + if( pTable->Get_Field_Count() == 0 || pTable->Get_Count() == 0 ) { - Message_Add(_TL("failed to create index for table")); + Message_Add(_TL("selected table contains no valid records")); return( false ); } //----------------------------------------------------- - if( !pClasses->Get_Sorted(0, iCell, false, true) ) + if( !pTable->Set_Index(iField, TABLE_INDEX_Ascending) ) { - Message_Add(_TL("failed to create index for grid")); + Message_Add(_TL("failed to create index for table")); return( false ); } diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_tools/GridsFromTableAndGrid.h saga-2.1.4+dfsg/src/modules/grid/grid_tools/GridsFromTableAndGrid.h --- saga-2.1.0+dfsg/src/modules/grid/grid_tools/GridsFromTableAndGrid.h 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_tools/GridsFromTableAndGrid.h 2014-11-13 08:32:16.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: GridsFromTableAndGrid.h 1246 2011-11-25 13:42:38Z oconrad $ + * Version $Id: GridsFromTableAndGrid.h 2072 2014-03-31 08:50:43Z reklov_w $ *********************************************************/ /******************************************************************************* GridsFromTableAndGrid.cpp @@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, USA *******************************************************************************/ @@ -43,7 +43,7 @@ public: CGridsFromTableAndGrid(void); - virtual CSG_String Get_MenuPath (void) { return( _TL("A:Grid|Construction") ); } + virtual CSG_String Get_MenuPath (void) { return( _TL("A:Grid|Values") ); } protected: diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_tools/Grid_Shrink_Expand.cpp saga-2.1.4+dfsg/src/modules/grid/grid_tools/Grid_Shrink_Expand.cpp --- saga-2.1.0+dfsg/src/modules/grid/grid_tools/Grid_Shrink_Expand.cpp 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_tools/Grid_Shrink_Expand.cpp 2014-11-13 08:32:16.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Grid_Shrink_Expand.cpp 1104 2011-06-20 20:50:18Z reklov_w $ + * Version $Id: Grid_Shrink_Expand.cpp 1992 2014-02-13 12:30:26Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// @@ -70,14 +70,28 @@ /////////////////////////////////////////////////////////// //--------------------------------------------------------- +enum +{ + EXPAND_MIN = 0, + EXPAND_MAX, + EXPAND_MEAN, + EXPAND_MAJORITY +}; + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- CGrid_Shrink_Expand::CGrid_Shrink_Expand(void) { //----------------------------------------------------- - // 1. Info... - - Set_Name (_TL("Grid Shrink/Expand")); + Set_Name (_TL("Shrink and Expand")); - Set_Author (SG_T("V.Wichmann & O.Conrad (c) 2011")); + Set_Author ("V.Wichmann & O.Conrad (c) 2011"); Set_Description (_TW( "Regions with valid data in the input grid can be shrinked or expanded by a certain amount (radius). " @@ -86,10 +100,7 @@ "selected (min, max, mean, majority).\n\n" )); - //----------------------------------------------------- - // 2. Parameters... - Parameters.Add_Grid( NULL, "INPUT" , _TL("Grid"), _TL(""), @@ -105,14 +116,16 @@ Parameters.Add_Choice( NULL, "OPERATION" , _TL("Operation"), _TL(""), - CSG_String::Format(SG_T("%s|%s|"), - _TL("Shrink"), - _TL("Expand") - ), 1 + CSG_String::Format(SG_T("%s|%s|%s|%s|"), + _TL("shrink"), + _TL("expand"), + _TL("shrink and expand"), + _TL("expand and shrink") + ), 3 ); Parameters.Add_Choice( - NULL, "MODE" , _TL("Search Mode"), + NULL, "CIRCLE" , _TL("Search Mode"), _TL(""), CSG_String::Format(SG_T("%s|%s|"), _TL("Square"), @@ -126,188 +139,119 @@ PARAMETER_TYPE_Int, 1, 1, true ); - CSG_String choices; - - for (int i=0; iGet_Identifier(), SG_T("OPERATION")) ) + { + pParameters->Get_Parameter("EXPAND")->Set_Enabled(pParameter->asInt() > 0); + } - //----------------------------------------------------- - m_pInput = Parameters("INPUT") ->asGrid(); - pResult = Parameters("RESULT") ->asGrid(); - m_Radius = Parameters("RADIUS") ->asInt(); - operation = Parameters("OPERATION") ->asInt(); - methodExpand = Parameters("METHOD_EXPAND")->asInt(); + return (1); +} - //----------------------------------------------------- - m_Kernel.Create(SG_DATATYPE_Byte, 1 + 2 * m_Radius, 1 + 2 * m_Radius); - m_Kernel.Set_NoData_Value(0.0); - m_Kernel.Assign(1.0); - m_Kernel.Set_Value(m_Radius, m_Radius, 0.0); - if( Parameters("MODE")->asInt() == 1 ) +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CGrid_Shrink_Expand::On_Execute(void) +{ + //----------------------------------------------------- + if( !m_Kernel.Set_Radius(Parameters("RADIUS")->asInt(), Parameters("CIRCLE")->asInt() == 0) ) { - for(y=-m_Radius, iy=0; y<=m_Radius; y++, iy++) - { - for(x=-m_Radius, ix=0; x<=m_Radius; x++, ix++) - { - if( x*x + y*y > m_Radius*m_Radius ) - { - m_Kernel.Set_Value(ix, iy, 0.0); - } - } - } + Error_Set(_TL("could not initialize search kernel")); + + return( false ); } //----------------------------------------------------- + CSG_Grid *pResult, Result; + + m_pInput = Parameters("INPUT" )->asGrid(); + pResult = Parameters("RESULT")->asGrid(); + if( !pResult || pResult == m_pInput ) { - pResult = SG_Create_Grid(m_pInput); - } - else - { - if( operation == 0 ) - pResult->Set_Name(CSG_String::Format(SG_T("%s [%s]"), m_pInput->Get_Name(), _TL("Shrink"))); - else - pResult->Set_Name(CSG_String::Format(SG_T("%s [%s %s]"), m_pInput->Get_Name(), _TL("Expand"), gSG_Method_Key_Names[Parameters("METHOD_EXPAND")->asInt()])); + Result.Create(m_pInput); - pResult->Set_NoData_Value(m_pInput->Get_NoData_Value()); + pResult = &Result; } - pResult->Assign_NoData(); - //----------------------------------------------------- - if( operation == 0 ) // shrink + CSG_String Name(m_pInput->Get_Name()); + + switch( Parameters("OPERATION")->asInt() ) { - for(y=0; yis_NoData(x, y) ) - continue; - else - { - bool bShrink = false; + Do_Shrink(pResult); - for(int iy=0, jy=y-m_Radius; iyis_InGrid(jx, jy, false) ) - { - if( m_pInput->is_NoData(jx, jy) ) - { - bShrink = true; - break; - } - } - } - - if( bShrink ) - break; - } - - if( bShrink ) - pResult->Set_NoData(x, y); - else - pResult->Set_Value(x, y, m_pInput->asDouble(x, y)); - } - } + pResult->Set_Name(Name + " [" + _TL("Shrink") + "]"); } - } - else // expand - { - for(y=0; yis_NoData(x, y) ) - { - pResult->Set_Value(x, y, m_pInput->asDouble(x, y)); - continue; - } - else - { - if( methodExpand == METHOD_KEY_MIN || methodExpand == METHOD_KEY_MAX || methodExpand == METHOD_KEY_MEAN ) - { - Statistics.Invalidate(); - - for(int iy=0, jy=y-m_Radius; iyis_InGrid(jx, jy, false) ) - { - if( !m_pInput->is_NoData(jx, jy) ) - Statistics.Add_Value(m_pInput->asDouble(jx, jy)); - } - } - } - - if( Statistics.Get_Count() == 0 ) - { - pResult->Set_NoData(x, y); - continue; - } - } - - - switch( methodExpand ) - { - default: - return( false ); - case METHOD_KEY_MIN: - pResult->Set_Value(x, y, Statistics.Get_Minimum()); - break; - case METHOD_KEY_MAX: - pResult->Set_Value(x, y, Statistics.Get_Maximum()); - break; - case METHOD_KEY_MEAN: - pResult->Set_Value(x, y, Statistics.Get_Mean()); - break; - case METHOD_KEY_MAJORITY: - m_Majority.Create(); - pResult->Set_Value(x, y, Get_Majority(x, y)); - m_Majority.Destroy(); - break; - } - } // noData - } // for x - } // for y - } // method expand + Do_Expand(pResult); + + pResult->Set_Name(Name + " [" + _TL("Expand") + "]"); + } + break; + + case 2: // shrink and expand + { + CSG_Grid TMP(pResult); + + Do_Shrink(&TMP); + + m_pInput = &TMP; + + Do_Expand(pResult); + + pResult->Set_Name(Name + " [" + _TL("Shrink and Expand") + "]"); + } + break; + + case 3: // expand and shrink + { + CSG_Grid TMP(pResult); + + Do_Expand(&TMP); + m_pInput = &TMP; + + Do_Shrink(pResult); + + pResult->Set_Name(Name + " [" + _TL("Expand and Shrink") + "]"); + } + break; + } //----------------------------------------------------- - if( !Parameters("RESULT")->asGrid() || Parameters("RESULT")->asGrid() == m_pInput ) + if( pResult == &Result ) { - m_pInput->Assign(pResult); - - delete(pResult); + Parameters("INPUT")->asGrid()->Assign(pResult); - DataObject_Update(m_pInput); + DataObject_Update(Parameters("INPUT")->asGrid()); } m_Kernel.Destroy(); @@ -316,49 +260,145 @@ } +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + //--------------------------------------------------------- -int CGrid_Shrink_Expand::On_Parameters_Enable(CSG_Parameters *pParameters, CSG_Parameter *pParameter) +bool CGrid_Shrink_Expand::Do_Shrink(CSG_Grid *pResult) { + Process_Set_Text(CSG_String::Format(SG_T("%s..."), _TL("Shrink"))); - if( !SG_STR_CMP(pParameter->Get_Identifier(), SG_T("OPERATION")) ) + for(int y=0; yGet_Parameter("METHOD_EXPAND")->Set_Enabled(pParameter->asInt() > 0); + #pragma omp parallel for + for(int x=0; xis_NoData(x, y); + + for(int i=0; !bShrink && iis_NoData(ix, iy) ) + { + bShrink = true; + } + } + + if( bShrink ) + { + pResult->Set_NoData(x, y); + } + else + { + pResult->Set_Value(x, y, m_pInput->asDouble(x, y)); + } + } } - //----------------------------------------------------- - return (1); + return( true ); } /////////////////////////////////////////////////////////// // // -// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CGrid_Shrink_Expand::Do_Expand(CSG_Grid *pResult) +{ + Process_Set_Text(CSG_String::Format(SG_T("%s..."), _TL("Expand"))); + + int Method = Parameters("EXPAND")->asInt(); + + for(int y=0; ySet_Value(x, y, Value); + } + else + { + pResult->Set_NoData(x, y); + } + } + } + + return( true ); +} + + +/////////////////////////////////////////////////////////// // // /////////////////////////////////////////////////////////// //--------------------------------------------------------- -double CGrid_Shrink_Expand::Get_Majority(int x, int y) +bool CGrid_Shrink_Expand::Get_Expand_Value(int x, int y, int Method, double &Value) { - m_Majority.Reset(); + //----------------------------------------------------- + if( !m_pInput->is_NoData(x, y) ) + { + Value = m_pInput->asDouble(x, y); + + return( true ); + } - for(int iy=0, jy=y-m_Radius; iyis_InGrid(jx, jy) ) + int ix = m_Kernel.Get_X(i, x); + int iy = m_Kernel.Get_Y(i, y); + + if( m_pInput->is_InGrid(ix, iy) ) { - m_Majority.Add_Value(m_pInput->asDouble(jx, jy)); + Majority.Add_Value(m_pInput->asDouble(ix, iy)); } } + + return( Majority.Get_Majority(Value) ); } - int Count; - double Value; + //----------------------------------------------------- + { + CSG_Simple_Statistics Statistics; + + for(int i=0; iis_InGrid(ix, iy) ) + { + Statistics.Add_Value(m_pInput->asDouble(ix, iy)); + } + } + + if( Statistics.Get_Count() > 0 ) + { + switch( Method ) + { + default: + case EXPAND_MEAN: Value = Statistics.Get_Mean (); break; + case EXPAND_MIN : Value = Statistics.Get_Minimum(); break; + case EXPAND_MAX : Value = Statistics.Get_Maximum(); break; + } + + return( true ); + } + } - if( m_Majority.Get_Majority(Value, Count) && Count > 0 ) - return( Value ); - else - return( m_pInput->Get_NoData_Value() ); + return( false ); } diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_tools/Grid_Shrink_Expand.h saga-2.1.4+dfsg/src/modules/grid/grid_tools/Grid_Shrink_Expand.h --- saga-2.1.0+dfsg/src/modules/grid/grid_tools/Grid_Shrink_Expand.h 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_tools/Grid_Shrink_Expand.h 2014-11-13 08:32:16.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Grid_Shrink_Expand.h 1104 2011-06-20 20:50:18Z reklov_w $ + * Version $Id: Grid_Shrink_Expand.h 1992 2014-02-13 12:30:26Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// @@ -81,49 +81,34 @@ /////////////////////////////////////////////////////////// //--------------------------------------------------------- -typedef enum ESG_Method_Key -{ - METHOD_KEY_MIN = 0, - METHOD_KEY_MAX, - METHOD_KEY_MEAN, - METHOD_KEY_MAJORITY, - METHOD_KEY_Count -} -TSG_Method_Key; - -//--------------------------------------------------------- -const SG_Char gSG_Method_Key_Names[METHOD_KEY_Count][32] = -{ - SG_T("min"), - SG_T("max"), - SG_T("mean"), - SG_T("majority") -}; - - -//--------------------------------------------------------- class CGrid_Shrink_Expand : public CSG_Module_Grid { public: CGrid_Shrink_Expand(void); + virtual CSG_String Get_MenuPath (void) { return( _TL("A:Grid|Gaps") ); } + protected: - virtual bool On_Execute (void); + virtual int On_Parameters_Enable (CSG_Parameters *pParameters, CSG_Parameter *pParameter); + + virtual bool On_Execute (void); - virtual int On_Parameters_Enable(CSG_Parameters *pParameters, CSG_Parameter *pParameter); private: - int m_Radius, m_Threshold; + int m_Threshold; + + CSG_Grid_Cell_Addressor m_Kernel; - CSG_Grid m_Kernel, *m_pInput; + CSG_Grid *m_pInput; - CSG_Class_Statistics m_Majority; + bool Do_Shrink (CSG_Grid *pResult); + bool Do_Expand (CSG_Grid *pResult); - double Get_Majority (int x, int y); + bool Get_Expand_Value (int x, int y, int Method, double &Value); }; diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_tools/Grid_SortRaster.cpp saga-2.1.4+dfsg/src/modules/grid/grid_tools/Grid_SortRaster.cpp --- saga-2.1.0+dfsg/src/modules/grid/grid_tools/Grid_SortRaster.cpp 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_tools/Grid_SortRaster.cpp 2014-11-13 08:32:16.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Grid_SortRaster.cpp 911 2011-02-14 16:38:15Z reklov_w $ + * Version $Id: Grid_SortRaster.cpp 2241 2014-09-22 11:04:27Z oconrad $ *********************************************************/ /******************************************************************************* SortRaster.cpp @@ -17,74 +17,85 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, USA *******************************************************************************/ #include "Grid_SortRaster.h" -CSortRaster::CSortRaster(void){ - - Parameters.Set_Name(_TL("Sort Grid")); - Parameters.Set_Description(_TW( - "(c) 2004 by Victor Olaya. Sort Grid")); - - Parameters.Add_Grid(NULL, - "GRID", - _TL("Input Grid"), - _TL(""), - PARAMETER_INPUT); - - Parameters.Add_Grid(NULL, - "OUTPUT", - _TL("Sorted Grid"), - _TL(""), - PARAMETER_OUTPUT); - - Parameters.Add_Value(NULL, - "DOWN", - _TL("Down sort"), - _TL(""), - PARAMETER_TYPE_Bool, - false); - -}//constructor - - -CSortRaster::~CSortRaster(void) -{} - -bool CSortRaster::On_Execute(void){ - - CSG_Grid* pGrid = Parameters("GRID")->asGrid(); - CSG_Grid* pSortedGrid = Parameters("OUTPUT")->asGrid(); - bool bDown = Parameters("DOWN")->asBool(); - bool bCopy = false; - long i; - int iX, iY; - int iCell=0; - - if (pGrid == pSortedGrid){ - pSortedGrid = SG_Create_Grid(pGrid); - bCopy = true; - }//if - - pSortedGrid->Set_NoData_Value(0.0); - - for(i=0; iGet_Sorted(i, iX, iY, bDown, false); - if (pGrid->is_NoData(iX,iY)){ - pSortedGrid->Set_NoData(iX,iY); - }//if - else{ - // pSortedGrid->Set_Value(iX, iY, i); - pSortedGrid->Set_Value(iX, iY, ++iCell); - }//else - }//for +CSortRaster::CSortRaster(void) +{ + Set_Name (_TL("Grid Cell Index")); + + Set_Author ("Victor Olaya (c) 2004"); + + Set_Description (_TW( + "Creates an index grid according to the cell values either in ascending or descending order." + )); + + Parameters.Add_Grid( + NULL , "GRID" , _TL("Grid"), + _TL(""), + PARAMETER_INPUT + ); - if (bCopy){ - pGrid->Assign(pSortedGrid); - }//if + Parameters.Add_Grid( + NULL , "INDEX" , _TL("Index"), + _TL(""), + PARAMETER_OUTPUT, true, SG_DATATYPE_Long + ); + + Parameters.Add_Choice( + NULL , "ORDER" , _TL("Sorting Order"), + _TL(""), + CSG_String::Format(SG_T("%s|%s|"), + _TL("ascending"), + _TL("descending") + ) + ); +} + +bool CSortRaster::On_Execute(void) +{ + CSG_Grid *pGrid = Parameters("GRID")->asGrid(); + + if( !pGrid->Set_Index() ) + { + Error_Set(_TL("index creation failed")); + + return( false ); + } + + CSG_Grid *pIndex = Parameters("INDEX")->asGrid(); + + bool bDown = Parameters("ORDER")->asInt() == 1; + + if( pGrid == pIndex ) + { + pIndex = SG_Create_Grid(pGrid); + } + + pIndex->Set_NoData_Value(0.0); + + for(sLong i=0, Index=0; iGet_Sorted(i, ix, iy, bDown) ) + { + pIndex->Set_Value(ix, iy, ++Index); + } + else + { + pIndex->Set_NoData(ix, iy); + } + } + + if( pGrid == Parameters("INDEX")->asGrid() ) + { + pGrid->Assign(pIndex); - return true; + delete(pIndex); + } -}//method + return( true ); +} diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_tools/Grid_SortRaster.h saga-2.1.4+dfsg/src/modules/grid/grid_tools/Grid_SortRaster.h --- saga-2.1.0+dfsg/src/modules/grid/grid_tools/Grid_SortRaster.h 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_tools/Grid_SortRaster.h 2014-11-13 08:32:16.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Grid_SortRaster.h 911 2011-02-14 16:38:15Z reklov_w $ + * Version $Id: Grid_SortRaster.h 2072 2014-03-31 08:50:43Z reklov_w $ *********************************************************/ /******************************************************************************* SortRaster.h @@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, USA *******************************************************************************/ #include "MLB_Interface.h" @@ -25,12 +25,12 @@ { public: CSortRaster(void); - virtual ~CSortRaster(void); + + virtual CSG_String Get_MenuPath (void) { return( _TL("A:Grid|Values") ); } + protected: bool On_Execute(void); -private: - -}; \ No newline at end of file +}; diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_tools/Grid_ThresholdBuffer.cpp saga-2.1.4+dfsg/src/modules/grid/grid_tools/Grid_ThresholdBuffer.cpp --- saga-2.1.0+dfsg/src/modules/grid/grid_tools/Grid_ThresholdBuffer.cpp 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_tools/Grid_ThresholdBuffer.cpp 2014-11-13 08:32:16.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Grid_ThresholdBuffer.cpp 911 2011-02-14 16:38:15Z reklov_w $ + * Version $Id: Grid_ThresholdBuffer.cpp 2208 2014-08-27 16:00:51Z oconrad $ *********************************************************/ /******************************************************************************* ThresholdBuffer.cpp @@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, USA *******************************************************************************/ #include "Grid_ThresholdBuffer.h" @@ -122,10 +122,10 @@ float fBaseValue; double dThreshold; - fBaseValue = m_pValueGrid->asFloat(x,y,true); + fBaseValue = m_pValueGrid->asFloat(x,y); if (m_pThresholdGrid){ - dThreshold = m_pThresholdGrid->asFloat(x,y,true); + dThreshold = m_pThresholdGrid->asFloat(x,y); }//if else{ dThreshold = m_dThreshold; @@ -149,10 +149,10 @@ iValue = m_pBuffer->asInt(x2,y2); if (!m_pValueGrid->is_NoData(x2, y2) && iValue == 0){ if (m_iThresholdType == THRESHOLD_ABSOLUTE){ - dValue = m_pValueGrid->asFloat(x2,y2,true); + dValue = m_pValueGrid->asFloat(x2,y2); }//if else{ - dValue = fabs(m_pValueGrid->asFloat(x2,y2,true) - fBaseValue); + dValue = fabs(m_pValueGrid->asFloat(x2,y2) - fBaseValue); }//else if(dValue < dThreshold){ m_pBuffer->Set_Value(x2, y2, BUFFER); diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_tools/Grid_ThresholdBuffer.h saga-2.1.4+dfsg/src/modules/grid/grid_tools/Grid_ThresholdBuffer.h --- saga-2.1.0+dfsg/src/modules/grid/grid_tools/Grid_ThresholdBuffer.h 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_tools/Grid_ThresholdBuffer.h 2014-11-13 08:32:16.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Grid_ThresholdBuffer.h 1246 2011-11-25 13:42:38Z oconrad $ + * Version $Id: Grid_ThresholdBuffer.h 2072 2014-03-31 08:50:43Z reklov_w $ *********************************************************/ /******************************************************************************* ThresholdBuffer.h @@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, USA *******************************************************************************/ #if _MSC_VER > 1000 @@ -26,32 +26,31 @@ #include "MLB_Interface.h" -class CThresholdBuffer : public CSG_Module_Grid { +class CThresholdBuffer : public CSG_Module_Grid +{ +public: + CThresholdBuffer(void); + virtual ~CThresholdBuffer(void); + + virtual CSG_String Get_MenuPath (void) { return( _TL("A:Grid|Distances") ); } + + +protected: + + virtual bool On_Execute (void); + private: - CSG_Grid* m_pFeatures; - CSG_Grid* m_pBuffer; - CSG_Grid* m_pValueGrid; - CSG_Grid* m_pThresholdGrid; - double m_dThreshold; - int m_iThresholdType; -// CAPI_3D_iPoints m_pCentralPoints; -// CAPI_3D_iPoints m_pAdjPoints; - CSG_Points_Int m_pCentralPoints; - CSG_Points_Int m_pAdjPoints; - - void BufferPoint(int,int); + int m_iThresholdType; -public: + double m_dThreshold; - CThresholdBuffer(void); - virtual ~CThresholdBuffer(void); + CSG_Grid *m_pFeatures, *m_pBuffer, *m_pValueGrid, *m_pThresholdGrid; - virtual CSG_String Get_MenuPath (void) { return( _TL("R:Buffers") ); } + CSG_Points_Int m_pCentralPoints, m_pAdjPoints; -protected: - virtual bool On_Execute(void); -}; + void BufferPoint (int x, int y); +}; diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_tools/Grid_Tiling.cpp saga-2.1.4+dfsg/src/modules/grid/grid_tools/Grid_Tiling.cpp --- saga-2.1.0+dfsg/src/modules/grid/grid_tools/Grid_Tiling.cpp 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_tools/Grid_Tiling.cpp 2014-11-13 08:32:16.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Grid_Tiling.cpp 1380 2012-04-26 12:02:19Z reklov_w $ + * Version $Id: Grid_Tiling.cpp 1921 2014-01-09 10:24:11Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_tools/Grid_Tiling.h saga-2.1.4+dfsg/src/modules/grid/grid_tools/Grid_Tiling.h --- saga-2.1.0+dfsg/src/modules/grid/grid_tools/Grid_Tiling.h 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_tools/Grid_Tiling.h 2014-11-13 08:32:16.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Grid_Tiling.h 1380 2012-04-26 12:02:19Z reklov_w $ + * Version $Id: Grid_Tiling.h 1921 2014-01-09 10:24:11Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// @@ -78,17 +78,16 @@ public: CGrid_Tiling(void); - virtual CSG_String Get_MenuPath (void) { return( _TL("A:Grid|Construction") ); } + virtual CSG_String Get_MenuPath (void) { return( _TL("A:Grid|Grid System") ); } protected: virtual int On_Parameter_Changed (CSG_Parameters *pParameters, CSG_Parameter *pParameter); + virtual int On_Parameters_Enable (CSG_Parameters *pParameters, CSG_Parameter *pParameter); virtual bool On_Execute (void); - virtual int On_Parameters_Enable (CSG_Parameters *pParameters, CSG_Parameter *pParameter); - }; diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_tools/Grid_Transpose.cpp saga-2.1.4+dfsg/src/modules/grid/grid_tools/Grid_Transpose.cpp --- saga-2.1.0+dfsg/src/modules/grid/grid_tools/Grid_Transpose.cpp 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_tools/Grid_Transpose.cpp 2014-11-13 08:32:16.000000000 +0000 @@ -0,0 +1,182 @@ +/********************************************************** + * Version $Id: Grid_Transpose.cpp 1834 2013-09-11 18:33:29Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// grid_tools // +// // +//-------------------------------------------------------// +// // +// Grid_Transpose.cpp // +// // +// Copyright (C) 2013 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.de // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Hamburg // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "Grid_Transpose.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +CGrid_Transpose::CGrid_Transpose(void) +{ + //----------------------------------------------------- + Set_Name (_TL("Transpose Grids")); + + Set_Author (SG_T("O.Conrad (c) 2013")); + + Set_Description (_TW( + "" + )); + + //----------------------------------------------------- + Parameters.Add_Grid_List( + NULL , "GRIDS" , _TL("Grids"), + _TL(""), + PARAMETER_INPUT + ); + + Parameters.Add_Grid_List( + NULL , "TRANSPOSED" , _TL("Transposed Grids"), + _TL(""), + PARAMETER_OUTPUT, false + ); + + //----------------------------------------------------- + Parameters.Add_Value( + NULL , "MIRROR_X" , _TL("Mirror Horizontally"), + _TL(""), + PARAMETER_TYPE_Bool, false + ); + + Parameters.Add_Value( + NULL , "MIRROR_Y" , _TL("Mirror Vertically"), + _TL(""), + PARAMETER_TYPE_Bool, false + ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CGrid_Transpose::On_Execute(void) +{ + //----------------------------------------------------- + CSG_Parameter_Grid_List *pGrids = Parameters("GRIDS")->asGridList(); + + if( pGrids->Get_Count() <= 0 ) + { + return( false ); + } + + //----------------------------------------------------- + bool bMirror_X = Parameters("MIRROR_X")->asBool(); + bool bMirror_Y = Parameters("MIRROR_Y")->asBool(); + + //----------------------------------------------------- + CSG_Grid_System System; + + if( !System.Assign(Get_Cellsize(), Get_YMin(), Get_XMin(), Get_NY(), Get_NX()) ) + { + return( false ); + } + + //----------------------------------------------------- + Parameters("TRANSPOSED")->asGridList()->Del_Items(); + + for(int i=0; iGet_Count() && Process_Get_Okay(); i++) + { + CSG_Grid *pGrid = pGrids->asGrid(i); + CSG_Grid *pTransposed = SG_Create_Grid(System, pGrid->Get_Type()); + + pTransposed->Set_Name(pGrid->Get_Name()); + pTransposed->Set_Unit(pGrid->Get_Unit()); + pTransposed->Set_Scaling(pGrid->Get_Scaling(), pGrid->Get_Offset()); + pTransposed->Set_NoData_Value_Range(pGrid->Get_NoData_Value(), pGrid->Get_NoData_hiValue()); + pTransposed->Get_MetaData () = pGrid->Get_MetaData (); + pTransposed->Get_Projection() = pGrid->Get_Projection(); + + for(int y=0; ySet_Value(iy, ix, pGrid->asDouble(x, y)); + } + } + + Parameters("TRANSPOSED")->asGridList()->Add_Item(pTransposed); + } + + //----------------------------------------------------- + return( true ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_tools/Grid_Transpose.h saga-2.1.4+dfsg/src/modules/grid/grid_tools/Grid_Transpose.h --- saga-2.1.0+dfsg/src/modules/grid/grid_tools/Grid_Transpose.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_tools/Grid_Transpose.h 2014-11-13 08:32:16.000000000 +0000 @@ -0,0 +1,104 @@ +/********************************************************** + * Version $Id: Grid_Transpose.h 1834 2013-09-11 18:33:29Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// grid_tools // +// // +//-------------------------------------------------------// +// // +// Grid_Transpose.h // +// // +// Copyright (C) 2013 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.de // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Hamburg // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#ifndef HEADER_INCLUDED__Grid_Transpose_H +#define HEADER_INCLUDED__Grid_Transpose_H + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "MLB_Interface.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +class CGrid_Transpose : public CSG_Module_Grid +{ +public: + CGrid_Transpose(void); + + virtual CSG_String Get_MenuPath (void) { return( _TL("A:Grid|Grid System") ); } + +protected: + + virtual bool On_Execute (void); + +}; + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#endif // #ifndef HEADER_INCLUDED__Grid_Transpose_H diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_tools/Grid_Value_Reclassify.cpp saga-2.1.4+dfsg/src/modules/grid/grid_tools/Grid_Value_Reclassify.cpp --- saga-2.1.0+dfsg/src/modules/grid/grid_tools/Grid_Value_Reclassify.cpp 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_tools/Grid_Value_Reclassify.cpp 2014-11-13 08:32:16.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Grid_Value_Reclassify.cpp 1733 2013-06-19 08:47:38Z reklov_w $ + * Version $Id: Grid_Value_Reclassify.cpp 2321 2014-11-03 21:10:22Z johanvdw $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// @@ -80,14 +80,20 @@ Set_Author(_TL("Copyrights (c) 2005 by Volker Wichmann")); Set_Description (_TW( - "The module can be used to reclassify the values of a grid. It provides three different options: (a) " - "reclassification of single values, (b) reclassification of a range of values and (c) reclassification " - "of value ranges specified in a lookup table. In addition to theses methods, two special cases " - "(No-Data values and values not included in the reclassification setup) are supported. In mode (a) " - "and (b) the 'No-Data option' is evaluated before the method settings, in mode (c) the option is " - "evaluated only if the No-Data value ins't included in the lookup table. The 'other values' option " - "is always evaluated after checking the method settings. ") - ); + "The module can be used to reclassify the values of a grid. It provides three different options:\n" + "(a) reclassification of single values\n" + "(b) reclassification of a range of values\n" + "(c) reclassification of value ranges specified in a lookup table\n\n" + "In addition to these methods, two special cases (NoData values and values not included in the " + "reclassification setup) are supported.\n" + "With reclassification mode (a) and (b), the 'NoData option' is evaluated before the 'Method' " + "settings. In reclassification mode (c) the option is evaluated only if the NoData value is not " + "included in the lookup table.\n" + "The 'other values' option is always evaluated after checking the 'Method' settings.\n\n" + "The module allows one to define the NoData value of the output grid (header): by default, the " + "output grid gets assigned the NoData value of the input grid. But it is also possible to " + "assign a user defined NoData value.\n\n" + )); //----------------------------------------------------- @@ -236,6 +242,27 @@ ); //----------------------------------------------------- + pNode = Parameters.Add_Node( + NULL, "OPT_RESULT" , _TL("NoData Output Grid"), + _TL("Parameter settings for the NoData value of the output grid (header).") + ); + + Parameters.Add_Choice( + pNode , "RESULT_NODATA_CHOICE" , _TL("Assign ..."), + _TL("Choose how to handle the NoData value of the output grid."), + CSG_String::Format(SG_T("%s|%s|"), + _TL("NoData value of input grid"), + _TL("user defined NoData value") + ), 0 + ); + + Parameters.Add_Value( + Parameters("RESULT_NODATA_CHOICE") , "RESULT_NODATA_VALUE" , _TL("NoData Value"), + _TL("User defined NoData value for output grid."), + PARAMETER_TYPE_Double, -99999 + ); + + //----------------------------------------------------- CSG_Table *pLookup; CSG_Table_Record *pRecord; @@ -283,8 +310,17 @@ //----------------------------------------------------- if( bSuccess ) { - pResult->Set_NoData_Value(pInput->Get_NoData_Value()); + if( Parameters("RESULT_NODATA_CHOICE") == 0 ) + { + pResult->Set_NoData_Value(pInput->Get_NoData_Value()); + } + else + { + pResult->Set_NoData_Value(Parameters("RESULT_NODATA_VALUE")->asDouble()); + } + pResult->Set_Name(CSG_String::Format(SG_T("%s_reclassified"), pInput->Get_Name())); + return( true ); } else @@ -615,6 +651,11 @@ pParameters->Get_Parameter("OTHERS" )->Set_Enabled(pParameter->asInt() > 0); } + if( !SG_STR_CMP(pParameter->Get_Identifier(), SG_T("RESULT_NODATA_CHOICE")) ) + { + pParameters->Get_Parameter("RESULT_NODATA_VALUE")->Set_Enabled(pParameter->asInt() > 0); + } + //----------------------------------------------------- return (1); } diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_tools/Grid_Value_Reclassify.h saga-2.1.4+dfsg/src/modules/grid/grid_tools/Grid_Value_Reclassify.h --- saga-2.1.0+dfsg/src/modules/grid/grid_tools/Grid_Value_Reclassify.h 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_tools/Grid_Value_Reclassify.h 2014-11-13 08:32:16.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Grid_Value_Reclassify.h 1246 2011-11-25 13:42:38Z oconrad $ + * Version $Id: Grid_Value_Reclassify.h 1921 2014-01-09 10:24:11Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// @@ -87,7 +87,7 @@ CGrid_Value_Reclassify(void); virtual ~CGrid_Value_Reclassify(void); - virtual CSG_String Get_MenuPath (void) { return( _TL("R:Values") ); } + virtual CSG_String Get_MenuPath (void) { return( _TL("A:Grid|Values") ); } protected: diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_tools/Grid_Value_Replace.cpp saga-2.1.4+dfsg/src/modules/grid/grid_tools/Grid_Value_Replace.cpp --- saga-2.1.0+dfsg/src/modules/grid/grid_tools/Grid_Value_Replace.cpp 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_tools/Grid_Value_Replace.cpp 2014-11-13 08:32:16.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Grid_Value_Replace.cpp 911 2011-02-14 16:38:15Z reklov_w $ + * Version $Id: Grid_Value_Replace.cpp 1921 2014-01-09 10:24:11Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_tools/Grid_Value_Replace.h saga-2.1.4+dfsg/src/modules/grid/grid_tools/Grid_Value_Replace.h --- saga-2.1.0+dfsg/src/modules/grid/grid_tools/Grid_Value_Replace.h 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_tools/Grid_Value_Replace.h 2014-11-13 08:32:16.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Grid_Value_Replace.h 1246 2011-11-25 13:42:38Z oconrad $ + * Version $Id: Grid_Value_Replace.h 1921 2014-01-09 10:24:11Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// @@ -88,7 +88,7 @@ CGrid_Value_Replace(void); virtual ~CGrid_Value_Replace(void); - virtual CSG_String Get_MenuPath (void) { return( _TL("R:Values") ); } + virtual CSG_String Get_MenuPath (void) { return( _TL("A:Grid|Values") ); } protected: diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_tools/Grid_Value_Replace_Interactive.cpp saga-2.1.4+dfsg/src/modules/grid/grid_tools/Grid_Value_Replace_Interactive.cpp --- saga-2.1.0+dfsg/src/modules/grid/grid_tools/Grid_Value_Replace_Interactive.cpp 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_tools/Grid_Value_Replace_Interactive.cpp 2014-11-13 08:32:16.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Grid_Value_Replace_Interactive.cpp 911 2011-02-14 16:38:15Z reklov_w $ + * Version $Id: Grid_Value_Replace_Interactive.cpp 2072 2014-03-31 08:50:43Z reklov_w $ *********************************************************/ /******************************************************************************* Grid_Value_Replace_Interactive.cpp @@ -17,48 +17,61 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, USA *******************************************************************************/ #include "Grid_Value_Replace_Interactive.h" -CGrid_Value_Replace_Interactive::CGrid_Value_Replace_Interactive(void){ +CGrid_Value_Replace_Interactive::CGrid_Value_Replace_Interactive(void) +{ - Set_Name(_TL("Change Cell Values")); - Set_Author(_TL("Copyrights (c) 2004 by Victor Olaya")); - Set_Description (_TW("(c) 2004 by Victor Olaya.")); - - Parameters.Add_Grid(NULL, - "GRID", - _TL("Grid"), - _TL(""), - PARAMETER_INPUT); - - Parameters.Add_Value(NULL, - "NEWVALUE", - _TL("New Value"), - _TL("New Value"), - PARAMETER_TYPE_Double, - 0); + Set_Name (_TL("Change Cell Values")); + Set_Author (_TL("Copyrights (c) 2004 by Victor Olaya")); + Set_Description (_TW("The module allows to interactively change cell values of the input grid. " + "Once the module is executed and running, you can use the Action tool to select " + "grid cells. While working on a grid, you can change (and apply) the 'New Value' " + "and the 'Method' parameters without stopping and re-starting the module.\n\n" + )); + + Parameters.Add_Grid( + NULL, "GRID", _TL("Grid"), + _TL("The grid to modify."), + PARAMETER_INPUT + ); + + Parameters.Add_Value( + NULL, "NEWVALUE", _TL("New Value"), + _TL("The value to apply."), + PARAMETER_TYPE_Double, 0.0 + ); + + Parameters.Add_Choice( + NULL , "METHOD" , _TL("Method"), + _TL("Choose how to apply the new value."), + CSG_String::Format(SG_T("%s|%s|%s|"), + _TL("set constant value"), + _TL("add value"), + _TL("subtract value") + ), 0 + ); }//constructor -CGrid_Value_Replace_Interactive::~CGrid_Value_Replace_Interactive(void){ +CGrid_Value_Replace_Interactive::~CGrid_Value_Replace_Interactive(void) +{ On_Execute_Finish(); } -bool CGrid_Value_Replace_Interactive::On_Execute(void){ - - - m_pGrid = Parameters("GRID")->asGrid(); - m_dNewValue = Parameters("NEWVALUE")->asDouble(); - - return true; +bool CGrid_Value_Replace_Interactive::On_Execute(void) +{ + m_pGrid = Parameters("GRID")->asGrid(); + return( true ); }//method + bool CGrid_Value_Replace_Interactive::On_Execute_Finish(void) { return( true ); @@ -74,12 +87,20 @@ return( false ); } - double dValue = m_pGrid->asDouble(iX,iY); + double dNewValue = Parameters("NEWVALUE")->asDouble(); + int iMethod = Parameters("METHOD")->asInt(); - m_pGrid->Set_Value(iX,iY,m_dNewValue); + double dValue = m_pGrid->asDouble(iX, iY); - DataObject_Update(m_pGrid, SG_UI_DATAOBJECT_UPDATE_ONLY); + switch( iMethod ) + { + default: + case 0: m_pGrid->Set_Value(iX, iY, dNewValue); break; + case 1: m_pGrid->Set_Value(iX, iY, dValue + dNewValue); break; + case 2: m_pGrid->Set_Value(iX, iY, dValue - dNewValue); break; + } - return (true); + DataObject_Update(m_pGrid, SG_UI_DATAOBJECT_UPDATE_ONLY); + return( true ); }//method diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_tools/Grid_Value_Replace_Interactive.h saga-2.1.4+dfsg/src/modules/grid/grid_tools/Grid_Value_Replace_Interactive.h --- saga-2.1.0+dfsg/src/modules/grid/grid_tools/Grid_Value_Replace_Interactive.h 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_tools/Grid_Value_Replace_Interactive.h 2014-11-13 08:32:16.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Grid_Value_Replace_Interactive.h 1246 2011-11-25 13:42:38Z oconrad $ + * Version $Id: Grid_Value_Replace_Interactive.h 2072 2014-03-31 08:50:43Z reklov_w $ *********************************************************/ /******************************************************************************* Grid_Value_Replace_Interactive.h @@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, USA *******************************************************************************/ //--------------------------------------------------------- @@ -31,14 +31,13 @@ class CGrid_Value_Replace_Interactive : public CSG_Module_Grid_Interactive { private: - CSG_Grid *m_pGrid; - double m_dNewValue; + CSG_Grid *m_pGrid; public: CGrid_Value_Replace_Interactive(void); virtual ~CGrid_Value_Replace_Interactive(void); - virtual CSG_String Get_MenuPath (void) { return( _TL("R:Values") ); } + virtual CSG_String Get_MenuPath (void) { return( _TL("A:Grid|Values") ); } protected: diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_tools/Grid_Value_Request.cpp saga-2.1.4+dfsg/src/modules/grid/grid_tools/Grid_Value_Request.cpp --- saga-2.1.0+dfsg/src/modules/grid/grid_tools/Grid_Value_Request.cpp 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_tools/Grid_Value_Request.cpp 2014-11-13 08:32:16.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Grid_Value_Request.cpp 911 2011-02-14 16:38:15Z reklov_w $ + * Version $Id: Grid_Value_Request.cpp 2318 2014-10-31 12:10:58Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// @@ -67,9 +67,11 @@ #define FIELD_NAME 0 #define FIELD_VALUE 1 -#define FIELD_X 0 -#define FIELD_Y 1 -#define FIELD_GRIDS 2 +#define FIELD_X_WORLD 0 +#define FIELD_Y_WORLD 1 +#define FIELD_X_GRID 2 +#define FIELD_Y_GRID 3 +#define FIELD_GRIDS 4 /////////////////////////////////////////////////////////// @@ -89,7 +91,9 @@ Set_Author (SG_T("(c) 2003 by O.Conrad")); Set_Description (_TW( - "Grid Value Request.\n") + "The module reads out grids values from one or more input grids and reports these in a table. " + "Besides the grid value(s), the x- and y-coordinates of the queried cell(s) are reported. The " + "reported grid coordinates (column, row) are those of the first input grid.\n") ); @@ -163,8 +167,10 @@ m_pTable->Add_Field(_TL("NAME") , SG_DATATYPE_String); m_pTable->Add_Field(_TL("VALUE") , SG_DATATYPE_Double); - m_pTable->Add_Record()->Set_Value(FIELD_NAME, _TL("X")); - m_pTable->Add_Record()->Set_Value(FIELD_NAME, _TL("Y")); + m_pTable->Add_Record()->Set_Value(FIELD_NAME, _TL("X World")); + m_pTable->Add_Record()->Set_Value(FIELD_NAME, _TL("Y World")); + m_pTable->Add_Record()->Set_Value(FIELD_NAME, _TL("X Grid 1")); + m_pTable->Add_Record()->Set_Value(FIELD_NAME, _TL("Y Grid 1")); for(iGrid=0; iGridGet_Count(); iGrid++) { @@ -173,8 +179,10 @@ break; case 1: - m_pTable->Add_Field(_TL("X") , SG_DATATYPE_Double); - m_pTable->Add_Field(_TL("Y") , SG_DATATYPE_Double); + m_pTable->Add_Field(_TL("X World") , SG_DATATYPE_Double); + m_pTable->Add_Field(_TL("Y World") , SG_DATATYPE_Double); + m_pTable->Add_Field(_TL("X Grid 1") , SG_DATATYPE_Int); + m_pTable->Add_Field(_TL("Y Grid 1") , SG_DATATYPE_Int); for(iGrid=0; iGridGet_Count(); iGrid++) { @@ -208,18 +216,21 @@ case 0: if( Mode == MODULE_INTERACTIVE_LDOWN || Mode == MODULE_INTERACTIVE_MOVE_LDOWN ) { - m_pTable->Get_Record(0)->Set_Value(FIELD_VALUE, ptWorld.Get_X()); - m_pTable->Get_Record(1)->Set_Value(FIELD_VALUE, ptWorld.Get_Y()); + m_pTable->Get_Record(FIELD_X_WORLD)->Set_Value(FIELD_VALUE, ptWorld.Get_X()); + m_pTable->Get_Record(FIELD_Y_WORLD)->Set_Value(FIELD_VALUE, ptWorld.Get_Y()); + + m_pTable->Get_Record(FIELD_X_GRID)->Set_Value(FIELD_VALUE, m_pGrids->asGrid(0)->Get_System().Get_xWorld_to_Grid(ptWorld.Get_X())); + m_pTable->Get_Record(FIELD_Y_GRID)->Set_Value(FIELD_VALUE, m_pGrids->asGrid(0)->Get_System().Get_yWorld_to_Grid(ptWorld.Get_Y())); for(iGrid=0; iGridGet_Count(); iGrid++) { - if( m_pGrids->asGrid(iGrid)->Get_Value(ptWorld, Value, m_Interpolation, true) ) + if( m_pGrids->asGrid(iGrid)->Get_Value(ptWorld, Value, m_Interpolation, false, true) ) { - m_pTable->Get_Record(iGrid + 2)->Set_Value(FIELD_VALUE, Value); + m_pTable->Get_Record(iGrid + FIELD_GRIDS)->Set_Value(FIELD_VALUE, Value); } else { - m_pTable->Get_Record(iGrid + 2)->Set_Value(FIELD_VALUE, 0.0); + m_pTable->Get_Record(iGrid + FIELD_GRIDS)->Set_Value(FIELD_VALUE, 0.0); } } @@ -235,12 +246,15 @@ { pRecord = m_pTable->Add_Record(); - pRecord->Set_Value(FIELD_X, ptWorld.Get_X()); - pRecord->Set_Value(FIELD_Y, ptWorld.Get_Y()); + pRecord->Set_Value(FIELD_X_WORLD, ptWorld.Get_X()); + pRecord->Set_Value(FIELD_Y_WORLD, ptWorld.Get_Y()); + + pRecord->Set_Value(FIELD_X_GRID, m_pGrids->asGrid(0)->Get_System().Get_xWorld_to_Grid(ptWorld.Get_X())); + pRecord->Set_Value(FIELD_Y_GRID, m_pGrids->asGrid(0)->Get_System().Get_yWorld_to_Grid(ptWorld.Get_Y())); for(iGrid=0; iGridGet_Count(); iGrid++) { - if( m_pGrids->asGrid(iGrid)->Get_Value(ptWorld, Value, m_Interpolation, true) ) + if( m_pGrids->asGrid(iGrid)->Get_Value(ptWorld, Value, m_Interpolation, false, true) ) { pRecord->Set_Value(FIELD_GRIDS + iGrid, Value); } diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_tools/Grid_Value_Request.h saga-2.1.4+dfsg/src/modules/grid/grid_tools/Grid_Value_Request.h --- saga-2.1.0+dfsg/src/modules/grid/grid_tools/Grid_Value_Request.h 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_tools/Grid_Value_Request.h 2014-11-13 08:32:16.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Grid_Value_Request.h 1246 2011-11-25 13:42:38Z oconrad $ + * Version $Id: Grid_Value_Request.h 1921 2014-01-09 10:24:11Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// @@ -81,12 +81,13 @@ CGrid_Value_Request(void); virtual ~CGrid_Value_Request(void); - virtual CSG_String Get_MenuPath (void) { return( _TL("R:Values") ); } + virtual CSG_String Get_MenuPath (void) { return( _TL("A:Grid|Values") ); } protected: virtual bool On_Execute (void); + virtual bool On_Execute_Position (CSG_Point ptWorld, TSG_Module_Interactive_Mode Mode); @@ -94,7 +95,7 @@ int m_Method, m_Interpolation; - CSG_Table *m_pTable; + CSG_Table *m_pTable; CSG_Parameter_Grid_List *m_pGrids; diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_tools/Grid_Value_Type.cpp saga-2.1.4+dfsg/src/modules/grid/grid_tools/Grid_Value_Type.cpp --- saga-2.1.0+dfsg/src/modules/grid/grid_tools/Grid_Value_Type.cpp 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_tools/Grid_Value_Type.cpp 2014-11-13 08:32:16.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Grid_Value_Type.cpp 1497 2012-10-22 15:25:48Z manfred-e $ + * Version $Id: Grid_Value_Type.cpp 2241 2014-09-22 11:04:27Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// @@ -74,15 +74,15 @@ CGrid_Value_Type::CGrid_Value_Type(void) { //----------------------------------------------------- - Set_Name(_TL("Convert Data Storage Type")); + Set_Name (_TL("Change Data Storage")); - Set_Author (SG_T("O.Conrad (c) 2003")); + Set_Author ("O.Conrad (c) 2003"); Set_Description (_TW( - "Changes the storage data type of a grid " - "(e.g. from 4 byte floating point to 2 byte signed integer). " - "If the target is not set, the original grid's storage type will be changed. ") - ); + "Changes a grid's data storage type, offset and scaling, e.g. from 4 byte floating point " + "to 2 byte signed integer. This might be useful to increase precision or to save memory. " + "If the target is not set, the original grid's storage type will be changed." + )); //----------------------------------------------------- Parameters.Add_Grid( @@ -110,7 +110,19 @@ SG_Data_Type_Get_Name(SG_DATATYPE_Int ).c_str(), SG_Data_Type_Get_Name(SG_DATATYPE_Float ).c_str(), SG_Data_Type_Get_Name(SG_DATATYPE_Double).c_str() - ) + ), 7 + ); + + Parameters.Add_Value( + NULL , "OFFSET" , _TL("Offset"), + _TL(""), + PARAMETER_TYPE_Double, 0.0 + ); + + Parameters.Add_Value( + NULL , "SCALE" , _TL("Scale"), + _TL(""), + PARAMETER_TYPE_Double, 1.0 ); } @@ -125,19 +137,35 @@ bool CGrid_Value_Type::On_Execute(void) { //----------------------------------------------------- - CSG_Grid *pOutput = Parameters("OUTPUT") ->asGrid(); - CSG_Grid *pInput = Parameters("INPUT") ->asGrid(); + CSG_Grid *pOutput = Parameters("OUTPUT")->asGrid(); + CSG_Grid *pInput = Parameters("INPUT" )->asGrid(), Input; if( pOutput == NULL || pOutput == pInput ) { + Input.Create(*pInput); pOutput = pInput; - pInput = new CSG_Grid(*pOutput); + pInput = &Input; + } + + //----------------------------------------------------- + double Offset = Parameters("OFFSET")->asDouble(); + double Scale = Parameters("SCALE" )->asDouble(); + + if( Scale == 0.0 ) + { + Error_Set(_TL("scale factor must not equal zero")); + + return( false ); } //----------------------------------------------------- switch( Parameters("TYPE")->asInt() ) { default: + Error_Set(_TL("undefined data type")); + + return( false ); + case 0: pOutput->Create(*Get_System(), SG_DATATYPE_Bit ); break; case 1: pOutput->Create(*Get_System(), SG_DATATYPE_Byte ); break; case 2: pOutput->Create(*Get_System(), SG_DATATYPE_Char ); break; @@ -149,8 +177,12 @@ case 8: pOutput->Create(*Get_System(), SG_DATATYPE_Double); break; } + pOutput->Set_Name (pInput->Get_Name ()); + pOutput->Set_Description(pInput->Get_Description()); + pOutput->Set_Unit (pInput->Get_Unit ()); + pOutput->Set_Scaling (Scale, Offset); + //----------------------------------------------------- - for(int y=0; yis_NoData(x, y) ) { - pOutput->Set_NoData(x, y); + pOutput->Set_NoData(x, y); } else { - pOutput->Set_Value(x, y, pInput->asDouble(x, y)); + pOutput->Set_Value(x, y, pInput->asDouble(x, y)); } } } //----------------------------------------------------- - if( pInput != Parameters("INPUT")->asGrid() ) + if( pOutput == Parameters("INPUT")->asGrid() ) { - delete(pInput); + DataObject_Update(pOutput); } return( true ); diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_tools/Grid_Value_Type.h saga-2.1.4+dfsg/src/modules/grid/grid_tools/Grid_Value_Type.h --- saga-2.1.0+dfsg/src/modules/grid/grid_tools/Grid_Value_Type.h 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_tools/Grid_Value_Type.h 2014-11-13 08:32:16.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Grid_Value_Type.h 1246 2011-11-25 13:42:38Z oconrad $ + * Version $Id: Grid_Value_Type.h 1921 2014-01-09 10:24:11Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// @@ -87,7 +87,7 @@ public: CGrid_Value_Type(void); - virtual CSG_String Get_MenuPath (void) { return( _TL("R:Values") ); } + virtual CSG_String Get_MenuPath (void) { return( _TL("A:Grid|Values") ); } protected: diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_tools/Makefile.am saga-2.1.4+dfsg/src/modules/grid/grid_tools/Makefile.am --- saga-2.1.0+dfsg/src/modules/grid/grid_tools/Makefile.am 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_tools/Makefile.am 2014-11-13 08:32:16.000000000 +0000 @@ -1,5 +1,5 @@ # -# $Id: Makefile.am 1383 2012-04-26 15:44:11Z oconrad $ +# $Id: Makefile.am 1844 2013-09-18 10:49:54Z oconrad $ # if DEBUG DBGFLAGS = -g -DDEBUG @@ -37,6 +37,7 @@ Grid_SortRaster.cpp\ Grid_ThresholdBuffer.cpp\ Grid_Tiling.cpp\ +Grid_Transpose.cpp\ Grid_Value_Reclassify.cpp\ Grid_Value_Replace.cpp\ Grid_Value_Replace_Interactive.cpp\ @@ -68,6 +69,7 @@ Grid_SortRaster.h\ Grid_ThresholdBuffer.h\ Grid_Tiling.h\ +Grid_Transpose.h\ Grid_Value_Reclassify.h\ Grid_Value_Replace.h\ Grid_Value_Replace_Interactive.h\ diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_tools/Makefile.in saga-2.1.4+dfsg/src/modules/grid/grid_tools/Makefile.in --- saga-2.1.0+dfsg/src/modules/grid/grid_tools/Makefile.in 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_tools/Makefile.in 2014-11-13 08:33:31.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -35,15 +79,17 @@ build_triplet = @build@ host_triplet = @host@ subdir = src/modules/grid/grid_tools -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_postgresql.m4 \ + $(top_srcdir)/m4/ax_pkg_swig.m4 \ $(top_srcdir)/m4/ax_python_devel.m4 \ $(top_srcdir)/m4/ax_swig_enable_cxx.m4 \ $(top_srcdir)/m4/ax_swig_python.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.in + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -71,6 +117,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(pkglibdir)" LTLIBRARIES = $(pkglib_LTLIBRARIES) libgrid_tools_la_DEPENDENCIES = \ @@ -83,40 +135,97 @@ Grid_InvertNoData.lo Grid_Mask.lo Grid_Merge.lo \ Grid_Orientation.lo Grid_Proximity.lo Grid_Resample.lo \ Grid_Shrink_Expand.lo Grid_SortRaster.lo \ - Grid_ThresholdBuffer.lo Grid_Tiling.lo \ + Grid_ThresholdBuffer.lo Grid_Tiling.lo Grid_Transpose.lo \ Grid_Value_Reclassify.lo Grid_Value_Replace.lo \ Grid_Value_Replace_Interactive.lo Grid_Value_Request.lo \ Grid_Value_Type.lo GridsFromTableAndGrid.lo MLB_Interface.lo libgrid_tools_la_OBJECTS = $(am_libgrid_tools_la_OBJECTS) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles am__mv = mv -f CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libgrid_tools_la_SOURCES) DIST_SOURCES = $(libgrid_tools_la_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -137,6 +246,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLELIBHARU = @DISABLELIBHARU@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -164,6 +274,7 @@ LOCAL_LIBS = @LOCAL_LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -176,8 +287,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PG_CONFIG = @PG_CONFIG@ +POSTGRESQL_CFLAGS = @POSTGRESQL_CFLAGS@ +POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@ +POSTGRESQL_VERSION = @POSTGRESQL_VERSION@ POW_LIB = @POW_LIB@ PYTHON = @PYTHON@ PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ @@ -201,6 +317,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -234,7 +351,6 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -256,7 +372,7 @@ top_srcdir = @top_srcdir@ # -# $Id: Makefile.am 1383 2012-04-26 15:44:11Z oconrad $ +# $Id: Makefile.am 1844 2013-09-18 10:49:54Z oconrad $ # @DEBUG_TRUE@DBGFLAGS = -g -DDEBUG @SAGA_UNICODE_TRUE@UC_DEFS = -D_SAGA_UNICODE @@ -290,6 +406,7 @@ Grid_SortRaster.cpp\ Grid_ThresholdBuffer.cpp\ Grid_Tiling.cpp\ +Grid_Transpose.cpp\ Grid_Value_Reclassify.cpp\ Grid_Value_Replace.cpp\ Grid_Value_Replace_Interactive.cpp\ @@ -321,6 +438,7 @@ Grid_SortRaster.h\ Grid_ThresholdBuffer.h\ Grid_Tiling.h\ +Grid_Transpose.h\ Grid_Value_Reclassify.h\ Grid_Value_Replace.h\ Grid_Value_Replace_Interactive.h\ @@ -343,9 +461,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/modules/grid/grid_tools/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/modules/grid/grid_tools/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu src/modules/grid/grid_tools/Makefile + $(AUTOMAKE) --foreign src/modules/grid/grid_tools/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -364,9 +482,9 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): + install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -374,6 +492,8 @@ else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \ } @@ -389,14 +509,17 @@ clean-pkglibLTLIBRARIES: -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES) - @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -libgrid_tools.la: $(libgrid_tools_la_OBJECTS) $(libgrid_tools_la_DEPENDENCIES) - $(CXXLINK) -rpath $(pkglibdir) $(libgrid_tools_la_OBJECTS) $(libgrid_tools_la_LIBADD) $(LIBS) + @list='$(pkglib_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + +libgrid_tools.la: $(libgrid_tools_la_OBJECTS) $(libgrid_tools_la_DEPENDENCIES) $(EXTRA_libgrid_tools_la_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) -rpath $(pkglibdir) $(libgrid_tools_la_OBJECTS) $(libgrid_tools_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -428,6 +551,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Grid_SortRaster.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Grid_ThresholdBuffer.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Grid_Tiling.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Grid_Transpose.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Grid_Value_Reclassify.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Grid_Value_Replace.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Grid_Value_Replace_Interactive.Plo@am__quote@ @@ -437,25 +561,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MLB_Interface.Plo@am__quote@ .cpp.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< .cpp.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .cpp.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -463,26 +587,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -494,15 +607,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -511,6 +620,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -562,10 +686,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -650,19 +779,20 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-pkglibLTLIBRARIES ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-pkglibLTLIBRARIES \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-pkglibLTLIBRARIES install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ + uninstall-pkglibLTLIBRARIES # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_tools/MLB_Interface.cpp saga-2.1.4+dfsg/src/modules/grid/grid_tools/MLB_Interface.cpp --- saga-2.1.0+dfsg/src/modules/grid/grid_tools/MLB_Interface.cpp 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_tools/MLB_Interface.cpp 2014-11-13 08:32:16.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: MLB_Interface.cpp 1383 2012-04-26 15:44:11Z oconrad $ + * Version $Id: MLB_Interface.cpp 2281 2014-10-09 15:49:41Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// @@ -74,7 +74,10 @@ switch( i ) { case MLB_INFO_Name: default: - return( _TL("Grid - Tools") ); + return( _TL("Tools") ); + + case MLB_INFO_Category: + return( _TL("Grid") ); case MLB_INFO_Author: return( SG_T("O. Conrad, V. Olaya, V. Wichmann (c) 2002-11") ); @@ -132,6 +135,8 @@ #include "Grid_Tiling.h" #include "Grid_Shrink_Expand.h" +#include "Grid_Transpose.h" + //--------------------------------------------------------- // 4. Allow your modules to be created here... @@ -142,7 +147,7 @@ { case 0: return( new CGrid_Resample ); case 1: return( new CGrid_Aggregate ); - case 2: return( new CGrid_Cut ); + case 2: return( new CGrid_Clip_Interactive ); case 3: return( new CGrid_Merge ); case 4: return( new CConstantGrid ); case 5: return( new CGrid_Completion ); @@ -170,9 +175,12 @@ case 27: return( new CGrid_Tiling ); case 28: return( new CGrid_Shrink_Expand ); case 29: return( new CGrid_Gaps_Resampling ); - } + case 30: return( new CGrid_Transpose ); + case 31: return( new CGrid_Clip ); - return( NULL ); + case 40: return( NULL ); + default: return( MLB_INTERFACE_SKIP_MODULE ); + } } diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_tools/MLB_Interface.h saga-2.1.4+dfsg/src/modules/grid/grid_tools/MLB_Interface.h --- saga-2.1.0+dfsg/src/modules/grid/grid_tools/MLB_Interface.h 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_tools/MLB_Interface.h 2014-11-13 08:32:16.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: MLB_Interface.h 911 2011-02-14 16:38:15Z reklov_w $ + * Version $Id: MLB_Interface.h 1922 2014-01-09 10:28:46Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_visualisation/Grid_3D_Image.cpp saga-2.1.4+dfsg/src/modules/grid/grid_visualisation/Grid_3D_Image.cpp --- saga-2.1.0+dfsg/src/modules/grid/grid_visualisation/Grid_3D_Image.cpp 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_visualisation/Grid_3D_Image.cpp 2014-11-13 08:32:15.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Grid_3D_Image.cpp 911 2011-02-14 16:38:15Z reklov_w $ + * Version $Id: Grid_3D_Image.cpp 1921 2014-01-09 10:24:11Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_visualisation/Grid_3D_Image.h saga-2.1.4+dfsg/src/modules/grid/grid_visualisation/Grid_3D_Image.h --- saga-2.1.0+dfsg/src/modules/grid/grid_visualisation/Grid_3D_Image.h 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_visualisation/Grid_3D_Image.h 2014-11-13 08:32:15.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Grid_3D_Image.h 911 2011-02-14 16:38:15Z reklov_w $ + * Version $Id: Grid_3D_Image.h 1921 2014-01-09 10:24:11Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_visualisation/Grid_Aspect_Slope_Map.cpp saga-2.1.4+dfsg/src/modules/grid/grid_visualisation/Grid_Aspect_Slope_Map.cpp --- saga-2.1.0+dfsg/src/modules/grid/grid_visualisation/Grid_Aspect_Slope_Map.cpp 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_visualisation/Grid_Aspect_Slope_Map.cpp 2014-11-13 08:32:15.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Grid_Aspect_Slope_Map.cpp 1459 2012-08-16 08:22:16Z reklov_w $ + * Version $Id: Grid_Aspect_Slope_Map.cpp 2064 2014-03-21 13:20:57Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// @@ -247,7 +247,7 @@ //----------------------------------------------------- #pragma omp parallel for - for(long n=0; n; +#include /////////////////////////////////////////////////////////// diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_visualisation/Grid_Color_Blend.cpp saga-2.1.4+dfsg/src/modules/grid/grid_visualisation/Grid_Color_Blend.cpp --- saga-2.1.0+dfsg/src/modules/grid/grid_visualisation/Grid_Color_Blend.cpp 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_visualisation/Grid_Color_Blend.cpp 2014-11-13 08:32:15.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Grid_Color_Blend.cpp 911 2011-02-14 16:38:15Z reklov_w $ + * Version $Id: Grid_Color_Blend.cpp 2208 2014-08-27 16:00:51Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// @@ -96,24 +96,49 @@ Parameters.Add_Value( NULL , "NSTEPS" , _TL("Interpolation Steps"), _TL(""), - PARAMETER_TYPE_Int , 0.0, 0.0, true + PARAMETER_TYPE_Int , 0, 0, true + ); + + Parameters.Add_Value( + NULL , "LOOP" , _TL("Loop"), + _TL(""), + PARAMETER_TYPE_Bool , true ); Parameters.Add_Choice( NULL , "RANGE" , _TL("Color Stretch"), _TL(""), - CSG_String::Format(SG_T("%s|%s|%s|%s|"), + CSG_String::Format(SG_T("%s|%s|%s|"), _TL("fit to each grid"), _TL("fit to overall range"), - _TL("fit to overall 1.5 standard deviation"), - _TL("fit to overall 2.0 standard deviation") + _TL("fit to overall standard deviation") ), 3 ); + + Parameters.Add_Value( + NULL , "STDDEV" , _TL("Standard Deviation"), + _TL(""), + PARAMETER_TYPE_Double, 2.0, 0.0, true + ); } + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + //--------------------------------------------------------- -CGrid_Color_Blend::~CGrid_Color_Blend(void) -{} +int CGrid_Color_Blend::On_Parameters_Enable(CSG_Parameters *pParameters, CSG_Parameter *pParameter) +{ + if( !SG_STR_CMP(pParameter->Get_Identifier(), "RANGE") ) + { + pParameters->Get_Parameter("STDDEV")->Set_Enabled(pParameter->asInt() == 2); + } + + return( 1 ); +} /////////////////////////////////////////////////////////// @@ -125,117 +150,132 @@ //--------------------------------------------------------- bool CGrid_Color_Blend::On_Execute(void) { - int iGrid, x, y, iStep, nSteps, Range; - double d, dStep, Value_A, Value_B, Range_Min, Range_Max; - CSG_Grid *pGrid, *pGrid_A, *pGrid_B; - CSG_Parameter_Grid_List *pGrids; - - pGrid = Parameters("GRID") ->asGrid(); - pGrids = Parameters("GRIDS") ->asGridList(); - Range = Parameters("RANGE") ->asInt(); + //----------------------------------------------------- + CSG_Parameter_Grid_List *pGrids = Parameters("GRIDS")->asGridList(); - if( pGrids->Get_Count() > 1 ) + if( pGrids->Get_Count() < 2 ) { - nSteps = Parameters("NSTEPS")->asInt(); - dStep = 1.0 / (1.0 + nSteps); - nSteps = (1 + nSteps) * (pGrids->Get_Count() - 1); - - pGrid_B = pGrids->asGrid(0); - pGrid->Assign(pGrid_B); + return( false ); + } - switch( Range ) + //----------------------------------------------------- + switch( Parameters("RANGE")->asInt() ) + { + case 0: // fit to each grid { - case 0: - Range_Min = pGrid->Get_ZMin(); - Range_Max = pGrid->Get_ZMax(); - break; + m_Range_Min = 0.0; + m_Range_Max = 0.0; + } + break; - case 1: - Range_Min = pGrid->Get_ZMin(); - Range_Max = pGrid->Get_ZMax(); + case 1: // fit to overall range + { + m_Range_Min = pGrids->asGrid(0)->Get_ZMin(); + m_Range_Max = pGrids->asGrid(0)->Get_ZMax(); - for(iGrid=1; iGridGet_Count(); iGrid++) + for(int i=1; iGet_Count(); i++) { - if( Range_Min > pGrids->asGrid(iGrid)->Get_ZMin() ) Range_Min = pGrids->asGrid(iGrid)->Get_ZMin(); - if( Range_Max < pGrids->asGrid(iGrid)->Get_ZMax() ) Range_Max = pGrids->asGrid(iGrid)->Get_ZMax(); + if( m_Range_Min > pGrids->asGrid(i)->Get_ZMin() ) m_Range_Min = pGrids->asGrid(i)->Get_ZMin(); + if( m_Range_Max < pGrids->asGrid(i)->Get_ZMax() ) m_Range_Max = pGrids->asGrid(i)->Get_ZMax(); } - break; + } + break; + + case 2: // fit to overall standard deviation + { + double StdDev = Parameters("STDDEV")->asDouble(); - case 2: - Range_Min = pGrid->Get_ArithMean() - 1.5 * pGrid->Get_StdDev(); - Range_Max = pGrid->Get_ArithMean() + 1.5 * pGrid->Get_StdDev(); + m_Range_Min = pGrids->asGrid(0)->Get_Mean() - StdDev * pGrids->asGrid(0)->Get_StdDev(); + m_Range_Max = pGrids->asGrid(0)->Get_Mean() + StdDev * pGrids->asGrid(0)->Get_StdDev(); - for(iGrid=1; iGridGet_Count(); iGrid++) + for(int i=1; iGet_Count(); i++) { - double Min = pGrids->asGrid(iGrid)->Get_ArithMean() - 1.5 * pGrids->asGrid(iGrid)->Get_StdDev(); - double Max = pGrids->asGrid(iGrid)->Get_ArithMean() + 1.5 * pGrids->asGrid(iGrid)->Get_StdDev(); + double Min = pGrids->asGrid(i)->Get_Mean() - StdDev * pGrids->asGrid(i)->Get_StdDev(); + double Max = pGrids->asGrid(i)->Get_Mean() + StdDev * pGrids->asGrid(i)->Get_StdDev(); - if( Range_Min > Min ) Range_Min = Min; - if( Range_Max < Max ) Range_Max = Max; + if( m_Range_Min > Min ) m_Range_Min = Min; + if( m_Range_Max < Max ) m_Range_Max = Max; } - break; + } + break; + } - case 3: - Range_Min = pGrid->Get_ArithMean() - 2.0 * pGrid->Get_StdDev(); - Range_Max = pGrid->Get_ArithMean() + 2.0 * pGrid->Get_StdDev(); + //----------------------------------------------------- + m_pGrid = Parameters("GRID")->asGrid(); + m_pGrid ->Set_Name(_TL("Color Blending")); + m_pGrid ->Assign(pGrids->asGrid(0)); - for(iGrid=1; iGridGet_Count(); iGrid++) - { - double Min = pGrids->asGrid(iGrid)->Get_ArithMean() - 2.0 * pGrids->asGrid(iGrid)->Get_StdDev(); - double Max = pGrids->asGrid(iGrid)->Get_ArithMean() + 2.0 * pGrids->asGrid(iGrid)->Get_StdDev(); + DataObject_Update(m_pGrid, SG_UI_DATAOBJECT_SHOW); - if( Range_Min > Min ) Range_Min = Min; - if( Range_Max < Max ) Range_Max = Max; - } - break; + do + { + for(int i=1; iGet_Count() && Set_Progress(i, pGrids->Get_Count() - 1); i++) + { + Blend(pGrids->asGrid(i - 1), pGrids->asGrid(i)); } - DataObject_Update(pGrid, Range_Min, Range_Max, SG_UI_DATAOBJECT_SHOW); - - for(iGrid=1, iStep=1; iGridGet_Count() && Set_Progress(iStep, nSteps); iGrid++, iStep++) + if( Parameters("LOOP")->asBool() && Process_Get_Okay() ) { - pGrid_A = pGrid_B; - pGrid_B = pGrids->asGrid(iGrid); + Blend(pGrids->asGrid(pGrids->Get_Count() - 1), pGrids->asGrid(0)); + } + } + while( Parameters("LOOP")->asBool() && Process_Get_Okay() ); - for(d=dStep; d<1.0 && Set_Progress(iStep, nSteps); d+=dStep, iStep++) - { - for(y=0; yasDouble(x, y); - Value_B = pGrid_B->asDouble(x, y); - - pGrid->Set_Value(x, y, Value_A + d * (Value_B - Value_A) ); - } - } - - if( Range == 0 ) - { - DataObject_Update(pGrid); - } - else - { - DataObject_Update(pGrid, Range_Min, Range_Max); - } - } + //----------------------------------------------------- + return( true ); +} - pGrid->Assign(pGrid_B); - if( Range == 0 ) - { - DataObject_Update(pGrid); - } - else +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +void CGrid_Color_Blend::Blend(CSG_Grid *pA, CSG_Grid *pB) +{ + int nSteps = 1 + Parameters("NSTEPS")->asInt(); + + for(int i=1; iasDouble(x, y); + double b = pB->asDouble(x, y); + + m_pGrid->Set_Value(x, y, a + d * (b - a)); } } - return( true ); + if( m_Range_Min < m_Range_Max ) + { + DataObject_Update(m_pGrid, m_Range_Min, m_Range_Max); + } + else + { + DataObject_Update(m_pGrid); + } } - return( false ); + //----------------------------------------------------- + SG_UI_Progress_Lock(true); + m_pGrid->Assign(pB); + SG_UI_Progress_Lock(false); + + if( m_Range_Min < m_Range_Max ) + { + DataObject_Update(m_pGrid, m_Range_Min, m_Range_Max); + } + else + { + DataObject_Update(m_pGrid); + } } diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_visualisation/Grid_Color_Blend.h saga-2.1.4+dfsg/src/modules/grid/grid_visualisation/Grid_Color_Blend.h --- saga-2.1.0+dfsg/src/modules/grid/grid_visualisation/Grid_Color_Blend.h 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_visualisation/Grid_Color_Blend.h 2014-11-13 08:32:15.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Grid_Color_Blend.h 911 2011-02-14 16:38:15Z reklov_w $ + * Version $Id: Grid_Color_Blend.h 2157 2014-06-12 09:30:10Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// @@ -65,21 +65,55 @@ #define HEADER_INCLUDED__Grid_Color_Blend_H +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + //--------------------------------------------------------- #include "MLB_Interface.h" + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + //--------------------------------------------------------- class CGrid_Color_Blend : public CSG_Module_Grid { public: CGrid_Color_Blend(void); - virtual ~CGrid_Color_Blend(void); + + virtual bool needs_GUI (void) { return( true ); } protected: - virtual bool On_Execute(void); + virtual int On_Parameters_Enable (CSG_Parameters *pParameters, CSG_Parameter *pParameter); + + virtual bool On_Execute (void); + + +private: + + double m_Range_Min, m_Range_Max; + + CSG_Grid *m_pGrid; + + + void Blend (CSG_Grid *pA, CSG_Grid *pB); }; + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- #endif // #ifndef HEADER_INCLUDED__Grid_Color_Blend_H diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_visualisation/Grid_Color_Rotate.cpp saga-2.1.4+dfsg/src/modules/grid/grid_visualisation/Grid_Color_Rotate.cpp --- saga-2.1.0+dfsg/src/modules/grid/grid_visualisation/Grid_Color_Rotate.cpp 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_visualisation/Grid_Color_Rotate.cpp 2014-11-13 08:32:15.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Grid_Color_Rotate.cpp 911 2011-02-14 16:38:15Z reklov_w $ + * Version $Id: Grid_Color_Rotate.cpp 2157 2014-06-12 09:30:10Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// @@ -87,10 +87,6 @@ } -//--------------------------------------------------------- -CGrid_Color_Rotate::~CGrid_Color_Rotate(void) -{} - /////////////////////////////////////////////////////////// // // diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_visualisation/Grid_Color_Rotate.h saga-2.1.4+dfsg/src/modules/grid/grid_visualisation/Grid_Color_Rotate.h --- saga-2.1.0+dfsg/src/modules/grid/grid_visualisation/Grid_Color_Rotate.h 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_visualisation/Grid_Color_Rotate.h 2014-11-13 08:32:15.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Grid_Color_Rotate.h 911 2011-02-14 16:38:15Z reklov_w $ + * Version $Id: Grid_Color_Rotate.h 2157 2014-06-12 09:30:10Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// @@ -73,7 +73,8 @@ { public: CGrid_Color_Rotate(void); - virtual ~CGrid_Color_Rotate(void); + + virtual bool needs_GUI (void) { return( true ); } protected: diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_visualisation/Grid_Colors_Fit.cpp saga-2.1.4+dfsg/src/modules/grid/grid_visualisation/Grid_Colors_Fit.cpp --- saga-2.1.0+dfsg/src/modules/grid/grid_visualisation/Grid_Colors_Fit.cpp 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_visualisation/Grid_Colors_Fit.cpp 2014-11-13 08:32:15.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Grid_Colors_Fit.cpp 911 2011-02-14 16:38:15Z reklov_w $ + * Version $Id: Grid_Colors_Fit.cpp 2208 2014-08-27 16:00:51Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// @@ -110,10 +110,6 @@ ); } -//--------------------------------------------------------- -CGrid_Colors_Fit::~CGrid_Colors_Fit(void) -{} - /////////////////////////////////////////////////////////// // // @@ -160,7 +156,7 @@ { bZ = aZ; bC = aC; - aZ = (pGrid->Get_Percentile(100.0 - iColor * dColor, false) - zMin) / zRange; + aZ = (pGrid->Get_Percentile(iColor * dColor) - zMin) / zRange; aC = Colors_Old.Get_Color(iColor); _Set_Colors(Colors_New, bZ, bC, aZ, aC); } diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_visualisation/Grid_Colors_Fit.h saga-2.1.4+dfsg/src/modules/grid/grid_visualisation/Grid_Colors_Fit.h --- saga-2.1.0+dfsg/src/modules/grid/grid_visualisation/Grid_Colors_Fit.h 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_visualisation/Grid_Colors_Fit.h 2014-11-13 08:32:15.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Grid_Colors_Fit.h 911 2011-02-14 16:38:15Z reklov_w $ + * Version $Id: Grid_Colors_Fit.h 2157 2014-06-12 09:30:10Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// @@ -86,7 +86,8 @@ { public: CGrid_Colors_Fit(void); - virtual ~CGrid_Colors_Fit(void); + + virtual bool needs_GUI (void) { return( true ); } protected: diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_visualisation/Grid_Color_Triangle.cpp saga-2.1.4+dfsg/src/modules/grid/grid_visualisation/Grid_Color_Triangle.cpp --- saga-2.1.0+dfsg/src/modules/grid/grid_visualisation/Grid_Color_Triangle.cpp 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_visualisation/Grid_Color_Triangle.cpp 2014-11-13 08:32:15.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Grid_Color_Triangle.cpp 911 2011-02-14 16:38:15Z reklov_w $ + * Version $Id: Grid_Color_Triangle.cpp 2208 2014-08-27 16:00:51Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// @@ -324,7 +324,7 @@ if( pGrid ) { int x, y; - long n; + sLong n; switch( Method ) { @@ -347,10 +347,10 @@ break; case 3: // Normalise - n = (long)(pGrid->Get_NCells() * pPerctl->Get_LoVal() / 100.0); + n = (sLong)(pGrid->Get_NCells() * pPerctl->Get_LoVal() / 100.0); pGrid->Get_Sorted(n < 0 ? 0 : (n >= pGrid->Get_NCells() ? pGrid->Get_NCells() - 1 : n), x, y, false, false); Min = pGrid->asDouble(x, y); - n = (long)(pGrid->Get_NCells() * pPerctl->Get_HiVal() / 100.0); + n = (sLong)(pGrid->Get_NCells() * pPerctl->Get_HiVal() / 100.0); pGrid->Get_Sorted(n < 0 ? 0 : (n >= pGrid->Get_NCells() ? pGrid->Get_NCells() - 1 : n), x, y, false, false); Range = pGrid->asDouble(x, y) - Min; Range = Range > 0.0 ? 1.0 / Range : 0.0; @@ -358,7 +358,7 @@ case 4: // Standard deviation Range = sqrt(pGrid->Get_Variance()) * Percent / 100.0; - Min = pGrid->Get_ArithMean() - Range; + Min = pGrid->Get_Mean() - Range; Range = Range * 2.0; Range = Range > 0.0 ? 1.0 / Range : 0.0; break; diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_visualisation/Grid_Color_Triangle.h saga-2.1.4+dfsg/src/modules/grid/grid_visualisation/Grid_Color_Triangle.h --- saga-2.1.0+dfsg/src/modules/grid/grid_visualisation/Grid_Color_Triangle.h 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_visualisation/Grid_Color_Triangle.h 2014-11-13 08:32:15.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Grid_Color_Triangle.h 911 2011-02-14 16:38:15Z reklov_w $ + * Version $Id: Grid_Color_Triangle.h 1921 2014-01-09 10:24:11Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_visualisation/Grid_Histogram_Surface.cpp saga-2.1.4+dfsg/src/modules/grid/grid_visualisation/Grid_Histogram_Surface.cpp --- saga-2.1.0+dfsg/src/modules/grid/grid_visualisation/Grid_Histogram_Surface.cpp 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_visualisation/Grid_Histogram_Surface.cpp 2014-11-13 08:32:15.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Grid_Histogram_Surface.cpp 911 2011-02-14 16:38:15Z reklov_w $ + * Version $Id: Grid_Histogram_Surface.cpp 2245 2014-09-23 16:24:02Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// @@ -195,30 +195,36 @@ //--------------------------------------------------------- bool CGrid_Histogram_Surface::Get_Circle(void) { - long i; - int n; - double r; - CSG_Grid *pHist; + //----------------------------------------------------- + double r = sqrt(m_pGrid->Get_NCells() / M_PI); + int n = 1 + (int)(2.0 * r); - r = sqrt(m_pGrid->Get_NCells() / M_PI); - n = 1 + (int)(2.0 * r); + CSG_Grid *pHist = SG_Create_Grid(m_pGrid->Get_Type(), n, n, m_pGrid->Get_Cellsize(), + -r * m_pGrid->Get_Cellsize(), + -r * m_pGrid->Get_Cellsize() + ); - //----------------------------------------------------- - Parameters("HIST")->Set_Value(pHist = SG_Create_Grid(m_pGrid->Get_Type(), n, n, m_pGrid->Get_Cellsize(), -r * m_pGrid->Get_Cellsize(), -r * m_pGrid->Get_Cellsize())); + Parameters("HIST")->Set_Value(pHist); pHist->Set_NoData_Value_Range( m_pGrid->Get_NoData_Value(), m_pGrid->Get_NoData_hiValue() ); + if( !m_pGrid->Set_Index() ) + { + return( false ); + } + //----------------------------------------------------- for(int y=0; yGet_Sorted((long)(d*d*M_PI), i) ) + if( d < r && m_pGrid->Get_Sorted((sLong)(d*d*M_PI), i) ) { pHist->Set_Value(x, y, m_pGrid->asDouble(i)); } diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_visualisation/Grid_Histogram_Surface.h saga-2.1.4+dfsg/src/modules/grid/grid_visualisation/Grid_Histogram_Surface.h --- saga-2.1.0+dfsg/src/modules/grid/grid_visualisation/Grid_Histogram_Surface.h 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_visualisation/Grid_Histogram_Surface.h 2014-11-13 08:32:15.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Grid_Histogram_Surface.h 911 2011-02-14 16:38:15Z reklov_w $ + * Version $Id: Grid_Histogram_Surface.h 1921 2014-01-09 10:24:11Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_visualisation/Grid_RGB_Composite.cpp saga-2.1.4+dfsg/src/modules/grid/grid_visualisation/Grid_RGB_Composite.cpp --- saga-2.1.0+dfsg/src/modules/grid/grid_visualisation/Grid_RGB_Composite.cpp 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_visualisation/Grid_RGB_Composite.cpp 2014-11-13 08:32:15.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Grid_RGB_Composite.cpp 1228 2011-11-18 11:14:21Z reklov_w $ + * Version $Id: Grid_RGB_Composite.cpp 2208 2014-08-27 16:00:51Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// @@ -71,256 +71,191 @@ /////////////////////////////////////////////////////////// //--------------------------------------------------------- +#define METHOD_STRING CSG_String::Format(SG_T("%s|%s|%s|%s|%s|"),\ + _TL("take original value (0 - 255)"),\ + _TL("rescale to 0 - 255"),\ + _TL("user defined"),\ + _TL("percentiles"),\ + _TL("standard deviation")\ +), 4 + +//--------------------------------------------------------- CGrid_RGB_Composite::CGrid_RGB_Composite(void) { - CSG_Parameter *pNode; - + //----------------------------------------------------- Set_Name (_TL("RGB Composite")); - Set_Author (SG_T("(c) 2002 by O.Conrad")); + Set_Author ("O.Conrad (c) 2002"); Set_Description (_TW( "Create red-green-blue overlays of grids. " )); //----------------------------------------------------- - pNode = NULL; - - pNode = Parameters.Add_Grid( - pNode , "GRID_R" , _TL("Red"), - _TL(""), - PARAMETER_INPUT - ); - - Parameters.Add_Choice( - pNode , "R_METHOD" , _TL("Value Preparation"), - _TL(""), - - CSG_String::Format(SG_T("%s|%s|%s|%s|%s|"), - _TL("0 - 255"), - _TL("Rescale to 0 - 255"), - _TL("User defined rescale"), - _TL("Percentiles"), - _TL("Percentage of standard deviation") - ), 4 - ); - - Parameters.Add_Range( - pNode , "R_RANGE" , _TL("Rescale Range"), - _TL(""), - 0, 255 - ); - - Parameters.Add_Range( - pNode , "R_PERCTL" , _TL("Percentiles"), - _TL(""), - 1.0, 99.0, 0.0, true, 100.0, true - ); - - Parameters.Add_Value( - pNode , "R_PERCENT" , _TL("Percentage of standard deviation"), - _TL(""), - PARAMETER_TYPE_Double , 150.0, 0.0, true - ); - - //----------------------------------------------------- - pNode = NULL; - - pNode = Parameters.Add_Grid( - pNode , "GRID_G" , _TL("Green"), - _TL(""), - PARAMETER_INPUT - ); - - Parameters.Add_Choice( - pNode , "G_METHOD" , _TL("Value Preparation"), - _TL(""), - - CSG_String::Format(SG_T("%s|%s|%s|%s|%s|"), - _TL("0 - 255"), - _TL("Rescale to 0 - 255"), - _TL("User defined rescale"), - _TL("Percentiles"), - _TL("Percentage of standard deviation") - ), 4 - ); - - Parameters.Add_Range( - pNode , "G_RANGE" , _TL("Rescale Range"), - _TL(""), - 0, 255 - ); + CSG_Parameter *pNode; - Parameters.Add_Range( - pNode , "G_PERCTL" , _TL("Percentiles"), - _TL(""), - 1.0, 99.0, 0.0, true, 100.0, true - ); - - Parameters.Add_Value( - pNode , "G_PERCENT" , _TL("Percentage of standard deviation"), - _TL(""), - PARAMETER_TYPE_Double , 150.0, 0.0, true - ); + pNode = + Parameters.Add_Grid (NULL , "R_GRID" , _TL("Red" ), _TL(""), PARAMETER_INPUT); + pNode = + Parameters.Add_Choice(pNode, "R_METHOD", _TL("Value Preparation" ), _TL(""), METHOD_STRING); + Parameters.Add_Range (pNode, "R_RANGE" , _TL("Rescale Range" ), _TL(""), 0, 255); + Parameters.Add_Range (pNode, "R_PERCTL", _TL("Percentiles" ), _TL(""), 1.0, 99.0, 0.0, true, 100.0, true); + Parameters.Add_Value (pNode, "R_STDDEV", _TL("Standard Deviation"), _TL(""), PARAMETER_TYPE_Double, 2.0, 0.0, true); + + pNode = + Parameters.Add_Grid (NULL , "G_GRID" , _TL("Green" ), _TL(""), PARAMETER_INPUT); + pNode = + Parameters.Add_Choice(pNode, "G_METHOD", _TL("Value Preparation" ), _TL(""), METHOD_STRING); + Parameters.Add_Range (pNode, "G_RANGE" , _TL("Rescale Range" ), _TL(""), 0, 255); + Parameters.Add_Range (pNode, "G_PERCTL", _TL("Percentiles" ), _TL(""), 1.0, 99.0, 0.0, true, 100.0, true); + Parameters.Add_Value (pNode, "G_STDDEV", _TL("Standard Deviation"), _TL(""), PARAMETER_TYPE_Double, 2.0, 0.0, true); + + pNode = + Parameters.Add_Grid (NULL , "B_GRID" , _TL("Blue" ), _TL(""), PARAMETER_INPUT); + pNode = + Parameters.Add_Choice(pNode, "B_METHOD", _TL("Value Preparation" ), _TL(""), METHOD_STRING); + Parameters.Add_Range (pNode, "B_RANGE" , _TL("Rescale Range" ), _TL(""), 0, 255); + Parameters.Add_Range (pNode, "B_PERCTL", _TL("Percentiles" ), _TL(""), 1.0, 99.0, 0.0, true, 100.0, true); + Parameters.Add_Value (pNode, "B_STDDEV", _TL("Standard Deviation"), _TL(""), PARAMETER_TYPE_Double, 2.0, 0.0, true); + + pNode = + Parameters.Add_Grid (NULL , "A_GRID" , _TL("Alpha" ), _TL(""), PARAMETER_INPUT_OPTIONAL); + pNode = + Parameters.Add_Choice(pNode, "A_METHOD", _TL("Value Preparation" ), _TL(""), METHOD_STRING); + Parameters.Add_Range (pNode, "A_RANGE" , _TL("Rescale Range" ), _TL(""), 0, 255); + Parameters.Add_Range (pNode, "A_PERCTL", _TL("Percentiles" ), _TL(""), 1.0, 99.0, 0.0, true, 100.0, true); + Parameters.Add_Value (pNode, "A_STDDEV", _TL("Standard Deviation"), _TL(""), PARAMETER_TYPE_Double, 2.0, 0.0, true); //----------------------------------------------------- - pNode = NULL; - - pNode = Parameters.Add_Grid( - pNode , "GRID_B" , _TL("Blue"), - _TL(""), - PARAMETER_INPUT - ); - - Parameters.Add_Choice( - pNode , "B_METHOD" , _TL("Value Preparation"), + Parameters.Add_Grid( + NULL , "RGB" , _TL("Composite"), _TL(""), - - CSG_String::Format(SG_T("%s|%s|%s|%s|%s|"), - _TL("0 - 255"), - _TL("Rescale to 0 - 255"), - _TL("User defined rescale"), - _TL("Percentiles"), - _TL("Percentage of standard deviation") - ), 4 + PARAMETER_OUTPUT, true, SG_DATATYPE_Int ); +} - Parameters.Add_Range( - pNode , "B_RANGE" , _TL("Rescale Range"), - _TL(""), - 0, 255 - ); - Parameters.Add_Range( - pNode , "B_PERCTL" , _TL("Percentiles"), - _TL(""), - 1.0, 99.0, 0.0, true, 100.0, true - ); +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// - Parameters.Add_Value( - pNode , "B_PERCENT" , _TL("Percentage of standard deviation"), - _TL(""), - PARAMETER_TYPE_Double , 150.0, 0.0, true - ); +//--------------------------------------------------------- +int CGrid_RGB_Composite::On_Parameters_Enable(CSG_Parameters *pParameters, CSG_Parameter *pParameter) +{ + if( !SG_STR_CMP(pParameter->Get_Identifier(), "R_GRID") ) + { + pParameters->Set_Enabled("R_METHOD", pParameter->asGrid() != NULL); + } - //----------------------------------------------------- - pNode = NULL; + if( !SG_STR_CMP(pParameter->Get_Identifier(), "R_METHOD") ) + { + pParameters->Set_Enabled("R_RANGE" , pParameter->asInt() == 2); // User defined rescale + pParameters->Set_Enabled("R_PERCTL", pParameter->asInt() == 3); // Percentiles + pParameters->Set_Enabled("R_STDDEV", pParameter->asInt() == 4); // Percentage of standard deviation + } - pNode = Parameters.Add_Grid( - pNode , "GRID_A" , _TL("Transparency"), - _TL(""), - PARAMETER_INPUT_OPTIONAL - ); + if( !SG_STR_CMP(pParameter->Get_Identifier(), "G_GRID") ) + { + pParameters->Set_Enabled("G_METHOD", pParameter->asGrid() != NULL); + } - Parameters.Add_Choice( - pNode , "A_METHOD" , _TL("Value Preparation"), - _TL(""), + if( !SG_STR_CMP(pParameter->Get_Identifier(), "G_METHOD") ) + { + pParameters->Set_Enabled("G_RANGE" , pParameter->asInt() == 2); // User defined rescale + pParameters->Set_Enabled("G_PERCTL", pParameter->asInt() == 3); // Percentiles + pParameters->Set_Enabled("G_STDDEV", pParameter->asInt() == 4); // Percentage of standard deviation + } - CSG_String::Format(SG_T("%s|%s|%s|%s|%s|"), - _TL("0 - 255"), - _TL("Rescale to 0 - 255"), - _TL("User defined rescale"), - _TL("Percentiles"), - _TL("Percentage of standard deviation") - ), 4 - ); + if( !SG_STR_CMP(pParameter->Get_Identifier(), "B_GRID") ) + { + pParameters->Set_Enabled("B_METHOD", pParameter->asGrid() != NULL); + } - Parameters.Add_Range( - pNode , "A_RANGE" , _TL("Rescale Range"), - _TL(""), - 0, 255 - ); + if( !SG_STR_CMP(pParameter->Get_Identifier(), "B_METHOD") ) + { + pParameters->Set_Enabled("B_RANGE" , pParameter->asInt() == 2); // User defined rescale + pParameters->Set_Enabled("B_PERCTL", pParameter->asInt() == 3); // Percentiles + pParameters->Set_Enabled("B_STDDEV", pParameter->asInt() == 4); // Percentage of standard deviation + } - Parameters.Add_Range( - pNode , "A_PERCTL" , _TL("Percentiles"), - _TL(""), - 1.0, 99.0, 0.0, true, 100.0, true - ); + if( !SG_STR_CMP(pParameter->Get_Identifier(), "A_GRID") ) + { + pParameters->Set_Enabled("A_METHOD", pParameter->asGrid() != NULL); + } - Parameters.Add_Value( - pNode , "A_PERCENT" , _TL("Percentage of standard deviation"), - _TL(""), - PARAMETER_TYPE_Double , 150.0, 0.0, true - ); + if( !SG_STR_CMP(pParameter->Get_Identifier(), "A_METHOD") ) + { + pParameters->Set_Enabled("A_RANGE" , pParameter->asInt() == 2); // User defined rescale + pParameters->Set_Enabled("A_PERCTL", pParameter->asInt() == 3); // Percentiles + pParameters->Set_Enabled("A_STDDEV", pParameter->asInt() == 4); // Percentage of standard deviation + } - //----------------------------------------------------- - Parameters.Add_Grid( - NULL , "GRID_RGB" , _TL("Composite"), - _TL(""), - PARAMETER_OUTPUT, true, SG_DATATYPE_Int - ); + return( 1 ); } -//--------------------------------------------------------- -CGrid_RGB_Composite::~CGrid_RGB_Composite(void) -{} - /////////////////////////////////////////////////////////// // // -// // -// // /////////////////////////////////////////////////////////// //--------------------------------------------------------- bool CGrid_RGB_Composite::On_Execute(void) { - int x, y, r, g, b, a; - double rMin, gMin, bMin, aMin, rRange, gRange, bRange, aRange; - CSG_Grid *pR, *pG, *pB, *pA, *pRGB; + double rMin, rRange, gMin, gRange, bMin, bRange, aMin, aRange; //----------------------------------------------------- - pR = _Get_Grid(Parameters("GRID_R")->asGrid(), Parameters("R_METHOD")->asInt(), Parameters("R_RANGE")->asRange(), Parameters("R_PERCTL")->asRange(), Parameters("R_PERCENT")->asDouble(), rMin, rRange); - pG = _Get_Grid(Parameters("GRID_G")->asGrid(), Parameters("G_METHOD")->asInt(), Parameters("G_RANGE")->asRange(), Parameters("G_PERCTL")->asRange(), Parameters("G_PERCENT")->asDouble(), gMin, gRange); - pB = _Get_Grid(Parameters("GRID_B")->asGrid(), Parameters("B_METHOD")->asInt(), Parameters("B_RANGE")->asRange(), Parameters("B_PERCTL")->asRange(), Parameters("B_PERCENT")->asDouble(), bMin, bRange); - pA = _Get_Grid(Parameters("GRID_A")->asGrid(), Parameters("A_METHOD")->asInt(), Parameters("A_RANGE")->asRange(), Parameters("A_PERCTL")->asRange(), Parameters("A_PERCENT")->asDouble(), aMin, aRange); + CSG_Grid *pR = _Get_Grid(Parameters("R_GRID")->asGrid(), Parameters("R_METHOD")->asInt(), Parameters("R_RANGE")->asRange(), Parameters("R_PERCTL")->asRange(), Parameters("R_STDDEV")->asDouble(), rMin, rRange); + CSG_Grid *pG = _Get_Grid(Parameters("G_GRID")->asGrid(), Parameters("G_METHOD")->asInt(), Parameters("G_RANGE")->asRange(), Parameters("G_PERCTL")->asRange(), Parameters("G_STDDEV")->asDouble(), gMin, gRange); + CSG_Grid *pB = _Get_Grid(Parameters("B_GRID")->asGrid(), Parameters("B_METHOD")->asInt(), Parameters("B_RANGE")->asRange(), Parameters("B_PERCTL")->asRange(), Parameters("B_STDDEV")->asDouble(), bMin, bRange); + CSG_Grid *pA = _Get_Grid(Parameters("A_GRID")->asGrid(), Parameters("A_METHOD")->asInt(), Parameters("A_RANGE")->asRange(), Parameters("A_PERCTL")->asRange(), Parameters("A_STDDEV")->asDouble(), aMin, aRange); //----------------------------------------------------- - pRGB = Parameters("GRID_RGB")->asGrid(); - CSG_String n = pRGB->Get_Name(); + CSG_Grid *pRGB = Parameters("RGB")->asGrid(); + pRGB->Create(pRGB->Get_System(), SG_DATATYPE_Int); - pRGB->Set_Name(n); - DataObject_Set_Colors(pRGB, 100, SG_COLORS_BLACK_WHITE); + pRGB->Set_Name(_TL("Composite")); - CSG_Parameters Parms; + CSG_String s; - if( DataObject_Get_Parameters(pRGB, Parms) && Parms("COLORS_TYPE") ) - { - Parms("COLORS_TYPE")->Set_Value(3); // Color Classification Type: RGB + s += CSG_String(_TL("Red" )) + ": " + pR->Get_Name() + "\n"; + s += CSG_String(_TL("Green")) + ": " + pG->Get_Name() + "\n"; + s += CSG_String(_TL("Blue" )) + ": " + pB->Get_Name() + "\n"; - DataObject_Set_Parameters(pRGB, Parms); + if( pA ) + { + s += CSG_String(_TL("Alpha")) + ": " + pA->Get_Name() + "\n"; } + pRGB->Set_Description(s); + + DataObject_Set_Colors (pRGB, 100, SG_COLORS_BLACK_WHITE); + DataObject_Set_Parameter(pRGB, "COLORS_TYPE", 6); // Color Classification Type: RGB + //----------------------------------------------------- - for(y=0; yis_NoData(x, y) || pG->is_NoData(x, y) || pB->is_NoData(x, y) ) + if( pR->is_NoData(x, y) || pG->is_NoData(x, y) || pB->is_NoData(x, y) || (pA && pA->is_NoData(x, y)) ) { pRGB->Set_NoData(x, y); } else { - r = (int)(rRange * (pR->asDouble(x, y) - rMin)); - if( r > 255 ) r = 255; else if( r < 0 ) r = 0; - - g = (int)(gRange * (pG->asDouble(x, y) - gMin)); - if( g > 255 ) g = 255; else if( g < 0 ) g = 0; - - b = (int)(bRange * (pB->asDouble(x, y) - bMin)); - if( b > 255 ) b = 255; else if( b < 0 ) b = 0; + int r = (int)(rRange * (pR->asDouble(x, y) - rMin)); if( r > 255 ) r = 255; else if( r < 0 ) r = 0; + int g = (int)(gRange * (pG->asDouble(x, y) - gMin)); if( g > 255 ) g = 255; else if( g < 0 ) g = 0; + int b = (int)(bRange * (pB->asDouble(x, y) - bMin)); if( b > 255 ) b = 255; else if( b < 0 ) b = 0; if( pA ) { - a = (int)(aRange * (pA->asDouble(x, y) - aMin)); - if( a > 255 ) a = 255; else if( a < 0 ) a = 0; + int a = (int)(aRange * (pA->asDouble(x, y) - aMin)); if( a > 255 ) a = 255; else if( a < 0 ) a = 0; pRGB->Set_Value(x, y, SG_GET_RGBA(r, g, b, a)); } else { - pRGB->Set_Value(x, y, SG_GET_RGB(r, g, b)); + pRGB->Set_Value(x, y, SG_GET_RGB (r, g, b)); } } } @@ -332,61 +267,155 @@ /////////////////////////////////////////////////////////// // // -// // -// // /////////////////////////////////////////////////////////// //--------------------------------------------------------- -CSG_Grid * CGrid_RGB_Composite::_Get_Grid(CSG_Grid *pGrid, int Method, CSG_Parameter_Range *pRange, CSG_Parameter_Range *pPerctl, double Percent, double &Min, double &Range) +CSG_Grid * CGrid_RGB_Composite::_Get_Grid(CSG_Grid *pGrid, int Method, CSG_Parameter_Range *pRange, CSG_Parameter_Range *pPerctl, double StdDev, double &Min, double &Range) { if( pGrid ) { - int x, y; - long n; - switch( Method ) { default: case 0: // 0 - 255 - Min = 0.0; - Range = 1.0; + Min = 0.0; + Range = 255.0; break; case 1: // Rescale to 0 - 255 Min = pGrid->Get_ZMin(); Range = pGrid->Get_ZRange(); - Range = Range > 0.0 ? 255.0 / Range : 0.0; break; case 2: // User defined rescale Min = pRange->Get_LoVal(); - Range = pRange->Get_HiVal() - pRange->Get_LoVal(); - Range = Range > 0.0 ? 255.0 / Range : 0.0; + Range = pRange->Get_HiVal() - Min; break; - case 3: // Normalise - n = (long)(pGrid->Get_NCells() * pPerctl->Get_LoVal() / 100.0); - pGrid->Get_Sorted(n < 0 ? 0 : (n >= pGrid->Get_NCells() ? pGrid->Get_NCells() - 1 : n), x, y, false, false); - Min = pGrid->asDouble(x, y); - n = (long)(pGrid->Get_NCells() * pPerctl->Get_HiVal() / 100.0); - pGrid->Get_Sorted(n < 0 ? 0 : (n >= pGrid->Get_NCells() ? pGrid->Get_NCells() - 1 : n), x, y, false, false); - Range = pGrid->asDouble(x, y) - Min; - Range = Range > 0.0 ? 255.0 / Range : 0.0; + case 3: // Percentile + Min = pGrid->Get_Percentile(pPerctl->Get_LoVal()); + Range = pGrid->Get_Percentile(pPerctl->Get_HiVal()) - Min; break; case 4: // Standard deviation - Range = sqrt(pGrid->Get_Variance()) * Percent / 100.0; - Min = pGrid->Get_ArithMean() - Range; - Range = Range * 2.0; - Range = Range > 0.0 ? 255.0 / Range : 0.0; + Min = pGrid->Get_Mean() - StdDev * pGrid->Get_StdDev(); + Range = 2.0 * StdDev * pGrid->Get_StdDev(); break; } + + Range = Range > 0.0 ? 255.0 / Range : 0.0; } return( pGrid ); } +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +CGrid_RGB_Split::CGrid_RGB_Split(void) +{ + //----------------------------------------------------- + Set_Name (_TL("Split RGB Composite")); + + Set_Author ("O.Conrad (c) 2014"); + + Set_Description (_TW( + "Split red-green-blue channels of an rgb coded grid. " + )); + + //----------------------------------------------------- + Parameters.Add_Grid( + NULL , "RGB" , _TL("RGB Composite"), + _TL(""), + PARAMETER_INPUT + ); + + Parameters.Add_Grid( + NULL , "R" , _TL("Red"), + _TL(""), + PARAMETER_OUTPUT, true, SG_DATATYPE_Byte + ); + + Parameters.Add_Grid( + NULL , "G" , _TL("Green"), + _TL(""), + PARAMETER_OUTPUT, true, SG_DATATYPE_Byte + ); + + Parameters.Add_Grid( + NULL , "B" , _TL("Blue"), + _TL(""), + PARAMETER_OUTPUT, true, SG_DATATYPE_Byte + ); + + Parameters.Add_Grid( + NULL , "A" , _TL("Alpha"), + _TL(""), + PARAMETER_OUTPUT_OPTIONAL, true, SG_DATATYPE_Byte + ); + + Parameters.Add_Value( + NULL , "NODATA" , _TL("Ignore No Data"), + _TL(""), + PARAMETER_TYPE_Bool, true + ); +} + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CGrid_RGB_Split::On_Execute(void) +{ + CSG_Grid *pRGB = Parameters("RGB")->asGrid(); + + if( SG_Data_Type_Get_Size(pRGB->Get_Type()) < 4 ) + { + Message_Add(_TL("warning, input uses less than 4 bytes per value")); + } + + bool bNoData = Parameters("NODATA")->asBool(); + + CSG_Grid *pR = Parameters("R")->asGrid(); if( bNoData && pR ) pR->Set_NoData_Value(-1); + CSG_Grid *pG = Parameters("G")->asGrid(); if( bNoData && pG ) pG->Set_NoData_Value(-1); + CSG_Grid *pB = Parameters("B")->asGrid(); if( bNoData && pB ) pB->Set_NoData_Value(-1); + CSG_Grid *pA = Parameters("A")->asGrid(); if( bNoData && pA ) pA->Set_NoData_Value(-1); + + for(int y=0; yis_NoData(x, y) ) + { + int RGB = pRGB->asInt(x, y); + + if( pR ) pR->Set_Value(x, y, SG_GET_R(RGB)); + if( pG ) pG->Set_Value(x, y, SG_GET_G(RGB)); + if( pB ) pB->Set_Value(x, y, SG_GET_B(RGB)); + if( pA ) pA->Set_Value(x, y, SG_GET_A(RGB)); + } + else + { + if( pR ) pR->Set_NoData(x, y); + if( pG ) pG->Set_NoData(x, y); + if( pB ) pB->Set_NoData(x, y); + if( pA ) pA->Set_NoData(x, y); + } + } + } + + return( true ); +} + + /////////////////////////////////////////////////////////// // // // // diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_visualisation/Grid_RGB_Composite.h saga-2.1.4+dfsg/src/modules/grid/grid_visualisation/Grid_RGB_Composite.h --- saga-2.1.0+dfsg/src/modules/grid/grid_visualisation/Grid_RGB_Composite.h 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_visualisation/Grid_RGB_Composite.h 2014-11-13 08:32:15.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: Grid_RGB_Composite.h 911 2011-02-14 16:38:15Z reklov_w $ + * Version $Id: Grid_RGB_Composite.h 2155 2014-06-11 14:00:23Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// @@ -65,26 +65,69 @@ #define HEADER_INCLUDED__Grid_RGB_Composite_H +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + //--------------------------------------------------------- #include "MLB_Interface.h" + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + //--------------------------------------------------------- class CGrid_RGB_Composite : public CSG_Module_Grid { public: CGrid_RGB_Composite(void); - virtual ~CGrid_RGB_Composite(void); protected: - virtual bool On_Execute(void); + virtual int On_Parameters_Enable (CSG_Parameters *pParameters, CSG_Parameter *pParameter); + + virtual bool On_Execute (void); private: - CSG_Grid * _Get_Grid (CSG_Grid *pGrid, int Method, CSG_Parameter_Range *pRange, CSG_Parameter_Range *pPerctl, double Percent, double &Min, double &Range); + CSG_Grid * _Get_Grid (CSG_Grid *pGrid, int Method, CSG_Parameter_Range *pRange, CSG_Parameter_Range *pPerctl, double StdDev, double &Min, double &Range); + +}; + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +class CGrid_RGB_Split : public CSG_Module_Grid +{ +public: + CGrid_RGB_Split(void); + + +protected: + + virtual bool On_Execute (void); + + +private: }; + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- #endif // #ifndef HEADER_INCLUDED__Grid_RGB_Composite_H diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_visualisation/Grid_Terrain_Map.cpp saga-2.1.4+dfsg/src/modules/grid/grid_visualisation/Grid_Terrain_Map.cpp --- saga-2.1.0+dfsg/src/modules/grid/grid_visualisation/Grid_Terrain_Map.cpp 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_visualisation/Grid_Terrain_Map.cpp 2014-11-13 08:32:15.000000000 +0000 @@ -0,0 +1,407 @@ +/********************************************************** + * Version $Id: Grid_Terrain_Map.cpp 2328 2014-11-05 09:50:46Z reklov_w $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// Grid_Visualisation // +// // +//-------------------------------------------------------// +// // +// Grid_Terrain_Map.cpp // +// // +// Copyright (C) 2014 by // +// Volker Wichmann // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: wichmann@alps-gmbh.com // +// // +// contact: alpS GmbH // +// Center for Climate Change Adaptation // +// Grabenweg 68 // +// 6020 Innsbruck // +// Austria // +// www.alps-gmbh.com // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "Grid_Terrain_Map.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#define RUN_MODULE(LIBRARY, MODULE, CONDITION) {\ + bool bResult;\ + SG_RUN_MODULE(bResult, LIBRARY, MODULE, CONDITION)\ + if( !bResult ) return( false );\ +} + +#define SET_PARAMETER(IDENTIFIER, VALUE) pModule->Get_Parameters()->Set_Parameter(SG_T(IDENTIFIER), VALUE) + + +//--------------------------------------------------------- +CGrid_Terrain_Map::CGrid_Terrain_Map(void) +{ + //----------------------------------------------------- + Set_Name(_TL("Terrain Map View")); + + Set_Author(_TL("Copyrights (c) 2014 by Volker Wichmann")); + + Set_Description (_TW( + "This module allows one to create different terrain visualisations from an elevation dataset:\n\n" + "* Topography: a simple map with an analytical hillshading of the terrain\n\n" + "* Morphology: a map which visualizes the terrain by combining positive and " + "negative openess (Yokoyama et al. 2002) with terrain slope in a single map. " + "In contrast to conventional shading methods this has the advantage of being " + "independent from the direction of the light source.\n\n" + "References:\n" + "Yokoyama, R. / Shirasawa, M. / Pike, R.J. (2002): " + "Visualizing topography by openness: A new application of image processing to digital elevation models. " + "Photogrammetric Engineering and Remote Sensing, Vol.68, pp.251-266. " + "online at ASPRS.\n\n") + ); + + + //----------------------------------------------------- + Parameters.Add_Grid( + NULL , "DEM" ,_TL("DEM"), + _TL("Digital elevation model."), + PARAMETER_INPUT + ); + + Parameters.Add_Grid( + NULL , "SHADE" , _TL("Shade"), + _TL("The shaded DTM."), + PARAMETER_OUTPUT_OPTIONAL + ); + + Parameters.Add_Grid( + NULL , "OPENNESS" , _TL("Openness"), + _TL("The difference of positive and negative openness."), + PARAMETER_OUTPUT_OPTIONAL + ); + + Parameters.Add_Grid( + NULL , "SLOPE" , _TL("Slope"), + _TL("The calculated terrain slope [radians]."), + PARAMETER_OUTPUT_OPTIONAL + ); + + Parameters.Add_Shapes( + NULL , "CONTOURS" , _TL("Contours"), + _TL("The generated contour lines."), + PARAMETER_OUTPUT_OPTIONAL + ); + + Parameters.Add_Choice( + NULL , "METHOD" , _TL("Method"), + _TL("Choose the map type to generate."), + CSG_String::Format(SG_T("%s|%s"), + _TL("Topography"), + _TL("Morphology") + ), 0 + ); + + Parameters.Add_Value( + NULL , "RADIUS" , _TL("Radial Limit"), + _TL("Radial search limit for openness calculation."), + PARAMETER_TYPE_Double , 1000.0, 0.0, true + ); + + Parameters.Add_Value( + NULL , "CONTOUR_LINES" , _TL("Contour Lines"), + _TL("Derive contour lines."), + PARAMETER_TYPE_Bool , true + ); + + Parameters.Add_Value( + Parameters("CONTOUR_LINES") , "EQUIDISTANCE" , _TL("Equidistance"), + _TL("Contour lines equidistance [map units]."), + PARAMETER_TYPE_Double , 50.0, 0.0, true + ); +} + + +//--------------------------------------------------------- +CGrid_Terrain_Map::~CGrid_Terrain_Map(void) +{} + + +//--------------------------------------------------------- +int CGrid_Terrain_Map::On_Parameters_Enable(CSG_Parameters *pParameters, CSG_Parameter *pParameter) +{ + //----------------------------------------------------- + if( !SG_STR_CMP(pParameter->Get_Identifier(), SG_T("METHOD")) ) + { + pParameters->Get_Parameter("SHADE") ->Set_Enabled(pParameter->asInt() == 0); + + pParameters->Get_Parameter("OPENNESS") ->Set_Enabled(pParameter->asInt() == 1); + pParameters->Get_Parameter("SLOPE") ->Set_Enabled(pParameter->asInt() == 1); + pParameters->Get_Parameter("RADIUS") ->Set_Enabled(pParameter->asInt() == 1); + } + + //----------------------------------------------------- + if( !SG_STR_CMP(pParameter->Get_Identifier(), SG_T("CONTOUR_LINES")) ) + { + pParameters->Get_Parameter("CONTOURS") ->Set_Enabled(pParameter->asBool()); + pParameters->Get_Parameter("EQUIDISTANCE") ->Set_Enabled(pParameter->asBool()); + } + + //----------------------------------------------------- + return( 0 ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CGrid_Terrain_Map::On_Execute(void) +{ + bool bOkay = false; + + //----------------------------------------------------- + switch( Parameters("METHOD")->asInt() ) + { + default: + case 0: bOkay = Generate_Topography(); break; + case 1: bOkay = Generate_Morphology(); break; + } + + if( !bOkay ) + { + return( false ); + } + + //----------------------------------------------------- + if( Parameters("CONTOUR_LINES")->asBool() ) + { + return( Generate_Contours() ); + } + + //----------------------------------------------------- + return( true ); + +} + + +//--------------------------------------------------------- +bool CGrid_Terrain_Map::Generate_Topography() +{ + CSG_Grid *pShade; + + pShade = Parameters("SHADE")->asGrid(); + + + //----------------------------------------------------- + if( pShade == NULL ) + { + pShade = SG_Create_Grid(*Get_System(), SG_DATATYPE_Float); + Parameters("SHADE")->Set_Value(pShade); + DataObject_Add(pShade); + } + + + //----------------------------------------------------- + RUN_MODULE("ta_lighting" , 0, + SET_PARAMETER("ELEVATION" , Parameters("DEM")) + && SET_PARAMETER("SHADE" , pShade) + && SET_PARAMETER("METHOD" , 0) + ) + + + //----------------------------------------------------- + DataObject_Set_Colors(Parameters("DEM")->asGrid() , 11, SG_COLORS_TOPOGRAPHY , false); + DataObject_Set_Colors(pShade , 11, SG_COLORS_BLACK_WHITE, true); + + + CSG_Parameters Parms; + + if( DataObject_Get_Parameters(pShade, Parms) && Parms("DISPLAY_TRANSPARENCY") ) + { + Parms("DISPLAY_TRANSPARENCY")->Set_Value(40); + + DataObject_Set_Parameters(pShade, Parms); + } + + + DataObject_Update(Parameters("DEM")->asGrid() , SG_UI_DATAOBJECT_SHOW_NEW_MAP); + DataObject_Update(pShade , SG_UI_DATAOBJECT_SHOW_LAST_MAP); + + + //----------------------------------------------------- + return( true ); +} + + +//--------------------------------------------------------- +bool CGrid_Terrain_Map::Generate_Morphology() +{ + + CSG_Grid *pOpenness, *pSlope; + double dRadius; + + pOpenness = Parameters("OPENNESS")->asGrid(); + pSlope = Parameters("SLOPE")->asGrid(); + dRadius = Parameters("RADIUS")->asDouble(); + + + //----------------------------------------------------- + if( pOpenness == NULL ) + { + pOpenness = new CSG_Grid(*Get_System(), SG_DATATYPE_Float); + Parameters("OPENNESS")->Set_Value(pOpenness); + DataObject_Add(pOpenness); + } + + if( pSlope == NULL ) + { + pSlope = SG_Create_Grid(*Get_System(), SG_DATATYPE_Float); + Parameters("SLOPE")->Set_Value(pSlope); + DataObject_Add(pSlope); + } + + CSG_Grid TMP1(*Get_System(), SG_DATATYPE_Float); + + + //----------------------------------------------------- + RUN_MODULE("ta_lighting" , 5, + SET_PARAMETER("DEM" , Parameters("DEM")) + && SET_PARAMETER("POS" , pOpenness) + && SET_PARAMETER("NEG" , &TMP1) + && SET_PARAMETER("RADIUS" , dRadius) + && SET_PARAMETER("METHOD" , 1) + && SET_PARAMETER("NDIRS" , 8) + ) + + pOpenness->Subtract(TMP1); + pOpenness->Set_Name(_TL("Openness")); + + + //----------------------------------------------------- + RUN_MODULE("ta_morphometry" , 0, + SET_PARAMETER("ELEVATION" , Parameters("DEM")) + && SET_PARAMETER("SLOPE" , pSlope) + && SET_PARAMETER("ASPECT" , &TMP1) + ) + + + //----------------------------------------------------- + DataObject_Set_Colors(pOpenness, 11, SG_COLORS_BLACK_WHITE, false); + DataObject_Set_Colors(pSlope , 11, SG_COLORS_WHITE_RED , false); + + CSG_Parameters Parms; + + if( DataObject_Get_Parameters(pSlope, Parms) && Parms("DISPLAY_TRANSPARENCY") ) + { + Parms("DISPLAY_TRANSPARENCY")->Set_Value(60); + + DataObject_Set_Parameters(pSlope, Parms); + } + + + DataObject_Update(pOpenness , SG_UI_DATAOBJECT_SHOW_NEW_MAP); + DataObject_Update(pSlope , SG_UI_DATAOBJECT_SHOW_LAST_MAP); + + + //----------------------------------------------------- + return( true ); + +} + + +//--------------------------------------------------------- +bool CGrid_Terrain_Map::Generate_Contours() +{ + CSG_Shapes *pContours; + + pContours = Parameters("CONTOURS")->asShapes(); + + + //----------------------------------------------------- + if( pContours == NULL ) + { + pContours = SG_Create_Shapes(); + Parameters("CONTOURS")->Set_Value(pContours); + DataObject_Add(pContours); + } + + + //----------------------------------------------------- + RUN_MODULE("shapes_grid" , 5, + SET_PARAMETER("GRID" , Parameters("DEM")) + && SET_PARAMETER("CONTOUR" , pContours) + && SET_PARAMETER("ZSTEP" , Parameters("EQUIDISTANCE")) + ) + + + //----------------------------------------------------- + CSG_Parameters Parms; + + if( DataObject_Get_Parameters(pContours, Parms) && Parms("UNISYMBOL_COLOR") && Parms("DISPLAY_TRANSPARENCY") ) + { + Parms("UNISYMBOL_COLOR")->Set_Value(0); + Parms("DISPLAY_TRANSPARENCY")->Set_Value(70); + + DataObject_Set_Parameters(pContours, Parms); + } + + DataObject_Update(pContours , SG_UI_DATAOBJECT_SHOW_LAST_MAP); + + + //----------------------------------------------------- + return( true ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_visualisation/Grid_Terrain_Map.h saga-2.1.4+dfsg/src/modules/grid/grid_visualisation/Grid_Terrain_Map.h --- saga-2.1.0+dfsg/src/modules/grid/grid_visualisation/Grid_Terrain_Map.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_visualisation/Grid_Terrain_Map.h 2014-11-13 08:32:15.000000000 +0000 @@ -0,0 +1,115 @@ +/********************************************************** + * Version $Id: Grid_Terrain_Map.h 2131 2014-05-27 13:34:07Z reklov_w $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// Grid_Visualisation // +// // +//-------------------------------------------------------// +// // +// Grid_Terrain_Map.h // +// // +// Copyright (C) 2014 by // +// Volker Wichmann // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: wichmann@alps-gmbh.com // +// // +// contact: alpS GmbH // +// Center for Climate Change Adaptation // +// Grabenweg 68 // +// 6020 Innsbruck // +// Austria // +// www.alps-gmbh.com // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#ifndef HEADER_INCLUDED__Grid_Terrain_Map_H +#define HEADER_INCLUDED__Grid_Terrain_Map_H + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "MLB_Interface.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +class CGrid_Terrain_Map : public CSG_Module_Grid +{ +public: + CGrid_Terrain_Map(void); + virtual ~CGrid_Terrain_Map(void); + + +protected: + + virtual bool On_Execute (void); + + virtual int On_Parameters_Enable (CSG_Parameters *pParameters, CSG_Parameter *pParameter); + +private: + + bool Generate_Topography (void); + bool Generate_Morphology (void); + + bool Generate_Contours (void); + +}; + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#endif // #ifndef HEADER_INCLUDED__Grid_Terrain_Map_H diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_visualisation/Makefile.am saga-2.1.4+dfsg/src/modules/grid/grid_visualisation/Makefile.am --- saga-2.1.0+dfsg/src/modules/grid/grid_visualisation/Makefile.am 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_visualisation/Makefile.am 2014-11-13 08:32:15.000000000 +0000 @@ -1,5 +1,5 @@ # -# $Id: Makefile.am 1456 2012-08-15 10:31:10Z reklov_w $ +# $Id: Makefile.am 2131 2014-05-27 13:34:07Z reklov_w $ # if DEBUG DBGFLAGS = -g -DDEBUG @@ -14,22 +14,24 @@ pkglib_LTLIBRARIES = libgrid_visualisation.la libgrid_visualisation_la_SOURCES =\ Grid_3D_Image.cpp\ +Grid_Aspect_Slope_Map.cpp\ Grid_Color_Blend.cpp\ Grid_Color_Triangle.cpp\ Grid_Color_Rotate.cpp\ Grid_Colors_Fit.cpp\ Grid_Histogram_Surface.cpp\ Grid_RGB_Composite.cpp\ -Grid_Aspect_Slope_Map.cpp\ +Grid_Terrain_Map.cpp\ MLB_Interface.cpp\ Grid_3D_Image.h\ +Grid_Aspect_Slope_Map.h\ Grid_Color_Blend.h\ Grid_Color_Rotate.h\ Grid_Color_Triangle.h\ Grid_Colors_Fit.h\ Grid_Histogram_Surface.h\ Grid_RGB_Composite.h\ -Grid_Aspect_Slope_Map.h\ +Grid_Terrain_Map.h\ MLB_Interface.h libgrid_visualisation_la_LIBADD = $(top_srcdir)/src/saga_core/saga_api/libsaga_api.la diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_visualisation/Makefile.in saga-2.1.4+dfsg/src/modules/grid/grid_visualisation/Makefile.in --- saga-2.1.0+dfsg/src/modules/grid/grid_visualisation/Makefile.in 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_visualisation/Makefile.in 2014-11-13 08:33:31.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -35,15 +79,17 @@ build_triplet = @build@ host_triplet = @host@ subdir = src/modules/grid/grid_visualisation -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_postgresql.m4 \ + $(top_srcdir)/m4/ax_pkg_swig.m4 \ $(top_srcdir)/m4/ax_python_devel.m4 \ $(top_srcdir)/m4/ax_swig_enable_cxx.m4 \ $(top_srcdir)/m4/ax_swig_python.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.in + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -71,46 +117,109 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(pkglibdir)" LTLIBRARIES = $(pkglib_LTLIBRARIES) libgrid_visualisation_la_DEPENDENCIES = \ $(top_srcdir)/src/saga_core/saga_api/libsaga_api.la am_libgrid_visualisation_la_OBJECTS = Grid_3D_Image.lo \ - Grid_Color_Blend.lo Grid_Color_Triangle.lo \ - Grid_Color_Rotate.lo Grid_Colors_Fit.lo \ + Grid_Aspect_Slope_Map.lo Grid_Color_Blend.lo \ + Grid_Color_Triangle.lo Grid_Color_Rotate.lo Grid_Colors_Fit.lo \ Grid_Histogram_Surface.lo Grid_RGB_Composite.lo \ - Grid_Aspect_Slope_Map.lo MLB_Interface.lo + Grid_Terrain_Map.lo MLB_Interface.lo libgrid_visualisation_la_OBJECTS = \ $(am_libgrid_visualisation_la_OBJECTS) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles am__mv = mv -f CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libgrid_visualisation_la_SOURCES) DIST_SOURCES = $(libgrid_visualisation_la_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -131,6 +240,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLELIBHARU = @DISABLELIBHARU@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -158,6 +268,7 @@ LOCAL_LIBS = @LOCAL_LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -170,8 +281,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PG_CONFIG = @PG_CONFIG@ +POSTGRESQL_CFLAGS = @POSTGRESQL_CFLAGS@ +POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@ +POSTGRESQL_VERSION = @POSTGRESQL_VERSION@ POW_LIB = @POW_LIB@ PYTHON = @PYTHON@ PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ @@ -195,6 +311,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -228,7 +345,6 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -250,7 +366,7 @@ top_srcdir = @top_srcdir@ # -# $Id: Makefile.am 1456 2012-08-15 10:31:10Z reklov_w $ +# $Id: Makefile.am 2131 2014-05-27 13:34:07Z reklov_w $ # @DEBUG_TRUE@DBGFLAGS = -g -DDEBUG @SAGA_UNICODE_TRUE@UC_DEFS = -D_SAGA_UNICODE @@ -261,22 +377,24 @@ pkglib_LTLIBRARIES = libgrid_visualisation.la libgrid_visualisation_la_SOURCES = \ Grid_3D_Image.cpp\ +Grid_Aspect_Slope_Map.cpp\ Grid_Color_Blend.cpp\ Grid_Color_Triangle.cpp\ Grid_Color_Rotate.cpp\ Grid_Colors_Fit.cpp\ Grid_Histogram_Surface.cpp\ Grid_RGB_Composite.cpp\ -Grid_Aspect_Slope_Map.cpp\ +Grid_Terrain_Map.cpp\ MLB_Interface.cpp\ Grid_3D_Image.h\ +Grid_Aspect_Slope_Map.h\ Grid_Color_Blend.h\ Grid_Color_Rotate.h\ Grid_Color_Triangle.h\ Grid_Colors_Fit.h\ Grid_Histogram_Surface.h\ Grid_RGB_Composite.h\ -Grid_Aspect_Slope_Map.h\ +Grid_Terrain_Map.h\ MLB_Interface.h libgrid_visualisation_la_LIBADD = $(top_srcdir)/src/saga_core/saga_api/libsaga_api.la @@ -293,9 +411,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/modules/grid/grid_visualisation/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/modules/grid/grid_visualisation/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu src/modules/grid/grid_visualisation/Makefile + $(AUTOMAKE) --foreign src/modules/grid/grid_visualisation/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -314,9 +432,9 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): + install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -324,6 +442,8 @@ else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \ } @@ -339,14 +459,17 @@ clean-pkglibLTLIBRARIES: -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES) - @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -libgrid_visualisation.la: $(libgrid_visualisation_la_OBJECTS) $(libgrid_visualisation_la_DEPENDENCIES) - $(CXXLINK) -rpath $(pkglibdir) $(libgrid_visualisation_la_OBJECTS) $(libgrid_visualisation_la_LIBADD) $(LIBS) + @list='$(pkglib_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + +libgrid_visualisation.la: $(libgrid_visualisation_la_OBJECTS) $(libgrid_visualisation_la_DEPENDENCIES) $(EXTRA_libgrid_visualisation_la_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) -rpath $(pkglibdir) $(libgrid_visualisation_la_OBJECTS) $(libgrid_visualisation_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -362,28 +485,29 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Grid_Colors_Fit.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Grid_Histogram_Surface.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Grid_RGB_Composite.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Grid_Terrain_Map.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MLB_Interface.Plo@am__quote@ .cpp.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< .cpp.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .cpp.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -391,26 +515,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -422,15 +535,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -439,6 +548,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -490,10 +614,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -578,19 +707,20 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-pkglibLTLIBRARIES ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-pkglibLTLIBRARIES \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-pkglibLTLIBRARIES install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ + uninstall-pkglibLTLIBRARIES # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_visualisation/MLB_Interface.cpp saga-2.1.4+dfsg/src/modules/grid/grid_visualisation/MLB_Interface.cpp --- saga-2.1.0+dfsg/src/modules/grid/grid_visualisation/MLB_Interface.cpp 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_visualisation/MLB_Interface.cpp 2014-11-13 08:32:15.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: MLB_Interface.cpp 1456 2012-08-15 10:31:10Z reklov_w $ + * Version $Id: MLB_Interface.cpp 2289 2014-10-16 13:45:05Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// @@ -74,19 +74,22 @@ switch( i ) { case MLB_INFO_Name: default: - return( _TL("Grid - Visualisation") ); + return( _TL("Grids") ); + case MLB_INFO_Category: + return( _TL("Visualization") ); + case MLB_INFO_Author: - return( SG_T("O. Conrad, V. Wichmann (c) 2002-2012") ); + return( SG_T("O. Conrad, V. Wichmann (c) 2002-2014") ); case MLB_INFO_Description: - return( _TL("Special visualisation functions for grids.") ); + return( _TL("Visualization tools for grids.") ); case MLB_INFO_Version: return( SG_T("1.0") ); case MLB_INFO_Menu_Path: - return( _TL("Grid|Visualisation") ); + return( _TL("Visualization|Grid") ); } } @@ -102,6 +105,7 @@ #include "Grid_Color_Triangle.h" #include "Grid_Histogram_Surface.h" #include "Grid_Aspect_Slope_Map.h" +#include "Grid_Terrain_Map.h" //--------------------------------------------------------- // 4. Allow your modules to be created here... @@ -110,14 +114,16 @@ { switch( i ) { - case 0: return( new CGrid_Color_Rotate ); - case 1: return( new CGrid_Color_Blend ); - case 2: return( new CGrid_Colors_Fit ); - case 3: return( new CGrid_RGB_Composite ); - case 4: return( new CGrid_3D_Image ); - case 5: return( new CGrid_Color_Triangle ); - case 6: return( new CGrid_Histogram_Surface ); - case 7: return( new CGrid_Aspect_Slope_Map ); + case 0: return( new CGrid_Color_Rotate ); + case 1: return( new CGrid_Color_Blend ); + case 2: return( new CGrid_Colors_Fit ); + case 3: return( new CGrid_RGB_Composite ); + case 4: return( new CGrid_3D_Image ); + case 5: return( new CGrid_Color_Triangle ); + case 6: return( new CGrid_Histogram_Surface ); + case 7: return( new CGrid_Aspect_Slope_Map ); + case 8: return( new CGrid_Terrain_Map ); + case 9: return( new CGrid_RGB_Split ); } return( NULL ); diff -Nru saga-2.1.0+dfsg/src/modules/grid/grid_visualisation/MLB_Interface.h saga-2.1.4+dfsg/src/modules/grid/grid_visualisation/MLB_Interface.h --- saga-2.1.0+dfsg/src/modules/grid/grid_visualisation/MLB_Interface.h 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/grid_visualisation/MLB_Interface.h 2014-11-13 08:32:15.000000000 +0000 @@ -1,5 +1,5 @@ /********************************************************** - * Version $Id: MLB_Interface.h 911 2011-02-14 16:38:15Z reklov_w $ + * Version $Id: MLB_Interface.h 1922 2014-01-09 10:28:46Z oconrad $ *********************************************************/ /////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ // You should have received a copy of the GNU General // // Public License along with this program; if not, // // write to the Free Software Foundation, Inc., // -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // // USA. // // // //-------------------------------------------------------// diff -Nru saga-2.1.0+dfsg/src/modules/grid/Makefile.in saga-2.1.4+dfsg/src/modules/grid/Makefile.in --- saga-2.1.0+dfsg/src/modules/grid/Makefile.in 2013-11-14 22:21:59.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/grid/Makefile.in 2014-11-13 08:33:30.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,6 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -34,35 +78,74 @@ build_triplet = @build@ host_triplet = @host@ subdir = src/modules/grid -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_swig.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_postgresql.m4 \ + $(top_srcdir)/m4/ax_pkg_swig.m4 \ $(top_srcdir)/m4/ax_python_devel.m4 \ $(top_srcdir)/m4/ax_swig_enable_cxx.m4 \ $(top_srcdir)/m4/ax_swig_python.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.in + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -94,6 +177,7 @@ reldir="$$dir2" ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -114,6 +198,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLELIBHARU = @DISABLELIBHARU@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -141,6 +226,7 @@ LOCAL_LIBS = @LOCAL_LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -153,8 +239,13 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PG_CONFIG = @PG_CONFIG@ +POSTGRESQL_CFLAGS = @POSTGRESQL_CFLAGS@ +POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@ +POSTGRESQL_VERSION = @POSTGRESQL_VERSION@ POW_LIB = @POW_LIB@ PYTHON = @PYTHON@ PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ @@ -178,6 +269,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -211,7 +303,6 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -244,9 +335,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/modules/grid/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/modules/grid/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu src/modules/grid/Makefile + $(AUTOMAKE) --foreign src/modules/grid/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -273,22 +364,25 @@ -rm -rf .libs _libs # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -303,57 +397,12 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -369,12 +418,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -386,15 +430,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -403,6 +443,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -439,13 +494,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -480,10 +532,15 @@ installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -561,22 +618,20 @@ uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - ctags ctags-recursive distclean distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags tags-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru saga-2.1.0+dfsg/src/modules/imagery/imagery_classification/change_detection.cpp saga-2.1.4+dfsg/src/modules/imagery/imagery_classification/change_detection.cpp --- saga-2.1.0+dfsg/src/modules/imagery/imagery_classification/change_detection.cpp 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/imagery/imagery_classification/change_detection.cpp 2014-11-13 08:32:18.000000000 +0000 @@ -0,0 +1,507 @@ +/********************************************************** + * Version $Id: change_detection.cpp 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// imagery_classification // +// // +//-------------------------------------------------------// +// // +// change_detection.cpp // +// // +// Copyright (C) 2010 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Hamburg // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "change_detection.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +CChange_Detection::CChange_Detection(void) +{ + CSG_Parameter *pNode, *pTable; + + //----------------------------------------------------- + Set_Name (_TL("Change Detection")); + + Set_Author (SG_T("O.Conrad (c) 2010")); + + Set_Description (_TW( + "Change detection for classified grids." + )); + + //----------------------------------------------------- + pNode = Parameters.Add_Grid( + NULL , "INITIAL" , _TL("Initial State"), + _TL(""), + PARAMETER_INPUT + ); + + pTable = Parameters.Add_Table(pNode, "INI_LUT" , _TL("Look-up Table") , _TL(""), PARAMETER_INPUT_OPTIONAL); + Parameters.Add_Table_Field(pTable, "INI_LUT_MIN", _TL("Value") , _TL(""), false); + Parameters.Add_Table_Field(pTable, "INI_LUT_MAX", _TL("Value (Maximum)"), _TL(""), true ); + Parameters.Add_Table_Field(pTable, "INI_LUT_NAM", _TL("Name") , _TL(""), true); + + pNode = Parameters.Add_Grid( + NULL , "FINAL" , _TL("Final State"), + _TL(""), + PARAMETER_INPUT + ); + + pTable = Parameters.Add_Table(pNode, "FIN_LUT" , _TL("Look-up Table") , _TL(""), PARAMETER_INPUT_OPTIONAL); + Parameters.Add_Table_Field(pTable, "FIN_LUT_MIN", _TL("Value") , _TL(""), false); + Parameters.Add_Table_Field(pTable, "FIN_LUT_MAX", _TL("Value (Maximum)"), _TL(""), true ); + Parameters.Add_Table_Field(pTable, "FIN_LUT_NAM", _TL("Name") , _TL(""), true); + + Parameters.Add_Grid( + NULL , "CHANGE" , _TL("Changes"), + _TL(""), + PARAMETER_OUTPUT + ); + + Parameters.Add_Value( + NULL , "NOCHANGE" , _TL("Report Unchanged Classes"), + _TL(""), + PARAMETER_TYPE_Bool, true + ); + + pNode = Parameters.Add_Table( + NULL , "CHANGES" , _TL("Changes"), + _TL(""), + PARAMETER_OUTPUT + ); + + Parameters.Add_Choice( + pNode , "OUTPUT" , _TL("Output as..."), + _TL(""), + CSG_String::Format(SG_T("%s|%s|%s|"), + _TL("cells"), + _TL("percent"), + _TL("area") + ), 0 + ); +} + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +int CChange_Detection::On_Parameters_Enable(CSG_Parameters *pParameters, CSG_Parameter *pParameter) +{ + if( !SG_STR_CMP(pParameter->Get_Identifier(), SG_T("INI_LUT")) ) + { + pParameters->Get_Parameter("INI_LUT_MIN")->Set_Enabled(pParameter->asTable() != NULL); + pParameters->Get_Parameter("INI_LUT_MAX")->Set_Enabled(pParameter->asTable() != NULL); + pParameters->Get_Parameter("INI_LUT_NAM")->Set_Enabled(pParameter->asTable() != NULL); + } + + if( !SG_STR_CMP(pParameter->Get_Identifier(), SG_T("FIN_LUT")) ) + { + pParameters->Get_Parameter("FIN_LUT_MIN")->Set_Enabled(pParameter->asTable() != NULL); + pParameters->Get_Parameter("FIN_LUT_MAX")->Set_Enabled(pParameter->asTable() != NULL); + pParameters->Get_Parameter("FIN_LUT_NAM")->Set_Enabled(pParameter->asTable() != NULL); + } + + return( 1 ); +} + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CChange_Detection::On_Execute(void) +{ + bool bNoChange; + int iInitial, iFinal; + CSG_Matrix Identity; + CSG_Table Initial, Final, *pChanges; + CSG_Grid *pInitial, *pFinal, *pChange; + + //----------------------------------------------------- + pInitial = Parameters("INITIAL") ->asGrid(); + pFinal = Parameters("FINAL") ->asGrid(); + pChange = Parameters("CHANGE") ->asGrid(); + pChanges = Parameters("CHANGES") ->asTable(); + bNoChange = Parameters("NOCHANGE")->asBool(); + + if( !Get_Classes(Initial, pInitial, true) ) + { + Error_Set(_TL("no class definitions for initial state")); + + return( false ); + } + + if( !Get_Classes(Final, pFinal, false) ) + { + Error_Set(_TL("no class definitions for final state")); + + return( false ); + } + + if( !Get_Changes(Initial, Final, pChanges, Identity) ) + { + return( false ); + } + + //----------------------------------------------------- + for(int y=0; yasDouble(x, y)); + iFinal = Get_Class(Final , pFinal ->asDouble(x, y)); + + if( bNoChange || !Identity[iInitial][iFinal] ) + { + pChanges->Get_Record(iInitial)->Add_Value(1 + iFinal, 1); + + pChange->Set_Value(x, y, (pChanges->Get_Field_Count() - 1) * iInitial + iFinal); + } + else + { + pChange->Set_Value(x, y, -1); + } + } + } + + //----------------------------------------------------- + CSG_Parameters P; + + if( DataObject_Get_Parameters(pChange, P) && P("COLORS_TYPE") && P("LUT") ) + { + CSG_Table *pLUT = P("LUT")->asTable(); + + CSG_Colors cRandom(pChanges->Get_Count()); + + cRandom.Random(); + + pLUT->Del_Records(); + + for(iInitial=0; iInitialGet_Count(); iInitial++) + { + CSG_Colors cRamp(pChanges->Get_Field_Count() - 1); + + cRamp.Set_Ramp(cRandom[iInitial], cRandom[iInitial]); + cRamp.Set_Ramp_Brighness(225, 50); + + for(iFinal=0; iFinalGet_Field_Count()-1; iFinal++) + { + if( pChanges->Get_Record(iInitial)->asInt(1 + iFinal) > 0 ) + { + CSG_Table_Record *pClass = pLUT->Add_Record(); + + pClass->Set_Value(0, cRamp.Get_Color(iFinal)); + pClass->Set_Value(1, CSG_String::Format(SG_T("%s >> %s"), pChanges->Get_Record(iInitial)->asString(0), pChanges->Get_Field_Name(1 + iFinal))); + pClass->Set_Value(3, (pChanges->Get_Field_Count() - 1) * iInitial + iFinal); + pClass->Set_Value(4, (pChanges->Get_Field_Count() - 1) * iInitial + iFinal); + } + } + } + + P("COLORS_TYPE")->Set_Value(1); // Color Classification Type: Lookup Table + + DataObject_Set_Parameters(pChange, P); + } + + //----------------------------------------------------- + double Factor; + + switch( Parameters("OUTPUT")->asInt() ) + { + default: Factor = 1.0; break; // cells + case 1: Factor = 100.0 / Get_NCells(); break; // percent + case 2: Factor = M_SQR(Get_Cellsize()); break; // area + } + + if( Factor != 1.0 ) + { + for(iInitial=0; iInitialGet_Count(); iInitial++) + { + for(iFinal=0; iFinalGet_Field_Count()-1; iFinal++) + { + pChanges->Get_Record(iInitial)->Mul_Value(1 + iFinal, Factor); + } + } + } + + //----------------------------------------------------- + pChanges ->Set_Name(CSG_String::Format(SG_T("%s [%s >> %s]"), _TL("Changes"), pInitial->Get_Name(), pFinal->Get_Name())); + + pChange ->Set_Name(CSG_String::Format(SG_T("%s [%s >> %s]"), _TL("Changes"), pInitial->Get_Name(), pFinal->Get_Name())); + pChange ->Set_NoData_Value(-1); + + return( true ); +} + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +enum +{ + CLASS_NAM = 0, + CLASS_MIN, + CLASS_MAX +}; + +//--------------------------------------------------------- +bool CChange_Detection::Get_Classes(CSG_Table &Classes, CSG_Grid *pGrid, bool bInitial) +{ + CSG_Table *pClasses; + + Classes.Destroy(); + + Classes.Add_Field(_TL("NAME") , SG_DATATYPE_String); + Classes.Add_Field(_TL("MIN") , SG_DATATYPE_Double); + Classes.Add_Field(_TL("MAX") , SG_DATATYPE_Double); + + //----------------------------------------------------- + if( (pClasses = Parameters(bInitial ? "INI_LUT" : "FIN_LUT")->asTable()) != NULL ) + { + int fNam = Parameters(bInitial ? "INI_LUT_NAM" : "FIN_LUT_NAM")->asInt(); + int fMin = Parameters(bInitial ? "INI_LUT_MIN" : "FIN_LUT_MIN")->asInt(); + int fMax = Parameters(bInitial ? "INI_LUT_MAX" : "FIN_LUT_MAX")->asInt(); + + if( fNam < 0 || fNam >= pClasses->Get_Field_Count() ) { fNam = fMin; } + if( fMax < 0 || fMax >= pClasses->Get_Field_Count() ) { fMax = fMin; } + + for(int iClass=0; iClassGet_Count(); iClass++) + { + CSG_Table_Record *pClass = Classes.Add_Record(); + + pClass->Set_Value(CLASS_NAM, pClasses->Get_Record(iClass)->asString(fNam)); + pClass->Set_Value(CLASS_MIN, pClasses->Get_Record(iClass)->asDouble(fMin)); + pClass->Set_Value(CLASS_MAX, pClasses->Get_Record(iClass)->asDouble(fMax)); + } + } + + //----------------------------------------------------- + else if( DataObject_Get_Parameter(pGrid, "LUT") ) + { + pClasses = DataObject_Get_Parameter(pGrid, "LUT")->asTable(); + + for(int iClass=0; iClassGet_Count(); iClass++) + { + CSG_Table_Record *pClass = Classes.Add_Record(); + + pClass->Set_Value(CLASS_NAM, pClasses->Get_Record(iClass)->asString(1)); + pClass->Set_Value(CLASS_MIN, pClasses->Get_Record(iClass)->asDouble(3)); + pClass->Set_Value(CLASS_MAX, pClasses->Get_Record(iClass)->asDouble(4)); + } + } + + //----------------------------------------------------- + else + { + if( !pGrid->Set_Index() ) + { + Error_Set(_TL("index creation failed")); + + return( false ); + } + + double z; + + for(sLong i=0; iasDouble(pGrid->Get_Sorted(i, false, false)); + + if( i == 0 || iz != z ) + { + CSG_Table_Record *pClass = Classes.Add_Record(); + + pClass->Set_Value(CLASS_NAM, z = iz); + pClass->Set_Value(CLASS_MIN, z); + pClass->Set_Value(CLASS_MAX, z); + } + } + } + + //----------------------------------------------------- + return( Classes.Get_Count() > 0 ); +} + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CChange_Detection::Get_Changes(CSG_Table &Initial, CSG_Table &Final, CSG_Table *pChanges, CSG_Matrix &Identity) +{ + int iInitial, iFinal; + + //----------------------------------------------------- + Identity.Create(Final.Get_Count() + 1, Initial.Get_Count() + 1); + + for(iInitial=0; iInitialDestroy(); + + pChanges->Add_Field(_TL("Name"), SG_DATATYPE_String); + + for(iFinal=0; iFinalAdd_Field(Final[iFinal].asString(CLASS_NAM), SG_DATATYPE_Double); + } + + pChanges->Add_Field(_TL("Unclassified"), SG_DATATYPE_Double); + + //----------------------------------------------------- + for(iInitial=0; iInitialAdd_Record()->Set_Value(0, Initial[iInitial].asString(CLASS_NAM)); + } + + pChanges->Add_Record()->Set_Value(0, _TL("Unclassified")); + + return( true ); +} + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +inline int CChange_Detection::Cmp_Class(CSG_Table &Classes, double Value, int iClass) +{ + CSG_Table_Record *pClass = Classes.Get_Record_byIndex(iClass); + + double min = pClass->asDouble(CLASS_MIN); + + if( Value < min ) + { + return( 1 ); + } + + double max = pClass->asDouble(CLASS_MAX); + + return( min < max + ? (Value < max ? 0 : -1) + : (Value > min ? -1 : 0) + ); +} + +//--------------------------------------------------------- +int CChange_Detection::Get_Class(CSG_Table &Classes, double Value) +{ + int a, b, i, c; + + if( Classes.Get_Count() > 0 ) + { + if( Classes.Get_Index_Field(0) != CLASS_MIN || Classes.Get_Index_Order(0) != TABLE_INDEX_Ascending ) + { + Classes.Set_Index(CLASS_MIN, TABLE_INDEX_Ascending); + } + + for(a=0, b=Classes.Get_Record_Count()-1; a < b; ) + { + i = a + (b - a) / 2; + c = Cmp_Class(Classes, Value, i); + + if( c > 0 ) + { + b = b > i ? i : b - 1; + } + else if( c < 0 ) + { + a = a < i ? i : a + 1; + } + else + { + return( Classes.Get_Record_byIndex(i)->Get_Index() ); + } + } + + if( Cmp_Class(Classes, Value, a) == 0 ) + { + return( Classes.Get_Record_byIndex(a)->Get_Index() ); + } + + if( a != b && Cmp_Class(Classes, Value, b) == 0 ) + { + return( Classes.Get_Record_byIndex(b)->Get_Index() ); + } + } + + return( Classes.Get_Count() ); // := unclassified +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- diff -Nru saga-2.1.0+dfsg/src/modules/imagery/imagery_classification/change_detection.h saga-2.1.4+dfsg/src/modules/imagery/imagery_classification/change_detection.h --- saga-2.1.0+dfsg/src/modules/imagery/imagery_classification/change_detection.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/imagery/imagery_classification/change_detection.h 2014-11-13 08:32:18.000000000 +0000 @@ -0,0 +1,114 @@ +/********************************************************** + * Version $Id: change_detection.h 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// imagery_classification // +// // +//-------------------------------------------------------// +// // +// change_detection.h // +// // +// Copyright (C) 2010 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Hamburg // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#ifndef HEADER_INCLUDED__change_detection_H +#define HEADER_INCLUDED__change_detection_H + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "MLB_Interface.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +class CChange_Detection : public CSG_Module_Grid +{ +public: + CChange_Detection(void); + + +protected: + + virtual int On_Parameters_Enable (CSG_Parameters *pParameters, CSG_Parameter *pParameter); + + virtual bool On_Execute (void); + + +private: + + bool Get_Classes (CSG_Table &Classes, CSG_Grid *pGrid, bool bInitial); + bool Get_Changes (CSG_Table &Initial, CSG_Table &Final, CSG_Table *pChanges, CSG_Matrix &Identity); + + int Cmp_Class (CSG_Table &Classes, double Value, int iClass); + int Get_Class (CSG_Table &Classes, double Value); + +}; + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#endif // #ifndef HEADER_INCLUDED__change_detection_H diff -Nru saga-2.1.0+dfsg/src/modules/imagery/imagery_classification/classify_cluster_analysis.cpp saga-2.1.4+dfsg/src/modules/imagery/imagery_classification/classify_cluster_analysis.cpp --- saga-2.1.0+dfsg/src/modules/imagery/imagery_classification/classify_cluster_analysis.cpp 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/imagery/imagery_classification/classify_cluster_analysis.cpp 2014-11-13 08:32:18.000000000 +0000 @@ -0,0 +1,875 @@ +/********************************************************** + * Version $Id: classify_cluster_analysis.cpp 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// imagery_classification // +// // +//-------------------------------------------------------// +// // +// Grid_Cluster_Analysis.cpp // +// // +// Copyright (C) 2003 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Goettingen // +// Goldschmidtstr. 5 // +// 37077 Goettingen // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "classify_cluster_analysis.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +CGrid_Cluster_Analysis::CGrid_Cluster_Analysis(void) +{ + //----------------------------------------------------- + Set_Name (_TL("Cluster Analysis for Grids")); + + Set_Author (SG_T("O.Conrad (c) 2001")); + + Set_Description (_TW( + "Cluster Analysis for grids.\n\nReferences:\n\n" + + "Iterative Minimum Distance:\n" + "- Forgy, E. (1965):\n" + " 'Cluster Analysis of multivariate data: efficiency vs. interpretability of classifications',\n" + " Biometrics 21:768\n\n" + + "Hill-Climbing:" + "- Rubin, J. (1967):\n" + " 'Optimal Classification into Groups: An Approach for Solving the Taxonomy Problem',\n" + " J. Theoretical Biology, 15:103-144\n\n" + )); + + //----------------------------------------------------- + Parameters.Add_Grid_List( + NULL , "GRIDS" , _TL("Grids"), + _TL(""), + PARAMETER_INPUT + ); + + Parameters.Add_Grid( + NULL , "CLUSTER" , _TL("Clusters"), + _TL(""), + PARAMETER_OUTPUT, true, SG_DATATYPE_Int + ); + + Parameters.Add_Table( + NULL , "STATISTICS" , _TL("Statistics"), + _TL(""), + PARAMETER_OUTPUT + ); + + Parameters.Add_Choice( + NULL , "METHOD" , _TL("Method"), + _TL(""), + CSG_String::Format(SG_T("%s|%s|%s|"), + _TL("Iterative Minimum Distance (Forgy 1965)"), + _TL("Hill-Climbing (Rubin 1967)"), + _TL("Combined Minimum Distance / Hillclimbing") + ), 1 + ); + + Parameters.Add_Value( + NULL , "NCLUSTER" , _TL("Clusters"), + _TL("Number of clusters"), + PARAMETER_TYPE_Int, 10, 2, true + ); + + Parameters.Add_Value( + NULL , "MAXITER" , _TL("Maximum Iterations"), + _TL("maximum number of iterations, ignored if set to zero (default)"), + PARAMETER_TYPE_Int, 0, 0, true + ); + + Parameters.Add_Value( + NULL , "NORMALISE" , _TL("Normalise"), + _TL("Automatically normalise grids by standard deviation before clustering."), + PARAMETER_TYPE_Bool, false + ); + + //----------------------------------------------------- + CSG_Parameter *pNode = + Parameters.Add_Value(NULL , "OLDVERSION", _TL("Old Version"), _TL("slower but memory saving"), PARAMETER_TYPE_Bool, false); + Parameters.Add_Value(pNode , "UPDATEVIEW", _TL("Update View"), _TL(""), PARAMETER_TYPE_Bool, true); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +int CGrid_Cluster_Analysis::On_Parameters_Enable(CSG_Parameters *pParameters, CSG_Parameter *pParameter) +{ + if( !SG_STR_CMP(pParameter->Get_Identifier(), "OLDVERSION") ) + { + pParameters->Set_Enabled("MAXITER" , pParameter->asBool() == false); + pParameters->Set_Enabled("UPDATEVIEW", pParameter->asBool() == true ); + } + + return( 1 ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CGrid_Cluster_Analysis::On_Execute(void) +{ + if( Parameters("OLDVERSION")->asBool() ) { return( _On_Execute() ); } + + //----------------------------------------------------- + bool bNormalize; + sLong iFeature, iElement, nElements; + CSG_Cluster_Analysis Analysis; + CSG_Grid *pCluster; + CSG_Parameter_Grid_List *pGrids; + + //----------------------------------------------------- + pGrids = Parameters("GRIDS" )->asGridList(); + pCluster = Parameters("CLUSTER" )->asGrid(); + bNormalize = Parameters("NORMALISE")->asBool(); + + if( !Analysis.Create(pGrids->Get_Count()) ) + { + return( false ); + } + + //----------------------------------------------------- + pCluster->Set_NoData_Value(-1.0); + + for(iElement=0, nElements=0; iElementGet_Count() && !bNoData; iFeature++) + { + if( pGrids->asGrid(iFeature)->is_NoData(iElement) ) + { + bNoData = true; + } + } + + if( bNoData || !Analysis.Add_Element() ) + { + pCluster->Set_Value(iElement, -1); + } + else + { + pCluster->Set_Value(iElement, 0); + + for(iFeature=0; iFeatureGet_Count(); iFeature++) + { + double d = pGrids->asGrid(iFeature)->asDouble(iElement); + + if( bNormalize ) + { + d = (d - pGrids->asGrid(iFeature)->Get_Mean()) / pGrids->asGrid(iFeature)->Get_StdDev(); + } + + Analysis.Set_Feature(nElements, iFeature, d); + } + + nElements++; + } + } + + if( nElements <= 1 ) + { + return( false ); + } + + //----------------------------------------------------- + bool bResult = Analysis.Execute( + Parameters("METHOD" )->asInt(), + Parameters("NCLUSTER")->asInt(), + Parameters("MAXITER" )->asInt() + ); + + for(iElement=0, nElements=0; iElementis_NoData(iElement) ) + { + pCluster->Set_Value(iElement, Analysis.Get_Cluster(nElements++)); + } + } + + Save_Statistics(pGrids, bNormalize, Analysis); + + Save_LUT(pCluster, Analysis.Get_nClusters()); + + return( bResult ); +} + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +void CGrid_Cluster_Analysis::Save_Statistics(CSG_Parameter_Grid_List *pGrids, bool bNormalize, const CSG_Cluster_Analysis &Analysis) +{ + int iCluster, iFeature; + CSG_String s; + CSG_Table *pTable = Parameters("STATISTICS")->asTable(); + + pTable->Destroy(); + pTable->Set_Name(_TL("Cluster Analysis")); + + pTable->Add_Field(_TL("ClusterID") , SG_DATATYPE_Int); + pTable->Add_Field(_TL("Elements") , SG_DATATYPE_Int); + pTable->Add_Field(_TL("Std.Dev.") , SG_DATATYPE_Double); + + s.Printf(SG_T("\n%s:\t%d \n%s:\t%ld \n%s:\t%d \n%s:\t%d \n%s:\t%f\n\n%s\t%s\t%s"), + _TL("Number of Iterations") , Analysis.Get_Iteration(), + _TL("Number of Elements") , Analysis.Get_nElements(), + _TL("Number of Variables") , Analysis.Get_nFeatures(), + _TL("Number of Clusters") , Analysis.Get_nClusters(), + _TL("Standard Deviation") , sqrt(Analysis.Get_SP()), + _TL("Cluster"), _TL("Elements"), _TL("Std.Dev.") + ); + + for(iFeature=0; iFeatureasGrid(iFeature)->Get_Name()); + + pTable->Add_Field(pGrids->asGrid(iFeature)->Get_Name(), SG_DATATYPE_Double); + } + + Message_Add(s); + + for(iCluster=0; iClusterAdd_Record(); + + pRecord->Set_Value(0, iCluster); + pRecord->Set_Value(1, Analysis.Get_nMembers(iCluster)); + pRecord->Set_Value(2, sqrt(Analysis.Get_Variance(iCluster))); + + for(iFeature=0; iFeatureasGrid(iFeature)->Get_Mean() + Centroid * pGrids->asGrid(iFeature)->Get_StdDev(); + } + + s += CSG_String::Format(SG_T("\t%f"), Centroid); + + pRecord->Set_Value(iFeature + 3, Centroid); + } + + Message_Add(s, false); + } +} + +//--------------------------------------------------------- +void CGrid_Cluster_Analysis::Save_LUT(CSG_Grid *pCluster, int nClusters) +{ + CSG_Parameters Parms; + + if( DataObject_Get_Parameters(pCluster, Parms) && Parms("COLORS_TYPE") && Parms("LUT") ) + { + CSG_Table_Record *pClass; + CSG_Table *pLUT = Parms("LUT")->asTable(); + + for(int iCluster=0; iClusterGet_Record(iCluster)) == NULL ) + { + pClass = pLUT->Add_Record(); + pClass->Set_Value(0, SG_GET_RGB(rand() * 255.0 / RAND_MAX, rand() * 255.0 / RAND_MAX, rand() * 255.0 / RAND_MAX)); + } + + pClass->Set_Value(1, CSG_String::Format(SG_T("%s %d"), _TL("Class"), iCluster + 1)); + pClass->Set_Value(2, CSG_String::Format(SG_T("%s %d"), _TL("Class"), iCluster + 1)); + pClass->Set_Value(3, iCluster); + pClass->Set_Value(4, iCluster); + } + + while( pLUT->Get_Record_Count() > nClusters ) + { + pLUT->Del_Record(pLUT->Get_Record_Count() - 1); + } + + Parms("COLORS_TYPE")->Set_Value(1); // Color Classification Type: Lookup Table + + DataObject_Set_Parameters(pCluster, Parms); + } +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +// // +// // +// // +/////////////////////////////////////////////////////////// +// // +// Deprecated Old Version // +// // +/////////////////////////////////////////////////////////// +// // +// slow, but safes memory ! // +// // +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CGrid_Cluster_Analysis::_On_Execute(void) +{ + int i, j, *nMembers, nCluster, nElements; + double *Variances, **Centroids, SP; + CSG_Grid **Grids, *pCluster; + CSG_Parameter_Grid_List *pGrids; + + //----------------------------------------------------- + pGrids = Parameters("GRIDS") ->asGridList(); + pCluster = Parameters("CLUSTER") ->asGrid(); + nCluster = Parameters("NCLUSTER")->asInt(); + + if( pGrids->Get_Count() < 1 ) + { + return( false ); + } + + //----------------------------------------------------- + Grids = (CSG_Grid **)SG_Malloc(pGrids->Get_Count() * sizeof(CSG_Grid *)); + + if( Parameters("NORMALISE")->asBool() ) + { + for(i=0; iGet_Count(); i++) + { + Grids[i] = SG_Create_Grid(pGrids->asGrid(i), SG_DATATYPE_Float); + Grids[i] ->Assign(pGrids->asGrid(i)); + Grids[i] ->Standardise(); + } + } + else + { + for(i=0; iGet_Count(); i++) + { + Grids[i] = pGrids->asGrid(i); + } + } + + pCluster->Set_NoData_Value(-1.0); + pCluster->Assign_NoData(); + + nMembers = (int *)SG_Malloc(nCluster * sizeof(int)); + Variances = (double *)SG_Malloc(nCluster * sizeof(double)); + Centroids = (double **)SG_Malloc(nCluster * sizeof(double *)); + + for(i=0; iGet_Count() * sizeof(double)); + } + + //------------------------------------------------- + switch( Parameters("METHOD")->asInt() ) + { + case 0: SP = _MinimumDistance (Grids, pGrids->Get_Count(), pCluster, nCluster, nMembers, Variances, Centroids, nElements = Get_NCells()); break; + case 1: SP = _HillClimbing (Grids, pGrids->Get_Count(), pCluster, nCluster, nMembers, Variances, Centroids, nElements = Get_NCells()); break; + case 2: SP = _MinimumDistance (Grids, pGrids->Get_Count(), pCluster, nCluster, nMembers, Variances, Centroids, nElements = Get_NCells()); + SP = _HillClimbing (Grids, pGrids->Get_Count(), pCluster, nCluster, nMembers, Variances, Centroids, nElements = Get_NCells()); break; + } + + //------------------------------------------------- + if( Parameters("NORMALISE")->asBool() ) + { + for(i=0; iGet_Count(); i++) + { + delete(Grids[i]); + + for(j=0; jasGrid(i)->Get_StdDev() * Centroids[j][i] + pGrids->asGrid(i)->Get_Mean(); + } + } + } + + //------------------------------------------------- + Save_LUT(pCluster, nCluster); + + //------------------------------------------------- + int iCluster, iFeature; + CSG_String s; + CSG_Table_Record *pRecord; + CSG_Table *pTable; + + pTable = Parameters("STATISTICS")->asTable(); + + pTable->Destroy(); + pTable->Set_Name(_TL("Cluster Analysis")); + + pTable->Add_Field(_TL("ClusterID") , SG_DATATYPE_Int); + pTable->Add_Field(_TL("Elements") , SG_DATATYPE_Int); + pTable->Add_Field(_TL("Std.Dev.") , SG_DATATYPE_Double); + + s.Printf(SG_T("\n%s:\t%ld \n%s:\t%d \n%s:\t%d \n%s:\t%f\n\n%s\t%s\t%s"), + _TL("Number of Elements") , nElements, + _TL("Number of Variables") , pGrids->Get_Count(), + _TL("Number of Clusters") , nCluster, + _TL("Standard Deviation") , sqrt(SP), + _TL("Cluster"), _TL("Elements"), _TL("Std.Dev.") + ); + + for(iFeature=0; iFeatureGet_Count(); iFeature++) + { + s += CSG_String::Format(SG_T("\t%s"), pGrids->asGrid(iFeature)->Get_Name()); + + pTable->Add_Field(pGrids->asGrid(iFeature)->Get_Name(), SG_DATATYPE_Double); + } + + Message_Add(s); + + for(iCluster=0; iClusterAdd_Record(); + pRecord->Set_Value(0, iCluster); + pRecord->Set_Value(1, nMembers[iCluster]); + pRecord->Set_Value(2, sqrt(Variances[iCluster])); + + for(iFeature=0; iFeatureGet_Count(); iFeature++) + { + double Centroid = Centroids[iCluster][iFeature]; + + if( Parameters("NORMALISE")->asBool() ) + { + Centroid = pGrids->asGrid(iFeature)->Get_Mean() + Centroid * pGrids->asGrid(iFeature)->Get_StdDev(); + } + + s += CSG_String::Format(SG_T("\t%f"), Centroid); + + pRecord->Set_Value(iFeature + 3, Centroid); + } + + Message_Add(s, false); + } + + //------------------------------------------------- + for(i=0; iis_NoData(iElement) ) + { + bContinue = false; + } + } + + if( bContinue ) + { + if( pCluster->asInt(iElement) < 0 || pCluster->asInt(iElement) >= nCluster ) + { + pCluster->Set_Value(iElement, iElement % nCluster); + } + + nClusterElements++; + } + else + { + pCluster->Set_Value(iElement, -1); + } + } + + if( Parameters("UPDATEVIEW")->asBool() ) + { + DataObject_Update(pCluster, 0, nCluster, true); + } + + //----------------------------------------------------- + for(nPasses=1, bContinue=true; bContinue && Process_Get_Okay(false); nPasses++) + { + for(iCluster=0; iClusterasInt(iElement) >= 0 ) + { + iCluster = pCluster->asInt(iElement); + nMembers[iCluster]++; + + for(iGrid=0; iGridasDouble(iElement); + } + } + } + + //------------------------------------------------- + for(iCluster=0; iCluster 0 ? 1.0 / (double)nMembers[iCluster] : 0; + + for(iGrid=0; iGridasInt(iElement) >= 0 ) + { + minVariance = -1; + + for(iCluster=0; iClusterasDouble(iElement); + Variance += d * d; + } + + if( minVariance<0 || VarianceasInt(iElement) != minCluster ) + { + pCluster->Set_Value(iElement, minCluster); + nShifts++; + } + + SP += minVariance; + Variances[minCluster] += minVariance; + } + } + + //------------------------------------------------- + if( nShifts == 0 )//|| (SP_Last >= 0 && SP >= SP_Last) ) + { + bContinue = false; + } + + SP /= nElements; + + Process_Set_Text(CSG_String::Format(SG_T("%s: %d >> %s %f"), + _TL("pass") , nPasses, + _TL("change") , SP_Last < 0.0 ? SP : SP_Last - SP + )); + + SP_Last = SP; + + if( Parameters("UPDATEVIEW")->asBool() ) + { + DataObject_Update(pCluster, 0, nCluster); // Update_Output(); + } + } + + nElements = nClusterElements; + + return( SP ); +} + +//--------------------------------------------------------- +double CGrid_Cluster_Analysis::_HillClimbing(CSG_Grid **Grids, int nGrids, CSG_Grid *pCluster, int nCluster, int *nMembers, double *Variances, double **Centroids, int &nElements) +{ + bool bContinue; + int iElement, iGrid, iCluster, jCluster, kCluster, nClusterElements, noShift, nPasses; + double d, e, n_iK, n_jK, V, VMin, V1, V2, SP, SP_Last = -1; + + //----------------------------------------------------- + for(iCluster=0; iClusteris_NoData(iElement) ) + { + bContinue = false; + } + } + + if( bContinue ) + { + if( pCluster->asInt(iElement) < 0 || pCluster->asInt(iElement) >= nCluster ) + { + pCluster->Set_Value(iElement, iElement % nCluster); + } + + nClusterElements++; + + iCluster = pCluster->asInt(iElement); + + nMembers[iCluster]++; + + V = 0.0; + + for(iGrid=0; iGridasDouble(iElement); + Centroids[iCluster][iGrid] += d; + V += d * d; + } + + Variances[iCluster] += V; + } + else + { + pCluster->Set_Value(iElement, -1); + } + } + + //----------------------------------------------------- + for(iCluster=0; iClusterasBool() ) + { + DataObject_Update(pCluster, 0, nCluster, true); + } + + //----------------------------------------------------- + noShift = 0; + + for(nPasses=1, bContinue=true; bContinue && Process_Get_Okay(false); nPasses++) + { + for(iElement=0; iElementasInt(iElement) >= 0 ) + { + if( noShift++ >= nElements ) + { + bContinue = false; + } + else + { + + //------------------------------------- + iCluster = pCluster->asInt(iElement); + + if( nMembers[iCluster] > 1 ) + { + V = 0.0; + + for(iGrid=0; iGridasDouble(iElement); + V += d * d; + } + + n_iK = nMembers[iCluster]; + V1 = V * n_iK / (n_iK - 1.0); + VMin = -1.0; + + //--------------------------------- + for(jCluster=0; jClusterasDouble(iElement); + V += d * d; + } + + n_jK = nMembers[jCluster]; + V2 = V * n_jK / (n_jK + 1.0); + + if( VMin < 0 || V2 < VMin ) + { + VMin = V2; + kCluster = jCluster; + } + } + } + + //--------------------------------- + if( VMin >= 0 && VMin < V1 ) + { + noShift = 0; + Variances[iCluster] -= V1; + Variances[kCluster] += VMin; + V1 = 1.0 / (n_iK - 1.0); + n_jK = nMembers[kCluster]; + V2 = 1.0 / (n_jK + 1.0); + + for(iGrid=0; iGridasDouble(iElement); + Centroids[iCluster][iGrid] = (n_iK * Centroids[iCluster][iGrid] - d) * V1; + Centroids[kCluster][iGrid] = (n_jK * Centroids[kCluster][iGrid] + d) * V2; + } + + pCluster->Set_Value(iElement, kCluster); + + nMembers[iCluster]--; + nMembers[kCluster]++; + } + } + } + } + } + + //------------------------------------------------- + for(iCluster=0, SP=0.0; iCluster> %s %f"), + _TL("pass") , nPasses, + _TL("change") , SP_Last < 0.0 ? SP : SP_Last - SP + )); + + SP_Last = SP; + + if( Parameters("UPDATEVIEW")->asBool() ) + { + DataObject_Update(pCluster, 0, nCluster); // Update_Output(); + } + } + + nElements = nClusterElements; + + return( SP ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- diff -Nru saga-2.1.0+dfsg/src/modules/imagery/imagery_classification/classify_cluster_analysis.h saga-2.1.4+dfsg/src/modules/imagery/imagery_classification/classify_cluster_analysis.h --- saga-2.1.0+dfsg/src/modules/imagery/imagery_classification/classify_cluster_analysis.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/imagery/imagery_classification/classify_cluster_analysis.h 2014-11-13 08:32:18.000000000 +0000 @@ -0,0 +1,111 @@ +/********************************************************** + * Version $Id: classify_cluster_analysis.h 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// imagery_classification // +// // +//-------------------------------------------------------// +// // +// classify_cluster_analysis.h // +// // +// Copyright (C) 2003 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Goettingen // +// Goldschmidtstr. 5 // +// 37077 Goettingen // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#ifndef HEADER_INCLUDED__Grid_Cluster_Analysis_H +#define HEADER_INCLUDED__Grid_Cluster_Analysis_H + +//--------------------------------------------------------- +#include "MLB_Interface.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +class CGrid_Cluster_Analysis : public CSG_Module_Grid +{ +public: + CGrid_Cluster_Analysis(void); + + +protected: + + virtual int On_Parameters_Enable (CSG_Parameters *pParameters, CSG_Parameter *pParameter); + + virtual bool On_Execute (void); + + +private: + + void Save_Statistics (CSG_Parameter_Grid_List *pGrids, bool bNormalize, const CSG_Cluster_Analysis &Analysis); + void Save_LUT (CSG_Grid *pCluster, int nClusters); + + + bool _On_Execute (void); + double _MinimumDistance (CSG_Grid **Grids, int nGrids, CSG_Grid *pCluster, int nCluster, int *nMembers, double *Variances, double **Centroids, int &nElements); + double _HillClimbing (CSG_Grid **Grids, int nGrids, CSG_Grid *pCluster, int nCluster, int *nMembers, double *Variances, double **Centroids, int &nElements); + +}; + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#endif // #ifndef HEADER_INCLUDED__Grid_Cluster_Analysis_H diff -Nru saga-2.1.0+dfsg/src/modules/imagery/imagery_classification/classify_supervised.cpp saga-2.1.4+dfsg/src/modules/imagery/imagery_classification/classify_supervised.cpp --- saga-2.1.0+dfsg/src/modules/imagery/imagery_classification/classify_supervised.cpp 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/imagery/imagery_classification/classify_supervised.cpp 2014-11-13 08:32:18.000000000 +0000 @@ -0,0 +1,579 @@ +/********************************************************** + * Version $Id: classify_supervised.cpp 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// imagery_classification // +// // +//-------------------------------------------------------// +// // +// Grid_Classify_Supervised.cpp // +// // +// Copyright (C) 2005 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Goettingen // +// Goldschmidtstr. 5 // +// 37077 Goettingen // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "classify_supervised.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +enum +{ + CLASS_ID = 0, + CLASS_ROI_M, + CLASS_ROI_S, + CLASS_TOT_N, + CLASS_ROI_N +}; + +//--------------------------------------------------------- +#define CLASS_NPARMS (CLASS_ROI_S - CLASS_ROI_M + 1) + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +CGrid_Classify_Supervised::CGrid_Classify_Supervised(void) +{ + int i; + CSG_String s; + CSG_Parameter *pNode; + + //----------------------------------------------------- + Set_Name (_TL("Supervised Classification")); + + Set_Author (SG_T("O.Conrad (c) 2005")); + + Set_Description (_TW( + "Supervised Classification" + )); + + //----------------------------------------------------- + Parameters.Add_Grid_List( + NULL , "GRIDS" , _TL("Grids"), + _TL(""), + PARAMETER_INPUT + ); + + pNode = Parameters.Add_Shapes( + NULL , "ROI" , _TL("Training Areas"), + _TL(""), + PARAMETER_INPUT, SHAPE_TYPE_Polygon + ); + + Parameters.Add_Table_Field( + pNode , "ROI_ID" , _TL("Class Identifier"), + _TL("") + ); + + Parameters.Add_Table( + NULL , "STATS" , _TL("Class Statistics"), + _TL(""), + PARAMETER_INPUT + ); + + Parameters.Add_Table( + NULL , "CLASS_INFO" , _TL("Summary"), + _TL(""), + PARAMETER_OUTPUT + ); + + Parameters.Add_Grid( + NULL , "CLASSES" , _TL("Classification"), + _TL(""), + PARAMETER_OUTPUT, true, SG_DATATYPE_Short + ); + + Parameters.Add_Grid( + NULL , "QUALITY" , _TL("Quality"), + _TL("Dependent on chosen method, these are distances or probabilities."), + PARAMETER_OUTPUT_OPTIONAL + ); + + Parameters.Add_Choice( + NULL , "STATS_SRC" , _TL("Get Class Statistics from..."), + _TL(""), + CSG_String::Format(SG_T("%s|%s|"), + _TL("training areas"), + _TL("table") + ), 0 + ); + + for(i=0; i<=SG_CLASSIFY_SUPERVISED_WTA; i++) + { + s += CSG_Classifier_Supervised::Get_Name_of_Method(i) + SG_T("|"); + } + + Parameters.Add_Choice( + NULL , "METHOD" , _TL("Method"), + _TL(""), + s, SG_CLASSIFY_SUPERVISED_MinimumDistance + ); + + Parameters.Add_Value( + NULL , "NORMALISE" , _TL("Normalise"), + _TL(""), + PARAMETER_TYPE_Bool, false + ); + + Parameters.Add_Value( + NULL , "THRESHOLD_DIST" , _TL("Distance Threshold"), + _TL("Let pixel stay unclassified, if minimum or mahalanobis distance is greater than threshold."), + PARAMETER_TYPE_Double, 0.0, 0.0, true + ); + + Parameters.Add_Value( + NULL , "THRESHOLD_PROB" , _TL("Probability Threshold (Percent)"), + _TL("Let pixel stay unclassified, if maximum likelihood probability is less than threshold."), + PARAMETER_TYPE_Double, 0.0, 0.0, true, 100.0, true + ); + + Parameters.Add_Choice( + NULL , "RELATIVE_PROB" , _TL("Probability Reference"), + _TL(""), + CSG_String::Format(SG_T("%s|%s|"), + _TL("absolute"), + _TL("relative") + ), 1 + ); + + Parameters.Add_Value( + NULL , "THRESHOLD_ANGLE" , _TL("Spectral Angle Threshold (Degree)"), + _TL("Let pixel stay unclassified, if spectral angle distance is greater than threshold."), + PARAMETER_TYPE_Double, 0.0, 0.0, true, 90.0, true + ); + + pNode = Parameters.Add_Node( + NULL , "WTA" , _TL("Winner Takes All"), + _TL("") + ); + + for(i=0; iGet_Identifier(), SG_T("STATS_SRC")) ) + { + int Value = pParameter->asInt(); + + pParameters->Get_Parameter("ROI" )->Set_Enabled(Value == 0); + pParameters->Get_Parameter("STATS")->Set_Enabled(Value == 1); + } + + if( !SG_STR_CMP(pParameter->Get_Identifier(), SG_T("METHOD")) ) + { + int Value = pParameter->asInt(); + + pParameters->Get_Parameter("THRESHOLD_DIST" )->Set_Enabled(Value == SG_CLASSIFY_SUPERVISED_MinimumDistance || Value == SG_CLASSIFY_SUPERVISED_Mahalonobis); + pParameters->Get_Parameter("THRESHOLD_PROB" )->Set_Enabled(Value == SG_CLASSIFY_SUPERVISED_MaximumLikelihood); + pParameters->Get_Parameter("RELATIVE_PROB" )->Set_Enabled(Value == SG_CLASSIFY_SUPERVISED_MaximumLikelihood); + pParameters->Get_Parameter("THRESHOLD_ANGLE")->Set_Enabled(Value == SG_CLASSIFY_SUPERVISED_SAM); + pParameters->Get_Parameter("WTA" )->Set_Enabled(Value == SG_CLASSIFY_SUPERVISED_WTA); + } + + //----------------------------------------------------- + return( 1 ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +inline double CGrid_Classify_Supervised::Get_Value(int x, int y, int iGrid) +{ + CSG_Grid *pGrid = m_pGrids->asGrid(iGrid); + + return( m_bNormalise + ? (pGrid->asDouble(x, y) - pGrid->Get_Mean()) / pGrid->Get_StdDev() + : pGrid->asDouble(x, y) + ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CGrid_Classify_Supervised::On_Execute(void) +{ + int Method, Class, i; + double Quality; + + //------------------------------------------------- + m_pGrids = Parameters("GRIDS" )->asGridList(); + m_pClasses = Parameters("CLASSES" )->asGrid(); + m_pQuality = Parameters("QUALITY" )->asGrid(); + m_bNormalise = Parameters("NORMALISE")->asBool(); + Method = Parameters("METHOD" )->asInt(); + + m_Classifier.Set_Distance_Threshold (Parameters("THRESHOLD_DIST" )->asDouble()); + m_Classifier.Set_Probability_Threshold(Parameters("THRESHOLD_PROB" )->asDouble() / 100.0); + m_Classifier.Set_Probability_Relative (Parameters("RELATIVE_PROB" )->asBool ()); + m_Classifier.Set_Angle_Threshold (Parameters("THRESHOLD_ANGLE")->asDouble() * M_DEG_TO_RAD); + + for(i=0; iasBool()); + } + + //----------------------------------------------------- + for(i=m_pGrids->Get_Count()-1; i>=0; i--) + { + if( m_pGrids->asGrid(i)->Get_ZRange() <= 0.0 ) + { + Message_Add(CSG_String::Format(SG_T("%s: %s"), _TL("grid has been dropped"), m_pGrids->asGrid(i)->Get_Name())); + + m_pGrids->Del_Item(i); + } + } + + if( m_pGrids->Get_Count() <= 0 ) + { + Error_Set(_TL("no valid grid in list.")); + + return( false ); + } + + //------------------------------------------------- + Process_Set_Text(_TL("initializing")); + + if( !Initialize() ) + { + return( false ); + } + + //------------------------------------------------- + Process_Set_Text(_TL("running classification")); + + CSG_Vector Features(m_pGrids->Get_Count()); + + for(int y=0; yis_NoData(x, y) ) + { + for(i=0; iGet_Count(); i++) + { + Features[i] = Get_Value(x, y, i); + } + + if( m_Classifier.Get_Class(Features, Class, Quality, Method) ) + { + m_pClasses->Set_Value(x, y, 1 + Class); + } + else + { + m_pClasses->Set_NoData(x, y); + } + + if( m_pQuality ) + { + m_pQuality->Set_Value(x, y, Quality); + } + } + } + } + + return( Finalize() ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CGrid_Classify_Supervised::Initialize(void) +{ + bool bNoData; + int x, y, iGrid, iROI_ID; + TSG_Point p; + CSG_Shapes *pROIs; + + //----------------------------------------------------- + m_pClasses->Set_NoData_Value(-1); + m_pClasses->Assign(0.0); + + m_Classifier.Create(m_pGrids->Get_Count()); + + if( Parameters("STATS_SRC")->asInt() == 0 ) + { + pROIs = Parameters("ROI" )->asShapes(); + iROI_ID = Parameters("ROI_ID")->asInt(); + } + else + { + pROIs = NULL; + + CSG_Table *pStats = Parameters("STATS")->asTable(); + + if( pStats->Get_Field_Count() < (1 + 2 * m_pGrids->Get_Count()) ) + { + Error_Set(_TL("not entries in statistics table.")); + + return( false ); + } + + for(int iClass=0; iClassGet_Count(); iClass++) + { + CSG_Table_Record *pRecord = pStats->Get_Record(iClass); + CSG_Simple_Statistics *pClass = m_Classifier.Get_Statistics(pRecord->asString(0)); + + for(iGrid=0; iGridGet_Count(); iGrid++) + { + pClass[iGrid].Create(pRecord->asDouble(1 + 2 * iGrid), pRecord->asDouble(2 + 2 * iGrid)); + } + } + } + + //----------------------------------------------------- + for(y=0, p.y=Get_YMin(); yGet_Count() && !bNoData; iGrid++) + { + if( m_pGrids->asGrid(iGrid)->is_NoData(x, y) ) + { + bNoData = true; + } + } + + if( bNoData ) + { + m_pClasses->Set_NoData(x, y); + + if( m_pQuality ) + { + m_pQuality->Set_NoData(x, y); + } + } + else if( pROIs ) + { + for(int iROI=0; iROIGet_Count(); iROI++) + { + CSG_Simple_Statistics *pClass; + CSG_Shape_Polygon *pROI = (CSG_Shape_Polygon *)pROIs->Get_Shape(iROI); + + if( pROI->Contains(p) && (pClass = m_Classifier.Get_Statistics(pROI->asString(iROI_ID))) != NULL ) + { + for(iGrid=0; iGridGet_Count(); iGrid++) + { + pClass[iGrid].Add_Value(Get_Value(x, y, iGrid)); + } + } + } + } + } + } + + //----------------------------------------------------- + if( m_Classifier.Get_Class_Count() <= 0 ) + { + Error_Set(_TL("no training areas could be analysed.")); + + return( false ); + } + + return( true ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CGrid_Classify_Supervised::Finalize(void) +{ + int iClass, iGrid, iOffset, nClasses; + CSG_String Name_Method, Name_Quality; + CSG_Table *pTable; + + //----------------------------------------------------- + Name_Method = CSG_Classifier_Supervised::Get_Name_of_Method (Parameters("METHOD")->asInt()); + Name_Quality = CSG_Classifier_Supervised::Get_Name_of_Quality(Parameters("METHOD")->asInt()); + + //----------------------------------------------------- + pTable = Parameters("CLASS_INFO")->asTable(); + + pTable->Destroy(); + pTable->Set_Name(CSG_String::Format(SG_T("%s [%s]"), _TL("Class Information"), Name_Method.c_str())); + + pTable->Add_Field(_TL("ID") , SG_DATATYPE_String); // CLASS_ID + + for(iGrid=0; iGridGet_Count(); iGrid++) + { + pTable->Add_Field(CSG_String::Format(SG_T("B%02d_MEAN") , iGrid + 1), SG_DATATYPE_Double); // CLASS_ROI_M + pTable->Add_Field(CSG_String::Format(SG_T("B%02d_STDDEV"), iGrid + 1), SG_DATATYPE_Double); // CLASS_ROI_S + } + + pTable->Add_Field(_TL("TOT_N"), SG_DATATYPE_Int); // CLASS_TOT_N + pTable->Add_Field(_TL("ROI_N"), SG_DATATYPE_Int); // CLASS_ROI_N + + for(iClass=0; iClassAdd_Record(); + + pRecord->Set_Value(CLASS_ID , m_Classifier.Get_Class_ID(iClass).c_str()); + + for(iGrid=0, iOffset=0; iGridasGrid(iGrid)->Get_Mean() : 0.0; + double s = m_bNormalise ? m_pGrids->asGrid(iGrid)->Get_StdDev() : 1.0; + + pRecord->Set_Value(iOffset + CLASS_ROI_M , pStatistics->Get_Mean () * s + m); + pRecord->Set_Value(iOffset + CLASS_ROI_S , pStatistics->Get_StdDev () * s); + // pRecord->Set_Value(iOffset + CLASS_ROI_MIN, pStatistics->Get_Minimum() * s + m); + // pRecord->Set_Value(iOffset + CLASS_ROI_MAX, pStatistics->Get_Maximum() * s + m); + } + + pRecord->Set_Value(CLASS_NPARMS * m_Classifier.Get_Feature_Count() + 1, m_Classifier.Get_Statistics(iClass)->Get_Count()); + pRecord->Set_Value(CLASS_NPARMS * m_Classifier.Get_Feature_Count() + 2, m_Classifier.Get_Element_Count(iClass)); + } + + //----------------------------------------------------- + CSG_Parameters P; + + if( DataObject_Get_Parameters(m_pClasses, P) && P("COLORS_TYPE") && P("LUT") ) + { + pTable = P("LUT")->asTable(); + + for(iClass=0, nClasses=0; iClass 0 ) + { + CSG_Table_Record *pRecord = pTable->Get_Record(nClasses++); + + if( pRecord == NULL ) + { + pRecord = pTable->Add_Record(); + pRecord->Set_Value(0, SG_GET_RGB(rand() * 255.0 / RAND_MAX, rand() * 255.0 / RAND_MAX, rand() * 255.0 / RAND_MAX)); + } + + pRecord->Set_Value(1, m_Classifier.Get_Class_ID(iClass).c_str()); + pRecord->Set_Value(2, m_Classifier.Get_Class_ID(iClass).c_str()); + pRecord->Set_Value(3, iClass + 1); + pRecord->Set_Value(4, iClass + 1); + } + } + + while( pTable->Get_Record_Count() > m_Classifier.Get_Class_Count() ) + { + pTable->Del_Record(pTable->Get_Record_Count() - 1); + } + + P("COLORS_TYPE")->Set_Value(1); // Color Classification Type: Lookup Table + + DataObject_Set_Parameters(m_pClasses, P); + } + + //----------------------------------------------------- + m_pClasses->Set_Name(CSG_String::Format(SG_T("%s [%s]"), _TL("Classification"), Name_Method.c_str())); + + if( m_pQuality ) + { + m_pQuality->Set_Name(CSG_String::Format(SG_T("%s [%s]"), _TL("Classification Quality"), Name_Quality.c_str())); + + DataObject_Set_Colors(m_pQuality, 100, SG_COLORS_WHITE_GREEN); + } + + //----------------------------------------------------- + return( true ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- diff -Nru saga-2.1.0+dfsg/src/modules/imagery/imagery_classification/classify_supervised.h saga-2.1.4+dfsg/src/modules/imagery/imagery_classification/classify_supervised.h --- saga-2.1.0+dfsg/src/modules/imagery/imagery_classification/classify_supervised.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/imagery/imagery_classification/classify_supervised.h 2014-11-13 08:32:18.000000000 +0000 @@ -0,0 +1,122 @@ +/********************************************************** + * Version $Id: classify_supervised.h 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// imagery_classification // +// // +//-------------------------------------------------------// +// // +// Grid_Classify_Supervised.h // +// // +// Copyright (C) 2003 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Goettingen // +// Goldschmidtstr. 5 // +// 37077 Goettingen // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#ifndef HEADER_INCLUDED__Grid_Classify_Supervised_H +#define HEADER_INCLUDED__Grid_Classify_Supervised_H + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "MLB_Interface.h" + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +class CGrid_Classify_Supervised : public CSG_Module_Grid +{ +public: + CGrid_Classify_Supervised(void); + + +protected: + + virtual bool On_Execute (void); + + virtual int On_Parameters_Enable (CSG_Parameters *pParameters, CSG_Parameter *pParameter); + + +private: + + bool m_bNormalise; + + CSG_Classifier_Supervised m_Classifier; + + CSG_Grid *m_pClasses, *m_pQuality; + + CSG_Parameter_Grid_List *m_pGrids; + + + double Get_Value (int x, int y, int iGrid); + + bool Initialize (void); + bool Finalize (void); + +}; + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#endif // #ifndef HEADER_INCLUDED__Grid_Classify_Supervised_H diff -Nru saga-2.1.0+dfsg/src/modules/imagery/imagery_classification/classify_supervised_polygons.cpp saga-2.1.4+dfsg/src/modules/imagery/imagery_classification/classify_supervised_polygons.cpp --- saga-2.1.0+dfsg/src/modules/imagery/imagery_classification/classify_supervised_polygons.cpp 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/imagery/imagery_classification/classify_supervised_polygons.cpp 2014-11-13 08:32:18.000000000 +0000 @@ -0,0 +1,431 @@ +/********************************************************** + * Version $Id: classify_supervised_polygons.cpp 2104 2014-04-21 15:24:01Z reklov_w $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// imagery_classification // +// // +//-------------------------------------------------------// +// // +// classify_supervised_polygons.cpp // +// // +// Copyright (C) 2012 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Hamburg // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "classify_supervised_polygons.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +enum +{ + CLASS_ID = 0, + CLASS_ROI_M, + CLASS_ROI_S, + CLASS_TOT_N, + CLASS_ROI_N +}; + +//--------------------------------------------------------- +#define CLASS_NPARMS (CLASS_ROI_S - CLASS_ROI_M + 1) + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +CPolygon_Classify_Supervised::CPolygon_Classify_Supervised(void) +{ + CSG_Parameter *pNode; + + //----------------------------------------------------- + Set_Name (_TL("Supervised Classification for Polygons")); + + Set_Author (SG_T("O.Conrad (c) 2012")); + + Set_Description (_TW( + "Supervised Classification" + )); + + //----------------------------------------------------- + pNode = Parameters.Add_Shapes( + NULL , "POLYGONS" , _TL("Polygons"), + _TL(""), + PARAMETER_INPUT, SHAPE_TYPE_Polygon + ); + + Parameters.Add_Table_Field( + pNode , "CLASS_ID" , _TL("Class Identifier"), + _TL("") + ); + + Parameters.Add_Table_Fields( + pNode , "FIELDS" , _TL("Attributes"), + _TL("") + ); + + Parameters.Add_Shapes( + NULL , "CLASSES" , _TL("Classification"), + _TL(""), + PARAMETER_OUTPUT, SHAPE_TYPE_Polygon + ); + + Parameters.Add_Table( + NULL , "CLASS_INFO" , _TL("Summary"), + _TL(""), + PARAMETER_OUTPUT + ); + + Parameters.Add_Choice( + NULL , "METHOD" , _TL("Method"), + _TL(""), + CSG_String::Format(SG_T("%s|%s|"), + CSG_Classifier_Supervised::Get_Name_of_Method(SG_CLASSIFY_SUPERVISED_MinimumDistance).c_str(), + CSG_Classifier_Supervised::Get_Name_of_Method(SG_CLASSIFY_SUPERVISED_SAM).c_str() + ), 0 + ); + + Parameters.Add_Value( + NULL , "NORMALISE" , _TL("Normalise"), + _TL(""), + PARAMETER_TYPE_Bool, false + ); + + Parameters.Add_Value( + NULL , "THRESHOLD_DIST" , _TL("Distance Threshold"), + _TL("Let pixel stay unclassified, if minimum or mahalanobis distance is greater than threshold."), + PARAMETER_TYPE_Double, 0.0, 0.0, true + ); + + Parameters.Add_Value( + NULL , "THRESHOLD_ANGLE" , _TL("Spectral Angle Threshold (Degree)"), + _TL("Let pixel stay unclassified, if spectral angle distance is greater than threshold."), + PARAMETER_TYPE_Double, 0.0, 0.0, true, 90.0, true + ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +int CPolygon_Classify_Supervised::On_Parameters_Enable(CSG_Parameters *pParameters, CSG_Parameter *pParameter) +{ + if( !SG_STR_CMP(pParameter->Get_Identifier(), SG_T("METHOD")) ) + { + int Value = pParameter->asInt(); + + pParameters->Get_Parameter("THRESHOLD_DIST" )->Set_Enabled(Value == 0); + pParameters->Get_Parameter("THRESHOLD_ANGLE")->Set_Enabled(Value == 1); + } + + //----------------------------------------------------- + return( 1 ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CPolygon_Classify_Supervised::On_Execute(void) +{ + bool bNoData; + int Method, Class, i, iPolygon; + double Quality; + + //------------------------------------------------- + m_pPolygons = Parameters("POLYGONS" )->asShapes(); + m_Class_ID = Parameters("CLASS_ID" )->asInt(); + m_pClasses = Parameters("CLASSES" )->asShapes(); + m_bNormalise = Parameters("NORMALISE")->asBool(); + Method = Parameters("METHOD" )->asInt(); + + m_Classifier.Set_Distance_Threshold (Parameters("THRESHOLD_DIST" )->asDouble()); + m_Classifier.Set_Angle_Threshold (Parameters("THRESHOLD_ANGLE")->asDouble() * M_DEG_TO_RAD); + + switch( Method ) + { + default: + case 0: Method = SG_CLASSIFY_SUPERVISED_MinimumDistance; break; + case 1: Method = SG_CLASSIFY_SUPERVISED_SAM; break; + } + + //------------------------------------------------- + m_Features = (int *)Parameters("FIELDS")->asPointer(); + m_nFeatures = Parameters("FIELDS")->asInt (); + + if( !m_Features || m_nFeatures <= 0 ) + { + Error_Set(_TL("no features in selection")); + + return( false ); + } + + //------------------------------------------------- + m_pClasses->Create(SHAPE_TYPE_Polygon, CSG_String::Format(SG_T("%s [%s]"), m_pPolygons->Get_Name(), _TL("Classified")), NULL, m_pPolygons->Get_Vertex_Type()); + m_pClasses->Add_Field(_TL("CLASS_NR"), SG_DATATYPE_Int); + m_pClasses->Add_Field(_TL("CLASS_ID"), SG_DATATYPE_String); + m_pClasses->Add_Field(_TL("QUALITY" ), SG_DATATYPE_Double); + + CSG_Vector Features(m_nFeatures); + + m_Classifier.Create (m_nFeatures); + + //----------------------------------------------------- + Process_Set_Text(_TL("analyzing known classes")); + + for(iPolygon=0; iPolygonGet_Count() && Set_Progress(iPolygon, m_pPolygons->Get_Count()); iPolygon++) + { + CSG_Shape *pPolygon = m_pPolygons->Get_Shape(iPolygon); + + if( SG_STR_LEN(pPolygon->asString(m_Class_ID)) > 0 ) + { + for(i=0, bNoData=false; iis_NoData(m_Features[i]) ) + { + bNoData = true; + } + else + { + Features[i] = pPolygon->asDouble(m_Features[i]); + + if( m_bNormalise ) + { + Features[i] = (Features[i] - m_pPolygons->Get_Mean(m_Features[i])) / m_pPolygons->Get_StdDev(m_Features[i]); + } + } + } + + if( !bNoData ) + { + CSG_Simple_Statistics *pClass = m_Classifier.Get_Statistics(pPolygon->asString(m_Class_ID)); + + for(i=0; iGet_Count() && Set_Progress(iPolygon, m_pPolygons->Get_Count()); iPolygon++) + { + CSG_Shape *pPolygon = m_pPolygons->Get_Shape(iPolygon); + + for(i=0, bNoData=false; iis_NoData(m_Features[i]) ) + { + bNoData = true; + } + else + { + Features[i] = pPolygon->asDouble(m_Features[i]); + + if( m_bNormalise ) + { + Features[i] = (Features[i] - m_pPolygons->Get_Mean(m_Features[i])) / m_pPolygons->Get_StdDev(m_Features[i]); + } + } + } + + if( !bNoData ) + { + if( m_Classifier.Get_Class(Features, Class, Quality, Method) ) + { + CSG_Shape *pClass = m_pClasses->Add_Shape(pPolygon); + + pClass->Set_Value(0, 1 + Class); + pClass->Set_Value(1, m_Classifier.Get_Class_ID(Class)); + pClass->Set_Value(2, Quality); + } + } + } + + //----------------------------------------------------- + Finalize(); + + + return( true ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CPolygon_Classify_Supervised::Finalize(void) +{ + int iClass, iFeature, iOffset, nClasses; + CSG_String Name_Method, Name_Quality; + CSG_Table *pTable; + + //----------------------------------------------------- + Name_Method = CSG_Classifier_Supervised::Get_Name_of_Method (Parameters("METHOD")->asInt()); + Name_Quality = CSG_Classifier_Supervised::Get_Name_of_Quality(Parameters("METHOD")->asInt()); + + //----------------------------------------------------- + pTable = Parameters("CLASS_INFO")->asTable(); + + pTable->Destroy(); + pTable->Set_Name(CSG_String::Format(SG_T("%s [%s]"), _TL("Class Information"), Name_Method.c_str())); + + pTable->Add_Field(_TL("ID") , SG_DATATYPE_String); // CLASS_ID + + for(iFeature=0; iFeatureAdd_Field(CSG_String::Format(SG_T("B%02d_MEAN") , iFeature + 1), SG_DATATYPE_Double); // CLASS_ROI_M + pTable->Add_Field(CSG_String::Format(SG_T("B%02d_STDDEV"), iFeature + 1), SG_DATATYPE_Double); // CLASS_ROI_S + } + + pTable->Add_Field(_TL("TOT_N"), SG_DATATYPE_Int); // CLASS_TOT_N + pTable->Add_Field(_TL("ROI_N"), SG_DATATYPE_Int); // CLASS_ROI_N + + for(iClass=0; iClassAdd_Record(); + + pRecord->Set_Value(CLASS_ID , m_Classifier.Get_Class_ID(iClass).c_str()); + + for(iFeature=0, iOffset=0; iFeatureGet_Mean (m_Features[iFeature]) : 0.0; + double s = m_bNormalise ? m_pPolygons->Get_StdDev(m_Features[iFeature]) : 1.0; + + pRecord->Set_Value(iOffset + CLASS_ROI_M , pStatistics->Get_Mean () * s + m); + pRecord->Set_Value(iOffset + CLASS_ROI_S , pStatistics->Get_StdDev () * s); + // pRecord->Set_Value(iOffset + CLASS_ROI_MIN, pStatistics->Get_Minimum() * s + m); + // pRecord->Set_Value(iOffset + CLASS_ROI_MAX, pStatistics->Get_Maximum() * s + m); + } + + pRecord->Set_Value(CLASS_NPARMS * m_Classifier.Get_Feature_Count() + 1, m_Classifier.Get_Statistics(iClass)->Get_Count()); + pRecord->Set_Value(CLASS_NPARMS * m_Classifier.Get_Feature_Count() + 2, m_Classifier.Get_Element_Count(iClass)); + } + + //----------------------------------------------------- + CSG_Parameters P; + + if( DataObject_Get_Parameters(m_pClasses, P) && P("COLORS_TYPE") && P("LUT") ) + { + pTable = P("LUT")->asTable(); + + for(iClass=0, nClasses=0; iClass 0 ) + { + CSG_Table_Record *pRecord = pTable->Get_Record(nClasses++); + + if( pRecord == NULL ) + { + pRecord = pTable->Add_Record(); + pRecord->Set_Value(0, SG_GET_RGB(rand() * 255.0 / RAND_MAX, rand() * 255.0 / RAND_MAX, rand() * 255.0 / RAND_MAX)); + } + + pRecord->Set_Value(1, m_Classifier.Get_Class_ID(iClass).c_str()); + pRecord->Set_Value(2, m_Classifier.Get_Class_ID(iClass).c_str()); + pRecord->Set_Value(3, iClass + 1); + pRecord->Set_Value(4, iClass + 1); + } + } + + while( pTable->Get_Record_Count() > m_Classifier.Get_Class_Count() ) + { + pTable->Del_Record(pTable->Get_Record_Count() - 1); + } + + P.Set_Parameter("COLORS_TYPE", 1); // Color Classification Type: Lookup Table + P.Set_Parameter("LUT_ATTRIB" , 0); // Lookup Table Attribute + + DataObject_Set_Parameters(m_pClasses, P); + } + + //----------------------------------------------------- + return( true ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- diff -Nru saga-2.1.0+dfsg/src/modules/imagery/imagery_classification/classify_supervised_polygons.h saga-2.1.4+dfsg/src/modules/imagery/imagery_classification/classify_supervised_polygons.h --- saga-2.1.0+dfsg/src/modules/imagery/imagery_classification/classify_supervised_polygons.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/imagery/imagery_classification/classify_supervised_polygons.h 2014-11-13 08:32:18.000000000 +0000 @@ -0,0 +1,117 @@ +/********************************************************** + * Version $Id: classify_supervised_polygons.h 2104 2014-04-21 15:24:01Z reklov_w $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// imagery_classification // +// // +//-------------------------------------------------------// +// // +// classify_supervised_polygons.h // +// // +// Copyright (C) 2012 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Hamburg // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#ifndef HEADER_INCLUDED__classify_supervised_polygons_H +#define HEADER_INCLUDED__classify_supervised_polygons_H + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "MLB_Interface.h" + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +class CPolygon_Classify_Supervised : public CSG_Module +{ +public: + CPolygon_Classify_Supervised(void); + + +protected: + + virtual bool On_Execute (void); + + virtual int On_Parameters_Enable (CSG_Parameters *pParameters, CSG_Parameter *pParameter); + + +private: + + bool m_bNormalise; + + int m_Class_ID, *m_Features, m_nFeatures; + + CSG_Classifier_Supervised m_Classifier; + + CSG_Shapes *m_pPolygons, *m_pClasses; + + + bool Finalize (void); + +}; + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#endif // #ifndef HEADER_INCLUDED__classify_supervised_polygons_H diff -Nru saga-2.1.0+dfsg/src/modules/imagery/imagery_classification/decision_tree.cpp saga-2.1.4+dfsg/src/modules/imagery/imagery_classification/decision_tree.cpp --- saga-2.1.0+dfsg/src/modules/imagery/imagery_classification/decision_tree.cpp 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/imagery/imagery_classification/decision_tree.cpp 2014-11-13 08:32:18.000000000 +0000 @@ -0,0 +1,362 @@ +/********************************************************** + * Version $Id: decision_tree.cpp 1081 2011-06-08 08:05:26Z reklov_w $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// imagery_classification // +// // +//-------------------------------------------------------// +// // +// decision_tree.cpp // +// // +// Copyright (C) 2011 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Hamburg // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "decision_tree.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +CDecision_Tree::CDecision_Tree(void) +{ + //----------------------------------------------------- + Set_Name (_TL("Decision Tree")); + + Set_Author (SG_T("O.Conrad (c) 2011")); + + Set_Description (_TW( + "Decision Tree" + )); + + //----------------------------------------------------- + Parameters.Add_Grid( + NULL , "CLASSES" , _TL("Decision Tree"), + _TL(""), + PARAMETER_OUTPUT, true, SG_DATATYPE_Short + ); + + //----------------------------------------------------- + CSG_Parameter *pRoot = Parameters.Add_Parameters( + NULL , "ROOT" , _TL("Decision"), + _TL("") + ); + + Add_Decision(pRoot->asParameters()); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CDecision_Tree::Add_Decision(CSG_Parameters *pDecision) +{ + if( !pDecision || pDecision->Get_Count() > 0 ) + { + return( false ); + } + + CSG_String ID, ID_Root = pDecision->Get_Identifier(); if( !ID_Root.Cmp(SG_T("ROOT")) ) ID_Root.Clear(); + CSG_Parameter *pNode; + + pNode = pDecision->Add_Grid( + NULL , "GRID" , _TL("Grid"), + _TL(""), + PARAMETER_INPUT, false + ); + + pDecision->Add_Value( + pNode , "THRESHOLD" , _TL("Threshold"), + _TL(""), + PARAMETER_TYPE_Double + ); + + //----------------------------------------------------- + ID = ID_Root + SG_T("A"); + + pNode = pDecision->Add_Node( + NULL , ID + SG_T("|A") , _TL("Lower"), + _TL("") + ); + + pDecision->Add_String( + pNode , ID + SG_T("|NAME"), _TL("Name"), + _TL(""), + ID + ); + + pDecision->Add_Value( + pNode , ID + SG_T("|NODE"), _TL("Children"), + _TL(""), + PARAMETER_TYPE_Bool, false + ); + + pDecision->Add_Parameters( + pNode , ID , _TL("Decision"), + _TL("") + )->asParameters()->Set_Name(ID); + + //----------------------------------------------------- + ID = ID_Root + SG_T("B"); + + pNode = pDecision->Add_Node( + NULL , ID + SG_T("|B") , _TL("Higher"), + _TL("") + ); + + pDecision->Add_String( + pNode , ID + SG_T("|NAME"), _TL("Name"), + _TL(""), + ID + ); + + pDecision->Add_Value( + pNode , ID + SG_T("|NODE"), _TL("Children"), + _TL(""), + PARAMETER_TYPE_Bool, false + ); + + pDecision->Add_Parameters( + pNode , ID , _TL("Decision"), + _TL("") + ); + + return( true ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +int CDecision_Tree::On_Parameter_Changed(CSG_Parameters *pParameters, CSG_Parameter *pParameter) +{ + if( CSG_String(pParameter->Get_Identifier()).Find(SG_T("NODE")) >= 0 ) + { + CSG_String ID = CSG_String(pParameter->Get_Identifier()).BeforeFirst(SG_T('|')); + + if( pParameter->asBool() ) + { + CSG_Parameters *pDecision = pParameters->Get_Parameter(ID)->asParameters(); + + pDecision->Set_Name(CSG_String::Format(SG_T("%s|%s"), pParameters->Get_Name().c_str(), pParameters->Get_Parameter(ID + SG_T("|NAME"))->asString())); + + Add_Decision(pDecision); + } + else + { + pParameters->Get_Parameter(ID)->asParameters()->Del_Parameters(); + } + } + + if( !SG_STR_CMP(pParameter->Get_Identifier(), SG_T("GRID")) ) + { + if( pParameter->asGrid() ) + { + pParameters->Get_Parameter("THRESHOLD")->Set_Value(pParameter->asGrid()->Get_Mean()); + } + } + + return( 0 ); +} + +//--------------------------------------------------------- +int CDecision_Tree::On_Parameters_Enable(CSG_Parameters *pParameters, CSG_Parameter *pParameter) +{ + if( CSG_String(pParameter->Get_Identifier()).Find(SG_T("NODE")) >= 0 ) + { + CSG_String ID = CSG_String(pParameter->Get_Identifier()).BeforeFirst(SG_T('|')); + + pParameters->Get_Parameter(ID)->Set_Enabled(pParameter->asBool()); + } + + return( 0 ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CDecision_Tree::On_Execute(void) +{ + CSG_Grid *pClasses; + + //----------------------------------------------------- + pClasses = Parameters("CLASSES") ->asGrid(); + pClasses ->Set_NoData_Value(-1); + + //----------------------------------------------------- + for(int y=0; ySet_Value(x, y, Get_Class(Parameters("ROOT")->asParameters(), Get_System()->Get_Grid_to_World(x, y))); + } + } + + //----------------------------------------------------- + CSG_Parameters P; + + if( DataObject_Get_Parameters(pClasses, P) && P("COLORS_TYPE") && P("LUT") ) + { + CSG_Table *pTable = P("LUT")->asTable(); + + pTable->Del_Records(); + + Get_Class(Parameters("ROOT")->asParameters(), pTable); + + P("COLORS_TYPE")->Set_Value(1); // Color Classification Type: Lookup Table + + DataObject_Set_Parameters(pClasses, P); + } + + //----------------------------------------------------- + return( true ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +int CDecision_Tree::Get_Class(const CSG_String &ID) +{ + int Class = 0; + + for(int i=0, j=1; iGet_Parameter("GRID")->asGrid(); + + if( pGrid && pGrid->Get_Value(Point, Value) ) + { + CSG_String ID = pDecision->Get_Identifier(); if( !ID.Cmp(SG_T("ROOT")) ) ID.Clear(); + + ID += Value < pDecision->Get_Parameter("THRESHOLD")->asDouble() ? SG_T("A") : SG_T("B"); + + if( pDecision->Get_Parameter(ID + SG_T("|NODE"))->asBool() ) + { + return( Get_Class(pDecision->Get_Parameter(ID)->asParameters(), Point) ); + } + else + { + return( Get_Class(ID) ); + } + } + + return( -1 ); +} + +//--------------------------------------------------------- +int CDecision_Tree::Get_Class(CSG_Parameters *pDecision, CSG_Table *pTable) +{ + CSG_String ID_Root = pDecision->Get_Identifier(); if( !ID_Root.Cmp(SG_T("ROOT")) ) ID_Root.Clear(); + + for(int Child=0; Child<=1; Child++) + { + CSG_String ID = ID_Root + (Child == 0 ? SG_T("A") : SG_T("B")); + + if( pDecision->Get_Parameter(ID + SG_T("|NODE"))->asBool() ) + { + Get_Class(pDecision->Get_Parameter(ID)->asParameters(), pTable); + } + else + { + CSG_Table_Record *pRecord = pTable->Add_Record(); + + pRecord->Set_Value(0, SG_GET_RGB(rand() * 255.0 / RAND_MAX, rand() * 255.0 / RAND_MAX, rand() * 255.0 / RAND_MAX)); + pRecord->Set_Value(1, pDecision->Get_Parameter(ID + SG_T("|NAME"))->asString()); + pRecord->Set_Value(2, pDecision->Get_Parameter(ID + SG_T("|NAME"))->asString()); + pRecord->Set_Value(3, Get_Class(ID)); + pRecord->Set_Value(4, Get_Class(ID)); + } + } + + return( pTable->Get_Count() ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- diff -Nru saga-2.1.0+dfsg/src/modules/imagery/imagery_classification/decision_tree.h saga-2.1.4+dfsg/src/modules/imagery/imagery_classification/decision_tree.h --- saga-2.1.0+dfsg/src/modules/imagery/imagery_classification/decision_tree.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/imagery/imagery_classification/decision_tree.h 2014-11-13 08:32:18.000000000 +0000 @@ -0,0 +1,117 @@ +/********************************************************** + * Version $Id: decision_tree.h 911 2011-02-14 16:38:15Z reklov_w $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// imagery_classification // +// // +//-------------------------------------------------------// +// // +// decision_tree.h // +// // +// Copyright (C) 2011 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Hamburg // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#ifndef HEADER_INCLUDED__decision_tree_H +#define HEADER_INCLUDED__decision_tree_H + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "MLB_Interface.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +class CDecision_Tree : public CSG_Module_Grid +{ +public: + CDecision_Tree(void); + + virtual bool needs_GUI (void) { return( true ); } + + +protected: + + virtual int On_Parameter_Changed (CSG_Parameters *pParameters, CSG_Parameter *pParameter); + virtual int On_Parameters_Enable (CSG_Parameters *pParameters, CSG_Parameter *pParameter); + + virtual bool On_Execute (void); + + +private: + + bool Add_Decision (CSG_Parameters *pDecision); + + int Get_Class (const CSG_String &ID); + int Get_Class (CSG_Parameters *pDecision, const TSG_Point &Point); + int Get_Class (CSG_Parameters *pDecision, CSG_Table *pTable); + +}; + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#endif // #ifndef HEADER_INCLUDED__decision_tree_H diff -Nru saga-2.1.0+dfsg/src/modules/imagery/imagery_classification/Makefile.am saga-2.1.4+dfsg/src/modules/imagery/imagery_classification/Makefile.am --- saga-2.1.0+dfsg/src/modules/imagery/imagery_classification/Makefile.am 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/imagery/imagery_classification/Makefile.am 2014-11-13 08:32:18.000000000 +0000 @@ -0,0 +1,27 @@ +if DEBUG +DBGFLAGS = -g -DDEBUG +endif +if SAGA_UNICODE +UC_DEFS = -D_SAGA_UNICODE +endif +DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD +CXX_INCS = -I$(top_srcdir)/src/saga_core +AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS) +AM_LDFLAGS = -fPIC -shared -avoid-version +pkglib_LTLIBRARIES = libimagery_classification.la +libimagery_classification_la_SOURCES =\ +change_detection.cpp\ +classify_cluster_analysis.cpp\ +classify_supervised.cpp\ +classify_supervised_polygons.cpp\ +decision_tree.cpp\ +MLB_Interface.cpp\ +change_detection.h\ +classify_cluster_analysis.h\ +classify_supervised.h\ +classify_supervised_polygons.h\ +decision_tree.h\ +MLB_Interface.h + +libimagery_classification_la_LIBADD = $(top_srcdir)/src/saga_core/saga_api/libsaga_api.la + diff -Nru saga-2.1.0+dfsg/src/modules/imagery/imagery_classification/Makefile.in saga-2.1.4+dfsg/src/modules/imagery/imagery_classification/Makefile.in --- saga-2.1.0+dfsg/src/modules/imagery/imagery_classification/Makefile.in 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/imagery/imagery_classification/Makefile.in 2014-11-13 08:33:31.000000000 +0000 @@ -0,0 +1,711 @@ +# Makefile.in generated by automake 1.14.1 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +subdir = src/modules/imagery/imagery_classification +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_postgresql.m4 \ + $(top_srcdir)/m4/ax_pkg_swig.m4 \ + $(top_srcdir)/m4/ax_python_devel.m4 \ + $(top_srcdir)/m4/ax_swig_enable_cxx.m4 \ + $(top_srcdir)/m4/ax_swig_python.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__installdirs = "$(DESTDIR)$(pkglibdir)" +LTLIBRARIES = $(pkglib_LTLIBRARIES) +libimagery_classification_la_DEPENDENCIES = \ + $(top_srcdir)/src/saga_core/saga_api/libsaga_api.la +am_libimagery_classification_la_OBJECTS = change_detection.lo \ + classify_cluster_analysis.lo classify_supervised.lo \ + classify_supervised_polygons.lo decision_tree.lo \ + MLB_Interface.lo +libimagery_classification_la_OBJECTS = \ + $(am_libimagery_classification_la_OBJECTS) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) +depcomp = $(SHELL) $(top_srcdir)/depcomp +am__depfiles_maybe = depfiles +am__mv = mv -f +CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = +CXXLD = $(CXX) +CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = +CCLD = $(CC) +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = +SOURCES = $(libimagery_classification_la_SOURCES) +DIST_SOURCES = $(libimagery_classification_la_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +AX_SWIG_PYTHON_CPPFLAGS = @AX_SWIG_PYTHON_CPPFLAGS@ +AX_SWIG_PYTHON_OPT = @AX_SWIG_PYTHON_OPT@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DISABLELIBHARU = @DISABLELIBHARU@ +DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +FGREP = @FGREP@ +GOMPFLAGS = @GOMPFLAGS@ +GREP = @GREP@ +HARU_LIB = @HARU_LIB@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LOCAL_INCS = @LOCAL_INCS@ +LOCAL_LIBS = @LOCAL_LIBS@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ +MKDIR_P = @MKDIR_P@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PG_CONFIG = @PG_CONFIG@ +POSTGRESQL_CFLAGS = @POSTGRESQL_CFLAGS@ +POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@ +POSTGRESQL_VERSION = @POSTGRESQL_VERSION@ +POW_LIB = @POW_LIB@ +PYTHON = @PYTHON@ +PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ +PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ +PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ +PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_PLATFORM = @PYTHON_PLATFORM@ +PYTHON_PREFIX = @PYTHON_PREFIX@ +PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ +PYTHON_VERSION = @PYTHON_VERSION@ +RANLIB = @RANLIB@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +SWIG = @SWIG@ +SWIG_LIB = @SWIG_LIB@ +VERSION = @VERSION@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +pkgpyexecdir = @pkgpyexecdir@ +pkgpythondir = @pkgpythondir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +pyexecdir = @pyexecdir@ +pythondir = @pythondir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +@DEBUG_TRUE@DBGFLAGS = -g -DDEBUG +@SAGA_UNICODE_TRUE@UC_DEFS = -D_SAGA_UNICODE +DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD +CXX_INCS = -I$(top_srcdir)/src/saga_core +AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS) +AM_LDFLAGS = -fPIC -shared -avoid-version +pkglib_LTLIBRARIES = libimagery_classification.la +libimagery_classification_la_SOURCES = \ +change_detection.cpp\ +classify_cluster_analysis.cpp\ +classify_supervised.cpp\ +classify_supervised_polygons.cpp\ +decision_tree.cpp\ +MLB_Interface.cpp\ +change_detection.h\ +classify_cluster_analysis.h\ +classify_supervised.h\ +classify_supervised_polygons.h\ +decision_tree.h\ +MLB_Interface.h + +libimagery_classification_la_LIBADD = $(top_srcdir)/src/saga_core/saga_api/libsaga_api.la +all: all-am + +.SUFFIXES: +.SUFFIXES: .cpp .lo .o .obj +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/modules/imagery/imagery_classification/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign src/modules/imagery/imagery_classification/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): + +install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) + @$(NORMAL_INSTALL) + @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ + list2=; for p in $$list; do \ + if test -f $$p; then \ + list2="$$list2 $$p"; \ + else :; fi; \ + done; \ + test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \ + } + +uninstall-pkglibLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ + for p in $$list; do \ + $(am__strip_dir) \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$f"; \ + done + +clean-pkglibLTLIBRARIES: + -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES) + @list='$(pkglib_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + +libimagery_classification.la: $(libimagery_classification_la_OBJECTS) $(libimagery_classification_la_DEPENDENCIES) $(EXTRA_libimagery_classification_la_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) -rpath $(pkglibdir) $(libimagery_classification_la_OBJECTS) $(libimagery_classification_la_LIBADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MLB_Interface.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/change_detection.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/classify_cluster_analysis.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/classify_supervised.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/classify_supervised_polygons.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/decision_tree.Plo@am__quote@ + +.cpp.o: +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< + +.cpp.obj: +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + +.cpp.lo: +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + set x; \ + here=`pwd`; \ + $(am__define_uniq_tagged_files); \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ + fi +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ + test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(LTLIBRARIES) +installdirs: + for dir in "$(DESTDIR)$(pkglibdir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool clean-pkglibLTLIBRARIES \ + mostlyclean-am + +distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: install-pkglibLTLIBRARIES + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-pkglibLTLIBRARIES + +.MAKE: install-am install-strip + +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-pkglibLTLIBRARIES install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ + uninstall-pkglibLTLIBRARIES + + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nru saga-2.1.0+dfsg/src/modules/imagery/imagery_classification/MLB_Interface.cpp saga-2.1.4+dfsg/src/modules/imagery/imagery_classification/MLB_Interface.cpp --- saga-2.1.0+dfsg/src/modules/imagery/imagery_classification/MLB_Interface.cpp 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/imagery/imagery_classification/MLB_Interface.cpp 2014-11-13 08:32:18.000000000 +0000 @@ -0,0 +1,136 @@ +/********************************************************** + * Version $Id: MLB_Interface.cpp 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// imagery_classification // +// // +//-------------------------------------------------------// +// // +// MLB_Interface.cpp // +// // +// Copyright (C) 2003 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Goettingen // +// Goldschmidtstr. 5 // +// 37077 Goettingen // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// The Module Link Library Interface // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +// 1. Include the appropriate SAGA-API header... + +#include "MLB_Interface.h" + + +//--------------------------------------------------------- +// 2. Place general module library informations here... + +CSG_String Get_Info(int i) +{ + switch( i ) + { + case MLB_INFO_Name: default: + return( _TL("Classification") ); + + case MLB_INFO_Category: + return( _TL("Imagery") ); + + case MLB_INFO_Author: + return( SG_T("O. Conrad (c) 2002-11") ); + + case MLB_INFO_Description: + return( _TL("Classification tools for grids.") ); + + case MLB_INFO_Version: + return( SG_T("1.0") ); + + case MLB_INFO_Menu_Path: + return( _TL("Imagery|Classification") ); + } +} + + +//--------------------------------------------------------- +// 3. Include the headers of your modules here... + +#include "classify_supervised.h" +#include "classify_cluster_analysis.h" +#include "change_detection.h" +#include "decision_tree.h" +#include "classify_supervised_polygons.h" + + +//--------------------------------------------------------- +// 4. Allow your modules to be created here... + +CSG_Module * Create_Module(int i) +{ + switch( i ) + { + case 0: return( new CGrid_Classify_Supervised ); + case 1: return( new CGrid_Cluster_Analysis ); + case 2: return( new CChange_Detection ); + case 3: return( new CDecision_Tree ); + case 4: return( new CPolygon_Classify_Supervised ); + } + + return( NULL ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +//{{AFX_SAGA + + MLB_INTERFACE + +//}}AFX_SAGA diff -Nru saga-2.1.0+dfsg/src/modules/imagery/imagery_classification/MLB_Interface.h saga-2.1.4+dfsg/src/modules/imagery/imagery_classification/MLB_Interface.h --- saga-2.1.0+dfsg/src/modules/imagery/imagery_classification/MLB_Interface.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/imagery/imagery_classification/MLB_Interface.h 2014-11-13 08:32:18.000000000 +0000 @@ -0,0 +1,85 @@ +/********************************************************** + * Version $Id: MLB_Interface.h 1922 2014-01-09 10:28:46Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// imagery_classification // +// // +//-------------------------------------------------------// +// // +// MLB_Interface.h // +// // +// Copyright (C) 2003 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Goettingen // +// Goldschmidtstr. 5 // +// 37077 Goettingen // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// Include the SAGA-API here // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#ifndef HEADER_INCLUDED__grid_discretisation_H +#define HEADER_INCLUDED__grid_discretisation_H + +//--------------------------------------------------------- +#include + +//--------------------------------------------------------- +#ifdef grid_discretisation_EXPORTS + #define grid_discretisation_EXPORT _SAGA_DLL_EXPORT +#else + #define grid_discretisation_EXPORT _SAGA_DLL_IMPORT +#endif + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#endif // #ifndef HEADER_INCLUDED__grid_discretisation_H diff -Nru saga-2.1.0+dfsg/src/modules/imagery/imagery_opencv/Makefile.am saga-2.1.4+dfsg/src/modules/imagery/imagery_opencv/Makefile.am --- saga-2.1.0+dfsg/src/modules/imagery/imagery_opencv/Makefile.am 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/imagery/imagery_opencv/Makefile.am 2014-11-13 08:32:18.000000000 +0000 @@ -0,0 +1,33 @@ +# +# $Id: Makefile.am 1856 2013-10-17 09:46:51Z oconrad $ +# +if DEBUG +DBGFLAGS = -g -DDEBUG +endif +if SAGA_UNICODE +UC_DEFS = -D_SAGA_UNICODE +endif +if HAVE_CV +DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD +CXX_INCS = -I$(top_srcdir)/src/saga_core -I/usr/include/opencv +AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS) +AM_LDFLAGS = -fPIC -shared -avoid-version -lcv +pkglib_LTLIBRARIES = libimagery_opencv.la +libimagery_opencv_la_SOURCES =\ +MLB_Interface.cpp\ +opencv.cpp\ +opencv_fourier.cpp\ +opencv_morphology.cpp\ +opencv_nnet.cpp\ +opencv_stereo_match.cpp\ +opencv_svd.cpp\ +MLB_Interface.h\ +opencv.h\ +opencv_fourier.h\ +opencv_morphology.h\ +opencv_nnet.h\ +opencv_stereo_match.h\ +opencv_svd.h + +libimagery_opencv_la_LIBADD = $(top_srcdir)/src/saga_core/saga_api/libsaga_api.la +endif diff -Nru saga-2.1.0+dfsg/src/modules/imagery/imagery_opencv/Makefile.in saga-2.1.4+dfsg/src/modules/imagery/imagery_opencv/Makefile.in --- saga-2.1.0+dfsg/src/modules/imagery/imagery_opencv/Makefile.in 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/imagery/imagery_opencv/Makefile.in 2014-11-13 08:33:31.000000000 +0000 @@ -0,0 +1,722 @@ +# Makefile.in generated by automake 1.14.1 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +subdir = src/modules/imagery/imagery_opencv +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_postgresql.m4 \ + $(top_srcdir)/m4/ax_pkg_swig.m4 \ + $(top_srcdir)/m4/ax_python_devel.m4 \ + $(top_srcdir)/m4/ax_swig_enable_cxx.m4 \ + $(top_srcdir)/m4/ax_swig_python.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__installdirs = "$(DESTDIR)$(pkglibdir)" +LTLIBRARIES = $(pkglib_LTLIBRARIES) +@HAVE_CV_TRUE@libimagery_opencv_la_DEPENDENCIES = $(top_srcdir)/src/saga_core/saga_api/libsaga_api.la +am__libimagery_opencv_la_SOURCES_DIST = MLB_Interface.cpp opencv.cpp \ + opencv_fourier.cpp opencv_morphology.cpp opencv_nnet.cpp \ + opencv_stereo_match.cpp opencv_svd.cpp MLB_Interface.h \ + opencv.h opencv_fourier.h opencv_morphology.h opencv_nnet.h \ + opencv_stereo_match.h opencv_svd.h +@HAVE_CV_TRUE@am_libimagery_opencv_la_OBJECTS = MLB_Interface.lo \ +@HAVE_CV_TRUE@ opencv.lo opencv_fourier.lo opencv_morphology.lo \ +@HAVE_CV_TRUE@ opencv_nnet.lo opencv_stereo_match.lo \ +@HAVE_CV_TRUE@ opencv_svd.lo +libimagery_opencv_la_OBJECTS = $(am_libimagery_opencv_la_OBJECTS) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +@HAVE_CV_TRUE@am_libimagery_opencv_la_rpath = -rpath $(pkglibdir) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) +depcomp = $(SHELL) $(top_srcdir)/depcomp +am__depfiles_maybe = depfiles +am__mv = mv -f +CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = +CXXLD = $(CXX) +CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = +CCLD = $(CC) +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = +SOURCES = $(libimagery_opencv_la_SOURCES) +DIST_SOURCES = $(am__libimagery_opencv_la_SOURCES_DIST) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +AX_SWIG_PYTHON_CPPFLAGS = @AX_SWIG_PYTHON_CPPFLAGS@ +AX_SWIG_PYTHON_OPT = @AX_SWIG_PYTHON_OPT@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DISABLELIBHARU = @DISABLELIBHARU@ +DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +FGREP = @FGREP@ +GOMPFLAGS = @GOMPFLAGS@ +GREP = @GREP@ +HARU_LIB = @HARU_LIB@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LOCAL_INCS = @LOCAL_INCS@ +LOCAL_LIBS = @LOCAL_LIBS@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ +MKDIR_P = @MKDIR_P@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PG_CONFIG = @PG_CONFIG@ +POSTGRESQL_CFLAGS = @POSTGRESQL_CFLAGS@ +POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@ +POSTGRESQL_VERSION = @POSTGRESQL_VERSION@ +POW_LIB = @POW_LIB@ +PYTHON = @PYTHON@ +PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ +PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ +PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ +PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_PLATFORM = @PYTHON_PLATFORM@ +PYTHON_PREFIX = @PYTHON_PREFIX@ +PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ +PYTHON_VERSION = @PYTHON_VERSION@ +RANLIB = @RANLIB@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +SWIG = @SWIG@ +SWIG_LIB = @SWIG_LIB@ +VERSION = @VERSION@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +pkgpyexecdir = @pkgpyexecdir@ +pkgpythondir = @pkgpythondir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +pyexecdir = @pyexecdir@ +pythondir = @pythondir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ + +# +# $Id: Makefile.am 1856 2013-10-17 09:46:51Z oconrad $ +# +@DEBUG_TRUE@DBGFLAGS = -g -DDEBUG +@SAGA_UNICODE_TRUE@UC_DEFS = -D_SAGA_UNICODE +@HAVE_CV_TRUE@DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD +@HAVE_CV_TRUE@CXX_INCS = -I$(top_srcdir)/src/saga_core -I/usr/include/opencv +@HAVE_CV_TRUE@AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS) +@HAVE_CV_TRUE@AM_LDFLAGS = -fPIC -shared -avoid-version -lcv +@HAVE_CV_TRUE@pkglib_LTLIBRARIES = libimagery_opencv.la +@HAVE_CV_TRUE@libimagery_opencv_la_SOURCES = \ +@HAVE_CV_TRUE@MLB_Interface.cpp\ +@HAVE_CV_TRUE@opencv.cpp\ +@HAVE_CV_TRUE@opencv_fourier.cpp\ +@HAVE_CV_TRUE@opencv_morphology.cpp\ +@HAVE_CV_TRUE@opencv_nnet.cpp\ +@HAVE_CV_TRUE@opencv_stereo_match.cpp\ +@HAVE_CV_TRUE@opencv_svd.cpp\ +@HAVE_CV_TRUE@MLB_Interface.h\ +@HAVE_CV_TRUE@opencv.h\ +@HAVE_CV_TRUE@opencv_fourier.h\ +@HAVE_CV_TRUE@opencv_morphology.h\ +@HAVE_CV_TRUE@opencv_nnet.h\ +@HAVE_CV_TRUE@opencv_stereo_match.h\ +@HAVE_CV_TRUE@opencv_svd.h + +@HAVE_CV_TRUE@libimagery_opencv_la_LIBADD = $(top_srcdir)/src/saga_core/saga_api/libsaga_api.la +all: all-am + +.SUFFIXES: +.SUFFIXES: .cpp .lo .o .obj +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/modules/imagery/imagery_opencv/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign src/modules/imagery/imagery_opencv/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): + +install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) + @$(NORMAL_INSTALL) + @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ + list2=; for p in $$list; do \ + if test -f $$p; then \ + list2="$$list2 $$p"; \ + else :; fi; \ + done; \ + test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \ + } + +uninstall-pkglibLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ + for p in $$list; do \ + $(am__strip_dir) \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$f"; \ + done + +clean-pkglibLTLIBRARIES: + -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES) + @list='$(pkglib_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + +libimagery_opencv.la: $(libimagery_opencv_la_OBJECTS) $(libimagery_opencv_la_DEPENDENCIES) $(EXTRA_libimagery_opencv_la_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) $(am_libimagery_opencv_la_rpath) $(libimagery_opencv_la_OBJECTS) $(libimagery_opencv_la_LIBADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MLB_Interface.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/opencv.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/opencv_fourier.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/opencv_morphology.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/opencv_nnet.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/opencv_stereo_match.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/opencv_svd.Plo@am__quote@ + +.cpp.o: +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< + +.cpp.obj: +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + +.cpp.lo: +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + set x; \ + here=`pwd`; \ + $(am__define_uniq_tagged_files); \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ + fi +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ + test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(LTLIBRARIES) +installdirs: + for dir in "$(DESTDIR)$(pkglibdir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool clean-pkglibLTLIBRARIES \ + mostlyclean-am + +distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: install-pkglibLTLIBRARIES + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-pkglibLTLIBRARIES + +.MAKE: install-am install-strip + +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-pkglibLTLIBRARIES install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ + uninstall-pkglibLTLIBRARIES + + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nru saga-2.1.0+dfsg/src/modules/imagery/imagery_opencv/MLB_Interface.cpp saga-2.1.4+dfsg/src/modules/imagery/imagery_opencv/MLB_Interface.cpp --- saga-2.1.0+dfsg/src/modules/imagery/imagery_opencv/MLB_Interface.cpp 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/imagery/imagery_opencv/MLB_Interface.cpp 2014-11-13 08:32:18.000000000 +0000 @@ -0,0 +1,143 @@ +/********************************************************** + * Version $Id: MLB_Interface.cpp 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// OpenCV // +// // +//-------------------------------------------------------// +// // +// MLB_Interface.cpp // +// // +// Copyright (C) 2009 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Hamburg // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// The Module Link Library Interface // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +// 1. Include the appropriate SAGA-API header... + +#include "MLB_Interface.h" + +#include + +//--------------------------------------------------------- +// 2. Place general module library informations here... + +CSG_String Get_Info(int i) +{ + switch( i ) + { + case MLB_INFO_Name: default: + return( _TL("OpenCV") ); + + case MLB_INFO_Category: + return( _TL("Imagery") ); + + case MLB_INFO_Author: + return( _TL("O. Conrad (c) 2009") ); + + case MLB_INFO_Description: + { + CSG_String s; + + s += _TW("OpenCV - \"Open Source Computer Vision Library\"\nVersion: "); + s += CV_VERSION; + s += "\nOpenCV homepage"; + + return( s ); + } + + case MLB_INFO_Version: + return( SG_T("1.0") ); + + case MLB_INFO_Menu_Path: + return( _TL("Imagery") ); + } +} + + +//--------------------------------------------------------- +// 3. Include the headers of your modules here... + +#include "opencv_morphology.h" +#include "opencv_fourier.h" +#include "opencv_svd.h" +#include "opencv_nnet.h" +#include "opencv_stereo_match.h" + + +//--------------------------------------------------------- +// 4. Allow your modules to be created here... + +CSG_Module * Create_Module(int i) +{ + switch( i ) + { + case 0: return( new COpenCV_Morphology ); + case 1: return( new COpenCV_FFT ); + case 2: return( new COpenCV_SVD ); + case 3: return( new COpenCV_NNet ); + case 4: return( new COpenCV_Stereo_Match ); + } + + return( NULL ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +//{{AFX_SAGA + + MLB_INTERFACE + +//}}AFX_SAGA diff -Nru saga-2.1.0+dfsg/src/modules/imagery/imagery_opencv/MLB_Interface.h saga-2.1.4+dfsg/src/modules/imagery/imagery_opencv/MLB_Interface.h --- saga-2.1.0+dfsg/src/modules/imagery/imagery_opencv/MLB_Interface.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/imagery/imagery_opencv/MLB_Interface.h 2014-11-13 08:32:18.000000000 +0000 @@ -0,0 +1,76 @@ +/********************************************************** + * Version $Id: MLB_Interface.h 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// OpenCV // +// // +//-------------------------------------------------------// +// // +// MLB_Interface.h // +// // +// Copyright (C) 2009 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Hamburg // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// Include the SAGA-API here // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#ifndef HEADER_INCLUDED__MLB_OPENCV_H +#define HEADER_INCLUDED__MLB_OPENCV_H + +//--------------------------------------------------------- +#include + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#endif // #ifndef HEADER_INCLUDED__MLB_OPENCV_H diff -Nru saga-2.1.0+dfsg/src/modules/imagery/imagery_opencv/opencv.cpp saga-2.1.4+dfsg/src/modules/imagery/imagery_opencv/opencv.cpp --- saga-2.1.0+dfsg/src/modules/imagery/imagery_opencv/opencv.cpp 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/imagery/imagery_opencv/opencv.cpp 2014-11-13 08:32:18.000000000 +0000 @@ -0,0 +1,359 @@ +/********************************************************** + * Version $Id: opencv.cpp 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// OpenCV // +// // +//-------------------------------------------------------// +// // +// opencv.cpp // +// // +// Copyright (C) 2009 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Hamburg // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "opencv.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +int Get_CVMatrix_Type (TSG_Data_Type Type) +{ + switch( Type ) + { + case SG_DATATYPE_Bit: + case SG_DATATYPE_Byte: return( CV_8U ); // Unsigned 8-bit integer + + case SG_DATATYPE_Char: return( CV_8S ); // Signed 8-bit integer + + case SG_DATATYPE_Word: return( CV_16U ); // Unsigned 16-bit integer + + case SG_DATATYPE_Short: return( CV_16S ); // Signed 16-bit integer + + case SG_DATATYPE_Color: + case SG_DATATYPE_DWord: + case SG_DATATYPE_ULong: + case SG_DATATYPE_Long: + case SG_DATATYPE_Int: return( CV_32S ); // Signed 32-bit integer + + default: + case SG_DATATYPE_Float: return( CV_32F ); // Single-precision floating point + + case SG_DATATYPE_Double: return( CV_64F ); // Double-precision floating point + } +} + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool Copy_Grid_To_CVMatrix(CSG_Grid *pGrid, cv::Mat *pMatrix, bool bCheckSize) +{ + if( pMatrix && pGrid && (!bCheckSize || (pGrid->Get_NX() == pMatrix->cols && pGrid->Get_NY() == pMatrix->rows)) ) + { + int nx = pGrid->Get_NX() < pMatrix->cols ? pGrid->Get_NX() : pMatrix->cols; + int ny = pGrid->Get_NY() < pMatrix->rows ? pGrid->Get_NY() : pMatrix->rows; + + #pragma omp parallel for + for(int y=0; yrow(y); + + for(int x=0; xtype() ) + { + case CV_8U : Row.data.ptr[x] = pGrid->asByte (x, y); break; + case CV_8S : Row.data.ptr[x] = pGrid->asChar (x, y); break; + case CV_16U: Row.data.s [x] = pGrid->asShort (x, y); break; + case CV_16S: Row.data.s [x] = pGrid->asShort (x, y); break; + case CV_32S: Row.data.i [x] = pGrid->asInt (x, y); break; + case CV_32F: Row.data.fl [x] = pGrid->asFloat (x, y); break; + case CV_64F: Row.data.db [x] = pGrid->asDouble(x, y); break; + } + } + } + + return( true ); + } + + return( false ); +} + +//--------------------------------------------------------- +bool Copy_CVMatrix_To_Grid(CSG_Grid *pGrid, cv::Mat *pMatrix, bool bCheckSize) +{ + if( pMatrix && pGrid && (!bCheckSize || (pGrid->Get_NX() == pMatrix->cols && pGrid->Get_NY() == pMatrix->rows)) ) + { + int nx = pGrid->Get_NX() < pMatrix->cols ? pGrid->Get_NX() : pMatrix->cols; + int ny = pGrid->Get_NY() < pMatrix->rows ? pGrid->Get_NY() : pMatrix->rows; + + #pragma omp parallel for + for(int y=0; yrow(y); + + for(int x=0; xtype() ) + { + case CV_8U : pGrid->Set_Value(x, y, Row.data.ptr[x]); break; + case CV_8S : pGrid->Set_Value(x, y, ((char *)Row.data.ptr)[x]); break; + case CV_16U: pGrid->Set_Value(x, y, ((WORD *)Row.data.s )[x]); break; + case CV_16S: pGrid->Set_Value(x, y, Row.data.s [x]); break; + case CV_32S: pGrid->Set_Value(x, y, Row.data.i [x]); break; + case CV_32F: pGrid->Set_Value(x, y, Row.data.fl [x]); break; + case CV_64F: pGrid->Set_Value(x, y, Row.data.db [x]); break; + } + } + } + + return( true ); + } + + return( false ); +} + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool Get_CVMatrix(cv::Mat &Matrix, int nx, int ny, TSG_Data_Type Type) +{ + if( nx > 0 && ny > 0 ) + { + CvSize Size; + + Size.width = nx; + Size.height = ny; + + Matrix.create(Size, Get_CVMatrix_Type(Type)); + + return( true ); + } + + return( false ); +} + +//--------------------------------------------------------- +bool Get_CVMatrix(cv::Mat &Matrix, CSG_Grid *pGrid, TSG_Data_Type Type) +{ + if( pGrid && pGrid->is_Valid() && Get_CVMatrix(Matrix, pGrid->Get_NX(), pGrid->Get_NY(), Type == SG_DATATYPE_Undefined ? pGrid->Get_Type() : Type) ) + { + Copy_Grid_To_CVMatrix(pGrid, &Matrix); + + return( true ); + } + + return( false ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +int Get_CVImage_Type (TSG_Data_Type Type) +{ + switch( Type ) + { + case SG_DATATYPE_Bit: + case SG_DATATYPE_Byte: return( IPL_DEPTH_8U ); // Unsigned 8-bit integer + + case SG_DATATYPE_Char: return( IPL_DEPTH_8S ); // Signed 8-bit integer + + case SG_DATATYPE_Word: return( IPL_DEPTH_16U ); // Unsigned 16-bit integer + + case SG_DATATYPE_Short: return( IPL_DEPTH_16S ); // Signed 16-bit integer + + case SG_DATATYPE_Color: + case SG_DATATYPE_DWord: + case SG_DATATYPE_ULong: + case SG_DATATYPE_Long: + case SG_DATATYPE_Int: return( IPL_DEPTH_32S ); // Signed 32-bit integer + + default: + case SG_DATATYPE_Float: return( IPL_DEPTH_32F ); // Single-precision floating point + + case SG_DATATYPE_Double: return( IPL_DEPTH_64F ); // Double-precision floating point + } +} + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool Copy_Grid_To_CVImage(CSG_Grid *pGrid, IplImage *pImage, bool bCheckSize) +{ + if( pImage && pGrid && (!bCheckSize || (pGrid->Get_NX() == pImage->width && pGrid->Get_NY() == pImage->height)) ) + { + int nx = pGrid->Get_NX() < pImage->width ? pGrid->Get_NX() : pImage->width; + int ny = pGrid->Get_NY() < pImage->height ? pGrid->Get_NY() : pImage->height; + + #pragma omp parallel for + for(int y=0; ydepth ) + { + case IPL_DEPTH_8U: Row.data.ptr[x] = pGrid->asByte (x, y); break; + case IPL_DEPTH_8S: Row.data.ptr[x] = pGrid->asChar (x, y); break; + case IPL_DEPTH_16U: Row.data.s [x] = pGrid->asShort (x, y); break; + case IPL_DEPTH_16S: Row.data.s [x] = pGrid->asShort (x, y); break; + case IPL_DEPTH_32S: Row.data.i [x] = pGrid->asInt (x, y); break; + case IPL_DEPTH_32F: Row.data.fl [x] = pGrid->asFloat (x, y); break; + case IPL_DEPTH_64F: Row.data.db [x] = pGrid->asDouble(x, y); break; + } + } + } + + return( true ); + } + + return( false ); +} + +//--------------------------------------------------------- +bool Copy_CVImage_To_Grid(CSG_Grid *pGrid, IplImage *pImage, bool bCheckSize) +{ + if( pImage && pGrid && (!bCheckSize || (pGrid->Get_NX() == pImage->width && pGrid->Get_NY() == pImage->height)) ) + { + int nx = pGrid->Get_NX() < pImage->width ? pGrid->Get_NX() : pImage->width; + int ny = pGrid->Get_NY() < pImage->height ? pGrid->Get_NY() : pImage->height; + + #pragma omp parallel for + for(int y=0; ydepth ) + { + case IPL_DEPTH_8U: pGrid->Set_Value(x, y, Row.data.ptr[x]); break; + case IPL_DEPTH_8S: pGrid->Set_Value(x, y, ((char *)Row.data.ptr)[x]); break; + case IPL_DEPTH_16U: pGrid->Set_Value(x, y, ((WORD *)Row.data.s )[x]); break; + case IPL_DEPTH_16S: pGrid->Set_Value(x, y, Row.data.s [x]); break; + case IPL_DEPTH_32S: pGrid->Set_Value(x, y, Row.data.i [x]); break; + case IPL_DEPTH_32F: pGrid->Set_Value(x, y, Row.data.fl [x]); break; + case IPL_DEPTH_64F: pGrid->Set_Value(x, y, Row.data.db [x]); break; + } + } + } + + return( true ); + } + + return( false ); +} + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +IplImage * Get_CVImage(int nx, int ny, TSG_Data_Type Type) +{ + if( nx > 0 && ny > 0 ) + { + CvSize Size; + + Size.width = nx; + Size.height = ny; + + return( cvCreateImage(Size, Get_CVImage_Type(Type), 1) ); + } + + return( NULL ); +} + +//--------------------------------------------------------- +IplImage * Get_CVImage(CSG_Grid *pGrid, TSG_Data_Type Type) +{ + IplImage *pImage = NULL; + + if( pGrid && pGrid->is_Valid() && (pImage = Get_CVImage(pGrid->Get_NX(), pGrid->Get_NY(), Type == SG_DATATYPE_Undefined ? pGrid->Get_Type() : Type)) != NULL ) + { + Copy_Grid_To_CVImage(pGrid, pImage); + } + + return( pImage ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- diff -Nru saga-2.1.0+dfsg/src/modules/imagery/imagery_opencv/opencv_fourier.cpp saga-2.1.4+dfsg/src/modules/imagery/imagery_opencv/opencv_fourier.cpp --- saga-2.1.0+dfsg/src/modules/imagery/imagery_opencv/opencv_fourier.cpp 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/imagery/imagery_opencv/opencv_fourier.cpp 2014-11-13 08:32:18.000000000 +0000 @@ -0,0 +1,294 @@ +/********************************************************** + * Version $Id: opencv_fourier.cpp 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// OpenCV // +// // +//-------------------------------------------------------// +// // +// opencv_fourier.cpp // +// // +// Copyright (C) 2009 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Hamburg // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "opencv_fourier.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool DFT (IplImage *pInput, IplImage **ppReal, IplImage **ppImag); + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +COpenCV_FFT::COpenCV_FFT(void) +{ + Set_Name (_TL("Fourier Transformation (OpenCV)")); + + Set_Author (SG_T("O.Conrad (c) 2009")); + + Set_Description (_TW( + "References:\n" + "OpenCV - Open Source Computer Vision\n" + "http://opencv.willowgarage.com" + )); + + Parameters.Add_Grid( + NULL , "INPUT" , _TL("Input"), + _TL(""), + PARAMETER_INPUT + ); + + Parameters.Add_Grid( + NULL , "REAL" , _TL("Fourier Transformation (Real)"), + _TL(""), + PARAMETER_OUTPUT + ); + + Parameters.Add_Grid( + NULL , "IMAG" , _TL("Fourier Transformation (Imaginary)"), + _TL(""), + PARAMETER_OUTPUT + ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool COpenCV_FFT::On_Execute(void) +{ + CSG_Grid *pInput, *pReal, *pImag; + + pInput = Parameters("INPUT") ->asGrid(); + pReal = Parameters("REAL") ->asGrid(); + pImag = Parameters("IMAG") ->asGrid(); + + //----------------------------------------------------- + IplImage *cv_pInput = Get_CVImage(pInput, SG_DATATYPE_Float); + IplImage *cv_pReal = NULL;// Get_CVImage(Get_NX(), Get_NY(), SG_DATATYPE_Float); + IplImage *cv_pImag = NULL;// Get_CVImage(Get_NX(), Get_NY(), SG_DATATYPE_Float); + + //----------------------------------------------------- + DFT(cv_pInput, &cv_pReal, &cv_pImag); + + //----------------------------------------------------- + Copy_CVImage_To_Grid(pReal, cv_pReal, false); + Copy_CVImage_To_Grid(pImag, cv_pImag, false); + + cvReleaseImage(&cv_pInput); + cvReleaseImage(&cv_pReal); + cvReleaseImage(&cv_pImag); + + pReal->Set_Name(CSG_String::Format(SG_T("%s [DFT, %s]"), pInput->Get_Name(), _TL("Real"))); + pImag->Set_Name(CSG_String::Format(SG_T("%s [DFT, %s]"), pInput->Get_Name(), _TL("Imaginary"))); + + return( true ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +// Rearrange the quadrants of Fourier image so that the origin is at +// the image center +// src & dst arrays of equal size & type +bool cvShiftDFT(CvArr * src_arr, CvArr * dst_arr ) +{ + CvMat * tmp; + CvMat q1stub, q2stub; + CvMat q3stub, q4stub; + CvMat d1stub, d2stub; + CvMat d3stub, d4stub; + CvMat * q1, * q2, * q3, * q4; + CvMat * d1, * d2, * d3, * d4; + + CvSize size = cvGetSize(src_arr); + CvSize dst_size = cvGetSize(dst_arr); + int cx, cy; + + if( dst_size.width != size.width || dst_size.height != size.height ) + { + // cvError( CV_StsUnmatchedSizes, "cvShiftDFT", "Source and Destination arrays must have equal sizes", __FILE__, __LINE__ ); + return( false ); + } + + if(src_arr==dst_arr){ + tmp = cvCreateMat(size.height/2, size.width/2, cvGetElemType(src_arr)); + } + + cx = size.width/2; + cy = size.height/2; // image center + + q1 = cvGetSubRect( src_arr, &q1stub, cvRect(0,0,cx, cy) ); + q2 = cvGetSubRect( src_arr, &q2stub, cvRect(cx,0,cx,cy) ); + q3 = cvGetSubRect( src_arr, &q3stub, cvRect(cx,cy,cx,cy) ); + q4 = cvGetSubRect( src_arr, &q4stub, cvRect(0,cy,cx,cy) ); + d1 = cvGetSubRect( src_arr, &d1stub, cvRect(0,0,cx,cy) ); + d2 = cvGetSubRect( src_arr, &d2stub, cvRect(cx,0,cx,cy) ); + d3 = cvGetSubRect( src_arr, &d3stub, cvRect(cx,cy,cx,cy) ); + d4 = cvGetSubRect( src_arr, &d4stub, cvRect(0,cy,cx,cy) ); + + if(src_arr!=dst_arr){ + if( !CV_ARE_TYPES_EQ( q1, d1 )){ + // cvError( CV_StsUnmatchedFormats, "cvShiftDFT", "Source and Destination arrays must have the same format", __FILE__, __LINE__ ); + return( false ); + } + cvCopy(q3, d1, 0); + cvCopy(q4, d2, 0); + cvCopy(q1, d3, 0); + cvCopy(q2, d4, 0); + } + else{ + cvCopy(q3, tmp, 0); + cvCopy(q1, q3, 0); + cvCopy(tmp, q1, 0); + cvCopy(q4, tmp, 0); + cvCopy(q2, q4, 0); + cvCopy(tmp, q2, 0); + } + + return( true ); +} + +//--------------------------------------------------------- +bool DFT(IplImage *im, IplImage **ppReal, IplImage **ppImag) +{ + IplImage * realInput; + IplImage * imaginaryInput; + IplImage * complexInput; + int dft_M, dft_N; + CvMat* dft_A, tmp; + IplImage * image_Re; + IplImage * image_Im; + double m, M; + + if( !im ) + return false; + + realInput = cvCreateImage( cvGetSize(im), IPL_DEPTH_64F, 1); + imaginaryInput = cvCreateImage( cvGetSize(im), IPL_DEPTH_64F, 1); + complexInput = cvCreateImage( cvGetSize(im), IPL_DEPTH_64F, 2); + + cvScale(im, realInput, 1.0, 0.0); + cvZero(imaginaryInput); + cvMerge(realInput, imaginaryInput, NULL, NULL, complexInput); + + dft_M = cvGetOptimalDFTSize( im->height - 1 ); + dft_N = cvGetOptimalDFTSize( im->width - 1 ); + + dft_A = cvCreateMat( dft_M, dft_N, CV_64FC2 ); + *ppReal = image_Re = cvCreateImage( cvSize(dft_N, dft_M), IPL_DEPTH_64F, 1); + *ppImag = image_Im = cvCreateImage( cvSize(dft_N, dft_M), IPL_DEPTH_64F, 1); + + // copy A to dft_A and pad dft_A with zeros + cvGetSubRect( dft_A, &tmp, cvRect(0,0, im->width, im->height)); + cvCopy( complexInput, &tmp, NULL ); + if( dft_A->cols > im->width ) + { + cvGetSubRect( dft_A, &tmp, cvRect(im->width,0, dft_A->cols - im->width, im->height)); + cvZero( &tmp ); + } + + // no need to pad bottom part of dft_A with zeros because of + // use nonzero_rows parameter in cvDFT() call below + + cvDFT( dft_A, dft_A, CV_DXT_FORWARD, complexInput->height ); + + // Split Fourier in real and imaginary parts + cvSplit( dft_A, image_Re, image_Im, 0, 0 ); + + // Compute the magnitude of the spectrum Mag = sqrt(Re^2 + Im^2) +// cvPow( image_Re, image_Re, 2.0); +// cvPow( image_Im, image_Im, 2.0); +// cvAdd( image_Re, image_Im, image_Re, NULL); +// cvPow( image_Re, image_Re, 0.5 ); + + // Compute log(1 + Mag) +// cvAddS( image_Re, cvScalarAll(1.0), image_Re, NULL ); // 1 + Mag +// cvLog( image_Re, image_Re ); // log(1 + Mag) + + // Rearrange the quadrants of Fourier image so that the origin is at + // the image center +// cvShiftDFT( image_Re, image_Re ); + +// cvMinMaxLoc(image_Re, &m, &M, NULL, NULL, NULL); +// cvScale(image_Re, image_Re, 1.0/(M-m), 1.0*(-m)/(M-m)); + + return true; +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- diff -Nru saga-2.1.0+dfsg/src/modules/imagery/imagery_opencv/opencv_fourier.h saga-2.1.4+dfsg/src/modules/imagery/imagery_opencv/opencv_fourier.h --- saga-2.1.0+dfsg/src/modules/imagery/imagery_opencv/opencv_fourier.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/imagery/imagery_opencv/opencv_fourier.h 2014-11-13 08:32:18.000000000 +0000 @@ -0,0 +1,106 @@ +/********************************************************** + * Version $Id: opencv_fourier.h 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// OpenCV // +// // +//-------------------------------------------------------// +// // +// opencv_fourier.h // +// // +// Copyright (C) 2009 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Hamburg // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#ifndef HEADER_INCLUDED__opencv_fourier_H +#define HEADER_INCLUDED__opencv_fourier_H + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "opencv.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +class COpenCV_FFT : public CSG_Module_Grid +{ +public: + COpenCV_FFT(void); + + virtual CSG_String Get_MenuPath (void) { return( _TL("A:Imagery|Fourier Analysis") ); } + + +protected: + + virtual bool On_Execute (void); + + +}; + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#endif // #ifndef HEADER_INCLUDED__opencv_fourier_H diff -Nru saga-2.1.0+dfsg/src/modules/imagery/imagery_opencv/opencv.h saga-2.1.4+dfsg/src/modules/imagery/imagery_opencv/opencv.h --- saga-2.1.0+dfsg/src/modules/imagery/imagery_opencv/opencv.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/imagery/imagery_opencv/opencv.h 2014-11-13 08:32:18.000000000 +0000 @@ -0,0 +1,111 @@ +/********************************************************** + * Version $Id: opencv.h 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// OpenCV // +// // +//-------------------------------------------------------// +// // +// opencv.h // +// // +// Copyright (C) 2009 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Hamburg // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#ifndef HEADER_INCLUDED__opencv_H +#define HEADER_INCLUDED__opencv_H + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "MLB_Interface.h" + +//--------------------------------------------------------- +#include + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +int Get_CVMatrix_Type (TSG_Data_Type Type); + +bool Copy_Grid_To_CVMatrix (CSG_Grid *pGrid, cv::Mat *pMatrix, bool bCheckSize = true); +bool Copy_CVMatrix_To_Grid (CSG_Grid *pGrid, cv::Mat *pMatrix, bool bCheckSize = true); + +bool Get_CVMatrix (cv::Mat &Matrix, int nx, int ny , TSG_Data_Type Type); +bool Get_CVMatrix (cv::Mat &Matrix, CSG_Grid *pGrid, TSG_Data_Type Type = SG_DATATYPE_Undefined); + +//--------------------------------------------------------- +int Get_CVImage_Type (TSG_Data_Type Type); + +bool Copy_Grid_To_CVImage (CSG_Grid *pGrid, IplImage *pImage, bool bCheckSize = true); +bool Copy_CVImage_To_Grid (CSG_Grid *pGrid, IplImage *pImage, bool bCheckSize = true); + +IplImage * Get_CVImage (int nx, int ny , TSG_Data_Type Type); +IplImage * Get_CVImage (CSG_Grid *pGrid, TSG_Data_Type Type = SG_DATATYPE_Undefined); + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#endif // #ifndef HEADER_INCLUDED__opencv_H diff -Nru saga-2.1.0+dfsg/src/modules/imagery/imagery_opencv/opencv_morphology.cpp saga-2.1.4+dfsg/src/modules/imagery/imagery_opencv/opencv_morphology.cpp --- saga-2.1.0+dfsg/src/modules/imagery/imagery_opencv/opencv_morphology.cpp 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/imagery/imagery_opencv/opencv_morphology.cpp 2014-11-13 08:32:18.000000000 +0000 @@ -0,0 +1,236 @@ +/********************************************************** + * Version $Id: opencv_morphology.cpp 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// OpenCV // +// // +//-------------------------------------------------------// +// // +// opencv_morphology.cpp // +// // +// Copyright (C) 2009 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Hamburg // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "opencv_morphology.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +COpenCV_Morphology::COpenCV_Morphology(void) +{ + Set_Name (_TL("Morphological Filter (OpenCV)")); + + Set_Author (SG_T("O.Conrad (c) 2009")); + + Set_Description (_TW( + "References:\n" + "OpenCV - Open Source Computer Vision\n" + "http://opencv.willowgarage.com" + )); + + Parameters.Add_Grid( + NULL , "INPUT" , _TL("Input"), + _TL(""), + PARAMETER_INPUT + ); + + Parameters.Add_Grid( + NULL , "OUTPUT" , _TL("Output"), + _TL(""), + PARAMETER_OUTPUT, SG_DATATYPE_Byte + ); + + Parameters.Add_Choice( + NULL , "TYPE" , _TL("Operation"), + _TL(""), + CSG_String::Format(SG_T("%s|%s|%s|%s|%s|%s|%s|"), + _TL("dilation"), + _TL("erosion"), + _TL("opening"), + _TL("closing"), + _TL("morpological gradient"), + _TL("top hat"), + _TL("black hat") + ) + ); + + Parameters.Add_Choice( + NULL , "SHAPE" , _TL("Element Shape"), + _TL(""), + CSG_String::Format(SG_T("%s|%s|%s|"), + _TL("ellipse"), + _TL("rectangle"), + _TL("cross") + ) + ); + + Parameters.Add_Value( + NULL , "RADIUS" , _TL("Radius (cells)"), + _TL(""), + PARAMETER_TYPE_Int, 1.0, 0.0, true + ); + + Parameters.Add_Value( + NULL , "ITERATIONS" , _TL("Iterations"), + _TL(""), + PARAMETER_TYPE_Int, 1.0, 1.0, true + ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool COpenCV_Morphology::On_Execute(void) +{ + int Type, Shape, Radius, Iterations; + CSG_Grid *pInput, *pOutput; + + pInput = Parameters("INPUT") ->asGrid(); + pOutput = Parameters("OUTPUT") ->asGrid(); + Type = Parameters("TYPE") ->asInt(); + Shape = Parameters("SHAPE") ->asInt(); + Radius = Parameters("RADIUS") ->asInt(); + Iterations = Parameters("ITERATIONS") ->asInt(); + + //----------------------------------------------------- + switch( Shape ) + { + default: + case 0: Shape = CV_SHAPE_ELLIPSE; break; + case 1: Shape = CV_SHAPE_RECT; break; + case 2: Shape = CV_SHAPE_CROSS; break; + } + + //----------------------------------------------------- + IplImage *cv_pInput = Get_CVImage(pInput); + IplImage *cv_pOutput = Get_CVImage(Get_NX(), Get_NY(), pInput->Get_Type()); + IplImage *cv_pTmp = NULL; + + //----------------------------------------------------- + IplConvKernel *cv_pElement = cvCreateStructuringElementEx(Radius * 2 + 1, Radius * 2 + 1, Radius, Radius, Shape, 0); + + switch( Type ) + { + case 0: // dilation + cvDilate (cv_pInput, cv_pOutput, cv_pElement, Iterations); + break; + + case 1: // erosion + cvErode (cv_pInput, cv_pOutput, cv_pElement, Iterations); + break; + + case 2: // opening + cvMorphologyEx (cv_pInput, cv_pOutput, cv_pTmp, + cv_pElement, CV_MOP_OPEN , Iterations + ); + break; + + case 3: // closing + cvMorphologyEx (cv_pInput, cv_pOutput, cv_pTmp, + cv_pElement, CV_MOP_CLOSE , Iterations + ); + break; + + case 4: // morpological gradient + cvMorphologyEx (cv_pInput, cv_pOutput, cv_pTmp = Get_CVImage(Get_NX(), Get_NY(), pInput->Get_Type()), + cv_pElement, CV_MOP_GRADIENT, Iterations + ); + break; + + case 5: // top hat + cvMorphologyEx (cv_pInput, cv_pOutput, cv_pTmp = Get_CVImage(Get_NX(), Get_NY(), pInput->Get_Type()), + cv_pElement, CV_MOP_TOPHAT , Iterations + ); + break; + + case 6: // black hat + cvMorphologyEx (cv_pInput, cv_pOutput, cv_pTmp = Get_CVImage(Get_NX(), Get_NY(), pInput->Get_Type()), + cv_pElement, CV_MOP_BLACKHAT, Iterations + ); + break; + } + + cvReleaseStructuringElement(&cv_pElement); + + //----------------------------------------------------- + Copy_CVImage_To_Grid(pOutput, cv_pOutput); + + cvReleaseImage(&cv_pInput); + cvReleaseImage(&cv_pOutput); + + if( cv_pTmp ) + { + cvReleaseImage(&cv_pTmp); + } + + pOutput->Set_Name(CSG_String::Format(SG_T("%s [%s]"), pInput->Get_Name(), Get_Name().c_str())); + + return( true ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- diff -Nru saga-2.1.0+dfsg/src/modules/imagery/imagery_opencv/opencv_morphology.h saga-2.1.4+dfsg/src/modules/imagery/imagery_opencv/opencv_morphology.h --- saga-2.1.0+dfsg/src/modules/imagery/imagery_opencv/opencv_morphology.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/imagery/imagery_opencv/opencv_morphology.h 2014-11-13 08:32:18.000000000 +0000 @@ -0,0 +1,106 @@ +/********************************************************** + * Version $Id: opencv_morphology.h 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// OpenCV // +// // +//-------------------------------------------------------// +// // +// opencv_morphology.h // +// // +// Copyright (C) 2009 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Hamburg // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#ifndef HEADER_INCLUDED__opencv_morphology_H +#define HEADER_INCLUDED__opencv_morphology_H + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "opencv.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +class COpenCV_Morphology : public CSG_Module_Grid +{ +public: + COpenCV_Morphology(void); + + virtual CSG_String Get_MenuPath (void) { return( _TL("A:Grid|Filter") ); } + + +protected: + + virtual bool On_Execute (void); + + +}; + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#endif // #ifndef HEADER_INCLUDED__opencv_morphology_H diff -Nru saga-2.1.0+dfsg/src/modules/imagery/imagery_opencv/opencv_nnet.cpp saga-2.1.4+dfsg/src/modules/imagery/imagery_opencv/opencv_nnet.cpp --- saga-2.1.0+dfsg/src/modules/imagery/imagery_opencv/opencv_nnet.cpp 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/imagery/imagery_opencv/opencv_nnet.cpp 2014-11-13 08:32:18.000000000 +0000 @@ -0,0 +1,955 @@ +/********************************************************** + * Version $Id: OpenCVNNet.cpp 0001 2013-04-26 + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// OpenCVNNet // +// // +//-------------------------------------------------------// +// // +// OpenCVNNet.cpp // +// // +// // +// Luca Piras // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: 3piras@informatik.uni-hamburg.de // +// // +// contact: Luca Piras // +// Rellinger Str. 39 // +// 20257 Hamburg // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "opencv_nnet.h" +#include "opencv\cxcore.h" +#include "opencv\ml.h" + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +COpenCV_NNet::COpenCV_NNet(void) +{ + CSG_Parameter *pNodeTrainData, *pNodeTrainAreas, *pNodeTopology, *pNodeActFun, *pNodeRPROP, *pNodeBPROP, *pNodeData; + + Set_Name (_TL("Neural Networks (OpenCV)")); + + Set_Author (SG_T("Luca Piras")); + + Set_Description (_TW( + "Integration of the OpenCV Neural Networks library.\n" + "http://docs.opencv.org/modules/ml/doc/neural_networks.html" + )); + + #pragma region + //--------------------------------------------------------- + pNodeTrainData = Parameters.Add_Table( + NULL, "TRAIN_INPUT_TABLE", _TL("Train INPUT"), + _TL("Input data to train the network."), PARAMETER_INPUT + ); + + Parameters.Add_Parameters( + pNodeTrainData , "TRAIN_FEATURES_TABLE", _TL("Select training output features"), + _TL("Select the features that should be used as the OUTPUT features.") + ); + + Parameters.Add_Table( + NULL, "EVAL_INPUT_TABLE", _TL("Prediction INPUT"), + _TL("Input data for the trained network."), PARAMETER_INPUT + ); + + Parameters.Add_Table( + NULL, "EVAL_OUTPUT_TABLE", _TL("OUTPUT"), + _TL("Predicted responses (probabilities) for corresponding samples."), PARAMETER_OUTPUT + ); + #pragma endregion Table INPUT and OUTPUT section + + #pragma region + //--------------------------------------------------------- + Parameters.Add_Grid_List(NULL ,"TRAIN_INPUT_GRIDS", _TL("Train INPUT"), + _TL("Input grids to train the network."), + PARAMETER_INPUT + ); + + pNodeTrainAreas = Parameters.Add_Shapes( + NULL, "TRAIN_INPUT_AREAS" , _TL("Select training areas"), + _TL("The areas used to train the neural network."), + PARAMETER_INPUT, SHAPE_TYPE_Polygon + ); + + // TODO: Have to make a vector representation from the class identifier + Parameters.Add_Table_Field( + pNodeTrainAreas , "TRAIN_INPUT_AREAS_CLASS_FIELD", _TL("Select class identifier"), + _TL("The class field used to classify the shape. All classes will be vectorized.") + ); + + Parameters.Add_Grid( + NULL, "EVAL_OUTPUT_GRID_CLASSES", _TL("OUTPUT classes"), + _TL("These are the winner class vectors."), + PARAMETER_OUTPUT, true, SG_DATATYPE_Short + ); + + Parameters.Add_Grid( + NULL, "EVAL_OUTPUT_GRID_CERTAINTY", _TL("OUTPUT certainty"), + _TL("These are the probabilities for the winner classes given by the neural network."), + PARAMETER_OUTPUT_OPTIONAL + ); + #pragma endregion Grid INPUT and OUTPUT section + + #pragma region + //--------------------------------------------------------- + // Let the user select on which type of data we will operate + Parameters.Add_Choice( + NULL , "DATA_TYPE" , _TL("Data type"), + _TL("Choose the type of data used in this model."), + CSG_String::Format(SG_T("%s|%s|"), + _TL("Table"), + _TL("Grid") + ) + ); + + pNodeTopology = Parameters.Add_Node( + NULL, "NETWORK_TOPOLOGY", _TL("Network topology"), + _TL("In this section you can define the topology of the neural network.") + ); + + Parameters.Add_Value( + pNodeTopology , "NNET_LAYER" , _TL("Number of layers"), + _TL("You can specify the number of layers in the network (including input and output layer)."), + PARAMETER_TYPE_Int, 3, 1, true + ); + + Parameters.Add_Value( + pNodeTopology , "NNET_NEURONS" , _TL("Number of neurons"), + _TL("You can specify the number of neurons in each layer of the network."), + PARAMETER_TYPE_Int, 3, 1, true + ); + + Parameters.Add_Value( + NULL , "MAX_ITER" , _TL("Maximum number of iterations"), + _TL("Termination criteria of the training algorithm. You can specify the maximum number of iterations."), + PARAMETER_TYPE_Int, 1000 + ); + + Parameters.Add_Value( + NULL , "EPSILON" , _TL("Error change (epsilon)"), + _TL("Termination criteria of the training algorithm. You can specify how much the error could change between the iterations to make the algorithm continue (epsilon)."), + PARAMETER_TYPE_Double, 0.01 + ); + + pNodeActFun = Parameters.Add_Choice( + NULL , "ACTIVATION_FUNCTION" , _TL("Activation function"), + _TL("Choose the activation function used by the neronal network."), + CSG_String::Format(SG_T("%s|%s|%s|"), + _TL("Identity"), + _TL("Sigmoid"), + _TL("Gaussian") + ), 1 + ); + + Parameters.Add_Value( + pNodeActFun , "ALPHA" , _TL("Alpha"), + _TL("This is the alpha parameter value for the sigmoid function."), + PARAMETER_TYPE_Double, 1 + ); + + Parameters.Add_Value( + pNodeActFun , "BETA" , _TL("Beta"), + _TL("This is the beta parameter value for the sigmoid function."), + PARAMETER_TYPE_Double, 1 + ); + + Parameters.Add_Choice( + NULL , "TRAINING_METHOD" , _TL("Training method"), + _TL("Choose the training method used for the neronal network."), + CSG_String::Format(SG_T("%s|%s|"), + _TL("Resilent propagation (RPROP)"), + _TL("Backpropagation algorithm") + ), 1 + ); + + pNodeRPROP = Parameters.Add_Node( + NULL, "RPROP_PARAMS", _TL("RPROP parameters"), + _TL("This section contains all parameters used by the RPROP algorithm.") + ); + + Parameters.Add_Value( + pNodeRPROP , "RP_DW0" , _TL("Initial update value"), + _TL("Initial value delta_0 of update-values delta_ij."), + PARAMETER_TYPE_Double, 0 + ); + + Parameters.Add_Value( + pNodeRPROP , "RP_DW_PLUS" , _TL("Increase factor"), + _TL("Increase factor n_plus. Must be > 1."), + PARAMETER_TYPE_Double, 1.2, 1.01, true + ); + + Parameters.Add_Value( + pNodeRPROP , "RP_DW_MINUS" , _TL("Decrease factor"), + _TL("Decrease factor n_minus. Must be < 1."), + PARAMETER_TYPE_Double, 0.5, 0.01, true, 0.99, true + ); + + Parameters.Add_Value( + pNodeRPROP, "RP_DW_MIN" , _TL("Update values lower limit"), + _TL("Corresponds to delta_min. Must be > 0"), + PARAMETER_TYPE_Double, 0.1, 0.01, true + ); + + Parameters.Add_Value( + pNodeRPROP , "RP_DW_MAX" , _TL("Update values upper limit"), + _TL("Corresponds to delta_max. Must be > 1"), + PARAMETER_TYPE_Double, 1.1, 1.01, true + ); + + pNodeBPROP = Parameters.Add_Node( + NULL, "BPROP_PARAMS", _TL("Backpropagation parameters"), + _TL("This section contains all parameters used by the backpropagation algorithm.") + ); + + Parameters.Add_Value( + pNodeBPROP , "BP_DW_SCALE" , _TL("Weight gradient term"), + _TL("Strength of the weight gradient term. The recommended value is about 0.1."), + PARAMETER_TYPE_Double, 0.1 + ); + + Parameters.Add_Value( + pNodeBPROP , "BP_MOMENT_SCALE" , _TL("Moment term"), + _TL("Strength of the momentum term (the difference between weights on the 2 previous iterations). This parameter provides some inertia to smooth the random fluctuations of the weights. It can vary from 0 (the feature is disabled) to 1 and beyond. The value 0.1 or so is good enough."), + PARAMETER_TYPE_Double, 0.1 + ); + + pNodeData = Parameters.Add_Node( + NULL, "DATA", _TL("Data options"), + _TL("Specifie options used for the training and test data.") + ); + + Parameters.Add_Table( + pNodeData, "WEIGHTS", _TL("Sample weights"), + _TL("Optional floating-point vector of weights for each sample. Some samples may be more important than others for training."), PARAMETER_INPUT_OPTIONAL + ); + + Parameters.Add_Table( + pNodeData, "INDICES", _TL("Indices"), + _TL("Optional integer vector indicating the samples (rows of inputs and outputs) that are taken into account."), PARAMETER_INPUT_OPTIONAL + ); + + Parameters.Add_Value( + pNodeData , "UPDATE_WEIGHTS" , _TL("Update the network weights"), + _TL(""), + PARAMETER_TYPE_Bool, false + ); + + Parameters.Add_Value( + pNodeData , "NO_INPUT_SCALE" , _TL("No INPUT vector normalization"), + _TL("If false, the training algorithm normalizes each input feature independently, shifting its mean value to 0 and making the standard deviation equal to 1."), + PARAMETER_TYPE_Bool, true + ); + + Parameters.Add_Value( + pNodeData , "NO_OUTPUT_SCALE" , _TL("No OUTPUT vector normalization"), + _TL("If false, the training algorithm normalizes each output feature independently, by transforming it to the certain range depending on the used activation function."), + PARAMETER_TYPE_Bool, true + ); + #pragma endregion NNet options +} + + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool COpenCV_NNet::On_Execute(void) +{ + //------------------------------------------------- + bool b_updateWeights, b_noInputScale, b_noOutputScale, b_NoData; + int i_matType, i_layers, i_maxIter, i_neurons, i_areasClassId, i_trainFeatTotalCount, *i_outputFeatureIdxs, i_outputFeatureCount, i_Grid, x, y, i_evalOut, i_winner; + double d_alpha, d_beta, d_eps; + DATA_TYPE e_dataType; + TRAINING_METHOD e_trainMet; + ACTIVATION_FUNCTION e_actFunc; + CSG_Table *t_Weights, *t_Indices, *t_TrainInput, *t_EvalInput, *t_EvalOutput; + CSG_Parameter_Grid_List *gl_TrainInputs; + CSG_Grid *g_EvalOutput, *g_EvalOutputCert; + CSG_Shapes *s_TrainInputAreas; + CSG_Parameters *p_TrainFeatures; + TSG_Point p; + CvMat *mat_Weights, *mat_Indices, **mat_data, *mat_neuralLayers, mat_layerSizesSub, *mat_EvalInput, *mat_EvalOutput; // todo: mat_indices to respect input indices, mat_weights for initialization + CvANN_MLP_TrainParams tp_trainParams; + CvANN_MLP model; + + b_updateWeights = Parameters("UPDATE_WEIGHTS" )->asBool(); + b_noInputScale = Parameters("NO_INPUT_SCALE" )->asBool(); + b_noOutputScale = Parameters("NO_OUTPUT_SCALE" )->asBool(); + i_layers = Parameters("NNET_LAYER" )->asInt(); + i_neurons = Parameters("NNET_NEURONS" )->asInt(); + i_maxIter = Parameters("MAX_ITER" )->asInt(); + i_areasClassId = Parameters("TRAIN_INPUT_AREAS_CLASS_FIELD" )->asInt(); + e_dataType = (DATA_TYPE)Parameters("DATA_TYPE" )->asInt(); + e_trainMet = (TRAINING_METHOD)Parameters("TRAINING_METHOD" )->asInt(); + e_actFunc = (ACTIVATION_FUNCTION)Parameters("ACTIVATION_FUNCTION" )->asInt(); + d_alpha = Parameters("ALPHA" )->asDouble(); + d_beta = Parameters("BETA" )->asDouble(); + d_eps = Parameters("EPSILON" )->asDouble(); + t_Weights = Parameters("WEIGHTS" )->asTable(); + t_Indices = Parameters("INDICES" )->asTable(); + t_TrainInput = Parameters("TRAIN_INPUT_TABLE" )->asTable(); + t_EvalInput = Parameters("EVAL_INPUT_TABLE" )->asTable(); + t_EvalOutput = Parameters("EVAL_OUTPUT_TABLE" )->asTable(); + p_TrainFeatures = Parameters("TRAIN_FEATURES_TABLE" )->asParameters(); + gl_TrainInputs = Parameters("TRAIN_INPUT_GRIDS" )->asGridList(); + g_EvalOutput = Parameters("EVAL_OUTPUT_GRID_CLASSES" )->asGrid(); + g_EvalOutputCert = Parameters("EVAL_OUTPUT_GRID_CERTAINTY" )->asGrid(); + s_TrainInputAreas = Parameters("TRAIN_INPUT_AREAS" )->asShapes(); + + // Fixed matrix type (TODO: Analyze what to do for other types of data (i.e. images)) + i_matType = CV_32FC1; + + //------------------------------------------------- + if (e_dataType == TABLE) + { + // We are working with TABLE data + if( t_TrainInput->Get_Count() == 0 || p_TrainFeatures->Get_Count() == 0 ) + { + Error_Set(_TL("Select an input table and at least one output feature!")); + return( false ); + } + + // Count the total number of available features + i_trainFeatTotalCount = t_TrainInput->Get_Field_Count(); + + // Count the number of selected output features + i_outputFeatureIdxs = (int *)SG_Calloc(i_trainFeatTotalCount, sizeof(int)); + i_outputFeatureCount = 0; + + for(int i=0; iGet_Count(); i++) + { + if( p_TrainFeatures->Get_Parameter(i)->asBool() ) + { + i_outputFeatureIdxs[i_outputFeatureCount++] = CSG_String(p_TrainFeatures->Get_Parameter(i)->Get_Identifier()).asInt(); + } + } + + // Update the number of training features + i_trainFeatTotalCount = i_trainFeatTotalCount-i_outputFeatureCount; + + if( i_outputFeatureCount <= 0 ) + { + Error_Set(_TL("Select at least one output feature!")); + return( false ); + } + + // Now convert the input and output training data into a OpenCV matrix objects + mat_data = GetTrainAndOutputMatrix(t_TrainInput, i_matType, i_outputFeatureIdxs, i_outputFeatureCount); + } + else + { + // TODO: Add some grid validation logic + i_trainFeatTotalCount = gl_TrainInputs->Get_Count(); + i_outputFeatureCount = s_TrainInputAreas->Get_Count(); + + // Convert the data from the grid into the matrix from + mat_data = GetTrainAndOutputMatrix(gl_TrainInputs, i_matType, s_TrainInputAreas, i_areasClassId, g_EvalOutput, g_EvalOutputCert); + } + + //------------------------------------------------- + // Add two additional layer to the network topology (0-th layer for input and the last as the output) + i_layers = i_layers + 2; + mat_neuralLayers = cvCreateMat(i_layers, 1, CV_32SC1); + cvGetRows(mat_neuralLayers, &mat_layerSizesSub, 0, i_layers); + + //Setting the number of neurons on each layer + for (int i = 0; i < i_layers; i++) + { + if (i == 0) + { + // The first layer needs the same size (number of nerons) as the number of columns in the training data + cvSet1D(&mat_layerSizesSub, i, cvScalar(i_trainFeatTotalCount)); + } + else if (i == i_layers-1) + { + // The last layer needs the same size (number of neurons) as the number of output columns + cvSet1D(&mat_layerSizesSub, i, cvScalar(i_outputFeatureCount)); + } + else + { + // On every other layer set the layer size selected by the user + cvSet1D(&mat_layerSizesSub, i, cvScalar(i_neurons)); + } + } + + //------------------------------------------------- + // Create the training params object + tp_trainParams = CvANN_MLP_TrainParams(); + tp_trainParams.term_crit = cvTermCriteria(CV_TERMCRIT_ITER + CV_TERMCRIT_EPS, i_maxIter, d_eps); + + // Check which training method was selected and set corresponding params + if(e_trainMet == RPROP) + { + // Set all RPROP specific params + tp_trainParams.train_method = CvANN_MLP_TrainParams::RPROP; + tp_trainParams.rp_dw0 = Parameters("RP_DW0" )->asDouble(); + tp_trainParams.rp_dw_plus = Parameters("RP_DW_PLUS" )->asDouble(); + tp_trainParams.rp_dw_minus = Parameters("RP_DW_MINUS" )->asDouble(); + tp_trainParams.rp_dw_min = Parameters("RP_DW_MIN" )->asDouble(); + tp_trainParams.rp_dw_max = Parameters("RP_DW_MAX" )->asDouble(); + } + else + { + // Set all BPROP specific params + tp_trainParams.train_method = CvANN_MLP_TrainParams::BACKPROP; + tp_trainParams.bp_dw_scale = Parameters("BP_DW_SCALE" )->asDouble(); + tp_trainParams.bp_moment_scale = Parameters("BP_MOMENT_SCALE" )->asInt(); + } + + //------------------------------------------------- + // Create the model (depending on the activation function) + if(e_actFunc == SIGMOID) + { + model.create(mat_neuralLayers); + } + else + { + model.create(mat_neuralLayers, CvANN_MLP::GAUSSIAN, d_alpha, d_beta); + } + + //------------------------------------------------- + // Now train the network + + // TODO: Integrate init weights and indicies for record selection + // mat_Weights = GetMatrix(t_Weights, i_matType); + // mat_Indices = GetMatrix(t_Indices, i_matType); + + //model.train(mat_TrainInput, mat_TrainOutput, NULL, NULL, tp_trainParams); + model.train(mat_data[0], mat_data[1], NULL, NULL, tp_trainParams); + + //------------------------------------------------- + // Predict data + if (e_dataType == TABLE) + { + // Get the eavaluation/test matrix from the eval table + mat_EvalInput = GetEvalMatrix(t_EvalInput, i_matType); + } + else + { + // Train and eval data overlap in grid mode + mat_EvalInput = GetEvalMatrix(gl_TrainInputs, i_matType); + } + + // Prepare output matrix + mat_EvalOutput = cvCreateMat(mat_EvalInput->rows, i_outputFeatureCount, i_matType); + + // Start prediction + model.predict(mat_EvalInput, mat_EvalOutput); + + Message_Add(_TL("Successfully trained the network and predicted the values. Here comes the output.")); + + //------------------------------------------------- + // Save and print results + if (e_dataType == TABLE) + { + // DEBUG -> Save results to output table and print results + for (int i = 0; i < i_outputFeatureCount; i++) + { + t_EvalOutput->Add_Field(CSG_String(t_TrainInput->Get_Field_Name(i_outputFeatureIdxs[i])), SG_DATATYPE_Float); + } + + for (int i = 0; i < mat_EvalOutput->rows; i++) + { + CSG_Table_Record* tr_record = t_EvalOutput->Add_Record(); + + for (int j = 0; j < i_outputFeatureCount; j++) + { + float f_targetValue = mat_EvalOutput->data.fl[i*i_outputFeatureCount+j]; + tr_record->Set_Value(j, f_targetValue); + } + } + } + else + { + // Fill the output table output + for (int i = 0; i < i_outputFeatureCount; i++) + { + // TODO: Get the class name + t_EvalOutput->Add_Field(CSG_String::Format(SG_T("CLASS_%d"), i), SG_DATATYPE_Float); + } + + for (int i = 0; i < mat_EvalOutput->rows; i++) + { + CSG_Table_Record* tr_record = t_EvalOutput->Add_Record(); + + for (int j = 0; j < i_outputFeatureCount; j++) + { + float f_targetValue = mat_EvalOutput->data.fl[i*i_outputFeatureCount+j]; + tr_record->Set_Value(j, f_targetValue); + } + } + + i_evalOut = 0; + + // Fill the output grid + for(y=0, p.y=Get_YMin(); yGet_Count() && !b_NoData; i_Grid++) + { + // If there is one grid that has no data in this point p, then set the no data flag + if( gl_TrainInputs->asGrid(i_Grid)->is_NoData(x, y) ) + { + b_NoData = true; + } + } + + if (!b_NoData) + { + // We have data in all grids, so this is a point that was predicted + // Get the winner class for this point and set it to the output grid + float f_targetValue = 0; + + for (int j = 0; j < i_outputFeatureCount; j++) + { + if (mat_EvalOutput->data.fl[i_evalOut*i_outputFeatureCount+j] > f_targetValue) + { + // The current value is higher than the last one, so lets memorize the current class + f_targetValue = mat_EvalOutput->data.fl[i_evalOut*i_outputFeatureCount+j]; + i_winner = j; + } + } + + // Now finally set the values to the grids + g_EvalOutput->Set_Value(x, y, i_winner); + g_EvalOutputCert->Set_Value(x, y, f_targetValue); + + i_evalOut++; + } + } + } + } + + return( true ); +} + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +int COpenCV_NNet::On_Parameters_Enable(CSG_Parameters *pParameters, CSG_Parameter *pParameter) +{ + if( !SG_STR_CMP(pParameter->Get_Identifier(), SG_T("ACTIVATION_FUNCTION")) ) + { + ACTIVATION_FUNCTION e_actFunc = (ACTIVATION_FUNCTION)pParameter->asInt(); + + pParameters->Get_Parameter("ALPHA")->Set_Enabled(e_actFunc == SIGMOID); + pParameters->Get_Parameter("BETA" )->Set_Enabled(e_actFunc == SIGMOID); + } + + if( !SG_STR_CMP(pParameter->Get_Identifier(), SG_T("TRAINING_METHOD")) ) + { + TRAINING_METHOD e_trainMet = (TRAINING_METHOD)pParameter->asInt(); + + pParameters->Get_Parameter("RPROP_PARAMS" )->Set_Enabled(e_trainMet == RPROP); + pParameters->Get_Parameter("WEIGHTS" )->Set_Enabled(e_trainMet == RPROP); + pParameters->Get_Parameter("BPROP_PARAMS" )->Set_Enabled(e_trainMet == BPROP); + } + + if( !SG_STR_CMP(pParameter->Get_Identifier(), SG_T("DATA_TYPE")) ) + { + DATA_TYPE e_dataType = (DATA_TYPE)pParameter->asInt(); + + pParameters->Get_Parameter("PARAMETERS_GRID_SYSTEM" )->Set_Enabled(e_dataType == GRID); + pParameters->Get_Parameter("TRAIN_INPUT_AREAS" )->Set_Enabled(e_dataType == GRID); + + pParameters->Get_Parameter("TRAIN_INPUT_TABLE" )->Set_Enabled(e_dataType == TABLE); + pParameters->Get_Parameter("EVAL_INPUT_TABLE" )->Set_Enabled(e_dataType == TABLE); + pParameters->Get_Parameter("EVAL_OUTPUT_TABLE" )->Set_Enabled(e_dataType == TABLE); + pParameters->Get_Parameter("TRAIN_FEATURES_TABLE" )->Set_Enabled(e_dataType == TABLE); + + } + + //----------------------------------------------------- + return( 1 ); +} + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +int COpenCV_NNet::On_Parameter_Changed(CSG_Parameters *p_Parameters, CSG_Parameter *p_Parameter) +{ + if(!SG_STR_CMP(p_Parameter->Get_Identifier(), SG_T("TRAIN_INPUT_TABLE")) ) + { + CSG_Table* t_TrainInput = p_Parameter->asTable(); + CSG_Parameters* p_TrainFeatures = p_Parameters->Get_Parameter("TRAIN_FEATURES_TABLE")->asParameters(); + + p_TrainFeatures->Del_Parameters(); + + if (t_TrainInput && t_TrainInput->Get_Field_Count() > 0) + { + int i_fieldCount = t_TrainInput->Get_Field_Count(); + + for (int i = 0; i < i_fieldCount; i++) + { + if( SG_Data_Type_is_Numeric(t_TrainInput->Get_Field_Type(i)) ) + { + // Add a bool choice for every numeric field to mark it as an possible output feature + p_TrainFeatures->Add_Value(NULL, CSG_String::Format(SG_T("%d_FEATURE"), i), t_TrainInput->Get_Field_Name(i), _TL(""), PARAMETER_TYPE_Bool, false); + } + } + } + } + + //----------------------------------------------------- + return( 1 ); +} + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +CSG_Vector COpenCV_NNet::GetClassVectorByName(CSG_Shapes *s_areas, const SG_Char *s_class, int i_classId) +{ + CSG_Vector v_outVec(s_areas->Get_Count()); + v_outVec.Set_Zero(); + + for (int i = 0; i < s_areas->Get_Count(); i++) + { + if (!SG_STR_CMP(s_class,s_areas->Get_Shape(i)->asString(i_classId))) + { + v_outVec[i] = 1; + } + } + return v_outVec; +} + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +CvMat* COpenCV_NNet::GetEvalMatrix(CSG_Table *t_Data, int i_type) +{ + double d_value; + CSG_Table_Record *tr_Record; + CvMat *mat; + + mat = cvCreateMat(t_Data->Get_Count(), t_Data->Get_Field_Count(), i_type); + + for(int i=0; iGet_Count(); i++) + { + tr_Record = t_Data->Get_Record(i); + + for(int j=0; jGet_Field_Count(); j++) + { + d_value = tr_Record->Get_Value(j)->asDouble(); + cvSetReal2D(mat, i, j, (float)d_value); + } + } + return mat; +} + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +CvMat* COpenCV_NNet::GetEvalMatrix(CSG_Parameter_Grid_List *gl_grids, int type) +{ + bool b_NoData; + int x,y,i_Grid; + CSG_Table *t_data; + CSG_Table_Record *tr_rec; + TSG_Point p; + CvMat *mat; + + // We will use this table as a temporary data store, + // since we cannot dynamically resize the CvMat + t_data = new CSG_Table(); + + // We need a column for each grid and the output lable + for (int i = 0; i < gl_grids->Get_Count(); i++) + { + t_data->Add_Field(CSG_String::Format(SG_T("GRID_%d"), i), SG_DATATYPE_Float, i); + } + + // Traverse all grids, every point + for(y=0, p.y=Get_YMin(); yGet_Count() && !b_NoData; i_Grid++) + { + // If there is one grid that has no data in this point p, then set the no data flag + if( gl_grids->asGrid(i_Grid)->is_NoData(x, y) ) + { + b_NoData = true; + } + } + + if (!b_NoData) + { + // We have data in all grids, so lets add them to the eval data table + tr_rec = t_data->Add_Record(); + for(i_Grid=0; i_GridGet_Count(); i_Grid++) + { + tr_rec->Set_Value(i_Grid, (float) gl_grids->asGrid(i_Grid)->asFloat(x, y)); + } + } + } + } + + // Now create the matrix and add all data from the table to the matrix + mat = GetEvalMatrix(t_data, type); + + return mat; +} + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +CvMat** COpenCV_NNet::GetTrainAndOutputMatrix(CSG_Table *t_trainData, int type, int *i_outputFeatureIdxs, int i_outputFeatureCount) +{ + bool b_isOutputFeature; + int i_idxCorrection; + double d_value; + CvMat **mat_array; + CvMat *mat_trainData; + CvMat *mat_outputData; + CSG_Table_Record *tr_Record; + + mat_trainData = cvCreateMat(t_trainData->Get_Count(), t_trainData->Get_Field_Count()-i_outputFeatureCount, type); + mat_outputData = cvCreateMat(t_trainData->Get_Count(), i_outputFeatureCount, type); + + for(int i=0; iGet_Count(); i++) + { + tr_Record = t_trainData->Get_Record(i); + + i_idxCorrection = 0; + for(int j=0; jGet_Field_Count(); j++) + { + // Get the current value from the input table + d_value = tr_Record->Get_Value(j)->asDouble(); + b_isOutputFeature = false; + + for (int u = 0; u < i_outputFeatureCount; u++) + { + // Check if j is an output feature index + if (j==i_outputFeatureIdxs[u]) + { + b_isOutputFeature = true; + i_idxCorrection++; + + // See http://public.cranfield.ac.uk/c5354/teaching/ml/examples/c++/handwritten_ex/neuralnetwork.cpp + // note that the OpenCV neural network (MLP) implementation does not + // support categorical variables explicitly. + // So, instead of the output class label, we will use + // a binary vector of {0,0 ... 1,0,0} components (one element by class) + // for training and therefore, MLP will give us a vector of "probabilities" + // at the prediction stage - the highest probability can be accepted + // as the "winning" class label output by the network + + // The current value is an output feature, store it in the output matrix + cvSetReal2D(mat_outputData, i, u, (float)d_value); + } + } + + if(!b_isOutputFeature) + { + // Store the value inside the traning data matrix + cvSetReal2D(mat_trainData, i, j-i_idxCorrection, (float)d_value); + } + } + } + + mat_array = new CvMat*[2]; + mat_array[0] = mat_trainData; + mat_array[1] = mat_outputData; + return mat_array; +} + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +CvMat** COpenCV_NNet::GetTrainAndOutputMatrix(CSG_Parameter_Grid_List *gl_grids, int type, CSG_Shapes *s_areas, int i_classId, CSG_Grid *g_evalOut, CSG_Grid *g_evalOutCert) +{ + bool b_NoData; + double d_value; + int x, y, i_Grid, i_Shape; + CSG_Table *t_data; + CSG_Table_Record *tr_rec; + const SG_Char *s_class; + CSG_Vector v_outVec; + CvMat **mat_array; + CvMat *mat_trainData; + CvMat *mat_outputData; + TSG_Point p; + + // CGrid_Classify_Supervised was the template for this method + + g_evalOut->Set_NoData_Value(-1); + g_evalOut->Assign(0.0); + + // We will use this table as a temporary data store, + // since we cannot dynamically resize the CvMat + t_data = new CSG_Table(); + + // We need a column for each grid and the output lable + for (int i = 0; i < gl_grids->Get_Count(); i++) + { + t_data->Add_Field(CSG_String::Format(SG_T("GRID_%d"), i), SG_DATATYPE_Float, i); + } + + t_data->Add_Field("CLASS", SG_DATATYPE_String, gl_grids->Get_Count()); + + + // Traverse all grids, every point + for(y=0, p.y=Get_YMin(); yGet_Count() && !b_NoData; i_Grid++) + { + // If there is one grid that has no data in this point p, then set the no data flag + if( gl_grids->asGrid(i_Grid)->is_NoData(x, y) ) + { + b_NoData = true; + } + } + + if (b_NoData) + { + // Set the NoData_Value to this point in the resulting grid + g_evalOut->Set_NoData(x, y); + if (g_evalOutCert) + { + g_evalOutCert->Set_NoData(x, y); + } + } + else if(s_areas) + { + // We have a value in each input grid and we have training area shapes + for(i_Shape=0; i_ShapeGet_Count(); i_Shape++) + { + // TODO: Get the current shape and check if the point is in it, then store + // its class and the corresponding value from the input grids in the training grid + CSG_Shape_Polygon *sp_inputArea = (CSG_Shape_Polygon *)s_areas->Get_Shape(i_Shape); + + if (sp_inputArea->Contains(p)) + { + tr_rec = t_data->Add_Record(); + for(i_Grid=0; i_GridGet_Count(); i_Grid++) + { + tr_rec->Set_Value(i_Grid, (float) gl_grids->asGrid(i_Grid)->asFloat(x, y)); + } + tr_rec->Set_Value(gl_grids->Get_Count(), sp_inputArea->asString(i_classId)); + } + } + } + } + } + + // Now that we have got all values in t_data for all points and the classes let's create the mats + mat_trainData = cvCreateMat(t_data->Get_Count(), gl_grids->Get_Count(), type); + + // Extract only the train data from the table + for(int i=0; iGet_Count(); i++) + { + tr_rec = t_data->Get_Record(i); + + for(int j=0; jGet_Count(); j++) + { + d_value = tr_rec->Get_Value(j)->asDouble(); + cvSetReal2D(mat_trainData, i, j, (float)d_value); + } + } + + mat_outputData = cvCreateMat(t_data->Get_Count(), s_areas->Get_Count(), type); + + // Extract only the class data from the table + for(int i=0; iGet_Count(); i++) + { + tr_rec = t_data->Get_Record(i); + s_class = tr_rec->Get_Value(gl_grids->Get_Count())->asString(); + + v_outVec = GetClassVectorByName(s_areas, s_class, i_classId); + + for(int j=0; jhttp://opencv.org" + )); + + Parameters.Add_Grid( + NULL , "LEFT" , _TL("Left Image"), + _TL(""), + PARAMETER_INPUT + ); + + Parameters.Add_Grid( + NULL , "RIGHT" , _TL("Right Image"), + _TL(""), + PARAMETER_INPUT + ); + + Parameters.Add_Grid( + NULL , "DISPARITY" , _TL("Disparity Image"), + _TL(""), + PARAMETER_OUTPUT + ); + +// Parameters.Add_PointCloud( +// NULL , "POINTS" , _TL("3D Points"), +// _TL(""), +// PARAMETER_OUTPUT +// ); + + Parameters.Add_Choice( + NULL , "ALGORITHM" , _TL("Algorithm"), + _TL(""), + CSG_String::Format(SG_T("%s|%s|%s|%s|"), + _TL("bm"), + _TL("sgbm"), + _TL("hh"), + _TL("var") + ) + ); + + Parameters.Add_Value( + NULL , "BLOCKSIZE" , _TL("Block Size"), + _TL(""), + PARAMETER_TYPE_Int, 4, 0, true + ); + + Parameters.Add_Value( + NULL , "DISP_MAX" , _TL("Maximum Disparity"), + _TL(""), + PARAMETER_TYPE_Int, 1, 1, true + ); + + Parameters.Add_Value( + NULL , "SCALE" , _TL("Scale Factor"), + _TL(""), + PARAMETER_TYPE_Double, 1.0, 0.0, true + ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool COpenCV_Stereo_Match::On_Execute(void) +{ + CSG_Grid *pLeft, *pRight, *pDisp; + + pLeft = Parameters("LEFT" )->asGrid(); + pRight = Parameters("RIGHT")->asGrid(); + + pDisp = Parameters("DISPARITY")->asGrid(); + + //----------------------------------------------------- + int BlockSize, Algorithm, maxDisp; + double Scale; + + BlockSize = Parameters("BLOCKSIZE")->asInt() * 2 + 1; + maxDisp = Parameters("DISP_MAX" )->asInt() * 16; + Scale = Parameters("SCALE" )->asDouble(); + + switch( Parameters("ALGORITHM")->asInt() ) + { + case 0: Algorithm = STEREO_BM; break; + default: Algorithm = STEREO_SGBM; break; + case 2: Algorithm = STEREO_HH; break; + case 3: Algorithm = STEREO_VAR; break; + } + + //----------------------------------------------------- + cv::StereoBM bm;//(CV_STEREO_BM_BASIC, maxDisp); + + cv::Rect roi1, roi2; + bm.state->roi1 = roi1; + bm.state->roi2 = roi2; + bm.state->preFilterCap = 31; + bm.state->SADWindowSize = BlockSize > 0 ? BlockSize : 9; + bm.state->minDisparity = 0; + bm.state->numberOfDisparities = maxDisp; + bm.state->textureThreshold = 10; + bm.state->uniquenessRatio = 15; + bm.state->speckleWindowSize = 100; + bm.state->speckleRange = 32; + bm.state->disp12MaxDiff = 1; +/**/ + + //----------------------------------------------------- + cv::Mat Left, Right, Disparity; + + Get_CVMatrix(Left , pLeft , SG_DATATYPE_Byte); + Get_CVMatrix(Right, pRight, SG_DATATYPE_Byte); + + bm(Left, Right, Disparity, CV_32F); + + //----------------------------------------------------- + Copy_CVMatrix_To_Grid(pDisp, &Disparity); + +// pDisp->Set_Name(CSG_String::Format(SG_T("%s [%s]"), pInput->Get_Name(), Get_Name().c_str())); + + return( true ); + + //----------------------------------------------------- +/* + if( (intrinsic_filename != 0) ^ (extrinsic_filename != 0) ) + { + printf("Command-line parameter error: either both intrinsic and extrinsic parameters must be specified, or none of them (when the stereo pair is already rectified)\n"); + return -1; + } + if( extrinsic_filename == 0 && point_cloud_filename ) + { + printf("Command-line parameter error: extrinsic and intrinsic parameters must be specified to compute the point cloud\n"); + return -1; + } + + //----------------------------------------------------- + if( Scale != 1.f ) + { + Mat temp1, temp2; + int method = Scale < 1 ? INTER_AREA : INTER_CUBIC; + resize(img1, temp1, Size(), Scale, Scale, method); + img1 = temp1; + resize(img2, temp2, Size(), Scale, Scale, method); + img2 = temp2; + } + + Size img_size = img1.size(); + + Rect roi1, roi2; + Mat Q; + + if( intrinsic_filename ) + { + // reading intrinsic parameters + FileStorage fs(intrinsic_filename, CV_STORAGE_READ); + if(!fs.isOpened()) + { + printf("Failed to open file %s\n", intrinsic_filename); + return -1; + } + + Mat M1, D1, M2, D2; + fs["M1"] >> M1; + fs["D1"] >> D1; + fs["M2"] >> M2; + fs["D2"] >> D2; + + M1 *= Scale; + M2 *= Scale; + + fs.open(extrinsic_filename, CV_STORAGE_READ); + if(!fs.isOpened()) + { + printf("Failed to open file %s\n", extrinsic_filename); + return -1; + } + + Mat R, T, R1, P1, R2, P2; + fs["R"] >> R; + fs["T"] >> T; + + stereoRectify( M1, D1, M2, D2, img_size, R, T, R1, R2, P1, P2, Q, CALIB_ZERO_DISPARITY, -1, img_size, &roi1, &roi2 ); + + Mat map11, map12, map21, map22; + initUndistortRectifyMap(M1, D1, R1, P1, img_size, CV_16SC2, map11, map12); + initUndistortRectifyMap(M2, D2, R2, P2, img_size, CV_16SC2, map21, map22); + + Mat img1r, img2r; + remap(img1, img1r, map11, map12, INTER_LINEAR); + remap(img2, img2r, map21, map22, INTER_LINEAR); + + img1 = img1r; + img2 = img2r; + } + + maxDisp = maxDisp > 0 ? maxDisp : ((img_size.width/8) + 15) & -16; + + StereoBM bm; + StereoSGBM sgbm; + + bm.state->roi1 = roi1; + bm.state->roi2 = roi2; + bm.state->preFilterCap = 31; + bm.state->SADWindowSize = BlockSize > 0 ? BlockSize : 9; + bm.state->minDisparity = 0; + bm.state->numberOfDisparities = maxDisp; + bm.state->textureThreshold = 10; + bm.state->uniquenessRatio = 15; + bm.state->speckleWindowSize = 100; + bm.state->speckleRange = 32; + bm.state->disp12MaxDiff = 1; + + sgbm.preFilterCap = 63; + sgbm.SADWindowSize = BlockSize > 0 ? BlockSize : 3; + + int cn = img1.channels(); + + sgbm.P1 = 8*cn*sgbm.SADWindowSize*sgbm.SADWindowSize; + sgbm.P2 = 32*cn*sgbm.SADWindowSize*sgbm.SADWindowSize; + sgbm.minDisparity = 0; + sgbm.numberOfDisparities = maxDisp; + sgbm.uniquenessRatio = 10; + sgbm.speckleWindowSize = bm.state->speckleWindowSize; + sgbm.speckleRange = bm.state->speckleRange; + sgbm.disp12MaxDiff = 1; + sgbm.fullDP = Algorithm == STEREO_HH; + + Mat disp, disp8; + //Mat img1p, img2p, dispp; + //copyMakeBorder(img1, img1p, 0, 0, maxDisp, 0, IPL_BORDER_REPLICATE); + //copyMakeBorder(img2, img2p, 0, 0, maxDisp, 0, IPL_BORDER_REPLICATE); + + int64 t = getTickCount(); + + switch( Algorithm ) + { + case STEREO_BM: + bm(img1, img2, disp); + break; + + case STEREO_SGBM: + case STEREO_HH: + sgbm(img1, img2, disp); + break; + + case STEREO_VAR: + var(img1, img2, disp); + break; + } + + t = getTickCount() - t; + printf("Time elapsed: %fms\n", t*1000/getTickFrequency()); + + //disp = dispp.colRange(maxDisp, img1p.cols); + if( Algorithm != STEREO_VAR ) + disp.convertTo(disp8, CV_8U, 255/(maxDisp*16.)); + else + disp.convertTo(disp8, CV_8U); + + if(disparity_filename) + imwrite(disparity_filename, disp8); + + if(point_cloud_filename) + { + printf("storing the point cloud..."); + fflush(stdout); + Mat xyz; + reprojectImageTo3D(disp, xyz, Q, true); + saveXYZ(point_cloud_filename, xyz); + printf("\n"); + } +/**/ +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + +/*using namespace cv; +static void saveXYZ(const char* filename, const Mat& mat) +{ + const double max_z = 1.0e4; + FILE* fp = fopen(filename, "wt"); + for(int y = 0; y < mat.rows; y++) + { + for(int x = 0; x < mat.cols; x++) + { + Vec3f point = mat.at(y, x); + if(fabs(point[2] - max_z) < FLT_EPSILON || fabs(point[2]) > max_z) continue; + fprintf(fp, "%f %f %f\n", point[0], point[1], point[2]); + } + } + fclose(fp); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + +#include "opencv2/calib3d/calib3d.hpp" +#include "opencv2/imgproc/imgproc.hpp" +#include "opencv2/highgui/highgui.hpp" +#include "opencv2/contrib/contrib.hpp" + +#include + +using namespace cv; + +static void print_help() +{ + printf("\nDemo stereo matching converting L and R images into disparity and point clouds\n"); + printf("\nUsage: stereo_match [--algorithm=bm|sgbm|hh|var] [--blocksize=]\n" + "[--max-disparity=] [--scale=scale_factor>] [-i ] [-e ]\n" + "[--no-display] [-o ] [-p ]\n"); +} + +static void saveXYZ(const char* filename, const Mat& mat) +{ + const double max_z = 1.0e4; + FILE* fp = fopen(filename, "wt"); + for(int y = 0; y < mat.rows; y++) + { + for(int x = 0; x < mat.cols; x++) + { + Vec3f point = mat.at(y, x); + if(fabs(point[2] - max_z) < FLT_EPSILON || fabs(point[2]) > max_z) continue; + fprintf(fp, "%f %f %f\n", point[0], point[1], point[2]); + } + } + fclose(fp); +} + +int main(int argc, char** argv) +{ + const char* algorithm_opt = "--algorithm="; + const char* maxdisp_opt = "--max-disparity="; + const char* blocksize_opt = "--blocksize="; + const char* nodisplay_opt = "--no-display"; + const char* scale_opt = "--scale="; + + if(argc < 3) + { + print_help(); + return 0; + } + const char* img1_filename = 0; + const char* img2_filename = 0; + const char* intrinsic_filename = 0; + const char* extrinsic_filename = 0; + const char* disparity_filename = 0; + const char* point_cloud_filename = 0; + + enum { STEREO_BM=0, STEREO_SGBM=1, STEREO_HH=2, STEREO_VAR=3 }; + int alg = STEREO_SGBM; + int SADWindowSize = 0, numberOfDisparities = 0; + bool no_display = false; + float scale = 1.f; + + StereoBM bm; + StereoSGBM sgbm; + StereoVar var; + + for( int i = 1; i < argc; i++ ) + { + if( argv[i][0] != '-' ) + { + if( !img1_filename ) + img1_filename = argv[i]; + else + img2_filename = argv[i]; + } + else if( strncmp(argv[i], algorithm_opt, strlen(algorithm_opt)) == 0 ) + { + char* _alg = argv[i] + strlen(algorithm_opt); + alg = strcmp(_alg, "bm") == 0 ? STEREO_BM : + strcmp(_alg, "sgbm") == 0 ? STEREO_SGBM : + strcmp(_alg, "hh") == 0 ? STEREO_HH : + strcmp(_alg, "var") == 0 ? STEREO_VAR : -1; + if( alg < 0 ) + { + printf("Command-line parameter error: Unknown stereo algorithm\n\n"); + print_help(); + return -1; + } + } + else if( strncmp(argv[i], maxdisp_opt, strlen(maxdisp_opt)) == 0 ) + { + if( sscanf( argv[i] + strlen(maxdisp_opt), "%d", &numberOfDisparities ) != 1 || + numberOfDisparities < 1 || numberOfDisparities % 16 != 0 ) + { + printf("Command-line parameter error: The max disparity (--maxdisparity=<...>) must be a positive integer divisible by 16\n"); + print_help(); + return -1; + } + } + else if( strncmp(argv[i], blocksize_opt, strlen(blocksize_opt)) == 0 ) + { + if( sscanf( argv[i] + strlen(blocksize_opt), "%d", &SADWindowSize ) != 1 || + SADWindowSize < 1 || SADWindowSize % 2 != 1 ) + { + printf("Command-line parameter error: The block size (--blocksize=<...>) must be a positive odd number\n"); + return -1; + } + } + else if( strncmp(argv[i], scale_opt, strlen(scale_opt)) == 0 ) + { + if( sscanf( argv[i] + strlen(scale_opt), "%f", &scale ) != 1 || scale < 0 ) + { + printf("Command-line parameter error: The scale factor (--scale=<...>) must be a positive floating-point number\n"); + return -1; + } + } + else if( strcmp(argv[i], nodisplay_opt) == 0 ) + no_display = true; + else if( strcmp(argv[i], "-i" ) == 0 ) + intrinsic_filename = argv[++i]; + else if( strcmp(argv[i], "-e" ) == 0 ) + extrinsic_filename = argv[++i]; + else if( strcmp(argv[i], "-o" ) == 0 ) + disparity_filename = argv[++i]; + else if( strcmp(argv[i], "-p" ) == 0 ) + point_cloud_filename = argv[++i]; + else + { + printf("Command-line parameter error: unknown option %s\n", argv[i]); + return -1; + } + } + + if( !img1_filename || !img2_filename ) + { + printf("Command-line parameter error: both left and right images must be specified\n"); + return -1; + } + + if( (intrinsic_filename != 0) ^ (extrinsic_filename != 0) ) + { + printf("Command-line parameter error: either both intrinsic and extrinsic parameters must be specified, or none of them (when the stereo pair is already rectified)\n"); + return -1; + } + + if( extrinsic_filename == 0 && point_cloud_filename ) + { + printf("Command-line parameter error: extrinsic and intrinsic parameters must be specified to compute the point cloud\n"); + return -1; + } + + int color_mode = alg == STEREO_BM ? 0 : -1; + Mat img1 = imread(img1_filename, color_mode); + Mat img2 = imread(img2_filename, color_mode); + + if( scale != 1.f ) + { + Mat temp1, temp2; + int method = scale < 1 ? INTER_AREA : INTER_CUBIC; + resize(img1, temp1, Size(), scale, scale, method); + img1 = temp1; + resize(img2, temp2, Size(), scale, scale, method); + img2 = temp2; + } + + Size img_size = img1.size(); + + Rect roi1, roi2; + Mat Q; + + if( intrinsic_filename ) + { + // reading intrinsic parameters + FileStorage fs(intrinsic_filename, CV_STORAGE_READ); + if(!fs.isOpened()) + { + printf("Failed to open file %s\n", intrinsic_filename); + return -1; + } + + Mat M1, D1, M2, D2; + fs["M1"] >> M1; + fs["D1"] >> D1; + fs["M2"] >> M2; + fs["D2"] >> D2; + + M1 *= scale; + M2 *= scale; + + fs.open(extrinsic_filename, CV_STORAGE_READ); + if(!fs.isOpened()) + { + printf("Failed to open file %s\n", extrinsic_filename); + return -1; + } + + Mat R, T, R1, P1, R2, P2; + fs["R"] >> R; + fs["T"] >> T; + + stereoRectify( M1, D1, M2, D2, img_size, R, T, R1, R2, P1, P2, Q, CALIB_ZERO_DISPARITY, -1, img_size, &roi1, &roi2 ); + + Mat map11, map12, map21, map22; + initUndistortRectifyMap(M1, D1, R1, P1, img_size, CV_16SC2, map11, map12); + initUndistortRectifyMap(M2, D2, R2, P2, img_size, CV_16SC2, map21, map22); + + Mat img1r, img2r; + remap(img1, img1r, map11, map12, INTER_LINEAR); + remap(img2, img2r, map21, map22, INTER_LINEAR); + + img1 = img1r; + img2 = img2r; + } + + numberOfDisparities = numberOfDisparities > 0 ? numberOfDisparities : ((img_size.width/8) + 15) & -16; + + bm.state->roi1 = roi1; + bm.state->roi2 = roi2; + bm.state->preFilterCap = 31; + bm.state->SADWindowSize = SADWindowSize > 0 ? SADWindowSize : 9; + bm.state->minDisparity = 0; + bm.state->numberOfDisparities = numberOfDisparities; + bm.state->textureThreshold = 10; + bm.state->uniquenessRatio = 15; + bm.state->speckleWindowSize = 100; + bm.state->speckleRange = 32; + bm.state->disp12MaxDiff = 1; + + sgbm.preFilterCap = 63; + sgbm.SADWindowSize = SADWindowSize > 0 ? SADWindowSize : 3; + + int cn = img1.channels(); + + sgbm.P1 = 8*cn*sgbm.SADWindowSize*sgbm.SADWindowSize; + sgbm.P2 = 32*cn*sgbm.SADWindowSize*sgbm.SADWindowSize; + sgbm.minDisparity = 0; + sgbm.numberOfDisparities = numberOfDisparities; + sgbm.uniquenessRatio = 10; + sgbm.speckleWindowSize = bm.state->speckleWindowSize; + sgbm.speckleRange = bm.state->speckleRange; + sgbm.disp12MaxDiff = 1; + sgbm.fullDP = alg == STEREO_HH; + + var.levels = 3; // ignored with USE_AUTO_PARAMS + var.pyrScale = 0.5; // ignored with USE_AUTO_PARAMS + var.nIt = 25; + var.minDisp = -numberOfDisparities; + var.maxDisp = 0; + var.poly_n = 3; + var.poly_sigma = 0.0; + var.fi = 15.0f; + var.lambda = 0.03f; + var.penalization = var.PENALIZATION_TICHONOV; // ignored with USE_AUTO_PARAMS + var.cycle = var.CYCLE_V; // ignored with USE_AUTO_PARAMS + var.flags = var.USE_SMART_ID | var.USE_AUTO_PARAMS | var.USE_INITIAL_DISPARITY | var.USE_MEDIAN_FILTERING ; + + Mat disp, disp8; + //Mat img1p, img2p, dispp; + //copyMakeBorder(img1, img1p, 0, 0, numberOfDisparities, 0, IPL_BORDER_REPLICATE); + //copyMakeBorder(img2, img2p, 0, 0, numberOfDisparities, 0, IPL_BORDER_REPLICATE); + + int64 t = getTickCount(); + if( alg == STEREO_BM ) + bm(img1, img2, disp); + else if( alg == STEREO_VAR ) { + var(img1, img2, disp); + } + else if( alg == STEREO_SGBM || alg == STEREO_HH ) + sgbm(img1, img2, disp); + t = getTickCount() - t; + printf("Time elapsed: %fms\n", t*1000/getTickFrequency()); + + //disp = dispp.colRange(numberOfDisparities, img1p.cols); + if( alg != STEREO_VAR ) + disp.convertTo(disp8, CV_8U, 255/(numberOfDisparities*16.)); + else + disp.convertTo(disp8, CV_8U); + if( !no_display ) + { + namedWindow("left", 1); + imshow("left", img1); + namedWindow("right", 1); + imshow("right", img2); + namedWindow("disparity", 0); + imshow("disparity", disp8); + printf("press any key to continue..."); + fflush(stdout); + waitKey(); + printf("\n"); + } + + if(disparity_filename) + imwrite(disparity_filename, disp8); + + if(point_cloud_filename) + { + printf("storing the point cloud..."); + fflush(stdout); + Mat xyz; + reprojectImageTo3D(disp, xyz, Q, true); + saveXYZ(point_cloud_filename, xyz); + printf("\n"); + } + + return 0; +} +/**/ diff -Nru saga-2.1.0+dfsg/src/modules/imagery/imagery_opencv/opencv_stereo_match.h saga-2.1.4+dfsg/src/modules/imagery/imagery_opencv/opencv_stereo_match.h --- saga-2.1.0+dfsg/src/modules/imagery/imagery_opencv/opencv_stereo_match.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/imagery/imagery_opencv/opencv_stereo_match.h 2014-11-13 08:32:18.000000000 +0000 @@ -0,0 +1,106 @@ +/********************************************************** + * Version $Id: opencv_stereo_match.h 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// OpenCV // +// // +//-------------------------------------------------------// +// // +// opencv_stereo_match.h // +// // +// Copyright (C) 2014 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Hamburg // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#ifndef HEADER_INCLUDED__opencv_stereo_match_H +#define HEADER_INCLUDED__opencv_stereo_match_H + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "opencv.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +class COpenCV_Stereo_Match : public CSG_Module_Grid +{ +public: + COpenCV_Stereo_Match(void); + + virtual CSG_String Get_MenuPath (void) { return( _TL("A:Garden|Imagery") ); } + + +protected: + + virtual bool On_Execute (void); + + +}; + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#endif // #ifndef HEADER_INCLUDED__opencv_stereo_match_H diff -Nru saga-2.1.0+dfsg/src/modules/imagery/imagery_opencv/opencv_svd.cpp saga-2.1.4+dfsg/src/modules/imagery/imagery_opencv/opencv_svd.cpp --- saga-2.1.0+dfsg/src/modules/imagery/imagery_opencv/opencv_svd.cpp 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/imagery/imagery_opencv/opencv_svd.cpp 2014-11-13 08:32:18.000000000 +0000 @@ -0,0 +1,182 @@ +/********************************************************** + * Version $Id: opencv_svd.cpp 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// OpenCV // +// // +//-------------------------------------------------------// +// // +// opencv_svd.cpp // +// // +// Copyright (C) 2009 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Hamburg // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "opencv_svd.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +COpenCV_SVD::COpenCV_SVD(void) +{ + Set_Name (_TL("Single Value Decomposition (OpenCV)")); + + Set_Author (SG_T("O.Conrad (c) 2009")); + + Set_Description (_TW( + "References:\n" + "OpenCV - Open Source Computer Vision\n" + "http://opencv.willowgarage.com" + )); + + Parameters.Add_Grid( + NULL , "INPUT" , _TL("Input"), + _TL(""), + PARAMETER_INPUT + ); + + Parameters.Add_Grid( + NULL , "OUTPUT" , _TL("Output"), + _TL(""), + PARAMETER_OUTPUT + ); + + Parameters.Add_Range( + NULL , "RANGE" , _TL("Range"), + _TL(""), + 0.1, 0.9, 0.0, true + ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool COpenCV_SVD::On_Execute(void) +{ + int sMin, sMax; + CSG_Grid *pInput, *pOutput; + + int n = MIN(Get_NY(), Get_NX()); + int m = MAX(Get_NY(), Get_NX()); + + pInput = Parameters("INPUT") ->asGrid(); + pOutput = Parameters("OUTPUT") ->asGrid(); + sMin = (int)(Parameters("RANGE") ->asRange()->Get_LoVal() * n); + sMax = (int)(Parameters("RANGE") ->asRange()->Get_HiVal() * n); + + //----------------------------------------------------- + IplImage *cv_pInput = Get_CVImage(pInput, SG_DATATYPE_Double); + + //----------------------------------------------------- + IplImage *cv_pOutput = Get_CVImage(m, n, SG_DATATYPE_Double); + + CvMat *cv_pW = cvCreateMat(n, cv_pInput->height, CV_64FC1); + CvMat *cv_pU = cvCreateMat(n, cv_pInput->height, CV_64FC1); + CvMat *cv_pV = cvCreateMat(n, cv_pInput->width , CV_64FC1); + + //----------------------------------------------------- + cvSVD(cv_pInput, cv_pW, cv_pU, cv_pV, CV_SVD_MODIFY_A+CV_SVD_V_T); + + CSG_Matrix u(cv_pU->rows, cv_pU->cols, cv_pU->data.db); + CSG_Matrix v(cv_pV->rows, cv_pV->cols, cv_pV->data.db); + CSG_Matrix w(cv_pW->rows, cv_pW->cols, cv_pW->data.db); + CSG_Matrix svd(Get_NY(), Get_NX()); + + for(int i=0; i sMax ) + w[i][i] = 0.0; + + svd = u * w; + svd *= v.Get_Transpose(); + + for(int y=0; ySet_Value(x, y, svd[y][x]); +// pOutput->Set_Value(x, y, u[y][x]); +// pOutput->Set_Value(x, y, v[y][x]); +// pOutput->Set_Value(x, y, w[y][x]); + + //----------------------------------------------------- + +// cvSVBkSb(cv_pW, cv_pU, cv_pV, NULL, cv_pOutput, CV_SVD_U_T+CV_SVD_V_T); + + cvReleaseMat(&cv_pW); + cvReleaseMat(&cv_pU); + cvReleaseMat(&cv_pV); + + //----------------------------------------------------- +// Copy_CVImage_To_Grid(pOutput, cv_pOutput); + + cvReleaseImage(&cv_pInput); + cvReleaseImage(&cv_pOutput); + + pOutput->Set_Name(CSG_String::Format(SG_T("%s [%s]"), pInput->Get_Name(), Get_Name().c_str())); + + return( true ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- diff -Nru saga-2.1.0+dfsg/src/modules/imagery/imagery_opencv/opencv_svd.h saga-2.1.4+dfsg/src/modules/imagery/imagery_opencv/opencv_svd.h --- saga-2.1.0+dfsg/src/modules/imagery/imagery_opencv/opencv_svd.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/imagery/imagery_opencv/opencv_svd.h 2014-11-13 08:32:18.000000000 +0000 @@ -0,0 +1,106 @@ +/********************************************************** + * Version $Id: opencv_svd.h 1922 2014-01-09 10:28:46Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// OpenCV // +// // +//-------------------------------------------------------// +// // +// opencv_svd.h // +// // +// Copyright (C) 2009 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Hamburg // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#ifndef HEADER_INCLUDED__opencv_svd_H +#define HEADER_INCLUDED__opencv_svd_H + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "opencv.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +class COpenCV_SVD : public CSG_Module_Grid +{ +public: + COpenCV_SVD(void); + + virtual CSG_String Get_MenuPath (void) { return( _TL("A:Imagery|Fourier Analysis") ); } + + +protected: + + virtual bool On_Execute (void); + + +}; + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#endif // #ifndef HEADER_INCLUDED__opencv_svd_H diff -Nru saga-2.1.0+dfsg/src/modules/imagery/imagery_photogrammetry/Colorisation.cpp saga-2.1.4+dfsg/src/modules/imagery/imagery_photogrammetry/Colorisation.cpp --- saga-2.1.0+dfsg/src/modules/imagery/imagery_photogrammetry/Colorisation.cpp 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/imagery/imagery_photogrammetry/Colorisation.cpp 2014-11-13 08:32:18.000000000 +0000 @@ -0,0 +1,322 @@ +/********************************************************** + * Version $Id: Colorisation.cpp 1945 2014-01-16 10:00:22Z reklov_w $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// imagery_photogrammetry // +// // +//-------------------------------------------------------// +// // +// Colorisation.cpp // +// // +// Copyright (C) 2013 by // +// HfT Stuttgart // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: avishek.dutta@hft-stuttgart.de // +// // +// contact: Avishek Dutta // +// Hochschule fuer Technik Stuttgart // +// Schellingstr. 24 // +// D-70174 Stuttgart // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "Colorisation.h" +#include "methods.h" +#include + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +CColorisation::CColorisation(void) +{ + Set_Name (_TL("Colorisation (PC)")); + + Set_Author (SG_T("HfT Stuttgart (c) 2013")); + + Set_Description (_TW( + "This module attaches the color information from a RGB image to Laser Points." + "\n The RGB Image and the Point Cloud to be colorised are the inputs along " + "with the interior and exterior orientation parameters of the camera. The " + "necessary interior orientation parameters are Focal Length (mm), Pixel " + "Size (um), Principal Point Offsets (pixels) and optionally the Radial " + "Distortion Parameters. The distortion model being used is as follows: " + "\n x_d = x_u (1 - dR)" + "\n y_d = y_u (1 - dR) " + "\n where, dR = K1 * r_u ^ 2 + K2 * r_u ^ 4 + K3 * r_u ^ 6," + "\n r_u ^ 2 = x_u ^ 2 + y_u ^ 2," + "\n x_u, y_u are the undistorted (corrected) image coordinates in mm," + "\n x_d, y_d are the distorted (observed) image coordinates in mm," + "\n K1 is in [mm ^ -2], K2 is in [mm ^ -4], K3 is in [mm ^ -6]." + "\nThe necessary exterior orientation parameters are the coordinates of the " + "Projection Center and the Cardan angles Omega, Kappa and Alpha. The Cardan " + "angles refer to the following transformation between image coordinates " + "(x_image) and global coordinates (X_Global): " + "\n x_image = R_1(omega) * R_2(kappa) * R_3(alpha) * X_Global " + "\n\n [Optional] If the Time Stamp of the RGB Image is given, an acceptable time difference" + " between the points and the image must provided in order to colorise only those points falling" + " that range. If no time is given all points are colorised." + "\n The result is a colorised point cloud." + "\n\n" + )); + + //----------------------------------------------------- + Parameters.Add_Grid(NULL, "rgbImage", _TL("RGB Image"), _TL("RGB Image"), PARAMETER_INPUT); + + Parameters.Add_PointCloud( + NULL , "PC_IN" , _TL("Points to be Colorised"), + _TL("Points to be Colorised"), + PARAMETER_INPUT + ); + + Parameters.Add_Value (NULL, "GIVE_TIME", _TL ("Provide Time stamp of Image?"), _TL ("Do you wish to provide the time stamp of Image?"), PARAMETER_TYPE_Bool, false); + Parameters.Add_Value (NULL, "IMG_TIME", _TL ("Time stamp of Image"), _TL ("Time stamp of Image"), PARAMETER_TYPE_Double); + Parameters.Add_Value (NULL, "TIME_DIFF", _TL ("Time Difference between Image & Points"), _TL ("Acceptable Time Difference between Image and Laser Points"), PARAMETER_TYPE_Double); + + Parameters.Add_Node(NULL, "INT ORI", _TL("Interior Orientation Parameters"), _TL("Internal Orientation Parameters")); + Parameters.Add_Value (Parameters("INT ORI"), "F", _TL ("Focal Length (mm)"), _TL ("Focal Length in mm"), PARAMETER_TYPE_Double); + Parameters.Add_Value (Parameters("INT ORI"), "W", _TL ("Pixel Width (um)"), _TL ("Pixel Width in micro meters"), PARAMETER_TYPE_Double); + Parameters.Add_Value (Parameters("INT ORI"), "ppX", _TL ("Principal Point Offset in X (pixles)"), _TL ("Principal Point Offset in X"), PARAMETER_TYPE_Double); + Parameters.Add_Value (Parameters("INT ORI"), "ppY", _TL ("Principal Point Offset in Y (pixels)"), _TL ("Principal Point Offset in Y"), PARAMETER_TYPE_Double); + Parameters.Add_Value (Parameters("INT ORI"), "GIVE_DISTORTIONS", _TL ("Provide Radial Distortion Parameters?"), _TL ("Do you wish to provide the Radial Distortion Parameters?"), PARAMETER_TYPE_Bool, false); + Parameters.Add_Value (Parameters("INT ORI"), "K1", _TL ("K1"), _TL ("K1"), PARAMETER_TYPE_Double, 0.0); + Parameters.Add_Value (Parameters("INT ORI"), "K2", _TL ("K2"), _TL ("K2"), PARAMETER_TYPE_Double, 0.0); + Parameters.Add_Value (Parameters("INT ORI"), "K3", _TL ("K3"), _TL ("K3"), PARAMETER_TYPE_Double, 0.0); + + Parameters.Add_Node(NULL, "EXT ORI", _TL("Exterior Orientation Parameters"), _TL("Exterior Orientation Parameters")); + Parameters.Add_Value (Parameters("EXT ORI"), "Xc", _TL ("Projection Centre - X"), _TL ("Projection Centre"), PARAMETER_TYPE_Double); + Parameters.Add_Value (Parameters("EXT ORI"), "Yc", _TL ("Projection Centre - Y"), _TL ("Projection Centre"), PARAMETER_TYPE_Double); + Parameters.Add_Value (Parameters("EXT ORI"), "Zc", _TL ("Projection Centre - Z"), _TL ("Projection Centre"), PARAMETER_TYPE_Double); + Parameters.Add_Value (Parameters("EXT ORI"), "omega", _TL ("Omega"), _TL ("Rotation Angle"), PARAMETER_TYPE_Double); + Parameters.Add_Value (Parameters("EXT ORI"), "kappa", _TL ("Kappa"), _TL ("Rotation Angle"), PARAMETER_TYPE_Double); + Parameters.Add_Value (Parameters("EXT ORI"), "alpha", _TL ("Alpha"), _TL ("Rotation Angle"), PARAMETER_TYPE_Double); + + + Parameters.Add_PointCloud( + NULL , "PC_OUT" , _TL("Colorised Point Cloud"), + _TL("Colorised Point Cloud"), + PARAMETER_OUTPUT + ); + +} + +//--------------------------------------------------------- +bool CColorisation::On_Execute(void) +{ + + CSG_Vector center(3), angles(3); + + CSG_Grid *rgbImage = Parameters("rgbImage") ->asGrid(); + CSG_PointCloud *pPoints = Parameters("PC_IN") ->asPointCloud(); + CSG_PointCloud *pResult = Parameters("PC_OUT") ->asPointCloud(); + double c = Parameters("F") ->asDouble(); // Focal Length (mm) + double pixWmm = Parameters("W") ->asDouble() / 1000;// Pixel Width (mm) + double ppOffsetX = Parameters("ppX") ->asDouble(); // Principal Point Offset X (pixels) + double ppOffsetY = Parameters("ppY") ->asDouble(); // Principal Point Offset Y (pixels) + center[0] = Parameters("Xc") ->asDouble(); + center[1] = Parameters("Yc") ->asDouble(); + center[2] = Parameters("Zc") ->asDouble(); + angles[0] = Parameters("omega") ->asDouble(); + angles[1] = Parameters("kappa") ->asDouble(); + angles[2] = Parameters("alpha") ->asDouble(); + + int pointCount = pPoints->Get_Point_Count(); + int attrCount = pPoints->Get_Attribute_Count(); + + bool applyDistortions = false; + CSG_Vector K(3); + if ( Parameters("GIVE_DISTORTIONS")->asBool() ) { + + applyDistortions = true; + K[0] = Parameters("K1") ->asDouble(); + K[1] = Parameters("K2") ->asDouble(); + K[2] = Parameters("K3") ->asDouble(); + + } + + double imgTimeStamp = 0; + double timeThresh = 0; + bool applyTimeStamp = Parameters("GIVE_TIME") ->asBool(); + if (applyTimeStamp) { + + imgTimeStamp = Parameters("IMG_TIME") ->asDouble(); + timeThresh = Parameters("TIME_DIFF") ->asDouble(); + } + + pResult->Create(pPoints); + pResult->Set_Name(CSG_String::Format(_TL("%s_colorised"), pPoints->Get_Name())); +// pResult->Add_Field(SG_T("Red"), SG_DATATYPE_Int); +// pResult->Add_Field(SG_T("Green"), SG_DATATYPE_Int); +// pResult->Add_Field(SG_T("Blue"), SG_DATATYPE_Int); + pResult->Add_Field(SG_T("RGB"), SG_DATATYPE_Int); + DataObject_Update(pResult); + + CSG_Matrix R = methods::calcRotnMatrix(angles); + + double xmin = rgbImage->Get_XMin(); + double xmax = rgbImage->Get_XMax(); + double ymin = rgbImage->Get_YMin(); + double ymax = rgbImage->Get_YMax(); + + int iAccept = 0; + + for (int i = 0; i < pointCount && Set_Progress(i, pointCount); i++) { + + if ( applyTimeStamp && abs( imgTimeStamp - pPoints->Get_Attribute(i,0) ) >= timeThresh ) { + + continue; + + } + + CSG_Vector pqs(3); // Approx. pi, qi, si + for (int j = 0; j < 3; j++) { + pqs[j] = R[j][0] * (pPoints->Get_X(i) - center[0]) + + R[j][1] * (pPoints->Get_Y(i) - center[1]) + + R[j][2] * (pPoints->Get_Z(i) - center[2]); + } + + double p_i = pqs[0]; + double q_i = pqs[1]; + double s_i = pqs[2]; + + // Check for points behind image plane + if ( q_i < 0) { + continue; + } + + // Image coordinates in mm + CSG_Vector pixelPos(2); + pixelPos[0] = c * p_i / q_i; + pixelPos[1] = c * s_i / q_i; + + if ( applyDistortions ) { + + pixelPos = getDistortedPositions(pixelPos, K); + + } + + // Image coordinates in pixels + pixelPos[0] = ( pixelPos[0] / pixWmm ) + ppOffsetX; + pixelPos[1] = ( pixelPos[1] / pixWmm ) + ppOffsetY; + + int row = (int)floor(pixelPos[1] + 0.5); + int col = (int)floor(pixelPos[0] + 0.5); + + if ( col >= xmin && col <= xmax && row >= ymin && row <= ymax ) { + + pResult->Add_Point(pPoints->Get_X(i), pPoints->Get_Y(i), pPoints->Get_Z(i)); + + int iField; + + for(iField = 0; iField < attrCount; iField ++) + { + pResult->Set_Attribute(iAccept, iField, pPoints->Get_Attribute(i, iField)); + } + + pResult->Set_Attribute(iAccept, iField, rgbImage->asInt( col, row )); + + iAccept ++; + + } + + pqs.Destroy(); + pixelPos.Destroy(); + + } + + DataObject_Update(pResult); + + R.Destroy(); + K.Destroy(); + center.Destroy(); + angles.Destroy(); + + return true; +} + +//--------------------------------------------------------- +int CColorisation::On_Parameters_Enable(CSG_Parameters *pParameters, CSG_Parameter *pParameter) +{ + + if( !SG_STR_CMP(pParameter->Get_Identifier(), SG_T("GIVE_DISTORTIONS")) ) + { + pParameters->Get_Parameter("K1")->Set_Enabled( pParameter->asBool() ); + pParameters->Get_Parameter("K2")->Set_Enabled( pParameter->asBool() ); + pParameters->Get_Parameter("K3")->Set_Enabled( pParameter->asBool() ); + } + + if( !SG_STR_CMP(pParameter->Get_Identifier(), SG_T("GIVE_TIME")) ) + { + pParameters->Get_Parameter("IMG_TIME")->Set_Enabled( pParameter->asBool() ); + pParameters->Get_Parameter("TIME_DIFF")->Set_Enabled( pParameter->asBool() ); + } + + return 1; +} + +//--------------------------------------------------------- +CSG_Vector CColorisation::getDistortedPositions(CSG_Vector pixPos, CSG_Vector K) +{ + + CSG_Vector XYd(2); + + double r2 = pow(pixPos[0], 2.0) + pow(pixPos[1], 2.0); + double dR = K[0] * r2 + K[1] * pow(r2, 2) + K[2] * pow(r2, 3); + + XYd[0] = pixPos[0] * (1 - dR); + XYd[1] = pixPos[1] * (1 - dR); + + return XYd; +} + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- \ No newline at end of file diff -Nru saga-2.1.0+dfsg/src/modules/imagery/imagery_photogrammetry/Colorisation.h saga-2.1.4+dfsg/src/modules/imagery/imagery_photogrammetry/Colorisation.h --- saga-2.1.0+dfsg/src/modules/imagery/imagery_photogrammetry/Colorisation.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/imagery/imagery_photogrammetry/Colorisation.h 2014-11-13 08:32:18.000000000 +0000 @@ -0,0 +1,92 @@ +/********************************************************** + * Version $Id: Colorisation.h 1945 2014-01-16 10:00:22Z reklov_w $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// imagery_photogrammetry // +// // +//-------------------------------------------------------// +// // +// Colorisation.h // +// // +// Copyright (C) 2013 by // +// HfT Stuttgart // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: avishek.dutta@hft-stuttgart.de // +// // +// contact: Avishek Dutta // +// Hochschule fuer Technik Stuttgart // +// Schellingstr. 24 // +// D-70174 Stuttgart // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#ifndef HEADER_INCLUDED__Colorisation_H +#define HEADER_INCLUDED__Colorisation_H + +//--------------------------------------------------------- +# include "MLB_Interface.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +class CColorisation : public CSG_Module +{ +public: + CColorisation (void); + + virtual int On_Parameters_Enable (CSG_Parameters *pParameters, CSG_Parameter *pParameter); + +protected: + + virtual bool On_Execute (void); + +private: + + CSG_Vector getDistortedPositions (CSG_Vector pixPos, CSG_Vector K); + +}; + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#endif // #ifndef HEADER_INCLUDED__Colorisation_H \ No newline at end of file diff -Nru saga-2.1.0+dfsg/src/modules/imagery/imagery_photogrammetry/Makefile.am saga-2.1.4+dfsg/src/modules/imagery/imagery_photogrammetry/Makefile.am --- saga-2.1.0+dfsg/src/modules/imagery/imagery_photogrammetry/Makefile.am 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/imagery/imagery_photogrammetry/Makefile.am 2014-11-13 08:32:18.000000000 +0000 @@ -0,0 +1,23 @@ +if DEBUG +DBGFLAGS = -g -DDEBUG +endif +if SAGA_UNICODE +UC_DEFS = -D_SAGA_UNICODE +endif +DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD +CXX_INCS = -I$(top_srcdir)/src/saga_core +AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS) +AM_LDFLAGS = -fPIC -shared -avoid-version +pkglib_LTLIBRARIES = libimagery_photogrammetry.la +libimagery_photogrammetry_la_SOURCES =\ +Colorisation.cpp\ +methods.cpp\ +MLB_Interface.cpp\ +Resection.cpp\ +Colorisation.h\ +methods.h\ +MLB_Interface.h\ +Resection.h + +libimagery_photogrammetry_la_LIBADD = $(top_srcdir)/src/saga_core/saga_api/libsaga_api.la + diff -Nru saga-2.1.0+dfsg/src/modules/imagery/imagery_photogrammetry/Makefile.in saga-2.1.4+dfsg/src/modules/imagery/imagery_photogrammetry/Makefile.in --- saga-2.1.0+dfsg/src/modules/imagery/imagery_photogrammetry/Makefile.in 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/imagery/imagery_photogrammetry/Makefile.in 2014-11-13 08:33:32.000000000 +0000 @@ -0,0 +1,703 @@ +# Makefile.in generated by automake 1.14.1 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +subdir = src/modules/imagery/imagery_photogrammetry +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_postgresql.m4 \ + $(top_srcdir)/m4/ax_pkg_swig.m4 \ + $(top_srcdir)/m4/ax_python_devel.m4 \ + $(top_srcdir)/m4/ax_swig_enable_cxx.m4 \ + $(top_srcdir)/m4/ax_swig_python.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__installdirs = "$(DESTDIR)$(pkglibdir)" +LTLIBRARIES = $(pkglib_LTLIBRARIES) +libimagery_photogrammetry_la_DEPENDENCIES = \ + $(top_srcdir)/src/saga_core/saga_api/libsaga_api.la +am_libimagery_photogrammetry_la_OBJECTS = Colorisation.lo methods.lo \ + MLB_Interface.lo Resection.lo +libimagery_photogrammetry_la_OBJECTS = \ + $(am_libimagery_photogrammetry_la_OBJECTS) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) +depcomp = $(SHELL) $(top_srcdir)/depcomp +am__depfiles_maybe = depfiles +am__mv = mv -f +CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = +CXXLD = $(CXX) +CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = +CCLD = $(CC) +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = +SOURCES = $(libimagery_photogrammetry_la_SOURCES) +DIST_SOURCES = $(libimagery_photogrammetry_la_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +AX_SWIG_PYTHON_CPPFLAGS = @AX_SWIG_PYTHON_CPPFLAGS@ +AX_SWIG_PYTHON_OPT = @AX_SWIG_PYTHON_OPT@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DISABLELIBHARU = @DISABLELIBHARU@ +DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +FGREP = @FGREP@ +GOMPFLAGS = @GOMPFLAGS@ +GREP = @GREP@ +HARU_LIB = @HARU_LIB@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LOCAL_INCS = @LOCAL_INCS@ +LOCAL_LIBS = @LOCAL_LIBS@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ +MKDIR_P = @MKDIR_P@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PG_CONFIG = @PG_CONFIG@ +POSTGRESQL_CFLAGS = @POSTGRESQL_CFLAGS@ +POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@ +POSTGRESQL_VERSION = @POSTGRESQL_VERSION@ +POW_LIB = @POW_LIB@ +PYTHON = @PYTHON@ +PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ +PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ +PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ +PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_PLATFORM = @PYTHON_PLATFORM@ +PYTHON_PREFIX = @PYTHON_PREFIX@ +PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ +PYTHON_VERSION = @PYTHON_VERSION@ +RANLIB = @RANLIB@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +SWIG = @SWIG@ +SWIG_LIB = @SWIG_LIB@ +VERSION = @VERSION@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +pkgpyexecdir = @pkgpyexecdir@ +pkgpythondir = @pkgpythondir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +pyexecdir = @pyexecdir@ +pythondir = @pythondir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +@DEBUG_TRUE@DBGFLAGS = -g -DDEBUG +@SAGA_UNICODE_TRUE@UC_DEFS = -D_SAGA_UNICODE +DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD +CXX_INCS = -I$(top_srcdir)/src/saga_core +AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS) +AM_LDFLAGS = -fPIC -shared -avoid-version +pkglib_LTLIBRARIES = libimagery_photogrammetry.la +libimagery_photogrammetry_la_SOURCES = \ +Colorisation.cpp\ +methods.cpp\ +MLB_Interface.cpp\ +Resection.cpp\ +Colorisation.h\ +methods.h\ +MLB_Interface.h\ +Resection.h + +libimagery_photogrammetry_la_LIBADD = $(top_srcdir)/src/saga_core/saga_api/libsaga_api.la +all: all-am + +.SUFFIXES: +.SUFFIXES: .cpp .lo .o .obj +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/modules/imagery/imagery_photogrammetry/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign src/modules/imagery/imagery_photogrammetry/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): + +install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) + @$(NORMAL_INSTALL) + @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ + list2=; for p in $$list; do \ + if test -f $$p; then \ + list2="$$list2 $$p"; \ + else :; fi; \ + done; \ + test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \ + } + +uninstall-pkglibLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ + for p in $$list; do \ + $(am__strip_dir) \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$f"; \ + done + +clean-pkglibLTLIBRARIES: + -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES) + @list='$(pkglib_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + +libimagery_photogrammetry.la: $(libimagery_photogrammetry_la_OBJECTS) $(libimagery_photogrammetry_la_DEPENDENCIES) $(EXTRA_libimagery_photogrammetry_la_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) -rpath $(pkglibdir) $(libimagery_photogrammetry_la_OBJECTS) $(libimagery_photogrammetry_la_LIBADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Colorisation.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MLB_Interface.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Resection.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/methods.Plo@am__quote@ + +.cpp.o: +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< + +.cpp.obj: +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + +.cpp.lo: +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + set x; \ + here=`pwd`; \ + $(am__define_uniq_tagged_files); \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ + fi +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ + test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(LTLIBRARIES) +installdirs: + for dir in "$(DESTDIR)$(pkglibdir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool clean-pkglibLTLIBRARIES \ + mostlyclean-am + +distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: install-pkglibLTLIBRARIES + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-pkglibLTLIBRARIES + +.MAKE: install-am install-strip + +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-pkglibLTLIBRARIES install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ + uninstall-pkglibLTLIBRARIES + + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nru saga-2.1.0+dfsg/src/modules/imagery/imagery_photogrammetry/methods.cpp saga-2.1.4+dfsg/src/modules/imagery/imagery_photogrammetry/methods.cpp --- saga-2.1.0+dfsg/src/modules/imagery/imagery_photogrammetry/methods.cpp 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/imagery/imagery_photogrammetry/methods.cpp 2014-11-13 08:32:18.000000000 +0000 @@ -0,0 +1,148 @@ +/********************************************************** + * Version $Id: methods.cpp 1945 2014-01-16 10:00:22Z reklov_w $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// imagery_photogrammetry // +// // +//-------------------------------------------------------// +// // +// methods.cpp // +// // +// Copyright (C) 2013 by // +// HfT Stuttgart // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: avishek.dutta@hft-stuttgart.de // +// // +// contact: Avishek Dutta // +// Hochschule fuer Technik Stuttgart // +// Schellingstr. 24 // +// D-70174 Stuttgart // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "methods.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +namespace methods { + +//--------------------------------------------------------- +CSG_Vector calcRotations(CSG_Vector c, CSG_Vector t) +{ + + CSG_Vector exOri(3); + + exOri[0] = atan2((t[2]-c[2]) , (sqrt(pow((t[0]-c[0]),2.0) + pow((t[1]-c[1]),2)))); + exOri[1] = 0; + exOri[2] = atan2((t[1]-c[1]) , (t[0]-c[0])) - M_PI * 0.5; + + return exOri; +} + +//--------------------------------------------------------- +CSG_Matrix calcRotnMatrix(CSG_Vector params) +{ + CSG_Matrix rMat(3,3); + /* + omega = params[0]; + kappa = params[1]; + alpha = params[2]; + */ + + double sw = sin(params[0]); + double sk = sin(params[1]); + double sa = sin(params[2]); + + double cw = cos(params[0]); + double ck = cos(params[1]); + double ca = cos(params[2]); + + rMat[0][0] = ck * ca; + rMat[0][1] = ck * sa; + rMat[0][2] = -sk; + + rMat[1][0] = sw * sk * ca - cw * sa; + rMat[1][1] = sw * sk * sa + cw * ca; + rMat[1][2] = sw * ck; + + rMat[2][0] = cw * sk * ca + sw * sa; + rMat[2][1] = cw * sk * sa - sw * ca; + rMat[2][2] = cw * ck; + + return rMat; + +} + +//--------------------------------------------------------- +std::pair minmax(CSG_Vector v) +{ + double min = v[0]; + double max = v[0]; + + for (int i = 0; i < v.Get_Length(); i++) { + if (v[i] > v[0]) { + max = v[i]; + } + else if (v[i] < v[0]) { + min = v[i]; + } + } + + return std::make_pair(min, max); +} + +} // namespace methods + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- \ No newline at end of file diff -Nru saga-2.1.0+dfsg/src/modules/imagery/imagery_photogrammetry/methods.h saga-2.1.4+dfsg/src/modules/imagery/imagery_photogrammetry/methods.h --- saga-2.1.0+dfsg/src/modules/imagery/imagery_photogrammetry/methods.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/imagery/imagery_photogrammetry/methods.h 2014-11-13 08:32:18.000000000 +0000 @@ -0,0 +1,93 @@ +/********************************************************** + * Version $Id: methods.h 1945 2014-01-16 10:00:22Z reklov_w $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// imagery_photogrammetry // +// // +//-------------------------------------------------------// +// // +// methods.h // +// // +// Copyright (C) 2013 by // +// HfT Stuttgart // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: avishek.dutta@hft-stuttgart.de // +// // +// contact: Avishek Dutta // +// Hochschule fuer Technik Stuttgart // +// Schellingstr. 24 // +// D-70174 Stuttgart // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#ifndef HEADER_INCLUDED__methods_H +#define HEADER_INCLUDED__methods_H + +//--------------------------------------------------------- +//#define _USE_MATH_DEFINES +#include +#include + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +namespace methods { + + CSG_Vector calcRotations(CSG_Vector c , CSG_Vector t); + CSG_Matrix calcRotnMatrix(CSG_Vector params); + std::pair minmax(CSG_Vector v); +} + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#endif // #ifndef HEADER_INCLUDED__methods_H \ No newline at end of file diff -Nru saga-2.1.0+dfsg/src/modules/imagery/imagery_photogrammetry/MLB_Interface.cpp saga-2.1.4+dfsg/src/modules/imagery/imagery_photogrammetry/MLB_Interface.cpp --- saga-2.1.0+dfsg/src/modules/imagery/imagery_photogrammetry/MLB_Interface.cpp 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/imagery/imagery_photogrammetry/MLB_Interface.cpp 2014-11-13 08:32:18.000000000 +0000 @@ -0,0 +1,127 @@ +/********************************************************** + * Version $Id: MLB_Interface.cpp 2281 2014-10-09 15:49:41Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// imagery_photogrammetry // +// // +//-------------------------------------------------------// +// // +// MLB_Interface.cpp // +// // +// Copyright (C) 2009 by // +// SAGA User Group Assoc. // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: author@email.de // +// // +// contact: Author // +// Sesame Street. 7 // +// 12345 Metropolis // +// Nirwana // +// // +/////////////////////////////////////////////////////////// + + +/////////////////////////////////////////////////////////// +// // +// The Module Link Library Interface // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +// 1. Include the appropriate SAGA-API header... + +#include "MLB_Interface.h" + + +//--------------------------------------------------------- +// 2. Place general module library informations here... + +CSG_String Get_Info(int i) +{ + switch( i ) + { + case MLB_INFO_Name: default: + return( _TL("Photogrammetry") ); + + case MLB_INFO_Category: + return( _TL("Imagery") ); + + case MLB_INFO_Author: + return( SG_T("HfT Stuttgart (c) 2013") ); + + case MLB_INFO_Description: + return( _TL("Photogrammetry tools.") ); + + case MLB_INFO_Version: + return( SG_T("1.0") ); + + case MLB_INFO_Menu_Path: + return( _TL("Imagery|Photogrammetry") ); + } +} + + +//--------------------------------------------------------- +// 3. Include the headers of your modules here... + +#include "Resection.h" +#include "Colorisation.h" + + +//--------------------------------------------------------- +// 4. Allow your modules to be created here... + +CSG_Module * Create_Module(int i) +{ + switch( i ) + { + case 0: return ( new CResection ); + + case 1: return ( new CColorisation ); + + default: return ( NULL ); + } +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +//{{AFX_SAGA + + MLB_INTERFACE + +//}}AFX_SAGA diff -Nru saga-2.1.0+dfsg/src/modules/imagery/imagery_photogrammetry/MLB_Interface.h saga-2.1.4+dfsg/src/modules/imagery/imagery_photogrammetry/MLB_Interface.h --- saga-2.1.0+dfsg/src/modules/imagery/imagery_photogrammetry/MLB_Interface.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/imagery/imagery_photogrammetry/MLB_Interface.h 2014-11-13 08:32:18.000000000 +0000 @@ -0,0 +1,68 @@ +/********************************************************** + * Version $Id: MLB_Interface.h 1945 2014-01-16 10:00:22Z reklov_w $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// imagery_photogrammetry // +// // +//-------------------------------------------------------// +// // +// MLB_Interface.cpp // +// // +// Copyright (C) 2009 by // +// SAGA User Group Assoc. // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: author@email.de // +// // +// contact: Author // +// Sesame Street. 7 // +// 12345 Metropolis // +// Nirwana // +// // +/////////////////////////////////////////////////////////// + + +/////////////////////////////////////////////////////////// +// // +// Include the SAGA-API here // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#ifndef HEADER_INCLUDED__imagery_photogrammetry_H +#define HEADER_INCLUDED__imagery_photogrammetry_H + +//--------------------------------------------------------- +#include + + +//--------------------------------------------------------- +#endif // #ifndef HEADER_INCLUDED__imagery_photogrammetry_H diff -Nru saga-2.1.0+dfsg/src/modules/imagery/imagery_photogrammetry/Resection.cpp saga-2.1.4+dfsg/src/modules/imagery/imagery_photogrammetry/Resection.cpp --- saga-2.1.0+dfsg/src/modules/imagery/imagery_photogrammetry/Resection.cpp 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/imagery/imagery_photogrammetry/Resection.cpp 2014-11-13 08:32:18.000000000 +0000 @@ -0,0 +1,576 @@ +/********************************************************** + * Version $Id: Resection.cpp 2134 2014-05-29 10:33:16Z reklov_w $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// imagery_photogrammetry // +// // +//-------------------------------------------------------// +// // +// Resection.cpp // +// // +// Copyright (C) 2013 by // +// HfT Stuttgart // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: avishek.dutta@hft-stuttgart.de // +// // +// contact: Avishek Dutta // +// Hochschule fuer Technik Stuttgart // +// Schellingstr. 24 // +// D-70174 Stuttgart // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "Resection.h" +#include "methods.h" +#include + +// Convergence Criteria (mm) +const double thresh = 1; + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +CResection::CResection(void) +{ + Set_Name (_TL("Resection (Terrestrial)")); + + Set_Author (SG_T("HfT Stuttgart (c) 2013")); + + Set_Description (_TW( + "Single Image Spatial Resection (Terrestrial): from at least 3 image points with known " + "coordinates, the Cardan angles of the image orientation and the coordinates of the " + "perspective center are calculated by a least-squares adjustment. The Cardan angles " + "refer to the following transformation between image coordinates (x_image) and global " + "coordinates (X_Global): \n\t x_image = R_1(omega) * R_2(kappa) * R_3(alpha) * X_Global " + "\n Here R_1, R_2, R_3 denote rotation matrices of a right-handed (passive) coordinate " + "transformation.\n\nThe inputs consist of a point cloud containing the identical points " + "with their pixel indices as additional attributes. The origin of pixels is in the lower " + "left corner of the image. The interior orientation parameters of the camera is to be " + "provided. These include Focal Length (mm), Pixel Size (um), Principal Point Offsets (pixels) " + "and optionally the Radial Distortion Parameters. The distortion model being used is as follows: " + "\n x_d = x_u (1 - dR)" + "\n y_d = y_u (1 - dR) " + "\n where, dR = K1 * r_u ^ 2 + K2 * r_u ^ 4 + K3 * r_u ^ 6," + "\n r_u ^ 2 = x_u ^ 2 + y_u ^ 2," + "\n x_u, y_u are the undistorted (corrected) image coordinates in mm," + "\n x_d, y_d are the distorted (observed) image coordinates in mm," + "\n K1 is in [mm ^ -2], K2 is in [mm ^ -4], K3 is in [mm ^ -6]." + "\nApproximate coordinates in [m] for the Projection Center and the center of image are also " + "to be provided.\n\nFollowing the adjustment the results are written to a text file. The main " + "contents of the text file are: for each iteration the Sum of Squared Residuals, the A-Posteriori " + "Standard Deviation (Sigma Naught) and the Condition of Normal Matrix, and the final estimated " + "exterior orientation parameters (Xc, Yc, Zc, Omega, Kappa, Alpha).\n\n Optionally the Principal " + "Point Offsets can be estimated. This requires at least 4 image points as input." + "\n\n[Warning] The module is dedicated to the terrestrial case which means the viewing direction " + "must be sufficiently different from the vertical direction." + "\nThe estimation of Principal Point Offsets is not recommended if the condition of the Normal " + "Matrix is less than 10 ^ -7." + "\n\n" + )); + + //----------------------------------------------------- + Parameters.Add_PointCloud( + NULL , "POINTS" , _TL("Measured Points (PC)"), + _TL("List of Measured Points as PC"), + PARAMETER_INPUT + ); + + Parameters.Add_Node(NULL, "INT ORI", _TL("Interior Orientation Parameters"), _TL("Internal Orientation Parameters")); + Parameters.Add_Value (Parameters("INT ORI"), "F", _TL ("Focal Length (mm)"), _TL ("Focal Length in mm"), PARAMETER_TYPE_Double); + Parameters.Add_Value (Parameters("INT ORI"), "W", _TL ("Pixel Width (um)"), _TL ("Pixel Width in micro meters"), PARAMETER_TYPE_Double); + Parameters.Add_Value (Parameters("INT ORI"), "EST_OFFSETS", _TL ("Estimate Principal Point Offsets?"), _TL ("Do you wish to estimate Principal Point Offsets?"), PARAMETER_TYPE_Bool, false); + Parameters.Add_Value (Parameters("INT ORI"), "ppX", _TL ("Principal Point Offset in X (pixels)"), _TL ("Principal Point Offset in X"), PARAMETER_TYPE_Double); + Parameters.Add_Value (Parameters("INT ORI"), "ppY", _TL ("Principal Point Offset in Y (pixels)"), _TL ("Principal Point Offset in Y"), PARAMETER_TYPE_Double); + Parameters.Add_Value (Parameters("INT ORI"), "GIVE_DISTORTIONS", _TL ("Provide Radial Distortion Parameters?"), _TL ("Do you wish to provide the Radial Distortion Parameters?"), PARAMETER_TYPE_Bool, false); + Parameters.Add_Value (Parameters("INT ORI"), "K1", _TL ("K1"), _TL ("K1"), PARAMETER_TYPE_Double, 0.0); + Parameters.Add_Value (Parameters("INT ORI"), "K2", _TL ("K2"), _TL ("K2"), PARAMETER_TYPE_Double, 0.0); + Parameters.Add_Value (Parameters("INT ORI"), "K3", _TL ("K3"), _TL ("K3"), PARAMETER_TYPE_Double, 0.0); + + Parameters.Add_Node(NULL, "PROJ CENTER", _TL("Approximate Coordinates of Projection Center"), _TL("Approximate Coordinates of Projection Center")); + Parameters.Add_Value (Parameters("PROJ CENTER"), "Xc", _TL ("X"), _TL ("Approximate Coordinate"), PARAMETER_TYPE_Double); + Parameters.Add_Value (Parameters("PROJ CENTER"), "Yc", _TL ("Y"), _TL ("Approximate Coordinate"), PARAMETER_TYPE_Double); + Parameters.Add_Value (Parameters("PROJ CENTER"), "Zc", _TL ("Z"), _TL ("Approximate Coordinate"), PARAMETER_TYPE_Double); + + Parameters.Add_Node(NULL, "TARGET", _TL("Approximate Coordinates of Target Point"), _TL("Approximate Coordinates of Target Point")); + Parameters.Add_Value (Parameters("TARGET"), "Xt", _TL ("X"), _TL ("Approximate Coordinate"), PARAMETER_TYPE_Double); + Parameters.Add_Value (Parameters("TARGET"), "Yt", _TL ("Y"), _TL ("Approximate Coordinate"), PARAMETER_TYPE_Double); + Parameters.Add_Value (Parameters("TARGET"), "Zt", _TL ("Z"), _TL ("Approximate Coordinate"), PARAMETER_TYPE_Double); + + Parameters.Add_FilePath( + NULL , "OUTPUT FILE" , _TL("Output Text File"), + _TL("The file to write the Calculation Results to."), + CSG_String::Format(SG_T("%s|%s"), + _TL("Text Files (*.txt)") , SG_T("*.txt") + ), NULL, true + ); + +} + +//--------------------------------------------------------- +bool CResection::On_Execute(void) +{ + + CSG_PointCloud *pPoints; // Input Point Cloud + CSG_String fileName; + CSG_File *pTabStream = NULL; + int n = 6; // Number of unknowns + CSG_Vector center(3); + CSG_Vector target(3); + + double c = Parameters("F") ->asDouble(); // Focal Length (mm) + double pixWmm = Parameters("W") ->asDouble() / 1000;// Pixel Width (mm) + double ppOffsetX = Parameters("ppX") ->asDouble(); // Principal Point Offset X (pixels) + double ppOffsetY = Parameters("ppY") ->asDouble(); // Principal Point Offset Y (pixels) + pPoints = Parameters("POINTS") ->asPointCloud(); + fileName = Parameters("OUTPUT FILE") ->asString(); + center[0] = Parameters("Xc") ->asDouble(); + center[1] = Parameters("Yc") ->asDouble(); + center[2] = Parameters("Zc") ->asDouble(); + target[0] = Parameters("Xt") ->asDouble(); + target[1] = Parameters("Yt") ->asDouble(); + target[2] = Parameters("Zt") ->asDouble(); + + int pointCount = pPoints->Get_Point_Count(); + + bool estPPOffsets = false; + + if ( Parameters("EST_OFFSETS")->asBool() ) { + + estPPOffsets = true; + n = 8; // Increase number of unknowns by 2 + } + + bool applyDistortions = false; + CSG_Vector K(3); + + if ( Parameters("GIVE_DISTORTIONS")->asBool() ) { + + applyDistortions = true; + K[0] = Parameters("K1") ->asDouble(); + K[1] = Parameters("K2") ->asDouble(); + K[2] = Parameters("K3") ->asDouble(); + + } + + double dxapp = center [0] - target [0]; + double dyapp = center [1] - target [1]; + double dzapp = center [2] - target [2]; + double h_d = sqrt (dxapp * dxapp + dyapp * dyapp + dzapp * dzapp); // Distance between Proj. Center & Target (m) + double h_dmm = h_d * 1000; // Convert to mm + + if( fileName.Length() == 0 ) + { + SG_UI_Msg_Add_Error(_TL("Please provide an output file name!")); + return( false ); + } + + pTabStream = new CSG_File(); + + if( !pTabStream->Open(fileName, SG_FILE_W, false) ) + { + SG_UI_Msg_Add_Error(CSG_String::Format(_TL("Unable to open output file %s!"), fileName.c_str())); + delete (pTabStream); + return (false); + } + + + CSG_Vector rotns = methods::calcRotations(center,target); // Approx. rotations omega, kappa, alpha + + CSG_String msg = "********* Initial Approximate Values *********"; + pTabStream->Write(msg + SG_T("\n")); + SG_UI_Msg_Add(msg, true); + + msg = SG_T("Rotation Angles:"); + pTabStream->Write(SG_T("\n") + msg + SG_T("\n")); + SG_UI_Msg_Add(msg, true); + + msg = SG_T("Omega:\t") + SG_Get_String(rotns[0],6,false); + pTabStream->Write(msg + SG_T("\n")); + SG_UI_Msg_Add(msg, true); + msg = SG_T("Kappa:\t") + SG_Get_String(rotns[1],6,false); + pTabStream->Write(msg + SG_T("\n")); + SG_UI_Msg_Add(msg, true); + msg = SG_T("Alpha:\t") + SG_Get_String(rotns[2],6,false); + pTabStream->Write(msg + SG_T("\n")); + SG_UI_Msg_Add(msg, true); + + msg = SG_T("Projection Center:"); + pTabStream->Write(SG_T("\n") + msg + SG_T("\n")); + SG_UI_Msg_Add(msg, true); + + msg = SG_T("Xc:\t") + SG_Get_String(center[0],4,false); + pTabStream->Write(msg + SG_T("\n")); + SG_UI_Msg_Add(msg, true); + msg = SG_T("Yc:\t") + SG_Get_String(center[1],4,false); + pTabStream->Write(msg + SG_T("\n")); + SG_UI_Msg_Add(msg, true); + msg = SG_T("Zc:\t") + SG_Get_String(center[2],4,false); + pTabStream->Write(msg + SG_T("\n")); + SG_UI_Msg_Add(msg, true); + + if (estPPOffsets) { + + msg = SG_T("Principal Point Offsets:"); + pTabStream->Write(SG_T("\n") + msg + SG_T("\n")); + SG_UI_Msg_Add(msg, true); + + msg = SG_T("ppX:\t") + SG_Get_String(ppOffsetX,5,false); + pTabStream->Write(msg + SG_T("\n")); + SG_UI_Msg_Add(msg, true); + msg = SG_T("ppY:\t") + SG_Get_String(ppOffsetY,5,false); + pTabStream->Write(msg + SG_T("\n")); + SG_UI_Msg_Add(msg, true); + + } + + double itrNo = 0; + CSG_Matrix invN; + + while (true) { // Begin Iterations + + itrNo++; + + double omega = rotns[0]; + double kappa = rotns[1]; + double alpha = rotns[2]; + + CSG_Matrix R = methods::calcRotnMatrix(rotns); // Rotation Matrix from approximate values + CSG_Matrix E(3,3); // [w1;w2;w3] = E * [dw;dk;da] + + E[0][0] = -1; + E[0][1] = E[1][0] = E[2][0] = 0; + E[0][2] = sin(kappa); + E[1][1] = -cos(omega); + E[1][2] = -sin(omega) * cos(kappa); + E[2][1] = sin(omega); + E[2][2] = -cos(omega) * cos(kappa); + + CSG_Matrix N(n,n); // Transpose(Design Matrix) * I * Design Matrix + CSG_Vector ATL(n); // Transpose(Design Matrix) * I * Shortened obs. vector + + double SS = 0; + double sigma_naught = 0; + + for (int i = 0; i < pointCount; i++) { + + CSG_Vector pqs(3); // Approx. pi, qi, si + + for (int j = 0; j < 3; j++) { + pqs[j] = R[j][0] * (pPoints->Get_X(i) - center[0]) + + R[j][1] * (pPoints->Get_Y(i) - center[1]) + + R[j][2] * (pPoints->Get_Z(i) - center[2]); + } + + double p_i = pqs[0]; + double q_i = pqs[1]; + double s_i = pqs[2]; + + double dR = 0; + + // Undistorted + double x_u = c * p_i / q_i; + double y_u = c * s_i / q_i; + + double c_hat = c; + + if (applyDistortions) { + double r2 = x_u * x_u + y_u * y_u; + dR = K[0] * r2 + K[1] * r2 * r2 + K[2] * r2 * r2 * r2; + c_hat = c * (1 - dR); + } + + // Approx. image coordinates (with distortions) + double x_i = (1 - dR) * x_u + ppOffsetX * pixWmm; + double z_i = (1 - dR) * y_u + ppOffsetY * pixWmm; + + // Shortened obervation vector: dxi & dzi + double dx_i = pPoints->Get_Attribute(i,0) * pixWmm - x_i; + double dz_i = pPoints->Get_Attribute(i,1) * pixWmm - z_i; + SS += pow(dx_i,2) + pow(dz_i,2); + + /* + x_i, z_i in [mm] + p_i,q_i,s_i in [m] + h_d in [m] + c, c_hat in [mm] + h_dmm in [mm] + */ + CSG_Matrix L(3,2); // CSG_Matrix takes columns first and rows second + CSG_Matrix V(3,3); + CSG_Matrix LR(3,2); + CSG_Matrix LVE(3,2); + + L[0][0] = L[1][2] = c_hat / (1000 * q_i); + L[0][2] = L[1][0] = 0; + L[0][1] = -x_u * (1 - dR) / (1000 * q_i); + L[1][1] = -y_u * (1 - dR) / (1000 * q_i); + + V[0][0] = V[1][1] = V[2][2] = 0; + V[0][1] = s_i / h_d; + V[0][2] = -q_i / h_d; + V[1][0] = -s_i / h_d; + V[1][2] = p_i / h_d; + V[2][0] = q_i / h_d; + V[2][1] = -p_i / h_d; + + LVE = ( L * V ) * E; + LR = L * R; + + // Design Matrix (J) + CSG_Matrix design(n,2); + + for(int j = 0; j < 2; j++) { + for(int k = 0; k < 3; k++) { + design[j][k] = LVE[j][k]; + design[j][k+3] = -LR[j][k]; + } + } + + if ( estPPOffsets ) { + design[0][6] = design[1][7] = 1.0; + } + + // Build Normal Matrix + for(int j = 0; j < n; j++) { + for(int k = 0; k < n; k++) { + N[j][k] += (design[0][j] * design[0][k] + design[1][j] * design[1][k]); + } + } + + // Build Tranpose (J) * I * (Shortened obs. vector) + for (int m=0; m < n; m++) { + ATL[m] += design[0][m] * dx_i + design[1][m] * dz_i; + } + + L.Destroy(); + V.Destroy(); + LR.Destroy(); + LVE.Destroy(); + pqs.Destroy(); + design.Destroy(); + + } // end looping over observations + + // Eigen values and Eigen Vectors + CSG_Vector eigenVals(n); + CSG_Matrix eigenVecs(n,n); + SG_Matrix_Eigen_Reduction(N, eigenVecs, eigenVals, true); + + // One of the Eigen Values is 0 + // workaround the problem that the following snippet is C++11: + // if (std::any_of(eigenVals.cbegin(), eigenVals.cend(), [] (double i) { return i == 0; })) + bool bValid = true; + + for (int i=0; i < eigenVals.Get_Size(); i++) + { + if (eigenVals.Get_Data(i) == 0.0) + { + bValid = false; + break; + } + } + + if (!bValid) + { + msg = "The Normal Matrix has a rank defect. Please measure more points."; + pTabStream->Write(msg + SG_T("\n")); + SG_UI_Msg_Add(msg, true); + break; + } + + double mx = *std::max_element(eigenVals.cbegin(), eigenVals.cend()); + double mn = *std::min_element(eigenVals.cbegin(), eigenVals.cend()); + + // Ratio of Smallest to the Biggest Eigen value is too small + if ((mn / mx) < pow(10,-12.0)) { + msg = SG_T("Condition of the Matrix of Normal Equations:\t") + CSG_String::Format(SG_T(" %13.5e"), mn/mx); + pTabStream->Write(msg + SG_T("\n")); + SG_UI_Msg_Add(msg, true); + msg = "The Normal Matrix is weakly conditioned. Please measure more points."; + pTabStream->Write(msg + SG_T("\n")); + SG_UI_Msg_Add(msg, true); + break; + } + + // Calculate the adjustments + double absMax = 0; + invN = N.Get_Inverse(); + CSG_Vector est_param_incs = invN * ATL; + + for (int i = 0; i < n; i++) { + if (abs(est_param_incs[i]) > absMax) { + absMax = abs(est_param_incs[i]); + } + } + + if (absMax < thresh) { + msg = "Solution has converged."; + pTabStream->Write(SG_T("\n") + msg + SG_T("\n")); + SG_UI_Msg_Add(msg, true); + break; + } + + for (int a = 0; a < 3; a++) { + rotns[a] += est_param_incs[a] / h_dmm; // New Approx. rotations omega, kappa, alpha + center[a] += est_param_incs[a+3] / 1000; // New Approx. Projection Center + } + + if ( estPPOffsets ) { + ppOffsetX += (est_param_incs[6] / pixWmm); // New Approx. Principal Point + ppOffsetY += (est_param_incs[7] / pixWmm); + } + + sigma_naught = sqrt(SS / (2 * pointCount - n)); + + // Writing To Output File & SAGA Console + msg = "********* Iteration: " + SG_Get_String(itrNo,0,false) + " *********"; + pTabStream->Write(SG_T("\n") + msg + SG_T("\n")); + SG_UI_Msg_Add(msg, true); + + msg = "Sum of Squared Residuals:\t" + SG_Get_String(SS,5,false); + pTabStream->Write(SG_T("\n") + msg + SG_T("\n")); + SG_UI_Msg_Add(msg, true); + + msg = "Sigma Naught:\t" + SG_Get_String(sigma_naught,5,false); + pTabStream->Write(msg + SG_T("\n")); + SG_UI_Msg_Add(msg, true); + + msg = SG_T("Condition of the Matrix of Normal Equations:\t") + CSG_String::Format(SG_T(" %13.5e"), mn/mx); + pTabStream->Write(msg + SG_T("\n")); + SG_UI_Msg_Add(msg, true); + + R.Destroy(); + E.Destroy(); + N.Destroy(); + ATL.Destroy(); + invN.Destroy(); + eigenVals.Destroy(); + eigenVecs.Destroy(); + est_param_incs.Destroy(); + + } // end of iterations + + msg = "********* Final Estimated Parameters *********"; + pTabStream->Write(SG_T("\n") + msg + SG_T("\n")); + SG_UI_Msg_Add(msg, true); + + msg = SG_T("Rotation Angles:"); + pTabStream->Write(SG_T("\n") + msg + SG_T("\n")); + SG_UI_Msg_Add(msg, true); + + msg = SG_T("Omega:\t") + SG_Get_String(rotns[0],6,false); + pTabStream->Write(msg + SG_T("\n")); + SG_UI_Msg_Add(msg, true); + msg = SG_T("Kappa:\t") + SG_Get_String(rotns[1],6,false); + pTabStream->Write(msg + SG_T("\n")); + SG_UI_Msg_Add(msg, true); + msg = SG_T("Alpha:\t") + SG_Get_String(rotns[2],6,false); + pTabStream->Write(msg + SG_T("\n")); + SG_UI_Msg_Add(msg, true); + + msg = SG_T("Projection Center:"); + pTabStream->Write(SG_T("\n") + msg + SG_T("\n")); + SG_UI_Msg_Add(msg, true); + + msg = SG_T("Xc:\t") + SG_Get_String(center[0],4,false); + pTabStream->Write(msg + SG_T("\n")); + SG_UI_Msg_Add(msg, true); + msg = SG_T("Yc:\t") + SG_Get_String(center[1],4,false); + pTabStream->Write(msg + SG_T("\n")); + SG_UI_Msg_Add(msg, true); + msg = SG_T("Zc:\t") + SG_Get_String(center[2],4,false); + pTabStream->Write(msg + SG_T("\n")); + SG_UI_Msg_Add(msg, true); + + if (estPPOffsets) { + + msg = SG_T("Principal Point Offsets:"); + pTabStream->Write(SG_T("\n") + msg + SG_T("\n")); + SG_UI_Msg_Add(msg, true); + + msg = SG_T("ppX:\t") + SG_Get_String(ppOffsetX,5,false); + pTabStream->Write(msg + SG_T("\n")); + SG_UI_Msg_Add(msg, true); + msg = SG_T("ppY:\t") + SG_Get_String(ppOffsetY,5,false); + pTabStream->Write(msg + SG_T("\n")); + SG_UI_Msg_Add(msg, true); + + } + + + K.Destroy(); + rotns.Destroy(); + center.Destroy(); + target.Destroy(); + + pTabStream->Close(); + + return true; +} + +//--------------------------------------------------------- +int CResection::On_Parameters_Enable(CSG_Parameters *pParameters, CSG_Parameter *pParameter) +{ + + if( !SG_STR_CMP(pParameter->Get_Identifier(), SG_T("GIVE_DISTORTIONS")) ) + { + pParameters->Get_Parameter("K1")->Set_Enabled( pParameter->asBool() ); + pParameters->Get_Parameter("K2")->Set_Enabled( pParameter->asBool() ); + pParameters->Get_Parameter("K3")->Set_Enabled( pParameter->asBool() ); + } + + return( 1 ); +} + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- \ No newline at end of file diff -Nru saga-2.1.0+dfsg/src/modules/imagery/imagery_photogrammetry/Resection.h saga-2.1.4+dfsg/src/modules/imagery/imagery_photogrammetry/Resection.h --- saga-2.1.0+dfsg/src/modules/imagery/imagery_photogrammetry/Resection.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/imagery/imagery_photogrammetry/Resection.h 2014-11-13 08:32:18.000000000 +0000 @@ -0,0 +1,91 @@ +/********************************************************** + * Version $Id: Resection.h 1945 2014-01-16 10:00:22Z reklov_w $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// imagery_photogrammetry // +// // +//-------------------------------------------------------// +// // +// Resection.h // +// // +// Copyright (C) 2013 by // +// HfT Stuttgart // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: avishek.dutta@hft-stuttgart.de // +// // +// contact: Avishek Dutta // +// Hochschule fuer Technik Stuttgart // +// Schellingstr. 24 // +// D-70174 Stuttgart // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#ifndef HEADER_INCLUDED__Resection_H +#define HEADER_INCLUDED__Resection_H + +//--------------------------------------------------------- +# include "MLB_Interface.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +class CResection : public CSG_Module +{ +public: + CResection (void); + + virtual int On_Parameters_Enable (CSG_Parameters *pParameters, CSG_Parameter *pParameter); + +protected: + + virtual bool On_Execute (void); + +private: + + +}; + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#endif // #ifndef HEADER_INCLUDED__Resection_H \ No newline at end of file diff -Nru saga-2.1.0+dfsg/src/modules/imagery/imagery_segmentation/grid_seeds.cpp saga-2.1.4+dfsg/src/modules/imagery/imagery_segmentation/grid_seeds.cpp --- saga-2.1.0+dfsg/src/modules/imagery/imagery_segmentation/grid_seeds.cpp 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/imagery/imagery_segmentation/grid_seeds.cpp 2014-11-13 08:32:18.000000000 +0000 @@ -0,0 +1,535 @@ +/********************************************************** + * Version $Id: grid_seeds.cpp 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// imagery_segmentation // +// // +//-------------------------------------------------------// +// // +// grid_seeds.cpp // +// // +// Copyright (C) 2010 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Hamburg // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "grid_seeds.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +CGrid_Seeds::CGrid_Seeds(void) +{ + //----------------------------------------------------- + Set_Name (_TL("Seed Generation")); + + Set_Author ("O.Conrad (c) 2010"); + + Set_Description (_TW( + "" + )); + + //----------------------------------------------------- + Parameters.Add_Grid_List( + NULL , "FEATURES" , _TL("Features"), + _TL(""), + PARAMETER_INPUT + ); + + Parameters.Add_Grid( + NULL , "VARIANCE" , _TL("Variance"), + _TL(""), + PARAMETER_OUTPUT + ); + + Parameters.Add_Grid( + NULL , "SEED_GRID" , _TL("Seeds Grid"), + _TL(""), + PARAMETER_OUTPUT_OPTIONAL + ); + + Parameters.Add_Shapes( + NULL , "SEED_POINTS" , _TL("Seed Points"), + _TL(""), + PARAMETER_OUTPUT_OPTIONAL, SHAPE_TYPE_Point + ); + + Parameters.Add_Choice( + NULL , "SEED_TYPE" , _TL("Seed Type"), + _TL(""), + CSG_String::Format(SG_T("%s|%s|"), + _TL("minima of variance"), + _TL("maxima of variance") + ), 0 + ); + + Parameters.Add_Choice( + NULL , "METHOD" , _TL("Method"), + _TL(""), + CSG_String::Format(SG_T("%s|%s|"), + _TL("band width smoothing"), + _TL("band width search") + ), 0 + ); + + Parameters.Add_Value( + NULL , "BAND_WIDTH" , _TL("Bandwidth (Cells)"), + _TL(""), + PARAMETER_TYPE_Double, 10.0, 1.0, true + ); + + Parameters.Add_Value( + NULL , "NORMALIZE" , _TL("Normalize Features"), + _TL(""), + PARAMETER_TYPE_Bool, false + ); + + m_Cells.Get_Weighting().Set_Weighting(SG_DISTWGHT_GAUSS); + m_Cells.Get_Weighting().Set_BandWidth(5.0); + m_Cells.Get_Weighting().Create_Parameters(&Parameters, false); +} + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +int CGrid_Seeds::On_Parameters_Enable(CSG_Parameters *pParameters, CSG_Parameter *pParameter) +{ + if( !SG_STR_CMP(pParameter->Get_Identifier(), "METHOD") ) + { + pParameters->Set_Enabled("DISTANCE_WEIGHTING", pParameter->asInt() == 1); + } + + return( m_Cells.Get_Weighting().Enable_Parameters(pParameters) ); +} + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CGrid_Seeds::On_Execute(void) +{ + //----------------------------------------------------- + CSG_Parameter_Grid_List *pFeatures = Parameters("FEATURES")->asGridList(); + + if( (m_nFeatures = pFeatures->Get_Count()) <= 0 ) + { + Error_Set(_TL("no features in input list") ); + + return( false ); + } + + m_pFeatures = (CSG_Grid **)SG_Calloc(m_nFeatures, sizeof(CSG_Grid *)); + + //----------------------------------------------------- + int Method = Parameters("METHOD")->asInt(); + + if( Method == 0 ) // resampling + { + double Cellsize = Parameters("BAND_WIDTH")->asDouble() * Get_Cellsize(); + + CSG_Grid Smoothed(SG_DATATYPE_Float, + 4 + (int)(Get_System()->Get_XRange() / Cellsize), + 4 + (int)(Get_System()->Get_YRange() / Cellsize), + Cellsize, + Get_XMin() - Cellsize, + Get_YMin() - Cellsize + ); + + for(int i=0; iasGrid(i)->Get_Name())); + + SG_UI_Progress_Lock(true); + + Smoothed.Assign(pFeatures->asGrid(i), GRID_INTERPOLATION_Mean_Cells); + + m_pFeatures[i] = new CSG_Grid(*Get_System(), SG_DATATYPE_Float); + m_pFeatures[i] ->Assign(&Smoothed, GRID_INTERPOLATION_BSpline); + m_pFeatures[i] ->Set_Name(pFeatures->asGrid(i)->Get_Name()); + + SG_UI_Progress_Lock(false); + } + } + else // search radius + { + m_Cells.Get_Weighting().Set_Parameters(&Parameters); + m_Cells.Set_Radius(Parameters("BAND_WIDTH")->asInt()); + + for(int i=0; iasGrid(i); + } + } + + //----------------------------------------------------- + if( (m_bNormalize = Parameters("NORMALIZE")->asBool()) == true ) + { + m_Norm.Create(m_nFeatures, 2); + + for(int i=0; iasGrid(i)->Get_Mean (); + m_Norm[1][i] = pFeatures->asGrid(i)->Get_StdDev(); if( m_Norm[1][i] == 0.0 ) m_Norm[1][i] = 1.0; + } + } + + //----------------------------------------------------- + int x, y; + + m_pVariance = Parameters("VARIANCE")->asGrid(); + m_pVariance->Set_NoData_Value(-1.0); + + Process_Set_Text(_TL("masking no data")); + + for(y=0; yis_NoData(x, y); + } + + m_pVariance->Set_Value(x, y, bNoData ? -1.0 : 0.0); + } + } + + //----------------------------------------------------- + Process_Set_Text(_TL("calculating variance")); + + for(y=0; yis_NoData(x, y) ) + { + if( Method == 0 ) + { + Get_Resampled(x, y); + } + else + { + Get_Radius(x, y); + } + } + } + } + + //----------------------------------------------------- + Get_Seeds(); + + //----------------------------------------------------- + for(int i=0; Method==0 && iasDouble(x, y); + + if( m_bNormalize ) + { + return( (z - m_Norm[0][i]) / m_Norm[1][i] ); + } + + return( z ); +} + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CGrid_Seeds::Get_Resampled(int x, int y) +{ + int ix, iy, n, iFeature; + CSG_Vector Centroid(m_nFeatures); + + //----------------------------------------------------- + for(n=0, iy=y-1; iy<=y+1; iy++) + { + for(ix=x-1; ix<=x+1; ix++) + { + if( m_pVariance->is_InGrid(ix, iy) ) + { + for(n++, iFeature=0; iFeature 0 ) + { + CSG_Simple_Statistics s; + + Centroid *= 1.0 / n; + + for(iy=y-1; iy<=y+1; iy++) + { + for(ix=x-1; ix<=x+1; ix++) + { + if( m_pVariance->is_InGrid(ix, iy) ) + { + double Distance = 0.0; + + for(iFeature=0, Distance=0.0; iFeature 0 ) + { + m_pVariance->Set_Value(x, y, s.Get_Variance()); + + return( true ); + } + } + + m_pVariance->Set_NoData(x, y); + + return( false ); +} + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CGrid_Seeds::Get_Radius(int x, int y) +{ + int iFeature, iCell, ix, iy; + double iDistance, iWeight, Weights, Distance; + CSG_Vector Centroid(m_nFeatures); + + //----------------------------------------------------- + for(iCell=0, Weights=0.0; iCellis_InGrid(ix, iy) ) + { + for(iFeature=0; iFeature 0.0 ) + { + CSG_Simple_Statistics s; + + Centroid *= 1.0 / Weights; + + for(iCell=0; iCellis_InGrid(ix, iy) ) + { + for(iFeature=0, Distance=0.0; iFeatureSet_Value(x, y, s.Get_Variance()); + + return( true ); + } + + //----------------------------------------------------- + m_pVariance->Set_NoData(x, y); + + return( false ); +} + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CGrid_Seeds::Get_Seeds(void) +{ + int Type = Parameters("SEED_TYPE")->asInt(); + + //----------------------------------------------------- + CSG_Shapes *pPoints = Parameters("SEED_POINTS")->asShapes(); + + if( pPoints ) + { + pPoints->Create(SHAPE_TYPE_Point, _TL("Seeds")); + + pPoints->Add_Field(SG_T("ID" ), SG_DATATYPE_Int); + pPoints->Add_Field(SG_T("X" ), SG_DATATYPE_Int); + pPoints->Add_Field(SG_T("Y" ), SG_DATATYPE_Int); + pPoints->Add_Field(SG_T("VAR"), SG_DATATYPE_Double); + + for(int iFeature=0; iFeatureAdd_Field(m_pFeatures[iFeature]->Get_Name(), SG_DATATYPE_Double); + } + } + + //----------------------------------------------------- + CSG_Grid *pGrid = Parameters("SEED_GRID")->asGrid(); + + if( (pGrid = Parameters("SEED_GRID")->asGrid()) != NULL ) + { + pGrid->Assign_NoData(); + } + + //----------------------------------------------------- + for(int n=0, y=0; yis_NoData(x, y) ) + { + bool bExtreme = true; + + double z = m_pVariance->asDouble(x, y); + + for(int i=0; bExtreme && i<8; i++) + { + int ix = Get_xTo(i, x); + int iy = Get_yTo(i, y); + + if( !m_pVariance->is_InGrid(ix, iy) + || (Type == 0 && z > m_pVariance->asDouble(ix, iy)) // minimum + || (Type == 1 && z < m_pVariance->asDouble(ix, iy)) ) // maximum + { + bExtreme = false; + } + } + + //----------------------------------------- + if( bExtreme ) + { + n++; + + if( pPoints ) + { + CSG_Shape *pPoint = pPoints->Add_Shape(); + + pPoint->Add_Point(Get_System()->Get_Grid_to_World(x, y)); + + pPoint->Set_Value(0, n); + pPoint->Set_Value(1, x); + pPoint->Set_Value(2, y); + pPoint->Set_Value(3, z); + + for(int iFeature=0; iFeatureSet_Value(3 + iFeature, m_pFeatures[iFeature]->asDouble(x, y)); + } + } + + if( pGrid ) + { + pGrid->Set_Value(x, y, n); + } + } + } + } + } + + return( true ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- diff -Nru saga-2.1.0+dfsg/src/modules/imagery/imagery_segmentation/grid_seeds.h saga-2.1.4+dfsg/src/modules/imagery/imagery_segmentation/grid_seeds.h --- saga-2.1.0+dfsg/src/modules/imagery/imagery_segmentation/grid_seeds.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/imagery/imagery_segmentation/grid_seeds.h 2014-11-13 08:32:18.000000000 +0000 @@ -0,0 +1,119 @@ +/********************************************************** + * Version $Id: grid_seeds.h 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// imagery_segmentation // +// // +//-------------------------------------------------------// +// // +// grid_seeds.h // +// // +// Copyright (C) 2010 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Hamburg // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#ifndef HEADER_INCLUDED__grid_seeds_H +#define HEADER_INCLUDED__grid_seeds_H + +//--------------------------------------------------------- +#include "MLB_Interface.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +class CGrid_Seeds : public CSG_Module_Grid +{ +public: + CGrid_Seeds(void); + + +protected: + + virtual int On_Parameters_Enable (CSG_Parameters *pParameters, CSG_Parameter *pParameter); + + virtual bool On_Execute (void); + + +private: + + bool m_bNormalize; + + int m_nFeatures; + + CSG_Matrix m_Norm; + + CSG_Grid_Cell_Addressor m_Cells; + + CSG_Grid *m_pVariance, **m_pFeatures; + + + double Get_Feature (int i, int x, int y); + + bool Get_Resampled (int x, int y); + bool Get_Radius (int x, int y); + + bool Get_Seeds (void); + +}; + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#endif // #ifndef HEADER_INCLUDED__grid_seeds_H diff -Nru saga-2.1.0+dfsg/src/modules/imagery/imagery_segmentation/Makefile.am saga-2.1.4+dfsg/src/modules/imagery/imagery_segmentation/Makefile.am --- saga-2.1.0+dfsg/src/modules/imagery/imagery_segmentation/Makefile.am 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/imagery/imagery_segmentation/Makefile.am 2014-11-13 08:32:18.000000000 +0000 @@ -0,0 +1,28 @@ +# +# $Id: Makefile.am 1277 2011-12-22 15:48:59Z reklov_w $ +# +if DEBUG +DBGFLAGS = -g -DDEBUG +endif +if SAGA_UNICODE +UC_DEFS = -D_SAGA_UNICODE +endif +DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD +CXX_INCS = -I$(top_srcdir)/src/saga_core +AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS) +AM_LDFLAGS = -fPIC -shared -avoid-version +pkglib_LTLIBRARIES = libimagery_segmentation.la +libimagery_segmentation_la_SOURCES =\ +grid_seeds.cpp\ +MLB_Interface.cpp\ +rga_basic.cpp\ +skeletonization.cpp\ +watershed_segmentation.cpp\ +grid_seeds.h\ +MLB_Interface.h\ +rga_basic.h\ +skeletonization.h\ +watershed_segmentation.h + +libimagery_segmentation_la_LIBADD = $(top_srcdir)/src/saga_core/saga_api/libsaga_api.la + diff -Nru saga-2.1.0+dfsg/src/modules/imagery/imagery_segmentation/Makefile.in saga-2.1.4+dfsg/src/modules/imagery/imagery_segmentation/Makefile.in --- saga-2.1.0+dfsg/src/modules/imagery/imagery_segmentation/Makefile.in 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/imagery/imagery_segmentation/Makefile.in 2014-11-13 08:33:32.000000000 +0000 @@ -0,0 +1,710 @@ +# Makefile.in generated by automake 1.14.1 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +subdir = src/modules/imagery/imagery_segmentation +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_postgresql.m4 \ + $(top_srcdir)/m4/ax_pkg_swig.m4 \ + $(top_srcdir)/m4/ax_python_devel.m4 \ + $(top_srcdir)/m4/ax_swig_enable_cxx.m4 \ + $(top_srcdir)/m4/ax_swig_python.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__installdirs = "$(DESTDIR)$(pkglibdir)" +LTLIBRARIES = $(pkglib_LTLIBRARIES) +libimagery_segmentation_la_DEPENDENCIES = \ + $(top_srcdir)/src/saga_core/saga_api/libsaga_api.la +am_libimagery_segmentation_la_OBJECTS = grid_seeds.lo MLB_Interface.lo \ + rga_basic.lo skeletonization.lo watershed_segmentation.lo +libimagery_segmentation_la_OBJECTS = \ + $(am_libimagery_segmentation_la_OBJECTS) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) +depcomp = $(SHELL) $(top_srcdir)/depcomp +am__depfiles_maybe = depfiles +am__mv = mv -f +CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = +CXXLD = $(CXX) +CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = +CCLD = $(CC) +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = +SOURCES = $(libimagery_segmentation_la_SOURCES) +DIST_SOURCES = $(libimagery_segmentation_la_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +AX_SWIG_PYTHON_CPPFLAGS = @AX_SWIG_PYTHON_CPPFLAGS@ +AX_SWIG_PYTHON_OPT = @AX_SWIG_PYTHON_OPT@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DISABLELIBHARU = @DISABLELIBHARU@ +DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +FGREP = @FGREP@ +GOMPFLAGS = @GOMPFLAGS@ +GREP = @GREP@ +HARU_LIB = @HARU_LIB@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LOCAL_INCS = @LOCAL_INCS@ +LOCAL_LIBS = @LOCAL_LIBS@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ +MKDIR_P = @MKDIR_P@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PG_CONFIG = @PG_CONFIG@ +POSTGRESQL_CFLAGS = @POSTGRESQL_CFLAGS@ +POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@ +POSTGRESQL_VERSION = @POSTGRESQL_VERSION@ +POW_LIB = @POW_LIB@ +PYTHON = @PYTHON@ +PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ +PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ +PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ +PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_PLATFORM = @PYTHON_PLATFORM@ +PYTHON_PREFIX = @PYTHON_PREFIX@ +PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ +PYTHON_VERSION = @PYTHON_VERSION@ +RANLIB = @RANLIB@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +SWIG = @SWIG@ +SWIG_LIB = @SWIG_LIB@ +VERSION = @VERSION@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +pkgpyexecdir = @pkgpyexecdir@ +pkgpythondir = @pkgpythondir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +pyexecdir = @pyexecdir@ +pythondir = @pythondir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ + +# +# $Id: Makefile.am 1277 2011-12-22 15:48:59Z reklov_w $ +# +@DEBUG_TRUE@DBGFLAGS = -g -DDEBUG +@SAGA_UNICODE_TRUE@UC_DEFS = -D_SAGA_UNICODE +DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD +CXX_INCS = -I$(top_srcdir)/src/saga_core +AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS) +AM_LDFLAGS = -fPIC -shared -avoid-version +pkglib_LTLIBRARIES = libimagery_segmentation.la +libimagery_segmentation_la_SOURCES = \ +grid_seeds.cpp\ +MLB_Interface.cpp\ +rga_basic.cpp\ +skeletonization.cpp\ +watershed_segmentation.cpp\ +grid_seeds.h\ +MLB_Interface.h\ +rga_basic.h\ +skeletonization.h\ +watershed_segmentation.h + +libimagery_segmentation_la_LIBADD = $(top_srcdir)/src/saga_core/saga_api/libsaga_api.la +all: all-am + +.SUFFIXES: +.SUFFIXES: .cpp .lo .o .obj +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/modules/imagery/imagery_segmentation/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign src/modules/imagery/imagery_segmentation/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): + +install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) + @$(NORMAL_INSTALL) + @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ + list2=; for p in $$list; do \ + if test -f $$p; then \ + list2="$$list2 $$p"; \ + else :; fi; \ + done; \ + test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \ + } + +uninstall-pkglibLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ + for p in $$list; do \ + $(am__strip_dir) \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$f"; \ + done + +clean-pkglibLTLIBRARIES: + -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES) + @list='$(pkglib_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + +libimagery_segmentation.la: $(libimagery_segmentation_la_OBJECTS) $(libimagery_segmentation_la_DEPENDENCIES) $(EXTRA_libimagery_segmentation_la_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) -rpath $(pkglibdir) $(libimagery_segmentation_la_OBJECTS) $(libimagery_segmentation_la_LIBADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MLB_Interface.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/grid_seeds.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rga_basic.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/skeletonization.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/watershed_segmentation.Plo@am__quote@ + +.cpp.o: +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< + +.cpp.obj: +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + +.cpp.lo: +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + set x; \ + here=`pwd`; \ + $(am__define_uniq_tagged_files); \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ + fi +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ + test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(LTLIBRARIES) +installdirs: + for dir in "$(DESTDIR)$(pkglibdir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool clean-pkglibLTLIBRARIES \ + mostlyclean-am + +distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: install-pkglibLTLIBRARIES + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-pkglibLTLIBRARIES + +.MAKE: install-am install-strip + +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-pkglibLTLIBRARIES install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ + uninstall-pkglibLTLIBRARIES + + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nru saga-2.1.0+dfsg/src/modules/imagery/imagery_segmentation/MLB_Interface.cpp saga-2.1.4+dfsg/src/modules/imagery/imagery_segmentation/MLB_Interface.cpp --- saga-2.1.0+dfsg/src/modules/imagery/imagery_segmentation/MLB_Interface.cpp 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/imagery/imagery_segmentation/MLB_Interface.cpp 2014-11-13 08:32:18.000000000 +0000 @@ -0,0 +1,130 @@ +/********************************************************** + * Version $Id: MLB_Interface.cpp 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// imagery_segmentation // +// // +//-------------------------------------------------------// +// // +// MLB_Interface.cpp // +// // +// Copyright (C) 2009 by // +// SAGA User Group Assoc. // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: author@email.de // +// // +// contact: Author // +// Sesame Street. 7 // +// 12345 Metropolis // +// Nirwana // +// // +/////////////////////////////////////////////////////////// + + +/////////////////////////////////////////////////////////// +// // +// The Module Link Library Interface // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +// 1. Include the appropriate SAGA-API header... + +#include "MLB_Interface.h" + + +//--------------------------------------------------------- +// 2. Place general module library informations here... + +CSG_String Get_Info(int i) +{ + switch( i ) + { + case MLB_INFO_Name: default: + return( _TL("Segmentation") ); + + case MLB_INFO_Category: + return( _TL("Imagery") ); + + case MLB_INFO_Author: + return( SG_T("SAGA User Group Assoc. (c) 2009") ); + + case MLB_INFO_Description: + return( _TL("Image segmentation algorithms.") ); + + case MLB_INFO_Version: + return( SG_T("1.0") ); + + case MLB_INFO_Menu_Path: + return( _TL("Imagery|Segmentation") ); + } +} + + +//--------------------------------------------------------- +// 3. Include the headers of your modules here... + +#include "watershed_segmentation.h" +#include "skeletonization.h" +#include "grid_seeds.h" +#include "rga_basic.h" + + +//--------------------------------------------------------- +// 4. Allow your modules to be created here... + +CSG_Module * Create_Module(int i) +{ + switch( i ) + { + case 0: return( new CWatershed_Segmentation ); + case 1: return( new CSkeletonization ); + case 2: return( new CGrid_Seeds ); + case 3: return( new CRGA_Basic ); + } + + return( NULL ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +//{{AFX_SAGA + + MLB_INTERFACE + +//}}AFX_SAGA diff -Nru saga-2.1.0+dfsg/src/modules/imagery/imagery_segmentation/MLB_Interface.h saga-2.1.4+dfsg/src/modules/imagery/imagery_segmentation/MLB_Interface.h --- saga-2.1.0+dfsg/src/modules/imagery/imagery_segmentation/MLB_Interface.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/imagery/imagery_segmentation/MLB_Interface.h 2014-11-13 08:32:18.000000000 +0000 @@ -0,0 +1,68 @@ +/********************************************************** + * Version $Id: MLB_Interface.h 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// imagery_segmentation // +// // +//-------------------------------------------------------// +// // +// MLB_Interface.h // +// // +// Copyright (C) 2003 by // +// Author // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: author@email.de // +// // +// contact: Author // +// Sesame Street. 7 // +// 12345 Metropolis // +// Nirwana // +// // +/////////////////////////////////////////////////////////// + + +/////////////////////////////////////////////////////////// +// // +// Include the SAGA-API here // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#ifndef HEADER_INCLUDED__imagery_segmentation_H +#define HEADER_INCLUDED__imagery_segmentation_H + +//--------------------------------------------------------- +#include + + +//--------------------------------------------------------- +#endif // #ifndef HEADER_INCLUDED__imagery_segmentation_H diff -Nru saga-2.1.0+dfsg/src/modules/imagery/imagery_segmentation/rga_basic.cpp saga-2.1.4+dfsg/src/modules/imagery/imagery_segmentation/rga_basic.cpp --- saga-2.1.0+dfsg/src/modules/imagery/imagery_segmentation/rga_basic.cpp 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/imagery/imagery_segmentation/rga_basic.cpp 2014-11-13 08:32:18.000000000 +0000 @@ -0,0 +1,707 @@ +/********************************************************** + * Version $Id: rga_basic.cpp 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// imagery_segmentation // +// // +//-------------------------------------------------------// +// // +// rga_basic.cpp // +// // +// Copyright (C) 2008 by // +// Benni Bechtel // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Hamburg // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "rga_basic.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +CCandidates::CCandidates(void) +{ + m_Candidates = NULL; + m_nCandidates = 0; + m_pLow = NULL; + m_pHigh = NULL; + m_nMax = 256; + + Create(m_nMax); +} + +//--------------------------------------------------------- +CCandidates::CCandidates(int nMax) +{ + m_Candidates = NULL; + m_nCandidates = 0; + m_pLow = NULL; + m_pHigh = NULL; + m_nMax = nMax; + + Create(m_nMax); +} + +//--------------------------------------------------------- +CCandidates::~CCandidates(void) +{ + Destroy(); +} + +//--------------------------------------------------------- +void CCandidates::Create(void) +{ + Create(m_nMax); +} + +//--------------------------------------------------------- +void CCandidates::Create(int nMax) +{ + if( nMax <= 1 ) + { + Create(); + + return; + } + + Destroy(); + + m_nMax = nMax; + + m_Candidates = (TCandidate *)SG_Malloc(m_nMax * sizeof(TCandidate)); +} + +//--------------------------------------------------------- +void CCandidates::Destroy(void) +{ + m_nCandidates = 0; + + if( m_Candidates ) + { + SG_Free(m_Candidates); + + m_Candidates = NULL; + } + + if( m_pLow ) + { + delete(m_pLow); + + m_pLow = NULL; + } + + if( m_pHigh ) + { + delete(m_pHigh); + + m_pHigh = NULL; + } +} + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +void CCandidates::Add(int x, int y, int Segment, double Similarity) +{ + if( m_Candidates && m_nCandidates < m_nMax ) + { + int iInsert = _Find(Similarity); + + memmove(m_Candidates + iInsert + 1, m_Candidates + iInsert, sizeof(TCandidate) * (m_nCandidates - iInsert)); + + m_Candidates[iInsert].x = x; + m_Candidates[iInsert].y = y; + m_Candidates[iInsert].Segment = Segment; + m_Candidates[iInsert].Similarity = Similarity; + } + else + { + if( !m_pLow ) + { + int iDivide = m_nMax / 2; + + m_pLow = new CCandidates(m_nMax); + m_pHigh = new CCandidates(m_nMax); + + m_pLow ->m_nCandidates = iDivide; + m_pHigh->m_nCandidates = m_nMax - iDivide; + + memcpy(m_pLow ->m_Candidates, m_Candidates , m_pLow ->m_nCandidates * sizeof(TCandidate)); + memcpy(m_pHigh->m_Candidates, m_Candidates + m_pLow->m_nCandidates, m_pHigh->m_nCandidates * sizeof(TCandidate)); + + SG_Free(m_Candidates); + m_Candidates = NULL; + } + + if( Similarity > m_pHigh->Get_Minimum() ) + { + m_pHigh->Add(x, y, Segment, Similarity); + } + else + { + m_pLow ->Add(x, y, Segment, Similarity); + } + } + + m_nCandidates++; +} + +//--------------------------------------------------------- +double CCandidates::Get_Minimum(void) +{ + if( m_nCandidates > 0 ) + { + if( m_pLow ) + { + return( m_pLow->Get_Minimum() ); + } + + return( m_Candidates[0].Similarity ); + } + + return( 0.0 ); +} + +//--------------------------------------------------------- +double CCandidates::Get_Maximum(void) +{ + if( m_nCandidates > 0 ) + { + if( m_pHigh ) + { + return( m_pHigh->Get_Maximum() ); + } + + return( m_Candidates[m_nCandidates - 1].Similarity ); + } + + return( 0.0 ); +} + +//--------------------------------------------------------- +int CCandidates::_Find(double Similarity) +{ + if( m_nCandidates == 0 ) + { + return( 0 ); + } + + int a, b; + + a = 0; + b = m_nCandidates - 1; + + if( Similarity < m_Candidates[a].Similarity ) + { + return( a ); + } + + if( Similarity > m_Candidates[b].Similarity ) + { + return( b + 1 ); + } + + for(int d=(b-a)/2 ; d>0; d/=2) + { + int i = a + d; + + if( Similarity > m_Candidates[i].Similarity ) + { + a = a < i ? i : a + 1; + } + else + { + b = b > i ? i : b - 1; + } + } + + for(int i=a; i<=b; i++) + { + if( Similarity < m_Candidates[i].Similarity ) + { + return( i ); + } + } + + return( b ); +} + +//--------------------------------------------------------- +bool CCandidates::Get(int &x, int &y, int &Segment) +{ + if( m_nCandidates > 0 ) + { + m_nCandidates--; + + if( m_Candidates ) + { + x = m_Candidates[m_nCandidates].x; + y = m_Candidates[m_nCandidates].y; + Segment = m_Candidates[m_nCandidates].Segment; + } + else // if( m_pLow ) + { + m_pHigh->Get(x, y, Segment); + + if( m_pHigh->m_nCandidates == 0 ) + { + delete(m_pHigh); + + CCandidates *pLow = m_pLow; + + // m_nCandidates = pLow->m_nCandidates; + m_Candidates = pLow->m_Candidates; + m_pLow = pLow->m_pLow; + m_pHigh = pLow->m_pHigh; + + pLow->m_Candidates = NULL; + pLow->m_pLow = NULL; + pLow->m_pHigh = NULL; + delete(pLow); + } + } + + return( true ); + } + + return( false ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#define SEEDFIELD_X 2 +#define SEEDFIELD_Y (SEEDFIELD_X + 1) +#define SEEDFIELD_Z (SEEDFIELD_X + 2) + +#define NO_SEGMENT -1 +#define NO_SIMILARITY -1.0 + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +CRGA_Basic::CRGA_Basic(void) +{ + CSG_Parameter *pNode; + + //----------------------------------------------------- + Set_Name (_TL("Seeded Region Growing")); + + Set_Author ("B. Bechtel, O. Conrad (c) 2008"); + + Set_Description (_TW( + "\nReferences:\n" + "Adams, R. & Bischof, L. (1994): Seeded Region Growing. " + "IEEE Transactions on Pattern Analysis and Machine Intelligence, Vol.16, No.6, p.641-647.\n" + "\n" + "Bechtel, B., Ringeler, A. & Boehner, J. (2008): " + "Segmentation for Object Extraction of Trees using MATLAB and SAGA. " + "In: Boehner, J., Blaschke, T., Montanarella, L. [Eds.]: SAGA - Seconds Out. " + "Hamburger Beitraege zur Physischen Geographie und Landschaftsoekologie, 19:59-70. " + "download\n" + "\n" + )); + + //----------------------------------------------------- + Parameters.Add_Grid( + NULL , "SEEDS" , _TL("Seeds"), + _TL(""), + PARAMETER_INPUT + ); + + Parameters.Add_Grid_List( + NULL , "FEATURES" , _TL("Features"), + _TL(""), + PARAMETER_INPUT + ); + + Parameters.Add_Grid( + NULL , "SEGMENTS" , _TL("Segments"), + _TL(""), + PARAMETER_OUTPUT + ); + + Parameters.Add_Grid( + NULL , "SIMILARITY" , _TL("Similarity"), + _TL(""), + PARAMETER_OUTPUT + ); + + Parameters.Add_Table( + NULL , "TABLE" , _TL("Seeds"), + _TL(""), + PARAMETER_OUTPUT + ); + + Parameters.Add_Value( + NULL , "NORMALIZE" , _TL("Normalize"), + _TL(""), + PARAMETER_TYPE_Bool , false + ); + + Parameters.Add_Choice( + NULL , "NEIGHBOUR" , _TL("Neighbourhood"), + _TL(""), + CSG_String::Format(SG_T("%s|%s|"), + _TL("4 (von Neumann)"), + _TL("8 (Moore)") + ), 0 + ); + + pNode = Parameters.Add_Choice( + NULL , "METHOD" , _TL("Method"), + _TL(""), + CSG_String::Format(SG_T("%s|%s|"), + _TL("feature space and position"), + _TL("feature space") + ), 0 + ); + + Parameters.Add_Value( + pNode , "SIG_1" , _TL("Variance in Feature Space"), + _TL(""), + PARAMETER_TYPE_Double , 1.0, 0.0, true // 0.36 + ); + + Parameters.Add_Value( + pNode , "SIG_2" , _TL("Variance in Position Space"), + _TL(""), + PARAMETER_TYPE_Double , 1.0, 0.0, true // 8.2141 + ); + + Parameters.Add_Value( + pNode , "THRESHOLD" , _TL("Similarity Threshold"), + _TL(""), + PARAMETER_TYPE_Double , 0.0, 0.0, true // 0.15 + ); + + Parameters.Add_Value( + NULL , "REFRESH" , _TL("Refresh"), + _TL(""), + PARAMETER_TYPE_Bool , false + ); + + Parameters.Add_Value( + NULL , "LEAFSIZE" , _TL("Leaf Size (for Speed Optimisation)"), + _TL(""), + PARAMETER_TYPE_Int , 256, 2, true + ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +int CRGA_Basic::On_Parameters_Enable(CSG_Parameters *pParameters, CSG_Parameter *pParameter) +{ + if( !SG_STR_CMP(pParameter->Get_Identifier(), "METHOD") ) + { + pParameters->Set_Enabled("SIG_2", pParameter->asInt() == 0); + } + + return( 1 ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CRGA_Basic::On_Execute(void) +{ + bool bRefresh; + int x, y, i, Segment; + CSG_Grid *pSeeds; + + //----------------------------------------------------- + m_pSegments = Parameters("SEGMENTS" )->asGrid(); + m_pFeatures = Parameters("FEATURES" )->asGridList(); + m_nFeatures = m_pFeatures->Get_Count(); + + pSeeds = Parameters("SEEDS" )->asGrid(); + m_pSeeds = Parameters("TABLE" )->asTable(); + + m_pSimilarity = Parameters("SIMILARITY")->asGrid(); + + m_dNeighbour = Parameters("NEIGHBOUR" )->asInt() == 0 ? 2 : 1; + + m_Var_1 = SG_Get_Square(Parameters("SIG_1")->asDouble()); + m_Var_2 = SG_Get_Square(Parameters("SIG_2")->asDouble()); + m_Threshold = Parameters("THRESHOLD" )->asDouble(); + + m_bNormalize = Parameters("NORMALIZE" )->asBool(); + + m_Method = Parameters("METHOD" )->asInt(); + bRefresh = Parameters("REFRESH" )->asBool(); + + //----------------------------------------------------- + m_pSegments ->Assign(-1); + m_pSegments ->Set_NoData_Value(-1); + + m_pSimilarity ->Assign(-1); + m_pSimilarity ->Set_NoData_Value(-1); + + //----------------------------------------------------- + m_pSeeds->Destroy(); + + m_pSeeds->Add_Field(_TL("ID" ), SG_DATATYPE_Int); + m_pSeeds->Add_Field(_TL("AREA"), SG_DATATYPE_Double); + m_pSeeds->Add_Field(_TL("X" ), SG_DATATYPE_Double); + m_pSeeds->Add_Field(_TL("Y" ), SG_DATATYPE_Double); + + for(i=0; iGet_Count(); i++) + { + m_pSeeds->Add_Field(m_pFeatures->asGrid(i)->Get_Name(), SG_DATATYPE_Double); + } + + m_Candidates.Create(Parameters("LEAFSIZE")->asInt()); + + //----------------------------------------------------- + for(y=0; yis_NoData(x, y) ) + { + CSG_Table_Record *pRec = m_pSeeds->Add_Record(); + + pRec->Set_Value(0, m_pSeeds->Get_Count() - 1); + pRec->Set_Value(SEEDFIELD_X, x); + pRec->Set_Value(SEEDFIELD_Y, y); + + for(i=0; iGet_Count(); i++) + { + pRec->Set_Value(SEEDFIELD_Z + i, Get_Feature(x, y, i)); + } + + m_pSimilarity->Set_Value(x, y, 1.0); + + Add_To_Segment(x, y, m_pSeeds->Get_Count() - 1); + } + } + } + + //----------------------------------------------------- + if( m_pSeeds->Get_Count() > 1 ) + { + sLong n = 0; + + while( n++ < Get_NCells() && Set_Progress_NCells(n) && Get_Next_Candidate(x, y, Segment) ) + { + Add_To_Segment(x, y, Segment); + + if( bRefresh && (n % Get_NX()) == 0 ) + { + DataObject_Update(m_pSegments, 0, m_pSeeds->Get_Count()); + + Process_Set_Text(CSG_String::Format(SG_T("%.2f"), 100.0 * m_Candidates.Get_Count() / Get_NCells())); + } + } + + m_Candidates.Destroy(); + + return( true ); + } + + //----------------------------------------------------- + m_Candidates.Destroy(); + + return( false ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +inline double CRGA_Basic::Get_Feature(int x, int y, int iFeature) +{ + double Value = m_pFeatures->asGrid(iFeature)->asDouble(x, y); + + if( m_bNormalize ) + { + Value = (Value - m_pFeatures->asGrid(iFeature)->Get_Mean()) / m_pFeatures->asGrid(iFeature)->Get_StdDev(); + } + + return( Value ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CRGA_Basic::Get_Next_Candidate(int &x, int &y, int &Segment) +{ + while( m_Candidates.Get(x, y, Segment) ) + { + if( m_pSegments->is_NoData(x, y) ) + { + return( true ); + } + } + + return( false ); +} + +//--------------------------------------------------------- +bool CRGA_Basic::Add_To_Segment(int x, int y, int Segment) +{ + if( is_InGrid(x, y) && m_pSegments->is_NoData(x, y) ) // if the pixel is not element of any segment... + { + int i, ix, iy; + + m_pSegments->Set_Value(x, y, Segment); // the candidate is added to the correspondig region + + for(i=0; i<8; i+=m_dNeighbour) // update of candidate-grid - all 8-Neigbours of the added pixel are checked + { + if( Get_System()->Get_Neighbor_Pos(i, x, y, ix, iy) && m_pSegments->is_NoData(ix, iy) ) + { + double Similarity = Get_Similarity(ix, iy, Segment); + + if( Similarity >= m_Threshold // a neigbour-pixel is only added as candidate if its similarity is higher than the preset threshold + && Similarity > m_pSimilarity->asDouble(ix, iy) ) // and it is not candidate for another region with a higher similarity-value yet + { + m_Candidates.Add(ix, iy, Segment, Similarity); + + m_pSimilarity->Set_Value(ix, iy, Similarity); + } + } + } + + return( true ); + } + + return( false ); +} + +//--------------------------------------------------------- +double CRGA_Basic::Get_Similarity(int x, int y, int Segment) +{ + CSG_Table_Record *pSeed; + + if( is_InGrid(x, y) && (pSeed = m_pSeeds->Get_Record(Segment)) != NULL ) + { + int i; + double a, b, Result; + + switch( m_Method ) + { + //------------------------------------------------- + case 0: // feature space and position + for(i=0, a=0.0; iasDouble(SEEDFIELD_Z + i)); + } + + b = SG_Get_Square(x - pSeed->asDouble(SEEDFIELD_X)) + + SG_Get_Square(y - pSeed->asDouble(SEEDFIELD_Y)); + + Result = a / m_Var_1 + b / m_Var_2; + + break; + + //------------------------------------------------- + case 1: // feature space + for(i=0, a=0.0; iasDouble(SEEDFIELD_Z + i)); + } + + Result = a / m_Var_1; + + break; + } + + return( 1.0 / (1.0 + Result) ); // from 'distance' to 'similarity' !!! + // return( exp(-0.5 * Result) ); + } + + return( -1.0 ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- diff -Nru saga-2.1.0+dfsg/src/modules/imagery/imagery_segmentation/rga_basic.h saga-2.1.4+dfsg/src/modules/imagery/imagery_segmentation/rga_basic.h --- saga-2.1.0+dfsg/src/modules/imagery/imagery_segmentation/rga_basic.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/imagery/imagery_segmentation/rga_basic.h 2014-11-13 08:32:18.000000000 +0000 @@ -0,0 +1,176 @@ +/********************************************************** + * Version $Id: rga_basic.h 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// imagery_segmentation // +// // +//-------------------------------------------------------// +// // +// rga_basic.h // +// // +// Copyright (C) 2008 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Goettingen // +// Goldschmidtstr. 5 // +// 37077 Goettingen // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#ifndef HEADER_INCLUDED__rga_basic_H +#define HEADER_INCLUDED__rga_basic_H + +//--------------------------------------------------------- +#include "MLB_Interface.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +typedef struct SCandidate +{ + int x, y, Segment; + + double Similarity; +} +TCandidate; + +//--------------------------------------------------------- +class CCandidates +{ +public: + CCandidates(void); + CCandidates(int nMax); + ~CCandidates(void); + + void Create (void); + void Create (int nMax); + void Destroy (void); + + void Add (int x, int y, int Segment, double Similarity); + bool Get (int &x, int &y, int &Segment); + + int Get_Count (void) { return( m_nCandidates ); } + + double Get_Minimum (void); + double Get_Maximum (void); + + +private: + + int m_nCandidates, m_nMax; + + TCandidate *m_Candidates; + + CCandidates *m_pLow, *m_pHigh; + + + int _Find (double Similarity); + +}; + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +class CRGA_Basic : public CSG_Module_Grid +{ +public: + CRGA_Basic(void); + + +protected: + + virtual int On_Parameters_Enable (CSG_Parameters *pParameters, CSG_Parameter *pParameter); + + virtual bool On_Execute (void); + + +private: + + bool m_bNormalize; + + int m_Method, m_nFeatures, m_dNeighbour; + + double m_Var_1, m_Var_2, m_Threshold; + + CSG_Table *m_pSeeds; + + CSG_Grid *m_pSegments, *m_pSimilarity; + + CSG_Parameter_Grid_List *m_pFeatures; + + CCandidates m_Candidates; + + + double Get_Feature (int x, int y, int iFeature); + + bool Get_Next_Candidate (int &x, int &y, int &Segment); + + bool Add_To_Segment (int x, int y, int Segment); + + double Get_Similarity (int x, int y, int Segment); + +}; + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#endif // #ifndef HEADER_INCLUDED__rga_basic_H diff -Nru saga-2.1.0+dfsg/src/modules/imagery/imagery_segmentation/skeletonization.cpp saga-2.1.4+dfsg/src/modules/imagery/imagery_segmentation/skeletonization.cpp --- saga-2.1.0+dfsg/src/modules/imagery/imagery_segmentation/skeletonization.cpp 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/imagery/imagery_segmentation/skeletonization.cpp 2014-11-13 08:32:18.000000000 +0000 @@ -0,0 +1,944 @@ +/********************************************************** + * Version $Id: skeletonization.cpp 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// imagery_segmentation // +// // +//-------------------------------------------------------// +// // +// Grid_Skeletonize.cpp // +// // +// Copyright (C) 2003 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Goettingen // +// Goldschmidtstr. 5 // +// 37077 Goettingen // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "skeletonization.h" + +//--------------------------------------------------------- +#define skNE 1 +#define skJA 2 + +#define SEGMENT_END 1 +#define SEGMENT_NODE 2 +#define SEGMENT_LOCKED 3 + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +CSkeletonization::CSkeletonization(void) +{ + Set_Name (_TL("Grid Skeletonization")); + + Set_Author (SG_T("O.Conrad (c) 2002")); + + Set_Description (_TW( + "Simple skeletonisation methods for grids.\n" + )); + + Parameters.Add_Grid( + NULL, "INPUT" , _TL("Grid"), + _TL(""), + PARAMETER_INPUT + ); + + Parameters.Add_Grid( + NULL, "RESULT" , _TL("Skeleton"), + _TL(""), + PARAMETER_OUTPUT, true, SG_DATATYPE_Char + ); + + Parameters.Add_Shapes( + NULL, "VECTOR" , _TL("Skeleton"), + _TL(""), PARAMETER_OUTPUT_OPTIONAL + ); + + Parameters.Add_Choice( + NULL, "METHOD" , _TL("Method"), + _TL(""), + + CSG_String::Format(SG_T("%s|%s|%s|"), + _TL("Standard"), + _TL("Hilditch's Algorithm"), + _TL("Channel Skeleton") + ), 0 + ); + + Parameters.Add_Choice( + NULL, "INIT_METHOD" , _TL("Initialisation"), + _TL(""), + + CSG_String::Format(SG_T("%s|%s|"), + _TL("Less than"), + _TL("Greater than") + ),1 + ); + + Parameters.Add_Value( + NULL, "INIT_THRESHOLD" , _TL("Threshold (Init.)"), + _TL(""), + PARAMETER_TYPE_Double + ); + + Parameters.Add_Value( + NULL, "CONVERGENCE" , _TL("Convergence"), + _TL(""), + PARAMETER_TYPE_Int, 3 + ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CSkeletonization::On_Execute(void) +{ + int Initiation; + sLong n; + double Threshold; + CSG_Grid *pInput; + + //----------------------------------------------------- + pInput = Parameters("INPUT") ->asGrid(); + pResult = Parameters("RESULT") ->asGrid(); + + Initiation = Parameters("INIT_METHOD") ->asInt(); + Threshold = Parameters("INIT_THRESHOLD") ->asDouble(); + + DataObject_Set_Colors(pResult, 3, SG_COLORS_BLACK_WHITE, true); + pResult->Assign(0.0); + + //----------------------------------------------------- + for(n=0; nasDouble(n) < Threshold ) + { + pResult->Set_Value(n, 1); + } + break; + + case 1: + if( pInput->asDouble(n) > Threshold ) + { + pResult->Set_Value(n, 1); + } + break; + } + } + + //----------------------------------------------------- + switch( Parameters("METHOD")->asInt() ) + { + default: Standard_Execute(); break; + case 1: Hilditch_Execute(); break; + case 2: SK_Execute(); break; + } + + //------------------------------------------------- + if( Parameters("VECTOR")->asShapes() ) + { + Vectorize(Parameters("VECTOR")->asShapes()); + } + + if( 1 ) + { + for(n=0; nasDouble(n) < Threshold ) + { + pResult->Add_Value(n, 1); + } + break; + + case 1: + if( pInput->asDouble(n) > Threshold ) + { + pResult->Add_Value(n, 1); + } + break; + } + } + } + + //----------------------------------------------------- + return( true ); +} + + +/////////////////////////////////////////////////////////// +// // +// Helpers // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +int CSkeletonization::Get_Neighbours(int x, int y, CSG_Grid *pGrid, bool Neighbours[8]) +{ + int i, ix, iy, nNeighbours; + + nNeighbours = 0; + + for(i=0; i<8; i++) + { + ix = Get_System()->Get_xTo(i, x); + iy = Get_System()->Get_yTo(i, y); + + if( pGrid->is_InGrid(ix, iy) && pGrid->asByte(ix, iy) ) + { + Neighbours[i] = true; + + nNeighbours++; + } + else + { + Neighbours[i] = false; + } + } + + return( nNeighbours ); +} + + +/////////////////////////////////////////////////////////// +// // +// Vectorization // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +int CSkeletonization::Vectorize(CSG_Shapes *pShapes) +{ + bool z[8], bPrev; + + int x, y, i, ix, iy, n, nSegments; + + double xMin, yMin, dx, dy; + + CSG_Shape *pShape; + + //----------------------------------------------------- + pShapes->Create(SHAPE_TYPE_Line, _TL("Skeleton")); + pShapes->Add_Field("ID", SG_DATATYPE_Int); + + Lock_Create(); + + //----------------------------------------------------- + for(y=0; yasByte(x, y) ) + { + n = Get_Neighbours(x, y, pResult, z); + + if( n == 1 ) + { + Lock_Set(x, y, SEGMENT_END); + } + else if( n > 1 ) + { + n = 0; + + for(i=0, bPrev=z[7]; i<8; i++) + { + if( bPrev == false && z[i] == true ) + { + n++; + } + + bPrev = z[i]; + } + + if( n > 2 ) + { + Lock_Set(x, y, SEGMENT_NODE); + } + } + } + } + } + + //----------------------------------------------------- + nSegments = 0; + + for(y=0; yGet_Cellsize(); + xMin = pResult->Get_XMin();// + 0.5 * dx; + dy = pResult->Get_Cellsize(); + yMin = pResult->Get_YMin();// + 0.5 * dy; + + for(x=0; xGet_xTo(i, x); + iy = Get_System()->Get_yTo(i, y); + + if( pResult->is_InGrid(ix, iy) && pResult->asByte(ix, iy) && !Lock_Get(ix, iy) ) + { + pShape = pShapes->Add_Shape(); + pShape->Set_Value(0, ++nSegments); + pShape->Add_Point(xMin + dx * (double)x, yMin + dy * (double)y); + + Vectorize_Trace(ix, iy, pShape); + } + } + } + } + } + + //----------------------------------------------------- + Lock_Destroy(); + + Message_Dlg(CSG_String::Format(SG_T("%d %s\n"), nSegments, _TL("segments identified")), Get_Name()); + + return( nSegments ); +} + +//--------------------------------------------------------- +bool CSkeletonization::Vectorize_Trace(int x, int y, CSG_Shape *pShape) +{ + bool bContinue; + + int i, ix, iy, iNext; + + double xMin, yMin, dx, dy; + + //----------------------------------------------------- + dx = pResult->Get_Cellsize(); + xMin = pResult->Get_XMin();// + 0.5 * dx; + dy = pResult->Get_Cellsize(); + yMin = pResult->Get_YMin();// + 0.5 * dy; + + bContinue = true; + + do + { + pShape->Add_Point(xMin + dx * (double)x, yMin + dy * (double)y); + + if( Lock_Get(x, y) == SEGMENT_NODE || Lock_Get(x, y) == SEGMENT_END ) + { + bContinue = false; + } + else + { + Lock_Set(x, y, SEGMENT_LOCKED); + + iNext = -1; + + for(i=0; i<8; i+=2) + { + ix = Get_System()->Get_xTo(i, x); + iy = Get_System()->Get_yTo(i, y); + + if( pResult->is_InGrid(ix, iy) && pResult->asByte(ix, iy) && Lock_Get(ix, iy) != SEGMENT_LOCKED ) + { + iNext = i; + + if( Lock_Get(ix, iy) == SEGMENT_NODE ) + { + break; + } + } + } + + if( iNext < 0 ) + { + for(i=1; i<8; i+=2) + { + ix = Get_System()->Get_xTo(i, x); + iy = Get_System()->Get_yTo(i, y); + + if( pResult->is_InGrid(ix, iy) && pResult->asByte(ix, iy) && Lock_Get(ix, iy) != SEGMENT_LOCKED ) + { + iNext = i; + + if( Lock_Get(ix, iy) == SEGMENT_NODE ) + { + break; + } + } + } + } + + if( iNext < 0 ) + { + bContinue = false; + } + else + { + x += Get_System()->Get_xTo(iNext); + y += Get_System()->Get_yTo(iNext); + } + } + } + while( bContinue ); + + //----------------------------------------------------- + return( true ); +} + + +/////////////////////////////////////////////////////////// +// // +// Standard // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +void CSkeletonization::Standard_Execute(void) +{ + int i, nChanges; + + CSG_Grid *pPrev, *pNext, *pTemp; + + //----------------------------------------------------- + pPrev = pResult; + pNext = SG_Create_Grid(pPrev); + + //----------------------------------------------------- + do + { + DataObject_Update(pResult, 0, 1, true); + + nChanges = 0; + + for(i=0; i<8; i++) + { + nChanges += Standard_Step(i, pPrev, pNext); + + pTemp = pPrev; + pPrev = pNext; + pNext = pTemp; + } + } + while( nChanges > 0 && Process_Get_Okay(true) ); + + //----------------------------------------------------- + if( pNext == pResult ) + { + delete(pPrev); + } + else + { + pResult->Assign(pNext); + + delete(pNext); + } +} + +//--------------------------------------------------------- +int CSkeletonization::Standard_Step(int iDir, CSG_Grid *pPrev, CSG_Grid *pNext) +{ + bool z[8], bRemove; + + int x, y, nNeighbours, nChanges; + + pNext->Assign(); + + nChanges = 0; + + for(y=0; yasByte(x, y) ) + { + bRemove = false; + nNeighbours = Get_Neighbours(x, y, pPrev, z); + + if( nNeighbours > 1 && nNeighbours < 6 ) + { + bRemove = Standard_Check(iDir, z); + } + + if( bRemove ) + { + nChanges++; + } + else + { + pNext->Set_Value(x, y, 1); + } + } + } + } + + return( nChanges ); +} + +//--------------------------------------------------------- +inline bool CSkeletonization::Standard_Check(int iDir, bool z[8]) +{ + bool bRemove; + + switch( iDir ) + { + default: + bRemove = false; + break; + + case 0: + bRemove = !z[7] && !z[0] && !z[1] + && z[3] && z[4] && z[5]; + break; + + case 1: + bRemove = !z[0] && !z[1] && !z[2] + && z[4] && z[6]; + break; + + case 2: + bRemove = !z[1] && !z[2] && !z[3] + && z[5] && z[6] && z[7]; + break; + + case 3: + bRemove = !z[2] && !z[3] && !z[4] + && z[6] && z[0]; + break; + + case 4: + bRemove = !z[3] && !z[4] && !z[5] + && z[7] && z[0] && z[1]; + break; + + case 5: + bRemove = !z[4] && !z[5] && !z[6] + && z[0] && z[2]; + break; + + case 6: + bRemove = !z[5] && !z[6] && !z[7] + && z[1] && z[2] && z[3]; + break; + + case 7: + bRemove = !z[6] && !z[7] && !z[0] + && z[2] && z[4]; + break; + } + + return( bRemove ); +} + + +/////////////////////////////////////////////////////////// +// // +// Hilditch // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +void CSkeletonization::Hilditch_Execute(void) +{ + int nChanges; + + CSG_Grid *pPrev, *pNext, *pTemp, *pNC_Gaps; + + //----------------------------------------------------- + pPrev = pResult; + pNext = SG_Create_Grid(pPrev); + pNC_Gaps = SG_Create_Grid(pPrev, SG_DATATYPE_Char); + + //----------------------------------------------------- + do + { + DataObject_Update(pResult, 0, 1, true); + + nChanges = Hilditch_Step(pPrev, pNext, pNC_Gaps); + + pTemp = pPrev; + pPrev = pNext; + pNext = pTemp; + } + while( nChanges > 0 && Process_Get_Okay(true) ); + + //----------------------------------------------------- + delete(pNC_Gaps); + + if( pNext == pResult ) + { + delete(pPrev); + } + else + { + pResult->Assign(pNext); + + delete(pNext); + } +} + +//--------------------------------------------------------- +int CSkeletonization::Hilditch_Step(CSG_Grid *pPrev, CSG_Grid *pNext, CSG_Grid *pNC_Gaps) +{ + bool z[8], bPrev, bRemove; + + int x, y, i, nChanges, nNeighbours; + + //----------------------------------------------------- + for(y=0; yasByte(x, y) && Get_Neighbours(x, y, pPrev, z) > 0 ) + { + for(i=0, bPrev=z[7]; i<8; i++) + { + if( bPrev == false && z[i] == true ) + { + nChanges++; + } + + bPrev = z[i]; + } + } + + pNC_Gaps->Set_Value(x, y, nChanges); + } + } + + //----------------------------------------------------- + pNext->Assign(); + + nChanges = 0; + + for(y=0; yasByte(x, y) ) + { + bRemove = false; + nNeighbours = Get_Neighbours(x, y, pPrev, z); + + //----------------------------------------- + if( 2 <= nNeighbours && nNeighbours <= 6 && pNC_Gaps->asByte(x, y) == 1 ) + { + bRemove = Hilditch_Check(pNC_Gaps, x, y, 0, z) + || Hilditch_Check(pNC_Gaps, x, y, 2, z) + || Hilditch_Check(pNC_Gaps, x, y, 4, z) + || Hilditch_Check(pNC_Gaps, x, y, 6, z) + ; + } + + //----------------------------------------- + if( bRemove ) + { + nChanges++; + } + else + { + pNext->Set_Value(x, y, 1.0); + } + } + } + } + + //----------------------------------------------------- + return( nChanges ); +} + +//--------------------------------------------------------- +inline bool CSkeletonization::Hilditch_Check(CSG_Grid *pNC_Gaps, int x, int y, int i0, bool z[8]) +{ + int ix, iy, i2, i4, i6; + + i2 = (i0 + 2) % 8; + i4 = (i0 + 4) % 8; + i6 = (i0 + 6) % 8; + + if( z[i0] || z[i2] || z[i6] ) + { + ix = Get_System()->Get_xTo(i0, x); + iy = Get_System()->Get_yTo(i0, y); + + if( pNC_Gaps->is_InGrid(ix, iy) && pNC_Gaps->asByte(ix, iy) == 1 ) + { + return( false ); + } + } + + if( z[i0] || z[i2] || z[i4] ) + { + ix = Get_System()->Get_xTo(i2, x); + iy = Get_System()->Get_yTo(i2, y); + + if( pNC_Gaps->is_InGrid(ix, iy) && pNC_Gaps->asByte(ix, iy) == 1 ) + { + return( false ); + } + } + + return( true ); +} + + +/////////////////////////////////////////////////////////// +// // +// Channel Detection // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +void CSkeletonization::SK_Execute(void) +{ + int x, y, i, ix, iy, n, NB[8], Convergence; + double z, iz; + + //----------------------------------------------------- + CSG_Grid *pInput = Parameters("INPUT")->asGrid(); + + if( !pInput->Set_Index() ) + { + Error_Set(_TL("index creation failed")); + } + + Convergence = Parameters("CONVERGENCE")->asInt(); + + pResult->Assign(); + + + //----------------------------------------------------- + // 1.) Find definitive channel points... + + for(y=0; yasDouble(x, y); + n = 0; + + for(i=0; i<8; i++) + { + ix = Get_System()->Get_xTo(i, x); + iy = Get_System()->Get_yTo(i, y); + + if( pInput->is_InGrid(ix, iy) && z < pInput->asDouble(ix, iy) ) + { + n++; + } + } + + if( Convergence > n ) + { + pResult->Set_Value(x, y, 2); + } + } + } + + + //----------------------------------------------------- + // 2.) Find channels... + + for(n=0; nGet_Sorted(n, x, y) ) // Von oben nach unten... + { + z = pInput->asDouble(x, y); + + for(i=0; i<8; i++) + { + ix = Get_System()->Get_xTo(i,x); + iy = Get_System()->Get_yTo(i,y); + + if( !pInput->is_InGrid(ix, iy) ) + { + NB[i] = skNE; + } + else + { + iz = pInput->asDouble(ix, iy); + + if( iz < z ) + { + NB[i] = skNE; + } + else if( iz > z && pResult->asByte(ix, iy) ) + { + NB[i] = skJA; + } + else + { + NB[i] = 0; + } + } + } + + if( SK_Connectivity(NB) ) + { + pResult->Set_Value(x, y, 1); + } + } + } + + + //----------------------------------------------------- + /*/ 3.) Filter... + + Lock_Create(); + + for(y=0; ySet_Value(x, y, 0); + } + } + } + + Lock_Destroy();/**/ +} + +//--------------------------------------------------------- +int CSkeletonization::SK_Connectivity(int NB[8]) +{ + int i; + + for(i=0; i<8; i+=2) + { + if( !NB[i] ) + { + if( !NB[(i+2)%8] ) // Diagonal Connection + { + /* + if( ( NB[(i+1)%8] ) + && ( NB[(i+3)%8] || NB[(i+4)%8] || NB[(i+5)%8] || NB[(i+6)%8] || NB[(i+7)%8] ) ) + return(1); + */ + + ///* + if( ( NB[(i+1)%8]==skNE ) + && ( NB[(i+3)%8]==skJA || NB[(i+4)%8]==skJA || NB[(i+5)%8]==skJA || NB[(i+6)%8]==skJA || NB[(i+7)%8]==skJA ) ) + return(1); + + if( ( NB[(i+1)%8]==skJA ) + && ( NB[(i+3)%8]==skNE || NB[(i+4)%8]==skNE || NB[(i+5)%8]==skNE || NB[(i+6)%8]==skNE || NB[(i+7)%8]==skNE ) ) + return(1); + //*/ + } + + //---Orthogonal-Connection--------------------------------- + if(!NB[(i+4)%8]) + { /* + if( ( NB[(i+1)%8] || NB[(i+2)%8] || NB[(i+3)%8] ) + && ( NB[(i+5)%8] || NB[(i+6)%8] || NB[(i+7)%8] ) ) + return(1); + */ + + ///* + if( ( NB[(i+1)%8]==skJA || NB[(i+2)%8]==skJA || NB[(i+3)%8]==skJA ) + && ( NB[(i+5)%8]==skNE || NB[(i+6)%8]==skNE || NB[(i+7)%8]==skNE ) ) + return(1); + + if( ( NB[(i+1)%8]==skNE || NB[(i+2)%8]==skNE || NB[(i+3)%8]==skNE ) + && ( NB[(i+5)%8]==skJA || NB[(i+6)%8]==skJA || NB[(i+7)%8]==skJA ) ) + return(1); + //*/ + } + } + } + + return( 0 ); +} + +//--------------------------------------------------------- +bool CSkeletonization::SK_Filter(int x, int y) +{ + bool z[8]; + + if( !pResult->asByte(x, y) && Get_Neighbours(x, y, pResult, z) == 4 ) + { + if( z[0] && z[2] && z[4] && z[6] ) + { + Lock_Set(Get_System()->Get_xTo(0, x), Get_System()->Get_yTo(0, y)); + Lock_Set(Get_System()->Get_xTo(2, x), Get_System()->Get_yTo(2, y)); + Lock_Set(Get_System()->Get_xTo(4, x), Get_System()->Get_yTo(4, y)); + Lock_Set(Get_System()->Get_xTo(6, x), Get_System()->Get_yTo(6, y)); + + return( true ); + } + } + + return( false ); +} diff -Nru saga-2.1.0+dfsg/src/modules/imagery/imagery_segmentation/skeletonization.h saga-2.1.4+dfsg/src/modules/imagery/imagery_segmentation/skeletonization.h --- saga-2.1.0+dfsg/src/modules/imagery/imagery_segmentation/skeletonization.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/imagery/imagery_segmentation/skeletonization.h 2014-11-13 08:32:18.000000000 +0000 @@ -0,0 +1,128 @@ +/********************************************************** + * Version $Id: skeletonization.h 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// imagery_segmentation // +// // +//-------------------------------------------------------// +// // +// skeletonization.h // +// // +// Copyright (C) 2003 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Goettingen // +// Goldschmidtstr. 5 // +// 37077 Goettingen // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#ifndef HEADER_INCLUDED__skeletonization_H +#define HEADER_INCLUDED__skeletonization_H + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "MLB_Interface.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +class CSkeletonization : public CSG_Module_Grid +{ +public: + CSkeletonization(void); + + +protected: + + virtual bool On_Execute (void); + + +private: + + CSG_Grid *pResult; + + + int Get_Neighbours (int x, int y, CSG_Grid *pGrid, bool Neighbours[8]); + + int Vectorize (CSG_Shapes *pShapes); + bool Vectorize_Trace (int x, int y, CSG_Shape *pShape); + + void Standard_Execute (void); + int Standard_Step (int iDir, CSG_Grid *pPrev, CSG_Grid *pNext); + bool Standard_Check (int iDir, bool z[8]); + + void Hilditch_Execute (void); + int Hilditch_Step (CSG_Grid *pPrev, CSG_Grid *pNext, CSG_Grid *pNC_Gaps); + bool Hilditch_Check (CSG_Grid *pNC_Gaps, int x, int y, int i0, bool z[8]); + + void SK_Execute (void); + int SK_Connectivity (int NB[8]); + bool SK_Filter (int x, int y); + +}; + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#endif // #ifndef HEADER_INCLUDED__skeletonization_H diff -Nru saga-2.1.0+dfsg/src/modules/imagery/imagery_segmentation/watershed_segmentation.cpp saga-2.1.4+dfsg/src/modules/imagery/imagery_segmentation/watershed_segmentation.cpp --- saga-2.1.0+dfsg/src/modules/imagery/imagery_segmentation/watershed_segmentation.cpp 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/imagery/imagery_segmentation/watershed_segmentation.cpp 2014-11-13 08:32:18.000000000 +0000 @@ -0,0 +1,522 @@ +/********************************************************** + * Version $Id: watershed_segmentation.cpp 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// imagery_segmentation // +// // +//-------------------------------------------------------// +// // +// watershed_segmentation.cpp // +// // +// Copyright (C) 2003 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Goettingen // +// Goldschmidtstr. 5 // +// 37077 Goettingen // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "watershed_segmentation.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +enum +{ + SEED_X = 0, + SEED_Y, + SEED_Z, + SEED_ID, + SEED_JOIN +}; + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +CWatershed_Segmentation::CWatershed_Segmentation(void) +{ + CSG_Parameter *pNode; + + //----------------------------------------------------- + Set_Name (_TL("Watershed Segmentation")); + + Set_Author (SG_T("O.Conrad (c) 2002")); + + Set_Description (_TW( + "Watershed segmentation." + )); + + + //----------------------------------------------------- + Parameters.Add_Grid( + NULL , "GRID" , _TL("Grid"), + _TL(""), + PARAMETER_INPUT + ); + + pNode = Parameters.Add_Grid( + NULL , "SEGMENTS" , _TL("Segments"), + _TL(""), + PARAMETER_OUTPUT + ); + + Parameters.Add_Shapes( + NULL , "SEEDS" , _TL("Seed Points"), + _TL(""), + PARAMETER_OUTPUT, SHAPE_TYPE_Point + ); + + Parameters.Add_Grid_Output( + NULL , "BORDERS" , _TL("Borders"), + _TL("") + ); + + //----------------------------------------------------- + Parameters.Add_Choice( + pNode , "OUTPUT" , _TL("Output"), + _TL("The values of the resultant grid can be either the seed value (e.g. the local maximum) or the enumerated segment id."), + CSG_String::Format(SG_T("%s|%s|"), + _TL("Seed Value"), + _TL("Segment ID") + ), 1 + ); + + Parameters.Add_Choice( + NULL , "DOWN" , _TL("Method"), + _TL("Choose if you want to segmentate either on minima or on maxima."), + CSG_String::Format(SG_T("%s|%s|"), + _TL("Minima"), + _TL("Maxima") + ), 1 + ); + + pNode = Parameters.Add_Choice( + NULL , "JOIN" , _TL("Join Segments based on Threshold Value"), + _TL("Join segments based on threshold value."), + CSG_String::Format(SG_T("%s|%s|%s|"), + _TL("do not join"), + _TL("seed to saddle difference"), + _TL("seeds difference") + ), 0 + ); + + Parameters.Add_Value( + pNode , "THRESHOLD" , _TL("Threshold"), + _TL("Specify a threshold value as minimum difference between neighboured segments."), + PARAMETER_TYPE_Double, 0.0, 0.0, true + ); + + Parameters.Add_Value( + NULL , "EDGE" , _TL("Allow Edge Pixels to be Seeds"), + _TL(""), + PARAMETER_TYPE_Bool, true + ); + + Parameters.Add_Value( + NULL , "BBORDERS" , _TL("Borders"), + _TL("Create borders between segments as new grid."), + PARAMETER_TYPE_Bool, false + ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CWatershed_Segmentation::On_Execute(void) +{ + //----------------------------------------------------- + m_pGrid = Parameters("GRID") ->asGrid(); + m_pSeeds = Parameters("SEEDS") ->asShapes(); + m_pSegments = Parameters("SEGMENTS") ->asGrid(); + m_bDown = Parameters("DOWN") ->asInt() == 1; + + //----------------------------------------------------- + m_pSeeds->Create(SHAPE_TYPE_Point, CSG_String::Format(SG_T("%s [%s]"), m_pGrid->Get_Name(), _TL("Seeds"))); + + m_pSeeds->Add_Field(SG_T("XCELL") , SG_DATATYPE_Int); // SEED_X + m_pSeeds->Add_Field(SG_T("YCELL") , SG_DATATYPE_Int); // SEED_Y + m_pSeeds->Add_Field(SG_T("VALUE") , SG_DATATYPE_Double); // SEED_Z + m_pSeeds->Add_Field(SG_T("ID") , SG_DATATYPE_Int); // SEED_ID + m_pSeeds->Add_Field(SG_T("ID_JOIN") , SG_DATATYPE_Int); // SEED_JOIN + + //----------------------------------------------------- + m_pSegments->Set_Name(CSG_String::Format(SG_T("%s [%s]"), m_pGrid->Get_Name(), _TL("Segments"))); + m_pSegments->Set_NoData_Value(-999999.0); + + m_Dir.Create(*Get_System(), SG_DATATYPE_Char); + + //----------------------------------------------------- + if( !Get_Seeds() ) + { + Message_Add(_TL("no seed points identified")); + + return( false ); + } + + //----------------------------------------------------- + Get_Segments(); + + //----------------------------------------------------- + if( Parameters("OUTPUT")->asInt() == 0 ) + { + for(int y=0; yasInt(x, y); + + if( ID >= 0 ) + { + m_pSegments->Set_Value(x, y, m_pSeeds->Get_Shape(ID)->asDouble(SEED_Z)); + } + } + } + } + + //----------------------------------------------------- + if( Parameters("BBORDERS")->asBool() ) + { + Get_Borders(); + } + + //----------------------------------------------------- + m_Dir.Destroy(); + + return( true ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CWatershed_Segmentation::Get_Seeds(void) +{ + Process_Set_Text(_TL("Seeds")); + + bool bEdge, bEdge_Seeds; + int x, y, i, ix, iy, iMax; + double z, dz, dzMax; + + //----------------------------------------------------- + bEdge_Seeds = Parameters("EDGE") ->asBool(); + + //----------------------------------------------------- + for(y=0; yis_InGrid(x, y) ) + { + m_Dir.Set_Value(x, y, -1); + m_pSegments->Set_NoData(x, y); + } + else + { + for(i=0, iMax=-1, dzMax=0.0, z=m_pGrid->asDouble(x, y), bEdge=false; i<8; i++) + { + if( !m_pGrid->is_InGrid(ix = Get_xTo(i, x), iy = Get_yTo(i, y)) ) + { + bEdge = true; + } + else if( dzMax < (dz = (m_bDown ? m_pGrid->asDouble(ix, iy) - z : z - m_pGrid->asDouble(ix, iy)) / Get_Length(i)) ) + { + dzMax = dz; + iMax = i; + } + } + + //--------------------------------------------- + m_Dir.Set_Value(x, y, iMax); + + if( iMax < 0 && (bEdge_Seeds || !bEdge) ) + { + int ID = m_pSeeds->Get_Count(); + + CSG_Shape *pSeed = m_pSeeds->Add_Shape(); + + pSeed->Set_Point(Get_System()->Get_Grid_to_World(x, y), 0); + + pSeed->Set_Value(SEED_X , x); + pSeed->Set_Value(SEED_Y , y); + pSeed->Set_Value(SEED_Z , z); + pSeed->Set_Value(SEED_ID , ID); + pSeed->Set_Value(SEED_JOIN , -1); + + m_pSegments->Set_Value(x, y, ID); + } + else + { + m_pSegments->Set_Value(x, y, -1); + } + } + } + } + + return( m_pSeeds->Get_Count() > 1 ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CWatershed_Segmentation::Get_Segments(void) +{ + Process_Set_Text(_TL("Segments")); + + double Threshold = Parameters("THRESHOLD")->asDouble(); + int Join = Threshold > 0.0 ? Parameters("JOIN")->asInt() : 0; + + if( !m_pGrid->Set_Index() ) + { + Error_Set(_TL("index creation failed")); + + return( false ); + } + + //----------------------------------------------------- + for(sLong n=0; nGet_Sorted(n, x, y, m_bDown) && (i = m_Dir.asInt(x, y)) >= 0 ) + { + m_pSegments->Set_Value(x, y, ID = m_pSegments->asInt(Get_xTo(i, x), Get_yTo(i, y))); + + if( Join != 0 && ID >= 0 ) + { + double z = m_pGrid->asDouble(x, y); + + for(int i=0; i<8; i++) + { + int ix = Get_xTo(i, x); + int iy = Get_yTo(i, y); + + if( m_pSegments->is_InGrid(ix, iy) && (iID = m_pSegments->asInt(ix, iy)) >= 0 ) // Border < 0, Segment >= 0 + { + if( ID != iID ) + { + bool bJoin; + + if( Join == 1 ) + { + bJoin = (Threshold >= fabs(m_pSeeds->Get_Shape(iID)->asDouble(SEED_Z) - z)) + || (Threshold >= fabs(m_pSeeds->Get_Shape( ID)->asDouble(SEED_Z) - z)); + } + else + { + bJoin = Threshold >= fabs(m_pSeeds->Get_Shape(iID)->asDouble(SEED_Z) - m_pSeeds->Get_Shape(ID)->asDouble(SEED_Z)); + } + + if( bJoin ) + { + if( (m_bDown == true && m_pSeeds->Get_Shape(iID)->asDouble(SEED_Z) < m_pSeeds->Get_Shape(ID)->asDouble(SEED_Z)) + || (m_bDown == false && m_pSeeds->Get_Shape(iID)->asDouble(SEED_Z) > m_pSeeds->Get_Shape(ID)->asDouble(SEED_Z)) ) + { + Segment_Change(iID, ID); + } + else + { + Segment_Change(ID, iID); + + ID = iID; + } + } + } + } + } + } + } + } + + return( true ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CWatershed_Segmentation::Segment_Change(int ID, int new_ID) +{ + bool bContinue; + int ax, ay, bx, by; + + //----------------------------------------------------- + CSG_Shape *pSeed = m_pSeeds->Get_Shape(ID); + + pSeed->Set_Value(SEED_JOIN, new_ID); + + ax = bx = pSeed->asInt(SEED_X); + ay = by = pSeed->asInt(SEED_Y); + + do + { + bContinue = false; + + for(int x=ax; x<=bx; x++) + { + if( m_pSegments->asInt( x, ay) == ID ) + { + m_pSegments->Set_Value( x, ay, new_ID); + + bContinue = true; + } + + if( m_pSegments->asInt( x, by) == ID ) + { + m_pSegments->Set_Value( x, by, new_ID); + + bContinue = true; + } + } + + for(int y=ay; y<=by; y++) + { + if( m_pSegments->asInt(ax, y) == ID ) + { + m_pSegments->Set_Value(ax, y, new_ID); + + bContinue = true; + } + + if( m_pSegments->asInt(bx, y) == ID ) + { + m_pSegments->Set_Value(bx, y, new_ID); + + bContinue = true; + } + } + + if( ax > 0 ) ax--; + if( ay > 0 ) ay--; + if( bx < Get_NX() - 1 ) bx++; + if( by < Get_NY() - 1 ) by++; + } + while( bContinue ); + + return( true ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CWatershed_Segmentation::Get_Borders(void) +{ + Process_Set_Text(_TL("Borders")); + + CSG_Grid *pBorders = SG_Create_Grid(SG_DATATYPE_Byte, Get_NX() + 2, Get_NY() + 2, Get_Cellsize(), Get_XMin() - 0.5 * Get_Cellsize(), Get_YMin() - 0.5 * Get_Cellsize()); + + pBorders->Set_NoData_Value(0); + + Parameters("BORDERS")->Set_Value(pBorders); + + for(int y=0, yy=1; yyasInt(x, y); + + if( id != m_pSegments->asInt(xx, y) ) + { + pBorders->Set_Value(xx, y, 1); + } + + if( id != m_pSegments->asInt( x, yy) ) + { + pBorders->Set_Value( x, yy, 1); + } + + if( id != m_pSegments->asInt(xx, yy) ) + { + pBorders->Set_Value(xx, yy, 1); + } + } + } + + return( true ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- diff -Nru saga-2.1.0+dfsg/src/modules/imagery/imagery_segmentation/watershed_segmentation.h saga-2.1.4+dfsg/src/modules/imagery/imagery_segmentation/watershed_segmentation.h --- saga-2.1.0+dfsg/src/modules/imagery/imagery_segmentation/watershed_segmentation.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/imagery/imagery_segmentation/watershed_segmentation.h 2014-11-13 08:32:18.000000000 +0000 @@ -0,0 +1,115 @@ +/********************************************************** + * Version $Id: watershed_segmentation.h 1922 2014-01-09 10:28:46Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// imagery_segmentation // +// // +//-------------------------------------------------------// +// // +// watershed_segmentation.h // +// // +// Copyright (C) 2003 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Goettingen // +// Goldschmidtstr. 5 // +// 37077 Goettingen // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#ifndef HEADER_INCLUDED__watershed_segmentation_H +#define HEADER_INCLUDED__watershed_segmentation_H + +//--------------------------------------------------------- +#include "MLB_Interface.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +class CWatershed_Segmentation : public CSG_Module_Grid +{ +public: + CWatershed_Segmentation(void); + + +protected: + + virtual bool On_Execute (void); + + +private: + + bool m_bDown; + + CSG_Grid *m_pGrid, *m_pSegments, m_Dir; + + CSG_Shapes *m_pSeeds; + + + bool Get_Seeds (void); + + bool Get_Segments (void); + bool Segment_Change (int ID, int new_ID); + + bool Get_Borders (void); + +}; + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#endif // #ifndef HEADER_INCLUDED__watershed_segmentation_H diff -Nru saga-2.1.0+dfsg/src/modules/imagery/imagery_svm/Makefile.am saga-2.1.4+dfsg/src/modules/imagery/imagery_svm/Makefile.am --- saga-2.1.0+dfsg/src/modules/imagery/imagery_svm/Makefile.am 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/imagery/imagery_svm/Makefile.am 2014-11-13 08:32:18.000000000 +0000 @@ -0,0 +1,21 @@ +if DEBUG +DBGFLAGS = -g -DDEBUG +endif +if SAGA_UNICODE +UC_DEFS = -D_SAGA_UNICODE +endif +DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD +CXX_INCS = -I$(top_srcdir)/src/saga_core +AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS) +AM_LDFLAGS = -fPIC -shared -avoid-version +pkglib_LTLIBRARIES = libimagery_svm.la +libimagery_svm_la_SOURCES =\ +MLB_Interface.cpp\ +svm.cpp\ +svm_grids.cpp\ +MLB_Interface.h\ +svm.h\ +svm_grids.h + +libimagery_svm_la_LIBADD = $(top_srcdir)/src/saga_core/saga_api/libsaga_api.la + diff -Nru saga-2.1.0+dfsg/src/modules/imagery/imagery_svm/Makefile.in saga-2.1.4+dfsg/src/modules/imagery/imagery_svm/Makefile.in --- saga-2.1.0+dfsg/src/modules/imagery/imagery_svm/Makefile.in 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/imagery/imagery_svm/Makefile.in 2014-11-13 08:33:32.000000000 +0000 @@ -0,0 +1,698 @@ +# Makefile.in generated by automake 1.14.1 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +subdir = src/modules/imagery/imagery_svm +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_postgresql.m4 \ + $(top_srcdir)/m4/ax_pkg_swig.m4 \ + $(top_srcdir)/m4/ax_python_devel.m4 \ + $(top_srcdir)/m4/ax_swig_enable_cxx.m4 \ + $(top_srcdir)/m4/ax_swig_python.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__installdirs = "$(DESTDIR)$(pkglibdir)" +LTLIBRARIES = $(pkglib_LTLIBRARIES) +libimagery_svm_la_DEPENDENCIES = \ + $(top_srcdir)/src/saga_core/saga_api/libsaga_api.la +am_libimagery_svm_la_OBJECTS = MLB_Interface.lo svm.lo svm_grids.lo +libimagery_svm_la_OBJECTS = $(am_libimagery_svm_la_OBJECTS) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) +depcomp = $(SHELL) $(top_srcdir)/depcomp +am__depfiles_maybe = depfiles +am__mv = mv -f +CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = +CXXLD = $(CXX) +CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = +CCLD = $(CC) +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = +SOURCES = $(libimagery_svm_la_SOURCES) +DIST_SOURCES = $(libimagery_svm_la_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +AX_SWIG_PYTHON_CPPFLAGS = @AX_SWIG_PYTHON_CPPFLAGS@ +AX_SWIG_PYTHON_OPT = @AX_SWIG_PYTHON_OPT@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DISABLELIBHARU = @DISABLELIBHARU@ +DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +FGREP = @FGREP@ +GOMPFLAGS = @GOMPFLAGS@ +GREP = @GREP@ +HARU_LIB = @HARU_LIB@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LOCAL_INCS = @LOCAL_INCS@ +LOCAL_LIBS = @LOCAL_LIBS@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ +MKDIR_P = @MKDIR_P@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PG_CONFIG = @PG_CONFIG@ +POSTGRESQL_CFLAGS = @POSTGRESQL_CFLAGS@ +POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@ +POSTGRESQL_VERSION = @POSTGRESQL_VERSION@ +POW_LIB = @POW_LIB@ +PYTHON = @PYTHON@ +PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ +PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ +PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ +PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_PLATFORM = @PYTHON_PLATFORM@ +PYTHON_PREFIX = @PYTHON_PREFIX@ +PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ +PYTHON_VERSION = @PYTHON_VERSION@ +RANLIB = @RANLIB@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +SWIG = @SWIG@ +SWIG_LIB = @SWIG_LIB@ +VERSION = @VERSION@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +pkgpyexecdir = @pkgpyexecdir@ +pkgpythondir = @pkgpythondir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +pyexecdir = @pyexecdir@ +pythondir = @pythondir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +@DEBUG_TRUE@DBGFLAGS = -g -DDEBUG +@SAGA_UNICODE_TRUE@UC_DEFS = -D_SAGA_UNICODE +DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD +CXX_INCS = -I$(top_srcdir)/src/saga_core +AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS) +AM_LDFLAGS = -fPIC -shared -avoid-version +pkglib_LTLIBRARIES = libimagery_svm.la +libimagery_svm_la_SOURCES = \ +MLB_Interface.cpp\ +svm.cpp\ +svm_grids.cpp\ +MLB_Interface.h\ +svm.h\ +svm_grids.h + +libimagery_svm_la_LIBADD = $(top_srcdir)/src/saga_core/saga_api/libsaga_api.la +all: all-am + +.SUFFIXES: +.SUFFIXES: .cpp .lo .o .obj +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/modules/imagery/imagery_svm/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign src/modules/imagery/imagery_svm/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): + +install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) + @$(NORMAL_INSTALL) + @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ + list2=; for p in $$list; do \ + if test -f $$p; then \ + list2="$$list2 $$p"; \ + else :; fi; \ + done; \ + test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \ + } + +uninstall-pkglibLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ + for p in $$list; do \ + $(am__strip_dir) \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$f"; \ + done + +clean-pkglibLTLIBRARIES: + -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES) + @list='$(pkglib_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + +libimagery_svm.la: $(libimagery_svm_la_OBJECTS) $(libimagery_svm_la_DEPENDENCIES) $(EXTRA_libimagery_svm_la_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) -rpath $(pkglibdir) $(libimagery_svm_la_OBJECTS) $(libimagery_svm_la_LIBADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MLB_Interface.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/svm.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/svm_grids.Plo@am__quote@ + +.cpp.o: +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< + +.cpp.obj: +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + +.cpp.lo: +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + set x; \ + here=`pwd`; \ + $(am__define_uniq_tagged_files); \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ + fi +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ + test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(LTLIBRARIES) +installdirs: + for dir in "$(DESTDIR)$(pkglibdir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool clean-pkglibLTLIBRARIES \ + mostlyclean-am + +distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: install-pkglibLTLIBRARIES + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-pkglibLTLIBRARIES + +.MAKE: install-am install-strip + +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-pkglibLTLIBRARIES install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ + uninstall-pkglibLTLIBRARIES + + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nru saga-2.1.0+dfsg/src/modules/imagery/imagery_svm/MLB_Interface.cpp saga-2.1.4+dfsg/src/modules/imagery/imagery_svm/MLB_Interface.cpp --- saga-2.1.0+dfsg/src/modules/imagery/imagery_svm/MLB_Interface.cpp 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/imagery/imagery_svm/MLB_Interface.cpp 2014-11-13 08:32:18.000000000 +0000 @@ -0,0 +1,124 @@ +/********************************************************** + * Version $Id: MLB_Interface.cpp 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// SVM // +// // +//-------------------------------------------------------// +// // +// MLB_Interface.cpp // +// // +// Copyright (C) 2012 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.de // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Hamburg // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// The Module Link Library Interface // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "MLB_Interface.h" + +#include "svm.h" + +//--------------------------------------------------------- +CSG_String Get_Info(int i) +{ + switch( i ) + { + case MLB_INFO_Name: default: + return( _TL("SVM") ); + + case MLB_INFO_Category: + return( _TL("Imagery") ); + + case MLB_INFO_Author: + return( SG_T("O.Conrad (c) 2012") ); + + case MLB_INFO_Description: + return( _TW( + "Interface to LIBSVM - A Library for Support Vector Machines.\n" + "Reference:\n" + "Chang, C.-C. / Lin, C.-J. (2011): A library for support vector machines. " + "ACM Transactions on Intelligent Systems and Technology, vol.2/3, p.1-27. " + "LIBSVM Homepage.\n" + )); + + case MLB_INFO_Version: + return( CSG_String::Format(SG_T("LIBSVM %d.%d"), libsvm_version / 100, libsvm_version - 100 * (libsvm_version / 100)) ); + + case MLB_INFO_Menu_Path: + return( _TL("SVM") ); + } +} + +//--------------------------------------------------------- +#include "svm_grids.h" + +//--------------------------------------------------------- +CSG_Module * Create_Module(int i) +{ + switch( i ) + { + case 0: return( new CSVM_Grids ); + + case 10: return( NULL ); + default: return( MLB_INTERFACE_SKIP_MODULE ); + } +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +//{{AFX_SAGA + + MLB_INTERFACE + +//}}AFX_SAGA diff -Nru saga-2.1.0+dfsg/src/modules/imagery/imagery_svm/MLB_Interface.h saga-2.1.4+dfsg/src/modules/imagery/imagery_svm/MLB_Interface.h --- saga-2.1.0+dfsg/src/modules/imagery/imagery_svm/MLB_Interface.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/imagery/imagery_svm/MLB_Interface.h 2014-11-13 08:32:18.000000000 +0000 @@ -0,0 +1,85 @@ +/********************************************************** + * Version $Id: MLB_Interface.h 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// imagery_classification // +// // +//-------------------------------------------------------// +// // +// MLB_Interface.h // +// // +// Copyright (C) 2003 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Goettingen // +// Goldschmidtstr. 5 // +// 37077 Goettingen // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// Include the SAGA-API here // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#ifndef HEADER_INCLUDED__grid_discretisation_H +#define HEADER_INCLUDED__grid_discretisation_H + +//--------------------------------------------------------- +#include + +//--------------------------------------------------------- +#ifdef grid_discretisation_EXPORTS + #define grid_discretisation_EXPORT _SAGA_DLL_EXPORT +#else + #define grid_discretisation_EXPORT _SAGA_DLL_IMPORT +#endif + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#endif // #ifndef HEADER_INCLUDED__grid_discretisation_H diff -Nru saga-2.1.0+dfsg/src/modules/imagery/imagery_svm/svm_grids.cpp saga-2.1.4+dfsg/src/modules/imagery/imagery_svm/svm_grids.cpp --- saga-2.1.0+dfsg/src/modules/imagery/imagery_svm/svm_grids.cpp 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/imagery/imagery_svm/svm_grids.cpp 2014-11-13 08:32:18.000000000 +0000 @@ -0,0 +1,795 @@ +/********************************************************** + * Version $Id: svm_grids.cpp 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// svm // +// // +//-------------------------------------------------------// +// // +// svm_grids.cpp // +// // +// Copyright (C) 2012 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Hamburg // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "svm_grids.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +void SVM_Printf(const char *s) +{ + SG_UI_Msg_Add_Execution(s, false); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +CSVM_Grids::CSVM_Grids(void) +{ + //----------------------------------------------------- + Set_Name (_TL("SVM Classification")); + + Set_Author (SG_T("O.Conrad (c) 2012")); + + Set_Description (_TW( + "Support Vector Machine (SVM) based classification for grids.\n" + "Reference:\n" + "Chang, C.-C. / Lin, C.-J. (2011): A library for support vector machines. " + "ACM Transactions on Intelligent Systems and Technology, vol.2/3, p.1-27. " + "LIBSVM Homepage.\n" + )); + + //----------------------------------------------------- + Parameters.Add_Grid_List( + NULL , "GRIDS" , _TL("Grids"), + _TL(""), + PARAMETER_INPUT + ); + + Parameters.Add_Grid( + NULL , "CLASSES" , _TL("Classification"), + _TL(""), + PARAMETER_OUTPUT, true, SG_DATATYPE_Short + ); + + Parameters.Add_Choice( + NULL , "SCALING" , _TL("Scaling"), + _TL(""), + CSG_String::Format(SG_T("%s|%s|%s|"), + _TL("none"), + _TL("normalize (0-1)"), + _TL("standardize") + ), 2 + ); + + Parameters.Add_Value( + NULL , "MESSAGE" , _TL("Verbose Messages"), + _TL(""), + PARAMETER_TYPE_Bool, false + ); + + Parameters.Add_Choice( + NULL , "MODEL_SRC" , _TL("Model Source"), + _TL(""), + CSG_String::Format(SG_T("%s|%s|"), + _TL("create from training areas"), + _TL("restore from file") + ), 0 + ); + + //----------------------------------------------------- + Parameters.Add_FilePath( + NULL , "MODEL_LOAD" , _TL("Restore Model from File"), + _TL(""), + NULL, NULL, false + ); + + //----------------------------------------------------- + CSG_Parameter *pNode = Parameters.Add_Node( + NULL , "MODEL_TRAIN" , _TL("Training Options"), + _TL("") + ); + + CSG_Parameter *pShape = Parameters.Add_Shapes( + pNode , "ROI" , _TL("Training Areas"), + _TL(""), + PARAMETER_INPUT, SHAPE_TYPE_Polygon + ); + + Parameters.Add_Table_Field( + pShape , "ROI_ID" , _TL("Class Identifier"), + _TL("") + ); + + Parameters.Add_FilePath( + pNode , "MODEL_SAVE" , _TL("Store Model to File"), + _TL(""), + NULL, NULL, true + ); + + Parameters.Add_Choice( + pNode , "SVM_TYPE" , _TL("SVM Type"), + _TL(""), + CSG_String::Format(SG_T("%s|%s|%s|%s|%s|"), + _TL("C-SVC"), + _TL("nu-SVC"), + _TL("one-class SVM"), + _TL("epsilon-SVR"), + _TL("nu-SVR") + ), 0 + ); + + Parameters.Add_Choice( + pNode , "KERNEL_TYPE" , _TL("Kernel Type"), + _TL("linear: u'*v\npolynomial: (gamma*u'*v + coef0)^degree\nradial basis function: exp(-gamma*|u-v|^2)\nsigmoid: tanh(gamma*u'*v + coef0)"), + CSG_String::Format(SG_T("%s|%s|%s|%s|"), + _TL("linear"), + _TL("polynomial"), + _TL("radial basis function"), + _TL("sigmoid") + ), 2 + ); + + Parameters.Add_Value( + pNode , "DEGREE" , _TL("Degree"), + _TL("degree in kernel function"), + PARAMETER_TYPE_Int, 3 + ); + + Parameters.Add_Value( + pNode , "GAMMA" , _TL("Gamma"), + _TL("gamma in kernel function"), + PARAMETER_TYPE_Double , 0 + ); + + Parameters.Add_Value( + pNode , "COEF0" , _TL("coef0"), + _TL("coef0 in kernel function"), + PARAMETER_TYPE_Double , 0 + ); + + Parameters.Add_Value( + pNode , "COST" , _TL("C"), + _TL("parameter C (cost) of C-SVC, epsilon-SVR, and nu-SVR"), + PARAMETER_TYPE_Double , 1 + ); + + Parameters.Add_Value( + pNode , "NU" , _TL("nu-SVR"), + _TL("parameter nu of nu-SVC, one-class SVM, and nu-SVR"), + PARAMETER_TYPE_Double , 0.5 + ); + + Parameters.Add_Value( + pNode , "EPS_SVR" , _TL("SVR Epsilon"), + _TL("epsilon in loss function of epsilon-SVR"), + PARAMETER_TYPE_Double , 0.1 + ); + + Parameters.Add_Value( + pNode , "CACHE_SIZE" , _TL("Cache Size"), + _TL("cache memory size in MB"), + PARAMETER_TYPE_Double , 100 + ); + + Parameters.Add_Value( + pNode , "EPS" , _TL("Epsilon"), + _TL("tolerance of termination criterion"), + PARAMETER_TYPE_Double , 1e-3 + ); + + Parameters.Add_Value( + pNode , "SHRINKING" , _TL("Shrinking"), + _TL("whether to use the shrinking heuristics"), + PARAMETER_TYPE_Bool , false + ); + + Parameters.Add_Value( + pNode , "PROBABILITY" , _TL("Probability Estimates"), + _TL("whether to train a SVC or SVR model for probability estimates"), + PARAMETER_TYPE_Bool , false + ); + +// Parameters.Add_Value(pNode , "nr_weight" , _TL("Type"), _TL(""), PARAMETER_TYPE_Int , 0); +// Parameters.Add_Value(pNode , "weight_label" , _TL("Type"), _TL(""), PARAMETER_TYPE_Int , NULL); +// Parameters.Add_Value(pNode , "weight" , _TL("Type"), _TL(""), PARAMETER_TYPE_Int , NULL); + + Parameters.Add_Value( + pNode , "CROSSVAL" , _TL("Cross Validation"), + _TL("n-fold cross validation: n must > 1"), + PARAMETER_TYPE_Int , 1, 1, true + ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +int CSVM_Grids::On_Parameters_Enable(CSG_Parameters *pParameters, CSG_Parameter *pParameter) +{ + if( !SG_STR_CMP(pParameter->Get_Identifier(), SG_T("MODEL_SRC")) ) + { + pParameters->Get_Parameter("MODEL_TRAIN")->Set_Enabled(pParameter->asInt() == 0); + pParameters->Get_Parameter("MODEL_LOAD" )->Set_Enabled(pParameter->asInt() == 1); + } + + return( 1 ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +inline double CSVM_Grids::Get_Value(int x, int y, int iGrid) +{ + CSG_Grid *pGrid = m_pGrids->asGrid(iGrid); + + switch( m_Scaling ) + { + default: return( (pGrid->asDouble(x, y)) ); + case 1: return( (pGrid->asDouble(x, y) - pGrid->Get_ZMin()) / pGrid->Get_ZRange() ); + case 2: return( (pGrid->asDouble(x, y) - pGrid->Get_Mean()) / pGrid->Get_StdDev() ); + } +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CSVM_Grids::On_Execute(void) +{ + //----------------------------------------------------- + m_pModel = NULL; + + m_pClasses = Parameters("CLASSES")->asGrid(); + m_pClasses ->Set_NoData_Value(-1); + m_pClasses ->Assign(0.0); + + m_Scaling = Parameters("SCALING")->asInt(); + + m_pGrids = Parameters("GRIDS" )->asGridList(); + + for(int i=m_pGrids->Get_Count()-1; i>=0; i--) + { + if( m_pGrids->asGrid(i)->Get_ZRange() <= 0.0 ) + { + Message_Add(CSG_String::Format(SG_T("%s: %s"), _TL("grid has been dropped"), m_pGrids->asGrid(i)->Get_Name())); + + m_pGrids->Del_Item(i); + } + } + + if( m_pGrids->Get_Count() <= 0 ) + { + Error_Set(_TL("no valid grid in list.")); + + return( false ); + } + + //----------------------------------------------------- + svm_set_print_string_function(Parameters("MESSAGE")->asBool() ? SVM_Printf : NULL); + + //------------------------------------------------- + m_Problem.y = NULL; + m_Problem.x = NULL; + m_Nodes = NULL; + + switch( Parameters("MODEL_SRC")->asInt() ) + { + case 0: // create from training areas + if( !Training() ) + { + return( false ); + } + break; + + case 1: // restore from file + if( !Load() ) + { + return( false ); + } + break; + } + + //----------------------------------------------------- + Predict(); + + svm_free_and_destroy_model(&m_pModel); + + SG_FREE_SAFE(m_Problem.y); + SG_FREE_SAFE(m_Problem.x); + SG_FREE_SAFE(m_Nodes); + + Finalize(); + + //----------------------------------------------------- + return( true ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CSVM_Grids::Predict(void) +{ + Process_Set_Text(_TL("prediction")); + + struct svm_node *Features = (struct svm_node *)SG_Malloc((m_pGrids->Get_Count() + 1) * sizeof(struct svm_node)); + + Features[m_pGrids->Get_Count()].index = -1; + + //----------------------------------------------------- + for(int y=0; yis_NoData(x, y) ) + { + for(int iGrid=0; iGridGet_Count(); iGrid++) + { + Features[iGrid].index = iGrid + 1; + Features[iGrid].value = Get_Value(x, y, iGrid); + } + + m_pClasses->Set_Value(x, y, svm_predict(m_pModel, Features)); + } + } + } + + //----------------------------------------------------- + SG_Free(Features); + + return( true ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CSVM_Grids::Load(void) +{ + Process_Set_Text(_TL("restore model from file")); + + CSG_String File = Parameters("MODEL_LOAD")->asString(); + + if( (m_pModel = svm_load_model(File)) == NULL ) + { + Error_Set(CSG_String::Format(SG_T("%s [%s]"), _TL("could not open model file"), File.c_str())); + + return( false ); + } + + //----------------------------------------------------- + for(int y=0; yGet_Count() && !bNoData; iGrid++) + { + if( m_pGrids->asGrid(iGrid)->is_NoData(x, y) ) + { + bNoData = true; + + m_pClasses->Set_NoData(x, y); + } + } + } + } + + //----------------------------------------------------- + return( true ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CSVM_Grids::Training(void) +{ + CSG_Table Elements; + + struct svm_parameter param; + + //----------------------------------------------------- + Process_Set_Text(_TL("create model from training areas")); + + if( !Training_Get_Elements(Elements) ) + { + return( false ); + } + + if( !Training_Get_Parameters(param) ) + { + return( false ); + } + + //----------------------------------------------------- + m_Problem.l = Elements.Get_Count(); + m_Problem.y = (double *)SG_Malloc(m_Problem.l * sizeof(double)); + m_Problem.x = (struct svm_node **)SG_Malloc(m_Problem.l * sizeof(struct svm_node *)); + m_Nodes = (struct svm_node *)SG_Malloc(m_Problem.l * sizeof(struct svm_node ) * (1 + m_pGrids->Get_Count())); + + //----------------------------------------------------- + CSG_String ID_ROI; + + m_Classes.Destroy(); + m_Classes.Add_Field(SG_T("NAME"), SG_DATATYPE_String); + + Elements.Set_Index(0, TABLE_INDEX_Ascending); + + for(int i=0, j=0, ID_Class=0; iasString(0)) ) + { + ID_ROI = pElement->asString(0); + ID_Class ++; + + m_Classes.Add_Record()->Set_Value(0, pElement->asString(0)); + } + + m_Problem.x[i] = &m_Nodes[j]; + m_Problem.y[i] = ID_Class; + + for(int iGrid=0; iGridGet_Count(); iGrid++, j++) + { + m_Nodes[j].index = 1 + iGrid; + m_Nodes[j].value = pElement->asDouble(1 + iGrid); + } + + m_Nodes[j].index = -1; + } + + /*/----------------------------------------------------- + if( param.kernel_type == PRECOMPUTED ) + { + for(i=0; i max_index) + { + Error_Set("Wrong input format: sample_serial_number out of range"); + + return( false ); + } + } + }/**/ + + //----------------------------------------------------- + const char *error_msg = svm_check_parameter(&m_Problem, ¶m); + + if( error_msg ) + { + Error_Set(_TL("training failed")); + Error_Set(error_msg); + } + else if( (m_pModel = svm_train(&m_Problem, ¶m)) != NULL ) + { + //------------------------------------------------- + CSG_String File = Parameters("MODEL_SAVE")->asString(); + + if( File.Length() > 0 && svm_save_model(File, m_pModel) ) + { + Error_Set(CSG_String::Format(SG_T("%s [%s]"), _TL("could not save model to file"), File.c_str())); + } + + //------------------------------------------------- + if( Parameters("CROSSVAL")->asInt() > 1 ) + { + CSG_String Summary; + + double *target = (double *)SG_Malloc(m_Problem.l * sizeof(double)); + + svm_cross_validation(&m_Problem, ¶m, Parameters("CROSSVAL")->asInt(), target); + + if( param.svm_type == EPSILON_SVR || param.svm_type == NU_SVR ) + { + double total_error = 0.0, sum_v = 0.0, sum_y = 0.0, sum_vv = 0.0, sum_yy = 0.0, sum_vy = 0.0; + + for(int i=0; iasInt (); + param.kernel_type = Parameters("KERNEL_TYPE")->asInt (); + param.degree = Parameters("DEGREE" )->asInt (); + param.gamma = Parameters("GAMMA" )->asDouble(); + param.coef0 = Parameters("COEF0" )->asDouble(); + param.nu = Parameters("NU" )->asDouble(); + param.cache_size = Parameters("CACHE_SIZE" )->asDouble(); + param.C = Parameters("COST" )->asDouble(); + param.eps = Parameters("EPS" )->asDouble(); + param.p = Parameters("EPS_SVR" )->asDouble(); + param.shrinking = Parameters("SHRINKING" )->asBool () ? 1 : 0; + param.probability = Parameters("PROBABILITY")->asBool () ? 1 : 0; + + param.nr_weight = 0; + param.weight_label = NULL; + param.weight = NULL; + + if( param.gamma == 0 && m_pGrids->Get_Count() > 0 ) + { + param.gamma = 1.0 / m_pGrids->Get_Count(); + } + + return( true ); +} + +//--------------------------------------------------------- +bool CSVM_Grids::Training_Get_Elements(CSG_Table &Elements) +{ + int iROI_ID, iGrid; + CSG_Shapes *pROIs; + + //----------------------------------------------------- + pROIs = Parameters("ROI" )->asShapes(); + iROI_ID = Parameters("ROI_ID")->asInt(); + + Elements.Destroy(); + Elements.Add_Field(SG_T("ID"), SG_DATATYPE_String); + + for(iGrid=0; iGridGet_Count(); iGrid++) + { + Elements.Add_Field(SG_Get_String(iGrid, 0), SG_DATATYPE_Double); + } + + //----------------------------------------------------- + for(int y=0; yGet_Count() && !bNoData; iGrid++) + { + if( m_pGrids->asGrid(iGrid)->is_NoData(x, y) ) + { + bNoData = true; + } + } + + if( bNoData ) + { + m_pClasses->Set_NoData(x, y); + } + else + { + double p_x = Get_XMin() + x * Get_Cellsize(); + + for(int iROI=0; iROIGet_Count(); iROI++) + { + CSG_Shape_Polygon *pROI = (CSG_Shape_Polygon *)pROIs->Get_Shape(iROI); + + if( pROI->Contains(p_x, p_y) ) + { + CSG_Table_Record *pElement = Elements.Add_Record(); + + pElement->Set_Value(0, pROI->asString(iROI_ID)); + + for(iGrid=0; iGridGet_Count(); iGrid++) + { + pElement->Set_Value(1 + iGrid, Get_Value(x, y, iGrid)); + } + } + } + } + } + } + + //----------------------------------------------------- + if( Elements.Get_Count() <= 0 ) + { + Error_Set(_TL("no training areas could be analysed.")); + + return( false ); + } + + return( true ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CSVM_Grids::Finalize(void) +{ + //----------------------------------------------------- + CSG_Parameters P; + + if( DataObject_Get_Parameters(m_pClasses, P) && P("COLORS_TYPE") && P("LUT") ) + { + CSG_Table *pTable = P("LUT")->asTable(); + + for(int iClass=0; iClassGet_Record(iClass); + + if( pRecord == NULL ) + { + pRecord = pTable->Add_Record(); + pRecord->Set_Value(0, SG_GET_RGB(rand() * 255.0 / RAND_MAX, rand() * 255.0 / RAND_MAX, rand() * 255.0 / RAND_MAX)); + } + + pRecord->Set_Value(1, m_Classes[iClass].asString(0)); + pRecord->Set_Value(2, m_Classes[iClass].asString(0)); + pRecord->Set_Value(3, iClass + 1); + pRecord->Set_Value(4, iClass + 1); + } + + while( pTable->Get_Record_Count() > m_Classes.Get_Count() ) + { + pTable->Del_Record(pTable->Get_Record_Count() - 1); + } + + P("COLORS_TYPE")->Set_Value(1); // Color Classification Type: Lookup Table + + DataObject_Set_Parameters(m_pClasses, P); + } + + //----------------------------------------------------- + m_pClasses->Set_Name(CSG_String::Format(SG_T("%s [%s]"), _TL("Classification"), _TL("SVM"))); + + //----------------------------------------------------- + return( true ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- diff -Nru saga-2.1.0+dfsg/src/modules/imagery/imagery_svm/svm_grids.h saga-2.1.4+dfsg/src/modules/imagery/imagery_svm/svm_grids.h --- saga-2.1.0+dfsg/src/modules/imagery/imagery_svm/svm_grids.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/imagery/imagery_svm/svm_grids.h 2014-11-13 08:32:18.000000000 +0000 @@ -0,0 +1,139 @@ +/********************************************************** + * Version $Id: svm_grids.h 1922 2014-01-09 10:28:46Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// svm // +// // +//-------------------------------------------------------// +// // +// svm_grids.h // +// // +// Copyright (C) 2012 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Hamburg // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#ifndef HEADER_INCLUDED__svm_grids_H +#define HEADER_INCLUDED__svm_grids_H + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "MLB_Interface.h" + +#include "svm.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +class CSVM_Grids : public CSG_Module_Grid +{ +public: + CSVM_Grids(void); + + virtual CSG_String Get_MenuPath (void) { return( _TL("A:Imagery|Classification") ); } + + +protected: + + virtual bool On_Execute (void); + + virtual int On_Parameters_Enable (CSG_Parameters *pParameters, CSG_Parameter *pParameter); + + +private: + + int m_Scaling; + + CSG_Table m_Classes; + + CSG_Parameter_Grid_List *m_pGrids; + + CSG_Grid *m_pClasses; + + struct svm_problem m_Problem; + + struct svm_node *m_Nodes; + + struct svm_model *m_pModel; + + + double Get_Value (int x, int y, int iGrid); + + bool Load (void); + + bool Training (void); + bool Training_Get_Parameters (struct svm_parameter ¶m); + bool Training_Get_Elements (CSG_Table &Elements); + + bool Predict (void); + + bool Finalize (void); + +}; + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#endif // #ifndef HEADER_INCLUDED__svm_grids_H diff -Nru saga-2.1.0+dfsg/src/modules/imagery/imagery_tools/evi.cpp saga-2.1.4+dfsg/src/modules/imagery/imagery_tools/evi.cpp --- saga-2.1.0+dfsg/src/modules/imagery/imagery_tools/evi.cpp 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/imagery/imagery_tools/evi.cpp 2014-11-13 08:32:18.000000000 +0000 @@ -0,0 +1,200 @@ +/********************************************************** + * Version $Id: evi.cpp 1938 2014-01-12 13:44:06Z reklov_w $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// imagery_tools // +// // +//-------------------------------------------------------// +// // +// evi.cpp // +// // +// Copyright (C) 2011 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Hamburg // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "evi.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +CEnhanced_VI::CEnhanced_VI(void) +{ + Set_Name (_TL("Enhanced Vegetation Index")); + + Set_Author (SG_T("O.Conrad (c) 2011")); + + Set_Description (_TW( + "Enhanced Vegetation Index (EVI).\n" + "\n" + "References:\n" + "A Huete, K Didan, T Miura, E.P Rodriguez, X Gao, L.G Ferreira, " + "Overview of the radiometric and biophysical performance of the MODIS vegetation indices, " + "Remote Sensing of Environment, Volume 83, Issues 1-2, November 2002, Pages 195-213, ISSN 0034-4257, 10.1016/S0034-4257(02)00096-2. " + "online\n" + )); + + Parameters.Add_Grid( + NULL, "BLUE" , _TL("Blue Reflectance"), + _TL(""), + PARAMETER_INPUT_OPTIONAL + ); + + Parameters.Add_Grid( + NULL, "RED" , _TL("Red Reflectance"), + _TL(""), + PARAMETER_INPUT + ); + + Parameters.Add_Grid( + NULL, "NIR" , _TL("Near Infrared Reflectance"), + _TL(""), + PARAMETER_INPUT + ); + + Parameters.Add_Grid( + NULL, "EVI" , _TL("Enhanced Vegetation Index"), + _TL(""), + PARAMETER_OUTPUT + ); + + Parameters.Add_Value( + NULL, "GAIN" , _TL("Gain"), + _TL(""), + PARAMETER_TYPE_Double, 2.5, 0.0, true + ); + + Parameters.Add_Value( + NULL, "L" , _TL("Canopy Background Adjustment"), + _TL(""), + PARAMETER_TYPE_Double, 1.0, 0.0, true + ); + + Parameters.Add_Value( + NULL, "CBLUE" , _TL("Aerosol Resistance Coefficient (Blue)"), + _TL(""), + PARAMETER_TYPE_Double, 7.5, 0.0, true + ); + + Parameters.Add_Value( + NULL, "CRED" , _TL("Aerosol Resistance Coefficient (Red)"), + _TL(""), + PARAMETER_TYPE_Double, 6.0, 0.0, true + ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CEnhanced_VI::On_Execute(void) +{ + CSG_Grid *pBlue = Parameters("BLUE" )->asGrid(); + CSG_Grid *pRed = Parameters("RED" )->asGrid(); + CSG_Grid *pNIR = Parameters("NIR" )->asGrid(); + + CSG_Grid *pEVI = Parameters("EVI" )->asGrid(); + + double Gain = Parameters("GAIN" )->asDouble(); + double L = Parameters("L" )->asDouble(); + double CBlue = Parameters("CBLUE")->asDouble(); + double CRed = Parameters("CRED" )->asDouble(); + + DataObject_Set_Colors(pEVI, 100, SG_COLORS_WHITE_GREEN, false); + + for(int y=0; yis_NoData(x, y)) || pRed->is_NoData(x, y) || pNIR->is_NoData(x, y) ) + { + d = 0.0; + } + else if( pBlue ) + { + d = L + pNIR->asDouble(x, y) + CRed * pRed->asDouble(x, y) + CBlue * pBlue->asDouble(x, y); + } + else + { + d = L + pNIR->asDouble(x, y) + CRed * pRed->asDouble(x, y); + } + + if( d ) + { + pEVI->Set_Value(x, y, Gain * (pNIR->asDouble(x, y) - pRed->asDouble(x, y)) / d); + } + else + { + pEVI->Set_NoData(x, y); + } + } + } + + return( true ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- diff -Nru saga-2.1.0+dfsg/src/modules/imagery/imagery_tools/evi.h saga-2.1.4+dfsg/src/modules/imagery/imagery_tools/evi.h --- saga-2.1.0+dfsg/src/modules/imagery/imagery_tools/evi.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/imagery/imagery_tools/evi.h 2014-11-13 08:32:18.000000000 +0000 @@ -0,0 +1,108 @@ +/********************************************************** + * Version $Id: evi.h 1938 2014-01-12 13:44:06Z reklov_w $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// imagery_tools // +// // +//-------------------------------------------------------// +// // +// evi.h // +// // +// Copyright (C) 2011 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Hamburg // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#ifndef HEADER_INCLUDED__evi_H +#define HEADER_INCLUDED__evi_H + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "MLB_Interface.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +class CEnhanced_VI : public CSG_Module_Grid +{ +public: + CEnhanced_VI(void); + + virtual CSG_String Get_MenuPath (void) { return( _TL("Vegetation Indices") ); } + + +protected: + + virtual bool On_Execute (void); + + +private: + +}; + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#endif // #ifndef HEADER_INCLUDED__evi_H diff -Nru saga-2.1.0+dfsg/src/modules/imagery/imagery_tools/Image_VI_Distance.cpp saga-2.1.4+dfsg/src/modules/imagery/imagery_tools/Image_VI_Distance.cpp --- saga-2.1.0+dfsg/src/modules/imagery/imagery_tools/Image_VI_Distance.cpp 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/imagery/imagery_tools/Image_VI_Distance.cpp 2014-11-13 08:32:18.000000000 +0000 @@ -0,0 +1,284 @@ +/********************************************************** + * Version $Id: Image_VI_Distance.cpp 2072 2014-03-31 08:50:43Z reklov_w $ + *********************************************************/ +/******************************************************************************* + Image_VI_Distance.cpp + Copyright (C) Victor Olaya + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, USA +*******************************************************************************/ + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "Image_VI_Distance.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +CImage_VI_Distance::CImage_VI_Distance(void) +{ + Set_Name (_TL("Vegetation Index (Distance Based)")); + + Set_Author (SG_T("V.Olaya (c) 2004, O.Conrad (c) 2011")); + + Set_Description (_TW( + "Distance based vegetation indices.\n" + // "\n
    " + // "
  • Transformed Soil Adjusted Vegetation Index (s. McCloy, 2006)\n" + // " TSAVI = (NIR - Gain * R - Offset) * Gain / (Gain * NIR + R - Gain * Offset)
    • \n" + // "
  • Transformed Soil Adjusted Vegetation Index (s. McCloy, 2006)\n" + // " ATSAVI = (NIR - Gain * R - Offset) / (Gain * NIR + R - gain * Offset + 0.8 * (1 + Gain^2))
    • \n" + // "
(NIR = near infrared, R = red, S = soil adjustment factor)\n" + "\n" + "References:\n" + "K.R. McCloy (2006): Resource Management Information Systems: Remote Sensing, GIS and Modelling. 2nd Edition, CRC Taylor & Francis, 575pp.\n" + "\n" + "N.G. Silleos, T.K. Alexandridis, I.Z. Gitas & K. Perakis (2006): " + "Vegetation Indices: Advances Made in Biomass Estimation and Vegetation Monitoring in the Last 30 Years, " + "Geocarto International, 21:4, 21-28, " + "online.\n" + )); + + Parameters.Add_Grid( + NULL, "RED" , _TL("Red Reflectance"), + _TL(""), + PARAMETER_INPUT + ); + + Parameters.Add_Grid( + NULL, "NIR" , _TL("Near Infrared Reflectance"), + _TL(""), + PARAMETER_INPUT + ); + + Parameters.Add_Grid( + NULL, "PVI0" , _TL("Perpendicular Vegetation Index (Richardson and Wiegand, 1977)"), + _TL(""), + PARAMETER_OUTPUT_OPTIONAL + ); + + Parameters.Add_Grid( + NULL, "PVI1" , _TL("Perpendicular Vegetation Index (Perry and Lautenschlager, 1984)"), + _TL(""), + PARAMETER_OUTPUT_OPTIONAL + ); + + Parameters.Add_Grid( + NULL, "PVI2" , _TL("Perpendicular Vegetation Index (Walther and Shabaani)"), + _TL(""), + PARAMETER_OUTPUT_OPTIONAL + ); + + Parameters.Add_Grid( + NULL, "PVI3" , _TL("Perpendicular Vegetation Index (Qi, et al., 1994)"), + _TL(""), + PARAMETER_OUTPUT_OPTIONAL + ); + + Parameters.Add_Grid( + NULL, "TSAVI" , _TL("Transformed Soil Adjusted Vegetation Index (Baret et al. 1989)"), + _TL(""), + PARAMETER_OUTPUT_OPTIONAL + ); + + Parameters.Add_Grid( + NULL, "ATSAVI" , _TL("Transformed Soil Adjusted Vegetation Index (Baret and Guyot, 1991)"), + _TL(""), + PARAMETER_OUTPUT_OPTIONAL + ); + + Parameters.Add_Value( + NULL, "INTERCEPT" , _TL("Intercept of Soil Line"), + _TL(""), + PARAMETER_TYPE_Double, 0 + ); + + Parameters.Add_Value( + NULL, "SLOPE" , _TL("Slope of Soil Line"), + _TL(""), + PARAMETER_TYPE_Double, 0.5 + ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CImage_VI_Distance::On_Execute(void) +{ + CSG_Grid *pRed = Parameters("RED" )->asGrid(); + CSG_Grid *pNIR = Parameters("NIR" )->asGrid(); + + CSG_Grid *pPVI0 = Parameters("PVI0" )->asGrid(); + CSG_Grid *pPVI1 = Parameters("PVI1" )->asGrid(); + CSG_Grid *pPVI2 = Parameters("PVI2" )->asGrid(); + CSG_Grid *pPVI3 = Parameters("PVI3" )->asGrid(); + CSG_Grid *pTSAVI = Parameters("TSAVI" )->asGrid(); + CSG_Grid *pATSAVI = Parameters("ATSAVI")->asGrid(); + + DataObject_Set_Colors(pPVI0 , 100, SG_COLORS_WHITE_GREEN, false); + DataObject_Set_Colors(pPVI1 , 100, SG_COLORS_WHITE_GREEN, false); + DataObject_Set_Colors(pPVI2 , 100, SG_COLORS_WHITE_GREEN, false); + DataObject_Set_Colors(pPVI3 , 100, SG_COLORS_WHITE_GREEN, false); + DataObject_Set_Colors(pTSAVI , 100, SG_COLORS_WHITE_GREEN, false); + DataObject_Set_Colors(pATSAVI, 100, SG_COLORS_WHITE_GREEN, false); + + m_Slope = Parameters("SLOPE" )->asDouble(); + m_Intercept = Parameters("INTERCEPT")->asDouble(); + + if( m_Slope <= 0.0 ) + { + Error_Set(_TL("slope value has to be greater than zero")); + + return( false ); + } + + for(int y=0; yis_NoData(x, y) || pNIR->is_NoData(x, y) ) + { + if( pPVI0 ) pPVI0 ->Set_NoData(x, y); + if( pPVI1 ) pPVI1 ->Set_NoData(x, y); + if( pPVI2 ) pPVI2 ->Set_NoData(x, y); + if( pPVI3 ) pPVI3 ->Set_NoData(x, y); + if( pTSAVI ) pTSAVI ->Set_NoData(x, y); + if( pATSAVI ) pATSAVI->Set_NoData(x, y); + } + else + { + double R, NIR, Value; + + R = pRed->asDouble(x, y); + NIR = pNIR->asDouble(x, y); + + if( pPVI0 ) { if( Get_PVI0 (R, NIR, Value) ) pPVI0 ->Set_Value(x, y, Value); else pPVI0 ->Set_NoData(x, y); } + if( pPVI1 ) { if( Get_PVI1 (R, NIR, Value) ) pPVI1 ->Set_Value(x, y, Value); else pPVI1 ->Set_NoData(x, y); } + if( pPVI2 ) { if( Get_PVI2 (R, NIR, Value) ) pPVI2 ->Set_Value(x, y, Value); else pPVI2 ->Set_NoData(x, y); } + if( pPVI3 ) { if( Get_PVI3 (R, NIR, Value) ) pPVI3 ->Set_Value(x, y, Value); else pPVI3 ->Set_NoData(x, y); } + if( pTSAVI ) { if( Get_TSAVI (R, NIR, Value) ) pTSAVI ->Set_Value(x, y, Value); else pTSAVI ->Set_NoData(x, y); } + if( pATSAVI ) { if( Get_ATSAVI(R, NIR, Value) ) pATSAVI->Set_Value(x, y, Value); else pATSAVI->Set_NoData(x, y); } + } + } + } + + return( true ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +inline bool CImage_VI_Distance::Get_PVI0(double R, double NIR, double &Value) // Richardson & Wiegand, 1977 +{ + double dB1 = 1.0 / m_Slope; + double dB0 = R - NIR / m_Slope; + + double Rgg5 = (dB1 * m_Intercept - dB0 * m_Slope) / (dB1 - m_Slope); + double Rgg7 = (m_Intercept - dB0) / (dB1 - m_Slope); + + Value = sqrt(pow(Rgg5 - R, 2.0) + pow(Rgg7 - NIR, 3.0)); + + return( true ); +} + +//--------------------------------------------------------- +inline bool CImage_VI_Distance::Get_PVI1(double R, double NIR, double &Value) // Perry & Rautenschlager, 1984 +{ + if( (Value = sqrt(1.0 + m_Slope * m_Slope)) != 0.0 ) + { + Value = ((m_Slope * NIR - R) + m_Intercept) / Value; + + return( true ); + } + + return( false ); +} + +//--------------------------------------------------------- +inline bool CImage_VI_Distance::Get_PVI2(double R, double NIR, double &Value) +{ + if( (Value = sqrt(1.0 + m_Intercept)) != 0.0 ) + { + Value = (NIR - m_Intercept) * (R + m_Slope) / Value; + + return( true ); + } + + return( false ); +} + +//--------------------------------------------------------- +inline bool CImage_VI_Distance::Get_PVI3(double R, double NIR, double &Value) // Qi et al., 1994 +{ + Value = (NIR * m_Intercept) - (R * m_Slope); + + return( true ); +} + +//--------------------------------------------------------- +inline bool CImage_VI_Distance::Get_TSAVI(double R, double NIR, double &Value) // Baret et al., 1989 +{ + if( (Value = R + m_Slope * NIR - m_Slope * m_Intercept) != 0.0 ) + { + Value = m_Slope * (NIR - m_Slope) * (R - m_Intercept) / Value; + + return( true ); + } + + return( false ); +} + +//--------------------------------------------------------- +inline bool CImage_VI_Distance::Get_ATSAVI(double R, double NIR, double &Value) // Baret & Guyot, 1991 +{ + if( (Value = R + m_Slope * NIR - m_Slope * m_Intercept + 0.08 * (1.0 + m_Slope*m_Slope)) != 0.0 ) + { + Value = m_Slope * (NIR - m_Slope * R - m_Intercept) / Value; + + return( true ); + } + + return( false ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- diff -Nru saga-2.1.0+dfsg/src/modules/imagery/imagery_tools/Image_VI_Distance.h saga-2.1.4+dfsg/src/modules/imagery/imagery_tools/Image_VI_Distance.h --- saga-2.1.0+dfsg/src/modules/imagery/imagery_tools/Image_VI_Distance.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/imagery/imagery_tools/Image_VI_Distance.h 2014-11-13 08:32:18.000000000 +0000 @@ -0,0 +1,87 @@ +/********************************************************** + * Version $Id: Image_VI_Distance.h 2072 2014-03-31 08:50:43Z reklov_w $ + *********************************************************/ +/******************************************************************************* + Image_VI_Distance.h + Copyright (C) Victor Olaya + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, USA +*******************************************************************************/ + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#ifndef HEADER_INCLUDED__Image_VI_Distance_H +#define HEADER_INCLUDED__Image_VI_Distance_H + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "MLB_Interface.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +class CImage_VI_Distance : public CSG_Module_Grid +{ +public: + CImage_VI_Distance(void); + + virtual CSG_String Get_MenuPath (void) { return( _TL("Vegetation Indices") ); } + + +protected: + + virtual bool On_Execute (void); + + +private: + + double m_Intercept, m_Slope; + + + bool Get_PVI0 (double R, double NIR, double &Value); + bool Get_PVI1 (double R, double NIR, double &Value); + bool Get_PVI2 (double R, double NIR, double &Value); + bool Get_PVI3 (double R, double NIR, double &Value); + bool Get_TSAVI (double R, double NIR, double &Value); + bool Get_ATSAVI (double R, double NIR, double &Value); + +}; + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#endif // #ifndef HEADER_INCLUDED__Image_VI_Distance_H diff -Nru saga-2.1.0+dfsg/src/modules/imagery/imagery_tools/Image_VI_Slope.cpp saga-2.1.4+dfsg/src/modules/imagery/imagery_tools/Image_VI_Slope.cpp --- saga-2.1.0+dfsg/src/modules/imagery/imagery_tools/Image_VI_Slope.cpp 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/imagery/imagery_tools/Image_VI_Slope.cpp 2014-11-13 08:32:18.000000000 +0000 @@ -0,0 +1,329 @@ +/********************************************************** + * Version $Id: Image_VI_Slope.cpp 2072 2014-03-31 08:50:43Z reklov_w $ + *********************************************************/ +/******************************************************************************* + Image_VI_Slope.cpp + Copyright (C) Victor Olaya + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, USA +*******************************************************************************/ + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "Image_VI_Slope.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +CImage_VI_Slope::CImage_VI_Slope(void) +{ + Set_Name (_TL("Vegetation Index (Slope Based)")); + + Set_Author (SG_T("V.Olaya (c) 2004, O.Conrad (c) 2011")); + + Set_Description (_TW( + "Slope based vegetation indices.\n" + "\n
    " + "
  • Ratio Vegetation Index (Richardson and Wiegand, 1977)\n" + " RVI = R / NIR
    • \n" + "
  • Normalized Ratio Vegetation Index (Baret and Guyot, 1991)\n" + " NRVI = (RVI - 1) / (RVI + 1)
    • \n" + "
  • Normalized Difference Vegetation Index (Rouse et al. 1974)\n" + " NDVI = (NIR - R) / (NIR + R)
    • \n" + "
  • Transformed Vegetation Index (Deering et al., 1975)\n" + " TVI = [(NIR - R) / (NIR + R)]^0.5 + 0.5
    • \n" + "
  • Corrected Transformed Ratio Vegetation Index (Perry and Lautenschlager, 1984)\n" + " CTVI = [(NDVI + 0.5) / abs(NDVI + 0.5)] * [abs(NDVI + 0.5)]^0.5
    • \n" + "
  • Thiam's Transformed Vegetation Index (Thiam, 1997)\n" + " RVI = [abs(NDVI) + 0.5]^0.5
    • \n" + "
  • Soil Adjusted Vegetation Index (Huete, 1988)\n" + " SAVI = [(NIR - R) / (NIR + R)] * (1 + S)
    • \n" + "
(NIR = near infrared, R = red, S = soil adjustment factor)\n" + "\n" + "References:\n" + "K.R. McCloy (2006): Resource Management Information Systems: Remote Sensing, GIS and Modelling. 2nd Edition, CRC Taylor & Francis, 575pp.\n" + "\n" + "N.G. Silleos, T.K. Alexandridis, I.Z. Gitas & K. Perakis (2006): " + "Vegetation Indices: Advances Made in Biomass Estimation and Vegetation Monitoring in the Last 30 Years, " + "Geocarto International, 21:4, 21-28, " + "online.\n" + )); + + Parameters.Add_Grid( + NULL, "RED" , _TL("Red Reflectance"), + _TL(""), + PARAMETER_INPUT + ); + + Parameters.Add_Grid( + NULL, "NIR" , _TL("Near Infrared Reflectance"), + _TL(""), + PARAMETER_INPUT + ); + + Parameters.Add_Grid( + NULL, "DVI" , _TL("Difference Vegetation Index"), + _TL(""), + PARAMETER_OUTPUT_OPTIONAL + ); + + Parameters.Add_Grid( + NULL, "NDVI" , _TL("Normalized Difference Vegetation Index"), + _TL(""), + PARAMETER_OUTPUT_OPTIONAL + ); + + Parameters.Add_Grid( + NULL, "RVI" , _TL("Ratio Vegetation Index"), + _TL(""), + PARAMETER_OUTPUT_OPTIONAL + ); + + Parameters.Add_Grid( + NULL, "NRVI" , _TL("Normalized Ratio Vegetation Index"), + _TL(""), + PARAMETER_OUTPUT_OPTIONAL + ); + + Parameters.Add_Grid( + NULL, "TVI" , _TL("Transformed Vegetation Index"), + _TL(""), + PARAMETER_OUTPUT_OPTIONAL + ); + + Parameters.Add_Grid( + NULL, "CTVI" , _TL("Corrected Transformed Vegetation Index"), + _TL(""), + PARAMETER_OUTPUT_OPTIONAL + ); + + Parameters.Add_Grid( + NULL, "TTVI" , _TL("Thiam's Transformed Vegetation Index"), + _TL(""), + PARAMETER_OUTPUT_OPTIONAL + ); + + Parameters.Add_Grid( + NULL, "SAVI" , _TL("Soil Adjusted Vegetation Index"), + _TL(""), + PARAMETER_OUTPUT_OPTIONAL + ); + + Parameters.Add_Value( + NULL, "SOIL" , _TL("Soil Adjustment Factor"), + _TW("Soil adjustment factor for SAVI calculation. " + "Suggested values are 1.0 in case of very low vegetation, " + "0.5 for intermediate 0.5, and 0.25 for high densities (Silleos et al. 2006)."), + PARAMETER_TYPE_Double, 0.5, 0.0, true, 1.0, true + ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CImage_VI_Slope::On_Execute(void) +{ + CSG_Grid *pRed = Parameters("RED" )->asGrid(); + CSG_Grid *pNIR = Parameters("NIR" )->asGrid(); + + CSG_Grid *pDVI = Parameters("DVI" )->asGrid(); + CSG_Grid *pNDVI = Parameters("NDVI" )->asGrid(); + CSG_Grid *pRVI = Parameters("RVI" )->asGrid(); + CSG_Grid *pNRVI = Parameters("NRVI" )->asGrid(); + CSG_Grid *pTVI = Parameters("TVI" )->asGrid(); + CSG_Grid *pCTVI = Parameters("CTVI" )->asGrid(); + CSG_Grid *pTTVI = Parameters("TTVI" )->asGrid(); + CSG_Grid *pSAVI = Parameters("SAVI" )->asGrid(); + + DataObject_Set_Colors(pDVI , 100, SG_COLORS_WHITE_GREEN, false); + DataObject_Set_Colors(pNDVI , 100, SG_COLORS_WHITE_GREEN, false); + DataObject_Set_Colors(pRVI , 100, SG_COLORS_WHITE_GREEN, false); + DataObject_Set_Colors(pNRVI , 100, SG_COLORS_WHITE_GREEN, false); + DataObject_Set_Colors(pTVI , 100, SG_COLORS_WHITE_GREEN, false); + DataObject_Set_Colors(pCTVI , 100, SG_COLORS_WHITE_GREEN, false); + DataObject_Set_Colors(pTTVI , 100, SG_COLORS_WHITE_GREEN, false); + DataObject_Set_Colors(pSAVI , 100, SG_COLORS_WHITE_GREEN, false); + + m_Soil = Parameters("SOIL")->asDouble(); + + for(int y=0; yis_NoData(x, y) || pNIR->is_NoData(x, y) ) + { + if( pDVI ) pDVI ->Set_NoData(x, y); + if( pNDVI ) pNDVI ->Set_NoData(x, y); + if( pRVI ) pRVI ->Set_NoData(x, y); + if( pNRVI ) pNRVI ->Set_NoData(x, y); + if( pTVI ) pTVI ->Set_NoData(x, y); + if( pTTVI ) pTTVI ->Set_NoData(x, y); + if( pCTVI ) pCTVI ->Set_NoData(x, y); + if( pSAVI ) pSAVI ->Set_NoData(x, y); + } + else + { + double R, NIR, Value; + + R = pRed->asDouble(x, y); + NIR = pNIR->asDouble(x, y); + + if( pDVI ) { if( Get_DVI (R, NIR, Value) ) pDVI ->Set_Value(x, y, Value); else pDVI ->Set_NoData(x, y); } + if( pNDVI ) { if( Get_NDVI (R, NIR, Value) ) pNDVI ->Set_Value(x, y, Value); else pNDVI ->Set_NoData(x, y); } + if( pRVI ) { if( Get_RVI (R, NIR, Value) ) pRVI ->Set_Value(x, y, Value); else pRVI ->Set_NoData(x, y); } + if( pNRVI ) { if( Get_NRVI (R, NIR, Value) ) pNRVI ->Set_Value(x, y, Value); else pNRVI ->Set_NoData(x, y); } + if( pTVI ) { if( Get_TVI (R, NIR, Value) ) pTVI ->Set_Value(x, y, Value); else pTVI ->Set_NoData(x, y); } + if( pCTVI ) { if( Get_CTVI (R, NIR, Value) ) pCTVI ->Set_Value(x, y, Value); else pCTVI ->Set_NoData(x, y); } + if( pTTVI ) { if( Get_TTVI (R, NIR, Value) ) pTTVI ->Set_Value(x, y, Value); else pTTVI ->Set_NoData(x, y); } + if( pSAVI ) { if( Get_SAVI (R, NIR, Value) ) pSAVI ->Set_Value(x, y, Value); else pSAVI ->Set_NoData(x, y); } + } + } + } + + return( true ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +inline bool CImage_VI_Slope::Get_DVI(double R, double NIR, double &Value) +{ + Value = NIR - R; + + return( true ); +} + +//--------------------------------------------------------- +inline bool CImage_VI_Slope::Get_NDVI(double R, double NIR, double &Value) +{ + if( R + NIR != 0.0 ) + { + Value = (NIR - R) / (NIR + R); + + return( true ); + } + + return( false ); +} + +//--------------------------------------------------------- +inline bool CImage_VI_Slope::Get_RVI(double R, double NIR, double &Value) +{ + if( R != 0.0 ) + { + Value = NIR / R; + + return( true ); + } + + return( false ); +} + +//--------------------------------------------------------- +inline bool CImage_VI_Slope::Get_NRVI(double R, double NIR, double &Value) +{ + if( Get_RVI(R, NIR, Value) && Value + 1.0 != 0.0 ) + { + Value = (Value - 1.0) / (Value + 1.0); + + return( true ); + } + + return( false ); +} + +//--------------------------------------------------------- +inline bool CImage_VI_Slope::Get_TVI(double R, double NIR, double &Value) +{ + if( Get_NDVI(R, NIR, Value) && Value > 0.0 ) + { + Value = sqrt(Value) + 0.5; + + return( true ); + } + + return( false ); +} + +//--------------------------------------------------------- +inline bool CImage_VI_Slope::Get_CTVI(double R, double NIR, double &Value) +{ + if( Get_NDVI(R, NIR, Value) ) + { + Value += 0.5; + + Value = Value > 0.0 ? sqrt(fabs(Value)) : -sqrt(fabs(Value)); + + return( true ); + } + + return( false ); +} + +//--------------------------------------------------------- +inline bool CImage_VI_Slope::Get_TTVI(double R, double NIR, double &Value) +{ + if( Get_NDVI(R, NIR, Value) ) + { + Value = sqrt(fabs(Value + 0.5)); + + return( true ); + } + + return( false ); +} + +//--------------------------------------------------------- +inline bool CImage_VI_Slope::Get_SAVI(double R, double NIR, double &Value) +{ + if( Get_NDVI(R, NIR, Value) ) + { + Value = Value * (1.0 + m_Soil); + + return( true ); + } + + return( false ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- diff -Nru saga-2.1.0+dfsg/src/modules/imagery/imagery_tools/Image_VI_Slope.h saga-2.1.4+dfsg/src/modules/imagery/imagery_tools/Image_VI_Slope.h --- saga-2.1.0+dfsg/src/modules/imagery/imagery_tools/Image_VI_Slope.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/imagery/imagery_tools/Image_VI_Slope.h 2014-11-13 08:32:18.000000000 +0000 @@ -0,0 +1,89 @@ +/********************************************************** + * Version $Id: Image_VI_Slope.h 2072 2014-03-31 08:50:43Z reklov_w $ + *********************************************************/ +/******************************************************************************* + Image_VI_Slope.h + Copyright (C) Victor Olaya + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, USA +*******************************************************************************/ + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#ifndef HEADER_INCLUDED__Image_VI_Slope_H +#define HEADER_INCLUDED__Image_VI_Slope_H + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "MLB_Interface.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +class CImage_VI_Slope : public CSG_Module_Grid +{ +public: + CImage_VI_Slope(void); + + virtual CSG_String Get_MenuPath (void) { return( _TL("Vegetation Indices") ); } + + +protected: + + virtual bool On_Execute (void); + + +private: + + double m_Soil, m_Offset, m_Gain; + + + bool Get_DVI (double R, double NIR, double &Value); + bool Get_NDVI (double R, double NIR, double &Value); + bool Get_RVI (double R, double NIR, double &Value); + bool Get_NRVI (double R, double NIR, double &Value); + bool Get_TVI (double R, double NIR, double &Value); + bool Get_CTVI (double R, double NIR, double &Value); + bool Get_TTVI (double R, double NIR, double &Value); + bool Get_SAVI (double R, double NIR, double &Value); + +}; + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#endif // #ifndef HEADER_INCLUDED__Image_VI_Slope_H diff -Nru saga-2.1.0+dfsg/src/modules/imagery/imagery_tools/landsat_acca.cpp saga-2.1.4+dfsg/src/modules/imagery/imagery_tools/landsat_acca.cpp --- saga-2.1.0+dfsg/src/modules/imagery/imagery_tools/landsat_acca.cpp 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/imagery/imagery_tools/landsat_acca.cpp 2014-11-13 08:32:18.000000000 +0000 @@ -0,0 +1,889 @@ +/********************************************************** + * Version $Id: landsat_acca.cpp 1938 2014-01-12 13:44:06Z reklov_w $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// imagery_tools // +// // +//-------------------------------------------------------// +// // +// landsat_acca.cpp // +// // +// Copyright (C) 2013 by // +// Benjamin Bechtel & Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Hamburg // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "landsat_acca.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#define NO_DEFINED 1 +#define IS_SHADOW 2 +#define IS_COLD_CLOUD 6 +#define IS_WARM_CLOUD 9 + +//--------------------------------------------------------- +#define LUT_SET_CLASS(id, name, color) { CSG_Table_Record *pR = pLUT->asTable()->Add_Record(); pR->Set_Value(0, color); pR->Set_Value(1, name); pR->Set_Value(3, id); pR->Set_Value(3, id); } + +//--------------------------------------------------------- +void acca_algorithm (CSG_Grid *pCloud, CSG_Grid *band[], int single_pass, int with_shadow, int cloud_signature); +void filter_holes (CSG_Grid *pGrid); + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +CLandsat_ACCA::CLandsat_ACCA(void) +{ + CSG_Parameter *pNode; + + //----------------------------------------------------- + Set_Name (_TL("Automated Cloud Cover Assessment")); + + Set_Author (_TL("B.Bechtel, O.Conrad (c) 2013")); + + Set_Description (_TW( + "Automated Cloud-Cover Assessment (ACCA) for Landsat TM/ETM+ imagery as proposed by Irish (2000). " + "This module incorporates E.J. Tizado's GRASS GIS implementation (i.landsat.acca).\n" + "\n" + "References:\n" + "- Irish, R.R. (2000): Landsat 7 Automatic Cloud Cover Assessment." + " In Shen, S.S., Descour, M.R. (Eds.): Algorithms for Multispectral, Hyperspectral, and Ultraspectral Imagery VI. " + " Proceedings of SPIE, 4049: 348-355. " + "online.\n" + "- Irish, R.R., Barker J.L., Goward S.N., Arvidson T. (2006): " + " Characterization of the Landsat-7 ETM+ Automated Cloud-Cover Assessment (ACCA) Algorithm." + " Photogrammetric Engineering and Remote Sensing vol. 72(10): 1179-1188. " + "online.\n" + )); + + //----------------------------------------------------- + Parameters.Add_Grid(NULL, "BAND2", _TL("Landsat Band 2"), _TL(""), PARAMETER_INPUT); + Parameters.Add_Grid(NULL, "BAND3", _TL("Landsat Band 3"), _TL(""), PARAMETER_INPUT); + Parameters.Add_Grid(NULL, "BAND4", _TL("Landsat Band 4"), _TL(""), PARAMETER_INPUT); + Parameters.Add_Grid(NULL, "BAND5", _TL("Landsat Band 5"), _TL(""), PARAMETER_INPUT); + Parameters.Add_Grid(NULL, "BAND6", _TL("Landsat Band 6"), _TL(""), PARAMETER_INPUT, false); + + Parameters.Add_Grid( + NULL , "CLOUD" , _TL("Cloud Cover"), + _TL(""), + PARAMETER_OUTPUT, true, SG_DATATYPE_Char + ); + + Parameters.Add_Value( + NULL , "FILTER" , _TL("Apply post-processing filter to remove small holes"), + _TL(""), + PARAMETER_TYPE_Bool, true + ); + + //----------------------------------------------------- + pNode = Parameters.Add_Node( + NULL , "NODE_THRS" , _TL("Thresholds"), + _TL("") + ); + + Parameters.Add_Value( + pNode , "B56C" , _TL("B56 Composite (step 6)"), + _TL(""), + PARAMETER_TYPE_Double, 225.0 + ); + + Parameters.Add_Value( + pNode , "B45R" , _TL("B45 Ratio: Desert detection (step 10)"), + _TL(""), + PARAMETER_TYPE_Double, 1.0 + ); + + //----------------------------------------------------- + pNode = Parameters.Add_Node( + NULL , "NODE_CLOUD" , _TL("Cloud Settings"), + _TL("") + ); + +// Parameters.Add_Value( +// pNode , "HIST_N" , _TL("Number of classes in the cloud temperature histogram"), +// _TL(""), +// PARAMETER_TYPE_Int, 100, 10, true +// ); + + Parameters.Add_Value( + pNode , "CSIG" , _TL("Always use cloud signature (step 14)"), + _TL(""), + PARAMETER_TYPE_Bool, true + ); + + Parameters.Add_Value( + pNode , "PASS2" , _TL("Bypass second-pass processing, and merge warm (not ambiguous) and cold clouds"), + _TL(""), + PARAMETER_TYPE_Bool, true + ); + + Parameters.Add_Value( + pNode , "SHADOW" , _TL("Include a category for cloud shadows"), + _TL(""), + PARAMETER_TYPE_Bool, true + ); +} + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CLandsat_ACCA::On_Execute(void) +{ + CSG_Grid *pCloud, *pBand[5]; + + //----------------------------------------------------- + // Get parameter settings... + + pBand[0] = Parameters("BAND2")->asGrid(); + pBand[1] = Parameters("BAND3")->asGrid(); + pBand[2] = Parameters("BAND4")->asGrid(); + pBand[3] = Parameters("BAND5")->asGrid(); + pBand[4] = Parameters("BAND6")->asGrid(); + + pCloud = Parameters("CLOUD")->asGrid(); + pCloud ->Set_NoData_Value(0); + + //----------------------------------------------------- +// int hist_n = Parameters("HIST_N")->asInt(); + + //----------------------------------------------------- + acca_algorithm(pCloud, pBand, + Parameters("PASS2" )->asBool(), + Parameters("SHADOW")->asBool(), + Parameters("CSIG" )->asBool() + ); + + if( Parameters("FILTER")->asBool() ) + { + filter_holes(pCloud); + } + + //----------------------------------------------------- + CSG_Parameter *pLUT = DataObject_Get_Parameter(pCloud, "LUT"); + + if( pLUT && pLUT->asTable() ) + { + pLUT->asTable()->Del_Records(); + + LUT_SET_CLASS(IS_SHADOW , _TL("Shadow" ), SG_COLOR_BLUE_DARK); + LUT_SET_CLASS(IS_COLD_CLOUD, _TL("Cold Cloud"), SG_COLOR_BLUE); + LUT_SET_CLASS(IS_WARM_CLOUD, _TL("Warm Cloud"), SG_COLOR_BLUE_LIGHT); + + DataObject_Set_Parameter(pCloud, pLUT); + + DataObject_Set_Parameter(pCloud, "COLORS_TYPE", 1); // Color Classification Type: Lookup Table + } + + //----------------------------------------------------- + return( true ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +/**************************************************************************** + * + * MODULE: i.landsat.acca + * + * AUTHOR(S): E. Jorge Tizado - ej.tizado@unileon.es + * + * PURPOSE: Landsat TM/ETM+ Automatic Cloud Cover Assessment + * Adopted for GRASS 7 by Martin Landa + * + * COPYRIGHT: (C) 2008, 2010 by the GRASS Development Team + * + * This program is free software under the GNU General Public + * License (>=v2). Read the file COPYING that comes with GRASS + * for details. + * + *****************************************************************************/ + +#define SCALE 200. +#define K_BASE 230. + +/* value and count */ +#define TOTAL 0 +#define WARM 1 +#define COLD 2 +#define SNOW 3 +#define SOIL 4 + +/* signa */ +#define COVER 1 +#define SUM_COLD 0 +#define SUM_WARM 1 +#define KMEAN 2 +#define KMAX 3 +#define KMIN 4 + +/* re-use value */ +#define KLOWER 0 +#define KUPPER 1 +#define MEAN 2 +#define SKEW 3 +#define DSTD 4 + + +/********************************************************** + * + * Automatic Cloud Cover Assessment (ACCA): Irish 2000 + * + **********************************************************/ + +/*-------------------------------------------------------- + CONSTANTS + Usar esta forma para que via extern puedan modificarse + como opciones desde el programa main. + ---------------------------------------------------------*/ + +double th_1 = 0.08; /* Band 3 Brightness Threshold */ +double th_1_b = 0.07; +double th_2[2] = { -0.25, 0.70 }; /* Normalized Snow Difference Index */ +double th_2_b = 0.8; +double th_3 = 300.; /* Band 6 Temperature Threshold */ +double th_4 = 225.; /* Band 5/6 Composite */ +double th_4_b = 0.08; +double th_5 = 2.35; /* Band 4/3 Ratio */ +double th_6 = 2.16248; /* Band 4/2 Ratio */ +double th_7 = 1.0; /* Band 4/5 Ratio */ ; +double th_8 = 210.; /* Band 5/6 Composite */ + +//--------------------------------------------------------- +const int hist_n = 100; /* interval of real data 100/hist_n */ + +//--------------------------------------------------------- +#define G_message(s) SG_UI_Msg_Add(s, false) + +void acca_first(CSG_Grid *pCloud, CSG_Grid *band[], int with_shadow, int count[], int cold[], int warm[], double stats[]); +void acca_second(CSG_Grid *pCloud, CSG_Grid *band, int review_warm, double upper, double lower); +int shadow_algorithm(double pixel[]); + +void hist_put(double t, int hist[]); +double quantile(double q, int hist[]); +double moment(int n, int hist[], int k); + + +#define BAND2 0 +#define BAND3 1 +#define BAND4 2 +#define BAND5 3 +#define BAND6 4 + +#define NO_CLOUD 0 +#define IS_CLOUD 1 +#define COLD_CLOUD 30 +#define WARM_CLOUD 50 + +//--------------------------------------------------------- +void acca_algorithm(CSG_Grid *pCloud, CSG_Grid *band[], int single_pass, int with_shadow, int cloud_signature) +{ + int i, count[5], hist_cold[hist_n], hist_warm[hist_n], review_warm; + double max, value[5], signa[5], idesert, shift; + + /* Reset variables ... */ + for (i = 0; i < 5; i++) { + count[i] = 0; + value[i] = 0.; + } + + for (i = 0; i < hist_n; i++) { + hist_cold[i] = hist_warm[i] = 0; + } + + /* FIRST FILTER ... */ + acca_first(pCloud, band, with_shadow, count, hist_cold, hist_warm, signa); + /* CATEGORIES: NO_DEFINED, WARM_CLOUD, COLD_CLOUD, NULL (= NO_CLOUD) */ + + value[WARM] = (double)count[WARM] / (double)count[TOTAL]; + value[COLD] = (double)count[COLD] / (double)count[TOTAL]; + value[SNOW] = (double)count[SNOW] / (double)count[TOTAL]; + value[SOIL] = (double)count[SOIL] / (double)count[TOTAL]; + + value[0] = (double)(count[WARM] + count[COLD]); + idesert = (value[0] == 0. ? 0. : value[0] / ((double)count[SOIL])); + + //----------------------------------------------------- + // BAND-6 CLOUD SIGNATURE DEVELOPMENT + if( idesert <= .5 || value[SNOW] > 0.01 ) + { // Only the cold clouds are used if snow or desert soil is present + review_warm = 1; + } + else + { // The cold and warm clouds are combined and treated as a single population + review_warm = 0; + + count[COLD] += count[WARM]; + value[COLD] += value[WARM]; + signa[SUM_COLD] += signa[SUM_WARM]; + + for(i=0; i .5 && signa[COVER] > 0.004 && signa[KMEAN] < 295.) ) + { + G_message(_TL("Histogram cloud signature:")); + + value[MEAN] = quantile(0.5, hist_cold) + K_BASE; + value[DSTD] = sqrt(moment(2, hist_cold, 1)); + value[SKEW] = moment(3, hist_cold, 3) / pow(value[DSTD], 3); + + /* G_message(_TL("* Mean temperature: %.2lf K"), value[MEAN]); + G_message(_TL("* Standard deviation: %.2lf"), value[DSTD]); + G_message(_TL("* Skewness: %.2lf"), value[SKEW]); + G_message(_TL("* Histogram classes: %d"), hist_n); + /**/ + shift = value[SKEW]; + if (shift > 1.) + shift = 1.; + else if (shift < 0.) + shift = 0.; + + max = quantile(0.9875, hist_cold) + K_BASE; + value[KUPPER] = quantile(0.975, hist_cold) + K_BASE; + value[KLOWER] = quantile(0.835, hist_cold) + K_BASE; + + /* G_message(_TL("* 98.75 percentile: %.2lf K"), max); + G_message(_TL("* 97.50 percentile: %.2lf K"), value[KUPPER]); + G_message(_TL("* 83.50 percentile: %.2lf K"), value[KLOWER]); + /**/ + /* step 17 & 18 */ + if (shift > 0.) + { + shift *= value[DSTD]; + + if ((value[KUPPER] + shift) > max) + { + if ((value[KLOWER] + shift) > max) + { + value[KLOWER] += (max - value[KUPPER]); + } + else + { + value[KLOWER] += shift; + } + + value[KUPPER] = max; + } + else + { + value[KLOWER] += shift; + value[KUPPER] += shift; + } + } + + /* G_message(_TL("Maximum temperature:")); + G_message(_TL("* Cold cloud: %.2lf K"), value[KUPPER]); + G_message(_TL("* Warm cloud: %.2lf K"), value[KLOWER]); + /**/ + } + else if( signa[KMEAN] < 295. ) + { // Retained warm and cold clouds + G_message(_TL("Result: Scene with clouds")); + review_warm = 0; + value[KUPPER] = 0.; + value[KLOWER] = 0.; + } + else + { // Retained cold clouds + G_message(_TL("Result: Scene cloud free")); + review_warm = 1; + value[KUPPER] = 0.; + value[KLOWER] = 0.; + } + + //----------------------------------------------------- + // SECOND FILTER ... + + // By-pass two processing but it retains warm and cold clouds + if( single_pass != 0 ) + { + review_warm = -1; + value[KUPPER] = 0.; + value[KLOWER] = 0.; + } + + // CATEGORIES: IS_WARM_CLOUD, IS_COLD_CLOUD, IS_SHADOW, NULL (= NO_CLOUD) + acca_second(pCloud, band[BAND6], review_warm, value[KUPPER], value[KLOWER]); + + //----------------------------------------------------- + return; +} + +//--------------------------------------------------------- +void acca_first(CSG_Grid *pCloud, CSG_Grid *band[], int with_shadow, int count[], int cold[], int warm[], double stats[]) +{ + double nsdi, rat56; + + /* Creation of output file */ + /* ----- ----- */ + SG_UI_Msg_Add_Execution(_TL("Processing first pass..."), true); + + stats[SUM_COLD] = 0.; + stats[SUM_WARM] = 0.; + stats[KMAX] = 0.; + stats[KMIN] = 10000.; + + for(int y=0; yGet_NY() && SG_UI_Process_Set_Progress(y, pCloud->Get_NY()); y++) + { + for(int x=0; xGet_NX(); x++) + { + char code = NO_DEFINED; + double pixel[5]; + + for(int i=BAND2; i<=BAND6; i++) // Null when null pixel in any band + { + if( pCloud->Get_System() == band[i]->Get_System() ) + { + if( band[i]->is_NoData(x, y) ) + { + code = NO_CLOUD; + break; + } + + pixel[i] = band[i]->asDouble(x, y); + } + else if( !band[i]->Get_Value(pCloud->Get_System().Get_Grid_to_World(x, y), pixel[i]) ) + { + code = NO_CLOUD; + break; + } + } + + /* Determina los pixeles de sombras */ + if( code == NO_DEFINED && with_shadow ) + { + code = shadow_algorithm(pixel); + } + + /* Analiza el valor de los pixeles no definidos */ + if (code == NO_DEFINED) + { + code = NO_CLOUD; + count[TOTAL]++; + nsdi = (pixel[BAND2] - pixel[BAND5]) / (pixel[BAND2] + pixel[BAND5]); + + /* ----------------------------------------------------- */ + /* step 1. Brightness Threshold: Eliminates dark images */ + if (pixel[BAND3] > th_1) + { + /* step 3. Normalized Snow Difference Index: Eliminates many types of snow */ + if (nsdi > th_2[0] && nsdi < th_2[1]) + { + /* step 5. Temperature Threshold: Eliminates warm image features */ + if (pixel[BAND6] < th_3) + { + rat56 = (1. - pixel[BAND5]) * pixel[BAND6]; + /* step 6. Band 5/6 Composite: Eliminates numerous categories including ice */ + if (rat56 < th_4) + { + /* step 8. Eliminates growing vegetation */ + if ((pixel[BAND4] / pixel[BAND3]) < th_5) + { + /* step 9. Eliminates senescing vegetation */ + if ((pixel[BAND4] / pixel[BAND2]) < th_6) + { + /* step 10. Eliminates rocks and desert */ + count[SOIL]++; + + if ((pixel[BAND4] / pixel[BAND5]) > th_7) + { + /* step 11. Distinguishes warm clouds from cold clouds */ + if (rat56 < th_8) + { + code = COLD_CLOUD; + count[COLD]++; + /* for statistic */ + stats[SUM_COLD] += (pixel[BAND6] / SCALE); + hist_put(pixel[BAND6] - K_BASE, cold); + } + else + { + code = WARM_CLOUD; + count[WARM]++; + /* for statistic */ + stats[SUM_WARM] += (pixel[BAND6] / SCALE); + hist_put(pixel[BAND6] - K_BASE, warm); + } + + if (pixel[BAND6] > stats[KMAX]) stats[KMAX] = pixel[BAND6]; + if (pixel[BAND6] < stats[KMIN]) stats[KMIN] = pixel[BAND6]; + } + else + { + code = NO_DEFINED; + } + } + else + { + code = NO_DEFINED; + count[SOIL]++; + } + } + else + { + code = NO_DEFINED; + } + } + else + { + /* step 7 */ + code = (pixel[BAND5] < th_4_b) ? NO_CLOUD : NO_DEFINED; + } + } + else + { + code = NO_CLOUD; + } + } + else + { + /* step 3 */ + code = NO_CLOUD; + + if (nsdi > th_2_b) + count[SNOW]++; + } + } + else + { + /* step 2 */ + code = (pixel[BAND3] < th_1_b) ? NO_CLOUD : NO_DEFINED; + } + } + + //--------------------------------------------- + if (code == NO_CLOUD) + { + pCloud->Set_Value(x, y, 1); + } + else + { + pCloud->Set_Value(x, y, code); + } + } + } + + return; +} + +//--------------------------------------------------------- +void acca_second(CSG_Grid *pCloud, CSG_Grid *pThermal, int review_warm, double upper, double lower) +{ + SG_UI_Process_Set_Text(upper == 0.0 + ? _TL("Removing ambiguous pixels...") + : _TL("Pass two processing...") + ); + + //----------------------------------------------------- + for(int y=0; yGet_NY() && SG_UI_Process_Set_Progress(y, pCloud->Get_NY()); y++) + { + double p_y = pCloud->Get_YMin() + y * pCloud->Get_Cellsize(); + + #pragma omp parallel for + for(int x=0; xGet_NX(); x++) + { + if( !pCloud->is_NoData(x, y) ) + { + int code = pCloud->asInt(x, y); + + if( code == NO_DEFINED || (code == WARM_CLOUD && review_warm == 1) ) // Resolve ambiguous pixels + { + double t, p_x = pCloud->Get_XMin() + x * pCloud->Get_Cellsize(); + + if( !pThermal->Get_Value(p_x, p_y, t) || t > upper ) + { + pCloud->Set_NoData(x, y); + } + else + { + pCloud->Set_Value(x, y, t < lower ? IS_WARM_CLOUD : IS_COLD_CLOUD); + } + } + else if( code == COLD_CLOUD || code == WARM_CLOUD ) // Join warm (not ambiguous) and cold clouds + { + pCloud->Set_Value(x, y, (code == WARM_CLOUD && review_warm == 0) ? IS_WARM_CLOUD : IS_COLD_CLOUD); + } + else + { + pCloud->Set_Value(x, y, IS_SHADOW); + } + } + } + } + + //----------------------------------------------------- + return; +} + + +/////////////////////////////////////////////////////////// +// // +// Cloud shadows // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +int shadow_algorithm(double pixel[]) +{ + // I think this filter is better but not in any paper + if( pixel[BAND3] < 0.07 && (1 - pixel[BAND4]) * pixel[BAND6] > 240. && pixel[BAND4] / pixel[BAND2] > 1. + && (pixel[BAND3] - pixel[BAND5]) / (pixel[BAND3] + pixel[BAND5]) < 0.10 ) +// if( pixel[BAND3] < 0.07 && (1 - pixel[BAND4]) * pixel[BAND6] > 240. && pixel[BAND4] / pixel[BAND2] > 1. ) + { + return IS_SHADOW; + } + + return NO_DEFINED; +} + + +/////////////////////////////////////////////////////////// +// // +// HISTOGRAM ANALYSIS // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +// Define un factor de escala = hist_n/100 con objeto +// de dividir el entero 1 por 100/hist_n partes y +// aumentar la precision. +// +// Afecta al almacenamiento en el histograma pero +// modifica el calculo de quantiles y momentos. +//--------------------------------------------------------- + +//--------------------------------------------------------- +void hist_put(double t, int hist[]) +{ + int i = (int)(t * ((double)hist_n / 100.)); // scale factor + + if( i < 1 ) + i = 1; + else if (i > hist_n) + i = hist_n; + + hist[i - 1]++; +} + +//--------------------------------------------------------- +/* histogram moment */ +double moment(int n, int hist[], int k) +{ + int i, total; + double value, mean; + + for(i=0, total=0, mean=0; i=0; i--) + { + qmin = qmax - (double)hist[i] / (double)total; + + if( q >= qmin ) + { + value = (q - qmin) / (qmax - qmin) + (i - 1); + break; + } + + qmax = qmin; + } + + /* remove scale factor */ + return (value / ((double)hist_n / 100.)); +} + + +/////////////////////////////////////////////////////////// +// // +// FILTER HOLES OF CLOUDS // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +// This a >=50% filter of 3x3 +// if >= 50% vecinos cloud then pixel set to cloud +//--------------------------------------------------------- +void filter_holes(CSG_Grid *pCloud) +{ + if( pCloud->Get_NY() < 3 || pCloud->Get_NX() < 3 ) + return; + + SG_UI_Process_Set_Text(_TL("Filling small holes in clouds...")); + + CSG_Grid Cloud(*pCloud); + + //----------------------------------------------------- + for(int y=0; yGet_NY() && SG_UI_Process_Set_Progress(y, pCloud->Get_NY()); y++) + { + #pragma omp parallel for + for(int x=0; xGet_NX(); x++) + { + int z = Cloud.asInt(x, y); + + if( z == 0 ) + { + int cold, warm, shadow, nulo; + + cold = warm = shadow = nulo = 0; + + for(int i=0; i<8; i++) + { + int ix = pCloud->Get_System().Get_xTo(i, x); + int iy = pCloud->Get_System().Get_yTo(i, y); + + switch( Cloud.is_InGrid(ix, iy) ? Cloud.asInt(ix, iy) : -1 ) + { + case IS_COLD_CLOUD: cold ++; break; + case IS_WARM_CLOUD: warm ++; break; + case IS_SHADOW: shadow++; break; + default: nulo ++; break; + } + } + + int lim = (cold + warm + shadow + nulo) / 2; + + // Entra pixel[0] = 0 + if( nulo < lim ) + { + if( shadow >= (cold + warm) ) + z = IS_SHADOW; + else + z = (warm > cold) ? IS_WARM_CLOUD : IS_COLD_CLOUD; + } + } + + if( z != 0 ) + { + pCloud->Set_Value(x, y, z); + } + else + { + pCloud->Set_NoData(x, y); + } + } + } + + //----------------------------------------------------- + return; +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- diff -Nru saga-2.1.0+dfsg/src/modules/imagery/imagery_tools/landsat_acca.h saga-2.1.4+dfsg/src/modules/imagery/imagery_tools/landsat_acca.h --- saga-2.1.0+dfsg/src/modules/imagery/imagery_tools/landsat_acca.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/imagery/imagery_tools/landsat_acca.h 2014-11-13 08:32:18.000000000 +0000 @@ -0,0 +1,110 @@ +/********************************************************** + * Version $Id: landsat_acca.h 1938 2014-01-12 13:44:06Z reklov_w $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// imagery_tools // +// // +//-------------------------------------------------------// +// // +// landsat_acca.h // +// // +// Copyright (C) 2012 by // +// Benjamin Bechtel & Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Hamburg // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#ifndef HEADER_INCLUDED__landsat_acca_H +#define HEADER_INCLUDED__landsat_acca_H + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "MLB_Interface.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +class CLandsat_ACCA : public CSG_Module_Grid +{ +public: + + CLandsat_ACCA(void); + + virtual CSG_String Get_MenuPath (void) { return( _TL("R:Landsat") ); } + + +protected: + + virtual bool On_Execute (void); + + +private: + + +}; + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#endif // #ifndef HEADER_INCLUDED__landsat_acca_H diff -Nru saga-2.1.0+dfsg/src/modules/imagery/imagery_tools/landsat_import.cpp saga-2.1.4+dfsg/src/modules/imagery/imagery_tools/landsat_import.cpp --- saga-2.1.0+dfsg/src/modules/imagery/imagery_tools/landsat_import.cpp 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/imagery/imagery_tools/landsat_import.cpp 2014-11-13 08:32:18.000000000 +0000 @@ -0,0 +1,385 @@ +/********************************************************** + * Version $Id: landsat_import.cpp 911 2011-02-14 16:38:15Z reklov_w $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// imagery_tools // +// // +//-------------------------------------------------------// +// // +// landsat_import.cpp // +// // +// Copyright (C) 2014 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Hamburg // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "landsat_import.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +CLandsat_Import::CLandsat_Import(void) +{ + //----------------------------------------------------- + Set_Name (_TL("Landsat Import with Options")); + + Set_Author ("O.Conrad (c) 2014"); + + Set_Description (_TW( + "This tool facilitates the import and display of Landsat scenes, " + "which have each band given as a single GeoTIFF file.\n" + "\n" + "The development of this tool has been requested and sponsored by " + "Rohan Fisher, Charles Darwin University, Australia. " + )); + + //----------------------------------------------------- + CSG_Parameter *pNode; + + Parameters.Add_FilePath( + NULL , "FILES" , _TL("Files"), + _TL(""), + CSG_String::Format(SG_T("%s|*.tif;*.tiff|%s|*.*"), + _TL("GeoTIFF (*.tif)"), + _TL("All Files") + ), NULL, false, false, true + ); + + Parameters.Add_Grid_List( + NULL , "BANDS" , _TL("Bands"), + _TL(""), + PARAMETER_OUTPUT, false + ); + + pNode = Parameters.Add_Choice( + NULL , "PROJECTION" , _TL("Coordinate System"), + _TL(""), + CSG_String::Format(SG_T("%s|%s|%s|"), + _TL("UTM North"), + _TL("UTM South"), + _TL("Geographic Coordinates") + ), 0 + ); + + Parameters.Add_Choice( + pNode , "INTERPOLATION" , _TL("Interpolation"), + _TL(""), + CSG_String::Format(SG_T("%s|%s|%s|"), + _TL("Nearest Neighbour"), + _TL("Bilinear Interpolation"), + _TL("Cubic Convolution") + ), 2 + ); + + pNode = Parameters.Add_Value( + NULL , "SHOW_RGB" , _TL("Show a Composite"), + _TL(""), + PARAMETER_TYPE_Bool, true + ); + + Parameters.Add_Choice(pNode, "SHOW_R", _TL("Red" ), _TL(""), _TL("no choice available")); + Parameters.Add_Choice(pNode, "SHOW_G", _TL("Green"), _TL(""), _TL("no choice available")); + Parameters.Add_Choice(pNode, "SHOW_B", _TL("Blue" ), _TL(""), _TL("no choice available")); +} + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +int CLandsat_Import::On_Parameters_Enable(CSG_Parameters *pParameters, CSG_Parameter *pParameter) +{ + if( !SG_STR_CMP(pParameter->Get_Identifier(), "FILES") ) + { + CSG_Strings Files; pParameter->asFilePath()->Get_FilePaths(Files); + + if( Files.Get_Count() < 3 ) + { + pParameters->Set_Enabled("SHOW_RGB", false); + } + else + { + pParameters->Set_Enabled("SHOW_RGB", true); + + CSG_String Choices; + + for(int i=0; iGet_Parameter("SHOW_R")->asChoice()->Get_Count() > 1 ? pParameters->Get_Parameter("SHOW_R")->asInt() : 2; + int iG = pParameters->Get_Parameter("SHOW_G")->asChoice()->Get_Count() > 1 ? pParameters->Get_Parameter("SHOW_G")->asInt() : 1; + int iB = pParameters->Get_Parameter("SHOW_B")->asChoice()->Get_Count() > 1 ? pParameters->Get_Parameter("SHOW_B")->asInt() : 0; + + pParameters->Get_Parameter("SHOW_R")->asChoice()->Set_Items(Choices); pParameters->Get_Parameter("SHOW_R")->Set_Value(iR); + pParameters->Get_Parameter("SHOW_G")->asChoice()->Set_Items(Choices); pParameters->Get_Parameter("SHOW_G")->Set_Value(iG); + pParameters->Get_Parameter("SHOW_B")->asChoice()->Set_Items(Choices); pParameters->Get_Parameter("SHOW_B")->Set_Value(iB); + } + } + + if( !SG_STR_CMP(pParameter->Get_Identifier(), "PROJECTION") ) + { + pParameters->Set_Enabled("INTERPOLATION", pParameter->asInt() == 2); + } + + if( !SG_STR_CMP(pParameter->Get_Identifier(), "SHOW_RGB") ) + { + pParameters->Set_Enabled("SHOW_R", pParameter->asBool()); + pParameters->Set_Enabled("SHOW_G", pParameter->asBool()); + pParameters->Set_Enabled("SHOW_B", pParameter->asBool()); + } + + return( 1 ); +} + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CLandsat_Import::On_Execute(void) +{ + CSG_Strings Files; + + if( !Parameters("FILES")->asFilePath()->Get_FilePaths(Files) || Files.Get_Count() <= 0 ) + { + return( false ); + } + + //----------------------------------------------------- + CSG_Parameter_Grid_List *pBands = Parameters("BANDS")->asGridList(); + + pBands->Del_Items(); + + for(int i=0; iAdd_Item(pBand); + + DataObject_Add(pBand); + DataObject_Set_Colors(pBand, 11, SG_COLORS_BLACK_WHITE); + } + } + + //----------------------------------------------------- + if( Parameters("SHOW_RGB")->is_Enabled() && Parameters("SHOW_RGB")->asBool() ) + { + CSG_Grid *pR = pBands->asGrid(Parameters("SHOW_R")->asInt()); + CSG_Grid *pG = pBands->asGrid(Parameters("SHOW_G")->asInt()); + CSG_Grid *pB = pBands->asGrid(Parameters("SHOW_B")->asInt()); + + if( pR && pG && pB ) + { + DataObject_Set_Parameter(pR, "COLORS_TYPE" , 5); // _TL("RGB Overlay") // CLASSIFY_OVERLAY + DataObject_Set_Parameter(pR, "OVERLAY_MODE", 0); // _TL("red=this, green=1, blue=2") + DataObject_Set_Parameter(pR, "OVERLAY_1" , pG); + DataObject_Set_Parameter(pR, "OVERLAY_2" , pB); + + DataObject_Update(pR, true); + } + } + + //----------------------------------------------------- + return( true ); +} + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +CSG_Grid * CLandsat_Import::Get_Band(const CSG_String &File) +{ + CSG_Data_Manager tmpMgr; + + if( !tmpMgr.Add(File) || !tmpMgr.Get_Grid_System(0) || !tmpMgr.Get_Grid_System(0)->Get(0) ) + { + Error_Set(CSG_String::Format(SG_T("%s: %s"), _TL("could not load file"), File.c_str())); + + return( NULL ); + } + + tmpMgr.Get_Grid_System(0)->Get(0)->Set_NoData_Value(0); // landsat 8 pretends to use a value of 65535 (2^16 - 1) + + CSG_Grid *pBand = NULL; + + //----------------------------------------------------- + if( !tmpMgr.Get_Grid_System(0)->Get(0)->Get_Projection().is_Okay() ) + { + // undefined coordinate system, nothing to do be done further... + } + + //----------------------------------------------------- + else if( Parameters("PROJECTION")->asInt() == 2 ) // Geographic Coordinates + { + pBand = Get_Projection((CSG_Grid *)tmpMgr.Get_Grid_System(0)->Get(0), "+proj=longlat +ellps=WGS84 +datum=WGS84"); + } + + //----------------------------------------------------- + else // UTM + { + CSG_Grid *pTmp = (CSG_Grid *)tmpMgr.Get_Grid_System(0)->Get(0); + + CSG_String Projection = pTmp->Get_Projection().Get_Proj4(); + + if( Projection.Find("+proj=utm") >= 0 + && ( (Projection.Find("+south") >= 0 && Parameters("PROJECTION")->asInt() == 0) + || (Projection.Find("+south") < 0 && Parameters("PROJECTION")->asInt() == 1)) + && (pBand = SG_Create_Grid(pTmp->Get_Type(), pTmp->Get_NX(), pTmp->Get_NY(), pTmp->Get_Cellsize(), + pTmp->Get_XMin(), pTmp->Get_YMin() + (Parameters("PROJECTION")->asInt() == 1 ? 10000000 : -10000000) + )) != NULL ) + { + if( Parameters("PROJECTION")->asInt() == 1 ) + Projection.Append (" +south"); + else + Projection.Replace(" +south", ""); + + pBand->Get_Projection().Create(Projection, SG_PROJ_FMT_Proj4); + + pBand->Set_Name (pTmp->Get_Name()); + pBand->Set_Description (pTmp->Get_Description()); + pBand->Set_NoData_Value_Range(pTmp->Get_NoData_Value(), pTmp->Get_NoData_hiValue()); + pBand->Set_Scaling (pTmp->Get_Scaling(), pTmp->Get_Offset()); + + #pragma omp parallel for + for(int y=0; yGet_NY(); y++) + { + for(int x=0; xGet_NX(); x++) + { + pBand->Set_Value(x, y, pTmp->asDouble(x, y)); + } + } + } + } + + //----------------------------------------------------- + if( !pBand ) + { + pBand = (CSG_Grid *)tmpMgr.Get_Grid_System(0)->Get(0); + + tmpMgr.Delete(tmpMgr.Get_Grid_System(0)->Get(0), true); // make permanent, detach from temporary data manager + } + + return( pBand ); +} + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +CSG_Grid * CLandsat_Import::Get_Projection(CSG_Grid *pGrid, const CSG_String &Proj4) +{ + if( pGrid->Get_Projection().is_Okay() == false ) + { + return( NULL ); + } + + CSG_Module *pModule = SG_Get_Module_Library_Manager().Get_Module(SG_T("pj_proj4"), 4); // Coordinate Transformation (Grid) + + if( pModule == NULL ) + { + return( NULL ); + } + + int Interpolation; + + switch( Parameters("INTERPOLATION")->asInt() ) + { + case 0: Interpolation = GRID_INTERPOLATION_NearestNeighbour; break; + case 1: Interpolation = GRID_INTERPOLATION_Bilinear ; break; + default: Interpolation = GRID_INTERPOLATION_BSpline ; break; + } + + Message_Add(CSG_String::Format(SG_T("\n%s (%s: %s)\n"), _TL("re-projection to geographic coordinates"), _TL("original"), pGrid->Get_Projection().Get_Name().c_str()), false); + + pModule->Settings_Push(NULL); + + if( pModule->Set_Parameter("CRS_PROJ4" , Proj4 ) + && pModule->Set_Parameter("INTERPOLATION", Interpolation) + && pModule->Set_Parameter("SOURCE" , pGrid ) + && pModule->Execute() ) + { + pGrid = pModule->Get_Parameters("TARGET")->Get_Parameter("GRID")->asGrid(); + + pModule->Settings_Pop(); + + return( pGrid ); + } + + pModule->Settings_Pop(); + + Message_Add(CSG_String::Format(SG_T("\n%s: %s\n"), _TL("re-projection"), _TL("failed")), false); + + return( NULL ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- diff -Nru saga-2.1.0+dfsg/src/modules/imagery/imagery_tools/landsat_import.h saga-2.1.4+dfsg/src/modules/imagery/imagery_tools/landsat_import.h --- saga-2.1.0+dfsg/src/modules/imagery/imagery_tools/landsat_import.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/imagery/imagery_tools/landsat_import.h 2014-11-13 08:32:18.000000000 +0000 @@ -0,0 +1,115 @@ +/********************************************************** + * Version $Id: landsat_import.h 911 2011-02-14 16:38:15Z reklov_w $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// imagery_tools // +// // +//-------------------------------------------------------// +// // +// landsat_import.h // +// // +// Copyright (C) 2014 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Hamburg // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#ifndef HEADER_INCLUDED__landsat_import_H +#define HEADER_INCLUDED__landsat_import_H + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "MLB_Interface.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +class CLandsat_Import : public CSG_Module +{ +public: ////// public members and functions: ////////////// + + CLandsat_Import(void); + + virtual CSG_String Get_MenuPath (void) { return( _TL("R:Landsat") ); } + + +protected: /// protected members and functions: /////////// + + virtual int On_Parameters_Enable (CSG_Parameters *pParameters, CSG_Parameter *pParameter); + + virtual bool On_Execute (void); + + +private: ///// private members and functions: ///////////// + + CSG_Grid * Get_Band (const CSG_String &File); + + CSG_Grid * Get_Projection (CSG_Grid *pGrid, const CSG_String &Proj4); + +}; + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#endif // #ifndef HEADER_INCLUDED__landsat_import_H diff -Nru saga-2.1.0+dfsg/src/modules/imagery/imagery_tools/landsat_toar_core.cpp saga-2.1.4+dfsg/src/modules/imagery/imagery_tools/landsat_toar_core.cpp --- saga-2.1.0+dfsg/src/modules/imagery/imagery_tools/landsat_toar_core.cpp 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/imagery/imagery_tools/landsat_toar_core.cpp 2014-11-13 08:32:18.000000000 +0000 @@ -0,0 +1,2329 @@ +#include +#include +#include +#include + +#include "landsat_toar_core.h" + +#include + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +double julian_int (int year, int month, int day); +double julian_char (const char date[]); +double earth_sun (const char date[]); + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +void G_debug (int i, const char *s) +{ + SG_UI_Msg_Add_Execution('\n', false); + SG_UI_Msg_Add_Execution(s , false); +} + +//--------------------------------------------------------- +void G_warning (const char *s) +{ + SG_UI_Msg_Add_Execution('\n', false); + SG_UI_Msg_Add_Execution(s , false, SG_UI_MSG_STYLE_FAILURE); +} + + +/////////////////////////////////////////////////////////// +// // +// landsat_met.c // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#define MAX_STR 127 +#define METADATA_SIZE 65535 /* MTL.txt file size 65535 bytes */ +#define TM5_MET_SIZE 28700 /* .met file size 28686 bytes */ + +inline void chrncpy(char *dest, const char src[], int n) +{ + if (src == NULL) + { + dest[0] = '\0'; + } + else + { + int i; + for (i = 0; i < n && src[i] != '\0' && src[i] != '\"'; i++) dest[i] = src[i]; + dest[i] = '\0'; + } +} + + +/**************************************************************************** + * PURPOSE: Read values of Landsat MSS/TM from header (.met) file + *****************************************************************************/ +void get_metdata(const char metdata[], const char *text, char value[]) +{ + const char *ptr = strstr(metdata, text); + + if (ptr == NULL) + { + value[0] = 0; + return; + } + + ptr = strstr(ptr, " VALUE "); + if (ptr == NULL) return; + + while (*ptr++ != '\"') ; + int i = 0; + while (*ptr != '\"' && i < MAX_STR) value[i++] = *ptr++; + value[i] = '\0'; + + return; +} + +bool lsat_metdata(const char metdata[], lsat_data *lsat) +{ + char value[MAX_STR]; + + /* --------------------------------------- */ + get_metdata(metdata, "PLATFORMSHORTNAME", value); + lsat->number = atoi(value + 8); + + get_metdata(metdata, "SENSORSHORTNAME", value); + chrncpy(lsat->sensor, value + 1, 4); + + get_metdata(metdata, "CALENDARDATE", value); + chrncpy(lsat->date, value, 10); + + get_metdata(metdata, "PRODUCTIONDATETIME", value); + chrncpy(lsat->creation, value, 10); + + get_metdata(metdata, "SolarElevation", value); + lsat->sun_elev = atof(value); + + /* Fill data with the sensor_XXX functions */ + switch( lsat->number ) + { + default: return( false ); + case 1: set_MSS1(lsat); break; + case 2: set_MSS2(lsat); break; + case 3: set_MSS3(lsat); break; + case 4: if( lsat->sensor[0] == 'M' ) set_MSS4(lsat); else set_TM4(lsat); break; + case 5: if( lsat->sensor[0] == 'M' ) set_MSS5(lsat); else set_TM5(lsat); break; + } + + // "RADIANCE & QUANTIZE from band setting of the metadata file" + for(int i=0; ibands; i++) + { + CSG_String key; + + key.Printf(SG_T("Band%dGainSetting"), lsat->band[i].code); + get_metdata(metdata, key, value); + if (value[0] == '\0') + { + G_warning(key); + continue; + } + lsat->band[i].gain = atof(value); + + key.Printf(SG_T("Band%dBiasSetting"), lsat->band[i].code); + get_metdata(metdata, key, value); + if (value[0] == '\0') + { + G_warning(key); + continue; + } + + lsat->band[i].bias = atof(value); + lsat->band[i].qcalmax = 255.; + lsat->band[i].qcalmin = 1.; + lsat->band[i].lmin = lsat->band[i].gain * lsat->band[i].qcalmin + lsat->band[i].bias; + lsat->band[i].lmax = lsat->band[i].gain * lsat->band[i].qcalmax + lsat->band[i].bias; + } + + /* --------------------------------------- */ + lsat->flag = METADATAFILE; + + return( *lsat->sensor ? true : false ); +} + + +/**************************************************************************** + * PURPOSE: Read values of Landsat from MTL metadata (MTL.txt) file + *****************************************************************************/ + +//--------------------------------------------------------- +bool Load_MetaData(const char *filename, CSG_MetaData &MetaData) +{ + CSG_String sLine, sKey, sVal; + CSG_File f; + + MetaData.Destroy(); + + if( !f.Open(filename, SG_FILE_R, false) ) + { + return( false ); + } + + while( !f.is_EOF() && f.Read_Line(sLine) ) + { + sKey = sLine.BeforeFirst('='); sKey.Trim(false); sKey.Trim(true); + + if( !sKey.is_Empty() && sKey.CmpNoCase("GROUP") && sKey.CmpNoCase("END_GROUP") ) + { + sVal = sLine.AfterFirst ('='); sVal.Trim(false); sVal.Trim(true); sVal.Replace("\"", ""); + + MetaData.Add_Child(sKey, sVal); + } + } + + return( true ); +} + +//--------------------------------------------------------- +bool Get_MetaData(const CSG_MetaData &MetaData, const CSG_String &key, CSG_String &value) +{ + CSG_MetaData *p = MetaData.Get_Child(key); + + if( p ) + { + value = p->Get_Content(); + + return( true ); + } + + value.Clear(); + + return( false ); +} + +//--------------------------------------------------------- +#define GET_METADATA(key) if( Get_MetaData(m, key, s) == false ) return( false ); +#define IF_GET_METADATA(key) if( Get_MetaData(m, key, s) == true ) + +//--------------------------------------------------------- +int lsat_old_mtl(const CSG_MetaData &m, lsat_data *lsat) +{ + CSG_String s; + + //------------------------------------------- + IF_GET_METADATA("SPACECRAFT_ID" ) lsat->number = CSG_String(s.Get_Char(7)).asInt(); else return( false ); + IF_GET_METADATA("SENSOR_ID" ) chrncpy(lsat->sensor , s, 4); else return( false ); + IF_GET_METADATA("ACQUISITION_DATE" ) chrncpy(lsat->date , s, 10); + IF_GET_METADATA("PRODUCT_CREATION_TIME" ) chrncpy(lsat->creation, s, 10); else + IF_GET_METADATA("ORTHO_PRODUCT_CREATION_TIME") chrncpy(lsat->creation, s, 10); + IF_GET_METADATA("SUN_ELEVATION" ) lsat->sun_elev = s.asDouble(); + + switch( lsat->number ) // Fill data with the sensor_XXX functions + { + default: return( false ); + case 1: set_MSS1(lsat); break; + case 2: set_MSS2(lsat); break; + case 3: set_MSS3(lsat); break; + case 4: if( lsat->sensor[0] == 'M' ) set_MSS4(lsat); else set_TM4(lsat); break; + case 5: if( lsat->sensor[0] == 'M' ) set_MSS5(lsat); else set_TM5(lsat); break; + case 8: set_OLI(lsat); break; + case 7: + { + char gain[9]; + + GET_METADATA("BAND1_GAIN" ); gain[0] = *s.b_str(); + GET_METADATA("BAND2_GAIN" ); gain[1] = *s.b_str(); + GET_METADATA("BAND3_GAIN" ); gain[2] = *s.b_str(); + GET_METADATA("BAND4_GAIN" ); gain[3] = *s.b_str(); + GET_METADATA("BAND5_GAIN" ); gain[4] = *s.b_str(); + GET_METADATA("BAND6_GAIN1"); gain[5] = *s.b_str(); + GET_METADATA("BAND6_GAIN2"); gain[6] = *s.b_str(); + GET_METADATA("BAND7_GAIN" ); gain[7] = *s.b_str(); + GET_METADATA("BAND8_GAIN" ); gain[8] = *s.b_str(); + + set_ETM(lsat, gain); + } + break; + } + + //----------------------------------------------------- + for(int i=0; ibands; i++) // Update the information from metadata file + { + CSG_String Code(CSG_String::Format(SG_T("%d"), lsat->band[i].code)); + + IF_GET_METADATA("LMAX_BAND" + Code) lsat->band[i].lmax = s.asDouble(); + IF_GET_METADATA("LMIN_BAND" + Code) lsat->band[i].lmin = s.asDouble(); + IF_GET_METADATA("QCALMAX_BAND" + Code) lsat->band[i].qcalmax = s.asDouble(); + IF_GET_METADATA("QCALMIN_BAND" + Code) lsat->band[i].qcalmin = s.asDouble(); + } + + //----------------------------------------------------- + lsat->flag = METADATAFILE; + + return( *lsat->sensor ? true : false ); +} + +//--------------------------------------------------------- +int lsat_new_mtl(const CSG_MetaData &m, lsat_data * lsat) +{ + CSG_String s; + + //----------------------------------------------------- + GET_METADATA("SPACECRAFT_ID"); lsat->number = CSG_String(s.Get_Char(8)).asInt(); + GET_METADATA("SENSOR_ID" ); chrncpy(lsat->sensor , s, 4); + GET_METADATA("DATE_ACQUIRED"); chrncpy(lsat->date , s, 10); + GET_METADATA("FILE_DATE" ); chrncpy(lsat->creation, s, 10); + GET_METADATA("SUN_ELEVATION"); lsat->sun_elev = s.asDouble(); + + switch( lsat->number ) // Fill data with the sensor_XXX functions + { + default: return( false ); + case 1: set_MSS1(lsat); break; + case 2: set_MSS2(lsat); break; + case 3: set_MSS3(lsat); break; + case 4: if( lsat->sensor[0] == 'M' ) set_MSS4(lsat); else set_TM4(lsat); break; + case 5: if( lsat->sensor[0] == 'M' ) set_MSS5(lsat); else set_TM5(lsat); break; + case 8: set_OLI(lsat); break; + case 7: + { + char gain[9]; + + GET_METADATA("GAIN_BAND_1" ); gain[0] = *s.b_str(); + GET_METADATA("GAIN_BAND_2" ); gain[1] = *s.b_str(); + GET_METADATA("GAIN_BAND_3" ); gain[2] = *s.b_str(); + GET_METADATA("GAIN_BAND_4" ); gain[3] = *s.b_str(); + GET_METADATA("GAIN_BAND_5" ); gain[4] = *s.b_str(); + GET_METADATA("GAIN_BAND_6_VCID_1"); gain[5] = *s.b_str(); + GET_METADATA("GAIN_BAND_6_VCID_2"); gain[6] = *s.b_str(); + GET_METADATA("GAIN_BAND_7" ); gain[7] = *s.b_str(); + GET_METADATA("GAIN_BAND_8" ); gain[8] = *s.b_str(); + + set_ETM(lsat, gain); + } + break; + } + + //----------------------------------------------------- + // Update the information from metadata file + + // Other possible values in the metadata file + IF_GET_METADATA("EARTH_SUN_DISTANCE") lsat->dist_es = s.asDouble(); // Necessary after + + //----------------------------------------------------- + // RADIANCE & QUANTIZE from MIN_MAX_(RADIANCE|PIXEL_VALUE) + if( m.Get_Child("RADIANCE_MAXIMUM_BAND_" + SG_Get_String(lsat->band[0].code)) != NULL ) + { + for(int i=0; ibands; i++) + { + CSG_String Code(lsat->number == 7 && lsat->band[i].thermal + ? CSG_String::Format(SG_T("_6_VCID_%d"), lsat->band[i].code - 60) + : CSG_String::Format(SG_T( "_%d"), lsat->band[i].code) + ); + + IF_GET_METADATA("RADIANCE_MAXIMUM_BAND" + Code) lsat->band[i].lmax = s.asDouble(); + IF_GET_METADATA("RADIANCE_MINIMUM_BAND" + Code) lsat->band[i].lmin = s.asDouble(); + IF_GET_METADATA("QUANTIZE_CAL_MAX_BAND" + Code) lsat->band[i].qcalmax = s.asDouble(); + IF_GET_METADATA("QUANTIZE_CAL_MIN_BAND" + Code) lsat->band[i].qcalmin = s.asDouble(); + + // other possible values of each band + if( lsat->band[i].thermal ) + { + Code.Printf(SG_T("%d"), lsat->band[i].code); // ??!! see grass implementation!! + + IF_GET_METADATA("K1_CONSTANT_BAND" + Code) lsat->band[i].K1 = s.asDouble(); + IF_GET_METADATA("K2_CONSTANT_BAND" + Code) lsat->band[i].K2 = s.asDouble(); + } + else if( lsat->number == 8 ) // ESUN from REFLECTANCE and RADIANCE ADD_BAND + { + IF_GET_METADATA("REFLECTANCE_MAXIMUM_BAND" + Code) + lsat->band[i].esun = (M_PI * lsat->dist_es * lsat->dist_es * lsat->band[i].lmax) / s.asDouble(); + } + } + + if( lsat->number == 8 ) + { + G_warning("ESUN evaluated from REFLECTANCE_MAXIMUM_BAND"); + } + } + + //----------------------------------------------------- + // RADIANCE & QUANTIZE from RADIOMETRIC_RESCALING + else + { + for(int i=0; ibands; i++) + { + CSG_String Code(lsat->number == 7 && lsat->band[i].thermal + ? CSG_String::Format(SG_T("_6_VCID_%d"), lsat->band[i].code - 60) + : CSG_String::Format(SG_T( "_%d"), lsat->band[i].code) + ); + + IF_GET_METADATA("RADIANCE_MULT_BAND" + Code) lsat->band[i].gain = s.asDouble(); + IF_GET_METADATA("RADIANCE_ADD_BAND" + Code) lsat->band[i].bias = s.asDouble(); + + // reversing to calculate the values of Lmin and Lmax ... + lsat->band[i].lmin = lsat->band[i].gain * lsat->band[i].qcalmin + lsat->band[i].bias; + lsat->band[i].lmax = lsat->band[i].gain * lsat->band[i].qcalmax + lsat->band[i].bias; + + // ... qcalmax and qcalmin loaded in previous sensor_function + if( lsat->number == 8 ) + { + if( lsat->band[i].thermal ) + { + IF_GET_METADATA("K1_CONSTANT_BAND" + Code) lsat->band[i].K1 = s.asDouble(); + IF_GET_METADATA("K2_CONSTANT_BAND" + Code) lsat->band[i].K2 = s.asDouble(); + } + else // ESUN from REFLECTANCE_ADD_BAND + { + IF_GET_METADATA("REFLECTANCE_MULT_BAND" + Code) lsat->band[i].K1 = s.asDouble(); + IF_GET_METADATA("REFLECTANCE_ADD_BAND" + Code) lsat->band[i].K2 = s.asDouble(); + + lsat->band[i].esun = (M_PI * lsat->dist_es * lsat->dist_es * lsat->band[i].bias) / lsat->band[i].K2; + + // double esun1 = (M_PI * lsat->dist_es * lsat->dist_es * lsat->band[i].bias) / lsat->band[i].K2; + // double esun2 = (M_PI * lsat->dist_es * lsat->dist_es * lsat->band[i].gain) / lsat->band[i].K1; + // lsat->band[i].esun = (esun1 + esun2) / 2.; + } + } + } + + G_warning("ESUN evaluated from REFLECTANCE_ADDITIVE_FACTOR_BAND"); + } + + //----------------------------------------------------- + lsat->flag = METADATAFILE; + + return( *lsat->sensor ? true : false ); +} + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool lsat_metadata(const char *metafile, lsat_data *lsat) +{ + memset(lsat, 0, sizeof(lsat_data)); + + //----------------------------------------------------- + FILE *f = fopen(metafile, "r"); + + if( f == NULL ) + { + G_warning("Metadata file not found"); + + return( false ); + } + + //----------------------------------------------------- + char mtldata[METADATA_SIZE]; + int i = fread(mtldata, METADATA_SIZE, 1, f); + fclose(f); + + //----------------------------------------------------- + if( strstr(mtldata, " VALUE ") != NULL ) // get_metformat + { + return( lsat_metdata(mtldata, lsat) ); + } + + //----------------------------------------------------- + CSG_MetaData m; + + if( !Load_MetaData(metafile, m) ) + { + return( false ); + } + + if( m.Get_Child("QCALMAX_BAND1") != NULL ) // ver_mtl = (strstr(mtldata, "QCALMAX_BAND") != NULL) ? 0 : 1; + { + return( lsat_old_mtl(m, lsat) ); // old format + } + + return( lsat_new_mtl(m, lsat) ); // new format +} + + +/////////////////////////////////////////////////////////// +// // +// landsat_set.c // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +void sensor_MSS(lsat_data * lsat) +{ + /* green, red, near infrared, near infrared */ + int band[4] = { 1, 2, 3, 4 }; + int code[4] = { 4, 5, 6, 7 }; + double wmax[4] = { 0.6, 0.7, 0.8, 1.1 }; + double wmin[4] = { 0.5, 0.6, 0.7, 0.8 }; + /* 68x83, 68x83, 68x83, 68x83 */ + + strcpy(lsat->sensor, "MSS"); + + lsat->bands = 4; + + for(int i=0; ibands; i++) + { + lsat->band[i].number = band[i]; + lsat->band[i].code = code[i]; + lsat->band[i].wavemax = wmax[i]; + lsat->band[i].wavemin = wmin[i]; + lsat->band[i].qcalmax = 255.; + lsat->band[i].qcalmin = 0.; + lsat->band[i].thermal = 0; + } + + return; +} + +void sensor_TM(lsat_data * lsat) +{ + /* blue, green red, near infrared, shortwave IR, thermal IR, shortwave IR */ + int band[7] = { 1, 2, 3, 4, 5, 6, 7 }; + double wmax[7] = { 0.52, 0.60, 0.69, 0.90, 1.75, 12.5, 2.35 }; + double wmin[7] = { 0.45, 0.52, 0.63, 0.76, 1.55, 10.4, 2.08 }; + /* 30, 30, 30, 30, 30, 120, 30 */ + + if( !lsat->sensor ) + { + strcpy(lsat->sensor, "TM"); + } + + lsat->bands = 7; + + for(int i=0; ibands; i++) + { + lsat->band[i].number = band[i]; + lsat->band[i].code = band[i]; + lsat->band[i].wavemax = wmax[i]; + lsat->band[i].wavemin = wmin[i]; + lsat->band[i].qcalmax = 255.0; + lsat->band[i].qcalmin = 0.0; /* Modified in set_TM5 by date */ + lsat->band[i].thermal = band[i] == 6 ? 1 : 0; + } + + return; +} + +void sensor_ETM(lsat_data * lsat) +{ + /* blue, green, red, near infrared, shortwave IR, thermal IR, shortwave IR, panchromatic */ + int band[9] = { 1, 2, 3, 4, 5, 6, 6, 7, 8 }; + int code[9] = { 1, 2, 3, 4, 5, 61, 62, 7, 8 }; + double wmax[9] = { 0.515, 0.605, 0.690, 0.90, 1.75, 12.5, 12.5, 2.35, 0.90 }; + double wmin[9] = { 0.450, 0.525, 0.630, 0.75, 1.55, 10.4, 10.4, 2.09, 0.52 }; + /* 30, 30, 30, 30, 30, 60, 30, 15 */ + + strcpy(lsat->sensor, "ETM+"); + + lsat->bands = 9; + + for(int i=0; ibands; i++) + { + lsat->band[i].number = band[i]; + lsat->band[i].code = code[i]; + lsat->band[i].wavemax = wmax[i]; + lsat->band[i].wavemin = wmin[i]; + lsat->band[i].qcalmax = 255.0; + lsat->band[i].qcalmin = 1.0; + lsat->band[i].thermal = band[i] == 6 ? 1 : 0; + } + + return; +} + +void sensor_OLI(lsat_data * lsat) +{ + int i; + + /* coastal aerosol, blue, green, red, near infrared, shortwave IR (SWIR) 1, SWIR 2, panchromatic, + * cirrus, thermal infrared (TIR) 1, TIR 2 */ + int band[] = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 }; + int code[] = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 }; + double wmin[] = { 0.433, 0.450, 0.525, 0.630, 0.845, 1.560, 2.100, 0.500, 1.360, 10.3, 11.5 }; + double wmax[] = { 0.453, 0.515, 0.600, 0.680, 0.885, 1.660, 2.300, 0.680, 1.390, 11.3, 12.5 }; + /* 30, 30, 30, 30, 30, 30, 30, 15, 30, 100, 100 */ + + strcpy(lsat->sensor, "OLI/TIRS"); + + lsat->bands = 11; + for (i = 0; i < lsat->bands; i++) { + lsat->band[i].number = *(band + i); + lsat->band[i].code = *(code + i); + lsat->band[i].wavemax = *(wmax + i); + lsat->band[i].wavemin = *(wmin + i); + lsat->band[i].qcalmax = 65535.; + lsat->band[i].qcalmin = 1.; + lsat->band[i].thermal = (lsat->band[i].number > 9 ? 1 : 0); + } + return; +} + + +/** ********************************************** + ** Before access to these functions ... + ** store previously + ** >>> adquisition date, + ** >>> creation date, and + ** >>> sun_elev + ** **********************************************/ + +/**************************************************************************** + * PURPOSE: Store values of Landsat-1 MSS + * July 23, 1972 to January 6, 1978 + *****************************************************************************/ +void set_MSS1(lsat_data * lsat) +{ + int i, j; + + /** USGS Calibration Parameter Files 2012 */ + + /* Spectral radiances at detector */ + double lmax[] = { 248., 200., 176., 153. }; + double lmin[] = { 0., 0., 0., 0. }; + + /* Solar exoatmospheric spectral irradiances */ + double esun[] = { 1824., 1570., 1249., 853.4 }; + + lsat->number = 1; + sensor_MSS(lsat); + + lsat->dist_es = earth_sun(lsat->date); + + for (i = 0; i < lsat->bands; i++) { + j = lsat->band[i].number - 1; + lsat->band[i].esun = *(esun + j); + lsat->band[i].lmax = *(lmax + j); + lsat->band[i].lmin = *(lmin + j); + } + G_debug(1, "Landsat-1 MSS"); + return; +} + +/**************************************************************************** + * PURPOSE: Store values of Landsat-2 MSS + * January 22, 1975 to February 5, 1982 + *****************************************************************************/ +void set_MSS2(lsat_data * lsat) +{ + int i, j; + double julian, *lmax, *lmin; + + /** USGS Calibration Parameter Files 2012 */ + + /* Spectral radiances at detector */ + double Lmax[][4] = { + {210., 156., 140., 138.}, /* before July 16, 1975 */ + {263., 176., 152., 130.} /* on or after July 16, 1975 */ + }; + double Lmin[][4] = { + {10., 7., 7., 5.}, + {8., 6., 6., 4.} + }; + + /* Solar exoatmospheric spectral irradiances */ + double esun[] = { 1824., 1570., 1249., 853.4 }; + + julian = julian_char(lsat->creation); + if (julian < julian_char("1975-07-16")) + i = 0; + else + i = 1; + lmax = Lmax[i]; + lmin = Lmin[i]; + + lsat->number = 2; + sensor_MSS(lsat); + + lsat->dist_es = earth_sun(lsat->date); + + for (i = 0; i < lsat->bands; i++) { + j = lsat->band[i].number - 1; + lsat->band[i].esun = *(esun + j); + lsat->band[i].lmax = *(lmax + j); + lsat->band[i].lmin = *(lmin + j); + } + G_debug(1, "Landsat-2 MSS"); + return; +} + +/**************************************************************************** + * PURPOSE: Store values of Landsat-3 MSS + * March 5, 1978 to March 31, 1983 + * + * tiene una banda 8 thermal + *****************************************************************************/ +void set_MSS3(lsat_data * lsat) +{ + int i, j; + double julian, *lmax, *lmin; + + /** USGS Calibration Parameter Files 2012 */ + + /* Spectral radiances at detector */ + double Lmax[][4] = { + {220., 175., 145., 147.}, /* before June 1, 1978 */ + {259., 179., 149., 128.} /* on or after June 1, 1978 */ + }; + double Lmin[][4] = { + {4., 3., 3., 1.}, + {4., 3., 3., 1.} + }; + /* Solar exoatmospheric spectral irradiances */ + double esun[] = { 1824., 1570., 1249., 853.4 }; + + julian = julian_char(lsat->creation); + if (julian < julian_char("1978-06-01")) + i = 0; + else + i = 1; + lmax = Lmax[i]; + lmin = Lmin[i]; + + lsat->number = 3; + sensor_MSS(lsat); + + lsat->dist_es = earth_sun(lsat->date); + + for (i = 0; i < lsat->bands; i++) { + j = lsat->band[i].number - 1; + lsat->band[i].esun = *(esun + j); + lsat->band[i].lmax = *(lmax + j); + lsat->band[i].lmin = *(lmin + j); + } + G_debug(1, "Landsat-3 MSS"); + return; +} + +/**************************************************************************** + * PURPOSE: Store values of Landsat-4 MSS/TM + * July 16, 1982 to June 15, 2001 + *****************************************************************************/ +void set_MSS4(lsat_data * lsat) +{ + int i, j; + double julian, *lmax, *lmin; + + /** USGS Calibration Parameter Files 2012 */ + + /* Spectral radiances at detector */ + double Lmax[][4] = { + {250., 180., 150., 133.}, /* before August 26, 1982 */ + {230., 180., 130., 133.}, /* between */ + {238., 164., 142., 116.} /* on or after April 1, 1983 */ + }; + double Lmin[][4] = { + {2., 4., 4., 3.}, + {2., 4., 4., 3.}, + {4., 4., 5., 4.} + }; + + /* Solar exoatmospheric spectral irradiances */ + double esun[] = { 1824., 1570., 1249., 853.4 }; + + julian = julian_char(lsat->creation); + if (julian < julian_char("1982-08-26")) + i = 0; + else if (julian < julian_char("1983-03-31")) + i = 1; + else + i = 2; + lmax = Lmax[i]; + lmin = Lmin[i]; + + lsat->number = 4; + sensor_MSS(lsat); + + lsat->dist_es = earth_sun(lsat->date); + + for (i = 0; i < lsat->bands; i++) { + j = lsat->band[i].number - 1; + lsat->band[i].esun = *(esun + j); + lsat->band[i].lmax = *(lmax + j); + lsat->band[i].lmin = *(lmin + j); + } + G_debug(1, "Landsat-4 MSS"); + return; +} + +void set_TM4(lsat_data * lsat) +{ + int i, j; + double julian, *lmax, *lmin; + + /** USGS Calibration Parameter Files 2012 */ + + /* Spectral radiances at detector */ + double Lmax[][7] = { + {158.42, 308.17, 234.63, 224.32, 32.42, 15.64, 17.00}, /* before August 1983 */ + {142.86, 291.25, 225.00, 214.29, 30.00, 12.40, 15.93}, /* before January 15, 1984 */ + {171.00, 336.00, 254.00, 221.00, 31.40, 15.303, 16.60} /* after Jaunary 15, 1984 */ + }; + double Lmin[][7] = { + {-1.52, -2.84, -1.17, -1.51, -0.37, 2.00, -0.15}, + {0.00, 0.00, 0.00, 0.00, 0.00, 4.84, 0.00}, + {-1.52, -2.84, -1.17, -1.51, -0.37, 1.2378, -0.15} + }; + + /* Solar exoatmospheric spectral irradiances */ + double esun[] = { 1957., 1825., 1557., 1033., 214.9, 0., 80.72 }; + + /* Thermal band calibration constants: K1 = 671.62 K2 = 1284.30 */ + + julian = julian_char(lsat->creation); + if (julian < julian_char("1983-08-01")) + i = 0; + else if (julian < julian_char("1984-01-15")) + i = 1; + else + i = 2; + lmax = Lmax[i]; + lmin = Lmin[i]; + + lsat->number = 4; + sensor_TM(lsat); + + lsat->dist_es = earth_sun(lsat->date); + + for (i = 0; i < lsat->bands; i++) { + j = lsat->band[i].number - 1; + lsat->band[i].esun = *(esun + j); + lsat->band[i].lmax = *(lmax + j); + lsat->band[i].lmin = *(lmin + j); + if (lsat->band[i].thermal) { + lsat->band[i].K1 = 671.62; + lsat->band[i].K2 = 1284.30; + } + } + G_debug(1, "Landsat-4 TM"); + return; +} + + +/**************************************************************************** + * PURPOSE: Store values of Landsat-5 MSS/TM + * March 1, 1984 to today + *****************************************************************************/ +void set_MSS5(lsat_data * lsat) +{ + int i, j; + double julian, *lmax, *lmin; + + /** USGS Calibration Parameter Files 2012 */ + + /* Spectral radiances at detector */ + double Lmax[][4] = { + {240., 170., 150., 127.}, /* before April 6, 1984 */ + {268., 179., 159., 123.}, /* betweeen */ + {268., 179., 148., 123.} /* after November 9, 1984 */ + }; + double Lmin[][4] = { + {4., 3., 4., 2.}, + {3., 3., 4., 3.}, + {3., 3., 5., 3.} + }; + + /* Solar exoatmospheric spectral irradiances */ + double esun[] = { 1824., 1570., 1249., 853.4 }; + + julian = julian_char(lsat->creation); + if (julian < julian_char("1984-04-06")) + i = 0; + else if (julian < julian_char("1984-11-08")) + i = 1; + else + i = 2; + lmax = Lmax[i]; + lmin = Lmin[i]; + + lsat->number = 5; + sensor_MSS(lsat); + + lsat->dist_es = earth_sun(lsat->date); + + for (i = 0; i < lsat->bands; i++) { + j = lsat->band[i].number - 1; + lsat->band[i].esun = *(esun + j); + lsat->band[i].lmax = *(lmax + j); + lsat->band[i].lmin = *(lmin + j); + } + G_debug(1, "Landsat-5 MSS"); + return; +} + +void set_TM5(lsat_data * lsat) +{ + int i, j; + double julian, *lmax, *lmin, jbuf; + + /** USGS Calibration Parameter Files 2012 */ + + /* Spectral radiances at detector */ + double Lmax[][7] = { + {152.10, 296.81, 204.30, 206.20, 27.19, 15.303, 14.38}, /* before May 4, 2003 */ + {193.00, 365.00, 264.00, 221.00, 30.20, 15.303, 16.50}, /* after May 4, 2003 */ + {169.00, 333.00, 264.00, 221.00, 30.20, 15.303, 16.50} /* after April 2, 2007 */ + }; + double Lmin[][7] = { + {-1.52, -2.84, -1.17, -1.51, -0.37, 1.2378, -0.15}, + {-1.52, -2.84, -1.17, -1.51, -0.37, 1.2378, -0.15}, + {-1.52, -2.84, -1.17, -1.51, -0.37, 1.2378, -0.15} + }; + + /* Solar exoatmospheric spectral irradiances */ + double esun[] = { 1957., 1826., 1554., 1036., 215.0, 0., 80.67 }; + + /* Thermal band calibration constants: K1 = 607.76 K2 = 1260.56 */ + + julian = julian_char(lsat->creation); + if (julian < julian_char("2003-05-04")) + i = 0; + else if (julian < julian_char("2007-04-02")) + i = 1; + else + i = 2; + lmax = Lmax[i]; + lmin = Lmin[i]; + if (i == 2) { /* in Chander, Markham and Barsi 2007 */ + julian = julian_char(lsat->date); /* Yes, here acquisition date */ + if (julian >= julian_char("1992-01-01")) { + lmax[0] = 193.0; + lmax[1] = 365.0; + } + } + + jbuf = julian_char("2004-04-04"); + if (julian >= jbuf && !(lsat->flag & METADATAFILE) ) + { + G_warning("Using QCalMin=1.0 as a NLAPS product processed after 04/04/2004"); + } + lsat->number = 5; + sensor_TM(lsat); + + lsat->dist_es = earth_sun(lsat->date); + + for (i = 0; i < lsat->bands; i++) { + j = lsat->band[i].number - 1; + if (julian >= jbuf) + lsat->band[i].qcalmin = 1.; + lsat->band[i].esun = *(esun + j); + lsat->band[i].lmax = *(lmax + j); + lsat->band[i].lmin = *(lmin + j); + if (lsat->band[i].thermal) { + lsat->band[i].K1 = 607.76; + lsat->band[i].K2 = 1260.56; + } + } + G_debug(1, "Landsat-5 TM"); + return; +} + + +/**************************************************************************** + * PURPOSE: Store values of Landsat-7 ETM+ + * April 15, 1999 to May 31, 2003 (SLC failure) + *****************************************************************************/ +void set_ETM(lsat_data * lsat, const char gain[]) +{ + double *lmax, *lmin; + + /** USGS Calibration Parameter Files 2012 */ + + /* Spectral radiances at detector */ + /* - LOW GAIN - */ + double LmaxL[][8] = { + {297.5, 303.4, 235.5, 235.0, 47.70, 17.04, 16.60, 244.0}, /* before July 1, 2000 */ + {293.7, 300.9, 234.4, 241.1, 47.57, 17.04, 16.54, 243.1} /* on or after July 1, 2000 */ + }; + double LminL[][8] = { + {-6.2, -6.0, -4.5, -4.5, -1.0, 0.0, -0.35, -5.0}, + {-6.2, -6.4, -5.0, -5.1, -1.0, 0.0, -0.35, -4.7} + }; + /* - HIGH GAIN - */ + double LmaxH[][8] = { + {194.3, 202.4, 158.6, 157.5, 31.76, 12.65, 10.932, 158.4}, + {191.6, 196.5, 152.9, 157.4, 31.06, 12.65, 10.80, 158.3} + }; + double LminH[][8] = { + {-6.2, -6.0, -4.5, -4.5, -1.0, 3.2, -0.35, -5.0}, + {-6.2, -6.4, -5.0, -5.1, -1.0, 3.2, -0.35, -4.7} + }; + + /* Solar exoatmospheric spectral irradiances */ + double esun[] = { 1969., 1840., 1551., 1044., 225.7, 0., 82.07, 1368. }; + + /* Thermal band calibration constants: K1 = 666.09 K2 = 1282.71 */ + + int k = (julian_char(lsat->creation) < julian_char("2000-07-01")) ? 0 : 1; + + lsat->number = 7; + sensor_ETM(lsat); + + lsat->dist_es = earth_sun(lsat->date); + + for(int i=0; ibands; i++) + { + int j = lsat->band[i].number - 1; + + lsat->band[i].esun = esun[j]; + + if( gain[i] == 'H' || gain[i] == 'h' ) + { + lmax = LmaxH[k]; + lmin = LminH[k]; + } + else + { + lmax = LmaxL[k]; + lmin = LminL[k]; + } + + lsat->band[i].lmax = *(lmax + j); + lsat->band[i].lmin = *(lmin + j); + + if (lsat->band[i].thermal) + { + lsat->band[i].K1 = 666.09; + lsat->band[i].K2 = 1282.71; + } + } + G_debug(1, "Landsat-7 ETM+"); + return; +} + +/**************************************************************************** + * PURPOSE: Store values of Landsat-8 OLI/TIRS + * February 14, 2013 + *****************************************************************************/ +void set_OLI(lsat_data * lsat) +{ + int i, j; + double *lmax, *lmin; + + /* Spectral radiances at detector */ + /* estimates */ + double Lmax[][11] = { { 755.8, 770.7, 705.7, 597.7, 362.7, 91.4, 29.7, 673.3, 149.0, 22.0, 22.0 } }; + double Lmin[][11] = { { -62.4, -63.6, -58.3, -49.4, -30.0, -7.5, -2.5, -55.6, -12.3, 0.1, 0.1 } }; + + /* Solar exoatmospheric spectral irradiances estimates */ + double esun[] = + { 2026.8, 2066.8, 1892.5, 1602.8, 972.6, 245.0, 79.7, 1805.5, 399.7, 0., 0. }; + + lmax = Lmax[0]; + lmin = Lmin[0]; + + lsat->number = 8; + sensor_OLI(lsat); + + lsat->dist_es = earth_sun(lsat->date); + + for (i = 0; i < lsat->bands; i++) + { + j = lsat->band[i].number - 1; + lsat->band[i].esun = *(esun + j); + lsat->band[i].lmax = *(lmax + j); + lsat->band[i].lmin = *(lmin + j); + if (lsat->band[i].thermal) + { + lsat->band[i].K1 = (lsat->band[i].number == 10 ? 774.89 : 480.89); + lsat->band[i].K2 = (lsat->band[i].number == 10 ? 1321.08 : 1201.14); + } + } + G_debug(1, "Landsat-8 OLI/TIRS"); + return; +} + + +/////////////////////////////////////////////////////////// +// // +// landsat.c // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#define PI 3.1415926535897932384626433832795 +#define R2D 57.295779513082320877 +#define D2R 0.017453292519943295769 + +/**************************************************************************** + * PURPOSE: Calibrated Digital Number to at-satellite Radiance + *****************************************************************************/ +double lsat_qcal2rad(double qcal, band_data * band) +{ + return (double)(qcal * band->gain + band->bias); +} + +/**************************************************************************** + * PURPOSE: Radiance of non-thermal band to at-satellite Reflectance + *****************************************************************************/ +double lsat_rad2ref(double rad, band_data * band) +{ + return (double)(rad / band->K2); +} + +/**************************************************************************** + * PURPOSE: Radiance of thermal band to at-satellite Temperature + *****************************************************************************/ +double lsat_rad2temp(double rad, band_data * band) +{ + return (double)(band->K2 / log((band->K1 / rad) + 1.0)); +} + +/**************************************************************************** + * PURPOSE: Some band constants + * + * zenith = 90 - sun_elevation + * sin( sun_elevation ) = cos( sun_zenith ) + * + * lsat : satellite data + * i : band number + * method : level of atmospheric correction + * percent : percent of solar irradiance in path radiance + * dos : digital number of dark object for DOS + *****************************************************************************/ + +#define abs(x) (((x)>0)?(x):(-x)) + +void lsat_bandctes(lsat_data * lsat, int i, char method, + double percent, int dos, double rayleigh) +{ + double pi_d2, sin_e, cos_v, rad_sun; + + /* TAUv = at. transmittance surface-sensor */ + /* TAUz = at. transmittance sun-surface */ + /* Edown = diffuse sky spectral irradiance */ + double TAUv, TAUz, Edown; + + pi_d2 = (double)(PI * lsat->dist_es * lsat->dist_es); + sin_e = (double)(sin(D2R * lsat->sun_elev)); + cos_v = (double)(cos(D2R * (lsat->number < 4 ? 9.2 : 8.2))); + + /** Global irradiance on the sensor. + Radiance to reflectance coefficient, only NO thermal bands. + K1 and K2 variables are also utilized as thermal constants + */ + if (lsat->band[i].thermal == 0) { + switch (method) { + case DOS2: + { + TAUv = 1.; + TAUz = (lsat->band[i].wavemax < 1.) ? sin_e : 1.; + Edown = 0.; + break; + } + case DOS2b: + { + TAUv = (lsat->band[i].wavemax < 1.) ? cos_v : 1.; + TAUz = (lsat->band[i].wavemax < 1.) ? sin_e : 1.; + Edown = 0.; + break; + } + case DOS3: + { + double t; + + t = 2. / (lsat->band[i].wavemax + lsat->band[i].wavemin); + t = 0.008569 * t * t * t * t * (1 + 0.0113 * t * t + + 0.000013 * t * t * t * t); + TAUv = exp(-t / cos_v); + TAUz = exp(-t / sin_e); + Edown = rayleigh; + break; + } + case DOS4: + { + double Ro = + (lsat->band[i].lmax - lsat->band[i].lmin) * (dos - + lsat->band + [i].qcalmin) + / (lsat->band[i].qcalmax - lsat->band[i].qcalmin) + + lsat->band[i].lmin; + double Tv = 1.; + double Tz = 1.; + double Lp = 0.; + + do { + TAUz = Tz; + TAUv = Tv; + Lp = Ro - + percent * TAUv * (lsat->band[i].esun * sin_e * TAUz + + PI * Lp) / pi_d2; + Tz = 1 - (4 * pi_d2 * Lp) / (lsat->band[i].esun * sin_e); + Tv = exp(sin_e * log(Tz) / cos_v); + /* G_message("TAUv = %.5f (%.5f), TAUz = %.5f (%.5f) and Edown = %.5f\n", TAUv, Tv, TAUz, Tz, PI * Lp ); */ + /* } while( abs(TAUv - Tv) > 0.0000001 || abs(TAUz - Tz) > 0.0000001); */ + } while (TAUv != Tv && TAUz != Tz); + TAUz = (Tz < 1. ? Tz : 1.); + TAUv = (Tv < 1. ? Tv : 1.); + Edown = (Lp < 0. ? 0. : PI * Lp); + break; + } + default: /* DOS1 and Without atmospheric-correction */ + TAUv = 1.; + TAUz = 1.; + Edown = 0.; + break; + } + rad_sun = TAUv * (lsat->band[i].esun * sin_e * TAUz + Edown) / pi_d2; +// G_verbose_message("... TAUv = %.5f, TAUz = %.5f, Edown = %.5f\n", TAUv, TAUz, Edown); + + lsat->band[i].K1 = 0.; + lsat->band[i].K2 = rad_sun; + } + + /** Digital number to radiance coefficients. + Whitout atmospheric calibration for thermal bands. + */ + lsat->band[i].gain = ((lsat->band[i].lmax - lsat->band[i].lmin) / + (lsat->band[i].qcalmax - lsat->band[i].qcalmin)); + + if (method == UNCORRECTED || lsat->band[i].thermal) { + /* L = G * (DN - Qmin) + Lmin + -> bias = Lmin - G * Qmin */ + lsat->band[i].bias = + (lsat->band[i].lmin - lsat->band[i].gain * lsat->band[i].qcalmin); + } + else { + if (method == CORRECTED) { + /* L = G * (DN - Qmin) + Lmin - Lmin + -> bias = - G * Qmin */ + lsat->band[i].bias = + -(lsat->band[i].gain * lsat->band[i].qcalmin); + /* Another possibility is cut when rad < 0 */ + } + else if (method > DOS) { + /* L = Lsat - Lpath = + G * DNsat + B - (G * dark + B - p * rad_sun) = + G * DNsat - G * dark + p * rad_sun + -> bias = p * rad_sun - G * dark */ + lsat->band[i].bias = percent * rad_sun - lsat->band[i].gain * dos; + } + } +} + + +/////////////////////////////////////////////////////////// +// // +// earth_sun.c // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +/* + * Modified from LIBNOVA-0.12 + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + * Some functions in this file use the VSOP87 solution by + * Messrs. Bretagnon and Francou. + * + * Copyright (C) 2000 - 2005 Liam Girdwood + * Modified to GRASS (C) 2006 E. Jorge Tizado + */ + +#define RADIUS_R0 523 +#define RADIUS_R1 290 +#define RADIUS_R2 134 +#define RADIUS_R3 20 +#define RADIUS_R4 9 +#define RADIUS_R5 2 + +struct ln_vsop +{ + double A; + double B; + double C; +}; + +double ln_calc_series(const struct ln_vsop *data, int terms, double t); + +static const struct ln_vsop earth_radius_r0[RADIUS_R0] = { + {1.00013988784, 0.00000000000, 0.00000000000}, + {0.01670699632, 3.09846350258, 6283.07584999140}, + {0.00013956024, 3.05524609456, 12566.15169998280}, + {0.00003083720, 5.19846674381, 77713.77146812050}, + {0.00001628463, 1.17387558054, 5753.38488489680}, + {0.00001575572, 2.84685214877, 7860.41939243920}, + {0.00000924799, 5.45292236722, 11506.76976979360}, + {0.00000542439, 4.56409151453, 3930.20969621960}, + {0.00000472110, 3.66100022149, 5884.92684658320}, + {0.00000328780, 5.89983686142, 5223.69391980220}, + {0.00000345969, 0.96368627272, 5507.55323866740}, + {0.00000306784, 0.29867139512, 5573.14280143310}, + {0.00000174844, 3.01193636733, 18849.22754997420}, + {0.00000243181, 4.27349530790, 11790.62908865880}, + {0.00000211836, 5.84714461348, 1577.34354244780}, + {0.00000185740, 5.02199710705, 10977.07880469900}, + {0.00000109835, 5.05510635860, 5486.77784317500}, + {0.00000098316, 0.88681311278, 6069.77675455340}, + {0.00000086500, 5.68956418946, 15720.83878487840}, + {0.00000085831, 1.27079125277, 161000.68573767410}, + {0.00000062917, 0.92177053978, 529.69096509460}, + {0.00000057056, 2.01374292245, 83996.84731811189}, + {0.00000064908, 0.27251341435, 17260.15465469040}, + {0.00000049384, 3.24501240359, 2544.31441988340}, + {0.00000055736, 5.24159799170, 71430.69561812909}, + {0.00000042520, 6.01110257982, 6275.96230299060}, + {0.00000046966, 2.57799853213, 775.52261132400}, + {0.00000038963, 5.36063832897, 4694.00295470760}, + {0.00000044666, 5.53715663816, 9437.76293488700}, + {0.00000035661, 1.67447135798, 12036.46073488820}, + {0.00000031922, 0.18368299942, 5088.62883976680}, + {0.00000031846, 1.77775642078, 398.14900340820}, + {0.00000033193, 0.24370221704, 7084.89678111520}, + {0.00000038245, 2.39255343973, 8827.39026987480}, + {0.00000028468, 1.21344887533, 6286.59896834040}, + {0.00000037486, 0.82961281844, 19651.04848109800}, + {0.00000036957, 4.90107587287, 12139.55350910680}, + {0.00000034537, 1.84270693281, 2942.46342329160}, + {0.00000026275, 4.58896863104, 10447.38783960440}, + {0.00000024596, 3.78660838036, 8429.24126646660}, + {0.00000023587, 0.26866098169, 796.29800681640}, + {0.00000027795, 1.89934427832, 6279.55273164240}, + {0.00000023927, 4.99598548145, 5856.47765911540}, + {0.00000020345, 4.65282190725, 2146.16541647520}, + {0.00000023287, 2.80783632869, 14143.49524243060}, + {0.00000022099, 1.95002636847, 3154.68708489560}, + {0.00000019509, 5.38233922479, 2352.86615377180}, + {0.00000017958, 0.19871369960, 6812.76681508600}, + {0.00000017178, 4.43322156854, 10213.28554621100}, + {0.00000016190, 5.23159323213, 17789.84561978500}, + {0.00000017315, 6.15224075188, 16730.46368959580}, + {0.00000013814, 5.18962074032, 8031.09226305840}, + {0.00000018834, 0.67280058021, 149854.40013480789}, + {0.00000018330, 2.25348717053, 23581.25817731760}, + {0.00000013639, 3.68511810757, 4705.73230754360}, + {0.00000013142, 0.65267698994, 13367.97263110660}, + {0.00000010414, 4.33285688501, 11769.85369316640}, + {0.00000009978, 4.20126336356, 6309.37416979120}, + {0.00000010170, 1.59366684542, 4690.47983635860}, + {0.00000007564, 2.62560597391, 6256.77753019160}, + {0.00000009654, 3.67583728703, 27511.46787353720}, + {0.00000006743, 0.56269927047, 3340.61242669980}, + {0.00000008743, 6.06359123461, 1748.01641306700}, + {0.00000007786, 3.67371235367, 12168.00269657460}, + {0.00000006633, 5.66149277789, 11371.70468975820}, + {0.00000007712, 0.31242577788, 7632.94325965020}, + {0.00000006586, 3.13580054586, 801.82093112380}, + {0.00000007460, 5.64758066660, 11926.25441366880}, + {0.00000006933, 2.92384586372, 6681.22485339960}, + {0.00000006805, 1.42327153767, 23013.53953958720}, + {0.00000006118, 5.13395999022, 1194.44701022460}, + {0.00000006477, 2.64986648493, 19804.82729158280}, + {0.00000005233, 4.62432817299, 6438.49624942560}, + {0.00000006147, 3.02863936662, 233141.31440436149}, + {0.00000004608, 1.72194702724, 7234.79425624200}, + {0.00000004221, 1.55697533726, 7238.67559160000}, + {0.00000005310, 2.40821524293, 11499.65622279280}, + {0.00000005128, 5.32398965690, 11513.88331679440}, + {0.00000004770, 0.25554311730, 11856.21865142450}, + {0.00000005519, 2.09089153789, 17298.18232732620}, + {0.00000005625, 4.34052903053, 90955.55169449610}, + {0.00000004578, 4.46569641570, 5746.27133789600}, + {0.00000003788, 4.90728294810, 4164.31198961300}, + {0.00000005337, 5.09957905103, 31441.67756975680}, + {0.00000003967, 1.20054555175, 1349.86740965880}, + {0.00000004005, 3.02853885902, 1059.38193018920}, + {0.00000003480, 0.76066308841, 10973.55568635000}, + {0.00000004232, 1.05485713117, 5760.49843189760}, + {0.00000004582, 3.76570026763, 6386.16862421000}, + {0.00000003335, 3.13829943354, 6836.64525283380}, + {0.00000003420, 3.00043974511, 4292.33083295040}, + {0.00000003595, 5.70703236079, 5643.17856367740}, + {0.00000003236, 4.16387400645, 9917.69687450980}, + {0.00000004154, 2.59940749519, 7058.59846131540}, + {0.00000003362, 4.54577164994, 4732.03062734340}, + {0.00000002978, 1.30561268820, 6283.14316029419}, + {0.00000002765, 0.51311975671, 26.29831979980}, + {0.00000002807, 5.66230537649, 8635.94200376320}, + {0.00000002927, 5.73787834080, 16200.77272450120}, + {0.00000003167, 1.69181759900, 11015.10647733480}, + {0.00000002598, 2.96244118358, 25132.30339996560}, + {0.00000003519, 3.62639325753, 244287.60000722769}, + {0.00000002676, 4.20727719487, 18073.70493865020}, + {0.00000002978, 1.74971565805, 6283.00853968860}, + {0.00000002287, 1.06976449088, 14314.16811304980}, + {0.00000002863, 5.92838917309, 14712.31711645800}, + {0.00000003071, 0.23793217000, 35371.88726597640}, + {0.00000002656, 0.89959301615, 12352.85260454480}, + {0.00000002415, 2.79975176800, 709.93304855830}, + {0.00000002811, 3.51513864541, 21228.39202354580}, + {0.00000001977, 2.61358297551, 951.71840625060}, + {0.00000002548, 2.47684686575, 6208.29425142410}, + {0.00000001999, 0.56090396506, 7079.37385680780}, + {0.00000002305, 1.05376463592, 22483.84857449259}, + {0.00000001855, 2.86093570752, 5216.58037280140}, + {0.00000002157, 1.31395211105, 154717.60988768269}, + {0.00000001970, 4.36931551625, 167283.76158766549}, + {0.00000001754, 2.14452400686, 6290.18939699220}, + {0.00000001628, 5.85704450617, 10984.19235169980}, + {0.00000002154, 6.03828353794, 10873.98603048040}, + {0.00000001714, 3.70158195222, 1592.59601363280}, + {0.00000001541, 6.21599512982, 23543.23050468179}, + {0.00000001602, 1.99860679677, 10969.96525769820}, + {0.00000001712, 1.34295218697, 3128.38876509580}, + {0.00000001647, 5.54948299069, 6496.37494542940}, + {0.00000001495, 5.43980459648, 155.42039943420}, + {0.00000001827, 5.91227480351, 3738.76143010800}, + {0.00000001726, 2.16765465036, 10575.40668294180}, + {0.00000001532, 5.35683107063, 13521.75144159140}, + {0.00000001824, 1.66056145084, 39302.09696219600}, + {0.00000001605, 1.90930973224, 6133.51265285680}, + {0.00000001282, 2.46013372544, 13916.01910964160}, + {0.00000001211, 4.41360631550, 3894.18182954220}, + {0.00000001394, 1.77801929250, 9225.53927328300}, + {0.00000001571, 4.95512957606, 25158.60171976540}, + {0.00000001205, 1.19212756308, 3.52311834900}, + {0.00000001132, 2.69830084955, 6040.34724601740}, + {0.00000001504, 5.77577388271, 18209.33026366019}, + {0.00000001393, 1.62625077326, 5120.60114558360}, + {0.00000001081, 2.93726744446, 17256.63153634140}, + {0.00000001232, 0.71651766504, 143571.32428481648}, + {0.00000001087, 0.99769687961, 955.59974160860}, + {0.00000001068, 5.28472576591, 65147.61976813770}, + {0.00000001169, 3.11663802316, 14945.31617355440}, + {0.00000000975, 5.10887260780, 6172.86952877200}, + {0.00000001202, 4.02992510403, 553.56940284240}, + {0.00000000979, 2.00000879106, 15110.46611986620}, + {0.00000000962, 4.02380771400, 6282.09552892320}, + {0.00000000999, 3.62643002790, 6262.30045449900}, + {0.00000001030, 5.84987815239, 213.29909543800}, + {0.00000001014, 2.84227679965, 8662.24032356300}, + {0.00000001185, 1.51330629149, 17654.78053974960}, + {0.00000000967, 2.67081017562, 5650.29211067820}, + {0.00000001222, 2.65423784904, 88860.05707098669}, + {0.00000000986, 2.36212814824, 6206.80977871580}, + {0.00000001034, 0.13634950642, 11712.95531823080}, + {0.00000001103, 3.08477302937, 43232.30665841560}, + {0.00000000781, 2.53374971725, 16496.36139620240}, + {0.00000001019, 3.04569392376, 6037.24420376200}, + {0.00000000795, 5.80662989126, 5230.80746680300}, + {0.00000000813, 3.57702871938, 10177.25767953360}, + {0.00000000962, 5.31470594766, 6284.05617105960}, + {0.00000000717, 5.95797471837, 12559.03815298200}, + {0.00000000967, 2.74413738053, 6244.94281435360}, + {0.00000000921, 0.10160160830, 29088.81141598500}, + {0.00000000719, 5.91788189939, 4136.91043351620}, + {0.00000000688, 3.89489045092, 1589.07289528380}, + {0.00000000772, 4.05505380285, 6127.65545055720}, + {0.00000000706, 5.49323197725, 22003.91463486980}, + {0.00000000665, 1.60002747134, 11087.28512591840}, + {0.00000000690, 4.50539825729, 426.59819087600}, + {0.00000000854, 3.26104645060, 20426.57109242200}, + {0.00000000656, 4.32410182940, 16858.48253293320}, + {0.00000000840, 2.59572585212, 28766.92442448400}, + {0.00000000686, 0.61944033771, 11403.67699557500}, + {0.00000000700, 3.40901412473, 7.11354700080}, + {0.00000000728, 0.04050185963, 5481.25491886760}, + {0.00000000653, 1.03869451230, 6062.66320755260}, + {0.00000000559, 4.79221805695, 20199.09495963300}, + {0.00000000633, 5.70229959167, 45892.73043315699}, + {0.00000000591, 6.10986487621, 9623.68827669120}, + {0.00000000520, 3.62310356479, 5333.90024102160}, + {0.00000000602, 5.58381898589, 10344.29506538580}, + {0.00000000496, 2.21027756314, 1990.74501704100}, + {0.00000000691, 1.96733114988, 12416.58850284820}, + {0.00000000640, 1.59062417043, 18319.53658487960}, + {0.00000000625, 3.82358168221, 13517.87010623340}, + {0.00000000475, 1.17025904180, 12569.67481833180}, + {0.00000000660, 5.08498512995, 283.85931886520}, + {0.00000000664, 4.50029469969, 47162.51635463520}, + {0.00000000569, 0.16318535463, 17267.26820169119}, + {0.00000000568, 3.86100969474, 6076.89030155420}, + {0.00000000462, 0.26368763517, 4590.91018048900}, + {0.00000000535, 4.83225423196, 18422.62935909819}, + {0.00000000466, 0.75873879417, 7342.45778018060}, + {0.00000000541, 3.07212190556, 226858.23855437008}, + {0.00000000610, 1.53597089605, 33019.02111220460}, + {0.00000000617, 2.62356328726, 11190.37790013700}, + {0.00000000548, 4.55798855803, 18875.52586977400}, + {0.00000000633, 4.60110281228, 66567.48586525429}, + {0.00000000587, 5.78087907808, 632.78373931320}, + {0.00000000603, 5.38458554802, 316428.22867391503}, + {0.00000000525, 5.01522072363, 12132.43996210600}, + {0.00000000469, 0.59975173763, 21954.15760939799}, + {0.00000000548, 3.50627043672, 17253.04110768959}, + {0.00000000502, 0.98804327589, 11609.86254401220}, + {0.00000000568, 1.98497313089, 7668.63742494250}, + {0.00000000482, 1.62460405687, 12146.66705610760}, + {0.00000000391, 3.68718382972, 18052.92954315780}, + {0.00000000457, 3.77214896610, 156137.47598479928}, + {0.00000000401, 5.29221540240, 15671.08175940660}, + {0.00000000469, 1.80963351735, 12562.62858163380}, + {0.00000000514, 3.37031288919, 20597.24396304120}, + {0.00000000452, 5.66811219778, 10454.50138660520}, + {0.00000000375, 4.98528185039, 9779.10867612540}, + {0.00000000523, 0.97215560834, 155427.54293624099}, + {0.00000000403, 5.13948189770, 1551.04522264800}, + {0.00000000372, 3.69883738807, 9388.00590941520}, + {0.00000000367, 4.43875659833, 4535.05943692440}, + {0.00000000406, 4.20863156497, 12592.45001978260}, + {0.00000000362, 2.55099560446, 242.72860397400}, + {0.00000000471, 4.61907324819, 5436.99301524020}, + {0.00000000388, 4.96020928400, 24356.78078864160}, + {0.00000000441, 5.83872966262, 3496.03282613400}, + {0.00000000349, 6.16307810648, 19800.94595622480}, + {0.00000000356, 0.23819081240, 5429.87946823940}, + {0.00000000346, 5.60809622572, 2379.16447357160}, + {0.00000000380, 2.72105213132, 11933.36796066960}, + {0.00000000432, 0.24215988572, 17996.03116822220}, + {0.00000000378, 5.22516848076, 7477.52286021600}, + {0.00000000337, 5.10885555836, 5849.36411211460}, + {0.00000000315, 0.57827745123, 10557.59416082380}, + {0.00000000318, 4.49949007320, 3634.62102451840}, + {0.00000000323, 1.55850824803, 10440.27429260360}, + {0.00000000314, 5.77154773334, 20.77539549240}, + {0.00000000303, 2.34615580398, 4686.88940770680}, + {0.00000000414, 5.93237602310, 51092.72605085480}, + {0.00000000362, 2.17561997119, 28237.23345938940}, + {0.00000000288, 0.18377405421, 13095.84266507740}, + {0.00000000277, 5.12952205030, 13119.72110282519}, + {0.00000000325, 6.18608287927, 6268.84875598980}, + {0.00000000273, 0.30522428863, 23141.55838292460}, + {0.00000000267, 5.76152585786, 5966.68398033480}, + {0.00000000345, 2.94246040875, 36949.23080842420}, + {0.00000000253, 5.20994580359, 24072.92146977640}, + {0.00000000342, 5.76212804329, 16460.33352952499}, + {0.00000000307, 6.01039067183, 22805.73556599360}, + {0.00000000261, 2.00304796059, 6148.01076995600}, + {0.00000000238, 5.08241964961, 6915.85958930460}, + {0.00000000249, 2.94762789744, 135.06508003540}, + {0.00000000306, 3.89765478921, 10988.80815753500}, + {0.00000000308, 0.05451027736, 4701.11650170840}, + {0.00000000319, 2.95712862064, 163096.18036118349}, + {0.00000000272, 2.07967681309, 4804.20927592700}, + {0.00000000209, 4.43768461442, 6546.15977336420}, + {0.00000000217, 0.73691592312, 6303.85124548380}, + {0.00000000203, 0.32033085531, 25934.12433108940}, + {0.00000000205, 5.22936478995, 20995.39296644940}, + {0.00000000213, 0.20671418919, 28286.99048486120}, + {0.00000000197, 0.48286131290, 16737.57723659660}, + {0.00000000230, 6.06567392849, 6287.00800325450}, + {0.00000000219, 1.29194216300, 5326.78669402080}, + {0.00000000201, 1.74700937253, 22743.40937951640}, + {0.00000000207, 4.45440927276, 6279.48542133960}, + {0.00000000269, 6.05640445030, 64471.99124174489}, + {0.00000000190, 0.99261116842, 29296.61538957860}, + {0.00000000194, 3.82656562755, 419.48464387520}, + {0.00000000262, 5.26961924126, 522.57741809380}, + {0.00000000210, 4.68618183158, 6254.62666252360}, + {0.00000000197, 2.80624554186, 4933.20844033260}, + {0.00000000252, 4.36220154620, 40879.44050464380}, + {0.00000000261, 1.07241516738, 55022.93574707440}, + {0.00000000233, 5.41751014958, 39609.65458316560}, + {0.00000000185, 4.14324541379, 5642.19824260920}, + {0.00000000247, 3.44855612987, 6702.56049386660}, + {0.00000000205, 4.04424043226, 536.80451209540}, + {0.00000000191, 3.15807087926, 16723.35014259500}, + {0.00000000222, 5.16259496507, 23539.70738633280}, + {0.00000000180, 4.56214752149, 6489.26139842860}, + {0.00000000227, 0.60156339452, 5905.70224207560}, + {0.00000000170, 0.93185903228, 16062.18452611680}, + {0.00000000159, 0.92751013112, 23937.85638974100}, + {0.00000000157, 4.69607868164, 6805.65326808520}, + {0.00000000218, 0.85533373430, 16627.37091537720}, + {0.00000000169, 0.94641052064, 3097.88382272579}, + {0.00000000207, 4.88410451334, 6286.66627864320}, + {0.00000000160, 4.95943826819, 10021.83728009940}, + {0.00000000175, 6.12762824563, 239424.39025435288}, + {0.00000000173, 3.13887234973, 6179.98307577280}, + {0.00000000157, 3.62822057807, 18451.07854656599}, + {0.00000000206, 5.74617821138, 3646.35037735440}, + {0.00000000157, 4.67695912207, 6709.67404086740}, + {0.00000000146, 3.09506069745, 4907.30205014560}, + {0.00000000165, 2.27139128760, 10660.68693504240}, + {0.00000000144, 3.96947747592, 6019.99192661860}, + {0.00000000171, 5.91302216729, 6058.73105428950}, + {0.00000000144, 2.13155655120, 26084.02180621620}, + {0.00000000151, 0.67417383565, 2388.89402044920}, + {0.00000000196, 1.67718461229, 2107.03450754240}, + {0.00000000146, 5.10373877968, 10770.89325626180}, + {0.00000000187, 1.23915444627, 19402.79695281660}, + {0.00000000137, 1.26247412216, 12566.21901028560}, + {0.00000000191, 5.03547476279, 263.08392337280}, + {0.00000000137, 3.52825454595, 639.89728631400}, + {0.00000000135, 0.73840670927, 5017.50837136500}, + {0.00000000164, 2.39195095081, 6357.85744855870}, + {0.00000000168, 0.05515907462, 9380.95967271720}, + {0.00000000161, 1.15721259392, 26735.94526221320}, + {0.00000000144, 1.76097645199, 5888.44996493220}, + {0.00000000131, 2.51859277344, 6599.46771964800}, + {0.00000000142, 2.43802911123, 5881.40372823420}, + {0.00000000159, 5.90325893762, 6281.59137728310}, + {0.00000000151, 3.72338532519, 12669.24447420140}, + {0.00000000132, 2.38417741883, 6525.80445396540}, + {0.00000000127, 0.00254936441, 10027.90319572920}, + {0.00000000148, 2.85102145528, 6418.14093002680}, + {0.00000000143, 5.74460279560, 26087.90314157420}, + {0.00000000172, 0.41289962240, 174242.46596404970}, + {0.00000000136, 4.15497742275, 6311.52503745920}, + {0.00000000170, 5.98194913129, 327574.51427678125}, + {0.00000000136, 2.48430537541, 13341.67431130680}, + {0.00000000149, 0.33002271275, 245.83164622940}, + {0.00000000165, 2.49667924600, 58953.14544329400}, + {0.00000000123, 1.67328384813, 32217.20018108080}, + {0.00000000123, 3.45660563754, 6277.55292568400}, + {0.00000000117, 0.86065134175, 6245.04817735560}, + {0.00000000149, 5.61358281003, 5729.50644714900}, + {0.00000000128, 0.71204006448, 103.09277421860}, + {0.00000000159, 2.43166592149, 221995.02880149524}, + {0.00000000137, 1.70657709200, 12566.08438968000}, + {0.00000000129, 2.80667872683, 6016.46880826960}, + {0.00000000113, 3.58302904101, 25685.87280280800}, + {0.00000000109, 3.26403795962, 6819.88036208680}, + {0.00000000122, 0.34120688202, 1162.47470440780}, + {0.00000000106, 1.59721172719, 17782.73207278420}, + {0.00000000144, 2.28891651774, 12489.88562870720}, + {0.00000000137, 5.82029768354, 44809.65020086340}, + {0.00000000134, 1.26539983018, 5331.35744374080}, + {0.00000000103, 5.96518130595, 6321.10352262720}, + {0.00000000109, 0.33808549034, 11300.58422135640}, + {0.00000000129, 5.89187277190, 12029.34718788740}, + {0.00000000122, 5.77325634636, 11919.14086666800}, + {0.00000000107, 6.24998989350, 77690.75950573849}, + {0.00000000107, 1.00535580713, 77736.78343050249}, + {0.00000000115, 5.86963518266, 12721.57209941700}, + {0.00000000102, 5.66283467269, 5540.08578945880}, + {0.00000000143, 0.24122178432, 4214.06901508480}, + {0.00000000143, 0.88529649733, 7576.56007357400}, + {0.00000000107, 2.92124030351, 31415.37924995700}, + {0.00000000100, 5.99485644501, 4061.21921539440}, + {0.00000000103, 2.41941934525, 5547.19933645960}, + {0.00000000104, 4.44106051277, 2118.76386037840}, + {0.00000000110, 0.37559635174, 5863.59120611620}, + {0.00000000124, 2.55619029611, 12539.85338018300}, + {0.00000000110, 3.66952094465, 238004.52415723629}, + {0.00000000112, 4.32512422724, 97238.62754448749}, + {0.00000000120, 1.26895630075, 12043.57428188900}, + {0.00000000097, 5.42612959752, 7834.12107263940}, + {0.00000000094, 2.56461130309, 19004.64794940840}, + {0.00000000105, 5.68272475301, 16522.65971600220}, + {0.00000000117, 3.65425622684, 34520.30930938080}, + {0.00000000108, 1.24206843948, 84672.47584450469}, + {0.00000000098, 0.13589994287, 11080.17157891760}, + {0.00000000097, 2.46722096722, 71980.63357473118}, + {0.00000000095, 5.36958330451, 6288.59877429880}, + {0.00000000096, 0.20796618776, 18139.29450141590}, + {0.00000000111, 5.01961920313, 11823.16163945020}, + {0.00000000090, 2.72355843779, 26880.31981303260}, + {0.00000000099, 0.90164266199, 18635.92845453620}, + {0.00000000126, 4.78722177847, 305281.94307104882}, + {0.00000000124, 5.00979495566, 172146.97134054029}, + {0.00000000090, 4.50544881196, 40077.61957352000}, + {0.00000000104, 5.63679680710, 2787.04302385740}, + {0.00000000091, 5.43564326147, 6272.03014972750}, + {0.00000000100, 2.00639461597, 12323.42309600880}, + {0.00000000117, 2.35555589778, 83286.91426955358}, + {0.00000000105, 2.59824000109, 30666.15495843280}, + {0.00000000090, 2.35779490026, 12491.37010141550}, + {0.00000000089, 3.57152453732, 11720.06886523160}, + {0.00000000095, 5.67015349858, 14919.01785375460}, + {0.00000000087, 1.86043406047, 27707.54249429480}, + {0.00000000106, 3.04150600352, 22345.26037610820}, + {0.00000000082, 5.58298993353, 10241.20229116720}, + {0.00000000083, 3.10607039533, 36147.40987730040}, + {0.00000000094, 5.47749711149, 9924.81042151060}, + {0.00000000082, 4.71988314145, 15141.39079431200}, + {0.00000000096, 3.89073946348, 6379.05507720920}, + {0.00000000110, 4.92131611151, 5621.84292321040}, + {0.00000000110, 4.89978492291, 72140.62866668739}, + {0.00000000097, 5.20764563059, 6303.43116939020}, + {0.00000000085, 1.61269222311, 33326.57873317420}, + {0.00000000093, 1.32651591333, 23020.65308658799}, + {0.00000000090, 0.57733016380, 26482.17080962440}, + {0.00000000078, 3.99588630754, 11293.47067435560}, + {0.00000000106, 3.92012705073, 62883.35513951360}, + {0.00000000098, 2.94397773524, 316.39186965660}, + {0.00000000076, 3.96310417608, 29026.48522950779}, + {0.00000000098, 0.95914722366, 48739.85989708300}, + {0.00000000078, 1.97068528043, 90279.92316810328}, + {0.00000000076, 0.23027966596, 21424.46664430340}, + {0.00000000079, 1.46227790922, 8982.81066930900}, + {0.00000000078, 2.28840998832, 266.60704172180}, + {0.00000000071, 1.51940765590, 33794.54372352860}, + {0.00000000076, 0.22880641443, 57375.80190084620}, + {0.00000000097, 0.39449562097, 24279.10701821359}, + {0.00000000075, 2.77638584795, 12964.30070339100}, + {0.00000000077, 5.18846946344, 11520.99686379520}, + {0.00000000068, 0.50006599129, 4274.51831083240}, + {0.00000000075, 2.07323762803, 15664.03552270859}, + {0.00000000077, 0.46665178780, 16207.88627150200}, + {0.00000000081, 4.10452219483, 161710.61878623239}, + {0.00000000071, 3.91415328513, 7875.67186362420}, + {0.00000000081, 0.91938383406, 74.78159856730}, + {0.00000000083, 4.69916218791, 23006.42599258639}, + {0.00000000069, 0.98999300277, 6393.28217121080}, + {0.00000000065, 5.41938745446, 28628.33622609960}, + {0.00000000073, 2.45564765251, 15508.61512327440}, + {0.00000000065, 3.02336771694, 5959.57043333400}, + {0.00000000064, 0.18375587635, 1066.49547719000}, + {0.00000000080, 5.81239171612, 12341.80690428090}, + {0.00000000066, 2.15105504851, 38.02767263580}, + {0.00000000067, 5.14047250153, 9814.60410029120}, + {0.00000000062, 2.43313614978, 10138.10951694860}, + {0.00000000068, 2.24442548639, 24383.07910844140}, + {0.00000000078, 1.39649333997, 9411.46461508720}, + {0.00000000059, 4.95362151577, 35707.71008290740}, + {0.00000000073, 1.35229143121, 5327.47610838280}, + {0.00000000057, 3.16018882154, 5490.30096152400}, + {0.00000000072, 5.91833527334, 10881.09957748120}, + {0.00000000067, 0.66414713064, 29864.33402730900}, + {0.00000000065, 0.30352816135, 7018.95236352320}, + {0.00000000059, 5.36231868425, 10239.58386601080}, + {0.00000000056, 3.22196331515, 2636.72547263700}, + {0.00000000068, 5.32086226658, 3116.65941225980}, + {0.00000000059, 1.63156134967, 61306.01159706580}, + {0.00000000054, 4.29491690425, 21947.11137270000}, + {0.00000000070, 0.29271565928, 6528.90749622080}, + {0.00000000057, 5.89190132575, 34513.26307268280}, + {0.00000000054, 2.51856815404, 6279.19451463340}, + {0.00000000074, 1.38235845304, 9967.45389998160}, + {0.00000000054, 0.92276712152, 6286.95718534940}, + {0.00000000070, 5.00933012248, 6453.74872061060}, + {0.00000000053, 3.86543309344, 32370.97899156560}, + {0.00000000055, 4.51794544854, 34911.41207609100}, + {0.00000000063, 5.41479412056, 11502.83761653050}, + {0.00000000063, 2.34416220742, 11510.70192305670}, + {0.00000000056, 0.91310629913, 9910.58332750900}, + {0.00000000067, 4.03308763854, 34596.36465465240}, + {0.00000000060, 5.57024703495, 5756.90800324580}, + {0.00000000072, 2.80863088166, 10866.87248347960}, + {0.00000000066, 6.12047940728, 12074.48840752400}, + {0.00000000051, 2.59519527563, 11396.56344857420}, + {0.00000000062, 5.14746754396, 25287.72379939980}, + {0.00000000054, 2.50994032776, 5999.21653112620}, + {0.00000000051, 4.51195861837, 29822.78323632420}, + {0.00000000059, 0.44167237876, 250570.67585721909}, + {0.00000000051, 3.68849066760, 6262.72053059260}, + {0.00000000049, 0.54704693048, 22594.05489571199}, + {0.00000000065, 2.38423614501, 52670.06959330260}, + {0.00000000069, 5.34363738671, 66813.56483573320}, + {0.00000000056, 2.67216180349, 17892.93839400359}, + {0.00000000049, 4.18361320516, 18606.49894600020}, + {0.00000000055, 0.83886167974, 20452.86941222180}, + {0.00000000050, 1.46327331958, 37455.72649597440}, + {0.00000000058, 3.34847975377, 33990.61834428620}, + {0.00000000065, 1.45522693982, 76251.32777062019}, + {0.00000000056, 2.35650664200, 37724.75341974820}, + {0.00000000048, 1.80689447612, 206.18554843720}, + {0.00000000056, 3.84224878744, 5483.25472482600}, + {0.00000000053, 0.17334326094, 77717.29458646949}, + {0.00000000053, 0.79879700631, 77710.24834977149}, + {0.00000000047, 0.43240779709, 735.87651353180}, + {0.00000000053, 4.58786566028, 11616.97609101300}, + {0.00000000048, 6.20230111054, 4171.42553661380}, + {0.00000000052, 2.91719053030, 6993.00889854970}, + {0.00000000057, 3.42008310383, 50317.20343953080}, + {0.00000000048, 0.12356889012, 13362.44970679920}, + {0.00000000060, 5.52056066934, 949.17560896980}, + {0.00000000045, 3.37963782356, 10763.77970926100}, + {0.00000000047, 5.50958184902, 12779.45079542080}, + {0.00000000052, 5.42770349015, 310145.15282392364}, + {0.00000000061, 2.93237974631, 5791.41255753260}, + {0.00000000044, 2.87440620802, 8584.66166590080}, + {0.00000000046, 4.03141796560, 10667.80048204320}, + {0.00000000044, 1.21579107625, 6272.43918464160}, + {0.00000000047, 2.57670800912, 11492.54267579200}, + {0.00000000044, 3.62570223167, 63658.87775083760}, + {0.00000000051, 0.84531181151, 12345.73905754400}, + {0.00000000046, 1.17584556517, 149.56319713460}, + {0.00000000043, 0.01524970172, 37853.87549938260}, + {0.00000000043, 0.79038834934, 640.87760738220}, + {0.00000000044, 2.22554419931, 6293.71251534120}, + {0.00000000049, 1.01528394907, 149144.46708624958}, + {0.00000000041, 3.27146326065, 8858.31494432060}, + {0.00000000045, 3.03765521215, 65236.22129328540}, + {0.00000000058, 5.45843180927, 1975.49254585600}, + {0.00000000041, 1.32190847146, 2547.83753823240}, + {0.00000000047, 3.67626039848, 28313.28880466100}, + {0.00000000047, 6.21438985953, 10991.30589870060}, + {0.00000000040, 2.37237751212, 8273.82086703240}, + {0.00000000056, 1.09773690181, 77376.20102240759}, + {0.00000000040, 2.35698541041, 2699.73481931760}, + {0.00000000043, 5.28030897946, 17796.95916678580}, + {0.00000000054, 2.59175932091, 22910.44676536859}, + {0.00000000055, 0.07988985505, 83467.15635301729}, + {0.00000000041, 4.47510694062, 5618.31980486140}, + {0.00000000040, 1.35670430524, 27177.85152920020}, + {0.00000000041, 2.48011323946, 6549.68289171320}, + {0.00000000050, 2.56387920528, 82576.98122099529}, + {0.00000000042, 4.78798367468, 7856.89627409019}, + {0.00000000047, 2.75482175292, 18202.21671665939}, + {0.00000000039, 1.97008298629, 24491.42579258340}, + {0.00000000042, 4.04346599946, 7863.94251078820}, + {0.00000000039, 3.01033936420, 853.19638175200}, + {0.00000000038, 0.49178679251, 38650.17350619900}, + {0.00000000044, 1.35931241699, 21393.54196985760}, + {0.00000000036, 4.86047906533, 4157.19844261220}, + {0.00000000043, 5.64354880978, 1062.90504853820}, + {0.00000000039, 3.92736779879, 3903.91137641980}, + {0.00000000040, 5.39694918320, 9498.21223063460}, + {0.00000000043, 2.40863861919, 29424.63423291600}, + {0.00000000046, 2.08022244271, 12573.26524698360}, + {0.00000000050, 6.15760345261, 78051.34191383338}, +}; + +static const struct ln_vsop earth_radius_r1[RADIUS_R1] = { + {0.00103018607, 1.10748968172, 6283.07584999140}, + {0.00001721238, 1.06442300386, 12566.15169998280}, + {0.00000702217, 3.14159265359, 0.00000000000}, + {0.00000032345, 1.02168583254, 18849.22754997420}, + {0.00000030801, 2.84358443952, 5507.55323866740}, + {0.00000024978, 1.31906570344, 5223.69391980220}, + {0.00000018487, 1.42428709076, 1577.34354244780}, + {0.00000010077, 5.91385248388, 10977.07880469900}, + {0.00000008635, 0.27158192945, 5486.77784317500}, + {0.00000008654, 1.42046854427, 6275.96230299060}, + {0.00000005069, 1.68613408916, 5088.62883976680}, + {0.00000004985, 6.01402338185, 6286.59896834040}, + {0.00000004667, 5.98749245692, 529.69096509460}, + {0.00000004395, 0.51800423445, 4694.00295470760}, + {0.00000003870, 4.74932206877, 2544.31441988340}, + {0.00000003755, 5.07053801166, 796.29800681640}, + {0.00000004100, 1.08424801084, 9437.76293488700}, + {0.00000003518, 0.02290216978, 83996.84731811189}, + {0.00000003436, 0.94937503872, 71430.69561812909}, + {0.00000003221, 6.15628775321, 2146.16541647520}, + {0.00000003418, 5.41151581880, 775.52261132400}, + {0.00000002863, 5.48433323746, 10447.38783960440}, + {0.00000002525, 0.24296913555, 398.14900340820}, + {0.00000002205, 4.94892172085, 6812.76681508600}, + {0.00000002186, 0.41991932164, 8031.09226305840}, + {0.00000002828, 3.41986300734, 2352.86615377180}, + {0.00000002554, 6.13241770582, 6438.49624942560}, + {0.00000001932, 5.31374587091, 8429.24126646660}, + {0.00000002427, 3.09118902115, 4690.47983635860}, + {0.00000001730, 1.53685999718, 4705.73230754360}, + {0.00000002250, 3.68836395620, 7084.89678111520}, + {0.00000002094, 1.28169060400, 1748.01641306700}, + {0.00000001483, 3.22226346483, 7234.79425624200}, + {0.00000001434, 0.81293662216, 14143.49524243060}, + {0.00000001754, 3.22883705112, 6279.55273164240}, + {0.00000001583, 4.09815978783, 11499.65622279280}, + {0.00000001575, 5.53890314149, 3154.68708489560}, + {0.00000001847, 1.82041234937, 7632.94325965020}, + {0.00000001499, 3.63177937611, 11513.88331679440}, + {0.00000001337, 4.64442556061, 6836.64525283380}, + {0.00000001275, 2.69329661394, 1349.86740965880}, + {0.00000001348, 6.15284035323, 5746.27133789600}, + {0.00000001126, 3.35676107739, 17789.84561978500}, + {0.00000001470, 3.65282991735, 1194.44701022460}, + {0.00000001101, 4.49747427670, 4292.33083295040}, + {0.00000001168, 2.58033028504, 13367.97263110660}, + {0.00000001236, 5.64980098028, 5760.49843189760}, + {0.00000000985, 0.65326301914, 5856.47765911540}, + {0.00000000928, 2.32555018290, 10213.28554621100}, + {0.00000001073, 5.82672338169, 12036.46073488820}, + {0.00000000918, 0.76907130762, 16730.46368959580}, + {0.00000000876, 1.50335727807, 11926.25441366880}, + {0.00000001023, 5.62071200879, 6256.77753019160}, + {0.00000000853, 0.65678134630, 155.42039943420}, + {0.00000000802, 4.10519132094, 951.71840625060}, + {0.00000000859, 1.42880883564, 5753.38488489680}, + {0.00000000992, 1.14238001610, 1059.38193018920}, + {0.00000000814, 1.63584008733, 6681.22485339960}, + {0.00000000664, 4.55039663226, 5216.58037280140}, + {0.00000000627, 1.50782904323, 5643.17856367740}, + {0.00000000644, 4.19480024859, 6040.34724601740}, + {0.00000000590, 6.18371704849, 4164.31198961300}, + {0.00000000635, 0.52423584770, 6290.18939699220}, + {0.00000000650, 0.97935492869, 25132.30339996560}, + {0.00000000568, 2.30121525349, 10973.55568635000}, + {0.00000000549, 5.26737827342, 3340.61242669980}, + {0.00000000547, 2.20143332641, 1592.59601363280}, + {0.00000000526, 0.92464258271, 11371.70468975820}, + {0.00000000493, 5.91036281399, 3894.18182954220}, + {0.00000000483, 1.66005711540, 12168.00269657460}, + {0.00000000514, 3.59683072524, 10969.96525769820}, + {0.00000000516, 3.97164781773, 17298.18232732620}, + {0.00000000529, 5.03538677680, 9917.69687450980}, + {0.00000000487, 2.50544745305, 6127.65545055720}, + {0.00000000419, 4.05235655996, 10984.19235169980}, + {0.00000000538, 5.54081539813, 553.56940284240}, + {0.00000000402, 2.16859478359, 7860.41939243920}, + {0.00000000552, 2.32219865498, 11506.76976979360}, + {0.00000000367, 3.39145698451, 6496.37494542940}, + {0.00000000360, 5.34467204596, 7079.37385680780}, + {0.00000000334, 3.61346365667, 11790.62908865880}, + {0.00000000454, 0.28755421898, 801.82093112380}, + {0.00000000419, 3.69613970002, 10575.40668294180}, + {0.00000000319, 0.30793759304, 16200.77272450120}, + {0.00000000376, 5.81560210508, 7058.59846131540}, + {0.00000000364, 1.08425056923, 6309.37416979120}, + {0.00000000294, 4.54798604178, 11856.21865142450}, + {0.00000000290, 1.26451946335, 8635.94200376320}, + {0.00000000394, 4.15683669084, 26.29831979980}, + {0.00000000260, 5.09424572996, 10177.25767953360}, + {0.00000000241, 2.25766000302, 11712.95531823080}, + {0.00000000239, 1.06936978753, 242.72860397400}, + {0.00000000276, 3.44260568764, 5884.92684658320}, + {0.00000000255, 5.38496803122, 21228.39202354580}, + {0.00000000307, 4.24313885601, 3738.76143010800}, + {0.00000000213, 3.44661200485, 213.29909543800}, + {0.00000000198, 0.69427265195, 1990.74501704100}, + {0.00000000195, 5.16563409007, 12352.85260454480}, + {0.00000000213, 3.89937836808, 13916.01910964160}, + {0.00000000214, 4.00445200772, 5230.80746680300}, + {0.00000000184, 5.59805976614, 6283.14316029419}, + {0.00000000184, 2.85275392124, 7238.67559160000}, + {0.00000000179, 2.54259058252, 14314.16811304980}, + {0.00000000236, 5.58826125715, 6069.77675455340}, + {0.00000000189, 2.72689937708, 6062.66320755260}, + {0.00000000184, 6.04216273598, 6283.00853968860}, + {0.00000000225, 1.66128561344, 4732.03062734340}, + {0.00000000230, 3.62591335086, 6284.05617105960}, + {0.00000000172, 0.97566476085, 3930.20969621960}, + {0.00000000162, 2.19467339429, 18073.70493865020}, + {0.00000000215, 1.04672844028, 3496.03282613400}, + {0.00000000182, 5.17782354566, 17253.04110768959}, + {0.00000000167, 2.17754938066, 6076.89030155420}, + {0.00000000167, 4.75672473773, 17267.26820169119}, + {0.00000000149, 0.80944185798, 709.93304855830}, + {0.00000000149, 0.17584214812, 9779.10867612540}, + {0.00000000192, 5.00680790235, 11015.10647733480}, + {0.00000000141, 4.38420380014, 4136.91043351620}, + {0.00000000158, 4.60969054283, 9623.68827669120}, + {0.00000000133, 3.30507062245, 154717.60988768269}, + {0.00000000166, 6.13191098325, 3.52311834900}, + {0.00000000181, 1.60715321141, 7.11354700080}, + {0.00000000150, 5.28136702046, 13517.87010623340}, + {0.00000000142, 0.49788089569, 25158.60171976540}, + {0.00000000124, 6.03440459813, 9225.53927328300}, + {0.00000000124, 0.99251562639, 65147.61976813770}, + {0.00000000128, 1.92032744711, 22483.84857449259}, + {0.00000000124, 3.99739675184, 4686.88940770680}, + {0.00000000121, 2.37814805239, 167283.76158766549}, + {0.00000000123, 5.62315112940, 5642.19824260920}, + {0.00000000117, 5.81755956156, 12569.67481833180}, + {0.00000000157, 3.40236948518, 16496.36139620240}, + {0.00000000130, 2.10499918142, 1589.07289528380}, + {0.00000000116, 0.55839966736, 5849.36411211460}, + {0.00000000123, 5.81645568991, 6282.09552892320}, + {0.00000000110, 0.42176497674, 6172.86952877200}, + {0.00000000150, 4.26279600865, 3128.38876509580}, + {0.00000000106, 2.27436561182, 5429.87946823940}, + {0.00000000114, 1.52894564202, 12559.03815298200}, + {0.00000000121, 0.39459045915, 12132.43996210600}, + {0.00000000104, 2.41845930933, 426.59819087600}, + {0.00000000109, 5.82786999856, 16858.48253293320}, + {0.00000000102, 4.46626484910, 23543.23050468179}, + {0.00000000100, 2.93812275274, 4535.05943692440}, + {0.00000000097, 3.97935904984, 6133.51265285680}, + {0.00000000098, 0.87616810121, 6525.80445396540}, + {0.00000000110, 6.22339014386, 12146.66705610760}, + {0.00000000098, 3.17344332543, 10440.27429260360}, + {0.00000000096, 2.44128701699, 3097.88382272579}, + {0.00000000099, 5.75642493267, 7342.45778018060}, + {0.00000000090, 0.18984343165, 13119.72110282519}, + {0.00000000099, 5.58884724219, 2388.89402044920}, + {0.00000000091, 6.04278320182, 20426.57109242200}, + {0.00000000080, 1.29028142103, 5650.29211067820}, + {0.00000000086, 3.94529200528, 10454.50138660520}, + {0.00000000085, 1.92836879835, 29088.81141598500}, + {0.00000000076, 2.70726317966, 143571.32428481648}, + {0.00000000091, 5.63859073351, 8827.39026987480}, + {0.00000000076, 1.80783856698, 28286.99048486120}, + {0.00000000075, 3.40858032804, 5481.25491886760}, + {0.00000000070, 4.53719487231, 17256.63153634140}, + {0.00000000089, 1.10064490942, 11769.85369316640}, + {0.00000000066, 2.78384937771, 536.80451209540}, + {0.00000000068, 3.88199295043, 17260.15465469040}, + {0.00000000088, 3.88075269535, 7477.52286021600}, + {0.00000000061, 6.17558202197, 11087.28512591840}, + {0.00000000060, 4.34824715818, 6206.80977871580}, + {0.00000000082, 4.59843208943, 9388.00590941520}, + {0.00000000079, 1.63139280394, 4933.20844033260}, + {0.00000000081, 1.55550779371, 9380.95967271720}, + {0.00000000078, 4.20905757519, 5729.50644714900}, + {0.00000000058, 5.76889633224, 3634.62102451840}, + {0.00000000060, 0.93813100594, 12721.57209941700}, + {0.00000000071, 6.11408885148, 8662.24032356300}, + {0.00000000057, 5.48112524468, 18319.53658487960}, + {0.00000000070, 0.01749174864, 14945.31617355440}, + {0.00000000074, 1.09976045820, 16460.33352952499}, + {0.00000000056, 1.63036186739, 15720.83878487840}, + {0.00000000055, 4.86788348404, 13095.84266507740}, + {0.00000000060, 5.93729841267, 12539.85338018300}, + {0.00000000054, 0.22608242982, 15110.46611986620}, + {0.00000000054, 2.30250047594, 16062.18452611680}, + {0.00000000064, 2.13513754101, 7875.67186362420}, + {0.00000000059, 5.87963500139, 5331.35744374080}, + {0.00000000058, 2.30546168615, 955.59974160860}, + {0.00000000049, 1.93839278478, 5333.90024102160}, + {0.00000000054, 5.80331607119, 12043.57428188900}, + {0.00000000054, 4.44671053809, 4701.11650170840}, + {0.00000000049, 0.30241161485, 6805.65326808520}, + {0.00000000046, 2.76898193028, 6709.67404086740}, + {0.00000000046, 3.98449608961, 98068.53671630539}, + {0.00000000049, 3.72022009896, 12323.42309600880}, + {0.00000000045, 3.30065998328, 22003.91463486980}, + {0.00000000048, 0.71071357303, 6303.43116939020}, + {0.00000000061, 1.66030429494, 6262.30045449900}, + {0.00000000047, 1.26317154881, 11919.14086666800}, + {0.00000000051, 1.08020906825, 10988.80815753500}, + {0.00000000045, 0.89150445122, 51868.24866217880}, + {0.00000000043, 0.57756724285, 24356.78078864160}, + {0.00000000043, 1.61526242998, 6277.55292568400}, + {0.00000000045, 2.96132920534, 8982.81066930900}, + {0.00000000043, 5.74295325645, 11403.67699557500}, + {0.00000000055, 3.14274403422, 33019.02111220460}, + {0.00000000057, 0.06379726305, 15671.08175940660}, + {0.00000000041, 2.53761820726, 6262.72053059260}, + {0.00000000040, 1.53130436944, 18451.07854656599}, + {0.00000000052, 1.71451922581, 1551.04522264800}, + {0.00000000055, 0.89439119424, 11933.36796066960}, + {0.00000000045, 3.88495384656, 60530.48898574180}, + {0.00000000040, 4.75740908001, 38526.57435087200}, + {0.00000000040, 3.77498297348, 26087.90314157420}, + {0.00000000039, 2.97113832621, 2118.76386037840}, + {0.00000000040, 3.36050962605, 10021.83728009940}, + {0.00000000047, 1.67051113434, 6303.85124548380}, + {0.00000000052, 5.21827368711, 77713.77146812050}, + {0.00000000047, 4.26356628717, 21424.46664430340}, + {0.00000000037, 1.66712389942, 6819.88036208680}, + {0.00000000037, 0.65746800933, 12029.34718788740}, + {0.00000000035, 3.36255650927, 24072.92146977640}, + {0.00000000036, 0.11087914947, 10344.29506538580}, + {0.00000000040, 4.14725582115, 2787.04302385740}, + {0.00000000035, 5.93650887012, 31570.79964939120}, + {0.00000000036, 2.15108874765, 30774.50164257480}, + {0.00000000036, 1.75078825382, 16207.88627150200}, + {0.00000000034, 2.75708224536, 12139.55350910680}, + {0.00000000034, 6.16891378800, 24491.42579258340}, + {0.00000000034, 2.31528650443, 55798.45835839840}, + {0.00000000032, 4.21446357042, 15664.03552270859}, + {0.00000000034, 3.19783054699, 32217.20018108080}, + {0.00000000039, 1.24979117796, 6418.14093002680}, + {0.00000000038, 5.89832942685, 640.87760738220}, + {0.00000000033, 4.80200120107, 16723.35014259500}, + {0.00000000032, 1.72442327688, 27433.88921587499}, + {0.00000000035, 4.44608896525, 18202.21671665939}, + {0.00000000031, 4.52790731280, 6702.56049386660}, + {0.00000000034, 3.96287980676, 18216.44381066100}, + {0.00000000030, 5.06259854444, 226858.23855437008}, + {0.00000000034, 1.43910280005, 49515.38250840700}, + {0.00000000030, 0.29303163371, 13521.75144159140}, + {0.00000000029, 2.02633840220, 11609.86254401220}, + {0.00000000030, 2.54923230240, 9924.81042151060}, + {0.00000000032, 4.91793198558, 11300.58422135640}, + {0.00000000030, 0.23284423547, 23581.25817731760}, + {0.00000000029, 1.62807736495, 639.89728631400}, + {0.00000000028, 3.84568936822, 2699.73481931760}, + {0.00000000029, 1.83149729794, 29822.78323632420}, + {0.00000000033, 4.60320094415, 19004.64794940840}, + {0.00000000027, 1.86151121799, 6288.59877429880}, + {0.00000000030, 4.46494072240, 36147.40987730040}, + {0.00000000028, 5.19684492912, 5863.59120611620}, + {0.00000000035, 4.52695674113, 36949.23080842420}, + {0.00000000027, 3.52528177609, 10770.89325626180}, + {0.00000000026, 1.48499438453, 11080.17157891760}, + {0.00000000035, 2.82154380962, 19402.79695281660}, + {0.00000000025, 2.46339998836, 6279.48542133960}, + {0.00000000026, 4.97688894643, 16737.57723659660}, + {0.00000000027, 0.40827112500, 12964.30070339100}, + {0.00000000029, 4.15148654061, 45892.73043315699}, + {0.00000000026, 4.56404104286, 17796.95916678580}, + {0.00000000025, 2.89309528854, 6286.66627864320}, + {0.00000000026, 4.82914580957, 1066.49547719000}, + {0.00000000031, 3.93096113738, 29864.33402730900}, + {0.00000000024, 6.14987193584, 18606.49894600020}, + {0.00000000024, 3.74225964547, 29026.48522950779}, + {0.00000000025, 5.70460621565, 27707.54249429480}, + {0.00000000025, 5.33928840652, 15141.39079431200}, + {0.00000000023, 2.37624087345, 17996.03116822220}, + {0.00000000026, 1.34231351782, 18875.52586977400}, + {0.00000000022, 5.50791626120, 6245.04817735560}, + {0.00000000024, 1.33998410121, 19800.94595622480}, + {0.00000000023, 0.22512280890, 6279.78949257360}, + {0.00000000022, 1.17576471775, 11925.27409260060}, + {0.00000000022, 3.58603606640, 6915.85958930460}, + {0.00000000023, 3.21621246666, 6286.36220740920}, + {0.00000000029, 2.09564449439, 15265.88651930040}, + {0.00000000022, 4.74660932338, 28230.18722269139}, + {0.00000000021, 2.30688751432, 5999.21653112620}, + {0.00000000028, 3.92087592807, 18208.34994259200}, + {0.00000000021, 3.22643339385, 25934.12433108940}, + {0.00000000021, 3.04956726238, 6566.93516885660}, + {0.00000000027, 5.35645770522, 33794.54372352860}, + {0.00000000025, 5.91542362188, 6489.26139842860}, + {0.00000000020, 1.52296293311, 135.06508003540}, + {0.00000000019, 1.78134428631, 156137.47598479928}, + {0.00000000019, 0.34388684087, 5327.47610838280}, + {0.00000000026, 3.41701003233, 25287.72379939980}, + {0.00000000019, 2.86664271911, 18422.62935909819}, + {0.00000000019, 4.71432851499, 77690.75950573849}, + {0.00000000019, 2.54227398241, 77736.78343050249}, + {0.00000000020, 5.91915117116, 48739.85989708300}, +}; + +static const struct ln_vsop earth_radius_r2[RADIUS_R2] = { + {0.00004359385, 5.78455133808, 6283.07584999140}, + {0.00000123633, 5.57935427994, 12566.15169998280}, + {0.00000012342, 3.14159265359, 0.00000000000}, + {0.00000008792, 3.62777893099, 77713.77146812050}, + {0.00000005689, 1.86958905084, 5573.14280143310}, + {0.00000003302, 5.47034879713, 18849.22754997420}, + {0.00000001471, 4.47964125007, 5507.55323866740}, + {0.00000001013, 2.81323115556, 5223.69391980220}, + {0.00000000854, 3.10776566900, 1577.34354244780}, + {0.00000001102, 2.84173992403, 161000.68573767410}, + {0.00000000648, 5.47348203398, 775.52261132400}, + {0.00000000608, 1.37894173533, 6438.49624942560}, + {0.00000000499, 4.41649242250, 6286.59896834040}, + {0.00000000416, 0.90332697974, 10977.07880469900}, + {0.00000000404, 3.20567269530, 5088.62883976680}, + {0.00000000351, 1.81081728907, 5486.77784317500}, + {0.00000000466, 3.65086758149, 7084.89678111520}, + {0.00000000458, 5.38585314743, 149854.40013480789}, + {0.00000000304, 3.51015066341, 796.29800681640}, + {0.00000000266, 6.17413982699, 6836.64525283380}, + {0.00000000281, 1.83874672540, 4694.00295470760}, + {0.00000000262, 1.41420110644, 2146.16541647520}, + {0.00000000264, 3.14103683911, 71430.69561812909}, + {0.00000000319, 5.35037932146, 3154.68708489560}, + {0.00000000238, 2.17695432424, 155.42039943420}, + {0.00000000229, 4.75969588070, 7234.79425624200}, + {0.00000000291, 4.61776401638, 4690.47983635860}, + {0.00000000211, 0.21864885298, 4705.73230754360}, + {0.00000000204, 4.22895113488, 1349.86740965880}, + {0.00000000195, 4.58550676556, 529.69096509460}, + {0.00000000255, 2.81442711144, 1748.01641306700}, + {0.00000000182, 5.70454011389, 6040.34724601740}, + {0.00000000180, 6.02147727878, 4292.33083295040}, + {0.00000000186, 1.58690991244, 6309.37416979120}, + {0.00000000167, 2.88802733052, 9437.76293488700}, + {0.00000000166, 1.99990574734, 8031.09226305840}, + {0.00000000160, 0.04412738495, 2544.31441988340}, + {0.00000000197, 2.01089431842, 1194.44701022460}, + {0.00000000165, 5.78372596774, 83996.84731811189}, + {0.00000000214, 3.38300910371, 7632.94325965020}, + {0.00000000140, 0.36669664351, 10447.38783960440}, + {0.00000000151, 0.95519595275, 6127.65545055720}, + {0.00000000136, 1.48417295645, 2352.86615377180}, + {0.00000000128, 5.48057748834, 951.71840625060}, + {0.00000000126, 5.26866506592, 6279.55273164240}, + {0.00000000127, 3.77552907014, 6812.76681508600}, + {0.00000000103, 4.95897533789, 398.14900340820}, + {0.00000000104, 0.70183576826, 1592.59601363280}, + {0.00000000101, 1.14481598642, 3894.18182954220}, + {0.00000000131, 0.76624310306, 553.56940284240}, + {0.00000000109, 5.41063597567, 6256.77753019160}, + {0.00000000078, 5.84775340741, 242.72860397400}, + {0.00000000097, 1.94685257714, 11856.21865142450}, + {0.00000000100, 5.19725292131, 244287.60000722769}, + {0.00000000076, 0.70480774041, 8429.24126646660}, + {0.00000000080, 6.18430772683, 1059.38193018920}, + {0.00000000068, 5.29561709093, 14143.49524243060}, + {0.00000000085, 5.39487308005, 25132.30339996560}, + {0.00000000055, 5.16874637579, 7058.59846131540}, + {0.00000000063, 0.48494730699, 801.82093112380}, + {0.00000000058, 4.07254840265, 13367.97263110660}, + {0.00000000051, 3.89696552232, 12036.46073488820}, + {0.00000000051, 5.56335232286, 1990.74501704100}, + {0.00000000060, 2.25046596710, 8635.94200376320}, + {0.00000000049, 5.58163417371, 6290.18939699220}, + {0.00000000051, 3.87240194908, 26.29831979980}, + {0.00000000051, 4.19300909995, 7860.41939243920}, + {0.00000000041, 3.97169191582, 10973.55568635000}, + {0.00000000041, 3.57080919230, 7079.37385680780}, + {0.00000000056, 2.76959005761, 90955.55169449610}, + {0.00000000042, 1.91461189163, 7477.52286021600}, + {0.00000000042, 0.42775891995, 10213.28554621100}, + {0.00000000042, 1.06925480488, 709.93304855830}, + {0.00000000038, 6.17935925345, 9917.69687450980}, + {0.00000000050, 0.81691517401, 11506.76976979360}, + {0.00000000053, 1.45828359397, 233141.31440436149}, + {0.00000000038, 3.32444534628, 5643.17856367740}, + {0.00000000047, 6.21543665927, 6681.22485339960}, + {0.00000000037, 0.36359309980, 10177.25767953360}, + {0.00000000045, 5.29587706357, 10575.40668294180}, + {0.00000000034, 5.63446915337, 6525.80445396540}, + {0.00000000034, 5.36385158519, 4933.20844033260}, + {0.00000000035, 5.36152295839, 25158.60171976540}, + {0.00000000042, 5.08837645072, 11015.10647733480}, + {0.00000000042, 4.22496037505, 88860.05707098669}, + {0.00000000039, 1.99171699618, 6284.05617105960}, + {0.00000000029, 3.19088628170, 11926.25441366880}, + {0.00000000029, 0.14996158324, 12168.00269657460}, + {0.00000000030, 1.58346276808, 9779.10867612540}, + {0.00000000026, 4.16210340581, 12569.67481833180}, + {0.00000000036, 2.74684637873, 3738.76143010800}, + {0.00000000026, 0.72824915320, 1589.07289528380}, + {0.00000000031, 5.34906371821, 143571.32428481648}, + {0.00000000025, 0.10240267494, 22483.84857449259}, + {0.00000000030, 3.47110495524, 14945.31617355440}, + {0.00000000026, 3.89359701125, 5753.38488489680}, + {0.00000000024, 1.18744224678, 4535.05943692440}, + {0.00000000033, 2.99317143244, 3930.20969621960}, + {0.00000000024, 1.57253767584, 6496.37494542940}, + {0.00000000024, 3.47434797542, 4136.91043351620}, + {0.00000000022, 3.91230073719, 6275.96230299060}, + {0.00000000025, 4.02978941287, 3128.38876509580}, + {0.00000000023, 1.07724492065, 12721.57209941700}, + {0.00000000021, 1.89591807148, 16730.46368959580}, + {0.00000000025, 2.42198937013, 5729.50644714900}, + {0.00000000020, 1.78163489101, 17789.84561978500}, + {0.00000000021, 0.49258939822, 29088.81141598500}, + {0.00000000026, 4.14947806747, 2388.89402044920}, + {0.00000000027, 2.54785812264, 3496.03282613400}, + {0.00000000020, 4.29944129273, 16858.48253293320}, + {0.00000000021, 5.97796936723, 7.11354700080}, + {0.00000000019, 0.80292033311, 16062.18452611680}, + {0.00000000024, 4.89894141052, 17260.15465469040}, + {0.00000000025, 1.37003752175, 6282.09552892320}, + {0.00000000022, 4.92663152168, 18875.52586977400}, + {0.00000000023, 5.68902059771, 16460.33352952499}, + {0.00000000023, 3.03021283729, 66567.48586525429}, + {0.00000000016, 3.89713736666, 5331.35744374080}, + {0.00000000016, 5.68562539832, 12559.03815298200}, + {0.00000000016, 3.95085099736, 3097.88382272579}, + {0.00000000016, 3.99041783945, 6283.14316029419}, + {0.00000000020, 6.10643919100, 167283.76158766549}, + {0.00000000015, 4.09775914607, 11712.95531823080}, + {0.00000000016, 5.71769940700, 17298.18232732620}, + {0.00000000016, 3.28894009404, 5884.92684658320}, + {0.00000000015, 4.42564243680, 13517.87010623340}, + {0.00000000016, 4.43452080930, 6283.00853968860}, + {0.00000000014, 1.44384279999, 4164.31198961300}, + {0.00000000014, 4.47380919159, 11790.62908865880}, + {0.00000000014, 4.77646531825, 7342.45778018060}, + {0.00000000011, 2.56768522896, 5481.25491886760}, + {0.00000000011, 1.51443332200, 16200.77272450120}, + {0.00000000011, 0.88708889185, 21228.39202354580}, + {0.00000000014, 4.50116508534, 640.87760738220}, +}; + +static const struct ln_vsop earth_radius_r3[RADIUS_R3] = { + {0.00000144595, 4.27319433901, 6283.07584999140}, + {0.00000006729, 3.91706261708, 12566.15169998280}, + {0.00000000774, 0.00000000000, 0.00000000000}, + {0.00000000247, 3.73021571217, 18849.22754997420}, + {0.00000000036, 2.80081409050, 6286.59896834040}, + {0.00000000033, 5.62990083112, 6127.65545055720}, + {0.00000000018, 3.72826142555, 6438.49624942560}, + {0.00000000016, 4.26011484232, 6525.80445396540}, + {0.00000000014, 3.47817116396, 6256.77753019160}, + {0.00000000012, 3.55747379482, 25132.30339996560}, + {0.00000000010, 4.43995693209, 4705.73230754360}, + {0.00000000010, 4.28045255470, 83996.84731811189}, + {0.00000000009, 5.36457057335, 6040.34724601740}, + {0.00000000008, 1.78458957263, 5507.55323866740}, + {0.00000000009, 0.47275199930, 6279.55273164240}, + {0.00000000009, 1.34741231639, 6309.37416979120}, + {0.00000000009, 0.77092900708, 5729.50644714900}, + {0.00000000007, 3.50146897332, 7058.59846131540}, + {0.00000000005, 2.89071061700, 775.52261132400}, + {0.00000000006, 2.36514111314, 6836.64525283380}, +}; + +static const struct ln_vsop earth_radius_r4[RADIUS_R4] = { + {0.00000003858, 2.56389016346, 6283.07584999140}, + {0.00000000306, 2.26911740541, 12566.15169998280}, + {0.00000000053, 3.44031471924, 5573.14280143310}, + {0.00000000015, 2.03136359366, 18849.22754997420}, + {0.00000000013, 2.05688873673, 77713.77146812050}, + {0.00000000007, 4.41218854480, 161000.68573767410}, + {0.00000000004, 5.33854414781, 6438.49624942560}, + {0.00000000006, 3.81514213664, 149854.40013480789}, + {0.00000000004, 4.26602478239, 6127.65545055720}, +}; + +static const struct ln_vsop earth_radius_r5[RADIUS_R5] = { + {0.00000000086, 1.21805304895, 6283.07584999140}, + {0.00000000012, 0.65572878044, 12566.15169998280}, +}; + +/* Use in earth-sun function */ +double ln_calc_series(const struct ln_vsop *data, int terms, double t) +{ + double value = 0; + int i; + + for (i = 0; i < terms; i++) { + value += data->A * cos(data->B + data->C * t); + data++; + } + + return value; +} + +/* Get Julian day from Gregorian year, month and day */ +double julian_int(int year, int month, int day) +{ + int a, b; + + if (month < 3) { + year--; + month += 12; + } + + /* check for Julian or Gregorian calendar (starts Oct 4th 1582) */ + b = 0; + if (year > 1582 || + (year == 1582 && (month > 10 || (month == 10 && day >= 4)))) { + a = year / 100; + b = 2 - a + (a / 4); + } + + return ((int)(365.25 * (year + 4716)) + (int)(30.6001 * (month + 1)) + + day + b - 1524.5); +} + +/* Get Julian day form Gregorian string yyyy-mm-dd */ +double julian_char(const char date[]) +{ + int day, month, year; + + year = atoi(date); + month = atoi(date + 5); + day = atoi(date + 8); + + return julian_int(year, month, day); +} + +/* Earth-Sun distance in astronomical units */ +double earth_sun(const char *date) +{ + double t; + double R0, R1, R2, R3, R4, R5; + + t = (julian_char(date) - 2451545.0) / 365250.0; + + R0 = ln_calc_series(earth_radius_r0, RADIUS_R0, t); + R1 = ln_calc_series(earth_radius_r1, RADIUS_R1, t); + R2 = ln_calc_series(earth_radius_r2, RADIUS_R2, t); + R3 = ln_calc_series(earth_radius_r3, RADIUS_R3, t); + R4 = ln_calc_series(earth_radius_r4, RADIUS_R4, t); + R5 = ln_calc_series(earth_radius_r5, RADIUS_R5, t); + + return (R0 + R1 * t + R2 * t * t + R3 * t * t * t + R4 * t * t * t * t + + R5 * t * t * t * t * t); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- diff -Nru saga-2.1.0+dfsg/src/modules/imagery/imagery_tools/landsat_toar_core.h saga-2.1.4+dfsg/src/modules/imagery/imagery_tools/landsat_toar_core.h --- saga-2.1.0+dfsg/src/modules/imagery/imagery_tools/landsat_toar_core.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/imagery/imagery_tools/landsat_toar_core.h 2014-11-13 08:32:18.000000000 +0000 @@ -0,0 +1,93 @@ +#ifndef _LANDSAT_H +#define _LANDSAT_H + +#define UNCORRECTED 0 +#define CORRECTED 1 + +#define DOS 10 +#define DOS1 12 +#define DOS2 14 +#define DOS2b 15 +#define DOS3 16 +#define DOS4 18 + +#define NOMETADATAFILE 0 +#define METADATAFILE 1 + +/***************************************************** + * Landsat Structures + * + * Lmax and Lmin in W / (m^2 * sr * µm) -> Radiance + * Esun in W / (m^2 * µm) -> Irradiance + ****************************************************/ + +#define MAX_BANDS 11 + +typedef struct +{ + int number; /* Band number */ + int code; /* Band code */ + + double wavemax, wavemin; /* Wavelength in micron */ + + double esun; /* Mean solar irradiance */ + double lmax, lmin; /* Spectral radiance */ + double qcalmax, qcalmin; /* Quantized calibrated pixel */ + + char thermal; /* Flag to thermal band */ + double gain, bias; /* Gain and Bias of sensor */ + double K1, K2; /* Thermal calibration + * or Rad2Ref constants */ +} band_data; + +typedef struct +{ + int flag; /* Line-data or file-data */ + unsigned char number; /* Landsat number */ + + char creation[11]; /* Image production date */ + char date[11]; /* Image acquisition date */ + double time; /* Image acquisition time */ + + double dist_es; /* Distance Earth-Sun */ + double sun_elev; /* Sun elevation */ + double sun_az; /* Sun azimuth */ + + char sensor[10]; /* Sensor: MSS, TM, ETM+, OLI/TIRS */ + int bands; /* Total number of bands */ + band_data band[MAX_BANDS]; /* Data for each band */ + +} lsat_data; + + +/***************************************************************************** + * Landsat Equations Prototypes + *****************************************************************************/ + +double lsat_qcal2rad(double, band_data *); +double lsat_rad2ref(double, band_data *); +double lsat_rad2temp(double, band_data *); + +void lsat_bandctes(lsat_data *, int, char, double, int, double); + +//--------------------------------------------------------- +bool lsat_metadata(const char *, lsat_data *); + +void set_MSS1(lsat_data *); +void set_MSS2(lsat_data *); +void set_MSS3(lsat_data *); +void set_MSS4(lsat_data *); +void set_MSS5(lsat_data *); + +void set_TM4(lsat_data *); +void set_TM5(lsat_data *); + +void set_ETM(lsat_data *, const char[]); + +void set_OLI(lsat_data *); + +//--------------------------------------------------------- +void G_debug (int i, const char *s); +void G_warning (const char *s); + +#endif diff -Nru saga-2.1.0+dfsg/src/modules/imagery/imagery_tools/landsat_toar.cpp saga-2.1.4+dfsg/src/modules/imagery/imagery_tools/landsat_toar.cpp --- saga-2.1.0+dfsg/src/modules/imagery/imagery_tools/landsat_toar.cpp 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/imagery/imagery_tools/landsat_toar.cpp 2014-11-13 08:32:18.000000000 +0000 @@ -0,0 +1,792 @@ +/********************************************************** + * Version $Id: landsat_toar.cpp 2165 2014-06-18 15:38:29Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// imagery_tools // +// // +//-------------------------------------------------------// +// // +// landsat_toar.cpp // +// // +// Copyright (C) 2013 by // +// Benjamin Bechtel & Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Hamburg // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "landsat_toar.h" + +//--------------------------------------------------------- +#include "landsat_toar_core.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +enum +{ + mss1 = 0, // Landsat-1 MSS + mss2, // Landsat-2 MSS + mss3, // Landsat-3 MSS + mss4, // Landsat-4 MSS + mss5, // Landsat-5 MSS + tm4, // Landsat-4 TM + tm5, // Landsat-5 TM + tm7, // Landsat-7 ETM+ + oli8 // Landsat-8 OLI/TIRS +}; + +//--------------------------------------------------------- +#define PRM_IN(sensor, id) CSG_String::Format(SG_T("DN_%s%02d"), CSG_String(sensor).c_str(), id) +#define PRM_OUT(sensor, id) CSG_String::Format(SG_T("RF_%s%02d"), CSG_String(sensor).c_str(), id) +#define PRM_ADD_BAND__IN(sensor, id) Parameters.Add_Grid(pNode, PRM_IN (sensor, id), CSG_String::Format(SG_T("%s %s %d"), _TL("DN") , _TL("Band"), id), _TL(""), PARAMETER_INPUT_OPTIONAL); +#define PRM_ADD_BAND_OUT(sensor, id) Parameters.Add_Grid(pNode, PRM_OUT(sensor, id), CSG_String::Format(SG_T("%s %s %d"), _TL("Reflectance"), _TL("Band"), id), _TL(""), PARAMETER_OUTPUT_OPTIONAL); +#define PRM_ENABLE_OUTPUT(sensor, id) pParameters->Set_Enabled(PRM_OUT(sensor, id), pParameters->Get_Parameter(PRM_IN(sensor, id)) && pParameters->Get_Parameter(PRM_IN(sensor, id))->asGrid()) + +//--------------------------------------------------------- +#define GET_DESC_INT(name, value) CSG_String::Format(SG_T("%s: %d\n"), name, value) +#define GET_DESC_FLT(name, value) CSG_String::Format(SG_T("%s: %f\n"), name, value) +#define GET_DESC_RNG(name, min, max) CSG_String::Format(SG_T("%s: %f / %f\n"), name, min, max) +#define GET_DESC_STR(name, value) CSG_String(name) + ": " + CSG_String(value) + "\n" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool Set_Date_from_String (char *date, const CSG_String s) +{ + // yyyy-mm-dd + // 0123456789 + + if( s.Length() == 10 ) + { + strncpy(date, s.b_str(), 11); + + return( true ); + } + + return( false ); +} + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool Load_MetaFile (const CSG_String &MetaFile, lsat_data &lsat) +{ + return( SG_File_Exists(MetaFile) && lsat_metadata(MetaFile, &lsat) ); +} + +//--------------------------------------------------------- +int Get_Sensor_Index (int LSat_Number, const CSG_String &LSat_Sensor) +{ + if( !LSat_Sensor.CmpNoCase("MSS") ) + { + switch( LSat_Number ) + { + case 1: return(0); break; // Landsat-1 MSS + case 2: return(1); break; // Landsat-2 MSS + case 3: return(2); break; // Landsat-3 MSS + case 4: return(3); break; // Landsat-4 MSS + case 5: return(4); break; // Landsat-5 MSS + } + } + else if( !CSG_String(LSat_Sensor).CmpNoCase("TM") ) + { + switch( LSat_Number ) + { + case 4: return(5); break; // Landsat-1 MSS + case 5: return(6); break; // Landsat-2 MSS + } + } + else if( !CSG_String(LSat_Sensor).Find("ETM") && LSat_Number == 7 ) + { + return(7); // Landsat-7 ETM+ + } + else if( !CSG_String(LSat_Sensor).Find("OLI") && LSat_Number == 8 ) + { + return(8); // Landsat-8 OLI/TIRS + } + + return( -1 ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +CLandsat_TOAR::CLandsat_TOAR(void) +{ + CSG_Parameter *pNode; + + //----------------------------------------------------- + Set_Name (_TL("Top of Atmosphere Reflectance")); + + Set_Author ("B.Bechtel, O.Conrad (c) 2013"); + + Set_Description (_TW( + "Calculation of top-of-atmosphere radiance or reflectance and temperature (TOAR) for Landsat MSS/TM/ETM+. " + "This module incorporates E.J. Tizado's GRASS GIS implementation (i.landsat.toar).\n" + "\n" + "References:\n" + "Landsat 7 Science Data Users Handbook" + )); + + //----------------------------------------------------- + pNode = Parameters.Add_Grid_System(NULL, "GS_MSS_SPECTRAL", _TL("Spectral" ), _TL("")); + PRM_ADD_BAND__IN("MSS", 1); PRM_ADD_BAND__IN("MSS", 2); PRM_ADD_BAND__IN("MSS", 3); PRM_ADD_BAND__IN("MSS", 4); + PRM_ADD_BAND_OUT("MSS", 1); PRM_ADD_BAND_OUT("MSS", 2); PRM_ADD_BAND_OUT("MSS", 3); PRM_ADD_BAND_OUT("MSS", 4); + + pNode = Parameters.Add_Grid_System(NULL, "GS_ETM_SPECTRAL", _TL("Spectral" ), _TL("")); + PRM_ADD_BAND__IN("ETM", 1); PRM_ADD_BAND__IN("ETM", 2); PRM_ADD_BAND__IN("ETM", 3); PRM_ADD_BAND__IN("ETM", 4); PRM_ADD_BAND__IN("ETM", 5); PRM_ADD_BAND__IN("ETM", 7); + PRM_ADD_BAND_OUT("ETM", 1); PRM_ADD_BAND_OUT("ETM", 2); PRM_ADD_BAND_OUT("ETM", 3); PRM_ADD_BAND_OUT("ETM", 4); PRM_ADD_BAND_OUT("ETM", 5); PRM_ADD_BAND_OUT("ETM", 7); + + pNode = Parameters.Add_Grid_System(NULL, "GS_OLI_SPECTRAL", _TL("Spectral" ), _TL("")); + PRM_ADD_BAND__IN("OLI", 1); PRM_ADD_BAND__IN("OLI", 2); PRM_ADD_BAND__IN("OLI", 3); PRM_ADD_BAND__IN("OLI", 4); PRM_ADD_BAND__IN("OLI", 5); PRM_ADD_BAND__IN("OLI", 6); PRM_ADD_BAND__IN("OLI", 7); PRM_ADD_BAND__IN("OLI", 9); + PRM_ADD_BAND_OUT("OLI", 1); PRM_ADD_BAND_OUT("OLI", 2); PRM_ADD_BAND_OUT("OLI", 3); PRM_ADD_BAND_OUT("OLI", 4); PRM_ADD_BAND_OUT("OLI", 5); PRM_ADD_BAND_OUT("OLI", 6); PRM_ADD_BAND_OUT("OLI", 7); PRM_ADD_BAND_OUT("OLI", 9); + + pNode = Parameters.Add_Grid_System(NULL, "GS__TM_THERMAL" , _TL("Thermal" ), _TL("")); + PRM_ADD_BAND__IN("_TM", 6); + PRM_ADD_BAND_OUT("_TM", 6); + + pNode = Parameters.Add_Grid_System(NULL, "GS_ETM_THERMAL" , _TL("Thermal" ), _TL("")); + PRM_ADD_BAND__IN("ETM", 61); PRM_ADD_BAND__IN("ETM", 62); + PRM_ADD_BAND_OUT("ETM", 61); PRM_ADD_BAND_OUT("ETM", 62); + + pNode = Parameters.Add_Grid_System(NULL, "GS_OLI_THERMAL" , _TL("Thermal" ), _TL("")); + PRM_ADD_BAND__IN("OLI", 10); PRM_ADD_BAND__IN("OLI", 11); + PRM_ADD_BAND_OUT("OLI", 10); PRM_ADD_BAND_OUT("OLI", 11); + + pNode = Parameters.Add_Grid_System(NULL, "GS_PAN" , _TL("Panchromatic"), _TL("")); + PRM_ADD_BAND__IN("PAN", 8); + PRM_ADD_BAND_OUT("PAN", 8); + + //----------------------------------------------------- + Parameters.Add_FilePath( + NULL , "METAFILE" , _TL("Metadata File"), + _TL("Name of Landsat metadata file (.met or MTL.txt)"), + CSG_String::Format(SG_T("%s|*.met;*.txt|%s|*.*"), + _TL("Metadata Files (*.met, *.txt)"), + _TL("All Files") + ) + ); + + //----------------------------------------------------- + Parameters.Add_Choice( + NULL , "SENSOR" , _TL("Spacecraft Sensor"), + _TL(""), + CSG_String::Format(SG_T("%s|%s|%s|%s|%s|%s|%s|%s|%s|"), + _TL("Landsat-1 MSS"), + _TL("Landsat-2 MSS"), + _TL("Landsat-3 MSS"), + _TL("Landsat-4 MSS"), + _TL("Landsat-5 MSS"), + _TL("Landsat-4 TM"), + _TL("Landsat-5 TM"), + _TL("Landsat-7 ETM+"), + _TL("Landsat-8 OLI/TIRS") + ), 7 + ); + + //----------------------------------------------------- + Parameters.Add_String( + NULL , "DATE_ACQU" , _TL("Image Acquisition Date"), + _TL("Image acquisition date (yyyy-mm-dd)"), + "2001-01-01" + ); + + Parameters.Add_String( + NULL , "DATE_PROD" , _TL("Image Creation Date"), + _TL("Image creation date (yyyy-mm-dd)"), + "2001-01-01" + ); + + Parameters.Add_Value( + NULL , "SUN_HGT" , _TL("Suns's Height"), + _TL("Sun's height above horizon in degree"), + PARAMETER_TYPE_Double, 45.0, 0.0, true, 90.0, true + ); + + Parameters.Add_Value( + NULL , "AS_RAD" , _TL("At-Sensor Radiance"), + _TL("Output at-sensor radiance for all bands"), + PARAMETER_TYPE_Bool, false + ); + + //----------------------------------------------------- + pNode = Parameters.Add_Choice( + NULL , "AC_METHOD" , _TL("Atmospheric Correction"), + _TL(""), + CSG_String::Format(SG_T("%s|%s|%s|%s|%s|%s|%s|"), + _TL("uncorrected"), + _TL("corrected"), + _TL("dark object subtraction 1"), + _TL("dark object subtraction 2"), + _TL("dark object subtraction 2b"), + _TL("dark object subtraction 3"), + _TL("dark object subtraction 4") + ), 0 + ); + + Parameters.Add_Value( + pNode , "AC_DO_CELLS" , _TL("Minimum Number of Dark Object Cells"), + _TL("Minimum pixels to consider digital number as dark object"), + PARAMETER_TYPE_Int, 1000, 0, true + ); + + Parameters.Add_Value( + pNode , "AC_RAYLEIGH" , _TL("Rayleigh Scattering"), + _TL("Rayleigh atmosphere (diffuse sky irradiance)"), + PARAMETER_TYPE_Double, 0.0 + ); + + Parameters.Add_Value( + pNode , "AC_SUN_RAD" , _TL("Solar Radiance"), + _TL("Percent of solar radiance in path radiance"), + PARAMETER_TYPE_Double, 1.0, 0.0, true, 100.0, true + ); + + //----------------------------------------------------- + pNode = Parameters.Add_Node( + NULL , "ETM_GAIN" , _TL("ETM+ Gain"), + _TL("Gain (H/L) of all Landsat ETM+ bands (1-5,61,62,7,8)") + ); + + Parameters.Add_Choice(pNode, "ETM_GAIN_10", _TL("Band 1" ), _TL(""), CSG_String::Format(SG_T("%s|%s|"), _TL("low"), _TL("high")), 1); + Parameters.Add_Choice(pNode, "ETM_GAIN_20", _TL("Band 2" ), _TL(""), CSG_String::Format(SG_T("%s|%s|"), _TL("low"), _TL("high")), 1); + Parameters.Add_Choice(pNode, "ETM_GAIN_30", _TL("Band 3" ), _TL(""), CSG_String::Format(SG_T("%s|%s|"), _TL("low"), _TL("high")), 1); + Parameters.Add_Choice(pNode, "ETM_GAIN_40", _TL("Band 4" ), _TL(""), CSG_String::Format(SG_T("%s|%s|"), _TL("low"), _TL("high")), 1); + Parameters.Add_Choice(pNode, "ETM_GAIN_50", _TL("Band 5" ), _TL(""), CSG_String::Format(SG_T("%s|%s|"), _TL("low"), _TL("high")), 1); + Parameters.Add_Choice(pNode, "ETM_GAIN_61", _TL("Band 61"), _TL(""), CSG_String::Format(SG_T("%s|%s|"), _TL("low"), _TL("high")), 0); + Parameters.Add_Choice(pNode, "ETM_GAIN_62", _TL("Band 62"), _TL(""), CSG_String::Format(SG_T("%s|%s|"), _TL("low"), _TL("high")), 1); + Parameters.Add_Choice(pNode, "ETM_GAIN_70", _TL("Band 7" ), _TL(""), CSG_String::Format(SG_T("%s|%s|"), _TL("low"), _TL("high")), 1); + Parameters.Add_Choice(pNode, "ETM_GAIN_80", _TL("Band 8" ), _TL(""), CSG_String::Format(SG_T("%s|%s|"), _TL("low"), _TL("high")), 0); +} + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +int CLandsat_TOAR::On_Parameter_Changed(CSG_Parameters *pParameters, CSG_Parameter *pParameter) +{ + if( !SG_STR_CMP(pParameter->Get_Identifier(), SG_T("METAFILE")) && *pParameter->asString() ) + { + lsat_data lsat; + + if( !Load_MetaFile(pParameter->asString(), lsat) ) + { + pParameter->Set_Value((const char *)""); + + Error_Set(_TL("could not read metadata file")); + } + else + { + pParameters->Get_Parameter("SENSOR" )->Set_Value(Get_Sensor_Index(lsat.number, lsat.sensor)); + pParameters->Get_Parameter("DATE_ACQU")->Set_Value((const char *)lsat.date); + pParameters->Get_Parameter("DATE_PROD")->Set_Value((const char *)lsat.creation); + pParameters->Get_Parameter("SUN_HGT" )->Set_Value(lsat.sun_elev); + } + } + + if( !SG_STR_CMP(pParameter->Get_Identifier(), SG_T("SENSOR")) ) + { + pParameters->Get_Parameter("METAFILE")->Set_Value((const char *)""); + } + + return( 0 ); +} + +//--------------------------------------------------------- +int CLandsat_TOAR::On_Parameters_Enable(CSG_Parameters *pParameters, CSG_Parameter *pParameter) +{ + if( !SG_STR_CMP(pParameter->Get_Identifier(), "AC_METHOD") ) + { + pParameters->Get_Parameter("AC_DO_CELLS")->Set_Enabled(pParameter->asInt() > 1); + } + + if( !SG_STR_CMP(pParameter->Get_Identifier(), "METAFILE") ) + { + int Sensor = pParameters->Get_Parameter("SENSOR")->asInt(); + + pParameters->Set_Enabled("ETM_GAIN" , Sensor == tm7 && *pParameters->Get_Parameter("METAFILE")->asString() == '\0'); + } + + if( !SG_STR_CMP(pParameter->Get_Identifier(), "SENSOR") ) + { + int Sensor = pParameters->Get_Parameter("SENSOR")->asInt(); + + pParameters->Set_Enabled("ETM_GAIN" , Sensor == tm7 && *pParameters->Get_Parameter("METAFILE")->asString() == '\0'); + + pParameters->Set_Enabled("GS_MSS_SPECTRAL", Sensor <= mss5); + pParameters->Set_Enabled("GS_ETM_SPECTRAL", Sensor >= tm4 && Sensor <= tm7); + pParameters->Set_Enabled("GS_OLI_SPECTRAL", Sensor == oli8); + + pParameters->Set_Enabled("GS__TM_THERMAL" , Sensor >= tm4 && Sensor <= tm5); + pParameters->Set_Enabled("GS_ETM_THERMAL" , Sensor == tm7); + pParameters->Set_Enabled("GS_OLI_THERMAL" , Sensor == oli8); + + pParameters->Set_Enabled("GS_PAN" , Sensor >= tm7); + } + + if( pParameter->is_Input() ) + { + for(int i=1; i<=11; i++) + { + PRM_ENABLE_OUTPUT("MSS", i); + PRM_ENABLE_OUTPUT("ETM", i); + PRM_ENABLE_OUTPUT("OLI", i); + } + + PRM_ENABLE_OUTPUT("_TM", 6); + PRM_ENABLE_OUTPUT("ETM", 61); + PRM_ENABLE_OUTPUT("ETM", 62); + PRM_ENABLE_OUTPUT("PAN", 8); + } + + return( 0 ); +} + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +CSG_Grid * CLandsat_TOAR::Get_Band_Input(int iBand, int Sensor) +{ + CSG_Parameter *pInput = NULL; + + iBand++; + + switch( Sensor ) + { + case mss1: case mss2: case mss3: case mss4: case mss5: + pInput = Parameters(PRM_IN("MSS", iBand)); + break; + + case tm4: case tm5: + pInput = Parameters(PRM_IN(iBand != 6 ? "ETM" : "_TM", iBand)); + break; + + case tm7: + pInput = Parameters(PRM_IN("ETM", iBand < 6 ? iBand : iBand == 6 ? 61 : iBand == 7 ? 62 : 7)); + break; + + case oli8: + pInput = Parameters(PRM_IN("OLI", iBand)); + break; + } + + return( pInput ? pInput->asGrid() : NULL ); +} + +//--------------------------------------------------------- +CSG_Grid * CLandsat_TOAR::Get_Band_Output(int iBand, int Sensor) +{ + CSG_Grid *pInput = Get_Band_Input(iBand, Sensor); + + if( pInput ) + { + CSG_Parameter *pOutput = NULL; + + iBand++; + + switch( Sensor ) + { + case mss1: case mss2: case mss3: case mss4: case mss5: + pOutput = Parameters(PRM_OUT("MSS", iBand)); + break; + + case tm4: case tm5: + pOutput = Parameters(PRM_OUT(iBand != 6 ? "ETM" : "_TM", iBand)); + break; + + case tm7: + pOutput = Parameters(PRM_OUT("ETM", iBand < 6 ? iBand : iBand == 6 ? 61 : iBand == 7 ? 62 : 7)); + break; + + case oli8: + pOutput = Parameters(PRM_OUT("OLI", iBand)); + break; + } + + if( pOutput ) + { + if( !pOutput->asGrid() ) + { + CSG_Grid *pGrid = SG_Create_Grid(pInput); + + if( pGrid && pGrid->is_Valid() && pGrid->Get_System() == pInput->Get_System() ) + { + pOutput->Set_Value(pGrid); + } + else + { + if( pGrid ) + { + delete(pGrid); + } + + return( NULL ); + } + } + + pOutput->asGrid()->Set_Name(CSG_String::Format(SG_T("%s [%s]"), pInput->Get_Name(), _TL("Reflectance"))); + + return( pOutput->asGrid() ); + } + } + + return( NULL ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CLandsat_TOAR::On_Execute(void) +{ + //----------------------------------------------------- + int Sensor, iBand, dn_dark[MAX_BANDS], dn_mode[MAX_BANDS], AC_Method, AC_nCells; + double AC_Rayleigh, AC_SunRad; + CSG_Grid *pInput, *pOutput; + lsat_data lsat; + + //----------------------------------------------------- + if( *Parameters("METAFILE")->asString() ) + { + if( !Load_MetaFile(Parameters("METAFILE")->asString(), lsat) ) + { + Error_Set(_TL("could not read metadata file")); + + return( false ); + } + + Sensor = Get_Sensor_Index(lsat.number, lsat.sensor); + } + + //----------------------------------------------------- + else + { + memset(&lsat, 0, sizeof(lsat)); + + if( !Set_Date_from_String(lsat.date , Parameters("DATE_ACQU")->asString()) ) + { + Error_Set(_TL("invalid acquisition date")); + + return( false ); + } + + if( !Set_Date_from_String(lsat.creation, Parameters("DATE_PROD")->asString()) ) + { + Error_Set(_TL("invalid production date")); + + return( false ); + } + + lsat.sun_elev = Parameters("SUN_HGT")->asDouble(); + + switch( Sensor = Parameters("SENSOR")->asInt() ) + { + case mss1: set_MSS1(&lsat); break; + case mss2: set_MSS2(&lsat); break; + case mss3: set_MSS3(&lsat); break; + case mss4: set_MSS4(&lsat); break; + case mss5: set_MSS5(&lsat); break; + case tm4: set_TM4 (&lsat); break; + case tm5: set_TM5 (&lsat); break; + case oli8: set_OLI (&lsat); break; + case tm7: + { + char gain[9]; + + gain[0] = Parameters("ETM_GAIN_10")->asInt() == 0 ? 'L' : 'H'; + gain[1] = Parameters("ETM_GAIN_20")->asInt() == 0 ? 'L' : 'H'; + gain[2] = Parameters("ETM_GAIN_30")->asInt() == 0 ? 'L' : 'H'; + gain[3] = Parameters("ETM_GAIN_40")->asInt() == 0 ? 'L' : 'H'; + gain[4] = Parameters("ETM_GAIN_50")->asInt() == 0 ? 'L' : 'H'; + gain[5] = Parameters("ETM_GAIN_61")->asInt() == 0 ? 'L' : 'H'; + gain[6] = Parameters("ETM_GAIN_62")->asInt() == 0 ? 'L' : 'H'; + gain[7] = Parameters("ETM_GAIN_70")->asInt() == 0 ? 'L' : 'H'; + gain[8] = Parameters("ETM_GAIN_80")->asInt() == 0 ? 'L' : 'H'; + + set_ETM (&lsat, gain); // Landsat-7 requires band gain with 9 (H/L) data + break; + } + } + } + + + /////////////////////////////////////////////////////// + //----------------------------------------------------- + // Atmospheric Correction + + switch( Parameters("AC_METHOD")->asInt() ) + { + default: AC_Method = UNCORRECTED; break; + case 1: AC_Method = CORRECTED; break; + case 2: AC_Method = DOS1; break; + case 3: AC_Method = DOS2; break; + case 4: AC_Method = DOS2b; break; + case 5: AC_Method = DOS3; break; + case 6: AC_Method = DOS4; break; + } + + AC_nCells = Parameters("AC_DO_CELLS")->asInt(); + AC_Rayleigh = Parameters("AC_RAYLEIGH")->asDouble(); + AC_SunRad = Parameters("AC_SUN_RAD" )->asDouble() / 100.0; + + //----------------------------------------------------- + for(iBand=0; iBand DOS && !lsat.band[iBand].thermal ) // calculate dark pixel + { + Process_Set_Text(CSG_String::Format(SG_T("%s [%d/%d]"), _TL("Dark Object Subtraction"), lsat.band[iBand].number, lsat.bands)); + + int j; + unsigned long hist[256], h_max; + + memset(hist, 0, 256 * sizeof(unsigned long)); + + //--------------------------------------------- + // histogram + for(int y=0; yGet_NY() && Set_Progress(y, pInput->Get_NY()); y++) + { + for(int x=0, q; xGet_NX(); x++) + { + if( !pInput->is_NoData(x, y) && (q = pInput->asInt(x, y)) != 0 && q >= lsat.band[iBand].qcalmin && q <= 255 ) + { + hist[q]++; + } + } + } + + //--------------------------------------------- + // DN of dark object + for(j=(int)lsat.band[iBand].qcalmin; j<256; j++) + { + if( hist[j] >= (unsigned int)AC_nCells ) + { + dn_dark[iBand] = j; + + break; + } + } + + //--------------------------------------------- + // Mode of DN + for(j=(int)lsat.band[iBand].qcalmin, h_max=0L; j<241; j++) + { + if( hist[j] > h_max ) // Exclude potentially saturated < 240 + { + h_max = hist[j]; + dn_mode[iBand] = j; + } + } + + Message_Add(CSG_String::Format(SG_T("DN = %.2d [%lu] : mode %.2d [%lu] %s"), + dn_dark[iBand], hist[dn_dark[iBand]], + dn_mode[iBand], hist[dn_mode[iBand]], + hist[255] > hist[dn_mode[iBand]] ? ", excluding DN > 241" : "" + )); + } + + //------------------------------------------------- + lsat_bandctes(&lsat, iBand, AC_Method, AC_SunRad, dn_dark[iBand], AC_Rayleigh); // calculate transformation constants + } + + + /////////////////////////////////////////////////////// + //----------------------------------------------------- + bool bRadiance = Parameters("AS_RAD")->asBool(); + + CSG_String sAll = _TL("Top of Atmosphere Reflectance"); sAll += "\n"; + + sAll += GET_DESC_STR(_TL("Platform") , CSG_String::Format(SG_T("Landsat-%d"), lsat.number)); + sAll += GET_DESC_STR(_TL("Sensor") , lsat.sensor); + sAll += GET_DESC_STR(_TL("Acquisition") , lsat.date); + sAll += GET_DESC_STR(_TL("Production") , lsat.creation); + sAll += GET_DESC_FLT(_TL("Earth-Sun Distance") , lsat.dist_es); + sAll += GET_DESC_FLT(_TL("Solar Height") , lsat.sun_elev); + sAll += GET_DESC_STR(_TL("Atmospheric Correction"), Parameters("AC_METHOD")->asString()); + + //----------------------------------------------------- + for(iBand=0; iBandGet_NY() && Set_Progress(y, pInput->Get_NY()); y++) + { + #pragma omp parallel for + for(int x=0; xGet_NX(); x++) + { + double qcal; + + if( pInput->is_NoData(x, y) || (qcal = pInput->asDouble(x, y)) == 0.0 || qcal < lsat.band[iBand].qcalmin ) + { + pOutput->Set_NoData(x, y); + } + else + { + double r = lsat_qcal2rad(qcal, &lsat.band[iBand]); + + if( bRadiance ) + { + pOutput->Set_Value(x, y, r); + } + else if( lsat.band[iBand].thermal ) + { + pOutput->Set_Value(x, y, lsat_rad2temp(r, &lsat.band[iBand])); + } + else + { + r = lsat_rad2ref(r, &lsat.band[iBand]); + + pOutput->Set_Value(x, y, r < 0.0 && AC_Method > DOS ? 0.0 : r); + } + } + } + } + + //------------------------------------------------- + CSG_String sBand; + + sBand += GET_DESC_INT(_TL("Band" ), lsat.band[iBand].number); + sBand += GET_DESC_STR(_TL("Type" ), bRadiance ? _TL("Radiance") : lsat.band[iBand].thermal ? _TL("Temperature") : _TL("Reflectance")); + sBand += GET_DESC_RNG(_TL("Calibrated Digital Number"), lsat.band[iBand].qcalmin, lsat.band[iBand].qcalmax); + sBand += GET_DESC_RNG(_TL("Calibration Constants" ), lsat.band[iBand].lmin , lsat.band[iBand].lmax); + sBand += GET_DESC_STR(AC_Method > DOS ? _TL("At-Surface Radiance") : _TL("At-Sensor Radiance"), CSG_String::Format(SG_T("%.5lf * DN + %.5lf"), lsat.band[iBand].gain, lsat.band[iBand].bias)); + + if( lsat.band[iBand].thermal ) + { + sBand += GET_DESC_STR(_TL("At-Sensor Temperature"), CSG_String::Format(SG_T("%.3lf / ln[(%.3lf / %s) + 1.0]"), lsat.band[iBand].K2, lsat.band[iBand].K1, _TL("Radiance"))); + sBand += GET_DESC_FLT(_TL("Temperature K1" ), lsat.band[iBand].K1); + sBand += GET_DESC_FLT(_TL("Temperature K2" ), lsat.band[iBand].K2); + } + else + { + sBand += GET_DESC_FLT(_TL("Mean Solar Irradiance"), lsat.band[iBand].esun); // Mean Solar Exoatmospheric Irradiance + sBand += GET_DESC_STR(AC_Method > DOS ? _TL("At-Surface Reflectance") : _TL("At-Sensor Reflectance"), CSG_String::Format(SG_T("%s / %.5lf"), _TL("Radiance"), lsat.band[iBand].K2)); + + if( AC_Method > DOS ) + { + double ref_mode = lsat_rad2ref(lsat_qcal2rad(dn_mode[iBand], &lsat.band[iBand]), &lsat.band[iBand]); + + sBand += GET_DESC_INT(_TL("Minimum of Darkness DN Cells" ), AC_nCells); + sBand += GET_DESC_INT(_TL("Darkness Digital Number (DN)" ), dn_dark[iBand]); + sBand += GET_DESC_INT(_TL("Mode of DN" ), dn_mode[iBand]); + sBand += GET_DESC_FLT(_TL("Mode in Reflectance Histogram"), ref_mode); + } + } + + Message_Add(sBand, true); + + //------------------------------------------------- + pOutput->Set_Name(CSG_String::Format(SG_T("%s [%s]"), pInput->Get_Name(), + bRadiance ? _TL("Radiance") : lsat.band[iBand].thermal ? _TL("Temperature") : _TL("Reflectance") + )); + + if( lsat.band[iBand].thermal ) + { + pOutput->Set_Unit(_TL("Kelvin")); + } + + pOutput->Set_Description(sAll + sBand); + } + + //----------------------------------------------------- + return( true ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- diff -Nru saga-2.1.0+dfsg/src/modules/imagery/imagery_tools/landsat_toar.h saga-2.1.4+dfsg/src/modules/imagery/imagery_tools/landsat_toar.h --- saga-2.1.0+dfsg/src/modules/imagery/imagery_tools/landsat_toar.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/imagery/imagery_tools/landsat_toar.h 2014-11-13 08:32:18.000000000 +0000 @@ -0,0 +1,114 @@ +/********************************************************** + * Version $Id: landsat_toar.h 1938 2014-01-12 13:44:06Z reklov_w $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// imagery_tools // +// // +//-------------------------------------------------------// +// // +// landsat_toar.h // +// // +// Copyright (C) 2012 by // +// Benjamin Bechtel & Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Hamburg // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#ifndef HEADER_INCLUDED__landsat_toar_H +#define HEADER_INCLUDED__landsat_toar_H + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "MLB_Interface.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +class CLandsat_TOAR : public CSG_Module +{ +public: + CLandsat_TOAR(void); + + virtual CSG_String Get_MenuPath (void) { return( _TL("R:Landsat") ); } + + +protected: + + virtual int On_Parameter_Changed (CSG_Parameters *pParameters, CSG_Parameter *pParameter); + virtual int On_Parameters_Enable (CSG_Parameters *pParameters, CSG_Parameter *pParameter); + + virtual bool On_Execute (void); + + +private: + + CSG_Grid * Get_Band_Input (int iBand, int Sensor); + CSG_Grid * Get_Band_Output (int iBand, int Sensor); + +}; + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#endif // #ifndef HEADER_INCLUDED__landsat_toar_H diff -Nru saga-2.1.0+dfsg/src/modules/imagery/imagery_tools/Makefile.am saga-2.1.4+dfsg/src/modules/imagery/imagery_tools/Makefile.am --- saga-2.1.0+dfsg/src/modules/imagery/imagery_tools/Makefile.am 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/imagery/imagery_tools/Makefile.am 2014-11-13 08:32:18.000000000 +0000 @@ -0,0 +1,35 @@ +if DEBUG +DBGFLAGS = -g -DDEBUG +endif +if SAGA_UNICODE +UC_DEFS = -D_SAGA_UNICODE +endif +DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD +CXX_INCS = -I$(top_srcdir)/src/saga_core +AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS) +AM_LDFLAGS = -fPIC -shared -avoid-version +pkglib_LTLIBRARIES = libimagery_tools.la +libimagery_tools_la_SOURCES =\ +evi.cpp\ +Image_VI_Distance.cpp\ +Image_VI_Slope.cpp\ +landsat_acca.cpp\ +landsat_import.cpp\ +landsat_toar.cpp\ +landsat_toar_core.cpp\ +MLB_Interface.cpp\ +pansharpening.cpp\ +tasseled_cap.cpp\ +evi.h\ +Image_VI_Distance.h\ +Image_VI_Slope.h\ +landsat_acca.h\ +landsat_import.h\ +landsat_toar.h\ +landsat_toar_core.h\ +MLB_Interface.h\ +pansharpening.h\ +tasseled_cap.h + +libimagery_tools_la_LIBADD = $(top_srcdir)/src/saga_core/saga_api/libsaga_api.la + diff -Nru saga-2.1.0+dfsg/src/modules/imagery/imagery_tools/Makefile.in saga-2.1.4+dfsg/src/modules/imagery/imagery_tools/Makefile.in --- saga-2.1.0+dfsg/src/modules/imagery/imagery_tools/Makefile.in 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/imagery/imagery_tools/Makefile.in 2014-11-13 08:33:32.000000000 +0000 @@ -0,0 +1,722 @@ +# Makefile.in generated by automake 1.14.1 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +subdir = src/modules/imagery/imagery_tools +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_postgresql.m4 \ + $(top_srcdir)/m4/ax_pkg_swig.m4 \ + $(top_srcdir)/m4/ax_python_devel.m4 \ + $(top_srcdir)/m4/ax_swig_enable_cxx.m4 \ + $(top_srcdir)/m4/ax_swig_python.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__installdirs = "$(DESTDIR)$(pkglibdir)" +LTLIBRARIES = $(pkglib_LTLIBRARIES) +libimagery_tools_la_DEPENDENCIES = \ + $(top_srcdir)/src/saga_core/saga_api/libsaga_api.la +am_libimagery_tools_la_OBJECTS = evi.lo Image_VI_Distance.lo \ + Image_VI_Slope.lo landsat_acca.lo landsat_import.lo \ + landsat_toar.lo landsat_toar_core.lo MLB_Interface.lo \ + pansharpening.lo tasseled_cap.lo +libimagery_tools_la_OBJECTS = $(am_libimagery_tools_la_OBJECTS) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) +depcomp = $(SHELL) $(top_srcdir)/depcomp +am__depfiles_maybe = depfiles +am__mv = mv -f +CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = +CXXLD = $(CXX) +CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = +CCLD = $(CC) +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = +SOURCES = $(libimagery_tools_la_SOURCES) +DIST_SOURCES = $(libimagery_tools_la_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +AX_SWIG_PYTHON_CPPFLAGS = @AX_SWIG_PYTHON_CPPFLAGS@ +AX_SWIG_PYTHON_OPT = @AX_SWIG_PYTHON_OPT@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DISABLELIBHARU = @DISABLELIBHARU@ +DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +FGREP = @FGREP@ +GOMPFLAGS = @GOMPFLAGS@ +GREP = @GREP@ +HARU_LIB = @HARU_LIB@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LOCAL_INCS = @LOCAL_INCS@ +LOCAL_LIBS = @LOCAL_LIBS@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ +MKDIR_P = @MKDIR_P@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PG_CONFIG = @PG_CONFIG@ +POSTGRESQL_CFLAGS = @POSTGRESQL_CFLAGS@ +POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@ +POSTGRESQL_VERSION = @POSTGRESQL_VERSION@ +POW_LIB = @POW_LIB@ +PYTHON = @PYTHON@ +PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ +PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ +PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ +PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_PLATFORM = @PYTHON_PLATFORM@ +PYTHON_PREFIX = @PYTHON_PREFIX@ +PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ +PYTHON_VERSION = @PYTHON_VERSION@ +RANLIB = @RANLIB@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +SWIG = @SWIG@ +SWIG_LIB = @SWIG_LIB@ +VERSION = @VERSION@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +pkgpyexecdir = @pkgpyexecdir@ +pkgpythondir = @pkgpythondir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +pyexecdir = @pyexecdir@ +pythondir = @pythondir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +@DEBUG_TRUE@DBGFLAGS = -g -DDEBUG +@SAGA_UNICODE_TRUE@UC_DEFS = -D_SAGA_UNICODE +DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD +CXX_INCS = -I$(top_srcdir)/src/saga_core +AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS) +AM_LDFLAGS = -fPIC -shared -avoid-version +pkglib_LTLIBRARIES = libimagery_tools.la +libimagery_tools_la_SOURCES = \ +evi.cpp\ +Image_VI_Distance.cpp\ +Image_VI_Slope.cpp\ +landsat_acca.cpp\ +landsat_import.cpp\ +landsat_toar.cpp\ +landsat_toar_core.cpp\ +MLB_Interface.cpp\ +pansharpening.cpp\ +tasseled_cap.cpp\ +evi.h\ +Image_VI_Distance.h\ +Image_VI_Slope.h\ +landsat_acca.h\ +landsat_import.h\ +landsat_toar.h\ +landsat_toar_core.h\ +MLB_Interface.h\ +pansharpening.h\ +tasseled_cap.h + +libimagery_tools_la_LIBADD = $(top_srcdir)/src/saga_core/saga_api/libsaga_api.la +all: all-am + +.SUFFIXES: +.SUFFIXES: .cpp .lo .o .obj +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/modules/imagery/imagery_tools/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign src/modules/imagery/imagery_tools/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): + +install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) + @$(NORMAL_INSTALL) + @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ + list2=; for p in $$list; do \ + if test -f $$p; then \ + list2="$$list2 $$p"; \ + else :; fi; \ + done; \ + test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \ + } + +uninstall-pkglibLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ + for p in $$list; do \ + $(am__strip_dir) \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$f"; \ + done + +clean-pkglibLTLIBRARIES: + -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES) + @list='$(pkglib_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + +libimagery_tools.la: $(libimagery_tools_la_OBJECTS) $(libimagery_tools_la_DEPENDENCIES) $(EXTRA_libimagery_tools_la_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) -rpath $(pkglibdir) $(libimagery_tools_la_OBJECTS) $(libimagery_tools_la_LIBADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Image_VI_Distance.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Image_VI_Slope.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MLB_Interface.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evi.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/landsat_acca.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/landsat_import.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/landsat_toar.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/landsat_toar_core.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pansharpening.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tasseled_cap.Plo@am__quote@ + +.cpp.o: +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< + +.cpp.obj: +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + +.cpp.lo: +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + set x; \ + here=`pwd`; \ + $(am__define_uniq_tagged_files); \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ + fi +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ + test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(LTLIBRARIES) +installdirs: + for dir in "$(DESTDIR)$(pkglibdir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool clean-pkglibLTLIBRARIES \ + mostlyclean-am + +distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: install-pkglibLTLIBRARIES + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-pkglibLTLIBRARIES + +.MAKE: install-am install-strip + +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-pkglibLTLIBRARIES install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ + uninstall-pkglibLTLIBRARIES + + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nru saga-2.1.0+dfsg/src/modules/imagery/imagery_tools/MLB_Interface.cpp saga-2.1.4+dfsg/src/modules/imagery/imagery_tools/MLB_Interface.cpp --- saga-2.1.0+dfsg/src/modules/imagery/imagery_tools/MLB_Interface.cpp 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/imagery/imagery_tools/MLB_Interface.cpp 2014-11-13 08:32:18.000000000 +0000 @@ -0,0 +1,147 @@ +/********************************************************** + * Version $Id: MLB_Interface.cpp 2326 2014-11-04 14:31:09Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// imagery_tools // +// // +//-------------------------------------------------------// +// // +// MLB_Interface.cpp // +// // +// Copyright (C) 2009 by // +// SAGA User Group Assoc. // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: author@email.de // +// // +// contact: Author // +// Sesame Street. 7 // +// 12345 Metropolis // +// Nirwana // +// // +/////////////////////////////////////////////////////////// + + +/////////////////////////////////////////////////////////// +// // +// The Module Link Library Interface // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +// 1. Include the appropriate SAGA-API header... + +#include "MLB_Interface.h" + + +//--------------------------------------------------------- +// 2. Place general module library informations here... + +CSG_String Get_Info(int i) +{ + switch( i ) + { + case MLB_INFO_Name: default: + return( _TL("Tools") ); + + case MLB_INFO_Category: + return( _TL("Imagery") ); + + case MLB_INFO_Author: + return( SG_T("SAGA User Group Assoc. (c) 2009") ); + + case MLB_INFO_Description: + return( _TL("Image processing tools.") ); + + case MLB_INFO_Version: + return( SG_T("1.0") ); + + case MLB_INFO_Menu_Path: + return( _TL("Imagery") ); + } +} + + +//--------------------------------------------------------- +// 3. Include the headers of your modules here... + +#include "Image_VI_Distance.h" +#include "Image_VI_Slope.h" +#include "evi.h" +#include "tasseled_cap.h" + +#include "pansharpening.h" + +#include "landsat_toar.h" +#include "landsat_acca.h" +#include "landsat_import.h" + + +//--------------------------------------------------------- +// 4. Allow your modules to be created here... + +CSG_Module * Create_Module(int i) +{ + switch( i ) + { + case 0: return( new CImage_VI_Distance ); + case 1: return( new CImage_VI_Slope ); + case 2: return( new CEnhanced_VI ); + case 3: return( new CTasseled_Cap ); + + case 4: return( new CPanSharp_IHS ); + case 5: return( new CPanSharp_Brovey ); + case 6: return( new CPanSharp_CN ); + case 7: return( new CPanSharp_PCA ); + + case 8: return( new CLandsat_TOAR ); + case 9: return( new CLandsat_ACCA ); + case 10: return( new CLandsat_Import ); + + //----------------------------------------------------- + case 11: return( NULL ); + default: return( MLB_INTERFACE_SKIP_MODULE ); + } +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +//{{AFX_SAGA + + MLB_INTERFACE + +//}}AFX_SAGA diff -Nru saga-2.1.0+dfsg/src/modules/imagery/imagery_tools/MLB_Interface.h saga-2.1.4+dfsg/src/modules/imagery/imagery_tools/MLB_Interface.h --- saga-2.1.0+dfsg/src/modules/imagery/imagery_tools/MLB_Interface.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/imagery/imagery_tools/MLB_Interface.h 2014-11-13 08:32:18.000000000 +0000 @@ -0,0 +1,68 @@ +/********************************************************** + * Version $Id: MLB_Interface.h 1938 2014-01-12 13:44:06Z reklov_w $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// imagery_tools // +// // +//-------------------------------------------------------// +// // +// MLB_Interface.cpp // +// // +// Copyright (C) 2009 by // +// SAGA User Group Assoc. // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: author@email.de // +// // +// contact: Author // +// Sesame Street. 7 // +// 12345 Metropolis // +// Nirwana // +// // +/////////////////////////////////////////////////////////// + + +/////////////////////////////////////////////////////////// +// // +// Include the SAGA-API here // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#ifndef HEADER_INCLUDED__imagery_tools_H +#define HEADER_INCLUDED__imagery_tools_H + +//--------------------------------------------------------- +#include + + +//--------------------------------------------------------- +#endif // #ifndef HEADER_INCLUDED__imagery_tools_H diff -Nru saga-2.1.0+dfsg/src/modules/imagery/imagery_tools/pansharpening.cpp saga-2.1.4+dfsg/src/modules/imagery/imagery_tools/pansharpening.cpp --- saga-2.1.0+dfsg/src/modules/imagery/imagery_tools/pansharpening.cpp 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/imagery/imagery_tools/pansharpening.cpp 2014-11-13 08:32:18.000000000 +0000 @@ -0,0 +1,811 @@ +/********************************************************** + * Version $Id: pansharpening.cpp 2208 2014-08-27 16:00:51Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// imagery_tools // +// // +//-------------------------------------------------------// +// // +// pansharpening.cpp // +// // +// Copyright (C) 2011 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Hamburg // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "pansharpening.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +TSG_Grid_Interpolation Get_Interpolation(int Interpolation) +{ + switch( Interpolation ) + { + case 0: return( GRID_INTERPOLATION_NearestNeighbour ); + case 1: return( GRID_INTERPOLATION_Bilinear ); + case 2: default: return( GRID_INTERPOLATION_BSpline ); + } +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +CPanSharp_IHS::CPanSharp_IHS(void) +{ + CSG_Parameter *pNode; + + //----------------------------------------------------- + Set_Name (_TL("IHS Sharpening")); + + Set_Author (SG_T("O.Conrad (c) 2011")); + + Set_Description (_TW( + "Intensity, hue, saturation (IHS) sharpening.\n" + "\nReferences:\n" + "Haydn, R., Dalke, G. W., Henkel, J., Bare, J. E. (1982): " + "Application of the IHS color transform to the processing of multisensor data and image enhancement. " + "Proceedings of the International Symposium on Remote Sensing of Arid and Semi-Arid Lands, " + "Cairo, Egypt (Environmental Research Institute, Ann Arbor, Mich., 1982), pp. 599–616.\n" + )); + + //----------------------------------------------------- + Parameters.Add_Grid(NULL , "R" , _TL("Red") , _TL(""), PARAMETER_INPUT); + Parameters.Add_Grid(NULL , "G" , _TL("Green") , _TL(""), PARAMETER_INPUT); + Parameters.Add_Grid(NULL , "B" , _TL("Blue") , _TL(""), PARAMETER_INPUT); + + pNode = Parameters.Add_Grid_System( + NULL , "PAN_SYSTEM" , _TL("High Resolution Grid System"), + _TL("") + ); + + Parameters.Add_Grid( + pNode , "PAN" , _TL("Panchromatic Channel"), + _TL(""), + PARAMETER_INPUT, false + ); + + Parameters.Add_Grid(pNode , "R_SHARP" , _TL("Red") , _TL(""), PARAMETER_OUTPUT, false); + Parameters.Add_Grid(pNode , "G_SHARP" , _TL("Green") , _TL(""), PARAMETER_OUTPUT, false); + Parameters.Add_Grid(pNode , "B_SHARP" , _TL("Blue") , _TL(""), PARAMETER_OUTPUT, false); + + Parameters.Add_Grid_List( + NULL , "SHARPEN" , _TL("Sharpend Channels"), + _TL(""), + PARAMETER_OUTPUT + ); + + Parameters.Add_Choice( + NULL , "RESAMPLING" , _TL("Resampling"), + _TL(""), + CSG_String::Format(SG_T("%s|%s|%s|"), + _TL("nearest neighbour"), + _TL("bilinear"), + _TL("cubic convolution") + ), 2 + ); + + Parameters.Add_Choice( + NULL , "PAN_MATCH" , _TL("Panchromatic Channel Matching"), + _TL(""), + CSG_String::Format(SG_T("%s|%s|"), + _TL("normalized"), + _TL("standardized") + ), 0 + ); +} + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CPanSharp_IHS::On_Execute(void) +{ + //----------------------------------------------------- + TSG_Grid_Interpolation Interpolation = Get_Interpolation(Parameters("RESAMPLING")->asInt()); + + //----------------------------------------------------- + int y; + double r, g, b, i, h, s; + CSG_Grid *pPan, *pR, *pG, *pB; + + pPan = Parameters("PAN")->asGrid(); + + //----------------------------------------------------- + Process_Set_Text(CSG_String::Format(SG_T("%s: %s ..."), _TL("Resampling"), Parameters("R")->asGrid()->Get_Name())); + pR = Parameters("R_SHARP")->asGrid(); + pR ->Assign (Parameters("R")->asGrid(), Interpolation); + pR ->Set_Name(Parameters("R")->asGrid()->Get_Name()); + + Process_Set_Text(CSG_String::Format(SG_T("%s: %s ..."), _TL("Resampling"), Parameters("G")->asGrid()->Get_Name())); + pG = Parameters("G_SHARP")->asGrid(); + pG ->Assign (Parameters("G")->asGrid(), Interpolation); + pG ->Set_Name(Parameters("G")->asGrid()->Get_Name()); + + Process_Set_Text(CSG_String::Format(SG_T("%s: %s ..."), _TL("Resampling"), Parameters("B")->asGrid()->Get_Name())); + pB = Parameters("B_SHARP")->asGrid(); + pB ->Assign (Parameters("B")->asGrid(), Interpolation); + pB ->Set_Name(Parameters("B")->asGrid()->Get_Name()); + + //----------------------------------------------------- + Process_Set_Text(_TL("RGB to IHS")); + + double rMin = pR->Get_ZMin(), rRange = pR->Get_ZRange(); + double gMin = pG->Get_ZMin(), gRange = pG->Get_ZRange(); + double bMin = pB->Get_ZMin(), bRange = pB->Get_ZRange(); + + for(y=0; yGet_NY() && Set_Progress(y, pPan->Get_NY()); y++) + { + for(int x=0; xGet_NX(); x++) + { + bool bNoData = true; + + if( pPan->is_NoData(x, y) || pR->is_NoData(x, y) || pG->is_NoData(x, y) || pB->is_NoData(x, y) ) + { + pR->Set_NoData(x, y); + pG->Set_NoData(x, y); + pB->Set_NoData(x, y); + } + else + { + r = (pR->asDouble(x, y) - rMin) / rRange; if( r < 0.0 ) r = 0.0; else if( r > 1.0 ) r = 1.0; + g = (pG->asDouble(x, y) - gMin) / gRange; if( g < 0.0 ) g = 0.0; else if( g > 1.0 ) g = 1.0; + b = (pB->asDouble(x, y) - bMin) / bRange; if( b < 0.0 ) b = 0.0; else if( b > 1.0 ) b = 1.0; + + i = r + g + b; + + if( i <= 0.0 ) + { + h = 0.0; + s = 0.0; + } + else + { + if( r == g && g == b ) { h = 0.0; } + else if( b < r && b < g ) { h = (g - b) / (i - 3 * b) ; } + else if( r < g && r < b ) { h = (b - r) / (i - 3 * r) + 1; } + else { h = (r - g) / (i - 3 * g) + 2; } + + if ( 0.0 <= h && h < 1.0 ) { s = (i - 3 * b) / i; } + else if( 1.0 <= h && h < 2.0 ) { s = (i - 3 * r) / i; } + else { s = (i - 3 * g) / i; } + } + + pR->Set_Value(x, y, i); + pG->Set_Value(x, y, s); + pB->Set_Value(x, y, h); + } + } + } + + //----------------------------------------------------- + double Offset_Pan, Offset, Scale; + + if( Parameters("PAN_MATCH")->asInt() == 0 ) + { + Offset_Pan = pPan->Get_ZMin(); + Offset = pR->Get_ZMin(); + Scale = pR->Get_ZRange() / pPan->Get_ZRange(); + } + else + { + Offset_Pan = pPan->Get_Mean(); + Offset = pR->Get_Mean(); + Scale = pR->Get_StdDev() / pPan->Get_StdDev(); + } + + //----------------------------------------------------- + Process_Set_Text(_TL("IHS to RGB")); + + for(y=0; yGet_NY() && Set_Progress(y, pPan->Get_NY()); y++) + { + for(int x=0; xGet_NX(); x++) + { + if( !pR->is_NoData(x, y) ) + { + i = Offset + Scale * (pPan->asDouble(x, y) - Offset_Pan); + s = pG ->asDouble(x, y); + h = pB ->asDouble(x, y); + + if ( 0.0 <= h && h < 1.0 ) + { + r = i * (1 + 2 * s - 3 * s * h) / 3; + g = i * (1 - s + 3 * s * h) / 3; + b = i * (1 - s ) / 3; + } + else if( 1.0 <= h && h < 2.0 ) + { + r = i * (1 - s ) / 3; + g = i * (1 + 2 * s - 3 * s * (h - 1)) / 3; + b = i * (1 - s + 3 * s * (h - 1)) / 3; + } + else + { + r = i * (1 - s + 3 * s * (h - 2)) / 3; + g = i * (1 - s ) / 3; + b = i * (1 + 2 * s - 3 * s * (h - 2)) / 3; + } + + pR->Set_Value(x, y, rMin + r * rRange); + pG->Set_Value(x, y, gMin + g * gRange); + pB->Set_Value(x, y, bMin + b * bRange); + } + } + } + + //----------------------------------------------------- + return( true ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +CPanSharp_Brovey::CPanSharp_Brovey(void) +{ + CSG_Parameter *pNode; + + //----------------------------------------------------- + Set_Name (_TL("Colour Normalized Brovey Sharpening")); + + Set_Author (SG_T("O.Conrad (c) 2011")); + + Set_Description (_TW( + "Colour normalized (Brovey) sharpening.\n" + "\n" + "References:\n" + "Vrabel, J. (1996): Multispectral Imagery Band Sharpening Study. " + "Photogrammetric Engineering & Remote Sensing, Vol. 62, No. 9, pp. 1075-1083.\n" + )); + + //----------------------------------------------------- + Parameters.Add_Grid(NULL , "R" , _TL("Red") , _TL(""), PARAMETER_INPUT); + Parameters.Add_Grid(NULL , "G" , _TL("Green") , _TL(""), PARAMETER_INPUT); + Parameters.Add_Grid(NULL , "B" , _TL("Blue") , _TL(""), PARAMETER_INPUT); + + pNode = Parameters.Add_Grid_System( + NULL , "PAN_SYSTEM" , _TL("High Resolution Grid System"), + _TL("") + ); + + Parameters.Add_Grid( + pNode , "PAN" , _TL("Panchromatic Channel"), + _TL(""), + PARAMETER_INPUT, false + ); + + Parameters.Add_Grid(pNode , "R_SHARP" , _TL("Red") , _TL(""), PARAMETER_OUTPUT, false); + Parameters.Add_Grid(pNode , "G_SHARP" , _TL("Green") , _TL(""), PARAMETER_OUTPUT, false); + Parameters.Add_Grid(pNode , "B_SHARP" , _TL("Blue") , _TL(""), PARAMETER_OUTPUT, false); + + Parameters.Add_Grid_List( + NULL , "SHARPEN" , _TL("Sharpend Channels"), + _TL(""), + PARAMETER_OUTPUT + ); + + Parameters.Add_Choice( + NULL , "RESAMPLING" , _TL("Resampling"), + _TL(""), + CSG_String::Format(SG_T("%s|%s|%s|"), + _TL("nearest neighbour"), + _TL("bilinear"), + _TL("cubic convolution") + ), 2 + ); +} + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CPanSharp_Brovey::On_Execute(void) +{ + //----------------------------------------------------- + TSG_Grid_Interpolation Interpolation = Get_Interpolation(Parameters("RESAMPLING")->asInt()); + + //----------------------------------------------------- + CSG_Grid *pPan, *pR, *pG, *pB; + + pPan = Parameters("PAN")->asGrid(); + + //----------------------------------------------------- + Process_Set_Text(CSG_String::Format(SG_T("%s: %s ..."), _TL("Resampling"), Parameters("R")->asGrid()->Get_Name())); + pR = Parameters("R_SHARP")->asGrid(); + pR ->Assign (Parameters("R")->asGrid(), Interpolation); + pR ->Set_Name(Parameters("R")->asGrid()->Get_Name()); + + Process_Set_Text(CSG_String::Format(SG_T("%s: %s ..."), _TL("Resampling"), Parameters("G")->asGrid()->Get_Name())); + pG = Parameters("G_SHARP")->asGrid(); + pG ->Assign (Parameters("G")->asGrid(), Interpolation); + pG ->Set_Name(Parameters("G")->asGrid()->Get_Name()); + + Process_Set_Text(CSG_String::Format(SG_T("%s: %s ..."), _TL("Resampling"), Parameters("B")->asGrid()->Get_Name())); + pB = Parameters("B_SHARP")->asGrid(); + pB ->Assign (Parameters("B")->asGrid(), Interpolation); + pB ->Set_Name(Parameters("B")->asGrid()->Get_Name()); + + //----------------------------------------------------- + Process_Set_Text(_TL("Sharpening")); + + for(int y=0; yGet_NY() && Set_Progress(y, pPan->Get_NY()); y++) + { + for(int x=0; xGet_NX(); x++) + { + if( !pPan->is_NoData(x, y) && !pR->is_NoData(x, y) && !pG->is_NoData(x, y) && !pB->is_NoData(x, y) ) + { + double k = (pR->asDouble(x, y) + pG->asDouble(x, y) + pB->asDouble(x, y)); + + if( k != 0.0 ) + { + k = pPan->asDouble(x, y) / k; + } + + pR->Mul_Value(x, y, k); + pG->Mul_Value(x, y, k); + pB->Mul_Value(x, y, k); + } + else + { + pR->Set_NoData(x, y); + pG->Set_NoData(x, y); + pB->Set_NoData(x, y); + } + } + } + + //----------------------------------------------------- + return( true ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +CPanSharp_CN::CPanSharp_CN(void) +{ + CSG_Parameter *pNode; + + //----------------------------------------------------- + Set_Name (_TL("Colour Normalized Spectral Sharpening")); + + Set_Author (SG_T("O.Conrad (c) 2011")); + + Set_Description (_TW( + "Colour normalized spectral sharpening.\n" + "\n" + "References:\n" + "Vrabel, J., Doraiswamy, P., McMurtrey, J., Stern, A. (2002): " + "Demonstration of the Accuracy of Improved Resolution Hyperspectral Imagery. " + "SPIE Symposium Proceedings.\n" + "\n" + "Vrabel, J., Doraiswamy, P., Stern, A. (2002): " + "Application of Hyperspectral Imagery Resolution Improvement for Site-Specific Farming. " + "ASPRS 2002 Conference Proceedings.\n" + )); + + //----------------------------------------------------- + pNode = Parameters.Add_Grid_System( + NULL , "LO_RES" , _TL("Low Resolution Grid System"), + _TL("") + ); + + Parameters.Add_Grid_List( + pNode , "GRIDS" , _TL("Original Channels"), + _TL(""), + PARAMETER_INPUT, false + ); + + Parameters.Add_Grid( + NULL , "PAN" , _TL("Panchromatic Channel"), + _TL(""), + PARAMETER_INPUT + ); + + Parameters.Add_Grid_List( + NULL , "SHARPEN" , _TL("Sharpend Channels"), + _TL(""), + PARAMETER_OUTPUT + ); + + Parameters.Add_Choice( + NULL , "RESAMPLING" , _TL("Resampling"), + _TL(""), + CSG_String::Format(SG_T("%s|%s|%s|"), + _TL("nearest neighbour"), + _TL("bilinear"), + _TL("cubic convolution") + ), 2 + ); +} + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CPanSharp_CN::On_Execute(void) +{ + //----------------------------------------------------- + TSG_Grid_Interpolation Interpolation = Get_Interpolation(Parameters("RESAMPLING")->asInt()); + + //----------------------------------------------------- + int i; + CSG_Grid *pPan; + CSG_Parameter_Grid_List *pGrids, *pSharp; + + pPan = Parameters("PAN" )->asGrid(); + pGrids = Parameters("GRIDS" )->asGridList(); + pSharp = Parameters("SHARPEN")->asGridList(); + + //----------------------------------------------------- + pSharp->Del_Items(); + + for(i=0; iGet_Count(); i++) + { + Process_Set_Text(CSG_String::Format(SG_T("%s: %s ..."), _TL("Resampling"), pGrids->asGrid(i)->Get_Name())); + + CSG_Grid *pGrid = SG_Create_Grid(*Get_System()); + + pGrid->Set_Name (pGrids->asGrid(i)->Get_Name()); + pGrid->Assign (pGrids->asGrid(i), Interpolation); + + pSharp->Add_Item(pGrid); + } + + //----------------------------------------------------- + for(int y=0; yis_NoData(x, y) ) + { + for(i=0; iGet_Count(); i++) + { + if( !pSharp->asGrid(i)->is_NoData(x, y) ) + { + Sum += pSharp->asGrid(i)->asDouble (x, y); + } + else + { + Sum = 0.0; + + break; + } + } + } + + if( Sum ) + { + Sum = pPan->asDouble(x, y) * pSharp->Get_Count() / (Sum + pSharp->Get_Count()); + + for(i=0; iGet_Count(); i++) + { + pSharp->asGrid(i)->Mul_Value(x, y, Sum); + } + } + else + { + for(i=0; iGet_Count(); i++) + { + pSharp->asGrid(i)->Set_NoData(x, y); + } + } + } + } + + //----------------------------------------------------- + return( true ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +CPanSharp_PCA::CPanSharp_PCA(void) +{ + CSG_Parameter *pNode; + + //----------------------------------------------------- + Set_Name (_TL("Principle Components Based Image Sharpening")); + + Set_Author (SG_T("O.Conrad (c) 2011")); + + Set_Description (_TW( + "Principle components based image sharpening." + )); + + //----------------------------------------------------- + pNode = Parameters.Add_Grid_System( + NULL , "LO_RES" , _TL("Low Resolution Grid System"), + _TL("") + ); + + Parameters.Add_Grid_List( + pNode , "GRIDS" , _TL("Original Channels"), + _TL(""), + PARAMETER_INPUT, false + ); + + Parameters.Add_Grid( + NULL , "PAN" , _TL("Panchromatic Channel"), + _TL(""), + PARAMETER_INPUT + ); + + Parameters.Add_Grid_List( + NULL , "SHARPEN" , _TL("Sharpend Channels"), + _TL(""), + PARAMETER_OUTPUT + ); + + Parameters.Add_Choice( + NULL , "METHOD" , _TL("Method"), + _TL(""), + CSG_String::Format(SG_T("%s|%s|%s|"), + _TL("correlation matrix"), + _TL("variance-covariance matrix"), + _TL("sums-of-squares-and-cross-products matrix") + ), 1 + ); + + Parameters.Add_Choice( + NULL , "RESAMPLING" , _TL("Resampling"), + _TL(""), + CSG_String::Format(SG_T("%s|%s|%s|"), + _TL("nearest neighbour"), + _TL("bilinear"), + _TL("cubic convolution") + ), 2 + ); + + Parameters.Add_Choice( + NULL , "PAN_MATCH" , _TL("Panchromatic Channel Matching"), + _TL(""), + CSG_String::Format(SG_T("%s|%s|"), + _TL("normalized"), + _TL("standardized") + ), 0 + ); +} + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#define RUN_MODULE(BRETVAL, LIBRARY, MODULE, PARAMETERS, GRIDSYSTEM, CONDITION) {\ + \ + BRETVAL = false;\ + \ + CSG_Module *pModule = SG_Get_Module_Library_Manager().Get_Module(SG_T(LIBRARY), MODULE);\ + \ + if( pModule == NULL )\ + {\ + Error_Set(CSG_String::Format(SG_T("%s: %s"), _TL("could not find module"), SG_T(LIBRARY)));\ + }\ + else if( pModule->is_Grid() )\ + {\ + Process_Set_Text(pModule->Get_Name());\ + \ + CSG_Parameters P_tmp; P_tmp.Assign(pModule->Get_Parameters());\ + \ + pModule->Set_Manager(NULL);\ + \ + ((CSG_Module_Grid *)pModule)->Get_System()->Assign(GRIDSYSTEM);\ + \ + if( !(CONDITION) )\ + {\ + Error_Set(CSG_String::Format(SG_T("%s: %s > %s"), _TL("could not initialize module"), SG_T(LIBRARY), pModule->Get_Name().c_str()));\ + }\ + else if( !pModule->Execute() )\ + {\ + Error_Set(CSG_String::Format(SG_T("%s: %s > %s"), _TL("could not execute module") , SG_T(LIBRARY), pModule->Get_Name().c_str()));\ + }\ + else\ + {\ + BRETVAL = true;\ + }\ + \ + PARAMETERS.Assign(pModule->Get_Parameters());\ + \ + pModule->Get_Parameters()->Assign_Values(&P_tmp);\ + }\ +} + +//--------------------------------------------------------- +#define SET_PARAMETER(IDENTIFIER, VALUE) pModule->Get_Parameters()->Set_Parameter(SG_T(IDENTIFIER), VALUE) + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CPanSharp_PCA::On_Execute(void) +{ + //----------------------------------------------------- + TSG_Grid_Interpolation Interpolation = Get_Interpolation(Parameters("RESAMPLING")->asInt()); + + //----------------------------------------------------- + bool bResult; + CSG_Parameters P; + CSG_Table Eigen; + + //----------------------------------------------------- + RUN_MODULE(bResult, "statistics_grid", 8, P, Parameters("GRIDS")->asGridList()->asGrid(0)->Get_System(), + SET_PARAMETER("GRIDS" , Parameters("GRIDS")) + && SET_PARAMETER("METHOD" , Parameters("METHOD")) + && SET_PARAMETER("EIGEN" , &Eigen) + && SET_PARAMETER("NFIRST" , 0) + ); + + if( !bResult ) + { + return( false ); + } + + //----------------------------------------------------- + CSG_Parameter_Grid_List *pPCA_0 = P.Get_Parameter("PCA")->asGridList(); + CSG_Parameter_Grid_List *pPCA_1 = P.Add_Grid_List(NULL, "PCA_1", SG_T(""), SG_T(""), PARAMETER_INPUT, false)->asGridList(); + + CSG_Grid *PCA = new CSG_Grid[pPCA_0->Get_Count()]; + CSG_Grid *pPan = Parameters("PAN")->asGrid(); + + double Offset_Pan, Offset, Scale; + + if( Parameters("PAN_MATCH")->asInt() == 0 ) + { + Offset_Pan = pPan->Get_ZMin(); + Offset = pPCA_0->asGrid(0)->Get_ZMin(); + Scale = pPCA_0->asGrid(0)->Get_ZRange() / pPan->Get_ZRange(); + } + else + { + Offset_Pan = pPan->Get_Mean(); + Offset = pPCA_0->asGrid(0)->Get_Mean(); + Scale = pPCA_0->asGrid(0)->Get_StdDev() / pPan->Get_StdDev(); + } + + PCA[0].Create(*Get_System()); + + for(int y=0; yis_NoData(x, y) ) + { + PCA[0].Set_NoData(x, y); + } + else + { + PCA[0].Set_Value(x, y, Offset + Scale * (pPan->asDouble(x, y) - Offset_Pan)); + } + } + } + + pPCA_1->Add_Item(&PCA[0]); + + delete(pPCA_0->asGrid(0)); + + for(int i=1; iGet_Count(); i++) + { + Process_Set_Text(CSG_String::Format(SG_T("%s: %s ..."), _TL("Resampling"), pPCA_0->asGrid(i)->Get_Name())); + + PCA[i].Create(*Get_System()); + PCA[i].Assign(pPCA_0->asGrid(i), Interpolation); + pPCA_1->Add_Item(&PCA[i]); + delete(pPCA_0->asGrid(i)); + } + + //----------------------------------------------------- + RUN_MODULE(bResult, "statistics_grid", 10, P, *Get_System(), + SET_PARAMETER("PCA" , P("PCA_1")) + && SET_PARAMETER("GRIDS" , Parameters("SHARPEN")) + && SET_PARAMETER("EIGEN" , &Eigen) + ); + + delete[](PCA); + + if( !bResult ) + { + return( false ); + } + + Parameters.Set_Parameter("SHARPEN", P.Get_Parameter("GRIDS")); + + CSG_Parameter_Grid_List *pGrids = Parameters("GRIDS" )->asGridList(); + CSG_Parameter_Grid_List *pSharp = Parameters("SHARPEN")->asGridList(); + + for(int j=0; jGet_Count() && jGet_Count(); j++) + { + pSharp->asGrid(j)->Set_Name(pGrids->asGrid(j)->Get_Name()); + } + + return( true ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- diff -Nru saga-2.1.0+dfsg/src/modules/imagery/imagery_tools/pansharpening.h saga-2.1.4+dfsg/src/modules/imagery/imagery_tools/pansharpening.h --- saga-2.1.0+dfsg/src/modules/imagery/imagery_tools/pansharpening.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/imagery/imagery_tools/pansharpening.h 2014-11-13 08:32:18.000000000 +0000 @@ -0,0 +1,155 @@ +/********************************************************** + * Version $Id: pansharpening.h 1938 2014-01-12 13:44:06Z reklov_w $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// imagery_tools // +// // +//-------------------------------------------------------// +// // +// pansharpening.h // +// // +// Copyright (C) 2011 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Hamburg // +// Germany // +// // +/////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#ifndef HEADER_INCLUDED__pansharpening_pca_H +#define HEADER_INCLUDED__pansharpening_pca_H + +//--------------------------------------------------------- +#include "MLB_Interface.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +class CPanSharp_IHS : public CSG_Module_Grid +{ +public: + CPanSharp_IHS(void); + + virtual CSG_String Get_MenuPath (void) { return( _TL("R:Image Sharpening") ); } + + +protected: + + virtual bool On_Execute (void); + +}; + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +class CPanSharp_Brovey : public CSG_Module_Grid +{ +public: + CPanSharp_Brovey(void); + + virtual CSG_String Get_MenuPath (void) { return( _TL("R:Image Sharpening") ); } + + +protected: + + virtual bool On_Execute (void); + +}; + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +class CPanSharp_CN : public CSG_Module_Grid +{ +public: + CPanSharp_CN(void); + + virtual CSG_String Get_MenuPath (void) { return( _TL("R:Image Sharpening") ); } + + +protected: + + virtual bool On_Execute (void); + +}; + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +class CPanSharp_PCA : public CSG_Module_Grid +{ +public: + CPanSharp_PCA(void); + + virtual CSG_String Get_MenuPath (void) { return( _TL("R:Image Sharpening") ); } + + +protected: + + virtual bool On_Execute (void); + +}; + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#endif // #ifndef HEADER_INCLUDED__pansharpening_pca_H diff -Nru saga-2.1.0+dfsg/src/modules/imagery/imagery_tools/tasseled_cap.cpp saga-2.1.4+dfsg/src/modules/imagery/imagery_tools/tasseled_cap.cpp --- saga-2.1.0+dfsg/src/modules/imagery/imagery_tools/tasseled_cap.cpp 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/imagery/imagery_tools/tasseled_cap.cpp 2014-11-13 08:32:18.000000000 +0000 @@ -0,0 +1,227 @@ +/********************************************************** + * Version $Id: tasseled_cap.cpp 1938 2014-01-12 13:44:06Z reklov_w $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// imagery_tools // +// // +//-------------------------------------------------------// +// // +// tasseled_cap.cpp // +// // +// Copyright (C) 2011 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Hamburg // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "tasseled_cap.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +CTasseled_Cap::CTasseled_Cap(void) +{ + Set_Name (_TL("Tasseled Cap Transformation")); + + Set_Author (SG_T("O.Conrad (c) 2011")); + + Set_Description (_TW( + "Tasseled Cap Transformation as proposed for Landsat Thematic Mapper.\n" + "\n" + "References:\n" + "Kauth R. J. und G. S. Thomas (1976): " + "The Tasseled Cap - A Graphic Description of the Spectral-Temporal Development of Agricultural Crops as Seen by LANDSAT. " + "Proceedings of the Symposium on Machine Processing of Remotely Sensed Data. " + "online at Purdue University\n" + "\n" + "Huang, C., B. Wylie, L. Yang, C. Homer, and G. Zylstra. " + "Derivation of a Tasseled Cap Transformation Based on Landsat 7 At-Satellite Reflectance. " + "USGS EROS Data Center White Paper. " + "online at USGS\n" + )); + + Parameters.Add_Grid( + NULL, "BLUE" , _TL("Blue (TM 1)"), + _TL(""), + PARAMETER_INPUT_OPTIONAL + ); + + Parameters.Add_Grid( + NULL, "RED" , _TL("Red (TM 2)"), + _TL(""), + PARAMETER_INPUT + ); + + Parameters.Add_Grid( + NULL, "GREEN" , _TL("Green (TM 3)"), + _TL(""), + PARAMETER_INPUT + ); + + Parameters.Add_Grid( + NULL, "NIR" , _TL("Near Infrared (TM 4)"), + _TL(""), + PARAMETER_INPUT + ); + + Parameters.Add_Grid( + NULL, "MIR1" , _TL("Mid Infrared (TM 5)"), + _TL(""), + PARAMETER_INPUT + ); + + Parameters.Add_Grid( + NULL, "MIR2" , _TL("Mid Infrared (TM 7)"), + _TL(""), + PARAMETER_INPUT + ); + + Parameters.Add_Grid( + NULL, "BRIGHTNESS" , _TL("Brightness"), + _TL(""), + PARAMETER_OUTPUT + ); + + Parameters.Add_Grid( + NULL, "GREENNESS" , _TL("Greenness"), + _TL(""), + PARAMETER_OUTPUT + ); + + Parameters.Add_Grid( + NULL, "WETNESS" , _TL("Wetness"), + _TL(""), + PARAMETER_OUTPUT + ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CTasseled_Cap::On_Execute(void) +{ + CSG_Grid *pBand[6], *pBright, *pGreen, *pWet; + + pBand[0] = Parameters("BLUE" )->asGrid(); + pBand[1] = Parameters("GREEN" )->asGrid(); + pBand[2] = Parameters("RED" )->asGrid(); + pBand[3] = Parameters("NIR" )->asGrid(); + pBand[4] = Parameters("MIR1" )->asGrid(); + pBand[5] = Parameters("MIR2" )->asGrid(); + + pBright = Parameters("BRIGHTNESS")->asGrid(); + pGreen = Parameters("GREENNESS" )->asGrid(); + pWet = Parameters("WETNESS" )->asGrid(); + + DataObject_Set_Colors(pBright, 100, SG_COLORS_BLACK_WHITE , false); + DataObject_Set_Colors(pGreen , 100, SG_COLORS_WHITE_GREEN , false); + DataObject_Set_Colors(pWet , 100, SG_COLORS_RED_GREY_BLUE, false); + + for(int y=0; yis_NoData(x, y) + || pBand[1]->is_NoData(x, y) + || pBand[2]->is_NoData(x, y) + || pBand[3]->is_NoData(x, y) + || pBand[4]->is_NoData(x, y) + || pBand[5]->is_NoData(x, y) + ) + { + pBright ->Set_NoData(x, y); + pGreen ->Set_NoData(x, y); + pWet ->Set_NoData(x, y); + } + else + { + double b[6]; + + b[0] = pBand[0]->asDouble(x, y); + b[1] = pBand[1]->asDouble(x, y); + b[2] = pBand[2]->asDouble(x, y); + b[3] = pBand[3]->asDouble(x, y); + b[4] = pBand[4]->asDouble(x, y); + b[5] = pBand[5]->asDouble(x, y); + + pBright ->Set_Value(x, y, + 0.3037 * b[0] + 0.2793 * b[1] + 0.4743 * b[2] + 0.5585 * b[3] + 0.5082 * b[4] + 0.1863 * b[5] + ); + + pGreen ->Set_Value(x, y, + -0.2848 * b[0] - 0.2435 * b[1] - 0.5436 * b[2] + 0.7243 * b[3] + 0.0840 * b[4] - 0.1800 * b[5] + ); + + pWet ->Set_Value(x, y, + 0.1509 * b[0] + 0.1973 * b[1] + 0.3279 * b[2] + 0.3406 * b[3] - 0.7112 * b[4] - 0.4572 * b[5] + ); + } + } + } + + return( true ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- diff -Nru saga-2.1.0+dfsg/src/modules/imagery/imagery_tools/tasseled_cap.h saga-2.1.4+dfsg/src/modules/imagery/imagery_tools/tasseled_cap.h --- saga-2.1.0+dfsg/src/modules/imagery/imagery_tools/tasseled_cap.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/imagery/imagery_tools/tasseled_cap.h 2014-11-13 08:32:18.000000000 +0000 @@ -0,0 +1,108 @@ +/********************************************************** + * Version $Id: tasseled_cap.h 1938 2014-01-12 13:44:06Z reklov_w $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// imagery_tools // +// // +//-------------------------------------------------------// +// // +// tasseled_cap.h // +// // +// Copyright (C) 2011 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Hamburg // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#ifndef HEADER_INCLUDED__tasseled_cap_H +#define HEADER_INCLUDED__tasseled_cap_H + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "MLB_Interface.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +class CTasseled_Cap : public CSG_Module_Grid +{ +public: + CTasseled_Cap(void); + + virtual CSG_String Get_MenuPath (void) { return( _TL("Vegetation Indices") ); } + + +protected: + + virtual bool On_Execute (void); + + +private: + +}; + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#endif // #ifndef HEADER_INCLUDED__tasseled_cap_H diff -Nru saga-2.1.0+dfsg/src/modules/imagery/imagery_vigra/Makefile.am saga-2.1.4+dfsg/src/modules/imagery/imagery_vigra/Makefile.am --- saga-2.1.0+dfsg/src/modules/imagery/imagery_vigra/Makefile.am 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/imagery/imagery_vigra/Makefile.am 2014-11-13 08:32:18.000000000 +0000 @@ -0,0 +1,37 @@ +# +# $Id: Makefile.am 1896 2013-12-10 14:56:59Z oconrad $ +# +if DEBUG +DBGFLAGS = -g -DDEBUG +endif +if SAGA_UNICODE +UC_DEFS = -D_SAGA_UNICODE +endif +if HAVE_VIGRA +DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD +CXX_INCS = -I$(top_srcdir)/src/saga_core +AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS) +AM_LDFLAGS = -fPIC -shared -avoid-version -lvigraimpex -lfftw3 +pkglib_LTLIBRARIES = libimagery_vigra.la +libimagery_vigra_la_SOURCES =\ +vigra.h\ +vigra_edges.h\ +vigra_smoothing.h\ +vigra_distance.h\ +vigra_fft.h\ +vigra_morphology.h\ +vigra_random_forest.h\ +vigra_watershed.h\ +MLB_Interface.cpp\ +vigra.cpp\ +MLB_Interface.h\ +vigra_distance.cpp\ +vigra_fft.cpp\ +vigra_smoothing.cpp\ +vigra_edges.cpp\ +vigra_morphology.cpp\ +vigra_random_forest.cpp\ +vigra_watershed.cpp + +libimagery_vigra_la_LIBADD = $(top_srcdir)/src/saga_core/saga_api/libsaga_api.la +endif diff -Nru saga-2.1.0+dfsg/src/modules/imagery/imagery_vigra/Makefile.in saga-2.1.4+dfsg/src/modules/imagery/imagery_vigra/Makefile.in --- saga-2.1.0+dfsg/src/modules/imagery/imagery_vigra/Makefile.in 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/imagery/imagery_vigra/Makefile.in 2014-11-13 08:33:32.000000000 +0000 @@ -0,0 +1,731 @@ +# Makefile.in generated by automake 1.14.1 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +subdir = src/modules/imagery/imagery_vigra +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_postgresql.m4 \ + $(top_srcdir)/m4/ax_pkg_swig.m4 \ + $(top_srcdir)/m4/ax_python_devel.m4 \ + $(top_srcdir)/m4/ax_swig_enable_cxx.m4 \ + $(top_srcdir)/m4/ax_swig_python.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__installdirs = "$(DESTDIR)$(pkglibdir)" +LTLIBRARIES = $(pkglib_LTLIBRARIES) +@HAVE_VIGRA_TRUE@libimagery_vigra_la_DEPENDENCIES = $(top_srcdir)/src/saga_core/saga_api/libsaga_api.la +am__libimagery_vigra_la_SOURCES_DIST = vigra.h vigra_edges.h \ + vigra_smoothing.h vigra_distance.h vigra_fft.h \ + vigra_morphology.h vigra_random_forest.h vigra_watershed.h \ + MLB_Interface.cpp vigra.cpp MLB_Interface.h vigra_distance.cpp \ + vigra_fft.cpp vigra_smoothing.cpp vigra_edges.cpp \ + vigra_morphology.cpp vigra_random_forest.cpp \ + vigra_watershed.cpp +@HAVE_VIGRA_TRUE@am_libimagery_vigra_la_OBJECTS = MLB_Interface.lo \ +@HAVE_VIGRA_TRUE@ vigra.lo vigra_distance.lo vigra_fft.lo \ +@HAVE_VIGRA_TRUE@ vigra_smoothing.lo vigra_edges.lo \ +@HAVE_VIGRA_TRUE@ vigra_morphology.lo vigra_random_forest.lo \ +@HAVE_VIGRA_TRUE@ vigra_watershed.lo +libimagery_vigra_la_OBJECTS = $(am_libimagery_vigra_la_OBJECTS) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +@HAVE_VIGRA_TRUE@am_libimagery_vigra_la_rpath = -rpath $(pkglibdir) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) +depcomp = $(SHELL) $(top_srcdir)/depcomp +am__depfiles_maybe = depfiles +am__mv = mv -f +CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = +CXXLD = $(CXX) +CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = +CCLD = $(CC) +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = +SOURCES = $(libimagery_vigra_la_SOURCES) +DIST_SOURCES = $(am__libimagery_vigra_la_SOURCES_DIST) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +AX_SWIG_PYTHON_CPPFLAGS = @AX_SWIG_PYTHON_CPPFLAGS@ +AX_SWIG_PYTHON_OPT = @AX_SWIG_PYTHON_OPT@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DISABLELIBHARU = @DISABLELIBHARU@ +DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +FGREP = @FGREP@ +GOMPFLAGS = @GOMPFLAGS@ +GREP = @GREP@ +HARU_LIB = @HARU_LIB@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LOCAL_INCS = @LOCAL_INCS@ +LOCAL_LIBS = @LOCAL_LIBS@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ +MKDIR_P = @MKDIR_P@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PG_CONFIG = @PG_CONFIG@ +POSTGRESQL_CFLAGS = @POSTGRESQL_CFLAGS@ +POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@ +POSTGRESQL_VERSION = @POSTGRESQL_VERSION@ +POW_LIB = @POW_LIB@ +PYTHON = @PYTHON@ +PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ +PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ +PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ +PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_PLATFORM = @PYTHON_PLATFORM@ +PYTHON_PREFIX = @PYTHON_PREFIX@ +PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ +PYTHON_VERSION = @PYTHON_VERSION@ +RANLIB = @RANLIB@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +SWIG = @SWIG@ +SWIG_LIB = @SWIG_LIB@ +VERSION = @VERSION@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +pkgpyexecdir = @pkgpyexecdir@ +pkgpythondir = @pkgpythondir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +pyexecdir = @pyexecdir@ +pythondir = @pythondir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ + +# +# $Id: Makefile.am 1896 2013-12-10 14:56:59Z oconrad $ +# +@DEBUG_TRUE@DBGFLAGS = -g -DDEBUG +@SAGA_UNICODE_TRUE@UC_DEFS = -D_SAGA_UNICODE +@HAVE_VIGRA_TRUE@DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD +@HAVE_VIGRA_TRUE@CXX_INCS = -I$(top_srcdir)/src/saga_core +@HAVE_VIGRA_TRUE@AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS) +@HAVE_VIGRA_TRUE@AM_LDFLAGS = -fPIC -shared -avoid-version -lvigraimpex -lfftw3 +@HAVE_VIGRA_TRUE@pkglib_LTLIBRARIES = libimagery_vigra.la +@HAVE_VIGRA_TRUE@libimagery_vigra_la_SOURCES = \ +@HAVE_VIGRA_TRUE@vigra.h\ +@HAVE_VIGRA_TRUE@vigra_edges.h\ +@HAVE_VIGRA_TRUE@vigra_smoothing.h\ +@HAVE_VIGRA_TRUE@vigra_distance.h\ +@HAVE_VIGRA_TRUE@vigra_fft.h\ +@HAVE_VIGRA_TRUE@vigra_morphology.h\ +@HAVE_VIGRA_TRUE@vigra_random_forest.h\ +@HAVE_VIGRA_TRUE@vigra_watershed.h\ +@HAVE_VIGRA_TRUE@MLB_Interface.cpp\ +@HAVE_VIGRA_TRUE@vigra.cpp\ +@HAVE_VIGRA_TRUE@MLB_Interface.h\ +@HAVE_VIGRA_TRUE@vigra_distance.cpp\ +@HAVE_VIGRA_TRUE@vigra_fft.cpp\ +@HAVE_VIGRA_TRUE@vigra_smoothing.cpp\ +@HAVE_VIGRA_TRUE@vigra_edges.cpp\ +@HAVE_VIGRA_TRUE@vigra_morphology.cpp\ +@HAVE_VIGRA_TRUE@vigra_random_forest.cpp\ +@HAVE_VIGRA_TRUE@vigra_watershed.cpp + +@HAVE_VIGRA_TRUE@libimagery_vigra_la_LIBADD = $(top_srcdir)/src/saga_core/saga_api/libsaga_api.la +all: all-am + +.SUFFIXES: +.SUFFIXES: .cpp .lo .o .obj +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/modules/imagery/imagery_vigra/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign src/modules/imagery/imagery_vigra/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): + +install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) + @$(NORMAL_INSTALL) + @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ + list2=; for p in $$list; do \ + if test -f $$p; then \ + list2="$$list2 $$p"; \ + else :; fi; \ + done; \ + test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \ + } + +uninstall-pkglibLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ + for p in $$list; do \ + $(am__strip_dir) \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$f"; \ + done + +clean-pkglibLTLIBRARIES: + -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES) + @list='$(pkglib_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + +libimagery_vigra.la: $(libimagery_vigra_la_OBJECTS) $(libimagery_vigra_la_DEPENDENCIES) $(EXTRA_libimagery_vigra_la_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) $(am_libimagery_vigra_la_rpath) $(libimagery_vigra_la_OBJECTS) $(libimagery_vigra_la_LIBADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MLB_Interface.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vigra.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vigra_distance.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vigra_edges.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vigra_fft.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vigra_morphology.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vigra_random_forest.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vigra_smoothing.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vigra_watershed.Plo@am__quote@ + +.cpp.o: +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< + +.cpp.obj: +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + +.cpp.lo: +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + set x; \ + here=`pwd`; \ + $(am__define_uniq_tagged_files); \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ + fi +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ + test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(LTLIBRARIES) +installdirs: + for dir in "$(DESTDIR)$(pkglibdir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool clean-pkglibLTLIBRARIES \ + mostlyclean-am + +distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: install-pkglibLTLIBRARIES + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-pkglibLTLIBRARIES + +.MAKE: install-am install-strip + +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-pkglibLTLIBRARIES install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ + uninstall-pkglibLTLIBRARIES + + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nru saga-2.1.0+dfsg/src/modules/imagery/imagery_vigra/MLB_Interface.cpp saga-2.1.4+dfsg/src/modules/imagery/imagery_vigra/MLB_Interface.cpp --- saga-2.1.0+dfsg/src/modules/imagery/imagery_vigra/MLB_Interface.cpp 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/imagery/imagery_vigra/MLB_Interface.cpp 2014-11-13 08:32:18.000000000 +0000 @@ -0,0 +1,161 @@ +/********************************************************** + * Version $Id: MLB_Interface.cpp 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// VIGRA // +// // +//-------------------------------------------------------// +// // +// MLB_Interface.cpp // +// // +// Copyright (C) 2009 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Hamburg // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// The Module Link Library Interface // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +// 1. Include the appropriate SAGA-API header... + +#include "MLB_Interface.h" + + +//--------------------------------------------------------- +// 2. Place general module library informations here... + +CSG_String Get_Info(int i) +{ + switch( i ) + { + case MLB_INFO_Name: default: + return( _TL("ViGrA") ); + + case MLB_INFO_Category: + return( _TL("Imagery") ); + + case MLB_INFO_Author: + return( _TL("O. Conrad (c) 2009") ); + + case MLB_INFO_Description: + { + CSG_String s; + + s += "ViGrA - \"Vision with Generic Algorithms\"\n"; +#ifdef VIGRA_VERSION + s += "Version: "; s += VIGRA_VERSION; s += "\n"; +#endif + s += _TW( + "ViGrA is a novel computer vision library that puts its main " + "emphasize on customizable algorithms and data structures. " + "By using template techniques similar to those in the C++ " + "Standard Template Library (STL), you can easily adapt any ViGrA " + "component to the needs of your application, without thereby " + "giving up execution speed.\n" + "Find out more at the ViGrA - Vision with Generic Algorithms - homepage:\n" + "" + "http://hci.iwr.uni-heidelberg.de\n" + ); + + return( s ); + } + + case MLB_INFO_Version: + return( SG_T("1.0") ); + + case MLB_INFO_Menu_Path: + return( _TL("Imagery|ViGrA") ); + } +} + + +//--------------------------------------------------------- +// 3. Include the headers of your modules here... + +#include "vigra_smoothing.h" +#include "vigra_edges.h" +#include "vigra_morphology.h" +#include "vigra_distance.h" +#include "vigra_fft.h" +#include "vigra_watershed.h" +#include "vigra_random_forest.h" + + +//--------------------------------------------------------- +// 4. Allow your modules to be created here... + +CSG_Module * Create_Module(int i) +{ + switch( i ) + { + case 0: return( new CViGrA_Smoothing ); + case 1: return( new CViGrA_Edges ); + case 2: return( new CViGrA_Morphology ); + case 3: return( new CViGrA_Distance ); + case 4: return( new CViGrA_Watershed ); + case 5: return( new CViGrA_FFT ); + case 6: return( new CViGrA_FFT_Inverse ); + case 7: return( new CViGrA_FFT_Real ); + case 8: return( new CViGrA_FFT_Filter ); + case 9: return( new CViGrA_Random_Forest ); + } + + return( NULL ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +//{{AFX_SAGA + + MLB_INTERFACE + +//}}AFX_SAGA diff -Nru saga-2.1.0+dfsg/src/modules/imagery/imagery_vigra/MLB_Interface.h saga-2.1.4+dfsg/src/modules/imagery/imagery_vigra/MLB_Interface.h --- saga-2.1.0+dfsg/src/modules/imagery/imagery_vigra/MLB_Interface.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/imagery/imagery_vigra/MLB_Interface.h 2014-11-13 08:32:18.000000000 +0000 @@ -0,0 +1,79 @@ +/********************************************************** + * Version $Id: MLB_Interface.h 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// VIGRA // +// // +//-------------------------------------------------------// +// // +// MLB_Interface.h // +// // +// Copyright (C) 2009 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Hamburg // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// Include the SAGA-API here // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#ifndef HEADER_INCLUDED__MLB_VIGRA_H +#define HEADER_INCLUDED__MLB_VIGRA_H + +//--------------------------------------------------------- +#include + +//--------------------------------------------------------- +#include + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#endif // #ifndef HEADER_INCLUDED__MLB_VIGRA_H diff -Nru saga-2.1.0+dfsg/src/modules/imagery/imagery_vigra/vigra.cpp saga-2.1.4+dfsg/src/modules/imagery/imagery_vigra/vigra.cpp --- saga-2.1.0+dfsg/src/modules/imagery/imagery_vigra/vigra.cpp 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/imagery/imagery_vigra/vigra.cpp 2014-11-13 08:32:18.000000000 +0000 @@ -0,0 +1,137 @@ +/********************************************************** + * Version $Id: vigra.cpp 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// VIGRA // +// // +//-------------------------------------------------------// +// // +// vigra.cpp // +// // +// Copyright (C) 2009 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Hamburg // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "vigra.h" + +//--------------------------------------------------------- +using namespace vigra; + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool Copy_RGBGrid_SAGA_to_VIGRA (CSG_Grid &Grid, BRGBImage &Image, bool bCreate) +{ + if( bCreate ) + { + Image.resize(Grid.Get_NX(), Grid.Get_NY()); + } + + if( Grid.Get_NX() != Image.width() || Grid.Get_NY() != Image.height() ) + { + return( false ); + } + + for(int y=0; y rgb(SG_GET_R(Grid.asInt(x, y)), SG_GET_G(Grid.asInt(x, y)), SG_GET_B(Grid.asInt(x, y))); + + Image(x, y) = rgb; + } + } + + SG_UI_Process_Set_Progress(0.0, 1.0); + + return( true ); +} + +//--------------------------------------------------------- +bool Copy_RGBGrid_VIGRA_to_SAGA (CSG_Grid &Grid, BRGBImage &Image, bool bCreate) +{ + if( bCreate ) + { + Grid.Create(Grid.Get_Type(), Image.width(), Image.height()); + } + + if( Grid.Get_NX() != Image.width() || Grid.Get_NY() != Image.height() ) + { + return( false ); + } + + for(int y=0; y rgb = Image(x, y); + + Grid.Set_Value(x, y, SG_GET_RGB(rgb.red(), rgb.green(), rgb.blue())); + } + } + + SG_UI_Process_Set_Progress(0.0, 1.0); + + return( true ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- diff -Nru saga-2.1.0+dfsg/src/modules/imagery/imagery_vigra/vigra_distance.cpp saga-2.1.4+dfsg/src/modules/imagery/imagery_vigra/vigra_distance.cpp --- saga-2.1.0+dfsg/src/modules/imagery/imagery_vigra/vigra_distance.cpp 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/imagery/imagery_vigra/vigra_distance.cpp 2014-11-13 08:32:18.000000000 +0000 @@ -0,0 +1,151 @@ +/********************************************************** + * Version $Id: vigra_distance.cpp 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// VIGRA // +// // +//-------------------------------------------------------// +// // +// vigra_distance.cpp // +// // +// Copyright (C) 2009 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Hamburg // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "vigra_distance.h" + +//--------------------------------------------------------- +#include + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +CViGrA_Distance::CViGrA_Distance(void) +{ + Set_Name (_TL("Distance (ViGrA)")); + + Set_Author (SG_T("O.Conrad (c) 2009")); + + Set_Description (_TW( + "References:\n" + "ViGrA - Vision with Generic Algorithms\n" + "http://hci.iwr.uni-heidelberg.de" + )); + + Parameters.Add_Grid( + NULL , "INPUT" , _TL("Features"), + _TL("Features are all pixels different not representing no-data."), + PARAMETER_INPUT + ); + + Parameters.Add_Grid( + NULL , "OUTPUT" , _TL("Distance"), + _TL(""), + PARAMETER_OUTPUT + ); + + Parameters.Add_Choice( + NULL , "NORM" , _TL("Type of distance calculation"), + _TL(""), + CSG_String::Format(SG_T("%s|%s|%s|"), + _TL("Chessboard"), + _TL("Manhattan"), + _TL("Euclidean") + ) + ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CViGrA_Distance::On_Execute(void) +{ + int Norm; + CSG_Grid *pInput, *pOutput; + + pInput = Parameters("INPUT") ->asGrid(); + pOutput = Parameters("OUTPUT") ->asGrid(); + Norm = Parameters("NORM") ->asInt(); + + //----------------------------------------------------- + vigra::FImage Input, Output(Get_NX(), Get_NY()); + + Copy_Grid_SAGA_to_VIGRA(*pInput, Input, true); + + distanceTransform(srcImageRange(Input), destImage(Output), pInput->Get_NoData_Value(), Norm); + + Copy_Grid_VIGRA_to_SAGA(*pOutput, Output, false); + + //----------------------------------------------------- + pOutput->Multiply(pOutput->Get_Cellsize()); + + pOutput->Set_Name(CSG_String::Format(SG_T("%s [%s - %s]"), pInput->Get_Name(), Get_Name().c_str(), Parameters("NORM")->asString())); + + return( true ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- diff -Nru saga-2.1.0+dfsg/src/modules/imagery/imagery_vigra/vigra_distance.h saga-2.1.4+dfsg/src/modules/imagery/imagery_vigra/vigra_distance.h --- saga-2.1.0+dfsg/src/modules/imagery/imagery_vigra/vigra_distance.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/imagery/imagery_vigra/vigra_distance.h 2014-11-13 08:32:18.000000000 +0000 @@ -0,0 +1,106 @@ +/********************************************************** + * Version $Id: vigra_distance.h 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// VIGRA // +// // +//-------------------------------------------------------// +// // +// vigra_distance.h // +// // +// Copyright (C) 2009 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Hamburg // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#ifndef HEADER_INCLUDED__vigra_distance_H +#define HEADER_INCLUDED__vigra_distance_H + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "vigra.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +class CViGrA_Distance : public CSG_Module_Grid +{ +public: + CViGrA_Distance(void); + + virtual CSG_String Get_MenuPath (void) { return( _TL("A:Grid|Distances") ); } + + +protected: + + virtual bool On_Execute (void); + + +}; + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#endif // #ifndef HEADER_INCLUDED__vigra_distance_H diff -Nru saga-2.1.0+dfsg/src/modules/imagery/imagery_vigra/vigra_edges.cpp saga-2.1.4+dfsg/src/modules/imagery/imagery_vigra/vigra_edges.cpp --- saga-2.1.0+dfsg/src/modules/imagery/imagery_vigra/vigra_edges.cpp 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/imagery/imagery_vigra/vigra_edges.cpp 2014-11-13 08:32:18.000000000 +0000 @@ -0,0 +1,178 @@ +/********************************************************** + * Version $Id: vigra_edges.cpp 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// VIGRA // +// // +//-------------------------------------------------------// +// // +// vigra_edges.cpp // +// // +// Copyright (C) 2009 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Hamburg // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "vigra_edges.h" + +//--------------------------------------------------------- +#include + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +CViGrA_Edges::CViGrA_Edges(void) +{ + Set_Name (_TL("Edge Detection (ViGrA)")); + + Set_Author (SG_T("O.Conrad (c) 2009")); + + Set_Description (_TW( + "References:\n" + "ViGrA - Vision with Generic Algorithms\n" + "http://hci.iwr.uni-heidelberg.de" + )); + + Parameters.Add_Grid( + NULL , "INPUT" , _TL("Input"), + _TL(""), + PARAMETER_INPUT + ); + + Parameters.Add_Grid( + NULL , "OUTPUT" , _TL("Edges"), + _TL(""), + PARAMETER_OUTPUT + ); + + Parameters.Add_Choice( + NULL , "TYPE" , _TL("Detector type"), + _TL(""), + CSG_String::Format(SG_T("%s|%s|"), + _TL("Canny"), + _TL("Shen-Castan") + ) + ); + + Parameters.Add_Value( + NULL , "SCALE" , _TL("Operator scale"), + _TL(""), + PARAMETER_TYPE_Double, 1.0, 0.0, true + ); + + Parameters.Add_Value( + NULL , "THRESHOLD" , _TL("Gradient threshold"), + _TL(""), + PARAMETER_TYPE_Double, 1.0, 0.0, true + ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CViGrA_Edges::On_Execute(void) +{ + int Type; + double Scale, Threshold; + CSG_Grid *pInput, *pOutput; + + pInput = Parameters("INPUT") ->asGrid(); + pOutput = Parameters("OUTPUT") ->asGrid(); + Type = Parameters("TYPE") ->asInt(); + Scale = Parameters("SCALE") ->asDouble(); + Threshold = Parameters("THRESHOLD") ->asDouble(); + + //----------------------------------------------------- + vigra::FImage Input; + vigra::BImage Output(Get_NX(), Get_NY()); + + Copy_Grid_SAGA_to_VIGRA(*pInput, Input, true); + + Output = 0; + + switch( Type ) + { + default: + case 0: // Canny + cannyEdgeImage (srcImageRange(Input), destImage(Output), Scale, Threshold, 1); + break; + + case 1: // Shen-Castan + differenceOfExponentialEdgeImage(srcImageRange(Input), destImage(Output), Scale, Threshold, 1); + break; + } + + //----------------------------------------------------- + Copy_Grid_VIGRA_to_SAGA(*pOutput, Output, false); + + pOutput->Set_NoData_Value(0); + + pOutput->Set_Name(CSG_String::Format(SG_T("%s [%s]"), pInput->Get_Name(), Get_Name().c_str())); + + return( true ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- diff -Nru saga-2.1.0+dfsg/src/modules/imagery/imagery_vigra/vigra_edges.h saga-2.1.4+dfsg/src/modules/imagery/imagery_vigra/vigra_edges.h --- saga-2.1.0+dfsg/src/modules/imagery/imagery_vigra/vigra_edges.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/imagery/imagery_vigra/vigra_edges.h 2014-11-13 08:32:18.000000000 +0000 @@ -0,0 +1,106 @@ +/********************************************************** + * Version $Id: vigra_edges.h 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// VIGRA // +// // +//-------------------------------------------------------// +// // +// vigra_edges.h // +// // +// Copyright (C) 2009 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Hamburg // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#ifndef HEADER_INCLUDED__vigra_edges_H +#define HEADER_INCLUDED__vigra_edges_H + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "vigra.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +class CViGrA_Edges : public CSG_Module_Grid +{ +public: + CViGrA_Edges(void); + + virtual CSG_String Get_MenuPath (void) { return( _TL("A:Imagery|Segmentation") ); } + + +protected: + + virtual bool On_Execute (void); + + +}; + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#endif // #ifndef HEADER_INCLUDED__vigra_edges_H diff -Nru saga-2.1.0+dfsg/src/modules/imagery/imagery_vigra/vigra_fft.cpp saga-2.1.4+dfsg/src/modules/imagery/imagery_vigra/vigra_fft.cpp --- saga-2.1.0+dfsg/src/modules/imagery/imagery_vigra/vigra_fft.cpp 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/imagery/imagery_vigra/vigra_fft.cpp 2014-11-13 08:32:18.000000000 +0000 @@ -0,0 +1,565 @@ +/********************************************************** + * Version $Id: vigra_fft.cpp 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// VIGRA // +// // +//-------------------------------------------------------// +// // +// vigra_fft.cpp // +// // +// Copyright (C) 2009 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Hamburg // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "vigra_fft.h" + +//--------------------------------------------------------- +#include + +//--------------------------------------------------------- +using namespace vigra; + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool Copy_ComplexGrid_SAGA_to_VIGRA (CSG_Grid &Real, CSG_Grid &Imag, FFTWComplexImage &Image, bool bCreate) +{ + if( bCreate ) + { + Image.resize(Real.Get_NX(), Real.Get_NY()); + } + + if( Real.Get_NX() != Image.width() || Real.Get_NY() != Image.height() + || Imag.Get_NX() != Image.width() || Imag.Get_NY() != Image.height() ) + { + return( false ); + } + + #pragma omp parallel for + for(int y=0; yhttp://hci.iwr.uni-heidelberg.de" + )); + + Parameters.Add_Grid( + NULL , "INPUT" , _TL("Input"), + _TL(""), + PARAMETER_INPUT + ); + + Parameters.Add_Grid( + NULL , "REAL" , _TL("Real"), + _TL(""), + PARAMETER_OUTPUT + ); + + Parameters.Add_Grid( + NULL , "IMAG" , _TL("Imaginary"), + _TL(""), + PARAMETER_OUTPUT + ); + + Parameters.Add_Value( + NULL , "CENTER" , _TL("Centered"), + _TL(""), + PARAMETER_TYPE_Bool, true + ); +} + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CViGrA_FFT::On_Execute(void) +{ + CSG_Grid *pInput, *pReal, *pImag; + + pInput = Parameters("INPUT")->asGrid(); + pReal = Parameters("REAL" )->asGrid(); + pImag = Parameters("IMAG" )->asGrid(); + + //----------------------------------------------------- + vigra::FImage Input; + vigra::FFTWComplexImage Output(Get_NX(), Get_NY()); + + Copy_Grid_SAGA_to_VIGRA(*pInput, Input, true); + + if( !Parameters("CENTER")->asBool() ) + { + fourierTransform(srcImageRange(Input) , destImage(Output)); + } + else + { + vigra::FFTWComplexImage tmp(Get_NX(), Get_NY()); + + fourierTransform(srcImageRange(Input) , destImage(tmp)); + moveDCToCenter (srcImageRange(tmp) , destImage(Output)); + } + + //----------------------------------------------------- + Copy_ComplexGrid_VIGRA_to_SAGA(*pReal, *pImag, Output, false); + + pReal->Set_Name(CSG_String::Format(SG_T("%s [FFT - %s]"), pInput->Get_Name(), _TL("Real"))); + pImag->Set_Name(CSG_String::Format(SG_T("%s [FFT - %s]"), pInput->Get_Name(), _TL("Imaginary"))); + + return( true ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +CViGrA_FFT_Inverse::CViGrA_FFT_Inverse(void) +{ + Set_Name (_TL("Fourier Transform Inverse (ViGrA)")); + + Set_Author ("O.Conrad (c) 2009"); + + Set_Description (_TW( + "References:\n" + "ViGrA - Vision with Generic Algorithms\n" + "http://hci.iwr.uni-heidelberg.de" + )); + + Parameters.Add_Grid( + NULL , "REAL" , _TL("Real"), + _TL(""), + PARAMETER_INPUT + ); + + Parameters.Add_Grid( + NULL , "IMAG" , _TL("Imaginary"), + _TL(""), + PARAMETER_INPUT + ); + + Parameters.Add_Grid( + NULL , "OUTPUT" , _TL("Output"), + _TL(""), + PARAMETER_OUTPUT + ); + + Parameters.Add_Value( + NULL , "CENTER" , _TL("Centered"), + _TL(""), + PARAMETER_TYPE_Bool, true + ); +} + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CViGrA_FFT_Inverse::On_Execute(void) +{ + CSG_Grid *pReal, *pImag; + + pReal = Parameters("REAL")->asGrid(); + pImag = Parameters("IMAG")->asGrid(); + + //----------------------------------------------------- + vigra::FFTWComplexImage Input, Output(Get_NX(), Get_NY()); + + Copy_ComplexGrid_SAGA_to_VIGRA(*pReal, *pImag, Input, true); + + if( !Parameters("CENTER")->asBool() ) + { + fourierTransformInverse(srcImageRange(Input), destImage(Output)); + } + else + { + vigra::FFTWComplexImage tmp(Get_NX(), Get_NY()); + + moveDCToUpperLeft (srcImageRange(Input), destImage(tmp)); + fourierTransformInverse(srcImageRange(tmp) , destImage(Output)); + } + + //----------------------------------------------------- + pReal = Parameters("OUTPUT")->asGrid(); + + Copy_ComplexGrid_VIGRA_to_SAGA(*pReal, Output, false); + + pReal->Set_Name(CSG_String::Format(SG_T("%s [FFT - %s]"), Get_Name().c_str(), _TL("Real"))); + + return( true ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +CViGrA_FFT_Real::CViGrA_FFT_Real(void) +{ + Set_Name (_TL("Fourier Transform (Real, ViGrA)")); + + Set_Author ("O.Conrad (c) 2009"); + + Set_Description (_TW( + "References:\n" + "ViGrA - Vision with Generic Algorithms\n" + "http://hci.iwr.uni-heidelberg.de" + )); + + Parameters.Add_Grid( + NULL , "INPUT" , _TL("Input"), + _TL(""), + PARAMETER_INPUT + ); + + Parameters.Add_Grid( + NULL , "OUTPUT" , _TL("Output"), + _TL(""), + PARAMETER_OUTPUT + ); +} + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CViGrA_FFT_Real::On_Execute(void) +{ + CSG_Grid *pInput, *pOutput; + + pInput = Parameters("INPUT") ->asGrid(); + pOutput = Parameters("OUTPUT") ->asGrid(); + + //----------------------------------------------------- + vigra::FImage Input, Output(Get_NX(), Get_NY()); + + Copy_Grid_SAGA_to_VIGRA(*pInput, Input, true); + + // forward cosine transform == reflective boundary conditions + fourierTransformRealEE(srcImageRange(Input), destImage(Output), (fftw_real)1.0); + + //----------------------------------------------------- + Copy_Grid_VIGRA_to_SAGA(*pOutput, Output, false); + + pOutput->Set_Name(CSG_String::Format(SG_T("%s [%s - %s]"), Get_Name().c_str(), pInput->Get_Name())); + + return( true ); + + /*/ multiply with a first derivative of Gaussian in x-direction + for(int y=0; yhttp://hci.iwr.uni-heidelberg.de" + )); + + Parameters.Add_Grid( + NULL , "INPUT" , _TL("Input"), + _TL(""), + PARAMETER_INPUT + ); + + Parameters.Add_Grid( + NULL , "OUTPUT" , _TL("Output"), + _TL(""), + PARAMETER_OUTPUT + ); + + Parameters.Add_Value( + NULL , "SCALE" , _TL("Size of smoothing filter"), + _TL(""), + PARAMETER_TYPE_Double, 2.0, 0.0, true + ); + + Parameters.Add_Value( + NULL , "POWER" , _TL("Power"), + _TL(""), + PARAMETER_TYPE_Double, 0.5 + ); + + Parameters.Add_Range( + NULL , "RANGE" , _TL("Range"), + _TL(""), + 0.1, 0.9, 0.0, true + ); + + Parameters.Add_Choice( + NULL , "FILTER" , _TL("Filter"), + _TL(""), + CSG_String::Format(SG_T("%s|%s|%s|%s|"), + _TL("gaussian"), + _TL("power of distance"), + _TL("include range"), + _TL("exclude range") + ) + ); +} + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +int CViGrA_FFT_Filter::On_Parameters_Enable(CSG_Parameters *pParameters, CSG_Parameter *pParameter) +{ + if( !SG_STR_CMP(pParameter->Get_Identifier(), "FILTER") ) + { + pParameters->Get_Parameter("SCALE")->Set_Enabled(pParameter->asInt() == 0); + pParameters->Get_Parameter("POWER")->Set_Enabled(pParameter->asInt() == 1); + pParameters->Get_Parameter("RANGE")->Set_Enabled(pParameter->asInt() >= 2); + } + + return( 1 ); +} + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CViGrA_FFT_Filter::On_Execute(void) +{ + int Filter; + double Scale, Power, Range_Min, Range_Max; + CSG_Grid *pInput, *pOutput; + + pInput = Parameters("INPUT" )->asGrid(); + pOutput = Parameters("OUTPUT")->asGrid(); + Scale = Parameters("SCALE" )->asDouble(); + Power = Parameters("POWER" )->asDouble(); + Filter = Parameters("FILTER")->asInt(); + Range_Min = Parameters("RANGE" )->asRange()->Get_LoVal(); + Range_Max = Parameters("RANGE" )->asRange()->Get_HiVal(); + + //----------------------------------------------------- + vigra::FImage Input, Filter_Raw(Get_NX(), Get_NY()), Filter_(Get_NX(), Get_NY()); + vigra::FFTWComplexImage Output(Get_NX(), Get_NY()); + + //----------------------------------------------------- + #pragma omp parallel for + for(int y=0; y Range_Max ? 0.0 : 1.0; + break; + + case 3: + Filter_Raw(x, y) = (xx = sqrt(xx*xx + yy*yy)) < Range_Min || xx > Range_Max ? 1.0 : 0.0; + break; + } + } + } + + //----------------------------------------------------- + moveDCToUpperLeft(srcImageRange(Filter_Raw), destImage(Filter_)); // applyFourierFilter() expects the filter's DC in the upper left + + Copy_Grid_SAGA_to_VIGRA(*pInput, Input, true); + + vigra::applyFourierFilter(srcImageRange(Input), srcImage(Filter_), destImage(Output)); + + //----------------------------------------------------- + Copy_ComplexGrid_VIGRA_to_SAGA(*pOutput, Output, false); + + pOutput->Set_Name(CSG_String::Format(SG_T("%s [FFT %s]"), pInput->Get_Name(), _TL("Filter"))); + + return( true ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- diff -Nru saga-2.1.0+dfsg/src/modules/imagery/imagery_vigra/vigra_fft.h saga-2.1.4+dfsg/src/modules/imagery/imagery_vigra/vigra_fft.h --- saga-2.1.0+dfsg/src/modules/imagery/imagery_vigra/vigra_fft.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/imagery/imagery_vigra/vigra_fft.h 2014-11-13 08:32:18.000000000 +0000 @@ -0,0 +1,171 @@ +/********************************************************** + * Version $Id: vigra_fft.h 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// VIGRA // +// // +//-------------------------------------------------------// +// // +// vigra_fft.h // +// // +// Copyright (C) 2009 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Hamburg // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#ifndef HEADER_INCLUDED__vigra_fft_H +#define HEADER_INCLUDED__vigra_fft_H + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "vigra.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +class CViGrA_FFT : public CSG_Module_Grid +{ +public: + CViGrA_FFT(void); + + virtual CSG_String Get_MenuPath (void) { return( _TL("A:Imagery|Fourier Analysis") ); } + + +protected: + + virtual bool On_Execute (void); + + +}; + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +class CViGrA_FFT_Inverse : public CSG_Module_Grid +{ +public: + CViGrA_FFT_Inverse(void); + + virtual CSG_String Get_MenuPath (void) { return( _TL("A:Imagery|Fourier Analysis") ); } + + +protected: + + virtual bool On_Execute (void); + + +}; + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +class CViGrA_FFT_Real : public CSG_Module_Grid +{ +public: + CViGrA_FFT_Real(void); + + virtual CSG_String Get_MenuPath (void) { return( _TL("A:Imagery|Fourier Analysis") ); } + + +protected: + + virtual bool On_Execute (void); + + +}; + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +class CViGrA_FFT_Filter : public CSG_Module_Grid +{ +public: + CViGrA_FFT_Filter(void); + + virtual CSG_String Get_MenuPath (void) { return( _TL("A:Imagery|Fourier Analysis") ); } + + +protected: + + virtual int On_Parameters_Enable(CSG_Parameters *pParameters, CSG_Parameter *pParameter); + + virtual bool On_Execute (void); + + +}; + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#endif // #ifndef HEADER_INCLUDED__vigra_fft_H diff -Nru saga-2.1.0+dfsg/src/modules/imagery/imagery_vigra/vigra.h saga-2.1.4+dfsg/src/modules/imagery/imagery_vigra/vigra.h --- saga-2.1.0+dfsg/src/modules/imagery/imagery_vigra/vigra.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/imagery/imagery_vigra/vigra.h 2014-11-13 08:32:18.000000000 +0000 @@ -0,0 +1,148 @@ +/********************************************************** + * Version $Id: vigra.h 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// VIGRA // +// // +//-------------------------------------------------------// +// // +// vigra.h // +// // +// Copyright (C) 2009 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Hamburg // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#ifndef HEADER_INCLUDED__vigra_H +#define HEADER_INCLUDED__vigra_H + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "MLB_Interface.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +template +bool Copy_Grid_SAGA_to_VIGRA (CSG_Grid &Grid, VIGRA_Image &Image, bool bCreate) +{ + if( bCreate ) + { + Image.resize(Grid.Get_NX(), Grid.Get_NY()); + } + + if( Grid.Get_NX() != Image.width() || Grid.Get_NY() != Image.height() ) + { + return( false ); + } + + for(int y=0; y +bool Copy_Grid_VIGRA_to_SAGA (CSG_Grid &Grid, VIGRA_Image &Image, bool bCreate) +{ + if( bCreate ) + { + Grid.Create(Grid.Get_Type(), Image.width(), Image.height()); + } + + if( Grid.Get_NX() != Image.width() || Grid.Get_NY() != Image.height() ) + { + return( false ); + } + + for(int y=0; y + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +CViGrA_Morphology::CViGrA_Morphology(void) +{ + Set_Name (_TL("Morphological Filter (ViGrA)")); + + Set_Author (SG_T("O.Conrad (c) 2009")); + + Set_Description (_TW( + "References:\n" + "ViGrA - Vision with Generic Algorithms\n" + "http://hci.iwr.uni-heidelberg.de" + )); + + Parameters.Add_Grid( + NULL , "INPUT" , _TL("Input"), + _TL(""), + PARAMETER_INPUT + ); + + Parameters.Add_Grid( + NULL , "OUTPUT" , _TL("Output"), + _TL(""), + PARAMETER_OUTPUT, SG_DATATYPE_Byte + ); + + Parameters.Add_Choice( + NULL , "TYPE" , _TL("Operation"), + _TL(""), + CSG_String::Format(SG_T("%s|%s|%s|%s|"), + _TL("Dilation"), + _TL("Erosion"), + _TL("Median"), + _TL("User defined rank") + ) + ); + + Parameters.Add_Value( + NULL , "RADIUS" , _TL("Radius (cells)"), + _TL(""), + PARAMETER_TYPE_Int, 1.0, 0.0, true + ); + + Parameters.Add_Value( + NULL , "RANK" , _TL("User defined rank"), + _TL(""), + PARAMETER_TYPE_Double, 0.5, 0.0, true, 1.0, true + ); + + Parameters.Add_Value( + NULL , "RESCALE" , _TL("Rescale Values (0-255)"), + _TL(""), + PARAMETER_TYPE_Bool, true + ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CViGrA_Morphology::On_Execute(void) +{ + bool bRescale; + int Type, Radius; + double Rank; + CSG_Grid *pInput, *pOutput, Rescaled; + + pInput = Parameters("INPUT") ->asGrid(); + pOutput = Parameters("OUTPUT") ->asGrid(); + Type = Parameters("TYPE") ->asInt(); + Radius = Parameters("RADIUS") ->asInt(); + Rank = Parameters("RANK") ->asDouble(); + bRescale = Parameters("RESCALE") ->asBool(); + + //----------------------------------------------------- + if( bRescale ) + { + Rescaled.Create(*Get_System(), SG_DATATYPE_Byte); + + for(sLong i=0; iasDouble(i) - pInput->Get_ZMin()) * 255.0 / pInput->Get_ZRange()); + } + + pInput = &Rescaled; + } + + //----------------------------------------------------- + vigra::BImage Input, Output(Get_NX(), Get_NY()); + + Copy_Grid_SAGA_to_VIGRA(*pInput, Input, true); + + switch( Type ) + { + case 0: // Dilation + discDilation (srcImageRange(Input), destImage(Output), Radius); + break; + + case 1: // Erosion + discErosion (srcImageRange(Input), destImage(Output), Radius); + break; + + case 2: // Median + discMedian (srcImageRange(Input), destImage(Output), Radius); + break; + + case 3: // User defined rank + discRankOrderFilter (srcImageRange(Input), destImage(Output), Radius, Rank); + break; + } + + //----------------------------------------------------- + Copy_Grid_VIGRA_to_SAGA(*pOutput, Output, false); + + pOutput->Set_Name(CSG_String::Format(SG_T("%s [%s]"), pInput->Get_Name(), Get_Name().c_str())); + + return( true ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- diff -Nru saga-2.1.0+dfsg/src/modules/imagery/imagery_vigra/vigra_morphology.h saga-2.1.4+dfsg/src/modules/imagery/imagery_vigra/vigra_morphology.h --- saga-2.1.0+dfsg/src/modules/imagery/imagery_vigra/vigra_morphology.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/imagery/imagery_vigra/vigra_morphology.h 2014-11-13 08:32:18.000000000 +0000 @@ -0,0 +1,106 @@ +/********************************************************** + * Version $Id: vigra_morphology.h 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// VIGRA // +// // +//-------------------------------------------------------// +// // +// vigra_morphology.h // +// // +// Copyright (C) 2009 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Hamburg // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#ifndef HEADER_INCLUDED__vigra_morphology_H +#define HEADER_INCLUDED__vigra_morphology_H + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "vigra.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +class CViGrA_Morphology : public CSG_Module_Grid +{ +public: + CViGrA_Morphology(void); + + virtual CSG_String Get_MenuPath (void) { return( _TL("A:Grid|Filter") ); } + + +protected: + + virtual bool On_Execute (void); + + +}; + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#endif // #ifndef HEADER_INCLUDED__vigra_morphology_H diff -Nru saga-2.1.0+dfsg/src/modules/imagery/imagery_vigra/vigra_random_forest.cpp saga-2.1.4+dfsg/src/modules/imagery/imagery_vigra/vigra_random_forest.cpp --- saga-2.1.0+dfsg/src/modules/imagery/imagery_vigra/vigra_random_forest.cpp 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/imagery/imagery_vigra/vigra_random_forest.cpp 2014-11-13 08:32:18.000000000 +0000 @@ -0,0 +1,765 @@ +/********************************************************** + * Version $Id: vigra_random_forest.cpp 1282 2011-12-29 17:13:26Z manfred-e $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// VIGRA // +// // +//-------------------------------------------------------// +// // +// vigra_random_forest.cpp // +// // +// Copyright (C) 2013 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Hamburg // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "vigra_random_forest.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#if !defined(VIGRA_VERSION_MAJOR) || VIGRA_VERSION_MAJOR < 1 || VIGRA_VERSION_MINOR < 10 +// define some dummies +CViGrA_Random_Forest::CViGrA_Random_Forest() {} +int CViGrA_Random_Forest::On_Parameters_Enable (CSG_Parameters *pParameters, CSG_Parameter *pParameter) { return(0); } +bool CViGrA_Random_Forest::On_Execute (void) { return(false); } +CSG_Grid * CViGrA_Random_Forest::Get_Class_Grid (void) { return(NULL); } +void CViGrA_Random_Forest::Set_Classification (CSG_Table &Classes) { } +CSG_Parameter_Grid_List * CViGrA_Random_Forest::Get_Propability_Grids(CSG_Table &Classes) { return(NULL); } +bool CViGrA_Random_Forest::Get_Training (CSG_Matrix &Data, CSG_Table &Classes) { return(false); } +int CViGrA_Random_Forest::Get_Training (CSG_Matrix &Data, int ID, CSG_Shape_Polygon *pArea) { return(0); } +#else + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include + +#define WITH_HDF5 +#if defined(WITH_HDF5) +#include +#endif + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +enum +{ + CLASS_ID = 0, + CLASS_NAME, + CLASS_COUNT +}; + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +CViGrA_Random_Forest::CViGrA_Random_Forest(void) +{ + CSG_Parameter *pNode; + + //----------------------------------------------------- + Set_Name (_TL("Random Forest (ViGrA)")); + + Set_Author ("O.Conrad (c) 2013"); + + Set_Description (_TW( + "References:\n" + "ViGrA - Vision with Generic Algorithms\n" + "http://hci.iwr.uni-heidelberg.de" + )); + + //----------------------------------------------------- + Parameters.Add_Grid_List( + NULL , "FEATURES" , _TL("Features"), + _TL(""), + PARAMETER_INPUT + ); + + Parameters.Add_Grid( + NULL , "CLASSES" , _TL("Random Forest Classification"), + _TL(""), + PARAMETER_OUTPUT, true, SG_DATATYPE_Short + ); + + Parameters.Add_Grid( + NULL , "PROBABILITY" , _TL("Prediction Probability"), + _TL(""), + PARAMETER_OUTPUT_OPTIONAL + ); + + Parameters.Add_Value( + NULL , "BPROBABILITIES" , _TL("Feature Probabilities"), + _TL(""), + PARAMETER_TYPE_Bool, false + ); + + Parameters.Add_Grid_List( + NULL , "PROBABILITIES" , _TL("Feature Probabilities"), + _TL(""), + PARAMETER_OUTPUT + ); + + //----------------------------------------------------- +#if defined(WITH_HDF5) + Parameters.Add_FilePath( + NULL , "RF_IMPORT" , _TL("Import from File"), + _TL(""), + NULL, NULL, false + ); +#endif + + //----------------------------------------------------- + pNode = Parameters.Add_Shapes( + NULL , "TRAINING" , _TL("Training Areas"), + _TL(""), + PARAMETER_INPUT, SHAPE_TYPE_Polygon + ); + + Parameters.Add_Table_Field( + pNode , "FIELD" , _TL("Label Field"), + _TL("") + ); + + Parameters.Add_Value( + pNode , "LABEL_AS_ID" , _TL("Use Label as Identifier"), + _TL("Use training area labels as identifier in classification result, assumes all label values are integer numbers!"), + PARAMETER_TYPE_Bool, false + ); + + CSG_mRMR::Parameters_Add(&Parameters, Parameters.Add_Value( + pNode , "DO_MRMR" , _TL("Minimum Redundancy Feature Selection"), + _TL("Use only features selected by the minimum Redundancy Maximum Relevance (mRMR) algorithm"), + PARAMETER_TYPE_Bool, false + )); + + //----------------------------------------------------- + pNode = Parameters.Add_Node( + NULL , "RF_OPTIONS" , _TL("Options"), + _TL("") + ); + +#if defined(WITH_HDF5) + Parameters.Add_FilePath( + pNode , "RF_EXPORT" , _TL("Export to File"), + _TL(""), + NULL, NULL, true + ); +#endif + + Parameters.Add_Value( + pNode , "RF_TREE_COUNT" , _TL("Tree Count"), + _TL("How many trees to create?"), + PARAMETER_TYPE_Int, 32, 1, true + ); + + Parameters.Add_Value( + pNode , "RF_TREE_SAMPLES" , _TL("Samples per Tree"), + _TL("Specifies the fraction of the total number of samples used per tree for learning."), + PARAMETER_TYPE_Double, 1.0, 0.0, true, 1.0, true + ); + + Parameters.Add_Value( + pNode , "RF_REPLACE" , _TL("Sample with Replacement"), + _TL("Sample from training population with or without replacement?"), + PARAMETER_TYPE_Bool, true + ); + + Parameters.Add_Value( + pNode , "RF_SPLIT_MIN_SIZE" , _TL("Minimum Node Split Size"), + _TL("Number of examples required for a node to be split. Choose 1 for complete growing."), + PARAMETER_TYPE_Int, 1, 1, true + ); + + Parameters.Add_Choice( + pNode , "RF_NODE_FEATURES" , _TL("Features per Node"), + _TL(""), + CSG_String::Format(SG_T("%s|%s|%s|"), + _TL("logarithmic"), + _TL("square root"), + _TL("all") + ), 1 + ); + + Parameters.Add_Choice( + pNode , "RF_STRATIFICATION" , _TL("Stratification"), + _TL("Specifies stratification strategy. Either none, equal amount of class samples, or proportional to fraction of class samples."), + CSG_String::Format(SG_T("%s|%s|%s|"), + _TL("none"), + _TL("equal"), + _TL("proportional") + ), 0 + ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +int CViGrA_Random_Forest::On_Parameters_Enable(CSG_Parameters *pParameters, CSG_Parameter *pParameter) +{ + if( !SG_STR_CMP(pParameter->Get_Identifier(), "RF_IMPORT") ) + { + bool bTraining = !SG_File_Exists(pParameter->asString()); + + pParameters->Set_Enabled("RF_OPTIONS", bTraining); + pParameters->Set_Enabled("TRAINING" , bTraining); + } + + if( !SG_STR_CMP(pParameter->Get_Identifier(), "DO_MRMR") ) + { + pParameters->Get("DO_MRMR")->Set_Children_Enabled(pParameter->asBool()); + } + + if( pParameters->Get("DO_MRMR")->asBool() ) + { + CSG_mRMR::Parameters_Enable(pParameters, pParameter); + } + + return( 1 ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CViGrA_Random_Forest::On_Execute(void) +{ + //----------------------------------------------------- + // Feature Grids + + CSG_Parameter_Grid_List *pFeatures = Parameters("FEATURES")->asGridList(); + + CSG_Array Features(sizeof(CSG_Grid *), pFeatures->Get_Count()); + + m_pFeatures = (CSG_Grid **)Features.Get_Array(); + m_nFeatures = 0; + + for(int i=pFeatures->Get_Count()-1; i>=0; i--) + { + if( pFeatures->asGrid(i)->Get_ZRange() <= 0.0 ) + { + Message_Add(CSG_String::Format(SG_T("%s: %s"), _TL("grid has been dropped"), pFeatures->asGrid(i)->Get_Name())); + } + else + { + m_pFeatures[m_nFeatures++] = pFeatures->asGrid(i); + } + } + + if( m_nFeatures <= 0 ) + { + Error_Set(_TL("no valid grid in features list.")); + + return( false ); + } + + + //----------------------------------------------------- + CSG_Table Classes; + + vigra::RandomForestOptions Options; + vigra::RandomForest Forest(Options); + + +#if defined(WITH_HDF5) + if( SG_File_Exists(Parameters("RF_IMPORT")->asString()) ) + { + if( !vigra::rf_import_HDF5(Forest, CSG_String(Parameters("RF_IMPORT")->asString()).b_str()) ) + { + Error_Set(_TL("could not import random forest")); + + return( false ); + } + + if( Forest.feature_count() != m_nFeatures ) + { + Error_Set(CSG_String::Format(SG_T("%s\n%s: %d"), _TL("invalid number of features"), _TL("expected"), Forest.feature_count())); + + return( false ); + } + } + else +#endif + { + //------------------------------------------------- + // Training Data + + CSG_Matrix Data; + + if( !Get_Training(Data, Classes) ) + { + Error_Set(_TL("insufficient training samples")); + + return( false ); + } + + vigra::Matrix train_features(Data.Get_NRows(), m_nFeatures); + vigra::Matrix train_response(Data.Get_NRows(), 1); + + for(int iSample=0; iSampleasInt ()); + Forest.set_options().samples_per_tree (Parameters("RF_TREE_SAMPLES" )->asDouble()); + Forest.set_options().sample_with_replacement(Parameters("RF_REPLACE" )->asBool ()); + Forest.set_options().min_split_node_size (Parameters("RF_SPLIT_MIN_SIZE")->asInt ()); + + switch( Parameters("RF_NODE_FEATURES")->asInt() ) + { + case 0: Forest.set_options().features_per_node(vigra::RF_LOG ); break; + default: Forest.set_options().features_per_node(vigra::RF_SQRT); break; + case 1: Forest.set_options().features_per_node(vigra::RF_ALL ); break; + } + + switch( Parameters("RF_STRATIFICATION")->asInt() ) + { + default: Forest.set_options().use_stratification(vigra::RF_NONE ); break; + case 1: Forest.set_options().use_stratification(vigra::RF_EQUAL ); break; + case 2: Forest.set_options().use_stratification(vigra::RF_PROPORTIONAL); break; + } + + + //------------------------------------------------- + // Learning + + Process_Set_Text(_TL("learning")); + + vigra::rf::visitors::OOB_Error oob_v; // construct visitor to calculate out-of-bag error + + Forest.learn(train_features, train_response, vigra::rf::visitors::create_visitor(oob_v)); + + Message_Add(CSG_String::Format(SG_T("\n%s: %f"), _TL("out-of-bag error"), oob_v.oob_breiman), false); + +#if defined(WITH_HDF5) + if( Parameters("RF_EXPORT")->asString() && *Parameters("RF_EXPORT")->asString() ) + { + vigra::rf_export_HDF5(Forest, CSG_String(Parameters("RF_EXPORT")->asString()).b_str()); + } +#endif + } + + //----------------------------------------------------- + // Output Grids + + CSG_Grid *pClasses = Get_Class_Grid(); + + CSG_Grid *pProbability = Parameters("PROBABILITY")->asGrid(); + + CSG_Parameter_Grid_List *pProbabilities = Get_Propability_Grids(Classes); + + DataObject_Set_Colors(pProbability, 11, SG_COLORS_WHITE_GREEN); + + + //----------------------------------------------------- + // Prediction + + Process_Set_Text(_TL("prediction")); + + for(int y=0; yis_NoData(x, y) ) + { + vigra::Matrix features(1, m_nFeatures); + + for(int iFeature=0; iFeatureasDouble(x, y); + } + + int id = Forest.predictLabel(features); + + pClasses->Set_Value(x, y, id); + + if( pProbability || pProbabilities ) + { + vigra::Matrix p(1, Forest.class_count()); + + Forest.predictProbabilities(features, p); + + if( pProbability ) + { + pProbability->Set_Value(x, y, p(0, id - 1)); + } + + for(int i=0; pProbabilities && iGet_Count(); i++) + { + pProbabilities->asGrid(i)->Set_Value(x, y, p(0, i)); + } + } + } + else // if( pClasses->is_NoData(x, y) ) + { + if( pProbability ) + { + pProbability->Set_NoData(x, y); + } + + for(int i=0; pProbabilities && iGet_Count(); i++) + { + pProbabilities->asGrid(i)->Set_NoData(x, y); + } + } + } + } + + + //----------------------------------------------------- + // Postprocessing + + Set_Classification(Classes); + + //----------------------------------------------------- + return( true ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CViGrA_Random_Forest::Get_Training(CSG_Matrix &Data, CSG_Table &Classes) +{ + CSG_Shapes *pTraining = Parameters("TRAINING")->asShapes(); + + bool bLabelAsId = Parameters("LABEL_AS_ID")->asBool(); + + int Field = Parameters("FIELD")->asInt(); + + Classes.Destroy(); + Classes.Add_Field(SG_T("ID" ), SG_DATATYPE_Int); // CLASS_ID + Classes.Add_Field(SG_T("NAME" ), SG_DATATYPE_String); // CLASS_NAME + Classes.Add_Field(SG_T("COUNT"), SG_DATATYPE_Int); // CLASS_COUNT + + CSG_String Label; + + CSG_Table_Record *pClass = NULL; + + pTraining->Set_Index(Field, TABLE_INDEX_Ascending); + + for(int iTraining=0, ID=0; iTrainingGet_Count(); iTraining++) + { + CSG_Shape *pArea = pTraining->Get_Shape(iTraining); + + if( !pClass || (bLabelAsId && ID != pArea->asInt(Field)) || Label.Cmp(pArea->asString(Field)) ) + { + Label = pArea->asString(Field); + + if( !pClass || pClass->asInt(CLASS_COUNT) > 0 ) + { + pClass = Classes.Add_Record(); + + ID = bLabelAsId ? pArea->asInt(Field) : ID + 1; + } + + pClass->Set_Value(CLASS_ID , ID); + pClass->Set_Value(CLASS_NAME , Label); + pClass->Set_Value(CLASS_COUNT, 0); + } + + pClass->Add_Value(CLASS_COUNT, Get_Training(Data, ID, (CSG_Shape_Polygon *)pArea)); + } + + if( Data.Get_NCols() > 1 && Data.Get_NRows() > 1 && Parameters("DO_MRMR")->asBool() ) + { + CSG_mRMR Selector; + + if( Selector.Set_Data(Data, m_nFeatures, &Parameters) && Selector.Get_Selection(&Parameters) + && Selector.Get_Count() > 0 && Selector.Get_Count() < m_nFeatures ) + { + int i, j, *bSelected = (int *)SG_Calloc(m_nFeatures, sizeof(int)); + + for(i=0; iGet_Name(), _TL("Score"), Selector.Get_Score(i) + ), false); + } + + Message_Add("\n", false); + + for(i=0, j=0; i 1 && Data.Get_NRows() > 1 ); +} + +//--------------------------------------------------------- +int CViGrA_Random_Forest::Get_Training(CSG_Matrix &Data, int ID, CSG_Shape_Polygon *pArea) +{ + int Count = 0; + + int xMin = Get_System()->Get_xWorld_to_Grid(pArea->Get_Extent().Get_XMin()); if( xMin < 0 ) xMin = 0; + int xMax = Get_System()->Get_xWorld_to_Grid(pArea->Get_Extent().Get_XMax()); if( xMax >= Get_NX() ) xMax = Get_NX() - 1; + int yMin = Get_System()->Get_yWorld_to_Grid(pArea->Get_Extent().Get_YMin()); if( yMin < 0 ) yMin = 0; + int yMax = Get_System()->Get_yWorld_to_Grid(pArea->Get_Extent().Get_YMax()); if( yMax >= Get_NY() ) yMax = Get_NY() - 1; + + for(int y=yMin; y<=yMax; y++) + { + for(int x=xMin; x<=xMax; x++) + { + if( pArea->Contains(Get_System()->Get_Grid_to_World(x, y)) ) + { + int iRow = Data.Get_NRows(); + + if( iRow == 0 ) + { + Data.Create(1 + m_nFeatures, 1); + } + else + { + Data.Add_Row(); + } + + Data[iRow][m_nFeatures] = ID; + + for(int i=0; iasDouble(x, y); + } + + Count++; + } + } + } + + return( Count ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +CSG_Grid * CViGrA_Random_Forest::Get_Class_Grid(void) +{ + CSG_Grid *pClasses = Parameters("CLASSES")->asGrid(); + + pClasses->Set_NoData_Value(-1.0); + + #pragma omp parallel for + for(sLong i=0; iis_NoData(i); + } + + pClasses->Set_Value(i, bOkay ? 0.0 : -1.0); + } + + return( pClasses ); +} + +//--------------------------------------------------------- +void CViGrA_Random_Forest::Set_Classification(CSG_Table &Classes) +{ + if( Classes.Get_Field_Count() == 3 && Classes.Get_Count() > 0 ) + { + CSG_Grid *pClasses = Parameters("CLASSES")->asGrid(); + + CSG_Parameters P; + + if( DataObject_Get_Parameters(pClasses, P) && P("COLORS_TYPE") && P("LUT") ) + { + CSG_Table *pTable = P("LUT")->asTable(); + + for(int i=0; iGet_Record(i); + + if( pRecord == NULL ) + { + pRecord = pTable->Add_Record(); + pRecord->Set_Value(0, CSG_Random::Get_Uniform(0, 255*255*255)); + } + + pRecord->Set_Value(1, Classes[i].asString(1)); + pRecord->Set_Value(2, Classes[i].asString(1)); + pRecord->Set_Value(3, Classes[i].asInt(0)); + pRecord->Set_Value(4, Classes[i].asInt(0)); + } + + while( pTable->Get_Record_Count() > Classes.Get_Count() ) + { + pTable->Del_Record(pTable->Get_Record_Count() - 1); + } + + P("COLORS_TYPE")->Set_Value(1); // Color Classification Type: Lookup Table + + DataObject_Set_Parameters(pClasses, P); + } + } +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +CSG_Parameter_Grid_List * CViGrA_Random_Forest::Get_Propability_Grids(CSG_Table &Classes) +{ + if( Parameters("BPROBABILITIES")->asBool() && Classes.Get_Field_Count() == 3 && Classes.Get_Count() > 0 ) + { + CSG_Parameter_Grid_List *pGrids = Parameters("PROBABILITIES")->asGridList(); + + for(int i=0; iGet_Count() ) + { + pGrid = pGrids->asGrid(i); + } + else + { + pGrids->Add_Item(pGrid = SG_Get_Data_Manager().Add_Grid(*Get_System())); + + DataObject_Set_Colors(pGrid, 11, SG_COLORS_WHITE_GREEN); + } + + pGrid->Set_Name(CSG_String::Format(SG_T("%s [%s]"), Classes[i].asString(CLASS_NAME), _TL("Probability"))); + } + + return( pGrids ); + } + + return( NULL ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#endif // !defined(VIGRA_VERSION_MAJOR) || VIGRA_VERSION_MAJOR < 1 || VIGRA_VERSION_MINOR < 10 + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- diff -Nru saga-2.1.0+dfsg/src/modules/imagery/imagery_vigra/vigra_random_forest.h saga-2.1.4+dfsg/src/modules/imagery/imagery_vigra/vigra_random_forest.h --- saga-2.1.0+dfsg/src/modules/imagery/imagery_vigra/vigra_random_forest.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/imagery/imagery_vigra/vigra_random_forest.h 2014-11-13 08:32:18.000000000 +0000 @@ -0,0 +1,123 @@ +/********************************************************** + * Version $Id: vigra_random_forest.h 911 2011-02-14 16:38:15Z reklov_w $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// VIGRA // +// // +//-------------------------------------------------------// +// // +// vigra_random_forest.h // +// // +// Copyright (C) 2013 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Hamburg // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#ifndef HEADER_INCLUDED__vigra_random_forest_H +#define HEADER_INCLUDED__vigra_random_forest_H + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "vigra.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +class CViGrA_Random_Forest : public CSG_Module_Grid +{ +public: + CViGrA_Random_Forest(void); + + virtual CSG_String Get_MenuPath (void) { return( _TL("A:Imagery|Classification") ); } + + +protected: + + virtual int On_Parameters_Enable (CSG_Parameters *pParameters, CSG_Parameter *pParameter); + + virtual bool On_Execute (void); + + +private: + + int m_nFeatures; + + CSG_Grid **m_pFeatures; + + + CSG_Grid * Get_Class_Grid (void); + void Set_Classification (CSG_Table &Classes); + + CSG_Parameter_Grid_List * Get_Propability_Grids (CSG_Table &Classes); + + bool Get_Training (CSG_Matrix &Data, CSG_Table &Classes); + int Get_Training (CSG_Matrix &Data, int ID, CSG_Shape_Polygon *pArea); + +}; + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#endif // #ifndef HEADER_INCLUDED__vigra_random_forest_H diff -Nru saga-2.1.0+dfsg/src/modules/imagery/imagery_vigra/vigra_smoothing.cpp saga-2.1.4+dfsg/src/modules/imagery/imagery_vigra/vigra_smoothing.cpp --- saga-2.1.0+dfsg/src/modules/imagery/imagery_vigra/vigra_smoothing.cpp 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/imagery/imagery_vigra/vigra_smoothing.cpp 2014-11-13 08:32:18.000000000 +0000 @@ -0,0 +1,194 @@ +/********************************************************** + * Version $Id: vigra_smoothing.cpp 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// VIGRA // +// // +//-------------------------------------------------------// +// // +// vigra.cpp // +// // +// Copyright (C) 2009 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Hamburg // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "vigra_smoothing.h" + +//--------------------------------------------------------- +#include +#include + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +CViGrA_Smoothing::CViGrA_Smoothing(void) +{ + Set_Name (_TL("Smoothing (ViGrA)")); + + Set_Author (SG_T("O.Conrad (c) 2009")); + + Set_Description (_TW( + "Based on the example code \"smooth.cxx\" by Ullrich Koethe.\n" + "References:\n" + "ViGrA - Vision with Generic Algorithms\n" + "http://hci.iwr.uni-heidelberg.de" + )); + + Parameters.Add_Grid( + NULL , "INPUT" , _TL("Input"), + _TL(""), + PARAMETER_INPUT + ); + + Parameters.Add_Grid( + NULL , "OUTPUT" , _TL("Output"), + _TL(""), + PARAMETER_OUTPUT + ); + + Parameters.Add_Choice( + NULL , "TYPE" , _TL("Type of smoothing"), + _TL(""), + CSG_String::Format(SG_T("%s|%s|%s|"), + _TL("exponential"), + _TL("nonlinear"), + _TL("gaussian") + ) + ); + + Parameters.Add_Value( + NULL , "SCALE" , _TL("Size of smoothing filter"), + _TL(""), + PARAMETER_TYPE_Double, 2.0, 0.0, true + ); + + Parameters.Add_Value( + NULL , "EDGE" , _TL("Edge threshold for nonlinear smoothing"), + _TL(""), + PARAMETER_TYPE_Double, 1.0, 0.0, true + ); +} + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CViGrA_Smoothing::On_Execute(void) +{ + int Type; + double Scale, Edge; + CSG_Grid *pInput, *pOutput; + vigra::FImage Input, Output; + + pInput = Parameters("INPUT") ->asGrid(); + pOutput = Parameters("OUTPUT") ->asGrid(); + Type = Parameters("TYPE") ->asInt(); + Scale = Parameters("SCALE") ->asDouble(); + Edge = Parameters("EDGE") ->asDouble(); + + Copy_Grid_SAGA_to_VIGRA(*pInput, Input, true); + + Output.resize(Get_NX(), Get_NY()); + + //----------------------------------------------------- + switch( Type ) + { + case 0: // apply recursive filter (exponential filter) to color image + { + recursiveSmoothX(srcImageRange(Input ), destImage(Output), Scale); + recursiveSmoothY(srcImageRange(Output), destImage(Output), Scale); + + break; + } + + case 1: // apply nonlinear diffusion to color image + { + nonlinearDiffusion(srcImageRange(Input), destImage(Output), vigra::DiffusivityFunctor(Edge), Scale); + + break; + } + + case 2: // apply Gaussian filter to color image + { + vigra::FImage tmp(Get_NX(), Get_NY()); + vigra::Kernel1D gauss; + + gauss.initGaussian(Scale); + + separableConvolveX(srcImageRange(Input) , destImage(tmp), kernel1d(gauss)); + separableConvolveY(srcImageRange(tmp), destImage(Output), kernel1d(gauss)); + + break; + } + } + + //----------------------------------------------------- + Copy_Grid_VIGRA_to_SAGA(*pOutput, Output, false); + + pOutput->Set_Name(CSG_String::Format(SG_T("%s [%s - %s]"), pInput->Get_Name(), Get_Name().c_str(), Parameters("TYPE")->asString())); + + return( true ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- diff -Nru saga-2.1.0+dfsg/src/modules/imagery/imagery_vigra/vigra_smoothing.h saga-2.1.4+dfsg/src/modules/imagery/imagery_vigra/vigra_smoothing.h --- saga-2.1.0+dfsg/src/modules/imagery/imagery_vigra/vigra_smoothing.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/imagery/imagery_vigra/vigra_smoothing.h 2014-11-13 08:32:18.000000000 +0000 @@ -0,0 +1,106 @@ +/********************************************************** + * Version $Id: vigra_smoothing.h 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// VIGRA // +// // +//-------------------------------------------------------// +// // +// vigra_smoothing.h // +// // +// Copyright (C) 2009 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Hamburg // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#ifndef HEADER_INCLUDED__vigra_smoothing_H +#define HEADER_INCLUDED__vigra_smoothing_H + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "vigra.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +class CViGrA_Smoothing : public CSG_Module_Grid +{ +public: + CViGrA_Smoothing(void); + + virtual CSG_String Get_MenuPath (void) { return( _TL("A:Grid|Filter") ); } + + +protected: + + virtual bool On_Execute (void); + + +}; + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#endif // #ifndef HEADER_INCLUDED__vigra_smoothing_H diff -Nru saga-2.1.0+dfsg/src/modules/imagery/imagery_vigra/vigra_watershed.cpp saga-2.1.4+dfsg/src/modules/imagery/imagery_vigra/vigra_watershed.cpp --- saga-2.1.0+dfsg/src/modules/imagery/imagery_vigra/vigra_watershed.cpp 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/imagery/imagery_vigra/vigra_watershed.cpp 2014-11-13 08:32:18.000000000 +0000 @@ -0,0 +1,293 @@ +/********************************************************** + * Version $Id: vigra_watershed.cpp 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// VIGRA // +// // +//-------------------------------------------------------// +// // +// vigra.cpp // +// // +// Copyright (C) 2009 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Hamburg // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "vigra_watershed.h" + +//--------------------------------------------------------- +#include + +#include +#include +#include +#include + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +CViGrA_Watershed::CViGrA_Watershed(void) +{ + Set_Name (_TL("Watershed Segmentation (ViGrA)")); + + Set_Author (SG_T("O.Conrad (c) 2009")); + + Set_Description (_TW( + "Note that the watershed algorithm usually results in an " + "oversegmentation (i.e., too many regions), but its boundary " + "localization is quite good.\n" + "Based on the example code \"watershed.cxx\" by Ullrich Koethe.\n" + "References:\n" + "ViGrA - Vision with Generic Algorithms\n" + "http://hci.iwr.uni-heidelberg.de" + )); + + Parameters.Add_Grid( + NULL , "INPUT" , _TL("Input"), + _TL(""), + PARAMETER_INPUT + ); + + Parameters.Add_Grid( + NULL , "OUTPUT" , _TL("Segmentation"), + _TL(""), + PARAMETER_OUTPUT + ); + + Parameters.Add_Value( + NULL , "SCALE" , _TL("Width of gradient filter"), + _TL(""), + PARAMETER_TYPE_Double, 1.0, 0.0, true + ); + + Parameters.Add_Value( + NULL , "RGB" , _TL("RGB coded data"), + _TL(""), + PARAMETER_TYPE_Bool, false + ); + + Parameters.Add_Value( + NULL , "EDGES" , _TL("Edges"), + _TL(""), + PARAMETER_TYPE_Bool, false + ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CViGrA_Watershed::On_Execute(void) +{ + bool bEdges, bRGB; + double Scale; + CSG_Grid *pInput, *pOutput; + + pInput = Parameters("INPUT") ->asGrid(); + pOutput = Parameters("OUTPUT") ->asGrid(); + Scale = Parameters("SCALE") ->asDouble(); + bEdges = Parameters("EDGES") ->asBool(); + bRGB = Parameters("RGB") ->asBool(); + + //----------------------------------------------------- + if( !bRGB ) + { + vigra::FImage Input, Output(Get_NX(), Get_NY()); + + Copy_Grid_SAGA_to_VIGRA(*pInput, Input, true); + + Segmentation(Input, Output, Scale, bEdges); + + Copy_Grid_VIGRA_to_SAGA(*pOutput, Output, false); + } + + //----------------------------------------------------- + else // perform watershed segmentation on color image + { + vigra::BRGBImage Input, Output(Get_NX(), Get_NY()); + + Copy_RGBGrid_SAGA_to_VIGRA(*pInput, Input, true); + + Segmentation(Input, Output, Scale, bEdges); + + Copy_RGBGrid_VIGRA_to_SAGA(*pOutput, Output, false); + } + + //----------------------------------------------------- + pOutput->Set_Name(CSG_String::Format(SG_T("%s [%s]"), pInput->Get_Name(), Get_Name().c_str())); + + return( true ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +// define a functor that calsulates the squared magnitude +// of the gradient given the x/y components of the gradient +//--------------------------------------------------------- +struct GradientSquaredMagnitudeFunctor +{ + float operator()(float const & g1, float const & g2) const + { + return g1 * g1 + g2 * g2; + } + + float operator()(vigra::RGBValue const & rg1, vigra::RGBValue const & rg2) const + { + float g1 = rg1.squaredMagnitude(); + float g2 = rg2.squaredMagnitude(); + + return g1 + g2; + } +}; + +//--------------------------------------------------------- +// generic implementation of the watershed algorithm +//--------------------------------------------------------- +template +void CViGrA_Watershed::Segmentation(TImage_In &Input, TImage_Out &Output, double Scale, bool bEdges) +{ + typedef typename vigra::NumericTraits::RealPromote TmpType; + + vigra::BasicImage gradientx (Get_NX(), Get_NY()); + vigra::BasicImage gradienty (Get_NX(), Get_NY()); + vigra::FImage gradientmag (Get_NX(), Get_NY()); + vigra::IImage labels (Get_NX(), Get_NY()); + + //----------------------------------------------------- + // calculate the x- and y-components of the image gradient at given scale + Process_Set_Text(_TL("calculate gradients")); + + recursiveFirstDerivativeX (srcImageRange(Input) , destImage(gradientx), Scale); + recursiveSmoothY (srcImageRange(gradientx) , destImage(gradientx), Scale); + + recursiveFirstDerivativeY (srcImageRange(Input) , destImage(gradienty), Scale); + recursiveSmoothX (srcImageRange(gradienty) , destImage(gradienty), Scale); + + //----------------------------------------------------- + // transform components into gradient magnitude + Process_Set_Text(_TL("calculate gradient magnitude")); + + combineTwoImages( + srcImageRange(gradientx), + srcImage(gradienty), + destImage(gradientmag), + GradientSquaredMagnitudeFunctor() + ); + + //----------------------------------------------------- + // find the local minima of the gradient magnitude (might be larger than one pixel) + Process_Set_Text(_TL("find local minima")); + + labels = 0; + + extendedLocalMinima(srcImageRange(gradientmag), destImage(labels), 1); + + //----------------------------------------------------- + // label the minima just found + Process_Set_Text(_TL("label minima")); + + int max_region_label = labelImageWithBackground(srcImageRange(labels), destImage(labels), false, 0); + + //----------------------------------------------------- + // create a statistics functor for region growing + vigra::ArrayOfRegionStatistics >gradstat(max_region_label); + + //----------------------------------------------------- + // perform region growing, starting from the minima of the gradient magnitude; + // as the feature (first input) image contains the gradient magnitude, + // this calculates the catchment basin of each minimum + Process_Set_Text(_TL("perform region growing")); + + seededRegionGrowing(srcImageRange(gradientmag), srcImage(labels), destImage(labels), gradstat); + + //----------------------------------------------------- + // initialize a functor to determine the average gray-value or color for each region (catchment basin) just found + vigra::ArrayOfRegionStatistics >averages(max_region_label); + + //----------------------------------------------------- + // calculate the averages + Process_Set_Text(_TL("calculate averages")); + + inspectTwoImages(srcImageRange(Input), srcImage(labels), averages); + + //----------------------------------------------------- + // write the averages into the destination image (the functor 'averages' acts as a look-up table) + transformImage(srcImageRange(labels), destImage(Output), averages); + + //----------------------------------------------------- + // mark the watersheds (region boundaries) black + if( bEdges ) + { + regionImageToEdgeImage(srcImageRange(labels), destImage(Output), vigra::NumericTraits::zero()); + } +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- diff -Nru saga-2.1.0+dfsg/src/modules/imagery/imagery_vigra/vigra_watershed.h saga-2.1.4+dfsg/src/modules/imagery/imagery_vigra/vigra_watershed.h --- saga-2.1.0+dfsg/src/modules/imagery/imagery_vigra/vigra_watershed.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/imagery/imagery_vigra/vigra_watershed.h 2014-11-13 08:32:18.000000000 +0000 @@ -0,0 +1,111 @@ +/********************************************************** + * Version $Id: vigra_watershed.h 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// VIGRA // +// // +//-------------------------------------------------------// +// // +// vigra_watershed.h // +// // +// Copyright (C) 2009 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Hamburg // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#ifndef HEADER_INCLUDED__vigra_watershed_H +#define HEADER_INCLUDED__vigra_watershed_H + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "vigra.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +class CViGrA_Watershed : public CSG_Module_Grid +{ +public: + CViGrA_Watershed(void); + + virtual CSG_String Get_MenuPath (void) { return( _TL("A:Imagery|Segmentation") ); } + + +protected: + + virtual bool On_Execute (void); + + +private: + + template + void Segmentation (TImage_In &Input, TImage_Out &Output, double Scale, bool bEdges); + +}; + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#endif // #ifndef HEADER_INCLUDED__vigra_watershed_H diff -Nru saga-2.1.0+dfsg/src/modules/imagery/Makefile.am saga-2.1.4+dfsg/src/modules/imagery/Makefile.am --- saga-2.1.0+dfsg/src/modules/imagery/Makefile.am 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/imagery/Makefile.am 2014-11-13 08:32:18.000000000 +0000 @@ -0,0 +1 @@ +SUBDIRS = imagery_classification imagery_opencv imagery_photogrammetry imagery_segmentation imagery_svm imagery_tools imagery_vigra diff -Nru saga-2.1.0+dfsg/src/modules/imagery/Makefile.in saga-2.1.4+dfsg/src/modules/imagery/Makefile.in --- saga-2.1.0+dfsg/src/modules/imagery/Makefile.in 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/imagery/Makefile.in 2014-11-13 08:33:31.000000000 +0000 @@ -0,0 +1,639 @@ +# Makefile.in generated by automake 1.14.1 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ +VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +subdir = src/modules/imagery +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_postgresql.m4 \ + $(top_srcdir)/m4/ax_pkg_swig.m4 \ + $(top_srcdir)/m4/ax_python_devel.m4 \ + $(top_srcdir)/m4/ax_swig_enable_cxx.m4 \ + $(top_srcdir)/m4/ax_swig_python.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = +SOURCES = +DIST_SOURCES = +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ + distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags +DIST_SUBDIRS = $(SUBDIRS) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +am__relativize = \ + dir0=`pwd`; \ + sed_first='s,^\([^/]*\)/.*$$,\1,'; \ + sed_rest='s,^[^/]*/*,,'; \ + sed_last='s,^.*/\([^/]*\)$$,\1,'; \ + sed_butlast='s,/*[^/]*$$,,'; \ + while test -n "$$dir1"; do \ + first=`echo "$$dir1" | sed -e "$$sed_first"`; \ + if test "$$first" != "."; then \ + if test "$$first" = ".."; then \ + dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ + dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ + else \ + first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ + if test "$$first2" = "$$first"; then \ + dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ + else \ + dir2="../$$dir2"; \ + fi; \ + dir0="$$dir0"/"$$first"; \ + fi; \ + fi; \ + dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ + done; \ + reldir="$$dir2" +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +AX_SWIG_PYTHON_CPPFLAGS = @AX_SWIG_PYTHON_CPPFLAGS@ +AX_SWIG_PYTHON_OPT = @AX_SWIG_PYTHON_OPT@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DISABLELIBHARU = @DISABLELIBHARU@ +DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +FGREP = @FGREP@ +GOMPFLAGS = @GOMPFLAGS@ +GREP = @GREP@ +HARU_LIB = @HARU_LIB@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LOCAL_INCS = @LOCAL_INCS@ +LOCAL_LIBS = @LOCAL_LIBS@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ +MKDIR_P = @MKDIR_P@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PG_CONFIG = @PG_CONFIG@ +POSTGRESQL_CFLAGS = @POSTGRESQL_CFLAGS@ +POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@ +POSTGRESQL_VERSION = @POSTGRESQL_VERSION@ +POW_LIB = @POW_LIB@ +PYTHON = @PYTHON@ +PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ +PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ +PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ +PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_PLATFORM = @PYTHON_PLATFORM@ +PYTHON_PREFIX = @PYTHON_PREFIX@ +PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ +PYTHON_VERSION = @PYTHON_VERSION@ +RANLIB = @RANLIB@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +SWIG = @SWIG@ +SWIG_LIB = @SWIG_LIB@ +VERSION = @VERSION@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +pkgpyexecdir = @pkgpyexecdir@ +pkgpythondir = @pkgpythondir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +pyexecdir = @pyexecdir@ +pythondir = @pythondir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +SUBDIRS = imagery_classification imagery_opencv imagery_photogrammetry imagery_segmentation imagery_svm imagery_tools imagery_vigra +all: all-recursive + +.SUFFIXES: +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/modules/imagery/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign src/modules/imagery/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +# This directory's subdirectories are mostly independent; you can cd +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + dot_seen=yes; \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + set x; \ + here=`pwd`; \ + if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ + empty_fix=.; \ + else \ + include_option=--include; \ + empty_fix=; \ + fi; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test ! -f $$subdir/TAGS || \ + set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ + $(am__define_uniq_tagged_files); \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ + fi +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ + test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ + dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ + $(am__relativize); \ + new_distdir=$$reldir; \ + dir1=$$subdir; dir2="$(top_distdir)"; \ + $(am__relativize); \ + new_top_distdir=$$reldir; \ + echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ + echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ + ($(am__cd) $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$$new_top_distdir" \ + distdir="$$new_distdir" \ + am__remove_distdir=: \ + am__skip_length_check=: \ + am__skip_mode_fix=: \ + distdir) \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-recursive +all-am: Makefile +installdirs: installdirs-recursive +installdirs-am: +install: install-recursive +install-exec: install-exec-recursive +install-data: install-data-recursive +uninstall: uninstall-recursive + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-recursive +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-recursive + +clean-am: clean-generic clean-libtool mostlyclean-am + +distclean: distclean-recursive + -rm -f Makefile +distclean-am: clean-am distclean-generic distclean-tags + +dvi: dvi-recursive + +dvi-am: + +html: html-recursive + +html-am: + +info: info-recursive + +info-am: + +install-data-am: + +install-dvi: install-dvi-recursive + +install-dvi-am: + +install-exec-am: + +install-html: install-html-recursive + +install-html-am: + +install-info: install-info-recursive + +install-info-am: + +install-man: + +install-pdf: install-pdf-recursive + +install-pdf-am: + +install-ps: install-ps-recursive + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-recursive + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-recursive + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +pdf: pdf-recursive + +pdf-am: + +ps: ps-recursive + +ps-am: + +uninstall-am: + +.MAKE: $(am__recursive_targets) install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags tags-am uninstall uninstall-am + + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nru saga-2.1.0+dfsg/src/modules/io/io_esri_e00/e00compr/cpl_conv.c saga-2.1.4+dfsg/src/modules/io/io_esri_e00/e00compr/cpl_conv.c --- saga-2.1.0+dfsg/src/modules/io/io_esri_e00/e00compr/cpl_conv.c 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_esri_e00/e00compr/cpl_conv.c 2014-11-13 08:32:20.000000000 +0000 @@ -0,0 +1,206 @@ +/********************************************************** + * Version $Id: cpl_conv.c 911 2011-02-14 16:38:15Z reklov_w $ + *********************************************************/ +/****************************************************************************** + * Copyright (c) 1998, Frank Warmerdam + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included + * in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + ****************************************************************************** + * + * cpl_conv.c: Various CPL convenience functions (from cpl_conv.h). + * + * $Log: not supported by cvs2svn $ + * Revision 1.1.1.1 2005/08/31 14:00:59 oconrad + * no message + * + * Revision 1.1.1.1 2005/08/17 08:25:16 oconrad + * no message + * + * Revision 1.1.1.1 2005/08/15 13:35:12 oconrad + * no message + * + * Revision 1.1 2004/04/16 13:36:45 oconrad + * no message + * + * Revision 1.4 1999/01/02 20:29:53 warmerda + * Allow zero length allocations + * + * Revision 1.3 1998/12/15 19:01:07 warmerda + * Added CPLReadLine(). + * + * Revision 1.2 1998/12/03 18:30:04 warmerda + * Use CPLError() instead of GPSError(). + * + * Revision 1.1 1998/12/02 19:33:23 warmerda + * New + * + */ + +#include "cpl_conv.h" + +/************************************************************************/ +/* CPLCalloc() */ +/************************************************************************/ + +void *CPLCalloc( size_t nCount, size_t nSize ) + +{ + void *pReturn; + + if( nSize == 0 ) + return NULL; + + pReturn = VSICalloc( nCount, nSize ); + if( pReturn == NULL ) + { + CPLError( CE_Fatal, CPLE_OutOfMemory, + "CPLCalloc(): Out of memory allocating %d bytes.\n", + nSize * nCount ); + } + + return pReturn; +} + +/************************************************************************/ +/* CPLMalloc() */ +/************************************************************************/ + +void *CPLMalloc( size_t nSize ) + +{ + void *pReturn; + + if( nSize == 0 ) + return NULL; + + pReturn = VSIMalloc( nSize ); + if( pReturn == NULL ) + { + CPLError( CE_Fatal, CPLE_OutOfMemory, + "CPLMalloc(): Out of memory allocating %d bytes.\n", + nSize ); + } + + return pReturn; +} + +/************************************************************************/ +/* CPLRealloc() */ +/************************************************************************/ + +void * CPLRealloc( void * pData, size_t nNewSize ) + +{ + void *pReturn; + + if( pData == NULL ) + pReturn = VSIMalloc( nNewSize ); + else + pReturn = VSIRealloc( pData, nNewSize ); + + if( pReturn == NULL ) + { + CPLError( CE_Fatal, CPLE_OutOfMemory, + "CPLRealloc(): Out of memory allocating %d bytes.\n", + nNewSize ); + } + + return pReturn; +} + +/************************************************************************/ +/* CPLStrdup() */ +/************************************************************************/ + +char *CPLStrdup( const char * pszString ) + +{ + char *pszReturn; + + if( pszString == NULL ) + pszString = ""; + + pszReturn = VSIStrdup( pszString ); + + if( pszReturn == NULL ) + { + CPLError( CE_Fatal, CPLE_OutOfMemory, + "CPLStrdup(): Out of memory allocating %d bytes.\n", + strlen(pszString) ); + + } + + return( pszReturn ); +} + +/************************************************************************/ +/* CPLReadLine() */ +/* */ +/* Read a line of text from the given file handle, taking care */ +/* to capture CR and/or LF and strip off ... equivelent of */ +/* DKReadLine(). Pointer to an internal buffer is returned. */ +/* The application shouldn't free it, or depend on it's value */ +/* past the next call to CPLReadLine() */ +/* */ +/* TODO: Allow arbitrarily long lines ... currently limited to */ +/* 512 characters. */ +/************************************************************************/ + +const char *CPLReadLine( FILE * fp ) + +{ + static char *pszRLBuffer = NULL; + static int nRLBufferSize = 0; + int nLength; + +/* -------------------------------------------------------------------- */ +/* Allocate our working buffer. Eventually this should grow as */ +/* needed ... we will implement that aspect later. */ +/* -------------------------------------------------------------------- */ + if( nRLBufferSize < 512 ) + { + nRLBufferSize = 512; + pszRLBuffer = (char *) CPLRealloc(pszRLBuffer, nRLBufferSize); + } + +/* -------------------------------------------------------------------- */ +/* Do the actual read. */ +/* -------------------------------------------------------------------- */ + if( VSIFGets( pszRLBuffer, nRLBufferSize, fp ) == NULL ) + return NULL; + +/* -------------------------------------------------------------------- */ +/* Clear CR and LF off the end. */ +/* -------------------------------------------------------------------- */ + nLength = strlen(pszRLBuffer); + if( nLength > 0 + && (pszRLBuffer[nLength-1] == 10 || pszRLBuffer[nLength-1] == 13) ) + { + pszRLBuffer[--nLength] = '\0'; + } + + if( nLength > 0 + && (pszRLBuffer[nLength-1] == 10 || pszRLBuffer[nLength-1] == 13) ) + { + pszRLBuffer[--nLength] = '\0'; + } + + return( pszRLBuffer ); +} + diff -Nru saga-2.1.0+dfsg/src/modules/io/io_esri_e00/e00compr/cpl_conv.h saga-2.1.4+dfsg/src/modules/io/io_esri_e00/e00compr/cpl_conv.h --- saga-2.1.0+dfsg/src/modules/io/io_esri_e00/e00compr/cpl_conv.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_esri_e00/e00compr/cpl_conv.h 2014-11-13 08:32:20.000000000 +0000 @@ -0,0 +1,75 @@ +/********************************************************** + * Version $Id: cpl_conv.h 911 2011-02-14 16:38:15Z reklov_w $ + *********************************************************/ +/****************************************************************************** + * Copyright (c) 1998, Frank Warmerdam + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included + * in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + ****************************************************************************** + * + * cpl_conv.h + * + * Prototypes, and stuff for various convenience functions. This is intended + * to remain light weight. + * + * $Log: + * Revision 1.1 1998/10/18 06:15:11 warmerda + * Initial implementation. + * + */ + +#ifndef CPL_CONV_H_INCLUDED +#define CPL_CONV_H_INCLUDED + +#include "cpl_port.h" +#include "cpl_vsi.h" +#include "cpl_error.h" + +/* -------------------------------------------------------------------- */ +/* Safe malloc() API. Thin cover over VSI functions with fatal */ +/* error reporting if memory allocation fails. */ +/* -------------------------------------------------------------------- */ +CPL_C_START +void CPL_DLL *CPLMalloc( size_t ); +void CPL_DLL *CPLCalloc( size_t, size_t ); +void CPL_DLL *CPLRealloc( void *, size_t ); +char CPL_DLL *CPLStrdup( const char * ); + +#define CPLFree VSIFree + +/* -------------------------------------------------------------------- */ +/* Read a line from a text file, and strip of CR/LF. */ +/* -------------------------------------------------------------------- */ +const char *CPLReadLine( FILE * ); + +/* -------------------------------------------------------------------- */ +/* Fetch a function from DLL / so. */ +/* -------------------------------------------------------------------- */ + +void CPL_DLL *CPLGetSymbol( const char *, const char * ); + +/* -------------------------------------------------------------------- */ +/* Read a directory (cpl_dir.c) */ +/* -------------------------------------------------------------------- */ +char CPL_DLL **CPLReadDir( const char *pszPath ); + + +CPL_C_END + +#endif /* ndef CPL_CONV_H_INCLUDED */ diff -Nru saga-2.1.0+dfsg/src/modules/io/io_esri_e00/e00compr/cpl_error.c saga-2.1.4+dfsg/src/modules/io/io_esri_e00/e00compr/cpl_error.c --- saga-2.1.0+dfsg/src/modules/io/io_esri_e00/e00compr/cpl_error.c 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_esri_e00/e00compr/cpl_error.c 2014-11-13 08:32:20.000000000 +0000 @@ -0,0 +1,166 @@ +/********************************************************** + * Version $Id: cpl_error.c 911 2011-02-14 16:38:15Z reklov_w $ + *********************************************************/ +/********************************************************************** + * $Id: cpl_error.c 911 2011-02-14 16:38:15Z reklov_w $ + * + * Name: cpl_error.cpp + * Project: CPL - Common Portability Library + * Purpose: Error handling functions. + * Author: Daniel Morissette, danmo@videotron.ca + * + ********************************************************************** + * Copyright (c) 1998, Daniel Morissette + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included + * in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + ********************************************************************** + * + * $Log: not supported by cvs2svn $ + * Revision 1.1.1.1 2005/08/31 14:00:59 oconrad + * no message + * + * Revision 1.1.1.1 2005/08/17 08:25:16 oconrad + * no message + * + * Revision 1.1.1.1 2005/08/15 13:35:12 oconrad + * no message + * + * Revision 1.1 2004/04/16 13:36:45 oconrad + * no message + * + * Revision 1.3 1998/12/15 19:02:27 warmerda + * Avoid use of errno as a variable + * + * Revision 1.2 1998/12/06 02:52:52 warmerda + * Implement assert support + * + * Revision 1.1 1998/12/03 18:26:02 warmerda + * New + * + **********************************************************************/ + +#include "cpl_error.h" + +/* static buffer to store the last error message. We'll assume that error + * messages cannot be longer than 2000 chars... which is quite reasonable + * (that's 25 lines of 80 chars!!!) + */ +static char gszCPLLastErrMsg[2000] = ""; +static int gnCPLLastErrNo = 0; + +static void (*gpfnCPLErrorHandler)(CPLErr, int, const char *) = NULL; + +/********************************************************************** + * CPLError() + * + * This function records an error code and displays the error message + * to stderr. + * + * The error code can be accessed later using CPLGetLastErrNo() + **********************************************************************/ +void CPLError(CPLErr eErrClass, int err_no, const char *fmt, ...) +{ + va_list args; + + /* Expand the error message + */ + va_start(args, fmt); + vsprintf(gszCPLLastErrMsg, fmt, args); + va_end(args); + + /* If the user provided his own error handling function, then call + * it, otherwise print the error to stderr and return. + */ + gnCPLLastErrNo = err_no; + + if (gpfnCPLErrorHandler != NULL) + { + gpfnCPLErrorHandler(eErrClass, err_no, gszCPLLastErrMsg); + } + else + { + fprintf(stderr, "ERROR %d: %s\n", gnCPLLastErrNo, gszCPLLastErrMsg); + } + + if( eErrClass == CE_Fatal ) + abort(); +} + +/********************************************************************** + * CPLErrorReset() + * + * Erase any traces of previous errors. + **********************************************************************/ +void CPLErrorReset() +{ + gnCPLLastErrNo = 0; + gszCPLLastErrMsg[0] = '\0'; +} + + +/********************************************************************** + * CPLGetLastErrorNo() + * + **********************************************************************/ +int CPLGetLastErrorNo() +{ + return gnCPLLastErrNo; +} + +/********************************************************************** + * CPLGetLastErrorMsg() + * + **********************************************************************/ +const char* CPLGetLastErrorMsg() +{ + return gszCPLLastErrMsg; +} + +/********************************************************************** + * CPLSetErrorHandler() + * + * Allow the library's user to specify his own error handler function. + * + * A valid error handler is a C function with the following prototype: + * + * void MyErrorHandler(int errno, const char *msg) + * + * Pass NULL to come back to the default behavior. + **********************************************************************/ + +void CPLSetErrorHandler(void (*pfnErrorHandler)(CPLErr, int, const char *)) +{ + gpfnCPLErrorHandler = pfnErrorHandler; +} + +/************************************************************************/ +/* _CPLAssert() */ +/* */ +/* This function is called only when an assertion fails. */ +/************************************************************************/ + +void _CPLAssert( const char * pszExpression, const char * pszFile, + int iLine ) + +{ + CPLError( CE_Fatal, CPLE_AssertionFailed, + "Assertion `%s' failed\n" + "in file `%s', line %d\n", + pszExpression, pszFile, iLine ); +} diff -Nru saga-2.1.0+dfsg/src/modules/io/io_esri_e00/e00compr/cpl_error.h saga-2.1.4+dfsg/src/modules/io/io_esri_e00/e00compr/cpl_error.h --- saga-2.1.0+dfsg/src/modules/io/io_esri_e00/e00compr/cpl_error.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_esri_e00/e00compr/cpl_error.h 2014-11-13 08:32:20.000000000 +0000 @@ -0,0 +1,118 @@ +/********************************************************** + * Version $Id: cpl_error.h 911 2011-02-14 16:38:15Z reklov_w $ + *********************************************************/ +/********************************************************************** + * $Id: cpl_error.h 911 2011-02-14 16:38:15Z reklov_w $ + * + * Name: cpl_error.h + * Project: CPL - Common Portability Library + * Purpose: CPL Error handling + * Author: Daniel Morissette, danmo@videotron.ca + * + ********************************************************************** + * Copyright (c) 1998, Daniel Morissette + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included + * in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + ********************************************************************** + * + * $Log: not supported by cvs2svn $ + * Revision 1.1.1.1 2005/08/31 14:00:59 oconrad + * no message + * + * Revision 1.1.1.1 2005/08/17 08:25:16 oconrad + * no message + * + * Revision 1.1.1.1 2005/08/15 13:35:12 oconrad + * no message + * + * Revision 1.1 2004/04/16 13:36:45 oconrad + * no message + * + * Revision 1.6 1999/02/17 05:40:47 danmo + * Fixed CPLAssert() macro to work with EGCS. + * + * Revision 1.5 1999/01/11 15:34:29 warmerda + * added reserved range comment + * + * Revision 1.4 1998/12/15 19:02:27 warmerda + * Avoid use of errno as a variable + * + * Revision 1.3 1998/12/06 22:20:42 warmerda + * Added error code. + * + * Revision 1.2 1998/12/06 02:52:52 warmerda + * Implement assert support + * + * Revision 1.1 1998/12/03 18:26:02 warmerda + * New + * + **********************************************************************/ + +#ifndef _CPL_ERROR_H_INCLUDED_ +#define _CPL_ERROR_H_INCLUDED_ + +#include "cpl_port.h" + +/*===================================================================== + Error handling functions (cpl_error.c) + =====================================================================*/ +CPL_C_START + +typedef enum +{ + CE_None = 0, + CE_Log = 1, + CE_Warning = 2, + CE_Failure = 3, + CE_Fatal = 4 + +} CPLErr; + +void CPL_DLL CPLError(CPLErr eErrClass, int err_no, const char *fmt, ...); +void CPL_DLL CPLErrorReset(); +int CPL_DLL CPLGetLastErrorNo(); +const char CPL_DLL * CPLGetLastErrorMsg(); +void CPL_DLL CPLSetErrorHandler(void(*pfnErrorHandler)(CPLErr,int, + const char *)); +void CPL_DLL _CPLAssert( const char *, const char *, int ); + +#ifdef DEBUG +# define CPLAssert(expr) ((expr) ? (void)(0) : _CPLAssert(#expr,__FILE__,__LINE__)) +#else +# define CPLAssert(expr) +#endif + +CPL_C_END + +/* ==================================================================== */ +/* Well known error codes. */ +/* ==================================================================== */ + +#define CPLE_AppDefined 1 +#define CPLE_OutOfMemory 2 +#define CPLE_FileIO 3 +#define CPLE_OpenFailed 4 +#define CPLE_IllegalArg 5 +#define CPLE_NotSupported 6 +#define CPLE_AssertionFailed 7 +#define CPLE_NoWriteAccess 8 + +/* 100 - 299 reserved for GDAL */ + +#endif /* _CPL_ERROR_H_INCLUDED_ */ diff -Nru saga-2.1.0+dfsg/src/modules/io/io_esri_e00/e00compr/cpl_port.h saga-2.1.4+dfsg/src/modules/io/io_esri_e00/e00compr/cpl_port.h --- saga-2.1.0+dfsg/src/modules/io/io_esri_e00/e00compr/cpl_port.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_esri_e00/e00compr/cpl_port.h 2014-11-13 08:32:20.000000000 +0000 @@ -0,0 +1,249 @@ +/********************************************************** + * Version $Id: cpl_port.h 911 2011-02-14 16:38:15Z reklov_w $ + *********************************************************/ +/****************************************************************************** + * Copyright (c) 1998, Frank Warmerdam + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included + * in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + ****************************************************************************** + * + * cpl_port.h + * + * Include file providing low level portability services for CPL. This + * should be the first include file for any CPL based code. It provides the + * following: + * + * o Includes some standard system include files, such as stdio, and stdlib. + * + * o Defines CPL_C_START, CPL_C_END macros. + * + * o Ensures that some other standard macros like NULL are defined. + * + * o Defines some portability stuff like CPL_MSB, or CPL_LSB. + * + * o Ensures that core types such as GBool, GInt32, GInt16, GUInt32, + * GUInt16, and GByte are defined. + * + * $Log: not supported by cvs2svn $ + * Revision 1.1.1.1 2005/08/31 14:01:00 oconrad + * no message + * + * Revision 1.1.1.1 2005/08/17 08:25:16 oconrad + * no message + * + * Revision 1.1.1.1 2005/08/15 13:35:12 oconrad + * no message + * + * Revision 1.1 2004/04/16 13:36:45 oconrad + * no message + * + * Revision 1.9 1999/02/17 01:41:17 warmerda + * Added NULL. + * + * Revision 1.8 1999/02/02 21:32:38 warmerda + * Added CPL_{MSB,LSB}WORD{16,32} macros. + * + * Revision 1.7 1999/02/02 19:02:36 warmerda + * Removed duplicates of base types, and CPL_LSB + * + * Revision 1.6 1999/01/28 18:36:06 warmerda + * Ensure WIN32 is defined on Windows. + * + * Revision 1.5 1999/01/28 05:26:12 danmo + * Added byte swapping macros. + * + * Revision 1.4 1998/12/15 19:05:30 warmerda + * added errno.h + * + * Revision 1.3 1998/12/14 04:50:07 warmerda + * Added DBMALLOC support + * + * Revision 1.2 1998/12/04 21:38:40 danmo + * Changed str*casecmp() to str*icmp() for WIN32 + * + * Revision 1.1 1998/12/03 18:26:02 warmerda + * New + * + */ + +#ifndef CPL_BASE_H_INCLUDED +#define CPL_BASE_H_INCLUDED + +/* ==================================================================== */ +/* We will use WIN32 as a standard windows define. */ +/* ==================================================================== */ +#if defined(_WIN32) && !defined(WIN32) +# define WIN32 +#endif + +/* ==================================================================== */ +/* Standard include files. */ +/* ==================================================================== */ + +#include +#include +#include +#include +#include +#include + +#ifdef DBMALLOC +#include +#endif + +/* ==================================================================== */ +/* Base portability stuff ... this stuff may need to be */ +/* modified for new platforms. */ +/* ==================================================================== */ + +/*--------------------------------------------------------------------- + * types for 16 and 32 bits integers, etc... + *--------------------------------------------------------------------*/ +#if UINT_MAX == 65535 +typedef long GInt32; +typedef unsigned long GUInt32; +#else +typedef int GInt32; +typedef unsigned int GUInt32; +#endif + +typedef short GInt16; +typedef unsigned short GUInt16; +typedef unsigned char GByte; +typedef int GBool; + + +/* ==================================================================== */ +/* Other standard services. */ +/* ==================================================================== */ +#ifdef __cplusplus +# define CPL_C_START extern "C" { +# define CPL_C_END } +#else +# define CPL_C_START +# define CPL_C_END +#endif + +/* # define CPL_DLL __declspec(dllexport) */ + +#define CPL_DLL + +#ifndef NULL +# define NULL 0 +#endif + +#ifndef FALSE +# define FALSE 0 +#endif + +#ifndef TRUE +# define TRUE 1 +#endif + +#ifndef MAX +# define MIN(a,b) ((ab) ? a : b) +#endif + +#ifndef NULL +#define NULL 0 +#endif + +#ifndef ABS +# define ABS(x) ((x<0) ? (-1*(x)) : x) +#endif + +#ifndef EQUAL +#ifdef WIN32 +# define EQUALN(a,b,n) (strnicmp(a,b,n)==0) +# define EQUAL(a,b) (stricmp(a,b)==0) +#else +# define EQUALN(a,b,n) (strncasecmp(a,b,n)==0) +# define EQUAL(a,b) (strcasecmp(a,b)==0) +#endif +#endif + +/*--------------------------------------------------------------------- + * CPL_LSB and CPL_MSB + * Only one of these 2 macros should be defined and specifies the byte + * ordering for the current platform. + * This should be defined in the Makefile, but if it is not then + * the default is CPL_LSB (Intel ordering, LSB first). + *--------------------------------------------------------------------*/ +#if ! ( defined(CPL_LSB) || defined(CPL_MSB) ) +#define CPL_LSB +#endif + +/*--------------------------------------------------------------------- + * Little endian <==> big endian byte swap macros. + *--------------------------------------------------------------------*/ + +#define CPL_SWAP16(x) \ + ((GUInt16)( \ + (((GUInt16)(x) & 0x00ffU) << 8) | \ + (((GUInt16)(x) & 0xff00U) >> 8) )) + +#define CPL_SWAP32(x) \ + ((GUInt32)( \ + (((GUInt32)(x) & (GUInt32)0x000000ffUL) << 24) | \ + (((GUInt32)(x) & (GUInt32)0x0000ff00UL) << 8) | \ + (((GUInt32)(x) & (GUInt32)0x00ff0000UL) >> 8) | \ + (((GUInt32)(x) & (GUInt32)0xff000000UL) >> 24) )) + +/* Until we have a safe 64 bits integer data type defined, we'll replace +m * this version of the CPL_SWAP64() macro with a less efficient one. + */ +/* +#define CPL_SWAP64(x) \ + ((uint64)( \ + (uint64)(((uint64)(x) & (uint64)0x00000000000000ffULL) << 56) | \ + (uint64)(((uint64)(x) & (uint64)0x000000000000ff00ULL) << 40) | \ + (uint64)(((uint64)(x) & (uint64)0x0000000000ff0000ULL) << 24) | \ + (uint64)(((uint64)(x) & (uint64)0x00000000ff000000ULL) << 8) | \ + (uint64)(((uint64)(x) & (uint64)0x000000ff00000000ULL) >> 8) | \ + (uint64)(((uint64)(x) & (uint64)0x0000ff0000000000ULL) >> 24) | \ + (uint64)(((uint64)(x) & (uint64)0x00ff000000000000ULL) >> 40) | \ + (uint64)(((uint64)(x) & (uint64)0xff00000000000000ULL) >> 56) )) +*/ + +#define CPL_SWAPDOUBLE(p) { \ + double _tmp = *(double *)(p); \ + ((GByte *)(p))[0] = ((GByte *)&_tmp)[7]; \ + ((GByte *)(p))[1] = ((GByte *)&_tmp)[6]; \ + ((GByte *)(p))[2] = ((GByte *)&_tmp)[5]; \ + ((GByte *)(p))[3] = ((GByte *)&_tmp)[4]; \ + ((GByte *)(p))[4] = ((GByte *)&_tmp)[3]; \ + ((GByte *)(p))[5] = ((GByte *)&_tmp)[2]; \ + ((GByte *)(p))[6] = ((GByte *)&_tmp)[1]; \ + ((GByte *)(p))[7] = ((GByte *)&_tmp)[0]; \ +} + +#ifdef CPL_MSB +# define CPL_MSBWORD16(x) (x) +# define CPL_LSBWORD16(x) CPL_SWAP16(x) +# define CPL_MSBWORD32(x) (x) +# define CPL_LSBWORD32(x) CPL_SWAP32(x) +#else +# define CPL_LSBWORD16(x) (x) +# define CPL_MSBWORD16(x) CPL_SWAP16(x) +# define CPL_LSBWORD32(x) (x) +# define CPL_MSBWORD32(x) CPL_SWAP32(x) +#endif + +#endif /* ndef CPL_BASE_H_INCLUDED */ diff -Nru saga-2.1.0+dfsg/src/modules/io/io_esri_e00/e00compr/cpl_vsi.h saga-2.1.4+dfsg/src/modules/io/io_esri_e00/e00compr/cpl_vsi.h --- saga-2.1.0+dfsg/src/modules/io/io_esri_e00/e00compr/cpl_vsi.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_esri_e00/e00compr/cpl_vsi.h 2014-11-13 08:32:20.000000000 +0000 @@ -0,0 +1,133 @@ +/********************************************************** + * Version $Id: cpl_vsi.h 911 2011-02-14 16:38:15Z reklov_w $ + *********************************************************/ +/****************************************************************************** + * Copyright (c) 1998, Frank Warmerdam + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included + * in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + ****************************************************************************** + * + * cpl_vsi.h + * + * Include file defining the Virtual System Interface (VSI) functions. This + * should normally be included by all translators using VSI functions for + * accessing system services. It is also used by the GDAL core, and can be + * used by higher level applications which adhere to VSI use. + * + * Most VSI functions are direct analogs of Posix C library functions. + * VSI exists to allow ``hooking'' these functions to provide application + * specific checking, io redirection and so on. + * + * $Log: not supported by cvs2svn $ + * Revision 1.1.1.1 2005/08/31 14:01:00 oconrad + * no message + * + * Revision 1.1.1.1 2005/08/17 08:25:16 oconrad + * no message + * + * Revision 1.1.1.1 2005/08/15 13:35:12 oconrad + * no message + * + * Revision 1.1 2004/04/16 13:36:45 oconrad + * no message + * + * Revision 1.4 1999/02/25 04:48:11 danmo + * Added VSIStat() macros specific to _WIN32 (for MSVC++) + * + * Revision 1.3 1999/01/28 18:31:25 warmerda + * Test on _WIN32 rather than WIN32. It seems to be more reliably defined. + * + * Revision 1.2 1998/12/04 21:42:57 danmo + * Added #ifndef WIN32 arounf #include + * + * Revision 1.1 1998/12/03 18:26:02 warmerda + * New + * + */ + +#ifndef CPL_VSI_H_INCLUDED +#define CPL_VSI_H_INCLUDED + +#include "cpl_port.h" + +/* -------------------------------------------------------------------- */ +/* We need access to ``struct stat''. */ +/* -------------------------------------------------------------------- */ +#ifndef _WIN32 +# include +#endif +#include + +CPL_C_START + +/* ==================================================================== */ +/* stdio file access functions. */ +/* ==================================================================== */ + +FILE CPL_DLL * VSIFOpen( const char *, const char * ); +int CPL_DLL VSIFClose( FILE * ); +int CPL_DLL VSIFSeek( FILE *, long, int ); +long CPL_DLL VSIFTell( FILE * ); +void CPL_DLL VSIRewind( FILE * ); + +size_t CPL_DLL VSIFRead( void *, size_t, size_t, FILE * ); +size_t CPL_DLL VSIFWrite( void *, size_t, size_t, FILE * ); +char CPL_DLL *VSIFGets( char *, int, FILE * ); +int CPL_DLL VSIFPuts( const char *, FILE * ); +int CPL_DLL VSIFPrintf( FILE *, const char *, ... ); + +int CPL_DLL VSIFGetc( FILE * ); +int CPL_DLL VSIFPutc( int, FILE * ); +int CPL_DLL VSIUngetc( int, FILE * ); +int CPL_DLL VSIFEof( FILE * ); + +/* ==================================================================== */ +/* VSIStat() related. */ +/* ==================================================================== */ + +typedef struct stat VSIStatBuf; +int CPL_DLL VSIStat( const char *, VSIStatBuf * ); + +#ifdef _WIN32 +# define VSI_ISLNK(x) ( 0 ) /* N/A on Windows */ +# define VSI_ISREG(x) ((x) & S_IFREG) +# define VSI_ISDIR(x) ((x) & S_IFDIR) +# define VSI_ISCHR(x) ((x) & S_IFCHR) +# define VSI_ISBLK(x) ( 0 ) /* N/A on Windows */ +#else +# define VSI_ISLNK(x) S_ISLNK(x) +# define VSI_ISREG(x) S_ISREG(x) +# define VSI_ISDIR(x) S_ISDIR(x) +# define VSI_ISCHR(x) S_ISCHR(x) +# define VSI_ISBLK(x) S_ISBLK(x) +#endif + +/* ==================================================================== */ +/* Memory allocation */ +/* ==================================================================== */ + +void CPL_DLL *VSICalloc( size_t, size_t ); +void CPL_DLL *VSIMalloc( size_t ); +void CPL_DLL VSIFree( void * ); +void CPL_DLL *VSIRealloc( void *, size_t ); +char CPL_DLL *VSIStrdup( const char * ); + +CPL_C_END + +#endif /* ndef CPL_VSI_H_INCLUDED */ diff -Nru saga-2.1.0+dfsg/src/modules/io/io_esri_e00/e00compr/cpl_vsisimple.c saga-2.1.4+dfsg/src/modules/io/io_esri_e00/e00compr/cpl_vsisimple.c --- saga-2.1.0+dfsg/src/modules/io/io_esri_e00/e00compr/cpl_vsisimple.c 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_esri_e00/e00compr/cpl_vsisimple.c 2014-11-13 08:32:20.000000000 +0000 @@ -0,0 +1,278 @@ +/********************************************************** + * Version $Id: cpl_vsisimple.c 911 2011-02-14 16:38:15Z reklov_w $ + *********************************************************/ +/****************************************************************************** + * Copyright (c) 1998, Frank Warmerdam + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included + * in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + ****************************************************************************** + * + * cpl_vsisimple.cpp + * + * This is a simple implementation (direct to Posix) of the Virtual System + * Interface (VSI). See gdal_vsi.h. + * + * TODO: + * - add some assertions to ensure that arguments are widely legal. For + * instance validation of access strings to fopen(). + * + * $Log: not supported by cvs2svn $ + * Revision 1.1.1.1 2005/08/31 14:01:00 oconrad + * no message + * + * Revision 1.1.1.1 2005/08/17 08:25:16 oconrad + * no message + * + * Revision 1.1.1.1 2005/08/15 13:35:12 oconrad + * no message + * + * Revision 1.1 2004/04/16 13:36:45 oconrad + * no message + * + * Revision 1.3 1998/12/14 04:50:33 warmerda + * Avoid C++ comments so it will be C compilable as well. + * + * Revision 1.2 1998/12/04 21:42:57 danmo + * Added #ifndef WIN32 arounf #include + * + * Revision 1.1 1998/12/03 18:26:03 warmerda + * New + * + */ + +#include "cpl_vsi.h" + +/* for stat() */ + +#ifndef WIN32 +# include +#endif +#include + +/************************************************************************/ +/* VSIFOpen() */ +/************************************************************************/ + +FILE *VSIFOpen( const char * pszFilename, const char * pszAccess ) + +{ + return( fopen( (char *) pszFilename, (char *) pszAccess ) ); +} + +/************************************************************************/ +/* VSIFClose() */ +/************************************************************************/ + +int VSIFClose( FILE * fp ) + +{ + return( fclose(fp) ); +} + +/************************************************************************/ +/* VSIFSeek() */ +/************************************************************************/ + +int VSIFSeek( FILE * fp, long nOffset, int nWhence ) + +{ + return( fseek( fp, nOffset, nWhence ) ); +} + +/************************************************************************/ +/* VSIFTell() */ +/************************************************************************/ + +long VSIFTell( FILE * fp ) + +{ + return( ftell( fp ) ); +} + +/************************************************************************/ +/* VSIRewind() */ +/************************************************************************/ + +void VSIRewind( FILE * fp ) + +{ + rewind( fp ); +} + +/************************************************************************/ +/* VSIFRead() */ +/************************************************************************/ + +size_t VSIFRead( void * pBuffer, size_t nSize, size_t nCount, FILE * fp ) + +{ + return( fread( pBuffer, nSize, nCount, fp ) ); +} + +/************************************************************************/ +/* VSIFWrite() */ +/************************************************************************/ + +size_t VSIFWrite( void * pBuffer, size_t nSize, size_t nCount, FILE * fp ) + +{ + return( fwrite( pBuffer, nSize, nCount, fp ) ); +} + +/************************************************************************/ +/* VSIFGets() */ +/************************************************************************/ + +char *VSIFGets( char *pszBuffer, int nBufferSize, FILE * fp ) + +{ + return( fgets( pszBuffer, nBufferSize, fp ) ); +} + +/************************************************************************/ +/* VSIFGetc() */ +/************************************************************************/ + +int VSIFGetc( FILE * fp ) + +{ + return( fgetc( fp ) ); +} + +/************************************************************************/ +/* VSIUngetc() */ +/************************************************************************/ + +int VSIUngetc( int c, FILE * fp ) + +{ + return( ungetc( c, fp ) ); +} + +/************************************************************************/ +/* VSIFPrintf() */ +/* */ +/* This is a little more complicated than just calling */ +/* fprintf() because of the variable arguments. Instead we */ +/* have to use vfprintf(). */ +/************************************************************************/ + +int VSIFPrintf( FILE * fp, const char * pszFormat, ... ) + +{ + va_list args; + int nReturn; + + va_start( args, pszFormat ); + nReturn = vfprintf( fp, pszFormat, args ); + va_end( args ); + + return( nReturn ); +} + +/************************************************************************/ +/* VSIFEof() */ +/************************************************************************/ + +int VSIFEof( FILE * fp ) + +{ + return( feof( fp ) ); +} + +/************************************************************************/ +/* VSIFPuts() */ +/************************************************************************/ + +int VSIFPuts( const char * pszString, FILE * fp ) + +{ + return fputs( pszString, fp ); +} + +/************************************************************************/ +/* VSIFPutc() */ +/************************************************************************/ + +int VSIFPutc( int nChar, FILE * fp ) + +{ + return( fputc( nChar, fp ) ); +} + +/************************************************************************/ +/* VSICalloc() */ +/************************************************************************/ + +void *VSICalloc( size_t nCount, size_t nSize ) + +{ + return( calloc( nCount, nSize ) ); +} + +/************************************************************************/ +/* VSIMalloc() */ +/************************************************************************/ + +void *VSIMalloc( size_t nSize ) + +{ + return( malloc( nSize ) ); +} + +/************************************************************************/ +/* VSIRealloc() */ +/************************************************************************/ + +void * VSIRealloc( void * pData, size_t nNewSize ) + +{ + return( realloc( pData, nNewSize ) ); +} + +/************************************************************************/ +/* VSIFree() */ +/************************************************************************/ + +void VSIFree( void * pData ) + +{ + if( pData != NULL ) + free( pData ); +} + +/************************************************************************/ +/* VSIStrdup() */ +/************************************************************************/ + +char *VSIStrdup( const char * pszString ) + +{ + return( strdup( pszString ) ); +} + +/************************************************************************/ +/* VSIStat() */ +/************************************************************************/ + +int VSIStat( const char * pszFilename, VSIStatBuf * pStatBuf ) + +{ + return( stat( pszFilename, pStatBuf ) ); +} diff -Nru saga-2.1.0+dfsg/src/modules/io/io_esri_e00/e00compr/e00compr.h saga-2.1.4+dfsg/src/modules/io/io_esri_e00/e00compr/e00compr.h --- saga-2.1.0+dfsg/src/modules/io/io_esri_e00/e00compr/e00compr.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_esri_e00/e00compr/e00compr.h 2014-11-13 08:32:20.000000000 +0000 @@ -0,0 +1,177 @@ +/********************************************************** + * Version $Id: e00compr.h 911 2011-02-14 16:38:15Z reklov_w $ + *********************************************************/ +/********************************************************************** + * $Id: e00compr.h 911 2011-02-14 16:38:15Z reklov_w $ + * + * Name: e00compr.h + * Project: Compressed E00 Read/Write library + * Language: ANSI C + * Purpose: Header file containing all definitions for the library. + * Author: Daniel Morissette, danmo@videotron.ca + * + * $Log: not supported by cvs2svn $ + * Revision 1.1.1.1 2005/08/31 14:01:00 oconrad + * no message + * + * Revision 1.1.1.1 2005/08/17 08:25:16 oconrad + * no message + * + * Revision 1.1.1.1 2005/08/15 13:35:12 oconrad + * no message + * + * Revision 1.1 2004/04/16 13:36:45 oconrad + * no message + * + * Revision 1.7 1999/02/25 18:47:40 daniel + * Now use CPL for Error handling, Memory allocation, and File access. + * + * Revision 1.6 1999/01/08 17:40:33 daniel + * Added E00Read/WriteCallbakcOpen() + * + * Revision 1.5 1998/11/13 15:39:45 daniel + * Added functions for write support. + * + * Revision 1.4 1998/11/02 18:37:03 daniel + * New file header, and added E00ErrorReset() + * + * Revision 1.1 1998/10/29 13:26:00 daniel + * Initial revision + * + ********************************************************************** + * Copyright (c) 1998, 1999, Daniel Morissette + * + * All rights reserved. This software may be copied or reproduced, in + * all or in part, without the prior written consent of its author, + * Daniel Morissette (danmo@videotron.ca). However, any material copied + * or reproduced must bear the original copyright notice (above), this + * original paragraph, and the original disclaimer (below). + * + * The entire risk as to the results and performance of the software, + * supporting text and other information contained in this file + * (collectively called the "Software") is with the user. Although + * considerable efforts have been used in preparing the Software, the + * author does not warrant the accuracy or completeness of the Software. + * In no event will the author be liable for damages, including loss of + * profits or consequential damages, arising out of the use of the + * Software. + * + **********************************************************************/ + +#ifndef _E00COMPR_H_INCLUDED_ +#define _E00COMPR_H_INCLUDED_ + +#ifdef __cplusplus +extern "C" { +#endif + + +#include + +#include "cpl_port.h" +#include "cpl_conv.h" +#include "cpl_error.h" + +/*===================================================================== + Data types and constants + =====================================================================*/ + +#define E00_READ_BUF_SIZE 256 /* E00 lines are always 80 chars or less */ + /* for both compressed and uncompressed */ + /* files, except the first line (the EXP)*/ + /* for which there is no known limit */ + /* We'll assume that it can't be longer */ + /* than 256 chars */ + +#define E00_WRITE_BUF_SIZE 256 /* This buffer must be big enough to hold*/ + /* at least 2 lines of compressed output */ + /* (i.e. 160 chars)... but just in case */ + /* compressing a line would ever result */ + /* in it becoming bigger than its source */ + /* we'll set the size to 256 chars! */ + +#define E00_COMPR_NONE 0 /* Compression levels to use when writing*/ +#define E00_COMPR_PARTIAL 1 +#define E00_COMPR_FULL 2 + +/*--------------------------------------------------------------------- + * E00ReadPtr + * + * A E00ReadPtr handle is used to hold information about the compressed + * file currently being read. + *--------------------------------------------------------------------*/ +struct _E00ReadInfo +{ + FILE *fp; /* Input file handle */ + int bEOF; /* Reached EOF? */ + int bIsCompressed; /* 1 if file is compressed, 0 if not */ + int nInputLineNo; + + int iInBufPtr; /* Last character processed in szInBuf */ + char szInBuf[E00_READ_BUF_SIZE]; /* compressed input buffer */ + char szOutBuf[E00_READ_BUF_SIZE];/* uncompressed output buffer */ + + /* pRefData, pfnReadNextLine() and pfnReadRewind() are used only + * when the file is opened with E00ReadCallbackOpen() + * (and in this case the FILE *fp defined above is not used) + */ + void * pRefData; + const char * (*pfnReadNextLine)(void *); + void (*pfnReadRewind)(void *); +}; + +typedef struct _E00ReadInfo *E00ReadPtr; + +/*--------------------------------------------------------------------- + * E00WritePtr + * + * A E00WritePtr handle is used to hold information about the + * file currently being written. + *--------------------------------------------------------------------*/ +struct _E00WriteInfo +{ + FILE *fp; /* Output file handle */ + int nComprLevel; + + int nSrcLineNo; + + int iOutBufPtr; /* Current position in szOutBuf */ + char szOutBuf[E00_WRITE_BUF_SIZE]; /* compressed output buffer */ + + /* pRefData and pfnWriteNextLine() are used only + * when the file is opened with E00WriteCallbackOpen() + * (and in this case the FILE *fp defined above is not used) + */ + void *pRefData; + int (*pfnWriteNextLine)(void *, const char *); +}; + +typedef struct _E00WriteInfo *E00WritePtr; + + +/*===================================================================== + Function prototypes + =====================================================================*/ + +E00ReadPtr E00ReadOpen(const char *pszFname); +E00ReadPtr E00ReadCallbackOpen(void *pRefData, + const char * (*pfnReadNextLine)(void *), + void (*pfnReadRewind)(void *)); +void E00ReadClose(E00ReadPtr psInfo); + +const char *E00ReadNextLine(E00ReadPtr psInfo); +void E00ReadRewind(E00ReadPtr psInfo); + +E00WritePtr E00WriteOpen(const char *pszFname, int nComprLevel); +E00WritePtr E00WriteCallbackOpen(void *pRefData, + int (*pfnWriteNextLine)(void *, const char *), + int nComprLevel); +void E00WriteClose(E00WritePtr psInfo); +int E00WriteNextLine(E00WritePtr psInfo, const char *pszLine); + + +#ifdef __cplusplus +} +#endif + +#endif /* _E00COMPR_H_INCLUDED_ */ diff -Nru saga-2.1.0+dfsg/src/modules/io/io_esri_e00/e00compr/e00read.c saga-2.1.4+dfsg/src/modules/io/io_esri_e00/e00compr/e00read.c --- saga-2.1.0+dfsg/src/modules/io/io_esri_e00/e00compr/e00read.c 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_esri_e00/e00compr/e00read.c 2014-11-13 08:32:20.000000000 +0000 @@ -0,0 +1,650 @@ +/********************************************************** + * Version $Id: e00read.c 911 2011-02-14 16:38:15Z reklov_w $ + *********************************************************/ +/********************************************************************** + * $Id: e00read.c 911 2011-02-14 16:38:15Z reklov_w $ + * + * Name: e00read.c + * Project: Compressed E00 Read/Write library + * Language: ANSI C + * Purpose: Functions to read Compressed E00 files and return a stream + * of uncompressed lines. + * Author: Daniel Morissette, danmo@videotron.ca + * + * $Log: not supported by cvs2svn $ + * Revision 1.1.1.1 2005/08/31 14:01:00 oconrad + * no message + * + * Revision 1.1.1.1 2005/08/17 08:25:16 oconrad + * no message + * + * Revision 1.1.1.1 2005/08/15 13:35:12 oconrad + * no message + * + * Revision 1.1 2004/04/16 13:36:45 oconrad + * no message + * + * Revision 1.8 1999/02/25 18:45:56 daniel + * Now use CPL for Error handling, Memory allocation, and File access + * + * Revision 1.7 1999/01/08 17:39:08 daniel + * Added E00ReadCallbackOpen() + * + * Revision 1.6 1998/11/13 16:34:08 daniel + * Fixed '\r' problem when reading E00 files from a PC under Unix + * + * Revision 1.5 1998/11/13 15:48:08 daniel + * Simplified the decoding of the compression codes for numbers + * (use a logical rule instead of going case by case) + * + * Revision 1.4 1998/11/02 18:34:29 daniel + * Added E00ErrorReset() calls. Replace "EXP 1" by "EXP 0" on read. + * + * Revision 1.1 1998/10/29 13:26:00 daniel + * Initial revision + * + ********************************************************************** + * Copyright (c) 1998, 1999, Daniel Morissette + * + * All rights reserved. This software may be copied or reproduced, in + * all or in part, without the prior written consent of its author, + * Daniel Morissette (danmo@videotron.ca). However, any material copied + * or reproduced must bear the original copyright notice (above), this + * original paragraph, and the original disclaimer (below). + * + * The entire risk as to the results and performance of the software, + * supporting text and other information contained in this file + * (collectively called the "Software") is with the user. Although + * considerable efforts have been used in preparing the Software, the + * author does not warrant the accuracy or completeness of the Software. + * In no event will the author be liable for damages, including loss of + * profits or consequential damages, arising out of the use of the + * Software. + * + **********************************************************************/ + +#include +#include +#include +#include + +#include "e00compr.h" + +static void _ReadNextSourceLine(E00ReadPtr psInfo); +static const char *_UncompressNextLine(E00ReadPtr psInfo); + +/********************************************************************** + * _E00ReadTestOpen() + * + * Given a pre-initialized E00ReadPtr, this function will make sure + * that the file is really a E00 file, and also establish if it is + * compressed or not... setting the structure members by the same way. + * + * Returns NULL (and destroys the E00ReadPtr) if the file does not + * appear to be a valid E00 file. + **********************************************************************/ +static E00ReadPtr _E00ReadTestOpen(E00ReadPtr psInfo) +{ + + /* Check that the file is in E00 format. + */ + _ReadNextSourceLine(psInfo); + if (!psInfo->bEOF && strncmp(psInfo->szInBuf, "EXP ", 4) == 0) + { + /* We should be in presence of a valid E00 file... + * Is the file compressed or not? + * + * Note: we cannot really rely on the number that follows the EXP to + * establish if the file is compressed since we sometimes encounter + * uncompressed files that start with a "EXP 1" line!!! + * + * The best test is to read the first non-empty line: if the file is + * compressed, the first line of data should be 79 or 80 characters + * long and contain several '~' characters. + */ + do + { + _ReadNextSourceLine(psInfo); + }while(!psInfo->bEOF && + (psInfo->szInBuf[0] == '\0' || isspace(psInfo->szInBuf[0])) ); + + if (!psInfo->bEOF && + (strlen(psInfo->szInBuf)==79 || strlen(psInfo->szInBuf)==80) && + strchr(psInfo->szInBuf, '~') != NULL ) + psInfo->bIsCompressed = 1; + + /* Move the Read ptr ready to read at the beginning of the file + */ + E00ReadRewind(psInfo); + } + else + { + CPLFree(psInfo); + psInfo = NULL; + } + + return psInfo; +} + +/********************************************************************** + * E00ReadOpen() + * + * Try to open a E00 file given its filename and return a E00ReadPtr handle. + * + * Returns NULL if the file could not be opened or if it does not + * appear to be a valid E00 file. + **********************************************************************/ +E00ReadPtr E00ReadOpen(const char *pszFname) +{ + E00ReadPtr psInfo = NULL; + FILE *fp; + + CPLErrorReset(); + + /* Open the file + */ + fp = VSIFOpen(pszFname, "rt"); + if (fp == NULL) + { + CPLError(CE_Failure, CPLE_OpenFailed, + "Failed to open %s: %s", pszFname, strerror(errno)); + return NULL; + } + + /* File was succesfully opened, allocate and initialize a + * E00ReadPtr handle and check that the file is valid. + */ + psInfo = (E00ReadPtr)CPLCalloc(1, sizeof(struct _E00ReadInfo)); + + psInfo->fp = fp; + + psInfo = _E00ReadTestOpen(psInfo); + + if (psInfo == NULL) + { + CPLError(CE_Failure, CPLE_OpenFailed, + "%s is not a valid E00 file.", pszFname); + } + + return psInfo; +} + +/********************************************************************** + * E00ReadCallbackOpen() + * + * This is an alternative to E00ReadOpen() for cases where you want to + * do all the file management yourself. You open/close the file yourself + * and provide 2 callback functions: to read from the file and rewind the + * file pointer. pRefData is your handle on the physical file and can + * be whatever you want... it is not used by the library, it will be + * passed directly to your 2 callback functions when they are called. + * + * The callback functions must have the following C prototype: + * + * const char *myReadNextLine(void *pRefData); + * void myReadRewind(void *pRefData); + * + * myReadNextLine() should return a reference to its own internal + * buffer, or NULL if an error happens or EOF is reached. + * + * E00ReadCallbackOpen() returns a E00ReadPtr handle or NULL if the file + * does not appear to be a valid E00 file. + **********************************************************************/ +E00ReadPtr E00ReadCallbackOpen(void *pRefData, + const char * (*pfnReadNextLine)(void *), + void (*pfnReadRewind)(void *)) +{ + E00ReadPtr psInfo = NULL; + + CPLErrorReset(); + + /* Make sure we received valid function pointers + */ + if (pfnReadNextLine == NULL || pfnReadRewind == NULL) + { + CPLError(CE_Failure, CPLE_IllegalArg, + "Invalid function pointers!"); + return NULL; + } + + /* Allocate and initialize a + * E00ReadPtr handle and check that the file is valid. + */ + psInfo = (E00ReadPtr)CPLCalloc(1, sizeof(struct _E00ReadInfo)); + + psInfo->pRefData = pRefData; + psInfo->pfnReadNextLine = pfnReadNextLine; + psInfo->pfnReadRewind = pfnReadRewind; + + psInfo = _E00ReadTestOpen(psInfo); + + if (psInfo == NULL) + { + CPLError(CE_Failure, CPLE_OpenFailed, + "This is not a valid E00 file."); + } + + return psInfo; +} + +/********************************************************************** + * E00ReadClose() + * + * Close input file and release any memory used by the E00ReadPtr. + **********************************************************************/ +void E00ReadClose(E00ReadPtr psInfo) +{ + CPLErrorReset(); + + if (psInfo) + { + if (psInfo->fp) + VSIFClose(psInfo->fp); + CPLFree(psInfo); + } +} + +/********************************************************************** + * E00ReadRewind() + * + * Rewind the E00ReadPtr. Allows to start another read pass on the + * input file. + **********************************************************************/ +void E00ReadRewind(E00ReadPtr psInfo) +{ + CPLErrorReset(); + + psInfo->szInBuf[0] = psInfo->szOutBuf[0] = '\0'; + psInfo->iInBufPtr = 0; + + psInfo->nInputLineNo = 0; + + if (psInfo->pfnReadRewind == NULL) + VSIRewind(psInfo->fp); + else + psInfo->pfnReadRewind(psInfo->pRefData); + + psInfo->bEOF = 0; +} + +/********************************************************************** + * E00ReadNextLine() + * + * Return the next line of input from the E00 file or NULL if we reached EOF. + * + * Returns a reference to an internal buffer whose contents will be valid + * only until the next call to this function. + **********************************************************************/ +const char *E00ReadNextLine(E00ReadPtr psInfo) +{ + const char *pszLine = NULL; + char *pszPtr; + + CPLErrorReset(); + + if (psInfo && !psInfo->bEOF) + { + if (!psInfo->bIsCompressed) + { + /* Uncompressed file... return line directly. + */ + _ReadNextSourceLine(psInfo); + pszLine = psInfo->szInBuf; + } + else if (psInfo->bIsCompressed && psInfo->nInputLineNo == 0) + { + /* Header line in a compressed file... return line + * after replacing "EXP 1" with "EXP 0". E00ReadOpen() + * has already verified that this line starts with "EXP " + */ + _ReadNextSourceLine(psInfo); + if ( (pszPtr = strstr(psInfo->szInBuf, " 1")) != NULL) + pszPtr[1] = '0'; + pszLine = psInfo->szInBuf; + } + else + { + if (psInfo->nInputLineNo == 1) + { + /* We just read the header line... reload the input buffer + */ + _ReadNextSourceLine(psInfo); + } + + /* Uncompress the next line of input and return it + */ + pszLine = _UncompressNextLine(psInfo); + } + + /* If we just reached EOF then make sure we don't add an extra + * empty line at the end of the uncompressed oputput. + */ + if (psInfo->bEOF && strlen(pszLine) == 0) + pszLine = NULL; + } + + return pszLine; +} + +/********************************************************************** + * _ReadNextSourceLine() + * + * Loads the next line from the source file in psInfo. + * + * psInfo->bEOF should be checked after this call. + **********************************************************************/ +static void _ReadNextSourceLine(E00ReadPtr psInfo) +{ + if (!psInfo->bEOF) + { + psInfo->iInBufPtr = 0; + psInfo->szInBuf[0] = '\0'; + + /* Read either using fgets() or psInfo->pfnReadNextLine() + * depending on the way the file was opened... + */ + if (psInfo->pfnReadNextLine == NULL) + { + if (VSIFGets(psInfo->szInBuf,E00_READ_BUF_SIZE,psInfo->fp) == NULL) + { + /* We reached EOF + */ + psInfo->bEOF = 1; + } + } + else + { + const char *pszLine; + pszLine = psInfo->pfnReadNextLine(psInfo->pRefData); + if (pszLine) + { + strncpy(psInfo->szInBuf, pszLine, E00_READ_BUF_SIZE); + } + else + { + /* We reached EOF + */ + psInfo->bEOF = 1; + } + } + + if (!psInfo->bEOF) + { + /* A new line was succesfully read. Remove trailing '\n' if any. + * (Note: For Unix systems, we also have to check for '\r') + */ + int nLen; + nLen = strlen(psInfo->szInBuf); + while(nLen > 0 && (psInfo->szInBuf[nLen-1] == '\n' || + psInfo->szInBuf[nLen-1] == '\r' ) ) + { + nLen--; + psInfo->szInBuf[nLen] = '\0'; + } + + psInfo->nInputLineNo++; + } + } +} + + +/********************************************************************** + * _GetNextSourceChar() + * + * Returns the next char from the source file input buffer... and + * reload the input buffer when necessary... this function makes the + * whole input file appear as one huge null-terminated string with + * no line delimiters. + * + * Will return '\0' when EOF is reached. + **********************************************************************/ +static char _GetNextSourceChar(E00ReadPtr psInfo) +{ + char c = '\0'; + + if (!psInfo->bEOF) + { + if (psInfo->szInBuf[psInfo->iInBufPtr] == '\0') + { + _ReadNextSourceLine(psInfo); + c = _GetNextSourceChar(psInfo); + } + else + { + c = psInfo->szInBuf[psInfo->iInBufPtr++]; + } + } + + return c; +} + +/********************************************************************** + * _UngetSourceChar() + * + * Reverse the effect of the previous call to _GetNextSourceChar() by + * moving the input buffer pointer back 1 character. + * + * This function can be called only once per call to _GetNextSourceChar() + * (i.e. you cannot unget more than one character) otherwise the pointer + * could move before the beginning of the input buffer. + **********************************************************************/ +static void _UngetSourceChar(E00ReadPtr psInfo) +{ + if (psInfo->iInBufPtr > 0) + psInfo->iInBufPtr--; + else + { + /* This error can happen only if _UngetSourceChar() is called + * twice in a row (which should never happen!). + */ + CPLError(CE_Failure, CPLE_AssertionFailed, + "UNEXPECTED INTERNAL ERROR: _UngetSourceChar() " + "failed while reading line %d.", psInfo->nInputLineNo); + } +} + +/********************************************************************** + * _UncompressNextLine() + * + * Uncompress one line of input and return a reference to an internal + * buffer containing the uncompressed output. + **********************************************************************/ +static const char *_UncompressNextLine(E00ReadPtr psInfo) +{ + char c; + int bEOL = 0; /* Set to 1 when End of Line reached */ + int iOutBufPtr = 0, i, n; + int iDecimalPoint, bOddNumDigits, iCurDigit; + char *pszExp; + int bPreviousCodeWasNumeric = 0; + + while(!bEOL && (c=_GetNextSourceChar(psInfo)) != '\0') + { + if (c != '~') + { + /* Normal character... just copy it + */ + psInfo->szOutBuf[iOutBufPtr++] = c; + bPreviousCodeWasNumeric = 0; + } + else /* c == '~' */ + { + /* ======================================================== + * Found an encoded sequence. + * =======================================================*/ + c = _GetNextSourceChar(psInfo); + + /* -------------------------------------------------------- + * Compression level 1: only spaces, '~' and '\n' are encoded + * -------------------------------------------------------*/ + if (c == ' ') + { + /* "~ " followed by number of spaces + */ + c = _GetNextSourceChar(psInfo); + n = c - ' '; + for(i=0; iszOutBuf[iOutBufPtr++] = ' '; + bPreviousCodeWasNumeric = 0; + } + else if (c == '}') + { + /* "~}" == '\n' + */ + bEOL = 1; + bPreviousCodeWasNumeric = 0; + } + else if (bPreviousCodeWasNumeric) + { + /* If the previous code was numeric, then the only valid code + * sequences are the ones above: "~ " and "~}". If we end up + * here, it is because the number was followed by a '~' but + * this '~' was not a code, it only marked the end of a + * number that was not followed by any space. + * + * We should simply ignore the '~' and return the character + * that follows it directly. + */ + psInfo->szOutBuf[iOutBufPtr++] = c; + bPreviousCodeWasNumeric = 0; + } + else if (c == '~' || c == '-') + { + /* "~~" and "~-" are simple escape sequences for '~' and '-' + */ + psInfo->szOutBuf[iOutBufPtr++] = c; + } + /* -------------------------------------------------------- + * Compression level 2: numeric values are encoded. + * + * All codes for this level are in the form "~ c0 c1 c2 ... cn" + * where: + * + * ~ marks the beginning of a new code sequence + * + * c0 is a single character code defining the format + * of the number (decimal position, exponent, + * and even or odd number of digits) + * + * c1 c2 ... cn each of these characters represent a pair of + * digits of the encoded value with '!' == 00 + * values 92..99 are encoded on 2 chars that + * must be added to each other + * (i.e. 92 == }!, 93 == }", ...) + * + * The sequence ends with a ' ' or a '~' character + * -------------------------------------------------------*/ + else if (c >= '!' && c <= 'z') + { + /* The format code defines 3 characteristics of the final number: + * - Presence of a decimal point and its position + * - Presence of an exponent, and its sign + * - Odd or even number of digits + */ + n = c - '!'; + iDecimalPoint = n % 15; /* 0 = no decimal point */ + bOddNumDigits = n / 45; /* 0 = even num.digits, 1 = odd */ + n = n / 15; + if ( n % 3 == 1 ) + pszExp = "E+"; + else if (n % 3 == 2 ) + pszExp = "E-"; + else + pszExp = NULL; + + /* Decode the c1 c2 ... cn value and apply the format. + * Read characters until we encounter a ' ' or a '~' + */ + iCurDigit = 0; + while((c=_GetNextSourceChar(psInfo)) != '\0' && + c != ' ' && c != '~') + { + n = c - '!'; + if (n == 92 && (c=_GetNextSourceChar(psInfo)) != '\0') + n += c - '!'; + + psInfo->szOutBuf[iOutBufPtr++] = '0' + n/10; + + if (++iCurDigit == iDecimalPoint) + psInfo->szOutBuf[iOutBufPtr++] = '.'; + + psInfo->szOutBuf[iOutBufPtr++] = '0' + n%10; + + if (++iCurDigit == iDecimalPoint) + psInfo->szOutBuf[iOutBufPtr++] = '.'; + } + + if (c == '~' || c == ' ') + { + bPreviousCodeWasNumeric = 1; + _UngetSourceChar(psInfo); + } + + /* If odd number of digits, then flush the last one + */ + if (bOddNumDigits) + iOutBufPtr--; + + /* Insert the exponent string before the 2 last digits + * (we assume the exponent string is 2 chars. long) + */ + if (pszExp) + { + for(i=0; i<2;i++) + { + psInfo->szOutBuf[iOutBufPtr] = + psInfo->szOutBuf[iOutBufPtr-2]; + psInfo->szOutBuf[iOutBufPtr-2] = pszExp[i]; + iOutBufPtr++; + } + } + } + else + { + /* Unsupported code sequence... this is a possibility + * given the fact that this library was written by + * reverse-engineering the format! + * + * Send an error to the user and abort. + * + * If this error ever happens, and you are convinced that + * the input file is not corrupted, then please report it to + * me at danmo@videotron.ca, quoting the section of the input + * file that produced it, and I'll do my best to add support + * for this code sequence. + */ + CPLError(CE_Failure, CPLE_NotSupported, + "Unexpected code \"~%c\" encountered in line %d.", + c, psInfo->nInputLineNo); + + /* Force the program to abort by simulating a EOF + */ + psInfo->bEOF = 1; + bEOL = 1; + } + + }/* if c == '~' */ + + /* E00 lines should NEVER be longer than 80 chars. if we passed + * that limit, then the input file is likely corrupt. + */ + if (iOutBufPtr > 80) + { + CPLError(CE_Failure, CPLE_FileIO, + "Uncompressed line longer than 80 chars. " + "Input file possibly corrupt around line %d.", + psInfo->nInputLineNo); + /* Force the program to abort by simulating a EOF + */ + psInfo->bEOF = 1; + bEOL = 1; + } + + }/* while !EOL */ + + psInfo->szOutBuf[iOutBufPtr++] = '\0'; + + return psInfo->szOutBuf; +} + + diff -Nru saga-2.1.0+dfsg/src/modules/io/io_esri_e00/e00compr/e00write.c saga-2.1.4+dfsg/src/modules/io/io_esri_e00/e00compr/e00write.c --- saga-2.1.0+dfsg/src/modules/io/io_esri_e00/e00compr/e00write.c 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_esri_e00/e00compr/e00write.c 2014-11-13 08:32:20.000000000 +0000 @@ -0,0 +1,617 @@ +/********************************************************** + * Version $Id: e00write.c 911 2011-02-14 16:38:15Z reklov_w $ + *********************************************************/ +/********************************************************************** + * $Id: e00write.c 911 2011-02-14 16:38:15Z reklov_w $ + * + * Name: e00write.c + * Project: Compressed E00 Read/Write library + * Language: ANSI C + * Purpose: Functions to write Compressed E00 files from a stream of + * uncompressed lines. + * Author: Daniel Morissette, danmo@videotron.ca + * + * $Log: not supported by cvs2svn $ + * Revision 1.1.1.1 2005/08/31 14:01:00 oconrad + * no message + * + * Revision 1.1.1.1 2005/08/17 08:25:16 oconrad + * no message + * + * Revision 1.1.1.1 2005/08/15 13:35:12 oconrad + * no message + * + * Revision 1.1 2004/04/16 13:36:45 oconrad + * no message + * + * Revision 1.5 1999/02/25 18:46:41 daniel + * Now use CPL for Error handling, Memory allocation, and File access. + * + * Revision 1.4 1999/01/08 17:40:01 daniel + * Added E00WriteCallbackOpen() + * + * Revision 1.3 1998/11/13 16:54:23 daniel + * Check for '\r' and '\n' at end of input line while compressing, just + * in case... + * + * Revision 1.2 1998/11/13 15:48:42 daniel + * Simplified the generation of the compression codes for numbers + * (use a logical rule instead of going case by case) + * + * Revision 1.1 1998/11/13 14:19:51 daniel + * Initial revision + * + ********************************************************************** + * Copyright (c) 1998, 1999, Daniel Morissette + * + * All rights reserved. This software may be copied or reproduced, in + * all or in part, without the prior written consent of its author, + * Daniel Morissette (danmo@videotron.ca). However, any material copied + * or reproduced must bear the original copyright notice (above), this + * original paragraph, and the original disclaimer (below). + * + * The entire risk as to the results and performance of the software, + * supporting text and other information contained in this file + * (collectively called the "Software") is with the user. Although + * considerable efforts have been used in preparing the Software, the + * author does not warrant the accuracy or completeness of the Software. + * In no event will the author be liable for damages, including loss of + * profits or consequential damages, arising out of the use of the + * Software. + * + **********************************************************************/ + +#include +#include +#include +#include +#include + +#include "e00compr.h" + +static int _CompressLine(E00WritePtr psInfo, const char *pszLine); +static int _WriteNextCompressedLine(E00WritePtr psInfo, int nMaxChars); +static int _PrintfNextLine(E00WritePtr psInfo, const char *pszFmt, ...); + +/********************************************************************** + * E00WriteOpen() + * + * Try to open output file, and alloc/initialize a new E00WritePtr + * handle. + * + * nComprLevel must be one of: + * E00_COMPR_NONE, E00_COMPR_PARTIAL or E00_COMPR_FULL + * + * Returns the new handle, or NULL if the file could not be opened. + * E00WriteClose() will eventually have to be called to release + * the resources used by the new handle. + **********************************************************************/ +E00WritePtr E00WriteOpen(const char *pszFname, int nComprLevel) +{ + E00WritePtr psInfo = NULL; + FILE *fp; + + CPLErrorReset(); + + /* Open the file + */ + fp = VSIFOpen(pszFname, "wt"); + if (fp == NULL) + { + CPLError(CE_Failure, CPLE_OpenFailed, + "Failed to open %s: %s", pszFname, strerror(errno)); + return NULL; + } + + /* Allocate and initialize a E00ReadPtr handle. + */ + psInfo = (E00WritePtr)CPLCalloc(1, sizeof(struct _E00WriteInfo)); + + psInfo->fp = fp; + psInfo->nComprLevel = nComprLevel; + + return psInfo; +} + +/********************************************************************** + * E00WriteCallbackOpen() + * + * This is an alternative to E00WriteOpen() for cases where you want to + * do all the file management yourself. You open/close the file yourself + * and provide a callback functions to write one line at a time to the + * file. pRefData is your handle on the physical file and can + * be whatever you want... it is not used by the library, it will be + * passed directly to your callback function when it is called. + * + * The callback function must have the following C prototype: + * + * int myWriteNextLine(void *pRefData, const char *pszLine); + * + * Like printf() does, myWriteNextLine() should return a positive + * value on success (the number of chars written) + * or -1 if an error happened. + * The value passed by the library in pszLine will not be terminated + * by a '\n' character... it is assumed that the myWriteNextLine() + * implementation will take care of terminating the line with a + * '\n' if necessary. + * + * nComprLevel must be one of: + * E00_COMPR_NONE, E00_COMPR_PARTIAL or E00_COMPR_FULL + * + * E00WriteCallbackOpen() returns a new E00ReadWritePtr handle. + * E00WriteClose() will eventually have to be called to release + * the resources used by the new handle. + **********************************************************************/ +E00WritePtr E00WriteCallbackOpen(void *pRefData, + int (*pfnWriteNextLine)(void *, const char *), + int nComprLevel) +{ + E00WritePtr psInfo = NULL; + + CPLErrorReset(); + + /* Make sure we received a valid function pointer + */ + if (pfnWriteNextLine == NULL) + { + CPLError(CE_Failure, CPLE_IllegalArg, + "Invalid function pointer!"); + return NULL; + } + + /* Allocate and initialize a E00ReadPtr handle. + */ + psInfo = (E00WritePtr)CPLCalloc(1, sizeof(struct _E00WriteInfo)); + + psInfo->pRefData = pRefData; + psInfo->pfnWriteNextLine = pfnWriteNextLine; + psInfo->nComprLevel = nComprLevel; + + return psInfo; +} + + +/********************************************************************** + * E00WriteClose() + * + * Close output file and release any memory used by the E00WritePtr. + **********************************************************************/ +void E00WriteClose(E00WritePtr psInfo) +{ + CPLErrorReset(); + + if (psInfo) + { + /* Flush output buffer before closing file. + */ + if (psInfo->iOutBufPtr > 0) + _WriteNextCompressedLine(psInfo, 1); + + if (psInfo->fp) + fclose(psInfo->fp); + + CPLFree(psInfo); + } +} + + +/********************************************************************** + * E00WriteNextLine() + * + * Take a line of what should be headed to a uncompressed E00 file, + * convert it to the requested compression level, and write the + * compressed result to the output file. + * + * Returns 0 if the line was processed succesfully, or an error number + * (> 0) if an error happened. + **********************************************************************/ +int E00WriteNextLine(E00WritePtr psInfo, const char *pszLine) +{ + char *pszPtr; + int nStatus = 0; + + CPLErrorReset(); + + if (psInfo && (psInfo->fp || psInfo->pfnWriteNextLine)) + { + psInfo->nSrcLineNo++; + + if (psInfo->nComprLevel == E00_COMPR_NONE) + { + /* Uncompressed file... write line directly. + */ + nStatus = _PrintfNextLine(psInfo, "%s", pszLine); + } + else if (psInfo->nSrcLineNo == 1) + { + /* Header line in a compressed file... write line + * after replacing "EXP 0" with "EXP 1". + */ + if ((pszPtr = strstr(pszLine, " 0")) != NULL) + { + nStatus = _PrintfNextLine(psInfo, "EXP 1%s", pszPtr+2); + } + else + { + /* Write line directly... assume that it contains a valid + * EXP prefix! + */ + nStatus = _PrintfNextLine(psInfo, "%s", pszLine); + } + } + else + { + /* FULL or PARTIAL compression... compress the current line, + * (output goes in psInfo->szOutBuf) + */ + nStatus = _CompressLine(psInfo, pszLine); + + while (nStatus == 0 && psInfo->iOutBufPtr >= 80) + { + /* Time to write the first 80 chars from the output buffer + */ + nStatus = _WriteNextCompressedLine(psInfo, 0); + } + } + + } + else + { + /* This should never happen unless the lib is not properly used + * or if an error happened in previous calls and was ignored by + * the caller + */ + CPLError(CE_Failure, CPLE_IllegalArg, + "Invalid E00WritePtr handle!"); + nStatus = 203; + } + + return nStatus; +} + + +/********************************************************************** + * _CompressLine() + * + * Compress one line of input, and store the compressed copy at the + * end of psInfo->pszOutBuf. + * + * Returns 0 if the line was compressed succesfully, or an error number + * (> 0) if an error happened. + **********************************************************************/ +static int _CompressLine(E00WritePtr psInfo, const char *pszLine) +{ + int nStatus = 0; + int nDigits, nExpSign, nDotPosition, iCurPos; + int numTotalDigits, numExpDigits; + char n, *pszCodePos; + + int nStartOutBufPtr; + const char *pszStartSrcPtr; + + while(*pszLine != '\0' && *pszLine != '\n' && *pszLine != '\r') + { + /*------------------------------------------------------------- + * By default, apply PARTIAL compression + * Note that PARTIAL is a subset of FULL compression. + *------------------------------------------------------------*/ + if (*pszLine == '~') + { + /* The '~' char is encoded as "~~" + */ + strcpy( psInfo->szOutBuf+psInfo->iOutBufPtr, "~~"); + psInfo->iOutBufPtr += 2; + } + else if (strncmp(pszLine, " ", 3) == 0) + { + /* A stream of at least 3 spaces. + * Count number of spaces and replace with a "~ n" code + */ + n=1; + while(*(pszLine+1) == ' ') + { + n++; + pszLine++; + } + strcpy( psInfo->szOutBuf+psInfo->iOutBufPtr, "~ "); + psInfo->iOutBufPtr += 2; + psInfo->szOutBuf[psInfo->iOutBufPtr++] = ' ' + n; + } + + /*------------------------------------------------------------- + * The cases below are specific to FULL compression. + *------------------------------------------------------------*/ + else if (psInfo->nComprLevel == E00_COMPR_FULL && + isdigit(*pszLine)) + { + /* Keep track of current input/output buffer positions in case + * we would have to revert the encoding. This could happen if + * the numeric value is less than 4 characters. + */ + nStartOutBufPtr = psInfo->iOutBufPtr; + pszStartSrcPtr = pszLine; + + /* Reset flags used for parsing numeric format + */ + nDigits = 0; + nDotPosition = 0; /* 0 means no decimal point */ + nExpSign = 0; /* 0 means no exponent */ + numExpDigits = 0; + numTotalDigits = 0; + n = 0; + + /* Prepare the code sequence in the output buffer. + * The code value will be set only after the number + * is finished parsing. + */ + psInfo->szOutBuf[psInfo->iOutBufPtr++] = '~'; + pszCodePos = psInfo->szOutBuf+psInfo->iOutBufPtr++; + + /* Scan the numeric sequence, encoding the digits as we read, + * and keeping track of decimal point position and exponent. + */ + for(iCurPos=0; + *pszLine != '\0' && numExpDigits<2; + pszLine++, iCurPos++) + { + if (isdigit(*pszLine)) + { + /* Accumulate pairs of digits + */ + numTotalDigits++; + if (numTotalDigits % 2 == 1) + { + n = (*pszLine - '0')*10; + } + else + { + n += (*pszLine - '0'); + if (n >= 92) + { + /* Pairs of digits > 92 are encoded on 2 chars + */ + psInfo->szOutBuf[psInfo->iOutBufPtr++] = 92 + '!'; + n -= 92; + } + psInfo->szOutBuf[psInfo->iOutBufPtr++] = n + '!'; + } + + /* Count number of exponent digits to end the loop + * once we've read 2 exponent digits + */ + if (nExpSign != 0) + numExpDigits++; + } + else if (*pszLine == '.' && nDotPosition == 0 && iCurPos < 15) + { + /* Decimal point position... make sure that we have only + * one decimal point, and that it is not beyond the 14th + * position. If these conditions are not met then end the + * numeric sequence here. + */ + nDotPosition = iCurPos; + } + else if (*pszLine == 'E' && + (*(pszLine+1) == '-' || *(pszLine+1)=='+') && + isdigit(*(pszLine+2)) && isdigit(*(pszLine+3)) && + !isdigit(*(pszLine+4)) ) + { + /* Exponent ... fetch sign, and read only 2 more digits + * A "E+" or "E-" MUST be followed by 2 and only 2 digits. + * If it's not the case, then the numeric sequence ends + * here. + */ + pszLine++; + nExpSign = (*pszLine=='-') ? -1: 1; + } + else + { + /* Numeric sequence finished ... stop parsing. + */ + break; + } + }/*for ... parsing numeric value*/ + + /* If the numeric value contains an even number of digits, + * then pad the last pair of digits with a zero and encode it. + */ + if (numTotalDigits % 2 == 1) + { + psInfo->szOutBuf[psInfo->iOutBufPtr++] = n + '!'; + } + + /* If the character that ends the number is NOT a '~', a ' ' + * or a 'end of line' then add a '~' to mark the end of the + * number. This extra '~' will be ignored by the uncompress + * algorithm. + */ + if (*(pszLine) != '~' && *(pszLine) != ' ' && + *(pszLine) != '\0') + { + psInfo->szOutBuf[psInfo->iOutBufPtr++] = '~'; + } + + /* At the end of the loop, the read pointer is located on the char + * that follows the numeric value. Move it back 1 char so that + * processing can continue later with the outer loop. + */ + pszLine--; + + /* Check that the parsed value contains enough characters to + * justify encoding it. The encoded value should not be + * bigger than the original. If the encoded value is the same + * size as the original then it is still encoded (a bit silly!). + * All numbers < 4 chars are not encoded, and some, such as + * "1092" won't either because it would require 5 chars to + * encode them. + * + * If the value should not be encoded, then overwrite the sutff + * we started encoding with a direct copy of the numeric value. + * + * (At this point, iCurPos is equal to the number of chars in the + * source value.) + */ + if ( iCurPos < psInfo->iOutBufPtr - nStartOutBufPtr ) + { + strncpy(psInfo->szOutBuf+ nStartOutBufPtr, + pszStartSrcPtr, iCurPos); + + psInfo->iOutBufPtr = nStartOutBufPtr + iCurPos; + } + else + { + /* Now that we have parsed the numeric value, set the code + * based on the characteristics we found. + */ + *pszCodePos = '!' + ((numTotalDigits % 2 == 1)? 45:0) + + (nExpSign?((nExpSign>0)?15:30):0) + + nDotPosition; + } + } + else + { + /* This char cannot be compressed ... output directly. + */ + psInfo->szOutBuf[psInfo->iOutBufPtr++] = *pszLine; + } + + /* Check for buffer overflow... just in case!!! + */ + if (psInfo->iOutBufPtr >= E00_WRITE_BUF_SIZE) + { + /* The buffer size has been set big enough to prevent this error + * from ever happening. So if it ever happens, then it's likely + * that the input lines were longer than 80 chars, which is the + * maximum length of a uncompressed line in a E00 file. + */ + CPLError(CE_Failure, CPLE_FileIO, + "Output buffer overflow!!!."); + nStatus = 205; + break; + } + + /* Get ready to proceed with next char from input string + */ + pszLine++; + } + + /* Terminate this line with a newline code + * This code applies to both PARTIAL and FULL compresion. + */ + strcpy( psInfo->szOutBuf+psInfo->iOutBufPtr, "~}"); + psInfo->iOutBufPtr += 2; + + return nStatus; +} + +/********************************************************************** + * _WriteNextCompressedLine() + * + * If bFlushWholeBuffer == 0, write the first 80 characters from + * psInfo->szOutBuf, and remove the written chars from szOutBuf. + * A '\n' (not counted in nMaxChars) will be written to terminate the + * output line. + * + * Pass bFlushBuffer == 1 to force writing the whole contents of szOutBuf + * at once. + * + * Returns 0 if the line was written succesfully, or an error number + * (> 0) if an error happened. + **********************************************************************/ +static int _WriteNextCompressedLine(E00WritePtr psInfo, int bFlushWholeBuffer) +{ + int nStatus = 0, nToWrite; + char *pszSrc, *pszDst; + + psInfo->szOutBuf[psInfo->iOutBufPtr] = '\0'; + + if (!bFlushWholeBuffer && psInfo->iOutBufPtr > 80) + { + /* Write the first 80 chars + * Note that a compressed line cannot end with spaces... spaces should + * be reported on the next line. + */ + nToWrite = 80; + while(nToWrite > 1 && psInfo->szOutBuf[nToWrite-1] == ' ') + nToWrite--; + + nStatus = _PrintfNextLine(psInfo, "%-.*s", nToWrite, psInfo->szOutBuf); + + /* Remove these chars from the output buffer + */ + pszDst = psInfo->szOutBuf; + pszSrc = psInfo->szOutBuf+nToWrite; + while(*pszSrc != '\0') + { + *pszDst = *pszSrc; + pszDst++; + pszSrc++; + } + psInfo->iOutBufPtr -= nToWrite; + } + else + { + /* Just write the buffer contents directly + */ + nStatus = _PrintfNextLine(psInfo, "%s", psInfo->szOutBuf); + + psInfo->iOutBufPtr = 0; + } + + return nStatus; +} + + +/********************************************************************** + * _PrintfNextLine() + * + * Cover function for fprintf() that will do error checking and + * reporting, and either call fprintf() directly or call the callback + * provided by the caller if E00WriteCallbackOpen() was used. + * + * A \n will be automatically appended to the string when it is + * written, so no \n should be included at the end of pszFmt. + * + * Returns 0 on success, or error 204 if it failed. + **********************************************************************/ +static int _PrintfNextLine(E00WritePtr psInfo, const char *pszFmt, ...) +{ + va_list args; + static char szBuf[E00_WRITE_BUF_SIZE]; + int nStatus = 0; + + /* Expand the string to print + */ + va_start(args, pszFmt); + vsprintf(szBuf, pszFmt, args); + va_end(args); + + /* Write the line using the right method + */ + if (psInfo->pfnWriteNextLine == NULL) + { + /* Use fprintf() directly + */ + if ( VSIFPrintf(psInfo->fp, "%s\n", szBuf) < 0) + { + CPLError(CE_Failure, CPLE_FileIO, + "Error writing to file: %s", + strerror(errno)); + nStatus = 204; + } + } + else + { + /* Use pfnWritenextLine() callback + */ + if ( psInfo->pfnWriteNextLine(psInfo->pRefData, szBuf) < 0) + { + CPLError(CE_Failure, CPLE_FileIO, + "Error writing to file."); + nStatus = 204; + } + } + + return nStatus; +} + diff -Nru saga-2.1.0+dfsg/src/modules/io/io_esri_e00/ESRI_E00_Import.cpp saga-2.1.4+dfsg/src/modules/io/io_esri_e00/ESRI_E00_Import.cpp --- saga-2.1.0+dfsg/src/modules/io/io_esri_e00/ESRI_E00_Import.cpp 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_esri_e00/ESRI_E00_Import.cpp 2014-11-13 08:32:20.000000000 +0000 @@ -0,0 +1,1655 @@ +/********************************************************** + * Version $Id: ESRI_E00_Import.cpp 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// Grid_IO // +// // +//-------------------------------------------------------// +// // +// ESRI_E00.cpp // +// // +// Copyright (C) 2003 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Goettingen // +// Goldschmidtstr. 5 // +// 37077 Goettingen // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "ESRI_E00_Import.h" + + +/////////////////////////////////////////////////////////// +// // +// Import // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +CESRI_E00_Import::CESRI_E00_Import(void) +{ + //----------------------------------------------------- + // 1. info_Table... + + Set_Name (_TL("Import ESRI E00 File")); + + Set_Author (SG_T("(c) 2004 by O.Conrad")); + + Set_Description (_TW( + "Import data sets from ESRI's E00 interchange format.\n\n" + + "This import filter is based on the E00 format analysis of the GRASS GIS module " + "\'m.in.e00\' written by Michel J. Wurtz. Go to the " + "GRASS GIS Hompage " + "for more information.\n" + + "The \'E00Compr\' library " + "written by Daniel Morissette has been used for e00 file access, so that " + "compressed e00 files also can be read.\n") + ); + + + //----------------------------------------------------- + // 2. Parameters... + + Parameters.Add_Table_List( + NULL , "TABLES" , _TL("Tables"), + _TL(""), + PARAMETER_OUTPUT_OPTIONAL + ); + + Parameters.Add_Shapes_List( + NULL , "SHAPES" , _TL("Shapes"), + _TL(""), + PARAMETER_OUTPUT_OPTIONAL + ); + + Parameters.Add_Grid_List( + NULL , "GRIDS" , _TL("Grids"), + _TL(""), + PARAMETER_OUTPUT_OPTIONAL + ); + + Parameters.Add_Table_Output( + NULL , "TABLE" , _TL("Table"), + _TL("") + ); + + Parameters.Add_FilePath( + NULL , "FILE" , _TL("File"), + _TL(""), + _TL("ESRI E00 Files|*.e00|All Files|*.*"), NULL, false, false, true + ); + + Parameters.Add_Value( + NULL , "BBND" , _TL("Import Extents"), + _TL(""), + PARAMETER_TYPE_Bool, false + ); + + Parameters.Add_Value( + NULL , "BTIC" , _TL("Import Tick Points"), + _TL(""), + PARAMETER_TYPE_Bool, false + ); + + Parameters.Add_Value( + NULL , "BTABLES" , _TL("Import Tables"), + _TL(""), + PARAMETER_TYPE_Bool, false + ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CESRI_E00_Import::On_Execute(void) +{ + int nLoaded = 0; + + m_bBnd = Parameters("BBND") ->asBool(); + m_bTic = Parameters("BTIC") ->asBool(); + m_bTables = Parameters("BTABLES") ->asBool(); + + m_pTables = Parameters("TABLES") ->asTableList(); + m_pShapes = Parameters("SHAPES") ->asShapesList(); + m_pGrids = Parameters("GRIDS") ->asGridList(); + + m_pTables ->Del_Items(); + m_pShapes ->Del_Items(); + m_pGrids ->Del_Items(); + + CSG_Strings fNames; + + if( Parameters("FILE")->asFilePath()->Get_FilePaths(fNames) && fNames.Get_Count() > 0 ) + { + for(int i=0; i 0 ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +const char * CESRI_E00_Import::E00_Read_Line(void) +{ + const char *line = E00ReadNextLine(m_hReadPtr); + + if( line == NULL ) + { + FILE *fp = fopen(SG_File_Make_Path(NULL, m_e00_Name, CSG_String::Format(SG_T("e%02d"), m_iFile + 1)), "rb"); + + if( fp ) + { + m_iFile++; + + int nInputLineNo = m_hReadPtr->nInputLineNo; + + E00ReadRewind(m_hReadPtr); + + fclose(m_hReadPtr->fp); + + m_hReadPtr->fp = fp; + m_hReadPtr->nInputLineNo = nInputLineNo - 1; + + line = E00ReadNextLine(m_hReadPtr); + } + } + + return( line ); +} + +//--------------------------------------------------------- +bool CESRI_E00_Import::E00_Goto_Line(int iLine) +{ + if( m_hReadPtr ) + { + if( m_iFile == 0 ) + { + E00ReadRewind(m_hReadPtr); + } + else + { + E00ReadClose(m_hReadPtr); + m_hReadPtr = E00ReadOpen(m_e00_Name); + m_iFile = 0; + } + + while( E00_Read_Line() && m_hReadPtr->nInputLineNo < iLine ); + + return( m_hReadPtr->nInputLineNo == iLine ); + } + + return( false ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CESRI_E00_Import::Load(const CSG_String &FileName) +{ + bool bResult = false; + + const char *Line; + + m_hReadPtr = NULL; + m_e00_Name = FileName; + m_iFile = 0; + + //----------------------------------------------------- + if( (m_hReadPtr = E00ReadOpen(m_e00_Name)) == NULL ) + { + Error_Set(CSG_String::Format(SG_T("%s: %s"), _TL("file not found") , FileName.c_str())); + } + else if( (Line = E00_Read_Line()) == NULL ) + { + Error_Set(CSG_String::Format(SG_T("%s: %s"), _TL("invalid E00 file"), FileName.c_str())); + } + else if( strncmp(Line, "EXP", 3) ) + { + Error_Set(CSG_String::Format(SG_T("%s: %d"), _TL("invalid E00 file"), FileName.c_str())); + } + + //----------------------------------------------------- + else + { + bResult = Load(); + } + + //----------------------------------------------------- + if( m_hReadPtr ) + { + E00ReadClose(m_hReadPtr); + } + + return( bResult ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CESRI_E00_Import::Load(void) +{ + const char *line; + + int prec_grd, prec_arc, prec_lab, prec_pal; + + long current_line, + offset_grd = 0, + offset_arc = 0, + offset_lab = 0, + offset_pal = 0; + + double scale = 1.0; + + TSG_Shape_Type shape_type; + + CSG_Grid *pGrid; + + CSG_Shapes *pShapes; + + //----------------------------------------------------- + m_pPAT = NULL; + m_pAAT = NULL; + + //----------------------------------------------------- + while( (line = E00_Read_Line()) != NULL && strncmp(line, "EOS", 3) ) + { + current_line = m_hReadPtr->nInputLineNo; + + // GRID SECTION + if( !strncmp(line, "GRD ", 5) ) + { + offset_grd = current_line; + prec_grd = line[5] - '2'; + skip("EOG"); + continue; + } + + // ARC SECTION + if( !strncmp(line, "ARC ", 5) ) + { + offset_arc = current_line; + prec_arc = line[5] - '2'; + skip_arc(prec_arc); + continue; + } + + // POLYGON TOPOLOGY + if( !strncmp(line, "PAL ", 5) + || !strncmp(line, "PFF ", 5) ) + { + offset_pal = current_line; + prec_pal = line[5] - '2'; + skip_pal(prec_pal); + continue; + } + + // CENTROID SECTION + if( !strncmp(line, "CNT ", 5) ) + { + skip_dat(); + continue; + } + + // LABEL SECTION + if( !strncmp(line, "LAB ", 5)) + { + offset_lab = current_line; + prec_lab = line[5] - '2'; + skip_lab(prec_lab); + continue; + } + + // INFO SECTION + if( !strncmp(line, "IFO ", 5) ) + { + info_Get_Tables(); + continue; + } + + // PROJECTION INFOS + if( !strncmp(line, "PRJ ", 5) ) + { + scale = getproj(); + continue; + } + + // Annotations (text). To be imported ? Does anybody have an idea ? + if( !strncmp(line, "TXT ", 5) ) + { + skip_txt(line[5] - '2'); + continue; + } + + // Mask description ? Noting to do with it + if( !strncmp(line, "MSK ", 5) ) + { + skip_msk(); + continue; + } + + // TOLERANCE SECTION. Should we really use it ? + if( !strncmp(line, "TOL ", 5) ) + { + skip_dat(); + continue; + } + + // UNKNOW KEYWORD SECTION. Don't know what to do with. Does anybody have an idea? + if( !strncmp(line, "LNK ", 5) ) + { + skip("END OF LINK DATA"); + continue; + } + + // SPATIAL INDEX SECTION. Noting to do with it + if( !strncmp(line, "SIN ", 5) ) + { + skip("EOX"); + continue; + } + + // Line pattern and palette. Shade pattern and palette end same as e00 archive ! + if( !strncmp(line, "CLN ", 5) + || !strncmp(line, "CSH ", 5) ) + { + skip("EOS"); + continue; + } + + // Font description ? Noting to do with it + if( !strncmp(line, "FNT ", 5) ) + { + skip("EOF"); + continue; + } + + // PLOT SECTION. Why should we import it ? + if( !strncmp(line, "PLT ", 5) ) + { + skip("EOP"); + continue; + } + + // LOG SECTION. Nothing to do with it + if( !strncmp(line, "LOG ", 5) ) + { + skip("EOL"); + continue; + } + + if( !strncmp(line, "RPL ", 5) // Specific to regions. Contains PAL formated data for each subclass + || !strncmp(line, "RXP ", 5) // Specific to regions. Seems to link regions IDs to PAL polygons IDs + || !strncmp(line, "TX6 ", 5) // Other kind of annotations not same termination. Other differences ? + || !strncmp(line, "TX7 ", 5) ) // Very close from TX6. So same questions and same rules... + { + skip("JABBERWOCKY"); + continue; + } + } + + //----------------------------------------------------- + switch( m_pPAT ? (m_pAAT ? 3 : 2) : (m_pAAT ? 1 : 0) ) + { + case 0: default: + shape_type = offset_arc != 0 ? SHAPE_TYPE_Line : SHAPE_TYPE_Point; + break; + + case 1: // m_pAAT + shape_type = SHAPE_TYPE_Line; + break; + + case 2: // m_pPAT + shape_type = offset_arc != 0 ? SHAPE_TYPE_Polygon : SHAPE_TYPE_Point; + break; + + case 3: // m_pAAT && m_pPAT + shape_type = offset_pal != 0 || offset_lab != 0 ? SHAPE_TYPE_Polygon : SHAPE_TYPE_Line; + break; + } + + //----------------------------------------------------- + // Extracting useful information as noted before... + + //----------------------------------------------------- + if( offset_grd > 0 ) + { + E00_Goto_Line(offset_grd); + + if( (pGrid = getraster (prec_grd, scale)) != NULL ) + { + pGrid->Set_Name(SG_File_Get_Name(m_e00_Name, false)); + + m_pGrids->Add_Item(pGrid); + } + } + + //----------------------------------------------------- + if( offset_arc != 0 ) + { + E00_Goto_Line(offset_arc); + + if( (pShapes = getarcs (prec_arc, scale, shape_type)) != NULL ) + { + pShapes->Set_Name(SG_File_Get_Name(m_e00_Name, false)); + + m_pShapes->Add_Item(pShapes); + } + } + + //----------------------------------------------------- + if( offset_lab != 0 && shape_type == SHAPE_TYPE_Point ) + { + E00_Goto_Line(offset_lab); + + if( (pShapes = getsites (prec_lab, scale)) != NULL ) + { + pShapes->Set_Name(SG_File_Get_Name(m_e00_Name, false)); + + m_pShapes->Add_Item(pShapes); + } + } + + //----------------------------------------------------- + if( offset_lab != 0 && shape_type != SHAPE_TYPE_Point ) + { + E00_Goto_Line(offset_lab); + + if( (pShapes = getlabels(prec_lab, scale)) != NULL ) + { + pShapes->Set_Name(SG_File_Get_Name(m_e00_Name, false)); + + m_pShapes->Add_Item(pShapes); + } + } + + //----------------------------------------------------- + if( !m_bTables ) + { + if( m_pPAT ) delete(m_pPAT); + if( m_pAAT ) delete(m_pAAT); + } + + return( true ); +} + + +/////////////////////////////////////////////////////////// +// // +// Grid // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +CSG_Grid * CESRI_E00_Import::getraster(int prec, double scale) +{ + const char *line; + + int x, y, ix; + long rows, cols, depth, p[5]; + float f[5]; + double xres, yres, xmin, ymin, xmax, ymax, nul_val, d[3]; + CSG_Grid *pGrid; + + //----------------------------------------------------- + if( (line = E00_Read_Line()) == NULL ) + return( NULL ); +// sscanf(line, "%ld%ld%ld", &cols, &rows, &depth, &nul_val); + sscanf(line, "%ld%ld%ld%lf", &cols, &rows, &depth, &nul_val); + + if( (line = E00_Read_Line()) == NULL ) + return( NULL ); + sscanf(line, "%lf%lf", &xres, &yres); + + if( (line = E00_Read_Line()) == NULL ) + return( NULL ); + sscanf(line, "%lf%lf", &xmin, &ymin); + + if( (line = E00_Read_Line()) == NULL ) + return( NULL ); + sscanf(line, "%lf%lf", &xmax, &ymax); + + xmax = xmax * scale; + xmin = xmin * scale; + ymax = ymax * scale; + ymin = ymin * scale; + xres = xres * scale; + yres = yres * scale; + + xmin += xres / 2.0; // SAGA treats xmin/ymin as "pixel-as-point" and not as "pixel-as-area" + ymin += yres / 2.0; + + if( depth == 2 && prec ) + { + depth = 3; + } + + //----------------------------------------------------- + switch( depth ) + { + default: + pGrid = NULL; + break; + + //----------------------------------------------------- + case 1: + pGrid = SG_Create_Grid(SG_DATATYPE_Int, cols, rows, xres, xmin, ymin); + pGrid->Set_NoData_Value(nul_val); + + for(y=0; ySet_Value(x + ix, y, p[ix]); + } + } + } + } + break; + + //----------------------------------------------------- + case 2: + pGrid = SG_Create_Grid(SG_DATATYPE_Float, cols, rows, xres, xmin, ymin); + pGrid->Set_NoData_Value(nul_val); + + for(y=0; ySet_Value(x + ix, y, f[ix]); + } + } + } + } + break; + + //----------------------------------------------------- + case 3: + pGrid = SG_Create_Grid(SG_DATATYPE_Double, cols, rows, xres, xmin, ymin); + pGrid->Set_NoData_Value(nul_val); + + for(y=0; ySet_Value(x + ix, y, d[ix]); + } + } + } + } + break; + } + + //----------------------------------------------------- + skip("EOG"); + + return( pGrid ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#define ARC_FNODE 2 +#define ARC_TNODE 3 +#define ARC_LPOL 4 +#define ARC_RPOL 5 + +//--------------------------------------------------------- +CSG_Shapes * CESRI_E00_Import::getarcs(int prec, double scale, TSG_Shape_Type &shape_type) +{ + const char *line; + + int covnum, cov_id, fnode, tnode, lpol, rpol, nPoints, iPoint; + double x_buf[2], y_buf[2]; + CSG_Shape *pShape; + CSG_Shapes *pShapes; + + //----------------------------------------------------- + pShapes = SG_Create_Shapes(shape_type); + pShapes->Add_Field("ID" , SG_DATATYPE_Int); + pShapes->Add_Field("ID#" , SG_DATATYPE_Int); + pShapes->Add_Field("FNODE" , SG_DATATYPE_Int); + pShapes->Add_Field("TNODE" , SG_DATATYPE_Int); + pShapes->Add_Field("LPOL" , SG_DATATYPE_Int); + pShapes->Add_Field("RPOL" , SG_DATATYPE_Int); + + Set_Progress(0, 100); + + //----------------------------------------------------- + do + { + Process_Set_Text(CSG_String::Format(SG_T("Loaded arcs: %d"), pShapes->Get_Count())); + + if( (line = E00_Read_Line()) == NULL ) + { + covnum = -1; + } + else + { + sscanf(line, "%d %d %d %d %d %d %d", &covnum, &cov_id, &fnode, &tnode, &lpol, &rpol, &nPoints); + } + + if( covnum != -1 ) + { + pShape = pShapes->Add_Shape(); + + pShape->Set_Value(0 , covnum); + pShape->Set_Value(1 , cov_id); + pShape->Set_Value(ARC_FNODE , fnode); + pShape->Set_Value(ARC_TNODE , tnode); + pShape->Set_Value(ARC_LPOL , lpol); + pShape->Set_Value(ARC_RPOL , rpol); + + //--------------------------------------------- + if( prec ) // double precision : 1 coord pair / line + { + for(iPoint=0; iPointAdd_Point(x_buf[0] * scale, y_buf[0] * scale); + } + } + } + + //--------------------------------------------- + else // single precision : 2 x,y pairs / line + { + for(iPoint=0; iPointAdd_Point(x_buf[0] * scale, y_buf[0] * scale); + + if( iPoint + 1 < nPoints ) + { + pShape->Add_Point(x_buf[1] * scale, y_buf[1] * scale); + } + } + } + } + } + } + while( covnum != -1 && line && Process_Get_Okay(false) ); + + //----------------------------------------------------- + if( pShapes->Get_Count() == 0 ) + { + delete(pShapes); + + shape_type = SHAPE_TYPE_Point; + + return( NULL ); + } + + if( shape_type == SHAPE_TYPE_Polygon ) + { + pShapes = Arcs2Polygons(pShapes); + + Assign_Attributes(pShapes); + } + + return( pShapes ); +} + +//--------------------------------------------------------- +CSG_Shapes * CESRI_E00_Import::Arcs2Polygons(CSG_Shapes *pArcs) +{ + //----------------------------------------------------- + Process_Set_Text(_TL("Arcs to polygons")); + + CSG_Shapes *pPolygons = SG_Create_Shapes(SHAPE_TYPE_Polygon); + + pPolygons->Add_Field("ID", SG_DATATYPE_Int); + + //----------------------------------------------------- + for(int iArc=0; iArcGet_Count() && Set_Progress(iArc, pArcs->Get_Count()); iArc++) + { + Arcs2Polygon(pArcs, pPolygons, pArcs->Get_Shape(iArc)->asInt(ARC_LPOL)); + Arcs2Polygon(pArcs, pPolygons, pArcs->Get_Shape(iArc)->asInt(ARC_RPOL)); + } + + //----------------------------------------------------- + delete(pArcs); + + pPolygons->Make_Clean(); + + return( pPolygons ); +} + +//--------------------------------------------------------- +void CESRI_E00_Import::Arcs2Polygon(CSG_Shapes *pArcs, CSG_Shapes *pPolygons, int id) +{ + //----------------------------------------------------- + if( id <= 1 ) + { + return; + } + + //----------------------------------------------------- + CSG_Shapes Segments(SHAPE_TYPE_Line); + + Segments.Add_Field("FNODE", SG_DATATYPE_Int); + Segments.Add_Field("TNODE", SG_DATATYPE_Int); + + //----------------------------------------------------- + for(int iArc=0; iArcGet_Count(); iArc++) + { + CSG_Shape *pArc = pArcs->Get_Shape(iArc); + + if( id == pArc->asInt(ARC_LPOL) ) + { + CSG_Shape *pSegment = Segments.Add_Shape(); + + pSegment->Set_Value(0, pArc->asInt(ARC_FNODE)); + pSegment->Set_Value(1, pArc->asInt(ARC_TNODE)); + + for(int iVertex=0; iVertexGet_Point_Count(0); iVertex++) + { + pSegment->Add_Point(pArc->Get_Point(iVertex, 0, false), 0); + } + + pArc->Set_Value(ARC_LPOL, -1); + } + else if( id == pArc->asInt(ARC_RPOL) ) + { + CSG_Shape *pSegment = Segments.Add_Shape(); + + pSegment->Set_Value(1, pArc->asInt(ARC_FNODE)); + pSegment->Set_Value(0, pArc->asInt(ARC_TNODE)); + + for(int iVertex=0; iVertexGet_Point_Count(0); iVertex++) + { + pSegment->Add_Point(pArc->Get_Point(iVertex, 0, true), 0); + } + + pArc->Set_Value(ARC_RPOL, -1); + } + } + + if( Segments.Get_Count() <= 0 ) + { + return; + } + + //----------------------------------------------------- + CSG_Shape *pPolygon = pPolygons->Add_Shape(); + + pPolygon->Set_Value(0, id); + + while( Segments.Get_Count() > 0 ) + { + CSG_Shape *pSegment = Segments.Get_Shape(0); + + int iPart = pPolygon->Get_Part_Count(); + + do + { + for(int iVertex=0; iVertexGet_Point_Count(0); iVertex++) + { + pPolygon->Add_Point(pSegment->Get_Point(iVertex), iPart); + } + + int fNode = pSegment->asInt(0); + int tNode = pSegment->asInt(1); + + Segments.Del_Shape(pSegment); pSegment = NULL; + + if( fNode != tNode ) + { + for(int iSegment=0; iSegmentasInt(1) ) + { + pSegment = Segments.Get_Shape(iSegment); + } + } + } + } + while( pSegment ); + } +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +CSG_Shapes * CESRI_E00_Import::getlabels(int prec, double scale) // shape_type: LINE or AREA +{ + const char *line; + + int num, id; // coverage-# and coverage-ID + double x, y; + CSG_Shapes *pShapes; + CSG_Shape *pShape; + + pShapes = SG_Create_Shapes(SHAPE_TYPE_Point); + + pShapes->Add_Field("ID#" , SG_DATATYPE_Int); + pShapes->Add_Field("ID" , SG_DATATYPE_Int); + + while( (line = E00_Read_Line()) != NULL ) + { + sscanf(line, "%d %d %lf %lf", &id, &num, &x, &y); + + if( id == -1 ) + { + break; + } + else + { + pShape = pShapes->Add_Shape(); + + pShape->Add_Point(x * scale, y * scale); + + pShape->Set_Value(0, num); + pShape->Set_Value(1, id); + + //--------------------------------------------- + E00_Read_Line(); // 4 values to skip + + if( prec ) + { + E00_Read_Line(); // on 2nd line when double precision + } + } + } + + if( pShapes->Get_Count() <= 0 ) + { + delete( pShapes ); + pShapes = NULL; + } + + return( pShapes ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +CSG_Shapes * CESRI_E00_Import::getsites(int prec, double scale) +{ + const char *line; + + int id; + double x, y; + CSG_Shape *pShape; + CSG_Shapes *pShapes; + + pShapes = SG_Create_Shapes(SHAPE_TYPE_Point); + pShapes->Add_Field("ID", SG_DATATYPE_Int); + + while( (line = E00_Read_Line()) != NULL ) + { + sscanf(line, "%d %*d %lf %lf", &id, &x, &y); + + if( id == -1 ) + { + break; + } + + pShape = pShapes->Add_Shape(); + + pShape->Add_Point(x * scale, y * scale); + pShape->Set_Value(0, id); + + //------------------------------------------------- + E00_Read_Line(); // 4 values to skip + + if( prec ) + { + E00_Read_Line(); // on 2nd line when double precision + } + } + + if( pShapes->Get_Count() <= 0 ) + { + delete( pShapes ); + pShapes = NULL; + } + else + { + Assign_Attributes(pShapes); + } + + return( pShapes ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +double CESRI_E00_Import::getproj(void) +{ + const char *line; + + double scale = 1.0; + + while( (line = E00_Read_Line()) != NULL && strncmp(line, "EOP", 3) ) + { + if( !strncmp(line, "Units", 5) ) + { + sscanf(line + 6, "%lf", &scale); + } + } + + scale = 1.0 / scale; + + return( scale ); +} + + +/////////////////////////////////////////////////////////// +// // +// info section // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +struct info_Field +{ + char Name[18]; // name of item + + int Position, // position in data line + Size, // size for reading + Type; // type of data +}; + +//--------------------------------------------------------- +struct info_Table +{ + char Name[34], + AI[4]; // XX if Arc/info file, spaces otherwise + + int uFields, // number of usable items in this table + nFields, // number of items in this table + ldr; // length of data record + + long nRecords, // number of data records + length; // total length for one data line + + struct info_Field *Field; // One per field... +}; + +//--------------------------------------------------------- +// [06.06.2006] ESRI E00 Import crash fix, James Flemer +int CESRI_E00_Import::info_Get_Tables(void) +{ + const char *line; + + char tmp[12], *p; + int i; + CSG_String s; + CSG_Table *pTable; + struct info_Table info; + + //----------------------------------------------------- + while( (line = E00_Read_Line()) != NULL && strncmp(line, "EOI", 3) ) + { + strncpy(info.Name, line, 32); + info.Name[32] = 0; + p = strchr(info.Name, ' '); + if( p != NULL ) + *p = 0; + p = strchr(info.Name, '.'); + if( p == 0 ) + p = info.Name; + else + p++; + s = p; + + strncpy(info.AI , line + 32, 2); info.AI[2] = 0; + strncpy(tmp , line + 34, 4); tmp[ 4] = 0; info.uFields = atoi(tmp); + strncpy(tmp , line + 38, 4); tmp[ 4] = 0; info.nFields = atoi(tmp); + strncpy(tmp , line + 42, 4); tmp[ 4] = 0; info.ldr = atoi(tmp); + strncpy(tmp , line + 46, 11); tmp[11] = 0; info.nRecords = atol(tmp); + + info.length = 0; + info.Field = (struct info_Field *)malloc(info.nFields * sizeof(struct info_Field)); + + //--------------------------------------------- + for(i=0; iAdd_Field("XMIN", SG_DATATYPE_Double); + pShapes->Add_Field("YMIN", SG_DATATYPE_Double); + pShapes->Add_Field("XMAX", SG_DATATYPE_Double); + pShapes->Add_Field("YMAX", SG_DATATYPE_Double); + + CSG_Table_Record *pRecord = pTable->Get_Record(0); + CSG_Shape *pShape = pShapes->Add_Shape(); + + pShape->Set_Value(0, pRecord->asDouble(0)); + pShape->Set_Value(1, pRecord->asDouble(1)); + pShape->Set_Value(2, pRecord->asDouble(2)); + pShape->Set_Value(3, pRecord->asDouble(3)); + + pShape->Add_Point(pRecord->asDouble(0), pRecord->asDouble(1)); + pShape->Add_Point(pRecord->asDouble(0), pRecord->asDouble(3)); + pShape->Add_Point(pRecord->asDouble(2), pRecord->asDouble(3)); + pShape->Add_Point(pRecord->asDouble(2), pRecord->asDouble(1)); + + m_pShapes->Add_Item(pShapes); + } + + delete(pTable); + } + + //--------------------------------------------- + else if( !s.CmpNoCase(SG_T("tic")) ) // tick marks + { + if( m_bTic ) + { + CSG_Shapes *pShapes = SG_Create_Shapes(SHAPE_TYPE_Point, SG_T("Tick Points")); + + pShapes->Add_Field("ID", SG_DATATYPE_Int); + pShapes->Add_Field("X" , SG_DATATYPE_Double); + pShapes->Add_Field("Y" , SG_DATATYPE_Double); + + for(i=0; iGet_Record_Count(); i++) + { + CSG_Table_Record *pRecord = pTable->Get_Record(i); + CSG_Shape *pShape = pShapes->Add_Shape(); + pShape->Set_Value(0, pRecord->asInt (0)); + pShape->Set_Value(1, pRecord->asDouble(1)); + pShape->Set_Value(2, pRecord->asDouble(2)); + pShape->Add_Point(pRecord->asDouble(1), pRecord->asDouble(2)); + } + + m_pShapes->Add_Item(pShapes); + } + + delete(pTable); + } + + //--------------------------------------------- + else if( m_bTables ) + { + m_pTables->Add_Item(pTable); + } + + //--------------------------------------------- + else if( pTable != m_pPAT && pTable != m_pAAT ) + { + delete(pTable); + } + } + } + + //----------------------------------------------------- + // 0 if none, 1 if AAT, 2 if PAT, 3 if both + return( m_pPAT ? (m_pAAT ? 3 : 2) : (m_pAAT ? 1 : 0) ); +} + +//--------------------------------------------------------- +CSG_Table * CESRI_E00_Import::info_Get_Table(struct info_Table info) +{ + char *buffer_record, *buffer_item; + int iRecord, iField; + CSG_Table *pTable; + CSG_Table_Record *pRecord; + + //----------------------------------------------------- + Process_Set_Text(CSG_String(info.Name)); + + buffer_record = (char *)malloc(info.length + 3); + buffer_item = (char *)malloc(info.length + 3); + + pTable = SG_Create_Table(); + pTable->Set_Name(CSG_String(info.Name)); + + //----------------------------------------------------- + for(iField=0; iFieldAdd_Field(info.Field[iField].Name, SG_DATATYPE_Double); + break; + + case 50: // short / long + pTable->Add_Field(info.Field[iField].Name, SG_DATATYPE_Int); + break; + + case 40: // float + pTable->Add_Field(info.Field[iField].Name, SG_DATATYPE_Double); + break; + + case 10: // short + pTable->Add_Field(info.Field[iField].Name, SG_DATATYPE_Int); + break; + + default: // string + pTable->Add_Field(info.Field[iField].Name, SG_DATATYPE_String); + break; + } + } + + //----------------------------------------------------- + for(iRecord=0; iRecordAdd_Record(); + + for(iField=0; iFieldGet_Field_Type(iField) ) + { + default: + pRecord->Set_Value(iField, atof(buffer_item)); + break; + + case SG_DATATYPE_Int: + pRecord->Set_Value(iField, atoi(buffer_item)); + break; + + case SG_DATATYPE_String: + pRecord->Set_Value(iField, CSG_String(buffer_item)); + break; + } + } + } + + //----------------------------------------------------- + free(buffer_record); + free(buffer_item); + + return( pTable ); +} + +//--------------------------------------------------------- +void CESRI_E00_Import::info_Skip_Table(struct info_Table info) +{ + char *buffer_record; + int iRecord; + + buffer_record = (char *)malloc(info.length + 3); + + for(iRecord=0; iRecordGet_Field_Count() <= 0 || !m_pPAT || m_pPAT->Get_Field_Count() <= 2 ) + { + return( false ); + } + + Process_Set_Text(_TL("Assign attributes to shapes...")); + + int iField, off_Field = pShapes->Get_Field_Count(); + + for(iField=0; iFieldGet_Field_Count(); iField++) + { + pShapes->Add_Field(m_pPAT->Get_Field_Name(iField), m_pPAT->Get_Field_Type(iField)); + } + + for(int i=0; iGet_Count() && Set_Progress(i, m_pPAT->Get_Count()); i++) + { + CSG_Shape *pShape = pShapes->Get_Shape(i); + + CSG_Table_Record *pRecord = m_pPAT->Get_Record(pShape->asInt(0) - 1); + + if( pRecord ) + { + for(iField=0; iFieldGet_Field_Count(); iField++) + { + if( SG_Data_Type_is_Numeric(m_pPAT->Get_Field_Type(iField)) ) + pShape->Set_Value(off_Field + iField, pRecord->asDouble(iField)); + else + pShape->Set_Value(off_Field + iField, pRecord->asString(iField)); + } + } + } + + return( true ); + +/* pShapes->Set_Index(0, TABLE_INDEX_Ascending); + m_pPAT ->Set_Index(3, TABLE_INDEX_Ascending); + + for(int iShape=0, off_Record=0; iShapeGet_Count() && Set_Progress(iShape, pShapes->Get_Count()); iShape++) + { + CSG_Shape *pShape = pShapes->Get_Shape_byIndex(iShape); + int id = pShape->asInt(0); + + for(int iRecord=off_Record; iRecordGet_Record_Count(); iRecord++) + { + CSG_Table_Record *pRecord = m_pPAT->Get_Record_byIndex(iRecord); + + if( id == pRecord->asInt(3) ) + { + for(iField=0; iFieldGet_Field_Count(); iField++) + { + if( SG_Data_Type_is_Numeric(m_pPAT->Get_Field_Type(iField)) ) + pShape->Set_Value(off_Field + iField, pRecord->asDouble(iField)); + else + pShape->Set_Value(off_Field + iField, pRecord->asString(iField)); + } + + off_Record++; + + break; + } + } + } + + return( true );/**/ +} + + +/////////////////////////////////////////////////////////// +// // +// Skips // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +void CESRI_E00_Import::skip(char *end) +{ + const char *line; + + int l = strlen(end); + + while( (line = E00_Read_Line()) != NULL && strncmp(line, end, l) ); +} + +//--------------------------------------------------------- +void CESRI_E00_Import::skip_dat(void) +{ + const char *line; + + int i = 0; + + while( (line = E00_Read_Line()) != NULL && i != -1 ) + { + sscanf(line, "%d", &i); + } +} + +//--------------------------------------------------------- +void CESRI_E00_Import::skip_msk(void) +{ + const char *line; + + double xmin, ymin, xmax, ymax, res, sk; + long xsize, ysize, nskip; + + if( (line = E00_Read_Line()) != NULL ) + { + sscanf(line, "%lf %lf %lf", &xmin, &ymin, &xmax); + + if( (line = E00_Read_Line()) != NULL ) + { + sscanf(line, "%lf %lf %ld %ld", &ymax, &res, &xsize, &ysize); + + sk = ((ymax - ymin) / res) * ((xmax - xmin) / res) / 32.0; + nskip = (long)ceil(sk / 7.0); + + while( nskip-- ) + { + E00_Read_Line(); + } + } + } +} + +//--------------------------------------------------------- +void CESRI_E00_Import::skip_arc(int prec) +{ + const char *line; + + int i, covnum, nPoints; + + while( (line = E00_Read_Line()) != NULL ) + { + sscanf(line, "%d %*d %*d %*d %*d %*d %d", &covnum, &nPoints); + + if( covnum == -1 ) + break; + + if( prec == 0 ) + nPoints = (nPoints + 1) / 2; // number of coordinate lines + + for(i=0; i&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +subdir = src/modules/io/io_esri_e00 +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_postgresql.m4 \ + $(top_srcdir)/m4/ax_pkg_swig.m4 \ + $(top_srcdir)/m4/ax_python_devel.m4 \ + $(top_srcdir)/m4/ax_swig_enable_cxx.m4 \ + $(top_srcdir)/m4/ax_swig_python.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__installdirs = "$(DESTDIR)$(pkglibdir)" +LTLIBRARIES = $(pkglib_LTLIBRARIES) +libio_esri_e00_la_DEPENDENCIES = \ + $(top_srcdir)/src/saga_core/saga_api/libsaga_api.la +am_libio_esri_e00_la_OBJECTS = ESRI_E00_Import.lo MLB_Interface.lo \ + cpl_conv.lo cpl_error.lo cpl_vsisimple.lo e00read.lo \ + e00write.lo +libio_esri_e00_la_OBJECTS = $(am_libio_esri_e00_la_OBJECTS) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) +depcomp = $(SHELL) $(top_srcdir)/depcomp +am__depfiles_maybe = depfiles +am__mv = mv -f +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = +CCLD = $(CC) +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = +CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = +CXXLD = $(CXX) +CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = +SOURCES = $(libio_esri_e00_la_SOURCES) +DIST_SOURCES = $(libio_esri_e00_la_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +AX_SWIG_PYTHON_CPPFLAGS = @AX_SWIG_PYTHON_CPPFLAGS@ +AX_SWIG_PYTHON_OPT = @AX_SWIG_PYTHON_OPT@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DISABLELIBHARU = @DISABLELIBHARU@ +DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +FGREP = @FGREP@ +GOMPFLAGS = @GOMPFLAGS@ +GREP = @GREP@ +HARU_LIB = @HARU_LIB@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LOCAL_INCS = @LOCAL_INCS@ +LOCAL_LIBS = @LOCAL_LIBS@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ +MKDIR_P = @MKDIR_P@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PG_CONFIG = @PG_CONFIG@ +POSTGRESQL_CFLAGS = @POSTGRESQL_CFLAGS@ +POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@ +POSTGRESQL_VERSION = @POSTGRESQL_VERSION@ +POW_LIB = @POW_LIB@ +PYTHON = @PYTHON@ +PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ +PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ +PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ +PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_PLATFORM = @PYTHON_PLATFORM@ +PYTHON_PREFIX = @PYTHON_PREFIX@ +PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ +PYTHON_VERSION = @PYTHON_VERSION@ +RANLIB = @RANLIB@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +SWIG = @SWIG@ +SWIG_LIB = @SWIG_LIB@ +VERSION = @VERSION@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +pkgpyexecdir = @pkgpyexecdir@ +pkgpythondir = @pkgpythondir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +pyexecdir = @pyexecdir@ +pythondir = @pythondir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ + +# +# $Id: Makefile.am 1277 2011-12-22 15:48:59Z reklov_w $ +# +@DEBUG_TRUE@DBGFLAGS = -g -DDEBUG +@SAGA_UNICODE_TRUE@UC_DEFS = -D_SAGA_UNICODE +DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD +CXX_INCS = -I$(top_srcdir)/src/saga_core +AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS) +AM_LDFLAGS = -fPIC -shared -avoid-version +pkglib_LTLIBRARIES = libio_esri_e00.la +libio_esri_e00_la_SOURCES = \ +ESRI_E00_Import.cpp\ +MLB_Interface.cpp\ +e00compr/cpl_conv.c\ +e00compr/cpl_error.c\ +e00compr/cpl_vsisimple.c\ +e00compr/e00read.c\ +e00compr/e00write.c\ +ESRI_E00_Import.h\ +MLB_Interface.h\ +e00compr/cpl_conv.h\ +e00compr/cpl_error.h\ +e00compr/cpl_port.h\ +e00compr/cpl_vsi.h\ +e00compr/e00compr.h + +libio_esri_e00_la_LIBADD = $(top_srcdir)/src/saga_core/saga_api/libsaga_api.la +all: all-am + +.SUFFIXES: +.SUFFIXES: .c .cpp .lo .o .obj +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/modules/io/io_esri_e00/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign src/modules/io/io_esri_e00/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): + +install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) + @$(NORMAL_INSTALL) + @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ + list2=; for p in $$list; do \ + if test -f $$p; then \ + list2="$$list2 $$p"; \ + else :; fi; \ + done; \ + test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \ + } + +uninstall-pkglibLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ + for p in $$list; do \ + $(am__strip_dir) \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$f"; \ + done + +clean-pkglibLTLIBRARIES: + -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES) + @list='$(pkglib_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + +libio_esri_e00.la: $(libio_esri_e00_la_OBJECTS) $(libio_esri_e00_la_DEPENDENCIES) $(EXTRA_libio_esri_e00_la_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) -rpath $(pkglibdir) $(libio_esri_e00_la_OBJECTS) $(libio_esri_e00_la_LIBADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ESRI_E00_Import.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MLB_Interface.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpl_conv.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpl_error.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpl_vsisimple.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/e00read.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/e00write.Plo@am__quote@ + +.c.o: +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< + +.c.obj: +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + +.c.lo: +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< + +cpl_conv.lo: e00compr/cpl_conv.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT cpl_conv.lo -MD -MP -MF $(DEPDIR)/cpl_conv.Tpo -c -o cpl_conv.lo `test -f 'e00compr/cpl_conv.c' || echo '$(srcdir)/'`e00compr/cpl_conv.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/cpl_conv.Tpo $(DEPDIR)/cpl_conv.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='e00compr/cpl_conv.c' object='cpl_conv.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o cpl_conv.lo `test -f 'e00compr/cpl_conv.c' || echo '$(srcdir)/'`e00compr/cpl_conv.c + +cpl_error.lo: e00compr/cpl_error.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT cpl_error.lo -MD -MP -MF $(DEPDIR)/cpl_error.Tpo -c -o cpl_error.lo `test -f 'e00compr/cpl_error.c' || echo '$(srcdir)/'`e00compr/cpl_error.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/cpl_error.Tpo $(DEPDIR)/cpl_error.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='e00compr/cpl_error.c' object='cpl_error.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o cpl_error.lo `test -f 'e00compr/cpl_error.c' || echo '$(srcdir)/'`e00compr/cpl_error.c + +cpl_vsisimple.lo: e00compr/cpl_vsisimple.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT cpl_vsisimple.lo -MD -MP -MF $(DEPDIR)/cpl_vsisimple.Tpo -c -o cpl_vsisimple.lo `test -f 'e00compr/cpl_vsisimple.c' || echo '$(srcdir)/'`e00compr/cpl_vsisimple.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/cpl_vsisimple.Tpo $(DEPDIR)/cpl_vsisimple.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='e00compr/cpl_vsisimple.c' object='cpl_vsisimple.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o cpl_vsisimple.lo `test -f 'e00compr/cpl_vsisimple.c' || echo '$(srcdir)/'`e00compr/cpl_vsisimple.c + +e00read.lo: e00compr/e00read.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT e00read.lo -MD -MP -MF $(DEPDIR)/e00read.Tpo -c -o e00read.lo `test -f 'e00compr/e00read.c' || echo '$(srcdir)/'`e00compr/e00read.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/e00read.Tpo $(DEPDIR)/e00read.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='e00compr/e00read.c' object='e00read.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o e00read.lo `test -f 'e00compr/e00read.c' || echo '$(srcdir)/'`e00compr/e00read.c + +e00write.lo: e00compr/e00write.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT e00write.lo -MD -MP -MF $(DEPDIR)/e00write.Tpo -c -o e00write.lo `test -f 'e00compr/e00write.c' || echo '$(srcdir)/'`e00compr/e00write.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/e00write.Tpo $(DEPDIR)/e00write.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='e00compr/e00write.c' object='e00write.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o e00write.lo `test -f 'e00compr/e00write.c' || echo '$(srcdir)/'`e00compr/e00write.c + +.cpp.o: +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< + +.cpp.obj: +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + +.cpp.lo: +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + set x; \ + here=`pwd`; \ + $(am__define_uniq_tagged_files); \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ + fi +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ + test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(LTLIBRARIES) +installdirs: + for dir in "$(DESTDIR)$(pkglibdir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool clean-pkglibLTLIBRARIES \ + mostlyclean-am + +distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: install-pkglibLTLIBRARIES + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-pkglibLTLIBRARIES + +.MAKE: install-am install-strip + +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-pkglibLTLIBRARIES install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ + uninstall-pkglibLTLIBRARIES + + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nru saga-2.1.0+dfsg/src/modules/io/io_esri_e00/MLB_Interface.cpp saga-2.1.4+dfsg/src/modules/io/io_esri_e00/MLB_Interface.cpp --- saga-2.1.0+dfsg/src/modules/io/io_esri_e00/MLB_Interface.cpp 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_esri_e00/MLB_Interface.cpp 2014-11-13 08:32:20.000000000 +0000 @@ -0,0 +1,84 @@ +/********************************************************** + * Version $Id: MLB_Interface.cpp 1246 2011-11-25 13:42:38Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// The Module Link Library Interface // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +// 1. Include the appropriate SAGA-API header... + +#include "MLB_Interface.h" + + +//--------------------------------------------------------- +// 2. Place general module library informations here... + +CSG_String Get_Info(int i) +{ + switch( i ) + { + case MLB_INFO_Name: default: + return( _TL("ESRI E00") ); + + case MLB_INFO_Category: + return( _TL("Import/Export") ); + + case MLB_INFO_Author: + return( SG_T("O. Conrad (c) 2004") ); + + case MLB_INFO_Description: + return( _TL("Import and export filter for ESRI's E00 file exchange format.") ); + + case MLB_INFO_Version: + return( SG_T("1.0") ); + + case MLB_INFO_Menu_Path: + return( _TL("File|ESRI E00") ); + } +} + + +//--------------------------------------------------------- +// 3. Include the headers of your modules here... + +#include "ESRI_E00_Import.h" + + +//--------------------------------------------------------- +// 4. Allow your modules to be created here... + +CSG_Module * Create_Module(int i) +{ + CSG_Module *pModule; + + switch( i ) + { + case 0: + pModule = new CESRI_E00_Import; + break; + + default: + pModule = NULL; + break; + } + + return( pModule ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +//{{AFX_SAGA + + MLB_INTERFACE + +//}}AFX_SAGA diff -Nru saga-2.1.0+dfsg/src/modules/io/io_esri_e00/MLB_Interface.h saga-2.1.4+dfsg/src/modules/io/io_esri_e00/MLB_Interface.h --- saga-2.1.0+dfsg/src/modules/io/io_esri_e00/MLB_Interface.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_esri_e00/MLB_Interface.h 2014-11-13 08:32:20.000000000 +0000 @@ -0,0 +1,85 @@ +/********************************************************** + * Version $Id: MLB_Interface.h 1922 2014-01-09 10:28:46Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// io_esri_e00 // +// // +//-------------------------------------------------------// +// // +// MLB_Interface.h // +// // +// Copyright (C) 2003 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Goettingen // +// Goldschmidtstr. 5 // +// 37077 Goettingen // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// Include the SAGA-API here // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#ifndef HEADER_INCLUDED__io_esri_e00_H +#define HEADER_INCLUDED__io_esri_e00_H + +//--------------------------------------------------------- +#include + +//--------------------------------------------------------- +#ifdef io_esri_e00_EXPORTS + #define io_esri_e00_EXPORT _SAGA_DLL_EXPORT +#else + #define io_esri_e00_EXPORT _SAGA_DLL_IMPORT +#endif + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#endif // #ifndef HEADER_INCLUDED__io_esri_e00_H diff -Nru saga-2.1.0+dfsg/src/modules/io/io_gdal/gdal_driver.cpp saga-2.1.4+dfsg/src/modules/io/io_gdal/gdal_driver.cpp --- saga-2.1.0+dfsg/src/modules/io/io_gdal/gdal_driver.cpp 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_gdal/gdal_driver.cpp 2014-11-13 08:32:20.000000000 +0000 @@ -0,0 +1,805 @@ +/********************************************************** + * Version $Id: gdal_driver.cpp 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library // +// // +// io_gdal // +// // +//-------------------------------------------------------// +// // +// gdal_driver.cpp // +// // +// Copyright (C) 2007 by O. Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.de // +// // +// contact: Olaf Conrad // +// Bundesstr. 55 // +// D-20146 Hamburg // +// Germany // +// // +/////////////////////////////////////////////////////////// + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "gdal_driver.h" + +#include +#include +#include + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +CSG_GDAL_Drivers gSG_GDAL_Drivers; + +const CSG_GDAL_Drivers & SG_Get_GDAL_Drivers (void) +{ + return( gSG_GDAL_Drivers ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +CSG_GDAL_Drivers::CSG_GDAL_Drivers(void) +{ + GDALAllRegister(); + + // affects Windows only, might be appropriate for applications + // that treat filenames as being in the local encoding. + // for more info see: http://trac.osgeo.org/gdal/wiki/ConfigOptions + CPLSetConfigOption("GDAL_FILENAME_IS_UTF8", "NO"); + + m_pDrivers = GetGDALDriverManager(); +} + +//--------------------------------------------------------- +CSG_GDAL_Drivers::~CSG_GDAL_Drivers(void) +{ + GDALDestroyDriverManager(); +} + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +CSG_String CSG_GDAL_Drivers::Get_Version(void) const +{ + return( GDALVersionInfo("RELEASE_NAME") ); +} + +//--------------------------------------------------------- +int CSG_GDAL_Drivers::Get_Count(void) const +{ + return( m_pDrivers->GetDriverCount() ); +} + +//--------------------------------------------------------- +GDALDriver * CSG_GDAL_Drivers::Get_Driver(const CSG_String &Name) const +{ + return( (GDALDriver *)GDALGetDriverByName(Name) ); +} + +//--------------------------------------------------------- +GDALDriver * CSG_GDAL_Drivers::Get_Driver(int Index) const +{ + return( (GDALDriver *)GDALGetDriver(Index) ); +} + +//--------------------------------------------------------- +CSG_String CSG_GDAL_Drivers::Get_Name(int Index) const +{ + return( Get_Driver(Index)->GetMetadataItem(GDAL_DMD_LONGNAME) ); +} + +//--------------------------------------------------------- +CSG_String CSG_GDAL_Drivers::Get_Description(int Index) const +{ + return( Get_Driver(Index)->GetDescription() ); +} + +//--------------------------------------------------------- +CSG_String CSG_GDAL_Drivers::Get_Extension(int Index) const +{ + return( Get_Driver(Index)->GetMetadataItem(GDAL_DMD_EXTENSION) ); +} + +//--------------------------------------------------------- +bool CSG_GDAL_Drivers::Can_Read(int Index) const +{ + return( Index >= 0 && Index < Get_Count() ); // ? CSLFetchBoolean(Get_Driver(Index)->GetMetadata(), GDAL_DCAP_CREATE, false) != 0 : false ); +} + +//--------------------------------------------------------- +bool CSG_GDAL_Drivers::Can_Write(int Index) const +{ + return( Index >= 0 && Index < Get_Count() ? CSLFetchBoolean(Get_Driver(Index)->GetMetadata(), GDAL_DCAP_CREATE, false) != 0 : false ); +} + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +int CSG_GDAL_Drivers::Get_GDAL_Type(TSG_Data_Type Type) +{ + switch( Type ) + { + case SG_DATATYPE_Bit: return( GDT_Byte ); // Eight bit unsigned integer + case SG_DATATYPE_Byte: return( GDT_Byte ); // Eight bit unsigned integer + case SG_DATATYPE_Char: return( GDT_Byte ); // Eight bit unsigned integer + case SG_DATATYPE_Word: return( GDT_UInt16 ); // Sixteen bit unsigned integer + case SG_DATATYPE_Short: return( GDT_Int16 ); // Sixteen bit signed integer + case SG_DATATYPE_DWord: return( GDT_UInt32 ); // Thirty two bit unsigned integer + case SG_DATATYPE_Int: return( GDT_Int32 ); // Thirty two bit signed integer + case SG_DATATYPE_Float: return( GDT_Float32 ); // Thirty two bit floating point + case SG_DATATYPE_Double: return( GDT_Float64 ); // Sixty four bit floating point + + default: return( GDT_Float64 ); + } +} + +//--------------------------------------------------------- +TSG_Data_Type CSG_GDAL_Drivers::Get_SAGA_Type(int Type) +{ + switch( Type ) + { + case GDT_Byte: return( SG_DATATYPE_Byte ); // Eight bit unsigned integer + case GDT_UInt16: return( SG_DATATYPE_Word ); // Sixteen bit unsigned integer + case GDT_Int16: return( SG_DATATYPE_Short ); // Sixteen bit signed integer + case GDT_UInt32: return( SG_DATATYPE_DWord ); // Thirty two bit unsigned integer + case GDT_Int32: return( SG_DATATYPE_Int ); // Thirty two bit signed integer + case GDT_Float32: return( SG_DATATYPE_Float ); // Thirty two bit floating point + case GDT_Float64: return( SG_DATATYPE_Double ); // Sixty four bit floating point + + case GDT_CInt16: return( SG_DATATYPE_Undefined ); // Complex Int16 + case GDT_CInt32: return( SG_DATATYPE_Undefined ); // Complex Int32 + case GDT_CFloat32: return( SG_DATATYPE_Undefined ); // Complex Float32 + case GDT_CFloat64: return( SG_DATATYPE_Undefined ); // Complex Float64 + + default: return( SG_DATATYPE_Undefined ); + } +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +CSG_GDAL_DataSet::CSG_GDAL_DataSet(void) +{ + m_pDataSet = NULL; + + m_TF_A.Create(2); + m_TF_B.Create(2, 2); +} + +//--------------------------------------------------------- +CSG_GDAL_DataSet::CSG_GDAL_DataSet(const CSG_String &File_Name) +{ + m_pDataSet = NULL; + + m_TF_A.Create(2); + m_TF_B.Create(2, 2); + + Open_Read(File_Name); +} + +//--------------------------------------------------------- +CSG_GDAL_DataSet::~CSG_GDAL_DataSet(void) +{ + Close(); +} + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CSG_GDAL_DataSet::Open_Read(const CSG_String &File_Name) +{ + Close(); + + if( (m_pDataSet = (GDALDataset *)GDALOpen(File_Name, GA_ReadOnly)) == NULL ) + { + return( false ); + } + + //----------------------------------------------------- + double Transform[6]; + + m_Access = SG_GDAL_IO_READ; + + m_NX = m_pDataSet->GetRasterXSize(); + m_NY = m_pDataSet->GetRasterYSize(); + + if( m_pDataSet->GetGeoTransform(Transform) != CE_None ) + { + m_bTransform = false; + m_Cellsize = 1.0; + m_xMin = 0.5; + m_yMin = 0.5; + } + else if( Transform[1] == -Transform[5] && Transform[2] == 0.0 && Transform[4] == 0.0 ) // nothing to transform + { + m_bTransform = false; + m_Cellsize = Transform[1]; // pixel width (== pixel height) + m_xMin = Transform[0] + m_Cellsize * 0.5; // center (x) of left edge pixels + m_yMin = Transform[3] + m_Cellsize * (0.5 - m_NY); // center (y) of lower edge pixels + } + else + { + m_bTransform = true; + m_Cellsize = 1.0; + m_xMin = 0.5; + m_yMin = 0.5; + } + + m_TF_A[0] = Transform[0]; + m_TF_A[1] = Transform[3]; + m_TF_B[0][0] = Transform[1]; + m_TF_B[0][1] = Transform[2]; + m_TF_B[1][0] = Transform[4]; + m_TF_B[1][1] = Transform[5]; + m_TF_BInv = m_TF_B.Get_Inverse(); + + return( true ); +} + +//--------------------------------------------------------- +bool CSG_GDAL_DataSet::Open_Write(const CSG_String &File_Name, const CSG_String &Driver, const CSG_String &Options,TSG_Data_Type Type, int NBands, const CSG_Grid_System &System, const CSG_Projection &Projection) +{ + char **pOptions = NULL; + char **pTokens = NULL; + GDALDriver *pDriver; + + if (!Options.is_Empty()){ + pTokens = CSLTokenizeString2( Options, " ", CSLT_STRIPLEADSPACES); + + for( int i = 0; pTokens != NULL && pTokens[i] != NULL; i++ ){ + pOptions = CSLAddString( pOptions, pTokens[i] ); + } + } + + Close(); + + + + //-------------------------------------------------------- + if( (pDriver = gSG_GDAL_Drivers.Get_Driver(Driver)) == NULL ) + { + SG_UI_Msg_Add_Error(CSG_String::Format(SG_T("%s: %s"), _TL("driver not found."), Driver.c_str())); + + return( false ); + } + + if( !GDALValidateCreationOptions (pDriver, pOptions)) + { + SG_UI_Msg_Add_Error(CSG_String::Format(SG_T("%s: %s"), _TL("Creation option(s) not supported by the driver"), Options.c_str() )); + + return false; + } + + if( CSLFetchBoolean(pDriver->GetMetadata(), GDAL_DCAP_CREATE, false) == false ) + { + SG_UI_Msg_Add_Error(_TL("Driver does not support file creation.")); + + return( false ); + } + + if( (m_pDataSet = pDriver->Create(File_Name, System.Get_NX(), System.Get_NY(), NBands, (GDALDataType)gSG_GDAL_Drivers.Get_GDAL_Type(Type), pOptions)) == NULL ) + { + SG_UI_Msg_Add_Error(_TL("Could not create dataset.")); + + return( false ); + } + + //-------------------------------------------------------- + m_Access = SG_GDAL_IO_WRITE; + + if( Projection.is_Okay() ) + { + m_pDataSet->SetProjection(Projection.Get_WKT()); + } + + double Transform[6] = + { + System.Get_XMin() - 0.5 * System.Get_Cellsize(), System.Get_Cellsize(), 0.0, + System.Get_YMax() + 0.5 * System.Get_Cellsize(), 0.0, -System.Get_Cellsize() + }; + + m_pDataSet->SetGeoTransform(Transform); + + m_NX = m_pDataSet->GetRasterXSize(); + m_NY = m_pDataSet->GetRasterYSize(); + + m_bTransform = false; + m_Cellsize = 1.0; + m_xMin = 0.5; + m_yMin = 0.5; + + return( true ); +} + +//--------------------------------------------------------- +bool CSG_GDAL_DataSet::Close(void) +{ + if( m_pDataSet ) + { + GDALClose(m_pDataSet); + + m_pDataSet = NULL; + } + + m_Access = SG_GDAL_IO_CLOSED; + + + if (strlen(CPLGetLastErrorMsg()) > 3) + { + SG_UI_Msg_Add_Error(CSG_String::Format(SG_T("%s: %s"),_TL("Dataset creation failed") , SG_STR_MBTOSG(CPLGetLastErrorMsg()))); + CPLErrorReset(); + + return false; + } + + return( true ); +} + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +GDALDriver * CSG_GDAL_DataSet::Get_Driver(void) const +{ + return( m_pDataSet ? m_pDataSet->GetDriver() : NULL ); +} + +//--------------------------------------------------------- +CSG_String CSG_GDAL_DataSet::Get_DriverID(void) const +{ + return( m_pDataSet && m_pDataSet->GetDriver() && m_pDataSet->GetDriver()->GetDescription() ? m_pDataSet->GetDriver()->GetDescription() : "" ); +} + +//--------------------------------------------------------- +const char * CSG_GDAL_DataSet::Get_Projection(void) const +{ + return( m_pDataSet && m_pDataSet->GetProjectionRef() ? m_pDataSet->GetProjectionRef() : "" ); +} + +//--------------------------------------------------------- +CSG_String CSG_GDAL_DataSet::Get_Name(void) const +{ + return( m_pDataSet ? m_pDataSet->GetMetadataItem(GDAL_DMD_LONGNAME) : "" ); +} + +//--------------------------------------------------------- +CSG_String CSG_GDAL_DataSet::Get_Description(void) const +{ + return( m_pDataSet ? m_pDataSet->GetDescription() : "" ); +} + +//--------------------------------------------------------- +const char * CSG_GDAL_DataSet::Get_MetaData_Item(const char *pszName, const char *pszDomain) const +{ + return( m_pDataSet ? m_pDataSet->GetMetadataItem(pszName, pszDomain) : "" ); +} + +//--------------------------------------------------------- +const char ** CSG_GDAL_DataSet::Get_MetaData(const char *pszDomain) const +{ + return( m_pDataSet ? (const char **)m_pDataSet->GetMetadata(pszDomain) : NULL ); +} + +//--------------------------------------------------------- +bool CSG_GDAL_DataSet::Get_MetaData_Item(CSG_String &MetaData, const char *pszName, const char *pszDomain) const +{ + const char *Item = Get_MetaData_Item(pszName, pszDomain); + + if( Item && *Item ) + { + MetaData = Item; + + return( true ); + } + + return( false ); +} + +//--------------------------------------------------------- +bool CSG_GDAL_DataSet::Get_MetaData(CSG_MetaData &MetaData) const +{ + if( m_pDataSet && is_Reading() ) + { + char **pMetaData = m_pDataSet->GetMetadata() + 0; + + if( pMetaData ) + { + while( *pMetaData ) + { + CSG_String s(*pMetaData); + + MetaData.Add_Child(s.BeforeFirst(SG_T('=')), s.AfterFirst(SG_T('='))); + + pMetaData++; + } + + return( true ); + } + } + + return( false ); +} + +//--------------------------------------------------------- +bool CSG_GDAL_DataSet::Get_MetaData(CSG_MetaData &MetaData, const char *pszDomain) const +{ + if( m_pDataSet && is_Reading() ) + { + char **pMetaData = m_pDataSet->GetMetadata(pszDomain) + 0; + + if( pMetaData ) + { + while( *pMetaData ) + { + CSG_String s(*pMetaData); + + MetaData.Add_Child(s.BeforeFirst(SG_T('=')), s.AfterFirst(SG_T('='))); + + pMetaData++; + } + + return( true ); + } + } + + return( false ); +} + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +int CSG_GDAL_DataSet::Get_Count(void) const +{ + return( m_pDataSet ? m_pDataSet->GetRasterCount() : 0 ); +} + +//--------------------------------------------------------- +CSG_String CSG_GDAL_DataSet::Get_Name(int i) const +{ + CSG_String Name; + + GDALRasterBand *pBand; + + if( is_Reading() && (pBand = m_pDataSet->GetRasterBand(i + 1)) != NULL ) + { + const char *s; + + //------------------------------------------------- + if( !SG_STR_CMP(m_pDataSet->GetDriver()->GetDescription(), "GRIB") ) + { + if( (s = pBand->GetMetadataItem("GRIB_COMMENT")) != NULL && *s ) + { + Name = s; + + if( (s = pBand->GetMetadataItem("GRIB_ELEMENT" )) != NULL && *s ) { Name += "["; Name += s; Name += "]"; } + if( (s = pBand->GetMetadataItem("GRIB_SHORT_NAME")) != NULL && *s ) { Name += "["; Name += s; Name += "]"; } + if( (s = pBand->GetMetadataItem("GRIB_VALID_TIME")) != NULL && *s ) { Name += CSG_String::Format(SG_T("[%s]"), CSG_Time_Converter::Get_String(atoi(s), SG_TIME_FMT_Seconds_Unix).c_str()); } + } + } + + //------------------------------------------------- + if( !SG_STR_CMP(m_pDataSet->GetDriver()->GetDescription(), "netCDF") ) + { + if( (s = pBand->GetMetadataItem("NETCDF_VARNAME" )) != NULL && *s ) { Name += "["; Name += s; Name += "]"; } + if( (s = pBand->GetMetadataItem("NETCDF_DIMENSION_time" )) != NULL && *s ) { Name += "["; Name += s; Name += "]"; } + if( (s = pBand->GetMetadataItem("NETCDF_DIMENSION_level")) != NULL && *s ) { Name += "["; Name += s; Name += "]"; } + } + + //------------------------------------------------- + if( Name.is_Empty() ) + { + Name = Get_Name(); + + if( Name.is_Empty() ) + { + Name = _TL("Band"); + } + + Name += CSG_String::Format(SG_T(" %0*d"), SG_Get_Digit_Count(Get_Count() + 1), i + 1); + } + } + + return( Name ); +} + +//--------------------------------------------------------- +CSG_String CSG_GDAL_DataSet::Get_Description(int i) const +{ + CSG_String Description; + + GDALRasterBand *pBand; + + if( is_Reading() && (pBand = m_pDataSet->GetRasterBand(i + 1)) != NULL ) + { + char **pMetaData = pBand->GetMetadata() + 0; + + if( pMetaData ) + { + while( *pMetaData ) + { + CSG_String s(*pMetaData); + + Description += s + SG_T("\n"); + + pMetaData++; + } + } + } + + return( Description ); +} + +//--------------------------------------------------------- +bool CSG_GDAL_DataSet::Get_MetaData(int i, CSG_MetaData &MetaData) const +{ + GDALRasterBand *pBand; + + if( is_Reading() && (pBand = m_pDataSet->GetRasterBand(i + 1)) != NULL ) + { + char **pMetaData = pBand->GetMetadata() + 0; + + if( pMetaData ) + { + while( *pMetaData ) + { + CSG_String s(*pMetaData); + + MetaData.Add_Child(s.BeforeFirst(SG_T('=')), s.AfterFirst(SG_T('='))); + + pMetaData++; + } + + return( true ); + } + } + + return( false ); +} + +//--------------------------------------------------------- +const char * CSG_GDAL_DataSet::Get_MetaData_Item(int i, const char *pszName) const +{ + GDALRasterBand *pBand = m_pDataSet->GetRasterBand(i + 1); + + return( pBand ? pBand->GetMetadataItem(pszName) : "" ); +} + +bool CSG_GDAL_DataSet::Get_MetaData_Item(int i, const char *pszName, CSG_String &MetaData) const +{ + GDALRasterBand *pBand; + + if( (pBand = m_pDataSet->GetRasterBand(i + 1)) != NULL ) + { + const char *pMetaData = pBand->GetMetadataItem(pszName); + + if( pMetaData && *pMetaData ) + { + MetaData = pMetaData; + + return( true ); + } + } + + return( false ); +} + +//--------------------------------------------------------- +CSG_Grid * CSG_GDAL_DataSet::Read(int i) +{ + //------------------------------------------------- + if( !is_Reading() ) + { + return( NULL ); + } + + //------------------------------------------------- + GDALRasterBand *pBand = m_pDataSet->GetRasterBand(i + 1); + + if( !pBand ) + { + return( NULL ); + } + + //------------------------------------------------- + TSG_Data_Type Type = gSG_GDAL_Drivers.Get_SAGA_Type(pBand->GetRasterDataType()); + + CSG_Grid *pGrid = SG_Create_Grid(Type, Get_NX(), Get_NY(), Get_Cellsize(), Get_xMin(), Get_yMin()); + + if( !pGrid ) + { + return( NULL ); + } + + //------------------------------------------------- + int bSuccess; + + double zScale = pBand->GetScale (&bSuccess); if( !bSuccess || !zScale ) zScale = 1.0; + double zOffset = pBand->GetOffset(&bSuccess); if( !bSuccess ) zOffset = 0.0; + + pGrid->Set_Name (Get_Name (i)); + pGrid->Set_Description (Get_Description(i)); + pGrid->Set_Unit (CSG_String(pBand->GetUnitType())); + pGrid->Set_Scaling (zScale, zOffset); + + pBand->GetNoDataValue(&bSuccess); + + if( bSuccess ) + { + pGrid->Set_NoData_Value(pBand->GetNoDataValue(&bSuccess)); + } + + pGrid->Get_Projection().Create(Get_Projection(), SG_PROJ_FMT_WKT); + + Get_MetaData(i, pGrid->Get_MetaData()); + + //------------------------------------------------- + double *zLine = (double *)SG_Malloc(Get_NX() * sizeof(double)); + + for(int y=0; yRasterIO(GF_Read, 0, y, Get_NX(), 1, zLine, Get_NX(), 1, GDT_Float64, 0, 0) == CE_None ) + { + for(int x=0; xSet_NoData(x, yy); else + pGrid->Set_Value(x, yy, zLine[x], false); + } + } + } + + SG_Free(zLine); + + return( pGrid ); +} + +//--------------------------------------------------------- +bool CSG_GDAL_DataSet::Write(int i, CSG_Grid *pGrid, double noDataValue) +{ + if( !m_pDataSet || !pGrid || pGrid->Get_NX() != Get_NX() || pGrid->Get_NY() != Get_NY() || i < 0 || i >= Get_Count() ) + { + return( false ); + } + + GDALRasterBand *pBand = m_pDataSet->GetRasterBand(i + 1); + + //----------------------------------------------------- + CPLErr Error = CE_None; + + double *zLine = (double *)SG_Malloc(Get_NX() * sizeof(double)); + + for(int y=0, yy=Get_NY()-1; Error==CE_None && yis_NoData(x, yy) ? noDataValue : pGrid->asDouble(x, yy); + } + + Error = pBand->RasterIO(GF_Write, 0, y, Get_NX(), 1, zLine, Get_NX(), 1, GDT_Float64, 0, 0); + } + + SG_Free(zLine); + + //----------------------------------------------------- + if( Error != CE_None ) + { + SG_UI_Msg_Add_Error(CSG_String::Format(SG_T("%s"), _TL("Writing dataset failed."))); + + return( false ); + } + + //----------------------------------------------------- + pBand->SetNoDataValue (noDataValue); + pBand->SetStatistics (pGrid->Get_ZMin(), pGrid->Get_ZMax(), pGrid->Get_Mean(), pGrid->Get_StdDev()); + + return( true ); +} + +//--------------------------------------------------------- +bool CSG_GDAL_DataSet::Write(int i, CSG_Grid *pGrid) +{ + return (CSG_GDAL_DataSet::Write (i, pGrid, pGrid->Get_NoData_Value())); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +TSG_Data_Type SG_Get_Grid_Type (CSG_Parameter_Grid_List *pGrids) +{ + TSG_Data_Type Type = SG_DATATYPE_Byte; + + if( pGrids ) + { + for(int i=0; iGet_Count(); i++) + { + if( SG_Data_Type_Get_Size(Type) <= SG_Data_Type_Get_Size(pGrids->asGrid(i)->Get_Type()) ) + { + Type = pGrids->asGrid(i)->Get_Type(); + } + } + } + + return( Type ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- diff -Nru saga-2.1.0+dfsg/src/modules/io/io_gdal/gdal_driver.h saga-2.1.4+dfsg/src/modules/io/io_gdal/gdal_driver.h --- saga-2.1.0+dfsg/src/modules/io/io_gdal/gdal_driver.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_gdal/gdal_driver.h 2014-11-13 08:32:20.000000000 +0000 @@ -0,0 +1,233 @@ +/********************************************************** + * Version $Id: gdal_driver.h 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library // +// // +// io_gdal // +// // +//-------------------------------------------------------// +// // +// gdal_driver.h // +// // +// Copyright (C) 2007 O. Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.de // +// // +// contact: Olaf Conrad // +// Bundesstr. 55 // +// D-20146 Hamburg // +// Germany // +// // +/////////////////////////////////////////////////////////// + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#ifndef HEADER_INCLUDED__gdal_driver_H +#define HEADER_INCLUDED__gdal_driver_H + +//--------------------------------------------------------- +#include "MLB_Interface.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +class io_gdal_EXPORT CSG_GDAL_Drivers +{ +public: + CSG_GDAL_Drivers(void); + virtual ~CSG_GDAL_Drivers(void); + + CSG_String Get_Version (void) const; + + int Get_Count (void) const; + + class GDALDriver * Get_Driver (const CSG_String &Name) const; + class GDALDriver * Get_Driver (int Index) const; + + CSG_String Get_Name (int Index) const; + CSG_String Get_Description (int Index) const; + CSG_String Get_Extension (int Index) const; + + bool Can_Read (int Index) const; + bool Can_Write (int Index) const; + + static int Get_GDAL_Type (TSG_Data_Type Type); + static TSG_Data_Type Get_SAGA_Type (int Type); + + +private: + + class GDALDriverManager *m_pDrivers; + +}; + +//--------------------------------------------------------- +io_gdal_EXPORT const CSG_GDAL_Drivers & SG_Get_GDAL_Drivers (void); + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#define SG_GDAL_IO_CLOSED 0x00 +#define SG_GDAL_IO_READ 0x01 +#define SG_GDAL_IO_WRITE 0x02 +#define SG_GDAL_IO_READWRITE (SG_GDAL_IO_READ|IO_WRITE) + +//--------------------------------------------------------- +class io_gdal_EXPORT CSG_GDAL_DataSet +{ +public: + CSG_GDAL_DataSet(void); + CSG_GDAL_DataSet(const CSG_String &File_Name); + virtual ~CSG_GDAL_DataSet(void); + + bool Open_Read (const CSG_String &File_Name); + bool Open_Write (const CSG_String &File_Name, const CSG_String &Driver, const CSG_String &Options, TSG_Data_Type Type, int NBands, const CSG_Grid_System &System, const CSG_Projection &Projection); + bool Close (void); + + bool is_Okay (void) const { return( m_pDataSet != NULL ); } + bool is_Reading (void) const { return( m_pDataSet != NULL && m_Access & SG_GDAL_IO_READ ); } + bool is_Writing (void) const { return( m_pDataSet != NULL && m_Access & SG_GDAL_IO_WRITE ); } + + int Get_NX (void) const { return( m_NX ); } + int Get_NY (void) const { return( m_NY ); } + double Get_Cellsize (void) const { return( m_Cellsize ); } + double Get_xMin (void) const { return( m_xMin ); } + double Get_yMin (void) const { return( m_yMin ); } + double Get_xMax (void) const { return( m_xMin + m_NX * m_Cellsize ); } + double Get_yMax (void) const { return( m_yMin + m_NY * m_Cellsize ); } + + bool Needs_Transform (void) const { return( m_bTransform ); } + void Get_Transform (CSG_Vector &A, CSG_Matrix &B) const { A = m_TF_A; B = m_TF_B; } + + class GDALDriver * Get_Driver (void) const; + CSG_String Get_DriverID (void) const; + CSG_String Get_Name (void) const; + CSG_String Get_Description (void) const; + const char * Get_Projection (void) const; + const char * Get_MetaData_Item (const char *pszName, const char *pszDomain = "") const; + const char ** Get_MetaData (const char *pszDomain = "") const; + bool Get_MetaData_Item (CSG_String &MetaData, const char *pszName, const char *pszDomain = "") const; + bool Get_MetaData (CSG_MetaData &MetaData) const; + bool Get_MetaData (CSG_MetaData &MetaData, const char *pszDomain) const; + + int Get_Count (void) const; + CSG_String Get_Name (int i) const; + CSG_String Get_Description (int i) const; + bool Get_MetaData (int i, CSG_MetaData &MetaData) const; + const char * Get_MetaData_Item (int i, const char *pszName) const; + bool Get_MetaData_Item (int i, const char *pszName, CSG_String &MetaData) const; + CSG_Grid * Read (int i); + bool Write (int i, CSG_Grid *pGrid, double NoDataValue); + bool Write (int i, CSG_Grid *pGrid); + + +private: + + bool m_bTransform; + + int m_Access, m_NX, m_NY; + + double m_xMin, m_yMin, m_Cellsize; + + CSG_Vector m_TF_A; + + CSG_Matrix m_TF_B, m_TF_BInv; + + class GDALDataset *m_pDataSet; + + +public: + + bool to_World (double x, double y, double &xWorld, double &yWorld) + { + if( m_pDataSet ) + { + xWorld = m_TF_A[0] + x * m_TF_B[0][1] + y * m_TF_B[0][1]; + yWorld = m_TF_A[1] + x * m_TF_B[1][0] + y * m_TF_B[1][1]; + + return( true ); + } + + return( false ); + } + + bool from_World (double xWorld, double yWorld, double &x, double &y) + { + if( m_pDataSet ) + { + xWorld -= m_TF_A[0]; + yWorld -= m_TF_A[1]; + + x = xWorld * m_TF_BInv[0][0] + yWorld * m_TF_BInv[0][1]; + y = xWorld * m_TF_BInv[1][0] + yWorld * m_TF_BInv[1][1]; + + return( true ); + } + + return( false ); + } + +}; + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +io_gdal_EXPORT TSG_Data_Type SG_Get_Grid_Type (CSG_Parameter_Grid_List *pGrids); + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#endif // #ifndef HEADER_INCLUDED__gdal_driver_H diff -Nru saga-2.1.0+dfsg/src/modules/io/io_gdal/gdal_export.cpp saga-2.1.4+dfsg/src/modules/io/io_gdal/gdal_export.cpp --- saga-2.1.0+dfsg/src/modules/io/io_gdal/gdal_export.cpp 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_gdal/gdal_export.cpp 2014-11-13 08:32:20.000000000 +0000 @@ -0,0 +1,247 @@ +/********************************************************** + * Version $Id: gdal_export.cpp 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library // +// // +// io_gdal // +// // +//-------------------------------------------------------// +// // +// gdal_export.cpp // +// // +// Copyright (C) 2007 O. Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.de // +// // +// contact: Olaf Conrad // +// Bundesstr. 55 // +// D-20146 Hamburg // +// Germany // +// // +/////////////////////////////////////////////////////////// + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "gdal_export.h" + +#include + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +CGDAL_Export::CGDAL_Export(void) +{ + Set_Name (_TL("GDAL: Export Raster")); + + Set_Author (SG_T("O.Conrad (c) 2007")); + + CSG_String Description, Formats; + + Description = _TW( + "The \"GDAL Raster Export\" module exports one or more grids to various file formats using the " + "\"Geospatial Data Abstraction Library\" (GDAL) by Frank Warmerdam. " + "For more information have a look at the GDAL homepage:\n" + " " + " http://www.gdal.org\n" + ); + + Description += CSG_String::Format(SG_T("\nGDAL %s:%s\n\n"), _TL("Version"), SG_Get_GDAL_Drivers().Get_Version().c_str()); + + Description += _TW( + "Following raster formats are currently supported:\n" + "\n" + ); + + for(int i=0; i\n"), + SG_Get_GDAL_Drivers().Get_Description(i).c_str(), + SG_Get_GDAL_Drivers().Get_Name (i).c_str() + ); + + Formats += CSG_String::Format(SG_T("{%s}%s|"), + SG_Get_GDAL_Drivers().Get_Description(i).c_str(), + SG_Get_GDAL_Drivers().Get_Name (i).c_str() + ); + } + } + + Description += SG_T("
IDName
%s%s
"); + + Set_Description(Description); + + //----------------------------------------------------- + Parameters.Add_Grid_List( + NULL, "GRIDS" , _TL("Grid(s)"), + _TL("The SAGA grids to be exported."), + PARAMETER_INPUT + ); + + Parameters.Add_FilePath( + NULL, "FILE" , _TL("File"), + _TL("The GDAL dataset to be created."), + NULL, NULL, true + ); + + Parameters.Add_Choice( + NULL, "FORMAT" , _TL("Format"), + _TL("The GDAL raster format (driver) to be used."), + Formats + ); + + Parameters.Add_Choice( + NULL, "TYPE" , _TL("Data Type"), + _TL("The GDAL datatype of the created dataset."), + + CSG_String::Format(SG_T("%s|%s|%s|%s|%s|%s|%s|%s|"), + _TL("match input data"), + _TL("8 bit unsigned integer"), + _TL("16 bit unsigned integer"), + _TL("16 bit signed integer"), + _TL("32 bit unsigned integer"), + _TL("32 bit signed integer"), + _TL("32 bit floating point"), + _TL("64 bit floating point") + ), 0 + ); + + Parameters.Add_Value( + NULL, "SET_NODATA" , _TL("Set Custom NoData"), + _TL(""), + PARAMETER_TYPE_Bool, 0.0 + ); + + Parameters.Add_Value( + NULL, "NODATA" , _TL("NoData Value"), + _TL(""), + PARAMETER_TYPE_Double, 0.0 + ); + + Parameters.Add_String( + NULL, "OPTIONS" , _TL("Creation Options"), + _TL("A space separated list of key-value pairs (K=V)."), _TL("") + + ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CGDAL_Export::On_Execute(void) +{ + TSG_Data_Type Type; + CSG_String File_Name, Driver, Options; + CSG_Projection Projection; + CSG_Parameter_Grid_List *pGrids; + CSG_GDAL_DataSet DataSet; + + //----------------------------------------------------- + pGrids = Parameters("GRIDS") ->asGridList(); + File_Name = Parameters("FILE") ->asString(); + Options = Parameters("OPTIONS") ->asString(); + + Get_Projection(Projection); + + //----------------------------------------------------- + switch( Parameters("TYPE")->asInt() ) + { + default: + case 0: Type = SG_Get_Grid_Type(pGrids); break; // match input data + case 1: Type = SG_DATATYPE_Byte; break; // Eight bit unsigned integer + case 2: Type = SG_DATATYPE_Word; break; // Sixteen bit unsigned integer + case 3: Type = SG_DATATYPE_Short; break; // Sixteen bit signed integer + case 4: Type = SG_DATATYPE_DWord; break; // Thirty two bit unsigned integer + case 5: Type = SG_DATATYPE_Int; break; // Thirty two bit signed integer + case 6: Type = SG_DATATYPE_Float; break; // Thirty two bit floating point + case 7: Type = SG_DATATYPE_Double; break; // Sixty four bit floating point + } + + //----------------------------------------------------- + if( !Parameters("FORMAT")->asChoice()->Get_Data(Driver) ) + { + return( false ); + } + + //----------------------------------------------------- + if( !DataSet.Open_Write(File_Name, Driver, Options, Type, pGrids->Get_Count(), *Get_System(), Projection) ) + { + return( false ); + } + + //----------------------------------------------------- + for(int i=0; iGet_Count(); i++) + { + Process_Set_Text(CSG_String::Format(SG_T("%s %d"), _TL("Band"), i + 1)); + + if ( Parameters("SET_NODATA")->asBool() ) + { + DataSet.Write(i, pGrids->asGrid(i), Parameters("NODATA")->asDouble()); + } + else + { + DataSet.Write(i, pGrids->asGrid(i)); + } + } + + if( !DataSet.Close() ) + { + return( false ); + } + + return( true ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- diff -Nru saga-2.1.0+dfsg/src/modules/io/io_gdal/gdal_export_geotiff.cpp saga-2.1.4+dfsg/src/modules/io/io_gdal/gdal_export_geotiff.cpp --- saga-2.1.0+dfsg/src/modules/io/io_gdal/gdal_export_geotiff.cpp 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_gdal/gdal_export_geotiff.cpp 2014-11-13 08:32:20.000000000 +0000 @@ -0,0 +1,160 @@ +/********************************************************** + * Version $Id: gdal_export_geotiff.cpp 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library // +// // +// io_gdal // +// // +//-------------------------------------------------------// +// // +// gdal_export_geotiff.cpp // +// // +// Copyright (C) 2007 O. Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.de // +// // +// contact: Olaf Conrad // +// Bundesstr. 55 // +// D-20146 Hamburg // +// Germany // +// // +/////////////////////////////////////////////////////////// + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "gdal_export_geotiff.h" + +#include + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +CGDAL_Export_GeoTIFF::CGDAL_Export_GeoTIFF(void) +{ + Set_Name (_TL("GDAL: Export Raster to GeoTIFF")); + + Set_Author (SG_T("O.Conrad (c) 2007")); + + Set_Description (_TW( + "The \"GDAL GeoTIFF Export\" module exports one or more grids to a Geocoded Tagged Image File Format using the " + "\"Geospatial Data Abstraction Library\" (GDAL) by Frank Warmerdam. " + "For more information have a look at the GDAL homepage:\n" + " " + " http://www.gdal.org\n" + )); + + //----------------------------------------------------- + Parameters.Add_Grid_List( + NULL, "GRIDS" , _TL("Grid(s)"), + _TL("The SAGA grids to be exported."), + PARAMETER_INPUT + ); + + Parameters.Add_FilePath( + NULL, "FILE" , _TL("File"), + _TL("The GeoTIFF File to be created."), + CSG_String::Format( + SG_T("%s|*.tif;*.tiff|%s|*.*"), + _TL("TIFF files (*.tif)"), + _TL("All Files") + ), NULL, true + ); + + Parameters.Add_String( + NULL, "OPTIONS" , _TL("Creation Options"), + _TL("A space separated list of key-value pairs (K=V)."), _TL("") + + ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CGDAL_Export_GeoTIFF::On_Execute(void) +{ + CSG_String File_Name, Options; + CSG_Projection Projection; + CSG_Parameter_Grid_List *pGrids; + CSG_GDAL_DataSet DataSet; + + //----------------------------------------------------- + pGrids = Parameters("GRIDS") ->asGridList(); + File_Name = Parameters("FILE") ->asString(); + Options = Parameters("OPTIONS") ->asString(); + Get_Projection(Projection); + + //----------------------------------------------------- + if( !DataSet.Open_Write(File_Name, SG_T("GTiff"), Options, SG_Get_Grid_Type(pGrids), pGrids->Get_Count(), *Get_System(), Projection) ) + { + return( false ); + } + + //----------------------------------------------------- + for(int i=0; iGet_Count(); i++) + { + Process_Set_Text(CSG_String::Format(SG_T("%s %d"), _TL("Band"), i + 1)); + + DataSet.Write(i, pGrids->asGrid(i)); + } + + if( !DataSet.Close() ) + { + return( false ); + } + + return( true ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- diff -Nru saga-2.1.0+dfsg/src/modules/io/io_gdal/gdal_export_geotiff.h saga-2.1.4+dfsg/src/modules/io/io_gdal/gdal_export_geotiff.h --- saga-2.1.0+dfsg/src/modules/io/io_gdal/gdal_export_geotiff.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_gdal/gdal_export_geotiff.h 2014-11-13 08:32:20.000000000 +0000 @@ -0,0 +1,94 @@ +/********************************************************** + * Version $Id: gdal_export_geotiff.h 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library // +// // +// io_gdal // +// // +//-------------------------------------------------------// +// // +// gdal_export_geotiff.h // +// // +// Copyright (C) 2007 O. Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.de // +// // +// contact: Olaf Conrad // +// Bundesstr. 55 // +// D-20146 Hamburg // +// Germany // +// // +/////////////////////////////////////////////////////////// + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#ifndef HEADER_INCLUDED__gdal_export_geotiff_H +#define HEADER_INCLUDED__gdal_export_geotiff_H + +//--------------------------------------------------------- +#include "gdal_driver.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +class io_gdal_EXPORT CGDAL_Export_GeoTIFF : public CSG_Module_Grid +{ +public: + CGDAL_Export_GeoTIFF(void); + + +protected: + + virtual bool On_Execute (void); + +}; + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#endif // #ifndef HEADER_INCLUDED__gdal_export_geotiff_H diff -Nru saga-2.1.0+dfsg/src/modules/io/io_gdal/gdal_export.h saga-2.1.4+dfsg/src/modules/io/io_gdal/gdal_export.h --- saga-2.1.0+dfsg/src/modules/io/io_gdal/gdal_export.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_gdal/gdal_export.h 2014-11-13 08:32:20.000000000 +0000 @@ -0,0 +1,95 @@ +/********************************************************** + * Version $Id: gdal_export.h 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library // +// // +// io_gdal // +// // +//-------------------------------------------------------// +// // +// gdal_export.h // +// // +// Copyright (C) 2007 O. Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.de // +// // +// contact: Olaf Conrad // +// Bundesstr. 55 // +// D-20146 Hamburg // +// Germany // +// // +/////////////////////////////////////////////////////////// + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#ifndef HEADER_INCLUDED__gdal_export_H +#define HEADER_INCLUDED__gdal_export_H + +//--------------------------------------------------------- +#include "gdal_driver.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +class io_gdal_EXPORT CGDAL_Export : public CSG_Module_Grid +{ +public: + CGDAL_Export(void); + + +protected: + + virtual bool On_Execute (void); + + +}; + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#endif // #ifndef HEADER_INCLUDED__gdal_export_H diff -Nru saga-2.1.0+dfsg/src/modules/io/io_gdal/gdal_import.cpp saga-2.1.4+dfsg/src/modules/io/io_gdal/gdal_import.cpp --- saga-2.1.0+dfsg/src/modules/io/io_gdal/gdal_import.cpp 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_gdal/gdal_import.cpp 2014-11-13 08:32:20.000000000 +0000 @@ -0,0 +1,529 @@ +/********************************************************** + * Version $Id: gdal_import.cpp 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library // +// // +// io_gdal // +// // +//-------------------------------------------------------// +// // +// gdal_import.cpp // +// // +// Copyright (C) 2007 O. Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.de // +// // +// contact: Olaf Conrad // +// Bundesstr. 55 // +// D-20146 Hamburg // +// Germany // +// // +/////////////////////////////////////////////////////////// + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "gdal_import.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +CGDAL_Import::CGDAL_Import(void) +{ + CSG_Parameter *pNode; + + //----------------------------------------------------- + Set_Name (_TL("GDAL: Import Raster")); + + Set_Author (SG_T("O.Conrad (c) 2007 (A.Ringeler)")); + + CSG_String Description; + + Description = _TW( + "The \"GDAL Raster Import\" module imports grid data from various file formats using the " + "\"Geospatial Data Abstraction Library\" (GDAL) by Frank Warmerdam. " + "For more information have a look at the GDAL homepage:\n" + " " + " http://www.gdal.org\n" + ); + + Description += CSG_String::Format(SG_T("\nGDAL %s:%s\n\n"), _TL("Version"), SG_Get_GDAL_Drivers().Get_Version().c_str()); + + Description += _TW( + "Following raster formats are currently supported:\n" + "\n" + ); + + for(int i=0; i\n"), + SG_Get_GDAL_Drivers().Get_Description(i).c_str(), + SG_Get_GDAL_Drivers().Get_Name (i).c_str() + ); + } + + Description += SG_T("
IDName
%s%s
"); + + Set_Description(Description); + + //----------------------------------------------------- + Parameters.Add_Grid_List( + NULL , "GRIDS" , _TL("Grids"), + _TL(""), + PARAMETER_OUTPUT, false + ); + + Parameters.Add_FilePath( + NULL , "FILES" , _TL("Files"), + _TL(""), + NULL, NULL, false, false, true + ); + + //----------------------------------------------------- + if( SG_UI_Get_Window_Main() ) + { + Parameters.Add_Value( + NULL , "SELECT" , _TL("Select from Multiple Bands"), + _TL(""), + PARAMETER_TYPE_Bool, true + ); + } + + //----------------------------------------------------- + pNode = Parameters.Add_Value( + NULL , "TRANSFORM" , _TL("Transformation"), + _TL("align grid to coordinate system"), + PARAMETER_TYPE_Bool, true + ); + + Parameters.Add_Choice( + pNode , "INTERPOL" , _TL("Interpolation"), + _TL("interpolation method to use if grid needs to be aligned to coordinate system"), + CSG_String::Format(SG_T("%s|%s|%s|%s|%s|"), + _TL("Nearest Neighbor"), + _TL("Bilinear Interpolation"), + _TL("Inverse Distance Interpolation"), + _TL("Bicubic Spline Interpolation"), + _TL("B-Spline Interpolation") + ), 4 + ); + + //----------------------------------------------------- + Add_Parameters("SELECTION", _TL("Select from Multiple Bands"), _TL("")); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +int CGDAL_Import::On_Parameters_Enable(CSG_Parameters *pParameters, CSG_Parameter *pParameter) +{ + if( !SG_STR_CMP(pParameter->Get_Identifier(), SG_T("TRANSFORM")) ) + { + pParameters->Get_Parameter("INTERPOL")->Set_Enabled(pParameter->asBool()); + } + + if( !SG_STR_CMP(pParameters->Get_Identifier(), SG_T("SELECTION")) + && !SG_STR_CMP(pParameter ->Get_Identifier(), SG_T("ALL")) && pParameters->Get_Parameter("BANDS") ) + { + pParameters->Get_Parameter("BANDS")->Set_Enabled(!pParameter->asBool()); + } + + return( 1 ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CGDAL_Import::On_Execute(void) +{ + CSG_Strings Files; + CSG_GDAL_DataSet DataSet; + + //----------------------------------------------------- + if( !Parameters("FILES")->asFilePath()->Get_FilePaths(Files) ) + { + return( false ); + } + + //----------------------------------------------------- + m_pGrids = Parameters("GRIDS")->asGridList(); + m_pGrids ->Del_Items(); + + for(int i=0; iGet_Count() > 0 ); +} + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CGDAL_Import::Load_Sub(CSG_GDAL_DataSet &DataSet) +{ + CSG_MetaData MetaData; + + if( !DataSet.Get_MetaData(MetaData, "SUBDATASETS") ) + { + return( false ); + } + + //----------------------------------------------------- + int i, n; + CSG_Parameters P; + + for(i=0, n=0; i==n; i++) + { + CSG_MetaData *pName = MetaData.Get_Child(CSG_String::Format(SG_T("SUBDATASET_%d_NAME"), i + 1)); + CSG_MetaData *pDesc = MetaData.Get_Child(CSG_String::Format(SG_T("SUBDATASET_%d_DESC"), i + 1)); + + if( pName ) + { + n++; + + Message_Add(CSG_String::Format(SG_T("\n%s"), pName->Get_Content().c_str()), false); + + P.Add_Value(NULL, pName->Get_Content(), pDesc ? pDesc->Get_Content().c_str() : _TL("unnamed"), SG_T(""), PARAMETER_TYPE_Bool, SG_UI_Get_Window_Main() == NULL); + } + } + + if( SG_UI_Get_Window_Main() && !Dlg_Parameters(&P, _TL("Select from Subdatasets...")) ) // with gui + { + return( false ); + } + + //----------------------------------------------------- + for(i=0, n=0; iasBool() && DataSet.Open_Read(P(i)->Get_Identifier()) && Load(DataSet, P(i)->Get_Name()) ) + { + n++; + } + } + + //--------------------------------------------- + return( n > 0 ); +} + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CGDAL_Import::Load(CSG_GDAL_DataSet &DataSet, const CSG_String &Name) +{ + if( !DataSet.is_Reading() ) + { + return( false ); + } + + //----------------------------------------------------- + if( DataSet.Get_Count() <= 0 ) + { + return( Load_Sub(DataSet) ); + } + + //----------------------------------------------------- + CSG_Vector A; + CSG_Matrix B; + + DataSet.Get_Transform(A, B); + + //----------------------------------------------------- + Message_Add(SG_T("\n"), false); + Message_Add(CSG_String::Format(SG_T("\n%s: %s"), _TL("Driver" ), DataSet.Get_DriverID().c_str() ), false); + Message_Add(CSG_String::Format(SG_T("\n%s: %d"), _TL("Bands" ), DataSet.Get_Count() ), false); + Message_Add(CSG_String::Format(SG_T("\n%s: %d"), _TL("Rows" ), DataSet.Get_NX() ), false); + Message_Add(CSG_String::Format(SG_T("\n%s: %d"), _TL("Columns"), DataSet.Get_NY() ), false); + Message_Add(SG_T("\n"), false); + Message_Add(CSG_String::Format(SG_T("\n%s:"), _TL("Transformation") ), false); + Message_Add(CSG_String::Format(SG_T("\n x' = %.6f + x * %.6f + y * %.6f"), A[0], B[0][0], B[0][1]), false); + Message_Add(CSG_String::Format(SG_T("\n y' = %.6f + x * %.6f + y * %.6f"), A[1], B[1][0], B[1][1]), false); + Message_Add(SG_T("\n"), false); + + //----------------------------------------------------- + int i, n; + CSG_Table Bands; + + Bands.Add_Field("NAME", SG_DATATYPE_String); + + for(i=0; iSet_Value(0, DataSet.Get_Name(i)); + } + + Bands.Set_Index(0, TABLE_INDEX_Ascending); + + //----------------------------------------------------- + if( Parameters("SELECT") && Parameters("SELECT")->asBool() && DataSet.Get_Count() > 1 ) + { + CSG_Parameters *pSelection = Get_Parameters("SELECTION"); + pSelection->Add_Value(NULL, "ALL", _TL("Load all bands"), _TL(""), PARAMETER_TYPE_Bool, false); + CSG_Parameter *pNode = pSelection->Add_Node(NULL, "BANDS", _TL("Bands"), _TL("")); + + for(i=0; iAdd_Value(pNode, SG_Get_String(i, 0), pBand->asString(0), _TL(""), PARAMETER_TYPE_Bool, false); + } + + if( Dlg_Parameters("SELECTION") ) + { + for(i=0; iGet_Parameter(0)->asBool() || pSelection->Get_Parameter(i + 2)->asBool() ) + { + Bands.Select(Bands.Get_Record_byIndex(i)->Get_Index(), true); + } + } + } + + pSelection->Del_Parameters(); + + if( Bands.Get_Selection_Count() <= 0 ) + { + return( false ); + } + } + + //----------------------------------------------------- + CSG_Grid_System Transform; + + if( Parameters("TRANSFORM")->asBool() && DataSet.Needs_Transform() ) + { + double s; + CSG_Vector v(2); + CSG_Rect r; + + v[0] = DataSet.Get_xMin(); v[1] = DataSet.Get_yMin(); v = B * v + A; r.Assign(v[0], v[1], v[0], v[1]); + v[0] = DataSet.Get_xMin(); v[1] = DataSet.Get_yMax(); v = B * v + A; r.Union(CSG_Point(v[0], v[1])); + v[0] = DataSet.Get_xMax(); v[1] = DataSet.Get_yMax(); v = B * v + A; r.Union(CSG_Point(v[0], v[1])); + v[0] = DataSet.Get_xMax(); v[1] = DataSet.Get_yMin(); v = B * v + A; r.Union(CSG_Point(v[0], v[1])); + + v[0] = 0; v[1] = 1; v = B * v; s = fabs(v.Get_Length()); + v[0] = 1; v[1] = 0; v = B * v; + + if( s != fabs(v.Get_Length()) ) + { + if( s > fabs(v.Get_Length()) ) + { + s = fabs(v.Get_Length()); + } + + Message_Add(CSG_String::Format(SG_T("\n%s: %s\n\t%s: %f\n"), _TL("warning"), _TL("top-to-bottom and left-to-right cell sizes differ."), _TL("using cellsize"), s), false); + } + + Transform.Assign(s, r); + } + + //----------------------------------------------------- + for(i=0, n=0; iis_Selected() ) + { + Process_Set_Text(CSG_String::Format(SG_T("%s [%d/%d]"), _TL("loading band"), i + 1, DataSet.Get_Count())); + + CSG_Grid *pGrid = DataSet.Read(pBand->Get_Index()); + + if( pGrid != NULL ) + { + n++; + + if( Transform.is_Valid() ) + { + Process_Set_Text(CSG_String::Format(SG_T("%s [%d/%d]"), _TL("band transformation"), i + 1, DataSet.Get_Count())); + + Set_Transformation(&pGrid, Transform, A, B); + } + + pGrid->Set_Name(DataSet.Get_Count() > 1 + ? CSG_String::Format(SG_T("%s [%s]"), Name.c_str(), pGrid->Get_Name()).c_str() + : Name.c_str() + ); + + m_pGrids->Add_Item(pGrid); + + DataObject_Add (pGrid); + DataObject_Set_Colors (pGrid, CSG_Colors(100, SG_COLORS_BLACK_WHITE, false)); + } + } + } + + //----------------------------------------------------- + return( n > 0 ); +} + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +void CGDAL_Import::Set_Transformation(CSG_Grid **ppGrid, const CSG_Grid_System &System, const CSG_Vector &A, const CSG_Matrix &B) +{ + //----------------------------------------------------- + TSG_Grid_Interpolation Interpolation; + + switch( Parameters("INTERPOL")->asInt() ) + { + default: + case 0: Interpolation = GRID_INTERPOLATION_NearestNeighbour; break; + case 1: Interpolation = GRID_INTERPOLATION_Bilinear; break; + case 2: Interpolation = GRID_INTERPOLATION_InverseDistance; break; + case 3: Interpolation = GRID_INTERPOLATION_BicubicSpline; break; + case 4: Interpolation = GRID_INTERPOLATION_BSpline; break; + } + + //----------------------------------------------------- + CSG_Matrix BInv(B.Get_Inverse()); + + CSG_Grid *pImage = *ppGrid; + CSG_Grid *pWorld = *ppGrid = SG_Create_Grid(System, pImage->Get_Type()); + + pWorld->Set_Name (pImage->Get_Name ()); + pWorld->Set_Description (pImage->Get_Description ()); + pWorld->Set_Unit (pImage->Get_Unit ()); + pWorld->Set_Scaling (pImage->Get_Scaling (), pImage->Get_Offset()); + pWorld->Set_NoData_Value_Range(pImage->Get_NoData_Value(), pImage->Get_NoData_hiValue()); + pWorld->Get_MetaData() = pImage->Get_MetaData (); + pWorld->Get_Projection() = pImage->Get_Projection (); + + //----------------------------------------------------- +// #pragma omp parallel for +// for(int y=0; yGet_NY(); y++) +// { +// Process_Get_Okay(); + + for(int y=0; yGet_NY() && Set_Progress(y, pWorld->Get_NY()); y++) + { + #pragma omp parallel for + for(int x=0; xGet_NX(); x++) + { + double z; + CSG_Vector vWorld(2), vImage; + + vWorld[0] = pWorld->Get_XMin() + x * pWorld->Get_Cellsize(); + vWorld[1] = pWorld->Get_YMin() + y * pWorld->Get_Cellsize(); + + vImage = BInv * (vWorld - A); + + if( pImage->Get_Value(vImage[0], vImage[1], z, Interpolation, false, true) ) + { + pWorld->Set_Value(x, y, z); + } + else + { + pWorld->Set_NoData(x, y); + } + } + } + + delete(pImage); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool SG_GDAL_Import (const CSG_String &File_Name) +{ + CGDAL_Import Import; + + if( !Import.Get_Parameters()->Set_Parameter(SG_T("FILES"), File_Name, PARAMETER_TYPE_FilePath) ) + { + return( false ); + } + + if( !Import.Execute() ) + { + return( false ); + } + + CSG_Parameter_Grid_List *pGrids = Import.Get_Parameters()->Get_Parameter(SG_T("GRIDS"))->asGridList(); + + for(int i=0; iGet_Count(); i++) + { + SG_UI_DataObject_Add(pGrids->asGrid(i), SG_UI_DATAOBJECT_UPDATE_ONLY); + } + + return( true ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- diff -Nru saga-2.1.0+dfsg/src/modules/io/io_gdal/gdal_import.h saga-2.1.4+dfsg/src/modules/io/io_gdal/gdal_import.h --- saga-2.1.0+dfsg/src/modules/io/io_gdal/gdal_import.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_gdal/gdal_import.h 2014-11-13 08:32:20.000000000 +0000 @@ -0,0 +1,115 @@ +/********************************************************** + * Version $Id: gdal_import.h 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library // +// // +// io_gdal // +// // +//-------------------------------------------------------// +// // +// gdal_import.h // +// // +// Copyright (C) 2007 O. Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.de // +// // +// contact: Olaf Conrad // +// Bundesstr. 55 // +// D-20146 Hamburg // +// Germany // +// // +/////////////////////////////////////////////////////////// + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#ifndef HEADER_INCLUDED__gdal_import_H +#define HEADER_INCLUDED__gdal_import_H + +//--------------------------------------------------------- +#include "gdal_driver.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +class io_gdal_EXPORT CGDAL_Import : public CSG_Module +{ +public: + CGDAL_Import(void); + + +protected: + + virtual bool On_Execute (void); + + virtual int On_Parameters_Enable (CSG_Parameters *pParameters, CSG_Parameter *pParameter); + + +private: + + CSG_Parameter_Grid_List *m_pGrids; + + + bool Load_Sub (CSG_GDAL_DataSet &DataSet); + bool Load (CSG_GDAL_DataSet &DataSet, const CSG_String &Name); + + void Set_Transformation (CSG_Grid **ppGrid, const CSG_Grid_System &System, const CSG_Vector &A, const CSG_Matrix &B); + +}; + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +io_gdal_EXPORT bool SG_GDAL_Import (const CSG_String &File_Name); + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#endif // #ifndef HEADER_INCLUDED__gdal_import_H diff -Nru saga-2.1.0+dfsg/src/modules/io/io_gdal/gdal_import_netcdf.cpp saga-2.1.4+dfsg/src/modules/io/io_gdal/gdal_import_netcdf.cpp --- saga-2.1.0+dfsg/src/modules/io/io_gdal/gdal_import_netcdf.cpp 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_gdal/gdal_import_netcdf.cpp 2014-11-13 08:32:20.000000000 +0000 @@ -0,0 +1,407 @@ +/********************************************************** + * Version $Id: gdal_import_netcdf.cpp 1379 2012-04-26 11:58:47Z manfred-e $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library // +// // +// io_gdal // +// // +//-------------------------------------------------------// +// // +// gdal_import_netcdf.cpp // +// // +// Copyright (C) 2012 O. Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.de // +// // +// contact: Olaf Conrad // +// Bundesstr. 55 // +// D-20146 Hamburg // +// Germany // +// // +/////////////////////////////////////////////////////////// + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "gdal_import_netcdf.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +CGDAL_Import_NetCDF::CGDAL_Import_NetCDF(void) +{ + CSG_Parameter *pNode; + + //----------------------------------------------------- + Set_Name (_TL("GDAL: Import NetCDF")); + + Set_Author (SG_T("O.Conrad (c) 2012")); + + Set_Description (_TW( + "This module imports grids NetCDF Format using the " + "\"Geospatial Data Abstraction Library\" (GDAL) by Frank Warmerdam. " + "For more information have a look at the GDAL homepage:\n" + " " + " http://www.gdal.org\n" + )); + + //----------------------------------------------------- + Parameters.Add_Grid_List( + NULL , "GRIDS" , _TL("Grids"), + _TL(""), + PARAMETER_OUTPUT + ); + + Parameters.Add_FilePath( + NULL , "FILE" , _TL("File"), + _TL(""), + CSG_String::Format( + SG_T("%s|*.nc|%s|*.*"), + _TL("NetCDF Files (*.nc)"), + _TL("All Files") + ), NULL, false + ); + + pNode = Parameters.Add_Value( + NULL , "SAVE_FILE" , _TL("Save to File"), + _TL("save output to file instead of memory"), + PARAMETER_TYPE_Bool, false + ); + + Parameters.Add_FilePath( + pNode , "SAVE_PATH" , _TL("Save to Path"), + _TL(""), + NULL, NULL, true, true + ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +int CGDAL_Import_NetCDF::On_Parameters_Enable(CSG_Parameters *pParameters, CSG_Parameter *pParameter) +{ + if( !SG_STR_CMP(pParameter->Get_Identifier(), SG_T("SAVE_FILE")) ) + { + pParameters->Get_Parameter("SAVE_PATH")->Set_Enabled(pParameter->asBool()); + } + + if( !SG_STR_CMP(pParameter->Get_Identifier(), SG_T("VARS_ALL" )) && pParameters->Get_Parameter("VARS") ) + { + pParameters->Get_Parameter("VARS" )->Set_Enabled(!pParameter->asBool()); + } + + if( !SG_STR_CMP(pParameter->Get_Identifier(), SG_T("TIME_ALL" )) && pParameters->Get_Parameter("TIME") ) + { + pParameters->Get_Parameter("TIME" )->Set_Enabled(!pParameter->asBool()); + } + + if( !SG_STR_CMP(pParameter->Get_Identifier(), SG_T("LEVEL_ALL")) && pParameters->Get_Parameter("LEVEL") ) + { + pParameters->Get_Parameter("LEVEL")->Set_Enabled(!pParameter->asBool()); + } + + return( 1 ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +const char * CGDAL_Import_NetCDF::Get_Variable(CSG_GDAL_DataSet &DataSet, int iBand) +{ + const char *s = DataSet.Get_MetaData_Item(iBand, "NETCDF_VARNAME"); + + return( s ); +} + +//--------------------------------------------------------- +const char * CGDAL_Import_NetCDF::Get_Time(CSG_GDAL_DataSet &DataSet, int iBand) +{ + const char *s = DataSet.Get_MetaData_Item(iBand, "NETCDF_DIMENSION_time"); + if( !s ) s = DataSet.Get_MetaData_Item(iBand, "NETCDF_DIM_time"); + + return( s ); +} + +//--------------------------------------------------------- +const char * CGDAL_Import_NetCDF::Get_Level(CSG_GDAL_DataSet &DataSet, int iBand) +{ + const char *s = DataSet.Get_MetaData_Item(iBand, "NETCDF_DIMENSION_level"); + if( !s ) s = DataSet.Get_MetaData_Item(iBand, "NETCDF_DIM_level"); + if( !s ) s = DataSet.Get_MetaData_Item(iBand, "NETCDF_DIM_lev"); + + return( s ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +CSG_String CGDAL_Import_NetCDF::Get_Time_String(const CSG_String &Time, int Format) +{ + switch( Format ) + { + case 0: return( CSG_Time_Converter::Get_String(Time.asInt(), SG_TIME_FMT_Hours_AD) ); + + default: return( Time ); + } +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CGDAL_Import_NetCDF::On_Execute(void) +{ + //----------------------------------------------------- + m_pGrids = Parameters("GRIDS")->asGridList(); + m_pGrids ->Del_Items(); + + if( (m_bSaveFile = Parameters("SAVE_FILE")->asBool()) == true ) + { + m_SavePath = Parameters("SAVE_PATH")->asString(); + + if( !SG_Dir_Exists(m_SavePath) ) + { + m_SavePath = SG_File_Get_Path(Parameters("FILE")->asString()); + } + } + + //----------------------------------------------------- + CSG_GDAL_DataSet DataSet; + + if( !DataSet.Open_Read(Parameters("FILE")->asString()) ) + { + Error_Set(CSG_String::Format(SG_T("%s [%s]"), _TL("could not open file"), Parameters("FILE")->asString())); + + return( false ); + } + + if( DataSet.Get_DriverID().Cmp("netCDF") ) + { + Error_Set(CSG_String::Format(SG_T("%s [%s]"), _TL("invalid NetCDF file"), Parameters("FILE")->asString())); + + return( false ); + } + + //----------------------------------------------------- + CSG_MetaData MetaData; + + if( DataSet.Get_Count() <= 0 && DataSet.Get_MetaData(MetaData, "SUBDATASETS") ) + { + int i, n; + + for(i=0, n=0; i==n; i++) + { + CSG_MetaData *pEntry = MetaData.Get_Child(CSG_String::Format(SG_T("SUBDATASET_%d_NAME"), i + 1)); + + if( pEntry && DataSet.Open_Read(pEntry->Get_Content()) ) + { + CSG_String Desc = _TL("unknown"); + + if( (pEntry = MetaData.Get_Child(CSG_String::Format(SG_T("SUBDATASET_%d_DESC"), i + 1))) != NULL ) + { + Desc = pEntry->Get_Content(); + } + + if( Load(DataSet, Desc) ) + { + n++; + } + } + } + + return( n > 0 ); + } + + return( Load(DataSet, SG_File_Get_Name(Parameters("FILE")->asString(), false)) ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CGDAL_Import_NetCDF::Load(CSG_GDAL_DataSet &DataSet, const CSG_String &Description) +{ + const char *s; + int i; + + //----------------------------------------------------- + CSG_MetaData MetaData, *pChild; + + DataSet.Get_MetaData(MetaData); + + //----------------------------------------------------- + int tFmt = -1; + + if( (pChild = MetaData.Get_Child("time#units")) != NULL ) + { + if( pChild->Get_Content().Find("hours since 1-1-1 00:00:0.0") >= 0 ) + { + tFmt = 0; + } + } + + //----------------------------------------------------- + CSG_Parameters P, *pVars = NULL, *pTime = NULL, *pLevel = NULL; + + //----------------------------------------------------- + if( SG_UI_Get_Window_Main() ) + { + CSG_Parameter *pNode; + + P.Create(this, _TL("Import NetCDF"), _TL("")); + P.Set_Callback_On_Parameter_Changed(Get_Parameter_Changed()); + + P.Add_Info_String(NULL , "METADATA", _TL("Metadata"), _TL(""), MetaData.asText(), true); + + pNode = P.Add_Value (NULL , "VARS_ALL" , _TL("All Variables"), _TL(""), PARAMETER_TYPE_Bool, true); + pVars = P.Add_Parameters(pNode, "VARS" , _TL("Selection") , _TL(""))->asParameters(); + + pNode = P.Add_Value (NULL , "TIME_ALL" , _TL("All Times") , _TL(""), PARAMETER_TYPE_Bool, true); + pTime = P.Add_Parameters(pNode, "TIME" , _TL("Selection") , _TL(""))->asParameters(); + + pNode = P.Add_Value (NULL , "LEVEL_ALL" , _TL("All Levels") , _TL(""), PARAMETER_TYPE_Bool, true); + pLevel = P.Add_Parameters(pNode, "LEVEL" , _TL("Selection") , _TL(""))->asParameters(); + + for(i=0; iGet_Parameter(s) ) + pVars ->Add_Value(NULL, s, s, _TL(""), PARAMETER_TYPE_Bool, false); + + if( (s = Get_Time (DataSet, i)) != NULL && !pTime ->Get_Parameter(s) ) + pTime ->Add_Value(NULL, s, Get_Time_String(s, tFmt), _TL(""), PARAMETER_TYPE_Bool, false); + + if( (s = Get_Level (DataSet, i)) != NULL && !pLevel->Get_Parameter(s) ) + pLevel ->Add_Value(NULL, s, s, _TL(""), PARAMETER_TYPE_Bool, false); + } + + P("VARS_ALL" )->Set_Enabled(pVars ->Get_Count() > 1); + P("TIME_ALL" )->Set_Enabled(pTime ->Get_Count() > 1); + P("LEVEL_ALL")->Set_Enabled(pLevel->Get_Count() > 1); + + //------------------------------------------------- + if( !Dlg_Parameters(&P, CSG_String::Format(SG_T("%s: %s"), _TL("Import NetCDF"), Description.c_str())) ) + { + return( false ); + } + + //------------------------------------------------- + if( !P("VARS_ALL" )->is_Enabled() || P("VARS_ALL" )->asBool() ) pVars = NULL; + if( !P("TIME_ALL" )->is_Enabled() || P("TIME_ALL" )->asBool() ) pTime = NULL; + if( !P("LEVEL_ALL")->is_Enabled() || P("LEVEL_ALL")->asBool() ) pLevel = NULL; + } + + //----------------------------------------------------- + for(i=0; iasBool())) + && (!pTime || (!!(pLoad = (*pTime )(Get_Time (DataSet, i))) && pLoad->asBool())) + && (!pLevel || (!!(pLoad = (*pLevel)(Get_Level (DataSet, i))) && pLoad->asBool())) ) + { + SG_UI_Progress_Lock(true); + + if( (pGrid = DataSet.Read(i)) != NULL ) + { + CSG_String Name(_TL("unknown")); + + if( (s = Get_Variable(DataSet, i)) != NULL && *s ) Name = s; + if( (s = Get_Time (DataSet, i)) != NULL && *s ) Name += " [" + Get_Time_String(s, tFmt) + "]"; + if( (s = Get_Level (DataSet, i)) != NULL && *s ) Name += " [" + CSG_String(s) + "]"; + + pGrid->Set_Name(Name); + + if( m_bSaveFile ) + { + Name.Replace(".", "_"); + Name.Replace(":", "-"); + + pGrid->Save(SG_File_Make_Path(m_SavePath, Name)); + + delete(pGrid); + } + else + { + m_pGrids->Add_Item(pGrid); + } + } + + SG_UI_Progress_Lock(false); + } + } + + //----------------------------------------------------- + return( true ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- diff -Nru saga-2.1.0+dfsg/src/modules/io/io_gdal/gdal_import_netcdf.h saga-2.1.4+dfsg/src/modules/io/io_gdal/gdal_import_netcdf.h --- saga-2.1.0+dfsg/src/modules/io/io_gdal/gdal_import_netcdf.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_gdal/gdal_import_netcdf.h 2014-11-13 08:32:20.000000000 +0000 @@ -0,0 +1,114 @@ +/********************************************************** + * Version $Id: gdal_import_netcdf.h 911 2011-02-14 16:38:15Z reklov_w $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library // +// // +// io_gdal // +// // +//-------------------------------------------------------// +// // +// gdal_import_netcdf.h // +// // +// Copyright (C) 2012 O. Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.de // +// // +// contact: Olaf Conrad // +// Bundesstr. 55 // +// D-20146 Hamburg // +// Germany // +// // +/////////////////////////////////////////////////////////// + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#ifndef HEADER_INCLUDED__gdal_import_netcdf_H +#define HEADER_INCLUDED__gdal_import_netcdf_H + +//--------------------------------------------------------- +#include "gdal_driver.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +class io_gdal_EXPORT CGDAL_Import_NetCDF : public CSG_Module +{ +public: + CGDAL_Import_NetCDF(void); + + +protected: + + virtual bool On_Execute (void); + + virtual int On_Parameters_Enable (CSG_Parameters *pParameters, CSG_Parameter *pParameter); + + +private: + + bool m_bSaveFile; + + CSG_String m_SavePath; + + CSG_Parameter_Grid_List *m_pGrids; + + + bool Load (CSG_GDAL_DataSet &DataSet, const CSG_String &Description); + + const char * Get_Variable (CSG_GDAL_DataSet &DataSet, int iBand); + const char * Get_Time (CSG_GDAL_DataSet &DataSet, int iBand); + const char * Get_Level (CSG_GDAL_DataSet &DataSet, int iBand); + + CSG_String Get_Time_String (const CSG_String &Time, int Format); + +}; + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#endif // #ifndef HEADER_INCLUDED__gdal_import_netcdf_H diff -Nru saga-2.1.0+dfsg/src/modules/io/io_gdal/Makefile.am saga-2.1.4+dfsg/src/modules/io/io_gdal/Makefile.am --- saga-2.1.0+dfsg/src/modules/io/io_gdal/Makefile.am 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_gdal/Makefile.am 2014-11-13 08:32:20.000000000 +0000 @@ -0,0 +1,39 @@ +# +# $Id: Makefile.am 1465 2012-08-23 09:20:00Z oconrad $ +# +if DEBUG +DBGFLAGS = -g -DDEBUG +endif +if SAGA_UNICODE +UC_DEFS = -D_SAGA_UNICODE +endif +DEP_LIBS = `gdal-config --libs` +DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD +CXX_INCS = -I$(top_srcdir)/src/saga_core `gdal-config --cflags` +AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS) +AM_LDFLAGS = -fPIC -shared -avoid-version $(DEP_LIBS) +pkglib_LTLIBRARIES = libio_gdal.la +libio_gdal_la_SOURCES =\ +gdal_driver.cpp\ +gdal_export.cpp\ +gdal_export_geotiff.cpp\ +gdal_import.cpp\ +gdal_import_netcdf.cpp\ +MLB_Interface.cpp\ +ogr_driver.cpp\ +ogr_export.cpp\ +ogr_export_kml.cpp\ +ogr_import.cpp\ +gdal_driver.h\ +gdal_export.h\ +gdal_export_geotiff.h\ +gdal_import.h\ +gdal_import_netcdf.h\ +MLB_Interface.h\ +ogr_driver.h\ +ogr_export.h\ +ogr_export_kml.h\ +ogr_import.h + +libio_gdal_la_LIBADD = $(top_srcdir)/src/saga_core/saga_api/libsaga_api.la + diff -Nru saga-2.1.0+dfsg/src/modules/io/io_gdal/Makefile.in saga-2.1.4+dfsg/src/modules/io/io_gdal/Makefile.in --- saga-2.1.0+dfsg/src/modules/io/io_gdal/Makefile.in 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_gdal/Makefile.in 2014-11-13 08:33:32.000000000 +0000 @@ -0,0 +1,727 @@ +# Makefile.in generated by automake 1.14.1 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +subdir = src/modules/io/io_gdal +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_postgresql.m4 \ + $(top_srcdir)/m4/ax_pkg_swig.m4 \ + $(top_srcdir)/m4/ax_python_devel.m4 \ + $(top_srcdir)/m4/ax_swig_enable_cxx.m4 \ + $(top_srcdir)/m4/ax_swig_python.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__installdirs = "$(DESTDIR)$(pkglibdir)" +LTLIBRARIES = $(pkglib_LTLIBRARIES) +libio_gdal_la_DEPENDENCIES = \ + $(top_srcdir)/src/saga_core/saga_api/libsaga_api.la +am_libio_gdal_la_OBJECTS = gdal_driver.lo gdal_export.lo \ + gdal_export_geotiff.lo gdal_import.lo gdal_import_netcdf.lo \ + MLB_Interface.lo ogr_driver.lo ogr_export.lo ogr_export_kml.lo \ + ogr_import.lo +libio_gdal_la_OBJECTS = $(am_libio_gdal_la_OBJECTS) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) +depcomp = $(SHELL) $(top_srcdir)/depcomp +am__depfiles_maybe = depfiles +am__mv = mv -f +CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = +CXXLD = $(CXX) +CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = +CCLD = $(CC) +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = +SOURCES = $(libio_gdal_la_SOURCES) +DIST_SOURCES = $(libio_gdal_la_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +AX_SWIG_PYTHON_CPPFLAGS = @AX_SWIG_PYTHON_CPPFLAGS@ +AX_SWIG_PYTHON_OPT = @AX_SWIG_PYTHON_OPT@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DISABLELIBHARU = @DISABLELIBHARU@ +DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +FGREP = @FGREP@ +GOMPFLAGS = @GOMPFLAGS@ +GREP = @GREP@ +HARU_LIB = @HARU_LIB@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LOCAL_INCS = @LOCAL_INCS@ +LOCAL_LIBS = @LOCAL_LIBS@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ +MKDIR_P = @MKDIR_P@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PG_CONFIG = @PG_CONFIG@ +POSTGRESQL_CFLAGS = @POSTGRESQL_CFLAGS@ +POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@ +POSTGRESQL_VERSION = @POSTGRESQL_VERSION@ +POW_LIB = @POW_LIB@ +PYTHON = @PYTHON@ +PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ +PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ +PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ +PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_PLATFORM = @PYTHON_PLATFORM@ +PYTHON_PREFIX = @PYTHON_PREFIX@ +PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ +PYTHON_VERSION = @PYTHON_VERSION@ +RANLIB = @RANLIB@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +SWIG = @SWIG@ +SWIG_LIB = @SWIG_LIB@ +VERSION = @VERSION@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +pkgpyexecdir = @pkgpyexecdir@ +pkgpythondir = @pkgpythondir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +pyexecdir = @pyexecdir@ +pythondir = @pythondir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ + +# +# $Id: Makefile.am 1465 2012-08-23 09:20:00Z oconrad $ +# +@DEBUG_TRUE@DBGFLAGS = -g -DDEBUG +@SAGA_UNICODE_TRUE@UC_DEFS = -D_SAGA_UNICODE +DEP_LIBS = `gdal-config --libs` +DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD +CXX_INCS = -I$(top_srcdir)/src/saga_core `gdal-config --cflags` +AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS) +AM_LDFLAGS = -fPIC -shared -avoid-version $(DEP_LIBS) +pkglib_LTLIBRARIES = libio_gdal.la +libio_gdal_la_SOURCES = \ +gdal_driver.cpp\ +gdal_export.cpp\ +gdal_export_geotiff.cpp\ +gdal_import.cpp\ +gdal_import_netcdf.cpp\ +MLB_Interface.cpp\ +ogr_driver.cpp\ +ogr_export.cpp\ +ogr_export_kml.cpp\ +ogr_import.cpp\ +gdal_driver.h\ +gdal_export.h\ +gdal_export_geotiff.h\ +gdal_import.h\ +gdal_import_netcdf.h\ +MLB_Interface.h\ +ogr_driver.h\ +ogr_export.h\ +ogr_export_kml.h\ +ogr_import.h + +libio_gdal_la_LIBADD = $(top_srcdir)/src/saga_core/saga_api/libsaga_api.la +all: all-am + +.SUFFIXES: +.SUFFIXES: .cpp .lo .o .obj +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/modules/io/io_gdal/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign src/modules/io/io_gdal/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): + +install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) + @$(NORMAL_INSTALL) + @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ + list2=; for p in $$list; do \ + if test -f $$p; then \ + list2="$$list2 $$p"; \ + else :; fi; \ + done; \ + test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \ + } + +uninstall-pkglibLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ + for p in $$list; do \ + $(am__strip_dir) \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$f"; \ + done + +clean-pkglibLTLIBRARIES: + -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES) + @list='$(pkglib_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + +libio_gdal.la: $(libio_gdal_la_OBJECTS) $(libio_gdal_la_DEPENDENCIES) $(EXTRA_libio_gdal_la_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) -rpath $(pkglibdir) $(libio_gdal_la_OBJECTS) $(libio_gdal_la_LIBADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MLB_Interface.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdal_driver.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdal_export.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdal_export_geotiff.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdal_import.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdal_import_netcdf.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ogr_driver.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ogr_export.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ogr_export_kml.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ogr_import.Plo@am__quote@ + +.cpp.o: +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< + +.cpp.obj: +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + +.cpp.lo: +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + set x; \ + here=`pwd`; \ + $(am__define_uniq_tagged_files); \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ + fi +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ + test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(LTLIBRARIES) +installdirs: + for dir in "$(DESTDIR)$(pkglibdir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool clean-pkglibLTLIBRARIES \ + mostlyclean-am + +distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: install-pkglibLTLIBRARIES + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-pkglibLTLIBRARIES + +.MAKE: install-am install-strip + +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-pkglibLTLIBRARIES install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ + uninstall-pkglibLTLIBRARIES + + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nru saga-2.1.0+dfsg/src/modules/io/io_gdal/MLB_Interface.cpp saga-2.1.4+dfsg/src/modules/io/io_gdal/MLB_Interface.cpp --- saga-2.1.0+dfsg/src/modules/io/io_gdal/MLB_Interface.cpp 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_gdal/MLB_Interface.cpp 2014-11-13 08:32:20.000000000 +0000 @@ -0,0 +1,148 @@ +/********************************************************** + * Version $Id: MLB_Interface.cpp 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// Grid_IO_GDAL // +// // +//-------------------------------------------------------// +// // +// MLB_Interface.cpp // +// // +// Copyright (C) 2003 by // +// Author // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: author@email.de // +// // +// contact: Author // +// Sesame Street 7 // +// 12345 Metropolis // +// Nirwana // +// // +/////////////////////////////////////////////////////////// + + +/////////////////////////////////////////////////////////// +// // +// The Module Link Library Interface // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +// 1. Include the appropriate SAGA-API header... + +#include "gdal_driver.h" + + +//--------------------------------------------------------- +// 2. Place general module library informations here... + +CSG_String Get_Info(int i) +{ + switch( i ) + { + case MLB_INFO_Name: default: + return( _TL("GDAL/OGR") ); + + case MLB_INFO_Category: + return( _TL("Import/Export") ); + + case MLB_INFO_Author: + return( _TL("SAGA User Group Associaton (c) 2008" )); + + case MLB_INFO_Description: + return( CSG_String::Format(SG_T("%s\n%s %s\n%s: %s"), + _TL("Interface to Frank Warmerdam's Geospatial Data Abstraction Library (GDAL)."), + _TL("Version"), SG_Get_GDAL_Drivers().Get_Version().c_str(), + _TL("Homepage"), SG_T("www.gdal.org\n") + )); + + case MLB_INFO_Version: + return( SG_T("2.0") ); + + case MLB_INFO_Menu_Path: + return( _TL("File|GDAL/OGR") ); + } +} + + +//--------------------------------------------------------- +// 3. Include the headers of your modules here... + +#include "gdal_import.h" +#include "gdal_export.h" +#include "gdal_export_geotiff.h" +#include "gdal_import_netcdf.h" + +#include "ogr_import.h" +#include "ogr_export.h" +#include "ogr_export_kml.h" + + +//--------------------------------------------------------- +// 4. Allow your modules to be created here... + +CSG_Module * Create_Module(int i) +{ + switch( i ) + { + case 0: return( new CGDAL_Import ); + case 1: return( new CGDAL_Export ); + case 2: return( new CGDAL_Export_GeoTIFF ); + + case 3: return( new COGR_Import ); + case 4: return( new COGR_Export ); + + case 5: return( new COGR_Export_KML ); + + case 6: return( SG_Get_GDAL_Drivers().Get_Driver("netCDF") ? new CGDAL_Import_NetCDF : NULL ); + + //----------------------------------------------------- + case 9: return( NULL ); + default: return( MLB_INTERFACE_SKIP_MODULE ); + } + + return( NULL ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +//{{AFX_SAGA + + MLB_INTERFACE + +//}}AFX_SAGA diff -Nru saga-2.1.0+dfsg/src/modules/io/io_gdal/MLB_Interface.h saga-2.1.4+dfsg/src/modules/io/io_gdal/MLB_Interface.h --- saga-2.1.0+dfsg/src/modules/io/io_gdal/MLB_Interface.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_gdal/MLB_Interface.h 2014-11-13 08:32:20.000000000 +0000 @@ -0,0 +1,82 @@ +/********************************************************** + * Version $Id: MLB_Interface.h 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library // +// // +// io_gdal // +// // +//-------------------------------------------------------// +// // +// MLB_Interface.h // +// // +// Copyright (C) 2007 O. Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.de // +// // +// contact: Olaf Conrad // +// Bundesstr. 55 // +// D-20146 Hamburg // +// Germany // +// // +/////////////////////////////////////////////////////////// + + + +/////////////////////////////////////////////////////////// +// // +// Include the SAGA-API here // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#ifndef HEADER_INCLUDED__io_gdal_H +#define HEADER_INCLUDED__io_gdal_H + +//--------------------------------------------------------- +#include + +//--------------------------------------------------------- +#ifdef io_gdal_EXPORTS + #define io_gdal_EXPORT _SAGA_DLL_EXPORT +#else + #define io_gdal_EXPORT _SAGA_DLL_IMPORT +#endif + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#endif // #ifndef HEADER_INCLUDED__io_gdal_H diff -Nru saga-2.1.0+dfsg/src/modules/io/io_gdal/ogr_driver.cpp saga-2.1.4+dfsg/src/modules/io/io_gdal/ogr_driver.cpp --- saga-2.1.0+dfsg/src/modules/io/io_gdal/ogr_driver.cpp 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_gdal/ogr_driver.cpp 2014-11-13 08:32:20.000000000 +0000 @@ -0,0 +1,863 @@ +/********************************************************** + * Version $Id: ogr_driver.cpp 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library // +// // +// io_gdal // +// // +//-------------------------------------------------------// +// // +// ogr_driver.cpp // +// // +// Copyright (C) 2008 by O. Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.de // +// // +// contact: Olaf Conrad // +// Bundesstr. 55 // +// D-20146 Hamburg // +// Germany // +// // +/////////////////////////////////////////////////////////// + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "ogr_driver.h" + +#include +#include +#include + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +CSG_OGR_Drivers gSG_OGR_Drivers; + +const CSG_OGR_Drivers & SG_Get_OGR_Drivers (void) +{ + return( gSG_OGR_Drivers ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +CSG_OGR_Drivers::CSG_OGR_Drivers(void) +{ + OGRRegisterAll(); + + m_pDrivers = OGRSFDriverRegistrar::GetRegistrar(); +} + +//--------------------------------------------------------- +CSG_OGR_Drivers::~CSG_OGR_Drivers(void) +{ +// OGRCleanupAll(); +} + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +int CSG_OGR_Drivers::Get_Count(void) const +{ + return( m_pDrivers->GetDriverCount() ); +} + +//--------------------------------------------------------- +OGRSFDriver * CSG_OGR_Drivers::Get_Driver(int Index) const +{ + return( m_pDrivers->GetDriver(Index) ); +} + +//--------------------------------------------------------- +OGRSFDriver * CSG_OGR_Drivers::Get_Driver(const CSG_String &Name) const +{ + return( m_pDrivers ? m_pDrivers->GetDriverByName(Name) : NULL ); +} + +//--------------------------------------------------------- +CSG_String CSG_OGR_Drivers::Get_Name(int Index) const +{ + return( m_pDrivers->GetDriver(Index)->GetName() ); +} + +//--------------------------------------------------------- +CSG_String CSG_OGR_Drivers::Get_Description(int Index) const +{ + OGRSFDriver *pDriver = m_pDrivers->GetDriver(Index); + CSG_String s; + + s += pDriver->TestCapability(ODrCCreateDataSource) ? SG_T("\n[x] ") : SG_T("\n[ ] "); + s += _TL("create data source"); + + s += pDriver->TestCapability(ODrCDeleteDataSource) ? SG_T("\n[x] ") : SG_T("\n[ ] "); + s += _TL("delete data source"); + +/* s += pDriver->TestCapability(ODsCCreateLayer) ? SG_T("\n[x]") : SG_T("\n[ ]"); + s += _TL("create layer"); + + s += pDriver->TestCapability(ODsCDeleteLayer) ? SG_T("\n[x]") : SG_T("\n[ ]"); + s += _TL("delete layer"); + + s += pDriver->TestCapability(OLCDeleteFeature) ? SG_T("\n[x]") : SG_T("\n[ ]"); + s += _TL("delete feature"); + + s += pDriver->TestCapability(OLCRandomRead) ? SG_T("\n[x]") : SG_T("\n[ ]"); + s += _TL("random read"); + + s += pDriver->TestCapability(OLCRandomWrite) ? SG_T("\n[x]") : SG_T("\n[ ]"); + s += _TL("random write"); + + s += pDriver->TestCapability(OLCSequentialWrite) ? SG_T("\n[x]") : SG_T("\n[ ]"); + s += _TL("sequential write"); +/**/ + + return( s ); +} + +//--------------------------------------------------------- +bool CSG_OGR_Drivers::Can_Read(int Index) const +{ + return( Get_Driver(Index) != NULL ); +} + +//--------------------------------------------------------- +bool CSG_OGR_Drivers::Can_Write(int Index) const +{ + return( Get_Driver(Index) != NULL );//&& Get_Driver(Index)->TestCapability(ODrCCreateDataSource) ); +} + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +TSG_Vertex_Type CSG_OGR_Drivers::Get_Vertex_Type(int Type) +{ + switch( Type ) + { + case wkbPoint25D: // 2.5D extension as per 99-402 + case wkbMultiPoint25D: // 2.5D extension as per 99-402 + case wkbLineString25D: // 2.5D extension as per 99-402 + case wkbMultiLineString25D: // 2.5D extension as per 99-402 + case wkbPolygon25D: // 2.5D extension as per 99-402 + case wkbMultiPolygon25D: // 2.5D extension as per 99-402 + case wkbGeometryCollection25D: // 2.5D extension as per 99-402 + return( SG_VERTEX_TYPE_XYZ ); + + default: + return( SG_VERTEX_TYPE_XY ); + } +} + +//--------------------------------------------------------- +TSG_Shape_Type CSG_OGR_Drivers::Get_Shape_Type(int Type) +{ + switch( Type ) + { + case wkbPoint: // 0-dimensional geometric object, standard WKB + case wkbPoint25D: // 2.5D extension as per 99-402 + return( SHAPE_TYPE_Point ); + + case wkbMultiPoint: // GeometryCollection of Points, standard WKB + case wkbMultiPoint25D: // 2.5D extension as per 99-402 + return( SHAPE_TYPE_Points ); + + case wkbLineString: // 1-dimensional geometric object with linear interpolation between Points, standard WKB + case wkbMultiLineString: // GeometryCollection of LineStrings, standard WKB + case wkbLineString25D: // 2.5D extension as per 99-402 + case wkbMultiLineString25D: // 2.5D extension as per 99-402 + return( SHAPE_TYPE_Line ); + + case wkbPolygon: // planar 2-dimensional geometric object defined by 1 exterior boundary and 0 or more interior boundaries, standard WKB + case wkbMultiPolygon: // GeometryCollection of Polygons, standard WKB + case wkbPolygon25D: // 2.5D extension as per 99-402 + case wkbMultiPolygon25D: // 2.5D extension as per 99-402 + return( SHAPE_TYPE_Polygon ); + + default: + case wkbUnknown: // unknown type, non-standard + case wkbNone: // non-standard, for pure attribute records + case wkbLinearRing: // non-standard, just for createGeometry() + case wkbGeometryCollection: // geometric object that is a collection of 1 or more geometric objects, standard WKB + case wkbGeometryCollection25D: // 2.5D extension as per 99-402 + return( SHAPE_TYPE_Undefined ); + } +} + +//--------------------------------------------------------- +int CSG_OGR_Drivers::Get_Shape_Type(TSG_Shape_Type Type, bool bZ) +{ + switch( Type ) + { + case SHAPE_TYPE_Point: return( bZ ? wkbPoint25D : wkbPoint ); // point + case SHAPE_TYPE_Points: return( bZ ? wkbMultiPoint25D : wkbMultiPoint ); // points + case SHAPE_TYPE_Line: return( bZ ? wkbMultiLineString25D : wkbMultiLineString ); // line + case SHAPE_TYPE_Polygon: return( bZ ? wkbMultiPolygon25D : wkbMultiPolygon ); // polygon + + default: return( wkbUnknown ); + } +} + +//--------------------------------------------------------- +TSG_Data_Type CSG_OGR_Drivers::Get_Data_Type(int Type) +{ + switch( Type ) + { + case OFTInteger: // Simple 32bit integer + return( SG_DATATYPE_Int ); + + case OFTReal: // Double Precision floating point + return( SG_DATATYPE_Double ); + + case OFTString: // String of ASCII chars + return( SG_DATATYPE_String ); + + case OFTDateTime: // Date and Time + return( SG_DATATYPE_Date ); + + default: + case OFTIntegerList: // List of 32bit integers + case OFTRealList: // List of doubles + case OFTStringList: // Array of strings + case OFTWideString: // deprecated + case OFTWideStringList: // deprecated + case OFTBinary: // Raw Binary data + case OFTDate: // Date + case OFTTime: // Time + return( SG_DATATYPE_String ); + } +} + +//--------------------------------------------------------- +int CSG_OGR_Drivers::Get_Data_Type(TSG_Data_Type Type) +{ + switch( Type ) + { + default: + case SG_DATATYPE_String: + case SG_DATATYPE_Date: + return( OFTString ); + + case SG_DATATYPE_Byte: + case SG_DATATYPE_Char: + case SG_DATATYPE_Word: + case SG_DATATYPE_Short: + case SG_DATATYPE_DWord: + case SG_DATATYPE_Int: + case SG_DATATYPE_ULong: + case SG_DATATYPE_Long: + case SG_DATATYPE_Color: + return( OFTInteger ); + + case SG_DATATYPE_Float: + case SG_DATATYPE_Double: + return( OFTReal ); + } +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +CSG_OGR_DataSource::CSG_OGR_DataSource(void) +{ + m_pDataSource = NULL; +} + +CSG_OGR_DataSource::CSG_OGR_DataSource(const CSG_String &File) +{ + m_pDataSource = NULL; + + Create(File); +} + +//--------------------------------------------------------- +CSG_OGR_DataSource::~CSG_OGR_DataSource(void) +{ + Destroy(); +} + +//--------------------------------------------------------- +bool CSG_OGR_DataSource::Create(const CSG_String &File) +{ + Destroy(); + + m_pDataSource = OGRSFDriverRegistrar::Open(File); + + return( m_pDataSource != NULL ); +} + +bool CSG_OGR_DataSource::Create(const CSG_String &File, const CSG_String &DriverName) +{ + OGRSFDriver *pDriver; + + Destroy(); + + if( (pDriver = gSG_OGR_Drivers.Get_Driver(DriverName)) != NULL ) + { + m_pDataSource = pDriver->CreateDataSource(File, NULL); + } + + return( m_pDataSource != NULL ); +} + +//--------------------------------------------------------- +bool CSG_OGR_DataSource::Destroy(void) +{ + if( m_pDataSource ) + { + OGRDataSource::DestroyDataSource(m_pDataSource); + + m_pDataSource = NULL; + } + + return( true ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +int CSG_OGR_DataSource::Get_Count(void) +{ + if( m_pDataSource ) + { + return( m_pDataSource->GetLayerCount() ); + } + + return( 0 ); +} + +//--------------------------------------------------------- +OGRLayer * CSG_OGR_DataSource::Get_Layer(int iLayer) +{ + if( m_pDataSource && iLayer >= 0 && iLayer < m_pDataSource->GetLayerCount() ) + { + return( m_pDataSource->GetLayer(iLayer) ); + } + + return( NULL ); +} + +//--------------------------------------------------------- +TSG_Shape_Type CSG_OGR_DataSource::Get_Type(int iLayer) +{ + if( Get_Layer(iLayer) ) + { + return( CSG_OGR_Drivers::Get_Shape_Type(Get_Layer(iLayer)->GetLayerDefn()->GetGeomType()) ); + } + + return( SHAPE_TYPE_Undefined ); +} + +//--------------------------------------------------------- +TSG_Vertex_Type CSG_OGR_DataSource::Get_Coordinate_Type(int iLayer) +{ + if( Get_Layer(iLayer) ) + { + return( CSG_OGR_Drivers::Get_Vertex_Type(Get_Layer(iLayer)->GetLayerDefn()->GetGeomType()) ); + } + + return( SG_VERTEX_TYPE_XY ); +} + +//--------------------------------------------------------- +CSG_Projection CSG_OGR_DataSource::Get_Projection(int iLayer) +{ + CSG_Projection Projection; + + if( Get_Layer(iLayer) && Get_Layer(iLayer)->GetSpatialRef() ) + { + char *p = NULL; + + //------------------------------------------------- + if( !Projection.is_Okay() && Get_Layer(iLayer)->GetSpatialRef()->exportToWkt (&p) == OGRERR_NONE && p && *p ) + { + Projection.Create(p, SG_PROJ_FMT_WKT); + } + + if( p ) { OGRFree(p); p = NULL; } + + //------------------------------------------------- + if( !Projection.is_Okay() && Get_Layer(iLayer)->GetSpatialRef()->exportToProj4(&p) == OGRERR_NONE && p && *p ) + { + Projection.Create(p, SG_PROJ_FMT_Proj4); + } + + if( p ) { OGRFree(p); p = NULL; } + } + + return( Projection ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +CSG_Shapes * CSG_OGR_DataSource::Read(int iLayer, int iGeomTypeChoice) +{ + //----------------------------------------------------- + OGRLayer *pLayer = Get_Layer(iLayer); + + if( !pLayer ) + { + return( NULL ); + } + + if( iGeomTypeChoice != 0 ) + { + pLayer->GetLayerDefn()->SetGeomType((OGRwkbGeometryType)_Get_GeomType_Choice(iGeomTypeChoice)); + } + + if( Get_Type(iLayer) == SHAPE_TYPE_Undefined ) + { + return( NULL ); + } + + //----------------------------------------------------- + OGRFeatureDefn *pDef = pLayer->GetLayerDefn(); + CSG_Shapes *pShapes = SG_Create_Shapes(Get_Type(iLayer), CSG_String(pDef->GetName()), NULL, Get_Coordinate_Type(iLayer)); + + pShapes->Get_Projection() = Get_Projection(iLayer); + + //----------------------------------------------------- + int iField; + + for(iField=0; iFieldGetFieldCount(); iField++) + { + OGRFieldDefn *pDefField = pDef->GetFieldDefn(iField); + + pShapes->Add_Field(pDefField->GetNameRef(), CSG_OGR_Drivers::Get_Data_Type(pDefField->GetType())); + } + + //----------------------------------------------------- + OGRFeature *pFeature; + + pLayer->ResetReading(); + + while( (pFeature = pLayer->GetNextFeature()) != NULL && SG_UI_Process_Get_Okay(false) ) + { + OGRGeometry *pGeometry = pFeature->GetGeometryRef(); + + if( pGeometry != NULL ) + { + CSG_Shape *pShape = pShapes->Add_Shape(); + + for(iField=0; iFieldGetFieldCount(); iField++) + { + OGRFieldDefn *pDefField = pDef->GetFieldDefn(iField); + + switch( pDefField->GetType() ) + { + default: pShape->Set_Value(iField, pFeature->GetFieldAsString (iField)); break; + case OFTString: pShape->Set_Value(iField, pFeature->GetFieldAsString (iField)); break; + case OFTInteger: pShape->Set_Value(iField, pFeature->GetFieldAsInteger(iField)); break; + case OFTReal: pShape->Set_Value(iField, pFeature->GetFieldAsDouble (iField)); break; + } + } + + //--------------------------------------------- + if( _Read_Geometry(pShape, pGeometry) == false ) + { + pShapes->Del_Shape(pShape); + } + } + + OGRFeature::DestroyFeature(pFeature); + } + + return( pShapes ); +} + +//--------------------------------------------------------- +int CSG_OGR_DataSource::_Get_GeomType_Choice(int iGeomTypeChoice) +{ + switch( iGeomTypeChoice ) + { + default: + case AUTOMATIC: return( wkbUnknown ); + case WKBPOINT: return( wkbPoint ); + case WKBPOINT25D: return( wkbPoint25D ); + case WKBMULTIPOINT: return( wkbMultiPoint ); + case WKBMULTIPOINT25D: return( wkbMultiPoint25D ); + case WKBLINESTRING: return( wkbLineString ); + case WKBLINESTRING25D: return( wkbLineString25D ); + case WKBMULTILINESTRING: return( wkbMultiLineString ); + case WKBMULTILINESTRING25D: return( wkbMultiLineString25D ); + case WKBPOLYGON: return( wkbPolygon ); + case WKBPOLYGON25D: return( wkbPolygon25D ); + case WKBMULTIPOLYGON: return( wkbMultiPolygon ); + case WKBMULTIPOLYGON25D: return( wkbMultiPolygon25D ); + case WKBGEOMETRYCOLLECTION: return( wkbGeometryCollection ); + case WKBGEOMETRYCOLLECTION25D: return( wkbGeometryCollection25D ); + } +} + +//--------------------------------------------------------- +bool CSG_OGR_DataSource::_Read_Geometry(CSG_Shape *pShape, OGRGeometry *pGeometry) +{ + if( pShape && pGeometry ) + { + switch( pGeometry->getGeometryType() ) + { + //------------------------------------------------- + case wkbPoint: // 0-dimensional geometric object, standard WKB + case wkbPoint25D: // 2.5D extension as per 99-402 + pShape->Add_Point(((OGRPoint *)pGeometry)->getX(), ((OGRPoint *)pGeometry)->getY()); + pShape->Set_Z(((OGRPoint *)pGeometry)->getZ(), 0); + return( true ); + + //------------------------------------------------- + case wkbLineString: // 1-dimensional geometric object with linear interpolation between Points, standard WKB + case wkbLineString25D: // 2.5D extension as per 99-402 + return( _Read_Line(pShape, (OGRLineString *)pGeometry) ); + + //------------------------------------------------- + case wkbPolygon: // planar 2-dimensional geometric object defined by 1 exterior boundary and 0 or more interior boundaries, standard WKB + case wkbPolygon25D: // 2.5D extension as per 99-402 + return( _Read_Polygon(pShape, (OGRPolygon *)pGeometry) ); + + //------------------------------------------------- + case wkbMultiPoint: // GeometryCollection of Points, standard WKB + case wkbMultiPoint25D: // 2.5D extension as per 99-402 + case wkbMultiLineString: // GeometryCollection of LineStrings, standard WKB + case wkbMultiLineString25D: // 2.5D extension as per 99-402 + case wkbMultiPolygon: // GeometryCollection of Polygons, standard WKB + case wkbMultiPolygon25D: // 2.5D extension as per 99-402 + { + for(int i=0; i<((OGRGeometryCollection *)pGeometry)->getNumGeometries(); i++) + { + if( _Read_Geometry(pShape, ((OGRGeometryCollection *)pGeometry)->getGeometryRef(i)) == false ) + { + return( false ); + } + } + } + + return( true ); + + //------------------------------------------------- + default: + break; + } + } + + return( false ); +} + +//--------------------------------------------------------- +bool CSG_OGR_DataSource::_Read_Line(CSG_Shape *pShape, OGRLineString *pLine) +{ + if( pShape && pLine && pLine->getNumPoints() > 0 ) + { + int iPart = pShape->Get_Part_Count(); + + for(int iPoint=0; iPointgetNumPoints(); iPoint++) + { + pShape->Add_Point(pLine->getX(iPoint), pLine->getY(iPoint), iPart); + + pShape->Set_Z(pLine->getZ(iPoint), iPoint, iPart); + } + + return( true ); + } + + return( false ); +} + +//--------------------------------------------------------- +bool CSG_OGR_DataSource::_Read_Polygon(CSG_Shape *pShape, OGRPolygon *pPolygon) +{ + if( pShape && pPolygon ) + { + _Read_Line(pShape, pPolygon->getExteriorRing()); + + for(int i=0; igetNumInteriorRings(); i++) + { + pPolygon->getInteriorRing(i); + } + + return( true ); + } + + return( false ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CSG_OGR_DataSource::Write(CSG_Shapes *pShapes, const CSG_String &DriverName) +{ + if( !m_pDataSource || !pShapes || !pShapes->is_Valid() ) + { + return( false ); + } + + //----------------------------------------------------- + OGRSpatialReference *pSRS = NULL; + + if( pShapes->Get_Projection().is_Okay() ) + { + pSRS = new OGRSpatialReference(pShapes->Get_Projection().Get_WKT()); + // pSRS = new OGRSpatialReference(); + // pSRS ->importFromProj4(pShapes->Get_Projection().Get_Proj4()); + } + + OGRLayer *pLayer = m_pDataSource->CreateLayer(CSG_String(pShapes->Get_Name()), pSRS, + (OGRwkbGeometryType)gSG_OGR_Drivers.Get_Shape_Type(pShapes->Get_Type(), pShapes->Get_Vertex_Type() != SG_VERTEX_TYPE_XY) + ); + + if( !pLayer ) + { + return( false ); + } + + //------------------------------------------------- + if( SG_STR_CMP(DriverName, "DXF") ) + { + // the dxf driver does not support arbitrary field creation and returns OGRERR_FAILURE; + // it seems like there is no method in OGR to check whether a driver supports field creation or not; + // another issue with the dxf driver: 3D polygon data is not supported (would require e.g. "3DFACE" + // entity implementation in GDAL/OGR), so we would need to treat them as polylines (not implemented, + // currently it is necessary to convert to a line shapefile a priori) + + for(int iField=0; iFieldGet_Field_Count(); iField++) + { + OGRFieldDefn DefField(CSG_String(pShapes->Get_Field_Name(iField)), (OGRFieldType)gSG_OGR_Drivers.Get_Data_Type(pShapes->Get_Field_Type(iField))); + + if( pLayer->CreateField(&DefField) != OGRERR_NONE ) + { + return( false ); + } + } + } + + //----------------------------------------------------- + for(int iShape=0; iShapeGet_Count() && SG_UI_Process_Set_Progress(iShape, pShapes->Get_Count()); iShape++) + { + CSG_Shape *pShape = pShapes->Get_Shape(iShape); + OGRFeature *pFeature = OGRFeature::CreateFeature(pLayer->GetLayerDefn()); + + if( _Write_Geometry(pShape, pFeature, pShapes->Get_Vertex_Type() != SG_VERTEX_TYPE_XY) ) + { + // no need for a special treatment of DXF here, as pFeature->SetField() just silently ignores iFields out of range + for(int iField=0; iFieldGet_Field_Count(); iField++) + { + switch( pShapes->Get_Field_Type(iField) ) + { + default: + case SG_DATATYPE_Char: + case SG_DATATYPE_String: + case SG_DATATYPE_Date: + pFeature->SetField(iField, CSG_String(pShape->asString(iField))); + break; + + case SG_DATATYPE_Short: + case SG_DATATYPE_Int: + case SG_DATATYPE_Long: + case SG_DATATYPE_Color: + pFeature->SetField(iField, pShape->asInt(iField)); + break; + + case SG_DATATYPE_Float: + case SG_DATATYPE_Double: + pFeature->SetField(iField, pShape->asDouble(iField)); + break; + } + } + + pLayer->CreateFeature(pFeature); + } + + OGRFeature::DestroyFeature(pFeature); + } + + //----------------------------------------------------- + return( true ); +} + +//--------------------------------------------------------- +bool CSG_OGR_DataSource::_Write_Geometry(CSG_Shape *pShape, OGRFeature *pFeature, bool bZ) +{ + if( !pShape || !pFeature ) + { + return( false ); + } + + switch( pShape->Get_Type() ) + { + //----------------------------------------------------- + case SHAPE_TYPE_Point: + { + TSG_Point p = pShape->Get_Point(0); + + OGRPoint Point(p.x, p.y, pShape->Get_Z(0)); + + return( pFeature->SetGeometry(&Point) == OGRERR_NONE ); + } + + //----------------------------------------------------- + case SHAPE_TYPE_Points: + { + OGRMultiPoint Points; + + for(int iPart=0; iPartGet_Part_Count(); iPart++) + { + for(int iPoint=0; iPointGet_Point_Count(iPart); iPoint++) + { + TSG_Point p = pShape->Get_Point(iPoint, iPart); + + OGRPoint Point(p.x, p.y, pShape->Get_Z(0)); + + Points.addGeometry(&Point); + } + } + + return( pFeature->SetGeometry(&Points) == OGRERR_NONE ); + } + + //----------------------------------------------------- + case SHAPE_TYPE_Line: + if( pShape->Get_Part_Count() == 1 ) + { + OGRLineString Line; + + _Write_Line(pShape, &Line, 0, bZ); + + return( pFeature->SetGeometry(&Line) == OGRERR_NONE ); + } + else + { + OGRMultiLineString Lines; + + for(int iPart=0; iPartGet_Part_Count(); iPart++) + { + OGRLineString Line; + + if( _Write_Line(pShape, &Line, iPart, bZ) ) + { + Lines.addGeometry(&Line); + } + } + + return( pFeature->SetGeometry(&Lines) == OGRERR_NONE ); + } + + //----------------------------------------------------- + case SHAPE_TYPE_Polygon: + { + OGRPolygon Polygon; + + for(int iPart=0; iPartGet_Part_Count(); iPart++) + { + OGRLinearRing Ring; + + if( _Write_Line(pShape, &Ring, iPart, bZ) ) + { + Polygon.addRing(&Ring); + } + } + + return( pFeature->SetGeometry(&Polygon) == OGRERR_NONE ); + } + + //------------------------------------------------- + default: + return( false ); + } +} + +//--------------------------------------------------------- +bool CSG_OGR_DataSource::_Write_Line(CSG_Shape *pShape, OGRLineString *pLine, int iPart, bool bZ) +{ + if( pLine && pShape && iPart >= 0 && iPart < pShape->Get_Part_Count() ) + { + pLine->empty(); + + for(int iPoint=0; iPointGet_Point_Count(iPart); iPoint++) + { + TSG_Point p = pShape->Get_Point(iPoint, iPart); + + pLine->addPoint(p.x, p.y, pShape->Get_Z(iPoint, iPart)); + } + + return( true ); + } + + return( false ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- diff -Nru saga-2.1.0+dfsg/src/modules/io/io_gdal/ogr_driver.h saga-2.1.4+dfsg/src/modules/io/io_gdal/ogr_driver.h --- saga-2.1.0+dfsg/src/modules/io/io_gdal/ogr_driver.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_gdal/ogr_driver.h 2014-11-13 08:32:20.000000000 +0000 @@ -0,0 +1,203 @@ +/********************************************************** + * Version $Id: ogr_driver.h 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library // +// // +// io_gdal // +// // +//-------------------------------------------------------// +// // +// ogr_driver.h // +// // +// Copyright (C) 2008 O. Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.de // +// // +// contact: Olaf Conrad // +// Bundesstr. 55 // +// D-20146 Hamburg // +// Germany // +// // +/////////////////////////////////////////////////////////// + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#ifndef HEADER_INCLUDED__ogr_driver_H +#define HEADER_INCLUDED__ogr_driver_H + +//--------------------------------------------------------- +#include "MLB_Interface.h" + + +//--------------------------------------------------------- +typedef enum ESG_Geom_Type_Choice_Key +{ + AUTOMATIC = 0, + WKBPOINT, + WKBPOINT25D, + WKBMULTIPOINT, + WKBMULTIPOINT25D, + WKBLINESTRING, + WKBLINESTRING25D, + WKBMULTILINESTRING, + WKBMULTILINESTRING25D, + WKBPOLYGON, + WKBPOLYGON25D, + WKBMULTIPOLYGON, + WKBMULTIPOLYGON25D, + WKBGEOMETRYCOLLECTION, + WKBGEOMETRYCOLLECTION25D, + GEOM_TYPE_KEY_Count +} +TSG_Geom_Type_Choice_Key; + + +//--------------------------------------------------------- +const SG_Char gSG_Geom_Type_Choice_Key_Name[GEOM_TYPE_KEY_Count][32] = +{ + SG_T("automatic"), + SG_T("wkbPoint"), + SG_T("wkbPoint25D"), + SG_T("wkbMultiPoint"), + SG_T("wkbMultiPoint25D"), + SG_T("wkbLineString"), + SG_T("wkbLineString25D"), + SG_T("wkbMultiLineString"), + SG_T("wkbMultiLineString25D"), + SG_T("wkbPolygon"), + SG_T("wkbPolygon25D"), + SG_T("wkbMultiPolygon"), + SG_T("wkbMultiPolygon25D"), + SG_T("wkbGeometryCollection"), + SG_T("wkbGeometryCollection25D") +}; + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +class io_gdal_EXPORT CSG_OGR_Drivers +{ +public: + CSG_OGR_Drivers(void); + virtual ~CSG_OGR_Drivers(void); + + int Get_Count (void) const; + + class OGRSFDriver * Get_Driver (const CSG_String &Name) const; + class OGRSFDriver * Get_Driver (int Index) const; + + CSG_String Get_Name (int Index) const; + CSG_String Get_Description (int Index) const; + + bool Can_Read (int Index) const; + bool Can_Write (int Index) const; + + static TSG_Vertex_Type Get_Vertex_Type (int Type); + static TSG_Shape_Type Get_Shape_Type (int Type); + static int Get_Shape_Type (TSG_Shape_Type Type, bool bZ); + + static TSG_Data_Type Get_Data_Type (int Type); + static int Get_Data_Type (TSG_Data_Type Type); + + +private: + + class OGRSFDriverRegistrar *m_pDrivers; + +}; + +//--------------------------------------------------------- +io_gdal_EXPORT const CSG_OGR_Drivers & SG_Get_OGR_Drivers (void); + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +class io_gdal_EXPORT CSG_OGR_DataSource +{ +public: + CSG_OGR_DataSource(void); + CSG_OGR_DataSource(const CSG_String &File); + CSG_OGR_DataSource(const CSG_String &File, const CSG_String &DriverName); + virtual ~CSG_OGR_DataSource(void); + + bool Create (const CSG_String &File); + bool Create (const CSG_String &File, const CSG_String &DriverName); + bool Destroy (void); + + int Get_Count (void); + class OGRLayer * Get_Layer (int iLayer); + TSG_Shape_Type Get_Type (int iLayer); + TSG_Vertex_Type Get_Coordinate_Type (int iLayer); + CSG_Projection Get_Projection (int iLayer); + + CSG_Shapes * Read (int iLayer, int iGeomTypeChoice); + bool Write (CSG_Shapes *pShapes, const CSG_String &DriverName); + + +private: + + class OGRDataSource *m_pDataSource; + + + int _Get_GeomType_Choice(int iGeomTypeChoice); + + bool _Read_Geometry (CSG_Shape *pShape, class OGRGeometry *pGeometry); + bool _Read_Line (CSG_Shape *pShape, class OGRLineString *pLine); + bool _Read_Polygon (CSG_Shape *pShape, class OGRPolygon *pPolygon); + + bool _Write_Geometry (CSG_Shape *pShape, class OGRFeature *pFeature, bool bZ); + bool _Write_Line (CSG_Shape *pShape, class OGRLineString *pLine, int iPart, bool bZ); + +}; + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#endif // #ifndef HEADER_INCLUDED__ogr_driver_H diff -Nru saga-2.1.0+dfsg/src/modules/io/io_gdal/ogr_export.cpp saga-2.1.4+dfsg/src/modules/io/io_gdal/ogr_export.cpp --- saga-2.1.0+dfsg/src/modules/io/io_gdal/ogr_export.cpp 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_gdal/ogr_export.cpp 2014-11-13 08:32:20.000000000 +0000 @@ -0,0 +1,164 @@ +/********************************************************** + * Version $Id: ogr_export.cpp 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library // +// // +// io_gdal // +// // +//-------------------------------------------------------// +// // +// ogr_export.cpp // +// // +// Copyright (C) 2008 O. Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.de // +// // +// contact: Olaf Conrad // +// Bundesstr. 55 // +// D-20146 Hamburg // +// Germany // +// // +/////////////////////////////////////////////////////////// + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "ogr_export.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +COGR_Export::COGR_Export(void) +{ + Set_Name (_TL("OGR: Export Vector Data")); + + Set_Author (SG_T("O.Conrad (c) 2008")); + + CSG_String Description, Formats; + + Description = _TW( + "The \"GDAL Vector Data Export\" module exports vector data to various file formats using the " + "\"Geospatial Data Abstraction Library\" (GDAL) by Frank Warmerdam. " + "For more information have a look at the GDAL homepage:\n" + " " + " http://www.gdal.org\n" + "\n" + "Following vector formats are currently supported:\n" + "\n" + ); + + for(int i=0; i\n"), + SG_Get_OGR_Drivers().Get_Name(i).c_str(), + SG_Get_OGR_Drivers().Get_Description(i).c_str() + ); + + Formats += CSG_String::Format(SG_T("%s|"), SG_Get_OGR_Drivers().Get_Name(i).c_str()); + } + } + + Description += SG_T("
NameDescription
%s%s
"); + + Set_Description(Description); + + //----------------------------------------------------- + Parameters.Add_Shapes( + NULL, "SHAPES" , _TL("Shapes"), + _TL(""), + PARAMETER_INPUT + ); + + Parameters.Add_FilePath( + NULL, "FILE" , _TL("File"), + _TL(""), + NULL, NULL, true + ); + + Parameters.Add_Choice( + NULL, "FORMAT" , _TL("Format"), + _TL(""), + Formats + ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool COGR_Export::On_Execute(void) +{ + CSG_String File_Name; + CSG_Shapes *pShapes; + CSG_OGR_DataSource DataSource; + + //----------------------------------------------------- + pShapes = Parameters("SHAPES") ->asShapes(); + File_Name = Parameters("FILE") ->asString(); + + //----------------------------------------------------- + if( DataSource.Create(File_Name, Parameters("FORMAT")->asString()) == false ) + { + Message_Add(_TL("Could not create data source.")); + } + else if( DataSource.Write(pShapes, Parameters("FORMAT")->asString()) ) + { + return( true ); + } + + return( false ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- diff -Nru saga-2.1.0+dfsg/src/modules/io/io_gdal/ogr_export.h saga-2.1.4+dfsg/src/modules/io/io_gdal/ogr_export.h --- saga-2.1.0+dfsg/src/modules/io/io_gdal/ogr_export.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_gdal/ogr_export.h 2014-11-13 08:32:20.000000000 +0000 @@ -0,0 +1,94 @@ +/********************************************************** + * Version $Id: ogr_export.h 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library // +// // +// io_gdal // +// // +//-------------------------------------------------------// +// // +// ogr_export.h // +// // +// Copyright (C) 2008 O. Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.de // +// // +// contact: Olaf Conrad // +// Bundesstr. 55 // +// D-20146 Hamburg // +// Germany // +// // +/////////////////////////////////////////////////////////// + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#ifndef HEADER_INCLUDED__ogr_export_H +#define HEADER_INCLUDED__ogr_export_H + +//--------------------------------------------------------- +#include "ogr_driver.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +class COGR_Export : public CSG_Module +{ +public: + COGR_Export(void); + + +protected: + + virtual bool On_Execute (void); + +}; + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#endif // #ifndef HEADER_INCLUDED__ogr_export_H diff -Nru saga-2.1.0+dfsg/src/modules/io/io_gdal/ogr_export_kml.cpp saga-2.1.4+dfsg/src/modules/io/io_gdal/ogr_export_kml.cpp --- saga-2.1.0+dfsg/src/modules/io/io_gdal/ogr_export_kml.cpp 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_gdal/ogr_export_kml.cpp 2014-11-13 08:32:20.000000000 +0000 @@ -0,0 +1,173 @@ +/********************************************************** + * Version $Id: ogr_export_kml.cpp 911 2011-02-14 16:38:15Z reklov_w $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library // +// // +// io_gdal // +// // +//-------------------------------------------------------// +// // +// ogr_export_kml.cpp // +// // +// Copyright (C) 2012 O. Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.de // +// // +// contact: Olaf Conrad // +// Bundesstr. 55 // +// D-20146 Hamburg // +// Germany // +// // +/////////////////////////////////////////////////////////// + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "ogr_export_kml.h" + +#include + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +COGR_Export_KML::COGR_Export_KML(void) +{ + Set_Name (_TL("OGR: Export Shapes to KML")); + + Set_Author (SG_T("O.Conrad (c) 2012")); + + Set_Description (_TW( + "This module exports a vector layer to a Google Earth KML Format using " + "Frank Warmerdam's \"Geospatial Data Abstraction Library\" (GDAL/OGR). " + "Output file will automatically re-projected to geographic coordinates " + "if necessary and possible. " + "For more information on GDAL/OGR have a look at the GDAL homepage:\n" + " " + " http://www.gdal.org\n" + )); + + //----------------------------------------------------- + Parameters.Add_Shapes( + NULL , "SHAPES" , _TL("Shapes"), + _TL(""), + PARAMETER_INPUT + ); + + Parameters.Add_FilePath( + NULL, "FILE" , _TL("File"), + _TL(""), + CSG_String::Format( + SG_T("%s|*.kml;*.kml|%s|*.*"), + _TL("KML files (*.kml)"), + _TL("All Files") + ), NULL, true + ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool COGR_Export_KML::On_Execute(void) +{ + CSG_String File_Name, Driver_Name = "KML"; + CSG_Shapes *pShapes, Shapes; + + pShapes = Parameters("SHAPES")->asShapes(); + File_Name = Parameters("FILE" )->asString(); + + //----------------------------------------------------- + if( pShapes->Get_Projection().Get_Type() == SG_PROJ_TYPE_CS_Undefined ) + { + Message_Add(_TL("layer uses undefined coordinate system, assuming geographic coordinates")); + } + else if( pShapes->Get_Projection().Get_Type() != SG_PROJ_TYPE_CS_Geographic ) + { + Message_Add(CSG_String::Format(SG_T("\n%s (%s: %s)\n"), _TL("re-projection to geographic coordinates"), _TL("original"), pShapes->Get_Projection().Get_Name().c_str()), false); + + bool bResult; + + SG_RUN_MODULE(bResult, "pj_proj4", 2, + pModule->Get_Parameters()->Set_Parameter(SG_T("SOURCE"), pShapes) + && pModule->Get_Parameters()->Set_Parameter(SG_T("TARGET"), &Shapes) + && pModule->Get_Parameters()->Set_Parameter(SG_T("CRS_PROJ4"), SG_T("+proj=longlat +ellps=WGS84 +datum=WGS84")) + ); + + if( bResult ) + { + pShapes = &Shapes; + + Message_Add(CSG_String::Format(SG_T("\n%s: %s\n"), _TL("re-projection"), _TL("success")), false); + } + else + { + Message_Add(CSG_String::Format(SG_T("\n%s: %s\n"), _TL("re-projection"), _TL("failed")), false); + } + } + + //----------------------------------------------------- + CSG_OGR_DataSource DataSource; + + if( DataSource.Create(File_Name, Driver_Name) == false ) + { + Message_Add(_TL("could not create KML file")); + } + else if( DataSource.Write(pShapes, Driver_Name) ) + { + return( true ); + } + + return( false ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- diff -Nru saga-2.1.0+dfsg/src/modules/io/io_gdal/ogr_export_kml.h saga-2.1.4+dfsg/src/modules/io/io_gdal/ogr_export_kml.h --- saga-2.1.0+dfsg/src/modules/io/io_gdal/ogr_export_kml.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_gdal/ogr_export_kml.h 2014-11-13 08:32:20.000000000 +0000 @@ -0,0 +1,94 @@ +/********************************************************** + * Version $Id: ogr_export_kml.h 911 2011-02-14 16:38:15Z reklov_w $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library // +// // +// io_gdal // +// // +//-------------------------------------------------------// +// // +// ogr_export_kml.h // +// // +// Copyright (C) 2012 O. Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.de // +// // +// contact: Olaf Conrad // +// Bundesstr. 55 // +// D-20146 Hamburg // +// Germany // +// // +/////////////////////////////////////////////////////////// + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#ifndef HEADER_INCLUDED__ogr_export_kml_H +#define HEADER_INCLUDED__ogr_export_kml_H + +//--------------------------------------------------------- +#include "ogr_driver.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +class COGR_Export_KML : public CSG_Module +{ +public: + COGR_Export_KML(void); + + +protected: + + virtual bool On_Execute (void); + +}; + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#endif // #ifndef HEADER_INCLUDED__ogr_export_kml_H diff -Nru saga-2.1.0+dfsg/src/modules/io/io_gdal/ogr_import.cpp saga-2.1.4+dfsg/src/modules/io/io_gdal/ogr_import.cpp --- saga-2.1.0+dfsg/src/modules/io/io_gdal/ogr_import.cpp 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_gdal/ogr_import.cpp 2014-11-13 08:32:20.000000000 +0000 @@ -0,0 +1,220 @@ +/********************************************************** + * Version $Id: ogr_import.cpp 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library // +// // +// io_gdal // +// // +//-------------------------------------------------------// +// // +// ogr_import.cpp // +// // +// Copyright (C) 2008 O. Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.de // +// // +// contact: Olaf Conrad // +// Bundesstr. 55 // +// D-20146 Hamburg // +// Germany // +// // +/////////////////////////////////////////////////////////// + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "ogr_import.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +COGR_Import::COGR_Import(void) +{ + Set_Name (_TL("OGR: Import Vector Data")); + + Set_Author (SG_T("O.Conrad (c) 2008")); + + CSG_String Description; + + Description = _TW( + "The \"GDAL Vector Data Import\" module imports vector data from various file/database formats using the " + "\"Geospatial Data Abstraction Library\" (GDAL) by Frank Warmerdam. " + "For more information have a look at the GDAL homepage:\n" + " " + " http://www.gdal.org\n" + "\n" + "Following vector data formats are currently supported:\n" + "\n" + ); + + for(int i=0; i\n"), + SG_Get_OGR_Drivers().Get_Name(i).c_str(), + SG_Get_OGR_Drivers().Get_Description(i).c_str() + ); + } + } + + Description += SG_T("
NameDescription
%s%s
"); + + Set_Description(Description); + + //----------------------------------------------------- + Parameters.Add_Shapes_List( + NULL, "SHAPES" , _TL("Shapes"), + _TL(""), + PARAMETER_OUTPUT + ); + + Parameters.Add_FilePath( + NULL, "FILES" , _TL("Files"), + _TL(""), + NULL, NULL, false, false, true + ); + + CSG_String sChoices; + for(int i=0; iasFilePath()->Get_FilePaths(Files) ) + { + return( false ); + } + + //----------------------------------------------------- + Parameters("SHAPES")->asShapesList()->Del_Items(); + + for(int iFile=0; iFileasInt()); + + if( pShapes ) + { + Parameters("SHAPES")->asShapesList()->Add_Item(pShapes); + } + } + } + } + + return( Parameters("SHAPES")->asShapesList()->Get_Count() > 0 ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool SG_OGR_Import (const CSG_String &File_Name) +{ + COGR_Import Import; + + if( !Import.Get_Parameters()->Set_Parameter(SG_T("FILES"), File_Name, PARAMETER_TYPE_FilePath) ) + { + return( false ); + } + + if( !Import.Execute() ) + { + return( false ); + } + + CSG_Parameter_Shapes_List *pShapes = Import.Get_Parameters()->Get_Parameter(SG_T("SHAPES"))->asShapesList(); + + for(int i=0; iGet_Count(); i++) + { + SG_UI_DataObject_Add(pShapes->asShapes(i), SG_UI_DATAOBJECT_UPDATE_ONLY); + } + + return( true ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- diff -Nru saga-2.1.0+dfsg/src/modules/io/io_gdal/ogr_import.h saga-2.1.4+dfsg/src/modules/io/io_gdal/ogr_import.h --- saga-2.1.0+dfsg/src/modules/io/io_gdal/ogr_import.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_gdal/ogr_import.h 2014-11-13 08:32:20.000000000 +0000 @@ -0,0 +1,102 @@ +/********************************************************** + * Version $Id: ogr_import.h 1922 2014-01-09 10:28:46Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library // +// // +// io_gdal // +// // +//-------------------------------------------------------// +// // +// ogr_import.h // +// // +// Copyright (C) 2008 O. Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.de // +// // +// contact: Olaf Conrad // +// Bundesstr. 55 // +// D-20146 Hamburg // +// Germany // +// // +/////////////////////////////////////////////////////////// + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#ifndef HEADER_INCLUDED__ogr_import_H +#define HEADER_INCLUDED__ogr_import_H + +//--------------------------------------------------------- +#include "ogr_driver.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +class COGR_Import : public CSG_Module +{ +public: + COGR_Import(void); + + +protected: + + virtual bool On_Execute (void); + +}; + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +io_gdal_EXPORT bool SG_OGR_Import (const CSG_String &File_Name); + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#endif // #ifndef HEADER_INCLUDED__ogr_import_H diff -Nru saga-2.1.0+dfsg/src/modules/io/io_gps/GPSBabel.cpp saga-2.1.4+dfsg/src/modules/io/io_gps/GPSBabel.cpp --- saga-2.1.0+dfsg/src/modules/io/io_gps/GPSBabel.cpp 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_gps/GPSBabel.cpp 2014-11-13 08:32:19.000000000 +0000 @@ -0,0 +1,163 @@ +/********************************************************** + * Version $Id: GPSBabel.cpp 911 2011-02-14 16:38:15Z reklov_w $ + *********************************************************/ +/******************************************************************************* + GPSBabel.cpp + Copyright (C) Victor Olaya + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, USA +*******************************************************************************/ +#include "GPSBabel.h" + +CSG_String sGPSBabelID[] = +{ + "geo", + "gpsman", + "gpx", + "magellan", + "mapsend", + "pcx", + "mapsource", + "gpsutil", + "tiger", + "csv", + "xmap", + "dna", + "psp", + "cetus", + "gpspilot", + "magnav", + "garmin", + "mxf", + "holux", + "ozi", + "tpg", + "tmpro" +}; + +CGPSBabel::CGPSBabel(){ + + Parameters.Set_Name(_TL("GPSBabel")); + + Parameters.Set_Description(_TW( + "An interface to the GPSBabel software" + "(c) 2005 by Victor Olaya\r\nemail: volaya@ya.com")); + + Parameters.Add_FilePath(NULL, + "BASEPATH", + _TL("GPSBabel path"), + _TL("GPSBabel path"), + _TL(""), + _TL(""), + false, + true); + + Parameters.Add_FilePath(NULL, + "INPUT", + _TL("Input file"), + _TL(""), + _TL("All Files|*.*|")); + + Parameters.Add_Choice(NULL, + "FORMATIN", + _TL("Input format"), + _TL(""), + _TW("Geocaching.com .loc|" + "GPSman|" + "GPX XML|" + "Magellan protocol|" + "Magellan Mapsend|" + "Garmin PCX5|" + "Garmin Mapsource|" + "gpsutil|" + "U.S. Census Bureau Tiger Mapping Service|" + "Comma separated values|" + "Delorme Topo USA4/XMap Conduit|" + "Navitrak DNA marker format|" + "MS PocketStreets 2002 Pushpin|" + "Cetus for Palm/OS|" + "GPSPilot Tracker for Palm/OS|" + "Magellan NAV Companion for PalmOS|" + "Garmin serial protocol|" + "MapTech Exchange Format|" + "Holux (gm-100) .wpo Format|" + "OziExplorer Waypoint|" + "National Geographic Topo .tpg|" + "TopoMapPro Places File|" + ), 0); + + Parameters.Add_FilePath(NULL, + "OUTPUT", + _TL("Output file"), + _TL(""), + _TL("All Files|*.*|"), + _TL(""), + true, + false); + + Parameters.Add_Choice(NULL, + "FORMATOUT", + _TL("Output format"), + _TL(""), + _TW("Geocaching.com .loc|" + "GPSman|" + "GPX XML|" + "Magellan protocol|" + "Magellan Mapsend|" + "Garmin PCX5|" + "Garmin Mapsource|" + "gpsutil|" + "U.S. Census Bureau Tiger Mapping Service|" + "Comma separated values|" + "Delorme Topo USA4/XMap Conduit|" + "Navitrak DNA marker format|" + "MS PocketStreets 2002 Pushpin|" + "Cetus for Palm/OS|" + "GPSPilot Tracker for Palm/OS|" + "Magellan NAV Companion for PalmOS|" + "Garmin serial protocol|" + "MapTech Exchange Format|" + "Holux (gm-100) .wpo Format|" + "OziExplorer Waypoint|" + "National Geographic Topo .tpg|" + "TopoMapPro Places File|"), + 0); + +}//constructor + +CGPSBabel::~CGPSBabel(){ + +}//destructor + +bool CGPSBabel::On_Execute(void){ + + CSG_String sCmd; + CSG_String sInputFile = Parameters("INPUT")->asString(); + CSG_String sOutputFile = Parameters("OUTPUT")->asString(); + CSG_String sBasePath = Parameters("BASEPATH")->asString(); + int iInputFormat = Parameters("FORMATIN")->asInt(); + int iOutputFormat = Parameters("FORMATOUT")->asInt(); + + sCmd = sBasePath + SG_T("\\") + SG_T("gpsbabel.exe ") + + SG_T("-i ") + sGPSBabelID[iInputFormat] + SG_T(" ") + + SG_T("-f ") + sInputFile + SG_T(" ") + + SG_T("-o ") + sGPSBabelID[iOutputFormat] + SG_T(" ") + + SG_T("-F ") + sOutputFile + SG_T(" "); + + system(sCmd.b_str()); + + return true; + +}//method \ No newline at end of file diff -Nru saga-2.1.0+dfsg/src/modules/io/io_gps/GPSBabel.h saga-2.1.4+dfsg/src/modules/io/io_gps/GPSBabel.h --- saga-2.1.0+dfsg/src/modules/io/io_gps/GPSBabel.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_gps/GPSBabel.h 2014-11-13 08:32:19.000000000 +0000 @@ -0,0 +1,39 @@ +/********************************************************** + * Version $Id: GPSBabel.h 911 2011-02-14 16:38:15Z reklov_w $ + *********************************************************/ +/******************************************************************************* + GPSBabel.h + Copyright (C) Victor Olaya + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, USA +*******************************************************************************/ + +#if _MSC_VER > 1000 +#pragma once +#endif // _MSC_VER > 1000 + +#include "MLB_Interface.h" + +class CGPSBabel : public CSG_Module { + +public: + CGPSBabel(void); + virtual ~CGPSBabel(void); + +protected: + virtual bool On_Execute(void); + +}; + diff -Nru saga-2.1.0+dfsg/src/modules/io/io_gps/gpx2shp.cpp saga-2.1.4+dfsg/src/modules/io/io_gps/gpx2shp.cpp --- saga-2.1.0+dfsg/src/modules/io/io_gps/gpx2shp.cpp 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_gps/gpx2shp.cpp 2014-11-13 08:32:19.000000000 +0000 @@ -0,0 +1,145 @@ +/********************************************************** + * Version $Id: gpx2shp.cpp 911 2011-02-14 16:38:15Z reklov_w $ + *********************************************************/ +/******************************************************************************* + GPX2SHP.cpp + Copyright (C) Victor Olaya + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, USA +*******************************************************************************/ +#include "gpx2shp.h" + +CGPX2SHP::CGPX2SHP(){ + + Parameters.Set_Name(_TL("GPX to shapefile")); + + Parameters.Set_Description(_TW( + "Converts a GPX file into a Shapefile (.shp)" + "(c) 2005 by Victor Olaya\r\nemail: volaya@ya.com") + ); + + Parameters.Add_FilePath(NULL, + "BASEPATH", + _TL("Gpx2shp path"), + _TL("Gpx2shp path"), + _TL(""), + _TL(""), + false, + true); + + Parameters.Add_FilePath(NULL, + "FILE", + _TL("GPX file"), + _TL(""), + _TL("GPX files (*.gpx)|*.gpx|All Files|*.*") + ); + + Parameters.Add_Value(NULL, + "TRACKPOINTS", + _TL("Convert track points"), + _TL("Convert track points"), + PARAMETER_TYPE_Bool, + true); + + Parameters.Add_Value(NULL, + "WAYPOINTS", + _TL("Convert way points"), + _TL("Convert way points"), + PARAMETER_TYPE_Bool, + true); + + Parameters.Add_Value(NULL, + "ROUTES", + _TL("Convert routes"), + _TL("Convert routes"), + PARAMETER_TYPE_Bool, + true); + + Parameters.Add_Value(NULL, + "ADD", + _TL("Load shapefile"), + _TL("Load shapefile after conversion"), + PARAMETER_TYPE_Bool, + true); + +}//constructor + +CGPX2SHP::~CGPX2SHP(){ + +}//destructor + +bool CGPX2SHP::On_Execute(void){ + + CSG_String sCmd; + CSG_String sFile = Parameters("FILE")->asString(); + CSG_String sBasePath = Parameters("BASEPATH")->asString(); + CSG_String sShapefile; + bool bWaypoints = Parameters("WAYPOINTS")->asBool(); + bool bTrackpoints = Parameters("TRACKPOINTS")->asBool(); + bool bRoutes = Parameters("ROUTES")->asBool(); + bool bAdd = Parameters("ADD")->asBool(); + CSG_Shapes *pShapes; + + sCmd = sBasePath + SG_T("\\gpx2shp "); + + if (bWaypoints){ + sCmd += SG_T("-w "); + }//if + if (bTrackpoints){ + sCmd += SG_T("-t "); + }//if + if (bRoutes){ + sCmd += SG_T("-r "); + }//if + + sCmd += sFile; + + system(sCmd.b_str()); + + if( bAdd ) + { + CSG_String sDir(SG_File_Get_Path(sFile)), sName(SG_File_Get_Name(sFile, false)); + + //------------------------------------------------- + sFile = SG_File_Make_Path(sDir, sName + SG_T("_wpt"), SG_T("shp")); + pShapes = SG_Create_Shapes(sFile); + + if( pShapes->is_Valid() ) + DataObject_Add(pShapes, false); + else + delete(pShapes); + + //------------------------------------------------- + sFile = SG_File_Make_Path(sDir, sName + SG_T("_trk"), SG_T("shp")); + pShapes = SG_Create_Shapes(sFile); + + if( pShapes->is_Valid() ) + DataObject_Add(pShapes, false); + else + delete(pShapes); + + //------------------------------------------------- + sFile = SG_File_Make_Path(sDir, sName + SG_T("_rte"), SG_T("shp")); + pShapes = SG_Create_Shapes(sFile); + + if( pShapes->is_Valid() ) + DataObject_Add(pShapes, false); + else + delete(pShapes); + }//if + + return true; + +}//method \ No newline at end of file diff -Nru saga-2.1.0+dfsg/src/modules/io/io_gps/gpx2shp.h saga-2.1.4+dfsg/src/modules/io/io_gps/gpx2shp.h --- saga-2.1.0+dfsg/src/modules/io/io_gps/gpx2shp.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_gps/gpx2shp.h 2014-11-13 08:32:19.000000000 +0000 @@ -0,0 +1,39 @@ +/********************************************************** + * Version $Id: gpx2shp.h 911 2011-02-14 16:38:15Z reklov_w $ + *********************************************************/ +/******************************************************************************* + GPX2SHP.h + Copyright (C) Victor Olaya + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, USA +*******************************************************************************/ + +#if _MSC_VER > 1000 +#pragma once +#endif // _MSC_VER > 1000 + +#include "MLB_Interface.h" + +class CGPX2SHP : public CSG_Module { + +public: + CGPX2SHP(void); + virtual ~CGPX2SHP(void); + +protected: + virtual bool On_Execute(void); + +}; + diff -Nru saga-2.1.0+dfsg/src/modules/io/io_gps/Makefile.am saga-2.1.4+dfsg/src/modules/io/io_gps/Makefile.am --- saga-2.1.0+dfsg/src/modules/io/io_gps/Makefile.am 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_gps/Makefile.am 2014-11-13 08:32:19.000000000 +0000 @@ -0,0 +1,24 @@ +# +# $Id: Makefile.am 1277 2011-12-22 15:48:59Z reklov_w $ +# +if DEBUG +DBGFLAGS = -g -DDEBUG +endif +if SAGA_UNICODE +UC_DEFS = -D_SAGA_UNICODE +endif +DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD +CXX_INCS = -I$(top_srcdir)/src/saga_core +AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS) +AM_LDFLAGS = -fPIC -shared -avoid-version +pkglib_LTLIBRARIES = libio_gps.la +libio_gps_la_SOURCES =\ +GPSBabel.cpp\ +gpx2shp.cpp\ +MLB_Interface.cpp\ +GPSBabel.h\ +gpx2shp.h\ +MLB_Interface.h + +libio_gps_la_LIBADD = $(top_srcdir)/src/saga_core/saga_api/libsaga_api.la + diff -Nru saga-2.1.0+dfsg/src/modules/io/io_gps/Makefile.in saga-2.1.4+dfsg/src/modules/io/io_gps/Makefile.in --- saga-2.1.0+dfsg/src/modules/io/io_gps/Makefile.in 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_gps/Makefile.in 2014-11-13 08:33:33.000000000 +0000 @@ -0,0 +1,702 @@ +# Makefile.in generated by automake 1.14.1 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +subdir = src/modules/io/io_gps +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_postgresql.m4 \ + $(top_srcdir)/m4/ax_pkg_swig.m4 \ + $(top_srcdir)/m4/ax_python_devel.m4 \ + $(top_srcdir)/m4/ax_swig_enable_cxx.m4 \ + $(top_srcdir)/m4/ax_swig_python.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__installdirs = "$(DESTDIR)$(pkglibdir)" +LTLIBRARIES = $(pkglib_LTLIBRARIES) +libio_gps_la_DEPENDENCIES = \ + $(top_srcdir)/src/saga_core/saga_api/libsaga_api.la +am_libio_gps_la_OBJECTS = GPSBabel.lo gpx2shp.lo MLB_Interface.lo +libio_gps_la_OBJECTS = $(am_libio_gps_la_OBJECTS) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) +depcomp = $(SHELL) $(top_srcdir)/depcomp +am__depfiles_maybe = depfiles +am__mv = mv -f +CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = +CXXLD = $(CXX) +CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = +CCLD = $(CC) +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = +SOURCES = $(libio_gps_la_SOURCES) +DIST_SOURCES = $(libio_gps_la_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +AX_SWIG_PYTHON_CPPFLAGS = @AX_SWIG_PYTHON_CPPFLAGS@ +AX_SWIG_PYTHON_OPT = @AX_SWIG_PYTHON_OPT@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DISABLELIBHARU = @DISABLELIBHARU@ +DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +FGREP = @FGREP@ +GOMPFLAGS = @GOMPFLAGS@ +GREP = @GREP@ +HARU_LIB = @HARU_LIB@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LOCAL_INCS = @LOCAL_INCS@ +LOCAL_LIBS = @LOCAL_LIBS@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ +MKDIR_P = @MKDIR_P@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PG_CONFIG = @PG_CONFIG@ +POSTGRESQL_CFLAGS = @POSTGRESQL_CFLAGS@ +POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@ +POSTGRESQL_VERSION = @POSTGRESQL_VERSION@ +POW_LIB = @POW_LIB@ +PYTHON = @PYTHON@ +PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ +PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ +PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ +PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_PLATFORM = @PYTHON_PLATFORM@ +PYTHON_PREFIX = @PYTHON_PREFIX@ +PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ +PYTHON_VERSION = @PYTHON_VERSION@ +RANLIB = @RANLIB@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +SWIG = @SWIG@ +SWIG_LIB = @SWIG_LIB@ +VERSION = @VERSION@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +pkgpyexecdir = @pkgpyexecdir@ +pkgpythondir = @pkgpythondir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +pyexecdir = @pyexecdir@ +pythondir = @pythondir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ + +# +# $Id: Makefile.am 1277 2011-12-22 15:48:59Z reklov_w $ +# +@DEBUG_TRUE@DBGFLAGS = -g -DDEBUG +@SAGA_UNICODE_TRUE@UC_DEFS = -D_SAGA_UNICODE +DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD +CXX_INCS = -I$(top_srcdir)/src/saga_core +AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS) +AM_LDFLAGS = -fPIC -shared -avoid-version +pkglib_LTLIBRARIES = libio_gps.la +libio_gps_la_SOURCES = \ +GPSBabel.cpp\ +gpx2shp.cpp\ +MLB_Interface.cpp\ +GPSBabel.h\ +gpx2shp.h\ +MLB_Interface.h + +libio_gps_la_LIBADD = $(top_srcdir)/src/saga_core/saga_api/libsaga_api.la +all: all-am + +.SUFFIXES: +.SUFFIXES: .cpp .lo .o .obj +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/modules/io/io_gps/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign src/modules/io/io_gps/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): + +install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) + @$(NORMAL_INSTALL) + @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ + list2=; for p in $$list; do \ + if test -f $$p; then \ + list2="$$list2 $$p"; \ + else :; fi; \ + done; \ + test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \ + } + +uninstall-pkglibLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ + for p in $$list; do \ + $(am__strip_dir) \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$f"; \ + done + +clean-pkglibLTLIBRARIES: + -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES) + @list='$(pkglib_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + +libio_gps.la: $(libio_gps_la_OBJECTS) $(libio_gps_la_DEPENDENCIES) $(EXTRA_libio_gps_la_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) -rpath $(pkglibdir) $(libio_gps_la_OBJECTS) $(libio_gps_la_LIBADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GPSBabel.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MLB_Interface.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gpx2shp.Plo@am__quote@ + +.cpp.o: +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< + +.cpp.obj: +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + +.cpp.lo: +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + set x; \ + here=`pwd`; \ + $(am__define_uniq_tagged_files); \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ + fi +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ + test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(LTLIBRARIES) +installdirs: + for dir in "$(DESTDIR)$(pkglibdir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool clean-pkglibLTLIBRARIES \ + mostlyclean-am + +distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: install-pkglibLTLIBRARIES + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-pkglibLTLIBRARIES + +.MAKE: install-am install-strip + +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-pkglibLTLIBRARIES install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ + uninstall-pkglibLTLIBRARIES + + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nru saga-2.1.0+dfsg/src/modules/io/io_gps/MLB_Interface.cpp saga-2.1.4+dfsg/src/modules/io/io_gps/MLB_Interface.cpp --- saga-2.1.0+dfsg/src/modules/io/io_gps/MLB_Interface.cpp 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_gps/MLB_Interface.cpp 2014-11-13 08:32:19.000000000 +0000 @@ -0,0 +1,143 @@ +/********************************************************** + * Version $Id: MLB_Interface.cpp 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for an Automated Geo-Scientific Analysis // +// // +// Module Library: // +// Models // +// // +//-------------------------------------------------------// +// // +// MLB_Interface.cpp // +// // +// Copyright (C) 2003 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for an Automated // +// Geo-Scientific Analysis'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Goettingen // +// Goldschmidtstr. 5 // +// 37077 Goettingen // +// Germany // +// // +// e-mail: oconrad@saga-gis.org // +// // +/////////////////////////////////////////////////////////// + + +/////////////////////////////////////////////////////////// +// // +// The Module Link Library Interface // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +// 1. Include the appropriate SAGA-API header... + +#include "MLB_Interface.h" + + +//--------------------------------------------------------- +// 2. Place general module library informations here... + +CSG_String Get_Info(int i) +{ + switch( i ) + { + case MLB_INFO_Name: default: + return( _TL("GPS Tools") ); + + case MLB_INFO_Category: + return( _TL("Import/Export") ); + + case MLB_INFO_Author: + return( SG_T("Victor Olaya (c) 2004") ); + + case MLB_INFO_Description: + return( _TL("Tools for GPS data handling.") ); + + case MLB_INFO_Version: + return( SG_T("1.0") ); + + case MLB_INFO_Menu_Path: + return( _TL("File|GPS Import") ); + } +} + + +//--------------------------------------------------------- +// 3. Include the headers of your modules here... + +#include "gpx2shp.h" +#include "GPSBabel.h" + +//--------------------------------------------------------- +// 4. Allow your modules to be created here... + +CSG_Module * Create_Module(int i) +{ + // Don't forget to continuously enumerate the case switches + // when adding new modules! Also bear in mind that the + // enumeration always has to start with [case 0:] and + // that [default:] must return NULL!... + + CSG_Module *pModule; + + switch( i ) + { + case 0: + pModule = new CGPX2SHP; + break; + + case 1: + pModule = new CGPSBabel; + break; + + default: + pModule = NULL; + break; + } + + return( pModule ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +//{{AFX_SAGA + + MLB_INTERFACE + +//}}AFX_SAGA diff -Nru saga-2.1.0+dfsg/src/modules/io/io_gps/MLB_Interface.h saga-2.1.4+dfsg/src/modules/io/io_gps/MLB_Interface.h --- saga-2.1.0+dfsg/src/modules/io/io_gps/MLB_Interface.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_gps/MLB_Interface.h 2014-11-13 08:32:19.000000000 +0000 @@ -0,0 +1,85 @@ +/********************************************************** + * Version $Id: MLB_Interface.h 1922 2014-01-09 10:28:46Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// Terrain_Analysis // +// // +//-------------------------------------------------------// +// // +// MLB_Interface.h // +// // +// Copyright (C) 2003 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Goettingen // +// Goldschmidtstr. 5 // +// 37077 Goettingen // +// Germany // +// // +// e-mail: oconrad@saga-gis.org // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// Include the SAGA-API here // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#ifndef HEADER_INCLUDED__io_gps_H +#define HEADER_INCLUDED__io_gps_H + +//--------------------------------------------------------- +#include + +//--------------------------------------------------------- +#ifdef io_gps_EXPORTS + #define io_gps_EXPORT _SAGA_DLL_EXPORT +#else + #define io_gps_EXPORT _SAGA_DLL_IMPORT +#endif + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#endif // #ifndef HEADER_INCLUDED__io_gps_H diff -Nru saga-2.1.0+dfsg/src/modules/io/io_grid/bmp_export.cpp saga-2.1.4+dfsg/src/modules/io/io_grid/bmp_export.cpp --- saga-2.1.0+dfsg/src/modules/io/io_grid/bmp_export.cpp 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_grid/bmp_export.cpp 2014-11-13 08:32:20.000000000 +0000 @@ -0,0 +1,245 @@ +/********************************************************** + * Version $Id: bmp_export.cpp 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for an Automated Geo-Scientific Analysis // +// // +// Module Library: // +// Grid_IO // +// // +//-------------------------------------------------------// +// // +// bmp_export.cpp // +// // +// Copyright (C) 2005 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for an Automated // +// Geo-Scientific Analysis'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@gwdg.de // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Goettingen // +// Goldschmidtstr. 5 // +// 37077 Goettingen // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "bmp_export.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +CBMP_Export::CBMP_Export(void) +{ + //----------------------------------------------------- + Set_Name (_TL("Export True Color Bitmap")); + + Set_Author (SG_T("(c) 2005 by O.Conrad")); + + Set_Description (_TW( + "Export red-green-blue coded image grids to MS-Windows true color bitmaps. " + "This module writes the data directly to the file and is hence particularly " + "suitable for very large data sets. " + )); + + //----------------------------------------------------- + Parameters.Add_Grid( + NULL , "IMAGE" , _TL("Image Grid"), + _TL(""), + PARAMETER_INPUT + ); + + Parameters.Add_FilePath( + NULL , "FILE" , _TL("File"), + _TL(""), + _TL("MS Windows Bitmap (*.bmp)|*.bmp|All Files|*.*"), + NULL, true, false + ); +} + +//--------------------------------------------------------- +CBMP_Export::~CBMP_Export(void) +{} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#define SIZE_HEADER_FILE 14 +#define SIZE_HEADER_BITMAP 40 +#define SIZE_HEADER_TOTAL (SIZE_HEADER_FILE + SIZE_HEADER_BITMAP) + +//--------------------------------------------------------- +bool CBMP_Export::On_Execute(void) +{ + //----------------------------------------------------- + char *Line, *pLine; + int x, y, Value, nBytes_Image, nBytes_Line; + FILE *Stream; + CSG_Grid *pGrid; + CSG_String FileName; + + //----------------------------------------------------- + pGrid = Parameters("IMAGE") ->asGrid(); + FileName = Parameters("FILE") ->asString(); + + //----------------------------------------------------- + if( (Stream = fopen(FileName.b_str(), "wb")) != NULL ) + { + nBytes_Line = 3 * sizeof(BYTE) * Get_NX(); + + if( (Value = nBytes_Line % 4) != 0 ) // must be a multiple of DWORD size... + { + nBytes_Line += 4 - Value; + } + + nBytes_Image = nBytes_Line * Get_NY(); + + //------------------------------------------------- + Write_WORD (Stream, 0x4d42); // bfType - 0x42 = "B", 0x4d = "M"... + Write_DWORD (Stream, SIZE_HEADER_TOTAL + nBytes_Image); // bfSize - size of the entire file... + Write_WORD (Stream, 0); // bfReserved1 + Write_WORD (Stream, 0); // bfReserved2 + Write_DWORD (Stream, SIZE_HEADER_TOTAL); // bfOffBits - offset to the array of color indices... + + //------------------------------------------------- + Write_DWORD (Stream, SIZE_HEADER_BITMAP); // biSize; + Write_LONG (Stream, Get_NX()); // biWidth; + Write_LONG (Stream, Get_NY()); // biHeight; + Write_WORD (Stream, 1); // biPlanes; + Write_WORD (Stream, 24); // biBitCount; + Write_DWORD (Stream, 0); // biCompression; + Write_DWORD (Stream, nBytes_Image); // biSizeImage; + Write_LONG (Stream, 0); // biXPelsPerMeter; + Write_LONG (Stream, 0); // biYPelsPerMeter; + Write_DWORD (Stream, 2^24); // biClrUsed; + Write_DWORD (Stream, 0); // biClrImportant; + + //------------------------------------------------- + Line = (char *)SG_Calloc(nBytes_Line, sizeof(char)); + + for(y=0; yasInt(x, y); + + pLine[0] = SG_GET_B(Value); + pLine[1] = SG_GET_G(Value); + pLine[2] = SG_GET_R(Value); + } + + fwrite(Line, sizeof(char), nBytes_Line, Stream); + } + + SG_Free(Line); + + fclose(Stream); + + //------------------------------------------------- + FileName = SG_File_Make_Path(SG_File_Get_Path(FileName), SG_File_Get_Name(FileName, false), SG_T("prj")); + + pGrid->Get_Projection().Save(FileName); + + //------------------------------------------------- + FileName = SG_File_Make_Path(SG_File_Get_Path(FileName), SG_File_Get_Name(FileName, false), SG_T("bpw")); + + if( (Stream = fopen(FileName.b_str(), "w")) != NULL ) + { + fprintf(Stream, "%f\n%f\n%f\n%f\n%f\n%f\n", + pGrid->Get_Cellsize(), + 0.0, 0.0, + -pGrid->Get_Cellsize(), + pGrid->Get_XMin(), + pGrid->Get_YMax() + ); + + fclose(Stream); + } + + return( true ); + } + + //----------------------------------------------------- + return( false ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +void CBMP_Export::Write_WORD (FILE *Stream, WORD Value) +{ + fwrite(&Value, sizeof(Value), 1, Stream); +} + +//--------------------------------------------------------- +void CBMP_Export::Write_DWORD (FILE *Stream, DWORD Value) +{ + fwrite(&Value, sizeof(Value), 1, Stream); +} + +//--------------------------------------------------------- +void CBMP_Export::Write_LONG (FILE *Stream, long Value) +{ + fwrite(&Value, sizeof(Value), 1, Stream); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- diff -Nru saga-2.1.0+dfsg/src/modules/io/io_grid/bmp_export.h saga-2.1.4+dfsg/src/modules/io/io_grid/bmp_export.h --- saga-2.1.0+dfsg/src/modules/io/io_grid/bmp_export.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_grid/bmp_export.h 2014-11-13 08:32:20.000000000 +0000 @@ -0,0 +1,115 @@ +/********************************************************** + * Version $Id: bmp_export.h 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for an Automated Geo-Scientific Analysis // +// // +// Module Library: // +// Grid_IO // +// // +//-------------------------------------------------------// +// // +// bmp_export.h // +// // +// Copyright (C) 2005 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for an Automated // +// Geo-Scientific Analysis'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@gwdg.de // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Goettingen // +// Goldschmidtstr. 5 // +// 37077 Goettingen // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#ifndef HEADER_INCLUDED__bmp_export_H +#define HEADER_INCLUDED__bmp_export_H + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "MLB_Interface.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +class CBMP_Export : public CSG_Module_Grid +{ +public: + CBMP_Export(void); + virtual ~CBMP_Export(void); + + virtual CSG_String Get_MenuPath (void) { return( _TL("R:Export") ); } + + +protected: + + virtual bool On_Execute (void); + + +private: + + void Write_WORD (FILE *Stream, WORD Value); + void Write_DWORD (FILE *Stream, DWORD Value); + void Write_LONG (FILE *Stream, long Value); + +}; + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#endif // #ifndef HEADER_INCLUDED__bmp_export_H diff -Nru saga-2.1.0+dfsg/src/modules/io/io_grid/citygml_import.cpp saga-2.1.4+dfsg/src/modules/io/io_grid/citygml_import.cpp --- saga-2.1.0+dfsg/src/modules/io/io_grid/citygml_import.cpp 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_grid/citygml_import.cpp 2014-11-13 08:32:20.000000000 +0000 @@ -0,0 +1,385 @@ +/********************************************************** + * Version $Id: citygml_import.cpp 911 2011-02-14 16:38:15Z reklov_w $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// io_grid // +// // +//-------------------------------------------------------// +// // +// citygml_import.cpp // +// // +// Copyright (C) 2014 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Hamburg // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "citygml_import.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +CCityGML_Import::CCityGML_Import(void) +{ + //----------------------------------------------------- + Set_Name (_TL("Import Building Sketches from CityGML")); + + Set_Author ("O.Conrad (c) 2014"); + + Set_Description (_TW( + "This tool facilitates the import of building sketches using a CityGML based file format, " + "that is commonly used by German land surveying offices and geoinformation distributors. " + )); + + //----------------------------------------------------- + Parameters.Add_Shapes( + NULL , "BUILDINGS" , _TL("Buildings"), + _TL(""), + PARAMETER_OUTPUT, SHAPE_TYPE_Polygon + ); + + Parameters.Add_FilePath( + NULL , "FILES" , _TL("Files"), + _TL(""), + CSG_String::Format(SG_T("%s|*.xml|%s|*.*"), + _TL("XML Files (*.xml)"), + _TL("All Files") + ), NULL, false, false, true + ); + + Parameters.Add_Value( + NULL , "PARTS" , _TL("Check for Building Parts"), + _TL(""), + PARAMETER_TYPE_Bool, true + ); +} + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CCityGML_Import::On_Execute(void) +{ + CSG_Strings Files; + + if( !Parameters("FILES")->asFilePath()->Get_FilePaths(Files) ) + { + return( false ); + } + + CSG_Shapes Buildings(SHAPE_TYPE_Polygon), *pBuildings = Parameters("BUILDINGS")->asShapes(); + + for(int i=0; iGet_Count() <= 0 ) + { + Get_Buildings(Files[i], pBuildings, Parameters("PARTS")->asBool()); + } + else if( Get_Buildings(Files[i], &Buildings, Parameters("PARTS")->asBool()) ) + { + Add_Buildings(pBuildings, &Buildings); + + CSG_String Description(pBuildings->Get_Description()); + + Description += "\n"; + Description += Buildings.Get_Name(); + + pBuildings->Set_Description(Description); + } + } + + return( pBuildings->Get_Count() > 0 ); +} + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CCityGML_Import::Get_Buildings(const CSG_String &File, CSG_Shapes *pBuildings, bool bParts) +{ + //----------------------------------------------------- + if( !Get_Buildings(File, pBuildings) ) + { + Error_Set(_TL("CityGML file import failed")); + + return( false ); + } + + if( bParts == false ) + { + return( true ); + } + + //----------------------------------------------------- + // 1. check for building parts + + Process_Set_Text(CSG_String::Format(SG_T("%s: %s"), _TL("loading building parts"), SG_File_Get_Name(File, true).c_str())); + + CSG_MetaData GML, GML_Parts; + + if( !GML.Create(File) ) + { + Error_Set(_TL("loading failed")); + + return( false ); + } + + GML_Parts.Assign(GML, false); + + bParts = false; + + for(int i=0; iGet(0) ) + { + Error_Set(CSG_String::Format(SG_T("%s: %s"), _TL("CityGML import failed"), File.c_str())); + + return( false ); + } + + + //----------------------------------------------------- + // convert line strings to polygons + + Process_Set_Text(_TL("polygon conversion")); + + CSG_Module *pModule; + + if( !(pModule = SG_Get_Module_Library_Manager().Get_Module(SG_T("shapes_polygons"), 3)) ) // Convert Lines to Polygons + { + Error_Set(_TL("could not locate line string to polygon conversion tool")); + + return( false ); + } + + CSG_Parameters P; P.Assign(pModule->Get_Parameters()); pModule->Set_Manager(NULL); + + bool bResult = pModule->Get_Parameters()->Set_Parameter("POLYGONS", pPolygons) + && pModule->Get_Parameters()->Set_Parameter("LINES" , (CSG_Shapes *)tmpMgr.Get_Shapes()->Get(0)) + && pModule->Get_Parameters()->Set_Parameter("MERGE" , true) + && pModule->Execute(); + + pModule->Get_Parameters()->Assign_Values(&P); pModule->Set_Manager(P.Get_Manager()); + + pPolygons->Set_Name(SG_File_Get_Name(File, false)); + + //----------------------------------------------------- + return( bResult ); +} + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CCityGML_Import::Add_Buildings(CSG_Shapes *pBuildings, CSG_Shapes *pAdd) +{ + int i, j, *Index = (int *)SG_Malloc(pBuildings->Get_Field_Count() * sizeof(int)); + + for(i=0; iGet_Field_Count(); i++) + { + CSG_String Name(pBuildings->Get_Field_Name(i)); + + Index[i] = -1; + + for(j=0; Index[i]<0 && jGet_Field_Count(); j++) + { + if( !Name.CmpNoCase(pAdd->Get_Field_Name(j)) ) + { + Index[i] = j; + } + } + } + + for(i=0; iGet_Count(); i++) + { + CSG_Shape *pPart = pAdd->Get_Shape(i); + CSG_Shape *pPolygon = pBuildings->Add_Shape(pPart, SHAPE_COPY_GEOM); + + for(j=0; jGet_Field_Count(); j++) + { + if( Index[j] >= 0 ) + { + *pPolygon->Get_Value(j) = *pPart->Get_Value(Index[j]); + } + } + } + + SG_Free(Index); + + return( true ); +} + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CCityGML_Import::Has_BuildingParts(const CSG_MetaData &GML) +{ + return( GML.Get_Name().CmpNoCase("core:cityObjectMember") == 0 + && GML.Get_Children_Count() == 1 && GML[0].Get_Name().CmpNoCase("bldg:Building") == 0 + && GML[0].Get_Child("bldg:consistsOfBuildingPart") != NULL + ); +} + +//--------------------------------------------------------- +bool CCityGML_Import::Add_BuildingParts(const CSG_MetaData &GML, CSG_MetaData &GML_Parts) +{ + if( GML.Get_Name().CmpNoCase("bldg:Building") ) + { + return( false ); + } + + int i; + CSG_MetaData head; + + for(i=0; iAdd_Child(GML[i][0], false); + + pBuilding->Set_Name("bldg:Building"); + pBuilding->Add_Children(head); + pBuilding->Add_Children(GML[i][0]); + } + } + + return( true ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- diff -Nru saga-2.1.0+dfsg/src/modules/io/io_grid/citygml_import.h saga-2.1.4+dfsg/src/modules/io/io_grid/citygml_import.h --- saga-2.1.0+dfsg/src/modules/io/io_grid/citygml_import.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_grid/citygml_import.h 2014-11-13 08:32:20.000000000 +0000 @@ -0,0 +1,117 @@ +/********************************************************** + * Version $Id: citygml_import.h 911 2011-02-14 16:38:15Z reklov_w $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// io_grid // +// // +//-------------------------------------------------------// +// // +// citygml_import.h // +// // +// Copyright (C) 2014 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Hamburg // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#ifndef HEADER_INCLUDED__citygml_import_H +#define HEADER_INCLUDED__citygml_import_H + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "MLB_Interface.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +class CCityGML_Import : public CSG_Module +{ +public: ////// public members and functions: ////////////// + + CCityGML_Import(void); + + virtual CSG_String Get_MenuPath (void) { return( _TL("R:Import") ); } + + +protected: /// protected members and functions: /////////// + + virtual bool On_Execute (void); + + +private: ///// private members and functions: ///////////// + + bool Get_Buildings (const CSG_String &File, CSG_Shapes *pPolygons, bool bParts); + bool Get_Buildings (const CSG_String &File, CSG_Shapes *pPolygons); + + bool Add_Buildings (CSG_Shapes *pBuildings, CSG_Shapes *pAdd); + + bool Has_BuildingParts (const CSG_MetaData &GML); + bool Add_BuildingParts (const CSG_MetaData &GML, CSG_MetaData &GML_Parts); + +}; + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#endif // #ifndef HEADER_INCLUDED__citygml_import_H diff -Nru saga-2.1.0+dfsg/src/modules/io/io_grid/erdas_lan.cpp saga-2.1.4+dfsg/src/modules/io/io_grid/erdas_lan.cpp --- saga-2.1.0+dfsg/src/modules/io/io_grid/erdas_lan.cpp 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_grid/erdas_lan.cpp 2014-11-13 08:32:20.000000000 +0000 @@ -0,0 +1,294 @@ +/********************************************************** + * Version $Id: erdas_lan.cpp 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for an Automated Geo-Scientific Analysis // +// // +// Module Library: // +// Grid_IO // +// // +//-------------------------------------------------------// +// // +// erdas_lan.cpp // +// // +// Copyright (C) 2005 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for an Automated // +// Geo-Scientific Analysis'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@gwdg.de // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Goettingen // +// Goldschmidtstr. 5 // +// 37077 Goettingen // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include + +#include "erdas_lan.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +CErdas_LAN_Import::CErdas_LAN_Import(void) +{ + //----------------------------------------------------- + Set_Name (_TL("Import Erdas LAN/GIS")); + + Set_Author (SG_T("(c) 2005 by O.Conrad")); + + Set_Description (_TW( + "Import Erdas LAN/GIS files. \n" + "The format analysis is based on the GRASS module i.in.erdas. " + "Go to the " + "GRASS GIS Hompage " + "for more information.\n" + )); + + //----------------------------------------------------- + Parameters.Add_Grid_List( + NULL , "GRIDS" , _TL("Grids"), + _TL(""), + PARAMETER_OUTPUT_OPTIONAL + ); + + Parameters.Add_FilePath( + NULL , "FILE" , _TL("File"), + _TL(""), + _TL("Erdas LAN/GIS files (*.lan, *.gis)|*.lan;*.gis|All Files|*.*"), + NULL, false, false + ); +} + +//--------------------------------------------------------- +CErdas_LAN_Import::~CErdas_LAN_Import(void) +{} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#define SWAP(v) if( bSwap ) SG_Swap_Bytes(&v, sizeof(v)); + +//--------------------------------------------------------- +bool CErdas_LAN_Import::On_Execute(void) +{ + //----------------------------------------------------- + bool bResult = false, bSwap = false; + BYTE *Line, *pLine; + char head[6], empty[56]; + short vType, nBands, maptyp, nclass, unit; + int x, y, i, nLine; + long nx, ny, px, py; + float area, dx, dy, xPos, yPos; + double Cellsize, xMin, yMin, Value; + FILE *Stream; + TSG_Data_Type gType; + CSG_Parameter_Grid_List *Grids; + CSG_String FileName; + + //----------------------------------------------------- + Grids = Parameters("GRIDS") ->asGridList(); + FileName = Parameters("FILE") ->asString(); + + Grids->Del_Items(); + + //----------------------------------------------------- + if( (Stream = fopen(FileName.b_str(), "rb")) != NULL ) + { + fread( head , 6, sizeof(char) , Stream); // "HEAD74" + fread(&vType , 1, sizeof(short) , Stream); SWAP(vType); // 0 = 8 bit, 1 = 4 bit, 2 = 16 bit + fread(&nBands , 1, sizeof(short) , Stream); SWAP(nBands); // number of bands + fread( empty , 6, sizeof(char) , Stream); // empty + fread(&nx , 1, sizeof(long) , Stream); SWAP(nx); // number of columns + fread(&ny , 1, sizeof(long) , Stream); SWAP(ny); // number of rows + fread(&px , 1, sizeof(long) , Stream); SWAP(px); // x position of top-left pixel "database location" + fread(&py , 1, sizeof(long) , Stream); SWAP(py); // y position of top-left pixel "database location" + fread( empty , 56, sizeof(char) , Stream); // empty + fread(&maptyp , 1, sizeof(short) , Stream); SWAP(maptyp); // map projection + fread(&nclass , 1, sizeof(short) , Stream); SWAP(nclass); // number of classes + fread( empty , 14, sizeof(char) , Stream); // empty + fread(&unit , 1, sizeof(short) , Stream); SWAP(unit); // units of area per pixel - 0 = none, 1 = acre, 2 = hectare, 3 = other + fread(&area , 1, sizeof(float) , Stream); SWAP(area); // area per pixel + fread(&xPos , 1, sizeof(float) , Stream); SWAP(xPos); // x coordinate of top-left pixel + fread(&yPos , 1, sizeof(float) , Stream); SWAP(yPos); // y coordinate of top-left pixel + fread(&dx , 1, sizeof(float) , Stream); SWAP(dx); // linear size of a pixel (feet/degrees/meters) + fread(&dy , 1, sizeof(float) , Stream); SWAP(dy); // linear size of a pixel (feet/degrees/meters) + + //------------------------------------------------- + CSG_File fWorld; + + if( fWorld.Open(SG_File_Make_Path(NULL, FileName, SG_T("lnw")), SG_FILE_R, false) ) + { + double d; + CSG_String sLine; + + if( fWorld.Read_Line(sLine) ) { if( sLine.asDouble(d) ) dx = (float)d; } + if( fWorld.Read_Line(sLine) ) { } + if( fWorld.Read_Line(sLine) ) { } + if( fWorld.Read_Line(sLine) ) { if( sLine.asDouble(d) ) dy = (float)d; } + if( fWorld.Read_Line(sLine) ) { if( sLine.asDouble(d) ) xPos = (float)d; } + if( fWorld.Read_Line(sLine) ) { if( sLine.asDouble(d) ) yPos = (float)d; } + } + + //------------------------------------------------- + if( feof(Stream) ) + { + Message_Add(_TL("File error")); + } + else if( strncmp(head, "HEAD74", sizeof(head)) ) + { + Message_Add(_TL("ERDAS files other than version 7.4 are not supported.")); + } + + //------------------------------------------------- + else + { + bResult = true; + Cellsize = dx; + xMin = xPos; + yMin = yPos - ny * Cellsize; + + switch( vType ) + { + case 0: default: // 8 bit + gType = SG_DATATYPE_Byte; + nLine = nx; + break; + + case 1: // 4 bit + gType = SG_DATATYPE_Byte; + nLine = nx / 2 + (nx % 2 ? 1 : 0); + break; + + case 2: // 16 bit + gType = SG_DATATYPE_Word; + nLine = nx * 2; + break; + } + + Line = (BYTE *)SG_Malloc(nLine * sizeof(BYTE)); + + for(i=0; iAdd_Item(SG_Create_Grid(gType, nx, ny, Cellsize, xMin, yMin)); + Grids->asGrid(i)->Set_Name(CSG_String::Format(SG_T("%s [%d]"), SG_File_Get_Name(FileName, false).c_str(), i + 1)); + } + + //--------------------------------------------- + for(y=0; y> 4; + pLine ++; + } + else + { + Value = (*pLine & 0x11); + } + break; + + case 2: + if( bSwap ) + { + SG_Swap_Bytes(pLine, 2); + } + + Value = *((short *)pLine); + pLine += 2; + break; + } + + Grids->asGrid(i)->Set_Value(x, ny - y - 1, Value); + } + } + } + + //--------------------------------------------- + SG_Free(Line); + + for(i=0; iasGrid(i)); + DataObject_Set_Colors (Grids->asGrid(i), 100, SG_COLORS_BLACK_WHITE); + } + } + + //------------------------------------------------- + fclose(Stream); + } + + //----------------------------------------------------- + return( bResult ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- diff -Nru saga-2.1.0+dfsg/src/modules/io/io_grid/erdas_lan.h saga-2.1.4+dfsg/src/modules/io/io_grid/erdas_lan.h --- saga-2.1.0+dfsg/src/modules/io/io_grid/erdas_lan.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_grid/erdas_lan.h 2014-11-13 08:32:20.000000000 +0000 @@ -0,0 +1,111 @@ +/********************************************************** + * Version $Id: erdas_lan.h 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for an Automated Geo-Scientific Analysis // +// // +// Module Library: // +// Grid_IO // +// // +//-------------------------------------------------------// +// // +// erdas_lan.h // +// // +// Copyright (C) 2005 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for an Automated // +// Geo-Scientific Analysis'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@gwdg.de // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Goettingen // +// Goldschmidtstr. 5 // +// 37077 Goettingen // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#ifndef HEADER_INCLUDED__erdas_lan_H +#define HEADER_INCLUDED__erdas_lan_H + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "MLB_Interface.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +class CErdas_LAN_Import : public CSG_Module +{ +public: + CErdas_LAN_Import(void); + virtual ~CErdas_LAN_Import(void); + + virtual CSG_String Get_MenuPath (void) { return( _TL("R:Import") ); } + + +protected: + + virtual bool On_Execute (void); + + +private: + +}; + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#endif // #ifndef HEADER_INCLUDED__erdas_lan_H diff -Nru saga-2.1.0+dfsg/src/modules/io/io_grid/esri_arcinfo.cpp saga-2.1.4+dfsg/src/modules/io/io_grid/esri_arcinfo.cpp --- saga-2.1.0+dfsg/src/modules/io/io_grid/esri_arcinfo.cpp 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_grid/esri_arcinfo.cpp 2014-11-13 08:32:20.000000000 +0000 @@ -0,0 +1,689 @@ +/********************************************************** + * Version $Id: esri_arcinfo.cpp 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// Grid_IO // +// // +//-------------------------------------------------------// +// // +// ESRI_ArcInfo.cpp // +// // +// Copyright (C) 2007 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Goettingen // +// Goldschmidtstr. 5 // +// 37077 Goettingen // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "esri_arcinfo.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#define HDR_NROWS SG_T("NROWS") +#define HDR_NCOLS SG_T("NCOLS") +#define HDR_X_CORNER SG_T("XLLCORNER") +#define HDR_Y_CORNER SG_T("YLLCORNER") +#define HDR_X_CENTER SG_T("XLLCENTER") +#define HDR_Y_CENTER SG_T("YLLCENTER") +#define HDR_CELLSIZE SG_T("CELLSIZE") +#define HDR_NODATA SG_T("NODATA_VALUE") +#define HDR_BYTEORDER SG_T("BYTE_ORDER") +#define HDR_BYTEORDER_HI SG_T("MSB_FIRST") +#define HDR_BYTEORDER_LO SG_T("LSB_FIRST") + + +/////////////////////////////////////////////////////////// +// // +// Import // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +CESRI_ArcInfo_Import::CESRI_ArcInfo_Import(void) +{ + //----------------------------------------------------- + // 1. Info... + + Set_Name (_TL("Import ESRI Arc/Info Grid")); + + Set_Author (SG_T("O.Conrad (c) 2007")); + + Set_Description (_TW( + "Import grid from ESRI's Arc/Info grid format.") + ); + + + //----------------------------------------------------- + // 2. Parameters... + + Parameters.Add_Grid_Output( + NULL , "GRID" , _TL("Grid"), + _TL("") + ); + + Parameters.Add_FilePath( + NULL , "FILE" , _TL("File"), + _TL(""), + + CSG_String::Format( + SG_T("%s|*.asc;*.flt|%s|*.asc|%s|*.flt|%s|*.*"), + _TL("ESRI Arc/Info Grids"), + _TL("ESRI Arc/Info ASCII Grids (*.asc)"), + _TL("ESRI Arc/Info Binary Grids (*.flt)"), + _TL("All Files") + ) + ); + + CSG_Parameter *pNode; + + pNode = Parameters.Add_Node( + NULL , "NODE_ASCII" , _TL("ASCII Grid Options"), + _TL("") + ); + + Parameters.Add_Choice( + pNode , "GRID_TYPE" , _TL("Target Grid Type"), + _TL(""), + + CSG_String::Format(SG_T("%s|%s|%s|%s|"), + _TL("Integer (2 byte)"), + _TL("Integer (4 byte)"), + _TL("Floating Point (4 byte)"), + _TL("Floating Point (8 byte)") + ), 2 + ); + + Parameters.Add_Choice( + pNode , "NODATA" , _TL("NoData Value"), + _TL("Choose whether the input file's NoData value or a user specified NoData value is written"), + + CSG_String::Format(SG_T("%s|%s|"), + _TL("Input File's NoData Value"), + _TL("User Defined NoData Value") + ), 0 + ); + + Parameters.Add_Value( + pNode , "NODATA_VAL" , _TL("User Defined NoData Value"), + _TL(""), + PARAMETER_TYPE_Double , -99999.0 + ); +} + +//--------------------------------------------------------- +bool CESRI_ArcInfo_Import::On_Execute(void) +{ + CSG_File Stream; + CSG_String fName; + CSG_Grid *pGrid; + TSG_Data_Type Datatype; + int iNoData; + double dNoData; + + //----------------------------------------------------- + pGrid = NULL; + fName = Parameters("FILE")->asString(); + iNoData = Parameters("NODATA")->asInt(); + dNoData = Parameters("NODATA_VAL")->asDouble(); + + switch( Parameters("GRID_TYPE")->asInt() ) + { + case 0: Datatype = SG_DATATYPE_Short; break; + case 1: Datatype = SG_DATATYPE_Int; break; + case 2: + default: Datatype = SG_DATATYPE_Float; break; + case 3: Datatype = SG_DATATYPE_Double; break; + } + + + //------------------------------------------------- + // Binary... + + if( Stream.Open(SG_File_Make_Path(SG_T(""), fName, SG_T("hdr")), SG_FILE_R, false) && (pGrid = Read_Header(Stream)) != NULL ) + { + if( Stream.Open(SG_File_Make_Path(SG_T(""), fName, SG_T("flt")), SG_FILE_R, true) ) + { + float *Line = (float *)SG_Malloc(pGrid->Get_NX() * sizeof(float)); + + for(int iy=0, y=pGrid->Get_NY()-1; iyGet_NY() && !Stream.is_EOF() && Set_Progress(iy, pGrid->Get_NY()); iy++, y--) + { + Stream.Read(Line, sizeof(float), pGrid->Get_NX()); + + for(int x=0; xGet_NX(); x++) + { + pGrid->Set_Value(x, y, Line[x]); + } + } + + SG_Free(Line); + } + else + { + delete(pGrid); + + return( false ); + } + } + + //------------------------------------------------- + // ASCII... + + else if( Stream.Open(fName, SG_FILE_R, false) && (pGrid = Read_Header(Stream, Datatype)) != NULL ) + { + double dValue; + + for(int iy=0, y=pGrid->Get_NY()-1; iyGet_NY() && !Stream.is_EOF() && Set_Progress(iy, pGrid->Get_NY()); iy++, y--) + { + for(int x=0; xGet_NX(); x++) + { + dValue = Read_Value(Stream); + + if( iNoData == 1 && dValue == pGrid->Get_NoData_Value() ) + dValue = dNoData; + + pGrid->Set_Value(x, y, dValue); + } + } + + if( iNoData == 1 ) + { + pGrid->Set_NoData_Value(dNoData); + } + } + + //------------------------------------------------- + else + { + return( false ); + } + + //------------------------------------------------- + pGrid->Set_Name(SG_File_Get_Name(fName, false)); + + pGrid->Get_Projection().Load(SG_File_Make_Path(NULL, fName, SG_T("prj"))); + + Parameters("GRID")->Set_Value(pGrid); + + return( true ); +} + +//--------------------------------------------------------- +inline bool SG_is_Numeric(int Character) +{ + switch( Character ) + { + case '0': + case '1': + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': + case '8': + case '9': + case '-': + case '+': + case '.': + case ',': + case 'e': + case 'E': + return( true ); + } + + return( false ); +} + +//--------------------------------------------------------- +double CESRI_ArcInfo_Import::Read_Value(CSG_File &Stream) +{ + int c; + CSG_String s; + + while( !Stream.is_EOF() && !SG_is_Numeric(c = Stream.Read_Char()) ); // ignore leading white space... + + if( !Stream.is_EOF() && SG_is_Numeric(c) ) + { + do + { + if( c == ',' ) + { + c = '.'; + } + + s += (char)c; + } + while( !Stream.is_EOF() && SG_is_Numeric(c = Stream.Read_Char()) ); + } + + return( s.asDouble() ); +} + +//--------------------------------------------------------- +bool CESRI_ArcInfo_Import::Read_Header_Line(CSG_File &Stream, CSG_String &sLine) +{ + int c; + + sLine.Clear(); + + while( !Stream.is_EOF() && (c = Stream.Read_Char()) != 0x0A ) + { + if( c != 0x0D ) + { + sLine += (char)c; + } + } + + sLine.Make_Upper(); + sLine.Replace(SG_T(","), SG_T(".")); + + return( sLine.Length() > 0 ); +} + +//--------------------------------------------------------- +bool CESRI_ArcInfo_Import::Read_Header_Value(const CSG_String &sKey, CSG_String &sLine, int &Value) +{ + sLine.Make_Upper(); + + if( sLine.Contains(sKey) ) + { + CSG_String sValue(sLine.c_str() + sKey.Length()); + + return( sValue.asInt(Value) ); + } + + return( false ); +} + +//--------------------------------------------------------- +bool CESRI_ArcInfo_Import::Read_Header_Value(const CSG_String &sKey, CSG_String &sLine, double &Value) +{ + sLine.Make_Upper(); + + if( sLine.Contains(sKey) ) + { + CSG_String sValue(sLine.c_str() + sKey.Length()); + + return( sValue.asDouble(Value) ); + } + + return( false ); +} + +//--------------------------------------------------------- +CSG_Grid * CESRI_ArcInfo_Import::Read_Header(CSG_File &Stream, TSG_Data_Type Datatype) +{ + bool bCorner_X, bCorner_Y; + int NX, NY; + double CellSize, xMin, yMin, NoData = -9999.0; + CSG_String sLine; + CSG_Grid *pGrid; + + //----------------------------------------------------- + if( !Stream.is_EOF() ) + { + //------------------------------------------------- + Read_Header_Line(Stream, sLine); + + if( !Read_Header_Value(HDR_NCOLS , sLine, NX) ) + return( NULL ); + + //------------------------------------------------- + Read_Header_Line(Stream, sLine); + + if( !Read_Header_Value(HDR_NROWS , sLine, NY) ) + return( NULL ); + + //------------------------------------------------- + Read_Header_Line(Stream, sLine); + + if( Read_Header_Value(HDR_X_CORNER, sLine, xMin) ) + bCorner_X = true; + else if( Read_Header_Value(HDR_X_CENTER, sLine, xMin) ) + bCorner_X = false; + else + return( NULL ); + + //------------------------------------------------- + Read_Header_Line(Stream, sLine); + + if( Read_Header_Value(HDR_Y_CORNER, sLine, yMin) ) + bCorner_Y = true; + else if( Read_Header_Value(HDR_Y_CENTER, sLine, yMin) ) + bCorner_Y = false; + else + return( NULL ); + + //------------------------------------------------- + Read_Header_Line(Stream, sLine); + + if( !Read_Header_Value(HDR_CELLSIZE, sLine, CellSize) ) + return( NULL ); + + //------------------------------------------------- + Read_Header_Line(Stream, sLine); + + if( !Read_Header_Value(HDR_NODATA , sLine, NoData) ) + // return( NULL ); + {} + + //------------------------------------------------- + if( bCorner_X ) + xMin += CellSize / 2.0; + + if( bCorner_Y ) + yMin += CellSize / 2.0; + + //------------------------------------------------- + if( (pGrid = SG_Create_Grid(Datatype, NX, NY, CellSize, xMin, yMin)) != NULL ) + { + pGrid->Set_NoData_Value(NoData); + + return( pGrid ); + } + } + + return( NULL ); +} + + +/////////////////////////////////////////////////////////// +// // +// Export // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +CESRI_ArcInfo_Export::CESRI_ArcInfo_Export(void) +{ + //----------------------------------------------------- + // 1. Info... + + Set_Name (_TL("Export ESRI Arc/Info Grid")); + + Set_Author (SG_T("O.Conrad (c) 2007")); + + Set_Description (_TW( + "Export grid to ESRI's Arc/Info grid format.") + ); + + + //----------------------------------------------------- + // 2. Parameters... + + Parameters.Add_Grid( + NULL , "GRID" , _TL("Grid"), + _TL(""), + PARAMETER_INPUT + ); + + Parameters.Add_FilePath( + NULL , "FILE" , _TL("File"), + _TL(""), + + CSG_String::Format( + SG_T("%s|*.asc;*.flt|%s|*.asc|%s|*.flt|%s|*.*"), + _TL("ESRI Arc/Info Grids"), + _TL("ESRI Arc/Info ASCII Grids (*.asc)"), + _TL("ESRI Arc/Info Binary Grids (*.flt)"), + _TL("All Files") + ), NULL, true + ); + + Parameters.Add_Choice( + NULL , "FORMAT" , _TL("Format"), + _TL(""), + + CSG_String::Format(SG_T("%s|%s|"), + _TL("binary"), + _TL("ASCII") + ), 1 + ); + + Parameters.Add_Choice( + NULL , "GEOREF" , _TL("Geo-Reference"), + _TL("The grids geo-reference must be related either to the center or the corner of its lower left grid cell."), + + CSG_String::Format(SG_T("%s|%s|"), + _TL("corner"), + _TL("center") + ), 0 + ); + + Parameters.Add_Value( + NULL , "PREC" , _TL("ASCII Precision"), + _TL("Number of decimals when writing floating point values in ASCII format."), + PARAMETER_TYPE_Int , 4, -1, true + ); + + Parameters.Add_Choice( + NULL , "DECSEP" , _TL("ASCII Decimal Separator"), + _TL("Applies also to the binary format header file."), + + CSG_String::Format(SG_T("%s|%s|"), + _TL("point (.)"), + _TL("comma (,)") + ), 0 + ); + +// Parameters.Add_Choice( +// NULL , "BYTEORD" , _TL("Binary Byte Order"), +// _TL("Byte order when writing floating point values in binary format"), +// +// CSG_String::Format(SG_T("%s|%s|"), +// _TL("most significant first"), +// _TL("least significant first") +// ), 0 +// ); +} + +//--------------------------------------------------------- +bool CESRI_ArcInfo_Export::On_Execute(void) +{ + bool bResult, bSwapBytes, bComma; + int x, y, iy, Precision; + CSG_File Stream; + CSG_Grid *pGrid; + CSG_String fName; + + //----------------------------------------------------- + bResult = false; + + pGrid = Parameters("GRID") ->asGrid(); + fName = Parameters("FILE") ->asString(); + Precision = Parameters("PREC") ->asInt(); + bComma = Parameters("DECSEP") ->asInt() == 1; + bSwapBytes = false; // bSwapBytes = Parameters("BYTEORD") ->asInt() == 1; + + + //----------------------------------------------------- + // Binary... + + if( Parameters("FORMAT")->asInt() == 0 ) + { + if( Stream.Open(SG_File_Make_Path(SG_T(""), fName, SG_T("hdr")), SG_FILE_W, false) + && Write_Header(Stream, pGrid, bComma) + && Stream.Open(SG_File_Make_Path(SG_T(""), fName, SG_T("flt")), SG_FILE_W, true) ) + { + float *Line = (float *)SG_Malloc(pGrid->Get_NX() * sizeof(float)); + + for(int iy=0, y=pGrid->Get_NY()-1; iyGet_NY() && Set_Progress(iy, pGrid->Get_NY()); iy++, y--) + { + for(int x=0; xGet_NX(); x++) + { + Line[x] = pGrid->asFloat(x, y); + + if( bSwapBytes ) + { + SG_Swap_Bytes(Line + x, sizeof(float)); + } + } + + Stream.Write(Line, sizeof(float), pGrid->Get_NX()); + } + + SG_Free(Line); + + pGrid->Get_Projection().Save(SG_File_Make_Path(NULL, fName, SG_T("prj"))); + + return( true ); + } + } + + + //----------------------------------------------------- + // ASCII... + + else if( Stream.Open(fName, SG_FILE_W, false) && Write_Header(Stream, pGrid, bComma) ) + { + for(iy=0, y=pGrid->Get_NY()-1; iyGet_NY() && Set_Progress(iy, pGrid->Get_NY()); iy++, y--) + { + for(x=0; xGet_NX(); x++) + { + if( x > 0 ) + { + fputs(" ",Stream.Get_Stream()); + } + + fputs(Write_Value(pGrid->asDouble(x, y), Precision, bComma).b_str(),Stream.Get_Stream()); + } + + fputs("\n", Stream.Get_Stream()); + } + + pGrid->Get_Projection().Save(SG_File_Make_Path(NULL, fName, SG_T("prj"))); + + return( true ); + } + + //----------------------------------------------------- + return( false ); +} + +//--------------------------------------------------------- +inline CSG_String CESRI_ArcInfo_Export::Write_Value(double Value, int Precision, bool bComma) +{ + CSG_String s; + + if( Precision < 0 ) + { + s.Printf(SG_T("%f") , Value); + } + else if( Precision > 0 ) + { + s.Printf(SG_T("%.*f"), Precision, Value); + } + else + { + s.Printf(SG_T("%d") , (int)(Value > 0.0 ? Value + 0.5 : Value - 0.5)); + } + + if( bComma ) + { + s.Replace(SG_T("."), SG_T(",")); + } + else + { + s.Replace(SG_T(","), SG_T(".")); + } + + return( s ); +} + +//--------------------------------------------------------- +bool CESRI_ArcInfo_Export::Write_Header(CSG_File &Stream, CSG_Grid *pGrid, bool bComma) +{ + if( Stream.is_Open() && pGrid && pGrid->is_Valid() ) + { + CSG_String s; + + s += CSG_String::Format(SG_T("%s %d\n") , HDR_NCOLS , pGrid->Get_NX()); + s += CSG_String::Format(SG_T("%s %d\n") , HDR_NROWS , pGrid->Get_NY()); + + if( Parameters("GEOREF")->asInt() == 0 ) + { + s += CSG_String::Format(SG_T("%s %s\n") , HDR_X_CORNER , Write_Value(pGrid->Get_XMin() - 0.5 * pGrid->Get_Cellsize(), 10, bComma).c_str()); + s += CSG_String::Format(SG_T("%s %s\n") , HDR_Y_CORNER , Write_Value(pGrid->Get_YMin() - 0.5 * pGrid->Get_Cellsize(), 10, bComma).c_str()); + } + else + { + s += CSG_String::Format(SG_T("%s %s\n") , HDR_X_CENTER , Write_Value(pGrid->Get_XMin(), 10, bComma).c_str()); + s += CSG_String::Format(SG_T("%s %s\n") , HDR_Y_CENTER , Write_Value(pGrid->Get_YMin(), 10, bComma).c_str()); + } + + s += CSG_String::Format(SG_T("%s %s\n") , HDR_CELLSIZE , Write_Value(pGrid->Get_Cellsize(), -1, bComma).c_str()); + s += CSG_String::Format(SG_T("%s %s\n") , HDR_NODATA , Write_Value(pGrid->Get_NoData_Value(), Parameters("PREC")->asInt(), bComma).c_str()); + + if( Parameters("FORMAT")->asInt() == 0 ) // binary + { if( Parameters("BYTEORD") ) + s += CSG_String::Format(SG_T("%s %s\n") , HDR_BYTEORDER , Parameters("BYTEORD")->asInt() == 1 ? HDR_BYTEORDER_LO : HDR_BYTEORDER_HI); + } + + fputs(s.b_str(),Stream.Get_Stream()); + + return( true ); + } + + return( false ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- diff -Nru saga-2.1.0+dfsg/src/modules/io/io_grid/esri_arcinfo.h saga-2.1.4+dfsg/src/modules/io/io_grid/esri_arcinfo.h --- saga-2.1.0+dfsg/src/modules/io/io_grid/esri_arcinfo.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_grid/esri_arcinfo.h 2014-11-13 08:32:20.000000000 +0000 @@ -0,0 +1,139 @@ +/********************************************************** + * Version $Id: esri_arcinfo.h 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// Grid_IO // +// // +//-------------------------------------------------------// +// // +// ESRI_ArcInfo.h // +// // +// Copyright (C) 2007 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Goettingen // +// Goldschmidtstr. 5 // +// 37077 Goettingen // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// ESRI_ArcInfo.h // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#ifndef HEADER_INCLUDED__ESRI_ArcInfo_H +#define HEADER_INCLUDED__ESRI_ArcInfo_H + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "MLB_Interface.h" + +//--------------------------------------------------------- +class CESRI_ArcInfo_Import : public CSG_Module +{ +public: + CESRI_ArcInfo_Import(void); + + virtual CSG_String Get_MenuPath (void) { return( _TL("R:Import") ); } + + +protected: + + virtual bool On_Execute (void); + + +private: + + double Read_Value (CSG_File &Stream); + + bool Read_Header_Value (const CSG_String &sKey, CSG_String &sLine, int &Value); + bool Read_Header_Value (const CSG_String &sKey, CSG_String &sLine, double &Value); + bool Read_Header_Line (CSG_File &Stream, CSG_String &sLine); + CSG_Grid * Read_Header (CSG_File &Stream, TSG_Data_Type Datatype = SG_DATATYPE_Float); + +}; + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +class CESRI_ArcInfo_Export : public CSG_Module_Grid +{ +public: + CESRI_ArcInfo_Export(void); + + virtual CSG_String Get_MenuPath (void) { return( _TL("R:Export") ); } + + +protected: + + virtual bool On_Execute (void); + + +private: + + CSG_String Write_Value (double Value, int Precision, bool bComma); + + bool Write_Header (CSG_File &Stream, CSG_Grid *pGrid, bool bComma); + +}; + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#endif // #ifndef HEADER_INCLUDED__ESRI_ArcInfo_H diff -Nru saga-2.1.0+dfsg/src/modules/io/io_grid/grid_table.cpp saga-2.1.4+dfsg/src/modules/io/io_grid/grid_table.cpp --- saga-2.1.0+dfsg/src/modules/io/io_grid/grid_table.cpp 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_grid/grid_table.cpp 2014-11-13 08:32:20.000000000 +0000 @@ -0,0 +1,245 @@ +/********************************************************** + * Version $Id: grid_table.cpp 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// Grid_IO // +// // +//-------------------------------------------------------// +// // +// Grid_Table.cpp // +// // +// Copyright (C) 2006 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Goettingen // +// Goldschmidtstr. 5 // +// 37077 Goettingen // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "grid_table.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +CGrid_Table_Import::CGrid_Table_Import(void) +{ + //----------------------------------------------------- + // 1. Info... + + Set_Name(_TL("Import Grid from Table")); + + Set_Author (SG_T("(c) 2006 by O.Conrad")); + + Set_Description (_TW( + "Imports grid from from table.\n") + ); + + + //----------------------------------------------------- + // 2. Parameters... + + Parameters.Add_Grid_Output( + NULL , "GRID" , _TL("Grid"), + _TL("") + ); + + Parameters.Add_FilePath( + NULL , "FILE_DATA" , _TL("Table"), + _TL("") + ); + + + //----------------------------------------------------- + Parameters.Add_Value( + NULL , "DXY" , _TL("Cell Size"), + _TL(""), + PARAMETER_TYPE_Double , 1.0 + ); + + Parameters.Add_Value( + NULL , "XMIN" , _TL("Left Border (X)"), + _TL(""), + PARAMETER_TYPE_Double , 0.0 + ); + + Parameters.Add_Value( + NULL , "YMIN" , _TL("Lower Border (Y)"), + _TL(""), + PARAMETER_TYPE_Double , 0.0 + ); + + Parameters.Add_String( + NULL , "UNIT" , _TL("Unit Name"), + _TL(""), + _TL("") + ); + + Parameters.Add_Value( + NULL , "ZFACTOR" , _TL("Z Multiplier"), + _TL(""), + PARAMETER_TYPE_Double , 1.0 + ); + + Parameters.Add_Value( + NULL , "NODATA" , _TL("No Data Value"), + _TL(""), + PARAMETER_TYPE_Double , -99999.0 + ); + + Parameters.Add_Choice( + NULL , "DATA_TYPE" , _TL("Data Type"), + _TL(""), _TW( + "1 Byte Integer (unsigned)|" + "1 Byte Integer (signed)|" + "2 Byte Integer (unsigned)|" + "2 Byte Integer (signed)|" + "4 Byte Integer (unsigned)|" + "4 Byte Integer (signed)|" + "4 Byte Floating Point|" + "8 Byte Floating Point|") + ); + + Parameters.Add_Choice( + NULL , "TOPDOWN" , _TL("Line Order"), + _TL(""), + + CSG_String::Format(SG_T("%s|%s|"), + _TL("Bottom to Top"), + _TL("Top to Bottom") + ), 0 + ); +} + +//--------------------------------------------------------- +CGrid_Table_Import::~CGrid_Table_Import(void) +{} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CGrid_Table_Import::On_Execute(void) +{ + bool bDown; + int x, y, nx, ny; + double dxy, xmin, ymin, zFactor, zNoData; + TSG_Data_Type data_type; + CSG_String FileName, Unit; + CSG_Grid *pGrid; + CSG_Table Table; + CSG_Table_Record *pRecord; + + //----------------------------------------------------- + FileName = Parameters("FILE_DATA") ->asString(); + dxy = Parameters("DXY") ->asDouble(); + xmin = Parameters("XMIN") ->asDouble(); + ymin = Parameters("YMIN") ->asDouble(); + bDown = Parameters("TOPDOWN") ->asInt() == 1; + Unit = Parameters("UNIT") ->asString(); + zFactor = Parameters("ZFACTOR") ->asDouble(); + zNoData = Parameters("NODATA") ->asDouble(); + + switch( Parameters("DATA_TYPE")->asInt() ) + { + default: data_type = SG_DATATYPE_Undefined; break; // not handled + case 0: data_type = SG_DATATYPE_Byte; break; // 1 Byte Integer (unsigned) + case 1: data_type = SG_DATATYPE_Char; break; // 1 Byte Integer (signed) + case 2: data_type = SG_DATATYPE_Word; break; // 2 Byte Integer (unsigned) + case 3: data_type = SG_DATATYPE_Short; break; // 2 Byte Integer (signed) + case 4: data_type = SG_DATATYPE_DWord; break; // 4 Byte Integer (unsigned) + case 5: data_type = SG_DATATYPE_Int; break; // 4 Byte Integer (signed) + case 6: data_type = SG_DATATYPE_Float; break; // 4 Byte Floating Point + case 7: data_type = SG_DATATYPE_Double; break; // 8 Byte Floating Point + } + + //----------------------------------------------------- + if( Table.Create(FileName) && (nx = Table.Get_Field_Count()) > 0 && (ny = Table.Get_Record_Count()) > 0 ) + { + pGrid = SG_Create_Grid(data_type, nx, ny, dxy, xmin, ymin); + + for(y=0; ySet_Value(x, y, pRecord->asDouble(x)); + } + } + + pGrid->Set_Unit (Unit); + pGrid->Set_Scaling (zFactor); + pGrid->Set_NoData_Value (zNoData); + pGrid->Set_Name (SG_File_Get_Name(FileName, false)); + + Parameters("GRID")->Set_Value(pGrid); + + return( true ); + } + + //----------------------------------------------------- + return( false ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- diff -Nru saga-2.1.0+dfsg/src/modules/io/io_grid/grid_table.h saga-2.1.4+dfsg/src/modules/io/io_grid/grid_table.h --- saga-2.1.0+dfsg/src/modules/io/io_grid/grid_table.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_grid/grid_table.h 2014-11-13 08:32:20.000000000 +0000 @@ -0,0 +1,109 @@ +/********************************************************** + * Version $Id: grid_table.h 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// Grid_IO // +// // +//-------------------------------------------------------// +// // +// Grid_Table.h // +// // +// Copyright (C) 2006 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Goettingen // +// Goldschmidtstr. 5 // +// 37077 Goettingen // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#ifndef HEADER_INCLUDED__Grid_Table_H +#define HEADER_INCLUDED__Grid_Table_H + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "MLB_Interface.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +class CGrid_Table_Import : public CSG_Module +{ +public: + CGrid_Table_Import(void); + virtual ~CGrid_Table_Import(void); + + virtual CSG_String Get_MenuPath (void) { return( _TL("R:Import") ); } + + +protected: + + virtual bool On_Execute (void); + + +}; + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#endif // #ifndef HEADER_INCLUDED__Grid_Table_H diff -Nru saga-2.1.0+dfsg/src/modules/io/io_grid/Makefile.am saga-2.1.4+dfsg/src/modules/io/io_grid/Makefile.am --- saga-2.1.0+dfsg/src/modules/io/io_grid/Makefile.am 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_grid/Makefile.am 2014-11-13 08:32:20.000000000 +0000 @@ -0,0 +1,44 @@ +# +# $Id: Makefile.am 1277 2011-12-22 15:48:59Z reklov_w $ +# +if DEBUG +DBGFLAGS = -g -DDEBUG +endif +if SAGA_UNICODE +UC_DEFS = -D_SAGA_UNICODE +endif +DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD +CXX_INCS = -I$(top_srcdir)/src/saga_core +AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS) +AM_LDFLAGS = -fPIC -shared -avoid-version +pkglib_LTLIBRARIES = libio_grid.la +libio_grid_la_SOURCES =\ +bmp_export.cpp\ +citygml_import.cpp\ +erdas_lan.cpp\ +esri_arcinfo.cpp\ +grid_table.cpp\ +MLB_Interface.cpp\ +mola.cpp\ +raw.cpp\ +srtm30.cpp\ +surfer.cpp\ +usgs_srtm.cpp\ +wrf.cpp\ +xyz.cpp\ +bmp_export.h\ +citygml_import.h\ +erdas_lan.h\ +esri_arcinfo.h\ +grid_table.h\ +MLB_Interface.h\ +mola.h\ +raw.h\ +srtm30.h\ +surfer.h\ +usgs_srtm.h\ +wrf.h\ +xyz.h + +libio_grid_la_LIBADD = $(top_srcdir)/src/saga_core/saga_api/libsaga_api.la + diff -Nru saga-2.1.0+dfsg/src/modules/io/io_grid/Makefile.in saga-2.1.4+dfsg/src/modules/io/io_grid/Makefile.in --- saga-2.1.0+dfsg/src/modules/io/io_grid/Makefile.in 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_grid/Makefile.in 2014-11-13 08:33:33.000000000 +0000 @@ -0,0 +1,734 @@ +# Makefile.in generated by automake 1.14.1 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +subdir = src/modules/io/io_grid +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_postgresql.m4 \ + $(top_srcdir)/m4/ax_pkg_swig.m4 \ + $(top_srcdir)/m4/ax_python_devel.m4 \ + $(top_srcdir)/m4/ax_swig_enable_cxx.m4 \ + $(top_srcdir)/m4/ax_swig_python.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__installdirs = "$(DESTDIR)$(pkglibdir)" +LTLIBRARIES = $(pkglib_LTLIBRARIES) +libio_grid_la_DEPENDENCIES = \ + $(top_srcdir)/src/saga_core/saga_api/libsaga_api.la +am_libio_grid_la_OBJECTS = bmp_export.lo citygml_import.lo \ + erdas_lan.lo esri_arcinfo.lo grid_table.lo MLB_Interface.lo \ + mola.lo raw.lo srtm30.lo surfer.lo usgs_srtm.lo wrf.lo xyz.lo +libio_grid_la_OBJECTS = $(am_libio_grid_la_OBJECTS) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) +depcomp = $(SHELL) $(top_srcdir)/depcomp +am__depfiles_maybe = depfiles +am__mv = mv -f +CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = +CXXLD = $(CXX) +CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = +CCLD = $(CC) +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = +SOURCES = $(libio_grid_la_SOURCES) +DIST_SOURCES = $(libio_grid_la_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +AX_SWIG_PYTHON_CPPFLAGS = @AX_SWIG_PYTHON_CPPFLAGS@ +AX_SWIG_PYTHON_OPT = @AX_SWIG_PYTHON_OPT@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DISABLELIBHARU = @DISABLELIBHARU@ +DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +FGREP = @FGREP@ +GOMPFLAGS = @GOMPFLAGS@ +GREP = @GREP@ +HARU_LIB = @HARU_LIB@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LOCAL_INCS = @LOCAL_INCS@ +LOCAL_LIBS = @LOCAL_LIBS@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ +MKDIR_P = @MKDIR_P@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PG_CONFIG = @PG_CONFIG@ +POSTGRESQL_CFLAGS = @POSTGRESQL_CFLAGS@ +POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@ +POSTGRESQL_VERSION = @POSTGRESQL_VERSION@ +POW_LIB = @POW_LIB@ +PYTHON = @PYTHON@ +PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ +PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ +PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ +PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_PLATFORM = @PYTHON_PLATFORM@ +PYTHON_PREFIX = @PYTHON_PREFIX@ +PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ +PYTHON_VERSION = @PYTHON_VERSION@ +RANLIB = @RANLIB@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +SWIG = @SWIG@ +SWIG_LIB = @SWIG_LIB@ +VERSION = @VERSION@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +pkgpyexecdir = @pkgpyexecdir@ +pkgpythondir = @pkgpythondir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +pyexecdir = @pyexecdir@ +pythondir = @pythondir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ + +# +# $Id: Makefile.am 1277 2011-12-22 15:48:59Z reklov_w $ +# +@DEBUG_TRUE@DBGFLAGS = -g -DDEBUG +@SAGA_UNICODE_TRUE@UC_DEFS = -D_SAGA_UNICODE +DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD +CXX_INCS = -I$(top_srcdir)/src/saga_core +AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS) +AM_LDFLAGS = -fPIC -shared -avoid-version +pkglib_LTLIBRARIES = libio_grid.la +libio_grid_la_SOURCES = \ +bmp_export.cpp\ +citygml_import.cpp\ +erdas_lan.cpp\ +esri_arcinfo.cpp\ +grid_table.cpp\ +MLB_Interface.cpp\ +mola.cpp\ +raw.cpp\ +srtm30.cpp\ +surfer.cpp\ +usgs_srtm.cpp\ +wrf.cpp\ +xyz.cpp\ +bmp_export.h\ +citygml_import.h\ +erdas_lan.h\ +esri_arcinfo.h\ +grid_table.h\ +MLB_Interface.h\ +mola.h\ +raw.h\ +srtm30.h\ +surfer.h\ +usgs_srtm.h\ +wrf.h\ +xyz.h + +libio_grid_la_LIBADD = $(top_srcdir)/src/saga_core/saga_api/libsaga_api.la +all: all-am + +.SUFFIXES: +.SUFFIXES: .cpp .lo .o .obj +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/modules/io/io_grid/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign src/modules/io/io_grid/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): + +install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) + @$(NORMAL_INSTALL) + @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ + list2=; for p in $$list; do \ + if test -f $$p; then \ + list2="$$list2 $$p"; \ + else :; fi; \ + done; \ + test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \ + } + +uninstall-pkglibLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ + for p in $$list; do \ + $(am__strip_dir) \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$f"; \ + done + +clean-pkglibLTLIBRARIES: + -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES) + @list='$(pkglib_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + +libio_grid.la: $(libio_grid_la_OBJECTS) $(libio_grid_la_DEPENDENCIES) $(EXTRA_libio_grid_la_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) -rpath $(pkglibdir) $(libio_grid_la_OBJECTS) $(libio_grid_la_LIBADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MLB_Interface.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bmp_export.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/citygml_import.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/erdas_lan.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/esri_arcinfo.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/grid_table.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mola.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/raw.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/srtm30.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/surfer.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/usgs_srtm.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wrf.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xyz.Plo@am__quote@ + +.cpp.o: +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< + +.cpp.obj: +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + +.cpp.lo: +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + set x; \ + here=`pwd`; \ + $(am__define_uniq_tagged_files); \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ + fi +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ + test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(LTLIBRARIES) +installdirs: + for dir in "$(DESTDIR)$(pkglibdir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool clean-pkglibLTLIBRARIES \ + mostlyclean-am + +distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: install-pkglibLTLIBRARIES + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-pkglibLTLIBRARIES + +.MAKE: install-am install-strip + +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-pkglibLTLIBRARIES install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ + uninstall-pkglibLTLIBRARIES + + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nru saga-2.1.0+dfsg/src/modules/io/io_grid/MLB_Interface.cpp saga-2.1.4+dfsg/src/modules/io/io_grid/MLB_Interface.cpp --- saga-2.1.0+dfsg/src/modules/io/io_grid/MLB_Interface.cpp 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_grid/MLB_Interface.cpp 2014-11-13 08:32:20.000000000 +0000 @@ -0,0 +1,154 @@ +/********************************************************** + * Version $Id: MLB_Interface.cpp 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// Grid_IO // +// // +//-------------------------------------------------------// +// // +// MLB_Interface.cpp // +// // +// Copyright (C) 2003 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Goettingen // +// Goldschmidtstr. 5 // +// 37077 Goettingen // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// The Module Link Library Interface // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +// 1. Include the appropriate SAGA-API header... + +#include "MLB_Interface.h" + + +//--------------------------------------------------------- +// 2. Place general module library informations here... + +CSG_String Get_Info(int i) +{ + switch( i ) + { + case MLB_INFO_Name: default: + return( _TL("Grids") ); + + case MLB_INFO_Category: + return( _TL("Import/Export") ); + + case MLB_INFO_Author: + return( _TL("SAGA User Group Associaton (c) 2002") ); + + case MLB_INFO_Description: + return( _TL("Tools for the import and export of gridded data.") ); + + case MLB_INFO_Version: + return( SG_T("1.0") ); + + case MLB_INFO_Menu_Path: + return( _TL("File|Grid") ); + } +} + + +//--------------------------------------------------------- +// 3. Include the headers of your modules here... + +#include "esri_arcinfo.h" +#include "surfer.h" +#include "raw.h" +#include "xyz.h" +#include "usgs_srtm.h" +#include "mola.h" +#include "srtm30.h" +#include "bmp_export.h" +#include "erdas_lan.h" +#include "grid_table.h" +#include "wrf.h" +#include "citygml_import.h" + + +//--------------------------------------------------------- +// 4. Allow your modules to be created here... + +CSG_Module * Create_Module(int i) +{ + switch( i ) + { + case 0: return( new CESRI_ArcInfo_Export ); + case 1: return( new CESRI_ArcInfo_Import ); + case 2: return( new CSurfer_Export ); + case 3: return( new CSurfer_Import ); + case 4: return( new CRaw_Import ); + case 5: return( new CXYZ_Export ); + case 6: return( new CXYZ_Import ); + case 7: return( new CUSGS_SRTM_Import ); + case 8: return( new CMOLA_Import ); + case 9: return( new CSRTM30_Import ); + case 10: return( new CBMP_Export ); + case 11: return( new CErdas_LAN_Import ); + case 12: return( new CGrid_Table_Import ); + case 13: return( new CWRF_Import ); + case 14: return( new CWRF_Export ); + case 15: return( new CCityGML_Import ); + + default: return( NULL ); + } +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +//{{AFX_SAGA + + MLB_INTERFACE + +//}}AFX_SAGA diff -Nru saga-2.1.0+dfsg/src/modules/io/io_grid/MLB_Interface.h saga-2.1.4+dfsg/src/modules/io/io_grid/MLB_Interface.h --- saga-2.1.0+dfsg/src/modules/io/io_grid/MLB_Interface.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_grid/MLB_Interface.h 2014-11-13 08:32:20.000000000 +0000 @@ -0,0 +1,85 @@ +/********************************************************** + * Version $Id: MLB_Interface.h 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// Grid_IO // +// // +//-------------------------------------------------------// +// // +// MLB_Interface.h // +// // +// Copyright (C) 2003 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Goettingen // +// Goldschmidtstr. 5 // +// 37077 Goettingen // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// Include the SAGA-API here // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#ifndef HEADER_INCLUDED__io_grid_H +#define HEADER_INCLUDED__io_grid_H + +//--------------------------------------------------------- +#include + +//--------------------------------------------------------- +#ifdef io_grid_EXPORTS + #define io_grid_EXPORT _SAGA_DLL_EXPORT +#else + #define io_grid_EXPORT _SAGA_DLL_IMPORT +#endif + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#endif // #ifndef HEADER_INCLUDED__io_grid_H diff -Nru saga-2.1.0+dfsg/src/modules/io/io_grid/mola.cpp saga-2.1.4+dfsg/src/modules/io/io_grid/mola.cpp --- saga-2.1.0+dfsg/src/modules/io/io_grid/mola.cpp 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_grid/mola.cpp 2014-11-13 08:32:20.000000000 +0000 @@ -0,0 +1,316 @@ +/********************************************************** + * Version $Id: mola.cpp 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// Grid_IO // +// // +//-------------------------------------------------------// +// // +// MOLA.cpp // +// // +// Copyright (C) 2003 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Goettingen // +// Goldschmidtstr. 5 // +// 37077 Goettingen // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "mola.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +CMOLA_Import::CMOLA_Import(void) +{ + //----------------------------------------------------- + // 1. Info... + + Set_Name (_TL("Import MOLA Grid (MEGDR)")); + + Set_Author (SG_T("(c) 2003 by O.Conrad")); + + Set_Description (_TW( + "Import Mars Orbit Laser Altimeter (MOLA) grids of the Mars Global Surveyor (MGS) Mission " + "(Topographic maps, Mission Experiment Gridded Data Records - MEGDRs). " + "Find more information and obtain free data from " + "" + "Mars Global Surveyor: MOLA (NASA)\n\n" + )); + + + //----------------------------------------------------- + // 2. Parameters... + + Parameters.Add_Grid_Output( + NULL , "GRID" , _TL("Grid"), + _TL("") + ); + + Parameters.Add_FilePath( + NULL , "FILE" , _TL("File"), + _TL(""), + _TL("MOLA Grids (*.img)|*.img|All Files|*.*") + ); + + Parameters.Add_Choice( + NULL , "TYPE" , _TL("Grid Type"), + _TL(""), + _TL("2 byte integer|4 byte floating point|"), 1 + ); + + Parameters.Add_Choice( + NULL , "ORIENT" , _TL("Orientation"), + _TL(""), + _TL("normal|down under|"), 1 + ); +} + +//--------------------------------------------------------- +CMOLA_Import::~CMOLA_Import(void) +{} + +//--------------------------------------------------------- +bool CMOLA_Import::On_Execute(void) +{ + bool bDown; + int xa, xb, y, yy, NX, NY; + short *sLine; + double D, xMin, yMin; + CSG_File Stream; + TSG_Data_Type Type; + CSG_Grid *pGrid; + CSG_String fName, sName; + + //----------------------------------------------------- + pGrid = NULL; + + switch( Parameters("TYPE")->asInt() ) + { + case 0: Type = SG_DATATYPE_Short; break; + case 1: default: Type = SG_DATATYPE_Float; break; + } + + bDown = Parameters("ORIENT")->asInt() == 1; + + //----------------------------------------------------- + // MEGpxxnyyyrv + // 012345678901 + // p indicates the product type (A for areoid, C for counts, R for + // radius, and T for topography) + // xx is the latitude of the upper left corner of the image + // n indicates whether the latitude is north (N) or south (S) + // yyy is the east longitude of the upper left corner of the image + // r is the map resolution using the pattern + // c = 4 pixel per degree + // e = 16 pixel per degree + // f = 32 pixel per degree + // g = 64 pixel per degree + // h = 128 pixel per degree + // (This convention is consistent with that used for the Mars Digital + // Image Model [MDIM] archives.) + // v is a letter indicating the product version. + + fName = SG_File_Get_Name(Parameters("FILE")->asString(), false); + fName.Make_Upper(); + + if( fName.Length() < 12 ) + { + return( false ); + } + + //----------------------------------------------------- + switch( fName[3] ) + { + default: + return( false ); + + case 'A': + sName.Printf(SG_T("MOLA: Areoid v%c") , fName[11]); + break; + + case 'C': + sName.Printf(SG_T("MOLA: Counts v%c") , fName[11]); + break; + + case 'R': + sName.Printf(SG_T("MOLA: Radius v%c") , fName[11]); + break; + + case 'T': + sName.Printf(SG_T("MOLA: Topography v%c") , fName[11]); + break; + } + + //----------------------------------------------------- + switch( fName[10] ) + { + default: + return( false ); + + case 'C': // 1/4th degree... + D = 1.0 / 4.0; + NX = 4 * 360; + NY = 4 * 180; + yMin = - 90.0; + xMin = -180.0; + break; + + case 'D': // 1/8th degree... + D = 1.0 / 8.0; + NX = 8 * 360; + NY = 8 * 180; + yMin = - 90.0; + xMin = -180.0; + break; + + case 'E': // 1/16th degree... + D = 1.0 / 16.0; + NX = 16 * 360; + NY = 16 * 180; + yMin = - 90.0; + xMin = -180.0; + break; + + case 'F': // 1/32th degree... + D = 1.0 / 32.0; + NX = 32 * 360; + NY = 32 * 180; + yMin = - 90.0; + xMin = -180.0; + break; + + case 'G': // 1/64th degree... + D = 1.0 / 64.0; + NX = 64 * 180; + NY = 64 * 90; + yMin = (fName[6] == 'S' ? -1.0 : 1.0) * fName.Right(8).asInt(); + yMin = bDown ? yMin - NY * D : -yMin; + xMin = fName.Right(5).asInt(); + if( xMin >= 180.0 ) + { + xMin -= 360.0; + } + break; + + case 'H': // 1/128th degree... + D = 1.0 / 128.0; + NX = 128 * 90; + NY = 128 * 44; + yMin = (fName[6] == 'S' ? -1.0 : 1.0) * fName.Right(8).asInt(); + yMin = bDown ? yMin - NY * D : -yMin; + xMin = fName.Right(5).asInt(); + if( xMin >= 180.0 ) + { + xMin -= 360.0; + } + break; + } + + //----------------------------------------------------- + if( Stream.Open(Parameters("FILE")->asString(), SG_FILE_R, true) ) + { + if( (pGrid = SG_Create_Grid(Type, NX, NY, D, xMin + D / 2.0, yMin + D / 2.0)) != NULL ) + { + pGrid->Set_Name(sName); + pGrid->Set_NoData_Value(-999999); + pGrid->Get_Projection().Create(SG_T("+proj=lonlat +units=m +a=3396200.000000 +b=3376200.000000"), SG_PROJ_FMT_Proj4); + + //--------------------------------------------- + sLine = (short *)SG_Malloc(NX * sizeof(short)); + + for(y=0; ySet_Value(xa, yy, sLine[xa]); + } + } + else + { + for(xa=0, xb=NX/2; xbSet_Value(xa, yy, sLine[xb]); + pGrid->Set_Value(xb, yy, sLine[xa]); + } + } + } + + //--------------------------------------------- + SG_Free(sLine); + + Parameters("GRID")->Set_Value(pGrid); + } + } + + return( pGrid != NULL ); +} + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- diff -Nru saga-2.1.0+dfsg/src/modules/io/io_grid/mola.h saga-2.1.4+dfsg/src/modules/io/io_grid/mola.h --- saga-2.1.0+dfsg/src/modules/io/io_grid/mola.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_grid/mola.h 2014-11-13 08:32:20.000000000 +0000 @@ -0,0 +1,91 @@ +/********************************************************** + * Version $Id: mola.h 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// Grid_IO // +// // +//-------------------------------------------------------// +// // +// MOLA.h // +// // +// Copyright (C) 2003 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Goettingen // +// Goldschmidtstr. 5 // +// 37077 Goettingen // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// MOLA.h // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#ifndef HEADER_INCLUDED__MOLA_Import_H +#define HEADER_INCLUDED__MOLA_Import_H + + + +//--------------------------------------------------------- +#include "MLB_Interface.h" + +//--------------------------------------------------------- +class CMOLA_Import : public CSG_Module +{ +public: + CMOLA_Import(void); + virtual ~CMOLA_Import(void); + + virtual CSG_String Get_MenuPath(void) { return( _TL("R:Import") ); } + + +protected: + + virtual bool On_Execute(void); + + +private: + +}; + +#endif // #ifndef HEADER_INCLUDED__MOLA_Import_H diff -Nru saga-2.1.0+dfsg/src/modules/io/io_grid/raw.cpp saga-2.1.4+dfsg/src/modules/io/io_grid/raw.cpp --- saga-2.1.0+dfsg/src/modules/io/io_grid/raw.cpp 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_grid/raw.cpp 2014-11-13 08:32:20.000000000 +0000 @@ -0,0 +1,366 @@ +/********************************************************** + * Version $Id: raw.cpp 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// Grid_IO // +// // +//-------------------------------------------------------// +// // +// Raw.cpp // +// // +// Copyright (C) 2003 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Goettingen // +// Goldschmidtstr. 5 // +// 37077 Goettingen // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "raw.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +CRaw_Import::CRaw_Import(void) +{ + //----------------------------------------------------- + // 1. Info... + + Set_Name(_TL("Import Binary Raw Data")); + + Set_Author (SG_T("(c) 2003 by O.Conrad")); + + Set_Description (_TW( + "Imports grid from binary raw data.\n") + ); + + + //----------------------------------------------------- + // 2. Parameters... + + Parameters.Add_Grid_Output( + NULL , "GRID" , _TL("Grid"), + _TL("") + ); + + Parameters.Add_FilePath( + NULL , "FILE_DATA" , _TL("Raw Data File"), + _TL("") + ); + + + //----------------------------------------------------- + Parameters.Add_Value( + NULL , "NX" , _TL("Cell Count (X)"), + _TL(""), + PARAMETER_TYPE_Int , 1 + ); + + Parameters.Add_Value( + NULL , "NY" , _TL("Cell Count (Y)"), + _TL(""), + PARAMETER_TYPE_Int , 1 + ); + + Parameters.Add_Value( + NULL , "DXY" , _TL("Cell Size"), + _TL(""), + PARAMETER_TYPE_Double , 1.0 + ); + + Parameters.Add_Value( + NULL , "XMIN" , _TL("Left Border (X)"), + _TL(""), + PARAMETER_TYPE_Double , 0.0 + ); + + Parameters.Add_Value( + NULL , "YMIN" , _TL("Lower Border (Y)"), + _TL(""), + PARAMETER_TYPE_Double , 0.0 + ); + + Parameters.Add_String( + NULL , "UNIT" , _TL("Unit Name"), + _TL(""), + _TL("") + ); + + Parameters.Add_Value( + NULL , "ZFACTOR" , _TL("Z Multiplier"), + _TL(""), + PARAMETER_TYPE_Double , 1.0 + ); + + Parameters.Add_Value( + NULL , "NODATA" , _TL("No Data Value"), + _TL(""), + PARAMETER_TYPE_Double , -99999.0 + ); + + Parameters.Add_Value( + NULL , "DATA_OFFSET" , _TL("Data Offset (Bytes)"), + _TL(""), + PARAMETER_TYPE_Int , 0.0 + ); + + Parameters.Add_Value( + NULL , "LINE_OFFSET" , _TL("Line Offset (Bytes)"), + _TL(""), + PARAMETER_TYPE_Int , 0.0 + ); + + Parameters.Add_Value( + NULL , "LINE_ENDSET" , _TL("Line Endset (Bytes)"), + _TL(""), + PARAMETER_TYPE_Int , 0.0 + ); + + Parameters.Add_Choice( + NULL , "DATA_TYPE" , _TL("Data Type"), + _TL(""), + _TW( + "1 Byte Integer (unsigned)|" + "1 Byte Integer (signed)|" + "2 Byte Integer (unsigned)|" + "2 Byte Integer (signed)|" + "4 Byte Integer (unsigned)|" + "4 Byte Integer (signed)|" + "4 Byte Floating Point|" + "8 Byte Floating Point|" + ) + ); + + Parameters.Add_Choice( + NULL , "BYTEORDER_BIG" , _TL("Byte Order"), + _TL(""), + + CSG_String::Format(SG_T("%s|%s|"), + _TL("Little Endian (Intel)"), + _TL("Big Endian (Motorola)") + ), 0 + ); + + Parameters.Add_Choice( + NULL , "TOPDOWN" , _TL("Line Order"), + _TL(""), + + CSG_String::Format(SG_T("%s|%s|"), + _TL("Bottom to Top"), + _TL("Top to Bottom") + ), 0 + ); +} + +//--------------------------------------------------------- +CRaw_Import::~CRaw_Import(void) +{} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CRaw_Import::On_Execute(void) +{ + bool bDown, bBig; + int nx, ny, data_head, line_head, line_tail; + double dxy, xmin, ymin, zFactor, zNoData; + FILE *Stream; + TSG_Data_Type data_type; + CSG_String FileName, Unit; + CSG_Grid *pGrid; + + //----------------------------------------------------- + pGrid = NULL; + + FileName = Parameters("FILE_DATA") ->asString(); + nx = Parameters("NX") ->asInt(); + ny = Parameters("NY") ->asInt(); + dxy = Parameters("DXY") ->asDouble(); + xmin = Parameters("XMIN") ->asDouble(); + ymin = Parameters("YMIN") ->asDouble(); + data_head = Parameters("DATA_OFFSET") ->asInt(); + line_head = Parameters("LINE_OFFSET") ->asInt(); + line_tail = Parameters("LINE_ENDSET") ->asInt(); + bDown = Parameters("TOPDOWN") ->asInt() == 1; + bBig = Parameters("BYTEORDER_BIG") ->asInt() == 1; + Unit = Parameters("UNIT") ->asString(); + zFactor = Parameters("ZFACTOR") ->asDouble(); + zNoData = Parameters("NODATA") ->asDouble(); + + switch( Parameters("DATA_TYPE")->asInt() ) + { + default: data_type = SG_DATATYPE_Undefined; break; // not handled + case 0: data_type = SG_DATATYPE_Byte; break; // 1 Byte Integer (unsigned) + case 1: data_type = SG_DATATYPE_Char; break; // 1 Byte Integer (signed) + case 2: data_type = SG_DATATYPE_Word; break; // 2 Byte Integer (unsigned) + case 3: data_type = SG_DATATYPE_Short; break; // 2 Byte Integer (signed) + case 4: data_type = SG_DATATYPE_DWord; break; // 4 Byte Integer (unsigned) + case 5: data_type = SG_DATATYPE_Int; break; // 4 Byte Integer (signed) + case 6: data_type = SG_DATATYPE_Float; break; // 4 Byte Floating Point + case 7: data_type = SG_DATATYPE_Double; break; // 8 Byte Floating Point + } + + //----------------------------------------------------- + if( data_type != SG_DATATYPE_Undefined && (Stream = fopen(FileName.b_str(), "rb")) != NULL ) + { + if( (pGrid = Load_Data(Stream, data_type, nx, ny, dxy, xmin, ymin, data_head, line_head, line_tail, bDown, bBig)) != NULL ) + { + pGrid->Set_Unit (Unit); + pGrid->Set_Scaling (zFactor); + pGrid->Set_NoData_Value (zNoData); + pGrid->Set_Name (SG_File_Get_Name(FileName, false)); + + Parameters("GRID")->Set_Value(pGrid); + } + + fclose(Stream); + } + + //----------------------------------------------------- + return( pGrid != NULL ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +CSG_Grid * CRaw_Import::Load_Data(FILE *Stream, TSG_Data_Type data_type, int nx, int ny, double dxy, double xmin, double ymin, int data_head, int line_head, int line_tail, bool bDown, bool bBig) +{ + char *pLine, *pValue; + int x, y, nBytes_Value, nBytes_Line; + + CSG_Grid *pGrid = NULL; + + //----------------------------------------------------- + if( Stream && data_type != SG_DATATYPE_Undefined ) + { + for(x=0; xGet_NY() && !feof(Stream) && Set_Progress(y, pGrid->Get_NY()); y++) + { + for(x=0; xGet_NX(); x++, pValue+=nBytes_Value) + { + if( bBig ) + { + SG_Swap_Bytes(pValue, nBytes_Value); + } + + switch( data_type ) + { + case SG_DATATYPE_Byte: pGrid->Set_Value(x, y, *(unsigned char *)pValue); break; // 1 Byte Integer (unsigned) + case SG_DATATYPE_Char: pGrid->Set_Value(x, y, *(signed char *)pValue); break; // 1 Byte Integer (signed) + case SG_DATATYPE_Word: pGrid->Set_Value(x, y, *(unsigned short *)pValue); break; // 2 Byte Integer (unsigned) + case SG_DATATYPE_Short: pGrid->Set_Value(x, y, *(signed short *)pValue); break; // 2 Byte Integer (signed) + case SG_DATATYPE_DWord: pGrid->Set_Value(x, y, *(unsigned int *)pValue); break; // 4 Byte Integer (unsigned) + case SG_DATATYPE_Int: pGrid->Set_Value(x, y, *(signed int *)pValue); break; // 4 Byte Integer (signed) + case SG_DATATYPE_Float: pGrid->Set_Value(x, y, *(float *)pValue); break; // 4 Byte Floating Point + case SG_DATATYPE_Double: pGrid->Set_Value(x, y, *(double *)pValue); break; // 8 Byte Floating Point + } + } + + for(x=0; xFlip(); + } + } + } + + //----------------------------------------------------- + return( pGrid ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- diff -Nru saga-2.1.0+dfsg/src/modules/io/io_grid/raw.h saga-2.1.4+dfsg/src/modules/io/io_grid/raw.h --- saga-2.1.0+dfsg/src/modules/io/io_grid/raw.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_grid/raw.h 2014-11-13 08:32:20.000000000 +0000 @@ -0,0 +1,113 @@ +/********************************************************** + * Version $Id: raw.h 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// Grid_IO // +// // +//-------------------------------------------------------// +// // +// Raw.h // +// // +// Copyright (C) 2003 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Goettingen // +// Goldschmidtstr. 5 // +// 37077 Goettingen // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#ifndef HEADER_INCLUDED__Raw_Import_H +#define HEADER_INCLUDED__Raw_Import_H + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "MLB_Interface.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +class CRaw_Import : public CSG_Module +{ +public: + CRaw_Import(void); + virtual ~CRaw_Import(void); + + virtual CSG_String Get_MenuPath (void) { return( _TL("R:Import") ); } + + +protected: + + virtual bool On_Execute (void); + + +private: + + CSG_Grid * Load_Data (FILE *Stream, TSG_Data_Type data_type, int nx, int ny, double dxy, double xmin, double ymin, int data_head, int line_head, int line_tail, bool bDown, bool bBig); + +}; + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#endif // #ifndef HEADER_INCLUDED__Raw_Import_H diff -Nru saga-2.1.0+dfsg/src/modules/io/io_grid/srtm30.cpp saga-2.1.4+dfsg/src/modules/io/io_grid/srtm30.cpp --- saga-2.1.0+dfsg/src/modules/io/io_grid/srtm30.cpp 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_grid/srtm30.cpp 2014-11-13 08:32:20.000000000 +0000 @@ -0,0 +1,301 @@ +/********************************************************** + * Version $Id: srtm30.cpp 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// Grid_IO // +// // +//-------------------------------------------------------// +// // +// SRTM30.cpp // +// // +// Copyright (C) 2004 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Goettingen // +// Goldschmidtstr. 5 // +// 37077 Goettingen // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "srtm30.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +CSRTM30_Import::CSRTM30_Import(void) +{ + CSG_Parameter *pNode_0; + CSG_Parameters *pParameters; + + //----------------------------------------------------- + Set_Name(_TL("Import SRTM30 DEM")); + + Set_Author (SG_T("(c) 2004 by O.Conrad")); + + Set_Description (_TW( + "Extracts elevation grids from SRTM30 data.\n\n" + + "\"SRTM30 is a near-global digital elevation model (DEM) comprising a " + "combination of data from the Shuttle Radar Topography Mission, flown " + "in February, 2000 and the the U.S. Geological Survey's GTOPO30 data " + "set. It can be considered to be either an SRTM data set enhanced with " + "GTOPO30, or as an upgrade to GTOPO30.\" (NASA)\n\n" + + "Further information about the GTOPO30 data set:\n" + "" + "http://edcdaac.usgs.gov/gtopo30/gtopo30.html\n\n" + + "SRTM30 data can be downloaded from:\n" + "" + "ftp://e0srp01u.ecs.nasa.gov/srtm/version2/SRTM30/\n\n" + + "A directory, that contains the uncompressed SRTM30 DEM files, can be located using " + "the \"Path\" Parameter of this module.") + ); + + //----------------------------------------------------- + pNode_0 = Parameters.Add_Grid_Output( + NULL , "GRID" , _TL("Grid"), + _TL("") + ); + + pNode_0 = Parameters.Add_FilePath( + NULL , "PATH" , _TL("Path"), + _TL(""), + NULL, NULL, false, true + ); + + //----------------------------------------------------- + pNode_0 = Parameters.Add_Value( + NULL , "XMIN" , _TL("West []"), + _TL(""), + PARAMETER_TYPE_Int, 60.0 + ); + + pNode_0 = Parameters.Add_Value( + NULL , "XMAX" , _TL("East []"), + _TL(""), + PARAMETER_TYPE_Int, 120.0 + ); + + pNode_0 = Parameters.Add_Value( + NULL , "YMIN" , _TL("South []"), + _TL(""), + PARAMETER_TYPE_Int, 20.0 + ); + pNode_0 = Parameters.Add_Value( + NULL , "YMAX" , _TL("North []"), + _TL(""), + PARAMETER_TYPE_Int, 50.0 + ); + + //----------------------------------------------------- + pParameters = Add_Parameters("TILE", _TL(""), _TL("")); + + pNode_0 = pParameters->Add_Info_String( + NULL , "INFO" , _TL("File does not exist:"), + _TL(""), + _TL("") + ); + + pNode_0 = pParameters->Add_FilePath( + NULL , "PATH" , _TL("Select file"), + _TL(""), + _TL("SRTM30 DEM Tiles (*.dem)|*.dem|All Files|*.*") + ); +} + +//--------------------------------------------------------- +CSRTM30_Import::~CSRTM30_Import(void) +{} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#define X_WIDTH 4800 +#define Y_WIDTH 6000 + +//--------------------------------------------------------- +bool CSRTM30_Import::On_Execute(void) +{ + char x_sTile[9][5] = { "W180", "W140", "W100", "W060", "W020", "E020", "E060", "E100", "E140" }, + y_sTile[3][4] = { "S10", "N40", "N90" }; + + double dSize = 30.0 / (60.0 * 60.0); + + //----------------------------------------------------- + int xTile, yTile; + double xMin, xMax, yMin, yMax; + TSG_Rect rOut, rTile; + CSG_String sTile; + CSG_Grid *pOut; + + //----------------------------------------------------- + xMin = Parameters("XMIN")->asInt(); + xMax = Parameters("XMAX")->asInt(); + yMin = Parameters("YMIN")->asInt(); + yMax = Parameters("YMAX")->asInt(); + + rOut.xMin = (180 + xMin) / 40.0 * X_WIDTH; + rOut.xMax = rOut.xMin + (int)((xMax - xMin) / dSize); + rOut.yMin = ( 60 + yMin) / 50.0 * Y_WIDTH; + rOut.yMax = rOut.yMin + (int)((yMax - yMin) / dSize); + + //----------------------------------------------------- + pOut = SG_Create_Grid(SG_DATATYPE_Short, + (int)(rOut.xMax - rOut.xMin), + (int)(rOut.yMax - rOut.yMin), + dSize, + xMin + 0.5 * dSize, + yMin + 0.5 * dSize + ); + + pOut->Set_NoData_Value(-9999); + pOut->Assign_NoData(); + pOut->Set_Name(SG_T("SRTM30")); + pOut->Get_Projection().Create(SG_T("GEOGCS[\"WGS 84\",DATUM[\"WGS_1984\",SPHEROID[\"WGS 84\",6378137,298.257223563,AUTHORITY[\"EPSG\",\"7030\"]],TOWGS84[0,0,0,0,0,0,0],AUTHORITY[\"EPSG\",\"6326\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994328,AUTHORITY[\"EPSG\",\"9122\"]],AUTHORITY[\"EPSG\",\"4326\"]]")); + + //----------------------------------------------------- + for(yTile=0, rTile.yMin=0, rTile.yMax=Y_WIDTH; yTile<3; yTile++, rTile.yMin+=Y_WIDTH, rTile.yMax+=Y_WIDTH) + { + for(xTile=0, rTile.xMin=0, rTile.xMax=X_WIDTH; xTile<9; xTile++, rTile.xMin+=X_WIDTH, rTile.xMax+=X_WIDTH) + { + sTile.Printf(SG_T("Tile: %s%s"), x_sTile[xTile], y_sTile[yTile]); + Process_Set_Text(sTile); + + sTile.Printf(SG_T("%s%s%s.dem"), Parameters("PATH")->asString(), x_sTile[xTile], y_sTile[yTile]); + Tile_Load(sTile, rTile, pOut, rOut); + } + } + + //----------------------------------------------------- + Parameters("GRID")->Set_Value(pOut); + + return( true ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CSRTM30_Import::Tile_Load(const SG_Char *sTile, TSG_Rect &rTile, CSG_Grid *pOut, TSG_Rect &rOut) +{ + short Value; + int x, y, xOut, yOut; + FILE *Stream; + CSG_Rect r(rTile); + + if( r.Intersects(rOut) != INTERSECTION_None && (Stream = Tile_Open(sTile)) != NULL ) + { + for(y=0, yOut=(int)(rTile.yMax-rOut.yMin); y=0 && Set_Progress(y, Y_WIDTH); y++, yOut--) + { + for(x=0, xOut=(int)(rTile.xMin-rOut.xMin); x= 0 && xOut < pOut->Get_NX() && yOut >= 0 && yOut < pOut->Get_NY() ) + { + SG_Swap_Bytes(&Value, sizeof(short)); + + pOut->Set_Value(xOut, yOut, Value); + } + } + } + + fclose(Stream); + + return( true ); + } + + return( false ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +FILE * CSRTM30_Import::Tile_Open(const SG_Char *sTile) +{ + const SG_Char *sPath; + FILE *Stream; + CSG_String fName; + CSG_Parameters *pParameters; + + fName = sTile; + + if( (Stream = fopen(fName.b_str(), "rb")) == NULL ) + { + pParameters = Get_Parameters("TILE"); + pParameters->Get_Parameter("INFO")->Set_Value(sTile); + + if( Dlg_Parameters(pParameters, _TL("Locate STRM30 Data File")) && (sPath = pParameters->Get_Parameter("PATH")->asString()) != NULL ) + { + fName = sPath; + Stream = fopen(fName.b_str(), "rb"); + } + } + + return( Stream ); +} diff -Nru saga-2.1.0+dfsg/src/modules/io/io_grid/srtm30.h saga-2.1.4+dfsg/src/modules/io/io_grid/srtm30.h --- saga-2.1.0+dfsg/src/modules/io/io_grid/srtm30.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_grid/srtm30.h 2014-11-13 08:32:20.000000000 +0000 @@ -0,0 +1,94 @@ +/********************************************************** + * Version $Id: srtm30.h 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// Grid_IO // +// // +//-------------------------------------------------------// +// // +// SRTM30.h // +// // +// Copyright (C) 2004 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Goettingen // +// Goldschmidtstr. 5 // +// 37077 Goettingen // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#ifndef HEADER_INCLUDED__Import_SRTM30_H +#define HEADER_INCLUDED__Import_SRTM30_H + + + +//--------------------------------------------------------- +#include "MLB_Interface.h" + +//--------------------------------------------------------- +class CSRTM30_Import : public CSG_Module +{ +public: + CSRTM30_Import(void); + virtual ~CSRTM30_Import(void); + + virtual CSG_String Get_MenuPath(void) { return( _TL("R:Import") ); } + + +protected: + + virtual bool On_Execute(void); + + +private: + + bool Tile_Load(const SG_Char *sTile, TSG_Rect &rTile, CSG_Grid *pOut, TSG_Rect &rOut); + FILE * Tile_Open(const SG_Char *sTile); + +}; + +#endif // #ifndef HEADER_INCLUDED__Import_SRTM30_H diff -Nru saga-2.1.0+dfsg/src/modules/io/io_grid/surfer.cpp saga-2.1.4+dfsg/src/modules/io/io_grid/surfer.cpp --- saga-2.1.0+dfsg/src/modules/io/io_grid/surfer.cpp 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_grid/surfer.cpp 2014-11-13 08:32:20.000000000 +0000 @@ -0,0 +1,458 @@ +/********************************************************** + * Version $Id: surfer.cpp 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// Grid_IO // +// // +//-------------------------------------------------------// +// // +// Surfer.cpp // +// // +// Copyright (C) 2003 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Goettingen // +// Goldschmidtstr. 5 // +// 37077 Goettingen // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include + +#include "surfer.h" + +//--------------------------------------------------------- +#define NODATAVALUE 1.70141e38f + + +/////////////////////////////////////////////////////////// +// // +// Import // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +CSurfer_Import::CSurfer_Import(void) +{ + CSG_Parameter *pNode; + + //----------------------------------------------------- + // 1. Info... + + Set_Name(_TL("Import Surfer Grid")); + + Set_Author (SG_T("(c) 2001 by O.Conrad")); + + Set_Description (_TW( + "Import grid from Golden Software's Surfer grid format.\n") + ); + + + //----------------------------------------------------- + // 2. Parameters... + + Parameters.Add_Grid_Output( + NULL , "GRID" , _TL("Grid"), + _TL("") + ); + + Parameters.Add_FilePath( + NULL , "FILE" , _TL("File"), + _TL(""), + _TL("Surfer Grid (*.grd)|*.grd|All Files|*.*") + ); + + pNode = Parameters.Add_Choice( + NULL , "NODATA" , _TL("No Data Value"), + _TL(""), + + CSG_String::Format(SG_T("%s|%s|"), + _TL("Surfer's No Data Value"), + _TL("User Defined") + ), 0 + ); + + Parameters.Add_Value( + pNode , "NODATA_VAL" , _TL("User Defined No Data Value"), + _TL(""), + PARAMETER_TYPE_Double , -99999.0 + ); +} + +//--------------------------------------------------------- +CSurfer_Import::~CSurfer_Import(void) +{} + +//--------------------------------------------------------- +bool CSurfer_Import::On_Execute(void) +{ + int x, y, NX, NY; + short sValue; + long lValue; + float *fLine; + double *dLine, dValue, DX, DY, xMin, yMin; + FILE *Stream; + CSG_String fName; + CSG_Grid *pGrid; + + //----------------------------------------------------- + pGrid = NULL; + fName = Parameters("FILE")->asString(); + + //----------------------------------------------------- + if( fName.Length() > 0 && (Stream = fopen(fName.b_str(), "rb")) != NULL ) + { + fread(&lValue, 1, sizeof(long), Stream); + + //------------------------------------------------- + // Surfer 7: Binary... + + if( !strncmp((char *)&lValue, "DSRB", 4) ) + { + fread(&lValue, 1, sizeof(long) , Stream); // SectionSize... + fread(&lValue, 1, sizeof(long) , Stream); // Version + fread(&lValue, 1, sizeof(long) , Stream); + + if( lValue == 0x44495247 ) // Grid-Header... + { + fread(&lValue , 1, sizeof(long) , Stream); // SectionSize... + + fread(&lValue , 1, sizeof(long) , Stream); // NX... + NY = (int)lValue; + fread(&lValue , 1, sizeof(long) , Stream); // NY... + NX = (int)lValue; + + fread(&xMin , 1, sizeof(double) , Stream); // xMin... + fread(&yMin , 1, sizeof(double) , Stream); // yMin... + + fread(&DX , 1, sizeof(double) , Stream); // DX... + fread(&DY , 1, sizeof(double) , Stream); // DY... + + fread(&dValue , 1, sizeof(double) , Stream); // zMin... + fread(&dValue , 1, sizeof(double) , Stream); // zMax... + + fread(&dValue , 1, sizeof(double) , Stream); // Rotation (unused)... + fread(&dValue , 1, sizeof(double) , Stream); // Blank Value... + fread(&lValue , 1, sizeof(long) , Stream); // ???... + + if( lValue == 0x41544144 ) // Load Binary Double... + { + fread(&lValue, 1, sizeof(long) , Stream); // SectionSize... + + //------------------------------------- + if( !feof(Stream) && (pGrid = SG_Create_Grid(SG_DATATYPE_Double, NX, NY, DX, xMin, yMin)) != NULL ) + { + dLine = (double *)SG_Malloc(pGrid->Get_NX() * sizeof(double)); + + for(y=0; yGet_NY() && !feof(Stream) && Set_Progress(y, pGrid->Get_NY()); y++) + { + fread(dLine, pGrid->Get_NX(), sizeof(double), Stream); + + for(x=0; xGet_NX(); x++) + { + pGrid->Set_Value(x, y, dLine[x]); + } + } + + SG_Free(dLine); + } + } + } + } + + //------------------------------------------------- + // Surfer 6: Binary... + + else if( !strncmp((char *)&lValue, "DSBB", 4) ) + { + fread(&sValue , 1, sizeof(short) , Stream); + NX = sValue; + fread(&sValue , 1, sizeof(short) , Stream); + NY = sValue; + + fread(&xMin , 1, sizeof(double) , Stream); + fread(&dValue , 1, sizeof(double) , Stream); // XMax + DX = (dValue - xMin) / (NX - 1.0); + + fread(&yMin , 1, sizeof(double) , Stream); + fread(&dValue , 1, sizeof(double) , Stream); // YMax... + DY = (dValue - yMin) / (NY - 1.0); + + fread(&dValue , 1, sizeof(double) , Stream); // ZMin... + fread(&dValue , 1, sizeof(double) , Stream); // ZMax... + + //--------------------------------------------- + if( !feof(Stream) && (pGrid = SG_Create_Grid(SG_DATATYPE_Float, NX, NY, DX, xMin, yMin)) != NULL ) + { + fLine = (float *)SG_Malloc(pGrid->Get_NX() * sizeof(float)); + + for(y=0; yGet_NY() && !feof(Stream) && Set_Progress(y, pGrid->Get_NY()); y++) + { + fread(fLine, pGrid->Get_NX(), sizeof(float), Stream); + + for(x=0; xGet_NX(); x++) + { + pGrid->Set_Value(x, y, fLine[x]); + } + } + + SG_Free(fLine); + } + } + + //------------------------------------------------- + // Surfer 6: ASCII... + + else if( !strncmp((char *)&lValue, "DSAA", 4) ) + { + fscanf(Stream, "%d %d" , &NX , &NY); + + fscanf(Stream, "%lf %lf", &xMin , &dValue); + DX = (dValue - xMin) / (NX - 1.0); + + fscanf(Stream, "%lf %lf", &yMin , &dValue); + DY = (dValue - yMin) / (NY - 1.0); + + fscanf(Stream, "%lf %lf", &dValue, &dValue); + + //--------------------------------------------- + if( !feof(Stream) && (pGrid = SG_Create_Grid(SG_DATATYPE_Float, NX, NY, DX, xMin, yMin)) != NULL ) + { + for(y=0; yGet_NY() && !feof(Stream) && Set_Progress(y, pGrid->Get_NY()); y++) + { + for(x=0; xGet_NX(); x++) + { + fscanf(Stream, "%lf", &dValue); + + pGrid->Set_Value(x, y, dValue); + } + } + } + } + + fclose(Stream); + } + + //----------------------------------------------------- + if( pGrid ) + { + pGrid->Set_Name(Parameters("FILE")->asString()); + pGrid->Set_NoData_Value(Parameters("NODATA")->asInt() == 0 ? NODATAVALUE : Parameters("NODATA_VAL")->asDouble()); + + Parameters("GRID")->Set_Value(pGrid); + } + + return( pGrid != NULL ); +} + + +/////////////////////////////////////////////////////////// +// // +// Export // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +CSurfer_Export::CSurfer_Export(void) +{ + //----------------------------------------------------- + // 1. Info... + + Set_Name(_TL("Export Surfer Grid")); + + Set_Author (SG_T("(c) 2001 by O.Conrad")); + + Set_Description (_TW( + "Export grid to Golden Software's Surfer grid format.\n") + ); + + + //----------------------------------------------------- + // 2. Parameters... + + Parameters.Add_Grid( + NULL , "GRID" , _TL("Grid"), + _TL(""), + PARAMETER_INPUT + ); + + Parameters.Add_FilePath( + NULL , "FILE" , _TL("File"), + _TL(""), + _TL( + "Surfer Grid (*.grd)|*.grd|All Files|*.*"), NULL, true + ); + + Parameters.Add_Choice( + NULL , "FORMAT" , _TL("Format"), + _TL(""), + + CSG_String::Format(SG_T("%s|%s|"), + _TL("binary"), + _TL("ASCII") + ), 0 + ); + + Parameters.Add_Value( + NULL , "NODATA" , _TL("Use Surfer's No-Data Value"), + _TL(""), + PARAMETER_TYPE_Bool , false + ); +} + +//--------------------------------------------------------- +CSurfer_Export::~CSurfer_Export(void) +{} + +//--------------------------------------------------------- +bool CSurfer_Export::On_Execute(void) +{ + const char ID_BINARY[] = "DSBB"; + + bool bNoData; + short sValue; + int x, y; + float *fLine; + double dValue; + FILE *Stream; + CSG_String fName; + CSG_Grid *pGrid; + + //----------------------------------------------------- + pGrid = Parameters("GRID") ->asGrid(); + fName = Parameters("FILE") ->asString(); + bNoData = Parameters("NODATA") ->asBool(); + + switch( Parameters("FORMAT")->asInt() ) + { + //----------------------------------------------------- + case 0: // Surfer 6 - Binary... + + if( (Stream = fopen(fName.b_str(), "wb")) != NULL ) + { + fwrite(ID_BINARY, 4, sizeof(char ), Stream); + + sValue = (short)pGrid->Get_NX(); + fwrite(&sValue , 1, sizeof(short ), Stream); + sValue = (short)pGrid->Get_NY(); + fwrite(&sValue , 1, sizeof(short ), Stream); + + dValue = pGrid->Get_XMin(); + fwrite(&dValue , 1, sizeof(double), Stream); + dValue = pGrid->Get_XMax(); + fwrite(&dValue , 1, sizeof(double), Stream); + + dValue = pGrid->Get_YMin(); + fwrite(&dValue , 1, sizeof(double), Stream); + dValue = pGrid->Get_YMax(); + fwrite(&dValue , 1, sizeof(double), Stream); + + dValue = pGrid->Get_ZMin(); + fwrite(&dValue , 1, sizeof(double), Stream); + dValue = pGrid->Get_ZMax(); + fwrite(&dValue , 1, sizeof(double), Stream); + + //--------------------------------------------- + fLine = (float *)SG_Malloc(pGrid->Get_NX() * sizeof(float)); + + for(y=0; yGet_NY() && Set_Progress(y, pGrid->Get_NY()); y++) + { + for(x=0; xGet_NX(); x++) + { + fLine[x] = bNoData && pGrid->is_NoData(x, y) ? NODATAVALUE : pGrid->asFloat(x, y); + } + + fwrite(fLine, pGrid->Get_NX(), sizeof(float), Stream); + } + + SG_Free(fLine); + + fclose(Stream); + + return( true ); + } + break; + + //----------------------------------------------------- + case 1: // Surfer - ASCII... + + if( (Stream = fopen(fName.b_str(), "w")) != NULL ) + { + fprintf(Stream, "DSAA\n" ); + fprintf(Stream, "%d %d\n", pGrid->Get_NX() , pGrid->Get_NY() ); + fprintf(Stream, "%f %f\n", pGrid->Get_XMin(), pGrid->Get_XMax() ); + fprintf(Stream, "%f %f\n", pGrid->Get_YMin(), pGrid->Get_YMax() ); + fprintf(Stream, "%f %f\n", pGrid->Get_ZMin(), pGrid->Get_ZMax() ); + + //--------------------------------------------- + for(y=0; yGet_NY() && Set_Progress(y, pGrid->Get_NY()); y++) + { + for(x=0; xGet_NX(); x++) + { + if( bNoData && pGrid->is_NoData(x, y) ) + { + fprintf(Stream, "1.70141e38 "); + } + else + { + fprintf(Stream, "%f ", pGrid->asFloat(x, y)); + } + } + + fprintf(Stream, "\n"); + } + + fclose(Stream); + + return( true ); + } + break; + } + + //----------------------------------------------------- + return( false ); +} diff -Nru saga-2.1.0+dfsg/src/modules/io/io_grid/surfer.h saga-2.1.4+dfsg/src/modules/io/io_grid/surfer.h --- saga-2.1.0+dfsg/src/modules/io/io_grid/surfer.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_grid/surfer.h 2014-11-13 08:32:20.000000000 +0000 @@ -0,0 +1,109 @@ +/********************************************************** + * Version $Id: surfer.h 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// Grid_IO // +// // +//-------------------------------------------------------// +// // +// Surfer.h // +// // +// Copyright (C) 2003 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Goettingen // +// Goldschmidtstr. 5 // +// 37077 Goettingen // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// Surfer.h // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#ifndef HEADER_INCLUDED__Surfer_H +#define HEADER_INCLUDED__Surfer_H + + +//--------------------------------------------------------- +#include "MLB_Interface.h" + +//--------------------------------------------------------- +class CSurfer_Import : public CSG_Module +{ +public: + CSurfer_Import(void); + virtual ~CSurfer_Import(void); + + virtual CSG_String Get_MenuPath(void) { return( _TL("R:Import") ); } + + +protected: + + virtual bool On_Execute(void); + + +private: + +}; + +//--------------------------------------------------------- +class CSurfer_Export : public CSG_Module_Grid +{ +public: + CSurfer_Export(void); + virtual ~CSurfer_Export(void); + + virtual CSG_String Get_MenuPath(void) { return( _TL("R:Export") ); } + + +protected: + + virtual bool On_Execute(void); + + +private: + +}; + +#endif // #ifndef HEADER_INCLUDED__Surfer_H diff -Nru saga-2.1.0+dfsg/src/modules/io/io_grid/usgs_srtm.cpp saga-2.1.4+dfsg/src/modules/io/io_grid/usgs_srtm.cpp --- saga-2.1.0+dfsg/src/modules/io/io_grid/usgs_srtm.cpp 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_grid/usgs_srtm.cpp 2014-11-13 08:32:20.000000000 +0000 @@ -0,0 +1,242 @@ +/********************************************************** + * Version $Id: usgs_srtm.cpp 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// Grid_IO // +// // +//-------------------------------------------------------// +// // +// USGS_SRTM.cpp // +// // +// Copyright (C) 2003 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Goettingen // +// Goldschmidtstr. 5 // +// 37077 Goettingen // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include + +#include "usgs_srtm.h" + + +/////////////////////////////////////////////////////////// +// // +// Import // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +CUSGS_SRTM_Import::CUSGS_SRTM_Import(void) +{ + //----------------------------------------------------- + // 1. Info... + + Set_Name (_TL("Import USGS SRTM Grid")); + + Set_Author (SG_T("O.Conrad (c) 2004")); + + Set_Description (_TW( + "Import grid from USGS SRTM (Shuttle Radar Topography Mission) data.\n" + + "You find data and further information at:\n" + " " + " http://dds.cr.usgs.gov/srtm/\n" + " " + " http://www.jpl.nasa.gov/srtm/\n" + + "\nFarr, T.G., M. Kobrick (2000):\n" + " 'Shuttle Radar Topography Mission produces a wealth of data',\n" + " Amer. Geophys. Union Eos, v. 81, p. 583-585\n" + + "\nRosen, P.A., S. Hensley, I.R. Joughin, F.K. Li, S.N. Madsen, E. Rodriguez, R.M. Goldstein (2000):\n" + " 'Synthetic aperture radar interferometry'\n" + " Proc. IEEE, v. 88, p. 333-382\n" + )); + + + //----------------------------------------------------- + // 2. Parameters... + + Parameters.Add_Grid_List( + NULL , "GRIDS" , _TL("Grids"), + _TL(""), + PARAMETER_OUTPUT_OPTIONAL, false + ); + + Parameters.Add_FilePath( + NULL , "FILE" , _TL("Files"), + _TL(""), + _TL("USGS SRTM Grids (*.hgt)|*.hgt|All Files|*.*"), NULL, false, false, true + ); + + Parameters.Add_Choice( + NULL , "RESOLUTION" , _TL("Resolution"), + _TL(""), + + CSG_String::Format(SG_T("%s|%s|"), + _TL("1 arc-second"), + _TL("3 arc-second") + ), 1 + ); +} + +//--------------------------------------------------------- +CUSGS_SRTM_Import::~CUSGS_SRTM_Import(void) +{} + +//--------------------------------------------------------- +bool CUSGS_SRTM_Import::On_Execute(void) +{ + int N; + double D; + CSG_Strings fNames; + CSG_Grid *pGrid; + CSG_Parameter_Grid_List *pGrids; + + pGrids = Parameters("GRIDS")->asGridList(); + pGrids ->Del_Items(); + + //----------------------------------------------------- + switch( Parameters("RESOLUTION")->asInt() ) + { + default: + return( false ); + + case 0: // 1 arcsec... + N = 3601; + D = 1.0 / 3600.0; + break; + + case 1: // 3 arcsec... + N = 1201; + D = 3.0 / 3600.0; + break; + } + + //----------------------------------------------------- + if( Parameters("FILE")->asFilePath()->Get_FilePaths(fNames) && fNames.Get_Count() > 0 ) + { + for(int i=0; iAdd_Item(pGrid); + } + } + + return( pGrids->Get_Count() > 0 ); + } + + return( false ); +} + +//--------------------------------------------------------- +CSG_Grid * CUSGS_SRTM_Import::Load(CSG_String File, int N, double D) +{ + int x, y; + short *sLine; + double xMin, yMin; + CSG_File Stream; + CSG_String fName; + CSG_Grid *pGrid; + + //----------------------------------------------------- + pGrid = NULL; + fName = SG_File_Get_Name(File, false); + + if( fName.Length() >= 7 ) + { + fName .Make_Upper(); + + Process_Set_Text(CSG_String::Format(SG_T("%s: %s"), _TL("Importing"), fName.c_str())); + + yMin = (fName[0] == 'N' ? 1.0 : -1.0) * fName.Right(6).asInt(); + xMin = (fName[3] == 'W' ? -1.0 : 1.0) * fName.Right(3).asInt(); + + //------------------------------------------------- + if( Stream.Open(File, SG_FILE_R, true) ) + { + if( (pGrid = SG_Create_Grid(SG_DATATYPE_Short, N, N, D, xMin, yMin)) != NULL ) + { + pGrid->Set_Name (fName); + pGrid->Get_Projection().Create(SG_T("GEOGCS[\"WGS 84\",DATUM[\"WGS_1984\",SPHEROID[\"WGS 84\",6378137,298.257223563,AUTHORITY[\"EPSG\",\"7030\"]],TOWGS84[0,0,0,0,0,0,0],AUTHORITY[\"EPSG\",\"6326\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994328,AUTHORITY[\"EPSG\",\"9122\"]],AUTHORITY[\"EPSG\",\"4326\"]]")); + pGrid->Set_NoData_Value (-32768); + + //----------------------------------------- + sLine = (short *)SG_Malloc(N * sizeof(short)); + + for(y=0; ySet_Value(x, N - 1 - y, sLine[x]); + } + } + + SG_Free(sLine); + } + } + } + + return( pGrid ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- diff -Nru saga-2.1.0+dfsg/src/modules/io/io_grid/usgs_srtm.h saga-2.1.4+dfsg/src/modules/io/io_grid/usgs_srtm.h --- saga-2.1.0+dfsg/src/modules/io/io_grid/usgs_srtm.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_grid/usgs_srtm.h 2014-11-13 08:32:20.000000000 +0000 @@ -0,0 +1,93 @@ +/********************************************************** + * Version $Id: usgs_srtm.h 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// Grid_IO // +// // +//-------------------------------------------------------// +// // +// USGS_SRTM.h // +// // +// Copyright (C) 2003 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Goettingen // +// Goldschmidtstr. 5 // +// 37077 Goettingen // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// USGS_SRTM.h // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#ifndef HEADER_INCLUDED__USGS_SRTM_H +#define HEADER_INCLUDED__USGS_SRTM_H + + + +//--------------------------------------------------------- +#include "MLB_Interface.h" + +//--------------------------------------------------------- +class CUSGS_SRTM_Import : public CSG_Module +{ +public: + CUSGS_SRTM_Import(void); + virtual ~CUSGS_SRTM_Import(void); + + virtual CSG_String Get_MenuPath (void) { return( _TL("R:Import") ); } + + +protected: + + virtual bool On_Execute (void); + + +private: + + CSG_Grid * Load (CSG_String fName, int N, double D); + +}; + +#endif // #ifndef HEADER_INCLUDED__USGS_SRTM_H diff -Nru saga-2.1.0+dfsg/src/modules/io/io_grid/wrf.cpp saga-2.1.4+dfsg/src/modules/io/io_grid/wrf.cpp --- saga-2.1.0+dfsg/src/modules/io/io_grid/wrf.cpp 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_grid/wrf.cpp 2014-11-13 08:32:20.000000000 +0000 @@ -0,0 +1,1041 @@ +/********************************************************** + * Version $Id: wrf.cpp 911 2011-11-11 11:11:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// Grid_IO // +// // +//-------------------------------------------------------// +// // +// wrf.cpp // +// // +// Copyright (C) 2011 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.de // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Hamburg // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "wrf.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +#define VAL_CATEGORICAL 0 +#define VAL_CONTINUOUS 1 +#define VAL_ENDIAN_BIG 0 +#define VAL_ENDIAN_LITTLE 1 +#define VAL_BOTTOM_TOP 0 +#define VAL_TOP_BOTTOM 1 + +//--------------------------------------------------------- +CWRF_Index::CWRF_Index(void) +{ + Reset(); +} + +//--------------------------------------------------------- +bool CWRF_Index::Reset(void) +{ + m_PROJECTION = SG_T(""); + // A character string specifying the projection of the data, which may be + // either lambert, polar, mercator, regular_ll, albers_nad83, or polar_wgs84. + // No default value. + + m_TYPE = 0; + // A character string, either categorical or continuous, that determines + // whether the data in the data files should be interpreted as a continuous field or as discrete + // indices. For categorical data represented by a fractional field for each possible category, + // type should be set to continuous. + // No default value. + + m_SIGNED = false; + // Either yes or no, indicating whether the values in the data files (which are + // always represented as integers) are signed in two's complement form or not. + // Default value is no. + + m_UNITS = SG_T(""); + // A character string, enclosed in quotation marks ("), specifying the units of the + // interpolated field; the string will be written to the geogrid output files as a variable timeindependent + // attribute. + // No default value. + + m_DESCRIPTION = SG_T(""); + // A character string, enclosed in quotation marks ("), giving a short + // description of the interpolated field; the string will be written to the geogrid output files + // as a variable time-independent attribute. + // No default value. + + m_DX = 0.0; + // A real value giving the grid spacing in the x-direction of the data set. If + // projection is one of lambert, polar, mercator, albers_nad83, or polar_wgs84, dx + // gives the grid spacing in meters; if projection is regular_ll, dx gives the grid spacing + // in degrees. + // No default value. + + m_DY = 0.0; + // A real value giving the grid spacing in the y-direction of the data set. If + // projection is one of lambert, polar, mercator, albers_nad83, or polar_wgs84, dy + // gives the grid spacing in meters; if projection is regular_ll, dy gives the grid spacing + // in degrees. + // No default value. + + m_KNOWN_X = 1.0; + // A real value specifying the i-coordinate of an (i,j) location + // corresponding to a (latitude, longitude) location that is known in the projection. + // Default value is 1. + + m_KNOWN_Y = 1.0; + // A real value specifying the j-coordinate of an (i,j) location + // corresponding to a (latitude, longitude) location that is known in the projection. + // Default value is 1. + + m_KNOWN_LAT = 0.0; + // A real value specifying the latitude of a (latitude, longitude) + // location that is known in the projection. + // No default value. + + m_KNOWN_LON = 0.0; + // A real value specifying the longitude of a (latitude, longitude) + // location that is known in the projection. + // No default value. + + m_STDLON = 0.0; + // A real value specifying the longitude that is parallel with the y-axis in + // conic and azimuthal projections. + // No default value. + + m_TRUELAT1 = 0.0; + // A real value specifying the first true latitude for conic projections or + // the only true latitude for azimuthal projections. + // No default value. + + m_TRUELAT2 = 0.0; + // A real value specifying the second true latitude for conic projections. + // No default value. + + m_WORDSIZE = 1; + // An integer giving the number of bytes used to represent the value of + // each grid point in the data files. + // No default value. + + m_TILE_X = 0; + // An integer specifying the number of grid points in the x-direction, + // excluding any halo points, for a single tile of source data. + // No default value. + + m_TILE_Y = 0; + // An integer specifying the number of grid points in the y-direction, + // excluding any halo points, for a single tile of source data. + // No default value. + + m_TILE_Z = 1; + // An integer specifying the number of grid points in the z-direction for a + // single tile of source data; this keyword serves as an alternative to the pair of keywords + // tile_z_start and tile_z_end, and when this keyword is used, the starting z-index is + // assumed to be 1. + // No default value. + + m_TILE_Z_START = 1; + // An integer specifying the starting index in the z-direction of the + // array in the data files. If this keyword is used, tile_z_end must also be specified. + // No default value. + + m_TILE_Z_END = 1; + // An integer specifying the ending index in the z-direction of the array + // in the data files. If this keyword is used, tile_z_start must also be specified. + // No default value + + m_CATEGORY_MIN = 0; + // For categorical data (type=categorical), an integer specifying + // the minimum category index that is found in the data set. If this keyword is used, + // category_max must also be specified. + // No default value. + + m_CATEGORY_MAX = 0; + // For categorical data (type=categorical), an integer + // specifying the maximum category index that is found in the data set. If this keyword is + // used, category_min must also be specified. + // No default value. + + m_TILE_BDR = 0; + // An integer specifying the halo width, in grid points, for each tile of data. + // Default value is 0. + + m_MISSING_VALUE = -99999.0; + // A real value that, when encountered in the data set, should be interpreted as missing data. + // No default value. + + m_SCALE_FACTOR = 1.0; + // A real value that data should be scaled by (through + // multiplication) after being read in as integers from tiles of the data set. + // Default value is 1. + + m_ROW_ORDER = VAL_BOTTOM_TOP; + // A character string, either bottom_top or top_bottom, specifying + // whether the rows of the data set arrays were written proceeding from the lowest-index + // row to the highest (bottom_top) or from highest to lowest (top_bottom). This keyword + // may be useful when utilizing some USGS data sets, which are provided in top_bottom + // order. + // Default value is bottom_top. + + m_ENDIAN = VAL_ENDIAN_BIG; + // A character string, either big or little, specifying whether the values in + // the static data set arrays are in big-endian or little-endian byte order. + // Default value is big. + + m_ISWATER = 16; + // An integer specifying the land use category of water. + // Default value is 16. + + m_ISLAKE = -1; + // An integer specifying the land use category of inland water bodies. + // Default value is -1 (i.e., no separate inland water category). + + m_ISICE = 24; + // An integer specifying the land use category of ice. + // Default value is 24. + + m_ISURBAN = 1; + // An integer specifying the land use category of urban areas. + // Default value is 1. + + m_ISOILWATER = 14; + // An integer specifying the soil category of water. + // Default value is 14. + + m_MMINLU = SG_T("USGS"); + // A character string, enclosed in quotation marks ("), indicating which + // section of WRF's LANDUSE.TBL and VEGPARM.TBL will be used when looking up + // parameters for land use categories. + // Default value is "USGS". + + return( true ); +} + +//--------------------------------------------------------- +bool CWRF_Index::Load(const CSG_String &File) +{ + Reset(); + + CSG_File Stream; + + if( !Stream.Open(File, SG_FILE_R, false) ) + { + return( false ); + } + + CSG_String sLine, sKey, sValue; + + while( Stream.Read_Line(sLine) ) + { + sKey = sLine.BeforeFirst(SG_T('=')).Make_Upper(); sKey .Trim(); sKey .Trim(true); + sValue = sLine.AfterFirst (SG_T('=')).Make_Upper(); sValue.Trim(); sValue.Trim(true); + + if( !sKey.Cmp(SG_T("PROJECTION")) ) + { + m_PROJECTION = sValue; + } + else if( !sKey.Cmp(SG_T("TYPE")) ) + { + m_TYPE = sValue.Contains(SG_T("CATEGORICAL")) ? VAL_CATEGORICAL : VAL_CONTINUOUS; + } + else if( !sKey.Cmp(SG_T("SIGNED")) ) + { + m_SIGNED = sValue.Contains(SG_T("YES")); + } + else if( !sKey.Cmp(SG_T("UNITS")) ) + { + m_UNITS = sValue; + } + else if( !sKey.Cmp(SG_T("DESCRIPTION")) ) + { + m_DESCRIPTION = sValue; + } + else if( !sKey.Cmp(SG_T("DX")) ) + { + m_DX = sValue.asDouble(); + } + else if( !sKey.Cmp(SG_T("DY")) ) + { + m_DY = sValue.asDouble(); + } + else if( !sKey.Cmp(SG_T("KNOWN_X")) ) + { + m_KNOWN_X = sValue.asDouble(); + } + else if( !sKey.Cmp(SG_T("KNOWN_Y")) ) + { + m_KNOWN_Y = sValue.asDouble(); + } + else if( !sKey.Cmp(SG_T("KNOWN_LAT")) ) + { + m_KNOWN_LAT = sValue.asDouble(); + } + else if( !sKey.Cmp(SG_T("KNOWN_LON")) ) + { + m_KNOWN_LON = sValue.asDouble(); + } + else if( !sKey.Cmp(SG_T("STDLON")) ) + { + m_STDLON = sValue.asDouble(); + } + else if( !sKey.Cmp(SG_T("TRUELAT1")) ) + { + m_TRUELAT1 = sValue.asDouble(); + } + else if( !sKey.Cmp(SG_T("TRUELAT2")) ) + { + m_TRUELAT2 = sValue.asDouble(); + } + else if( !sKey.Cmp(SG_T("WORDSIZE")) ) + { + m_WORDSIZE = sValue.asInt(); + } + else if( !sKey.Cmp(SG_T("TILE_X")) ) + { + m_TILE_X = sValue.asInt(); + } + else if( !sKey.Cmp(SG_T("TILE_Y")) ) + { + m_TILE_Y = sValue.asInt(); + } + else if( !sKey.Cmp(SG_T("TILE_Z")) ) + { + m_TILE_Z = sValue.asInt(); + } + else if( !sKey.Cmp(SG_T("TILE_Z_START")) ) + { + m_TILE_Z_START = sValue.asInt(); + } + else if( !sKey.Cmp(SG_T("TILE_Z_END")) ) + { + m_TILE_Z_END = sValue.asInt(); + } + else if( !sKey.Cmp(SG_T("CATEGORY_MIN")) ) + { + m_CATEGORY_MIN = sValue.asInt(); + } + else if( !sKey.Cmp(SG_T("CATEGORY_MAX")) ) + { + m_CATEGORY_MAX = sValue.asInt(); + } + else if( !sKey.Cmp(SG_T("TILE_BDR")) ) + { + m_TILE_BDR = sValue.asInt(); + } + else if( !sKey.Cmp(SG_T("MISSING_VALUE")) ) + { + m_MISSING_VALUE = sValue.asDouble(); + } + else if( !sKey.Cmp(SG_T("SCALE_FACTOR")) ) + { + m_SCALE_FACTOR = sValue.asDouble(); + } + else if( !sKey.Cmp(SG_T("ROW_ORDER")) ) + { + m_ROW_ORDER = sValue.Contains(SG_T("BOTTOM_TOP")) ? VAL_BOTTOM_TOP : VAL_TOP_BOTTOM; + } + else if( !sKey.Cmp(SG_T("ENDIAN")) ) + { + m_ENDIAN = sValue.Contains(SG_T("BIG")) ? VAL_ENDIAN_BIG : VAL_ENDIAN_LITTLE; + } + else if( !sKey.Cmp(SG_T("ISWATER")) ) + { + m_ISWATER = sValue.asInt(); + } + else if( !sKey.Cmp(SG_T("ISLAKE")) ) + { + m_ISLAKE = sValue.asInt(); + } + else if( !sKey.Cmp(SG_T("ISICE")) ) + { + m_ISICE = sValue.asInt(); + } + else if( !sKey.Cmp(SG_T("ISURBAN")) ) + { + m_ISURBAN = sValue.asInt(); + } + else if( !sKey.Cmp(SG_T("ISOILWATER")) ) + { + m_ISOILWATER = sValue.asInt(); + } + else if( !sKey.Cmp(SG_T("MMINLU")) ) + { + m_MMINLU = sValue; + } + } + + return( true ); +} + +//--------------------------------------------------------- +bool CWRF_Index::Save(const CSG_String &File) +{ + CSG_File Stream; + + if( !Stream.Open(File, SG_FILE_W, false) ) + { + return( false ); + } + + //----------------------------------------------------- + Stream.Printf(SG_T("%s=%s\n"), SG_T("TYPE") , m_TYPE == VAL_CATEGORICAL ? SG_T("CATEGORICAL") : SG_T("CONTINUOUS")); + + if( m_CATEGORY_MIN < m_CATEGORY_MAX ) + { + Stream.Printf(SG_T("%s=%d\n"), SG_T("CATEGORY_MIN") , m_CATEGORY_MIN); + Stream.Printf(SG_T("%s=%d\n"), SG_T("CATEGORY_MAX") , m_CATEGORY_MAX); + } + + Stream.Printf(SG_T("%s=%s\n"), SG_T("PROJECTION") , m_PROJECTION.c_str()); + + if( m_PROJECTION.CmpNoCase(SG_T("regular_ll")) ) + { + Stream.Printf(SG_T("%s=%f\n"), SG_T("STDLON") , m_STDLON); + Stream.Printf(SG_T("%s=%f\n"), SG_T("TRUELAT1") , m_TRUELAT1); + Stream.Printf(SG_T("%s=%f\n"), SG_T("TRUELAT2") , m_TRUELAT2); + } + + Stream.Printf(SG_T("%s=%.8f\n"), SG_T("DX") , m_DX); + Stream.Printf(SG_T("%s=%.8f\n"), SG_T("DY") , m_DY); + + Stream.Printf(SG_T("%s=%f\n"), SG_T("KNOWN_X") , m_KNOWN_X); + Stream.Printf(SG_T("%s=%f\n"), SG_T("KNOWN_Y") , m_KNOWN_Y); + Stream.Printf(SG_T("%s=%.5f\n"), SG_T("KNOWN_LAT") , m_KNOWN_LAT); + Stream.Printf(SG_T("%s=%.5f\n"), SG_T("KNOWN_LON") , m_KNOWN_LON); + + if( m_SIGNED ) + { + Stream.Printf(SG_T("%s=%s\n"), SG_T("SIGNED") , SG_T("YES")); + } + + Stream.Printf(SG_T("%s=%d\n"), SG_T("WORDSIZE") , m_WORDSIZE); + + Stream.Printf(SG_T("%s=%d\n"), SG_T("TILE_X") , m_TILE_X); + Stream.Printf(SG_T("%s=%d\n"), SG_T("TILE_Y") , m_TILE_Y); + + if( m_TILE_Z == 1 ) + { + Stream.Printf(SG_T("%s=%d\n"), SG_T("TILE_Z") , m_TILE_Z); + } + else + { + Stream.Printf(SG_T("%s=%d\n"), SG_T("TILE_Z_START") , m_TILE_Z_START); + Stream.Printf(SG_T("%s=%d\n"), SG_T("TILE_Z_END") , m_TILE_Z_END); + } + + if( m_TILE_BDR > 0 ) + { + Stream.Printf(SG_T("%s=%d\n"), SG_T("TILE_BDR") , m_TILE_BDR); + } + + Stream.Printf(SG_T("%s=%f\n"), SG_T("MISSING_VALUE") , m_MISSING_VALUE); + + if( m_SCALE_FACTOR != 1.0 ) + { + Stream.Printf(SG_T("%s=%f\n"), SG_T("SCALE_FACTOR") , m_SCALE_FACTOR); + } + + if( m_ROW_ORDER == VAL_TOP_BOTTOM ) + { + Stream.Printf(SG_T("%s=%s\n"), SG_T("ROW_ORDER") , SG_T("TOP_BOTTOM")); + } + + if( m_ENDIAN == VAL_ENDIAN_LITTLE ) + { + Stream.Printf(SG_T("%s=%s\n"), SG_T("ENDIAN") , SG_T("LITTLE")); + } + + if( m_TYPE == VAL_CATEGORICAL ) + { + Stream.Printf(SG_T("%s=\"%s\"\n"), SG_T("UNITS") , SG_T("CATEGORY")); + } + else if( m_UNITS.Length() > 0 ) + { + Stream.Printf(SG_T("%s=\"%s\"\n"), SG_T("UNITS") , m_UNITS.c_str()); + } + + if( m_DESCRIPTION.Length() > 0 ) + { + Stream.Printf(SG_T("%s=\"%s\"\n"), SG_T("DESCRIPTION") , m_DESCRIPTION.c_str()); + } + + if( m_MMINLU.CmpNoCase(SG_T("USGS")) ) + { + Stream.Printf(SG_T("%s=%s\n"), SG_T("MMINLU") , m_MMINLU.c_str()); + } + + if( m_ISWATER != 16 ) Stream.Printf(SG_T("%s=%d\n"), SG_T("ISWATER") , m_ISWATER); + if( m_ISLAKE != -1 ) Stream.Printf(SG_T("%s=%d\n"), SG_T("ISLAKE") , m_ISLAKE); + if( m_ISICE != 24 ) Stream.Printf(SG_T("%s=%d\n"), SG_T("_ISICE") , m_ISICE); + if( m_ISURBAN != 1 ) Stream.Printf(SG_T("%s=%d\n"), SG_T("m_ISURBAN") , m_ISURBAN); + if( m_ISOILWATER != 14 ) Stream.Printf(SG_T("%s=%d\n"), SG_T("m_ISOILWATER"), m_ISOILWATER); + + return( true ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +CWRF_Import::CWRF_Import(void) +{ + //----------------------------------------------------- + // 1. Info... + + Set_Name (_TL("Import WRF Geogrid Binary Format")); + + Set_Author (SG_T("O.Conrad (c) 2011")); + + Set_Description (_TW( + "Imports grid(s) from Weather Research and Forcasting Model (WRF) geogrid binary format." + "\n" + "WRF Homepage" + )); + + + //----------------------------------------------------- + // 2. Parameters... + + Parameters.Add_Grid_List( + NULL , "GRIDS" , _TL("Grids"), + _TL(""), + PARAMETER_OUTPUT + ); + + Parameters.Add_FilePath( + NULL , "FILE" , _TL("File"), + _TL("") + ); +} + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CWRF_Import::On_Execute(void) +{ + CSG_String File; + + //----------------------------------------------------- + File = Parameters("FILE") ->asString(); + + Parameters("GRIDS")->asGridList()->Del_Items(); + + //----------------------------------------------------- + if( !m_Index.Load(SG_File_Make_Path(SG_File_Get_Path(File), SG_T("index"))) ) + { + Error_Set(_TL("error reading index file")); + + return( false ); + } + + //----------------------------------------------------- + if( !Load(File) ) + { + Error_Set(_TL("error loading data file")); + + return( false ); + } + + //----------------------------------------------------- + return( true ); +} + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CWRF_Import::Load(const CSG_String &File) +{ + //----------------------------------------------------- + // 00001-00600.00001-00600 + // 01234567890123456789012 + + CSG_String Name = SG_File_Get_Name(File, true); + + if( Name.Length() != 23 || Name[5] != SG_T('-') || Name[11] != SG_T('.') || Name[17] != SG_T('-') ) + { + Error_Set(_TL("invalid geogrid file name")); + + return( false ); + } + + int xOffset = Name.asInt() - 1; + int yOffset = Name.AfterFirst(SG_T('.')).asInt() - 1; + + //----------------------------------------------------- + CSG_File Stream; + + if( !Stream.Open(File, SG_FILE_R) ) + { + Error_Set(_TL("data file could not be openend")); + + return( false ); + } + + //----------------------------------------------------- + TSG_Data_Type Type; + + switch( m_Index.m_WORDSIZE ) + { + default: + Error_Set(_TL("invalid word size")); + + return( false ); + + case 1: Type = m_Index.m_SIGNED == false ? SG_DATATYPE_Byte : SG_DATATYPE_Char; break; + case 2: Type = m_Index.m_SIGNED == false ? SG_DATATYPE_Word : SG_DATATYPE_Short; break; + case 4: Type = m_Index.m_SIGNED == false ? SG_DATATYPE_DWord : SG_DATATYPE_Int; break; + } + + //----------------------------------------------------- + char *pLine, *pValue; + int x, y, nBytes_Line; + + nBytes_Line = (m_Index.m_TILE_X + 2 * m_Index.m_TILE_BDR) * m_Index.m_WORDSIZE; + pLine = (char *)SG_Malloc(nBytes_Line); + + //----------------------------------------------------- + for(int z=m_Index.m_TILE_Z_START; z<=m_Index.m_TILE_Z_END && !Stream.is_EOF() && Process_Get_Okay(); z++) + { + CSG_Grid *pGrid = SG_Create_Grid( + Type, + m_Index.m_TILE_X + 2 * m_Index.m_TILE_BDR, + m_Index.m_TILE_Y + 2 * m_Index.m_TILE_BDR, + m_Index.m_DX, + m_Index.m_KNOWN_LON + (xOffset - m_Index.m_TILE_BDR) * m_Index.m_DX, + m_Index.m_KNOWN_LAT + (yOffset - m_Index.m_TILE_BDR) * m_Index.m_DY + ); + + pGrid->Set_Name (CSG_String::Format(SG_T("%s_%02d"), SG_File_Get_Name(File, false).c_str(), z)); + pGrid->Set_Description (m_Index.m_DESCRIPTION); + pGrid->Set_Unit (m_Index.m_UNITS); + pGrid->Set_NoData_Value (m_Index.m_MISSING_VALUE); + pGrid->Set_Scaling (m_Index.m_SCALE_FACTOR); + + Parameters("GRIDS")->asGridList()->Add_Item(pGrid); + + //------------------------------------------------- + for(y=0; yGet_NY() && !Stream.is_EOF() && Set_Progress(y, pGrid->Get_NY()); y++) + { + int yy = m_Index.m_ROW_ORDER == VAL_TOP_BOTTOM ? pGrid->Get_NY() - 1 - y : y; + + Stream.Read(pLine, sizeof(char), nBytes_Line); + + for(x=0, pValue=pLine; xGet_NX(); x++, pValue+=m_Index.m_WORDSIZE) + { + if( m_Index.m_ENDIAN == VAL_ENDIAN_BIG ) + { + SG_Swap_Bytes(pValue, m_Index.m_WORDSIZE); + } + + switch( pGrid->Get_Type() ) + { + case SG_DATATYPE_Byte: pGrid->Set_Value(x, yy, *(unsigned char *)pValue); break; // 1 Byte Integer (unsigned) + case SG_DATATYPE_Char: pGrid->Set_Value(x, yy, *(signed char *)pValue); break; // 1 Byte Integer (signed) + case SG_DATATYPE_Word: pGrid->Set_Value(x, yy, *(unsigned short *)pValue); break; // 2 Byte Integer (unsigned) + case SG_DATATYPE_Short: pGrid->Set_Value(x, yy, *(signed short *)pValue); break; // 2 Byte Integer (signed) + case SG_DATATYPE_DWord: pGrid->Set_Value(x, yy, *(unsigned int *)pValue); break; // 4 Byte Integer (unsigned) + case SG_DATATYPE_Int: pGrid->Set_Value(x, yy, *(signed int *)pValue); break; // 4 Byte Integer (signed) + } + } + } + } + + //----------------------------------------------------- + SG_Free(pLine); + + return( true ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +CWRF_Export::CWRF_Export(void) +{ + CSG_Parameter *pNode; + + //----------------------------------------------------- + // 1. Info... + + Set_Name (_TL("Export WRF Geogrid Binary Format")); + + Set_Author (SG_T("O.Conrad (c) 2011")); + + Set_Description (_TW( + "Exports grid(s) to Weather Research and Forcasting Model (WRF) geogrid binary format." + "\n" + "WRF Homepage" + )); + + + //----------------------------------------------------- + // 2. Parameters... + + Parameters.Add_Grid_List( + NULL , "GRIDS" , _TL("Grids"), + _TL(""), + PARAMETER_INPUT + ); + + Parameters.Add_FilePath( + NULL , "FILE" , _TL("Directory"), + _TL(""), + NULL, NULL, true, true + ); + + //----------------------------------------------------- + pNode = Parameters.Add_Node(NULL, "NODE_TYPE", _TL("Projection"), _TL("")); + + Parameters.Add_Choice( + pNode , "DATATYPE" , _TL("Data Type"), + _TL(""), + CSG_String::Format(SG_T("%s|%s|%s|%s|%s|%s|"), + _TL("1 byte unsigned"), + _TL("1 byte signed"), + _TL("2 byte unsigned"), + _TL("2 byte signed"), + _TL("4 byte unsigned"), + _TL("4 byte signed") + ), 0 + ); + + Parameters.Add_Choice( + pNode , "TYPE" , _TL("Type"), + _TL(""), + CSG_String::Format(SG_T("%s|%s|"), + _TL("categorical"), + _TL("continuous") + ), 0 + ); + + Parameters.Add_Value(pNode , "MISSING" , _TL("Missing Value") , _TL(""), PARAMETER_TYPE_Double, m_Index.m_MISSING_VALUE); + Parameters.Add_Value(pNode , "SCALE" , _TL("Scale Factor") , _TL(""), PARAMETER_TYPE_Double, m_Index.m_SCALE_FACTOR); + + Parameters.Add_String(pNode , "UNITS" , _TL("Units") , _TL(""), m_Index.m_UNITS); + Parameters.Add_String(pNode , "DESCRIPTION" , _TL("Description") , _TL(""), m_Index.m_DESCRIPTION); + Parameters.Add_String(pNode , "MMINLU" , _TL("Look Up Section") , _TL(""), m_Index.m_MMINLU); + + Parameters.Add_Value(pNode , "TILE_BDR" , _TL("Halo Width") , _TL(""), PARAMETER_TYPE_Int, 0, 0, true); + + //----------------------------------------------------- + pNode = Parameters.Add_Node(NULL, "NODE_PRJ", _TL("Projection"), _TL("")); + + Parameters.Add_Choice( + pNode , "PROJECTION" , _TL("Projection"), + _TL(""), + CSG_String::Format(SG_T("%s|%s|%s|%s|%s|%s|"), + SG_T("lambert"), + SG_T("polar"), + SG_T("mercator"), + SG_T("regular_ll"), + SG_T("albers_nad83"), + SG_T("polar_wgs84") + ), 3 + ); + + Parameters.Add_Value(pNode , "SDTLON" , _TL("Standard Longitude") , _TL(""), PARAMETER_TYPE_Double, 0.0); + Parameters.Add_Value(pNode , "TRUELAT1" , _TL("True Latitude 1") , _TL(""), PARAMETER_TYPE_Double, 45.0); + Parameters.Add_Value(pNode , "TRUELAT2" , _TL("True Latitude 2") , _TL(""), PARAMETER_TYPE_Double, 35.0); + + //----------------------------------------------------- +// pNode = Parameters.Add_Node(NULL, "NODE_REF", _TL("Referencing"), _TL("")); + +// Parameters.Add_Value(pNode , "KNOWN_X" , _TL("Known X") , _TL(""), PARAMETER_TYPE_Double, 1.0); +// Parameters.Add_Value(pNode , "KNOWN_Y" , _TL("Known Y") , _TL(""), PARAMETER_TYPE_Double, 1.0); +// Parameters.Add_Value(pNode , "KNOWN_LON" , _TL("Longitude") , _TL(""), PARAMETER_TYPE_Double, -180.0); +// Parameters.Add_Value(pNode , "KNOWN_LAT" , _TL("Latitude") , _TL(""), PARAMETER_TYPE_Double, -90.0); + + //----------------------------------------------------- + pNode = Parameters.Add_Node(NULL, "NODE_CAT", _TL("Categories"), _TL("")); + + Parameters.Add_Value(pNode , "ISWATER" , _TL("Water") , _TL(""), PARAMETER_TYPE_Int, m_Index.m_ISWATER); + Parameters.Add_Value(pNode , "ISLAKE" , _TL("Lake") , _TL(""), PARAMETER_TYPE_Int, m_Index.m_ISLAKE); + Parameters.Add_Value(pNode , "ISICE" , _TL("Ice") , _TL(""), PARAMETER_TYPE_Int, m_Index.m_ISICE); + Parameters.Add_Value(pNode , "ISURBAN" , _TL("Urban") , _TL(""), PARAMETER_TYPE_Int, m_Index.m_ISURBAN); + Parameters.Add_Value(pNode , "ISOILWATER" , _TL("Soil Water") , _TL(""), PARAMETER_TYPE_Int, m_Index.m_ISOILWATER); +} + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +int CWRF_Export::On_Parameter_Changed(CSG_Parameters *pParameters, CSG_Parameter *pParameter) +{ + if( !SG_STR_CMP(pParameter->Get_Identifier(), SG_T("MMINLU")) ) + { + if( !SG_STR_CMP(pParameter->asString(), SG_T("USGS")) ) + { + pParameters->Get_Parameter("DESCRIPTION")->Set_Value(SG_T("24-category USGS landuse")); + } + } + + //----------------------------------------------------- + return( 1 ); +} + +//--------------------------------------------------------- +int CWRF_Export::On_Parameters_Enable(CSG_Parameters *pParameters, CSG_Parameter *pParameter) +{ + if( !SG_STR_CMP(pParameter->Get_Identifier(), SG_T("PROJECTION")) ) + { + pParameters->Get_Parameter("SDTLON" )->Set_Enabled(pParameter->asInt() != 3); + pParameters->Get_Parameter("TRUELAT1")->Set_Enabled(pParameter->asInt() != 3); + pParameters->Get_Parameter("TRUELAT2")->Set_Enabled(pParameter->asInt() != 3); + } + + //----------------------------------------------------- + return( 1 ); +} + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CWRF_Export::On_Execute(void) +{ + CSG_String Directory; + CSG_Parameter_Grid_List *pGrids; + + //----------------------------------------------------- + Directory = Parameters("FILE") ->asString(); + pGrids = Parameters("GRIDS") ->asGridList(); + + //----------------------------------------------------- + m_Index.Reset(); + + switch( Parameters("DATATYPE")->asInt() ) + { + case 0: default: m_Index.m_WORDSIZE = 1; m_Index.m_SIGNED = false; break; + case 1: m_Index.m_WORDSIZE = 1; m_Index.m_SIGNED = true; break; + case 2: m_Index.m_WORDSIZE = 2; m_Index.m_SIGNED = false; break; + case 3: m_Index.m_WORDSIZE = 2; m_Index.m_SIGNED = true; break; + case 4: m_Index.m_WORDSIZE = 4; m_Index.m_SIGNED = false; break; + case 5: m_Index.m_WORDSIZE = 4; m_Index.m_SIGNED = true; break; + } + + m_Index.m_TYPE = Parameters("TYPE") ->asInt(); + m_Index.m_MISSING_VALUE = Parameters("MISSING") ->asDouble(); + m_Index.m_SCALE_FACTOR = Parameters("SCALE") ->asDouble(); + m_Index.m_UNITS = Parameters("UNITS") ->asString(); + m_Index.m_DESCRIPTION = Parameters("DESCRIPTION") ->asString(); + m_Index.m_MMINLU = Parameters("MMINLU") ->asString(); + + m_Index.m_TILE_BDR = Parameters("TILE_BDR") ->asInt(); + m_Index.m_TILE_X = Get_NX() - 2 * m_Index.m_TILE_BDR; + m_Index.m_TILE_Y = Get_NY() - 2 * m_Index.m_TILE_BDR; + m_Index.m_TILE_Z = pGrids->Get_Count(); + m_Index.m_TILE_Z_START = 1; + m_Index.m_TILE_Z_END = pGrids->Get_Count(); + m_Index.m_DX = Get_Cellsize(); + m_Index.m_DY = Get_Cellsize(); + m_Index.m_ENDIAN = VAL_ENDIAN_LITTLE; + m_Index.m_ROW_ORDER = VAL_BOTTOM_TOP; + + m_Index.m_PROJECTION = Parameters("PROJECTION") ->asString(); + m_Index.m_STDLON = Parameters("SDTLON") ->asDouble(); + m_Index.m_TRUELAT1 = Parameters("TRUELAT1") ->asDouble(); + m_Index.m_TRUELAT2 = Parameters("TRUELAT2") ->asDouble(); + + m_Index.m_KNOWN_LAT = - 90.0 + 0.5 * m_Index.m_DY; + m_Index.m_KNOWN_LON = -180.0 + 0.5 * m_Index.m_DX; + +// m_Index.m_KNOWN_X = Parameters("KNOWN_X") ->asDouble(); +// m_Index.m_KNOWN_Y = Parameters("KNOWN_Y") ->asDouble(); +// m_Index.m_KNOWN_LAT = Parameters("KNOWN_LAT") ->asDouble(); +// m_Index.m_KNOWN_LON = Parameters("KNOWN_LON") ->asDouble(); + + if( m_Index.m_TILE_Z == 1 ) + { + m_Index.m_CATEGORY_MIN = m_Index.m_TYPE == VAL_CATEGORICAL ? pGrids->asGrid(0)->Get_ZMin() : 0; + m_Index.m_CATEGORY_MAX = m_Index.m_TYPE == VAL_CATEGORICAL ? pGrids->asGrid(0)->Get_ZMax() : 0; + } + else + { + m_Index.m_CATEGORY_MIN = m_Index.m_TILE_Z_START; + m_Index.m_CATEGORY_MAX = m_Index.m_TILE_Z_END; + } + + m_Index.m_ISWATER = Parameters("ISWATER") ->asInt(); + m_Index.m_ISLAKE = Parameters("ISLAKE") ->asInt(); + m_Index.m_ISICE = Parameters("ISICE") ->asInt(); + m_Index.m_ISURBAN = Parameters("ISURBAN") ->asInt(); + m_Index.m_ISOILWATER = Parameters("ISOILWATER") ->asInt(); + + //----------------------------------------------------- + if( !m_Index.Save(SG_File_Make_Path(Directory, SG_T("index"))) ) + { + Error_Set(_TL("error saving index file")); + + return( false ); + } + + //----------------------------------------------------- + if( !Save(Directory, pGrids) ) + { + Error_Set(_TL("error saving data file")); + + return( false ); + } + + //----------------------------------------------------- + return( true ); +} + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CWRF_Export::Save(const CSG_String &Directory, CSG_Parameter_Grid_List *pGrids) +{ + //----------------------------------------------------- + // 00001-00600.00001-00600 + // 01234567890123456789012 + + int xOffset = m_Index.m_TILE_BDR + (int)(0.5 + (Get_XMin() - m_Index.m_KNOWN_LON) / Get_Cellsize()); + int yOffset = m_Index.m_TILE_BDR + (int)(0.5 + (Get_YMin() - m_Index.m_KNOWN_LAT) / Get_Cellsize()); + + CSG_String Name = SG_File_Get_Name(Directory, true); + + Name.Printf(SG_T("%05d-%05d.%05d-%05d"), xOffset + 1, xOffset + m_Index.m_TILE_X, yOffset + 1, yOffset + m_Index.m_TILE_Y); + + //----------------------------------------------------- + CSG_File Stream; + + if( !Stream.Open(SG_File_Make_Path(Directory, Name), SG_FILE_W) ) + { + Error_Set(_TL("data file could not be openend")); + + return( false ); + } + + //----------------------------------------------------- + char *pLine, *pValue; + int x, y, nBytes_Line; + + nBytes_Line = Get_NX() * m_Index.m_WORDSIZE; + pLine = (char *)SG_Malloc(nBytes_Line); + + //----------------------------------------------------- + for(int z=0; zGet_Count() && Process_Get_Okay(); z++) + { + CSG_Grid *pGrid = pGrids->asGrid(z); + + //------------------------------------------------- + for(y=0; yGet_NY() && !Stream.is_EOF() && Set_Progress(y, pGrid->Get_NY()); y++) + { + int yy = m_Index.m_ROW_ORDER == VAL_TOP_BOTTOM ? pGrid->Get_NY() - 1 - y : y; + + for(x=0, pValue=pLine; xGet_NX(); x++, pValue+=m_Index.m_WORDSIZE) + { + if( m_Index.m_SIGNED ) + { + switch( m_Index.m_WORDSIZE ) + { + case 1: *((signed char *)pValue) = (signed char )pGrid->asInt(x, yy); break; + case 2: *((signed short *)pValue) = (signed short )pGrid->asInt(x, yy); break; + case 4: *((signed int *)pValue) = (signed int )pGrid->asInt(x, yy); break; + } + } + else + { + switch( m_Index.m_WORDSIZE ) + { + case 1: *((unsigned char *)pValue) = (unsigned char )pGrid->asInt(x, yy); break; + case 2: *((unsigned short *)pValue) = (unsigned short)pGrid->asInt(x, yy); break; + case 4: *((unsigned int *)pValue) = (unsigned int )pGrid->asInt(x, yy); break; + } + } + + if( m_Index.m_ENDIAN == VAL_ENDIAN_BIG ) + { + SG_Swap_Bytes(pValue, m_Index.m_WORDSIZE); + } + } + + Stream.Write(pLine, sizeof(char), nBytes_Line); + } + } + + //----------------------------------------------------- + SG_Free(pLine); + + return( true ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- diff -Nru saga-2.1.0+dfsg/src/modules/io/io_grid/wrf.h saga-2.1.4+dfsg/src/modules/io/io_grid/wrf.h --- saga-2.1.0+dfsg/src/modules/io/io_grid/wrf.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_grid/wrf.h 2014-11-13 08:32:20.000000000 +0000 @@ -0,0 +1,173 @@ +/********************************************************** + * Version $Id: wrf.h 911 2011-02-14 16:38:15Z reklov_w $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// Grid_IO // +// // +//-------------------------------------------------------// +// // +// wrf.h // +// // +// Copyright (C) 2003 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.de // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Hamburg // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#ifndef HEADER_INCLUDED__wrf_Import_H +#define HEADER_INCLUDED__wrf_Import_H + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "MLB_Interface.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +class CWRF_Index +{ +public: + CWRF_Index(void); + + bool Reset (void); + + bool Load (const CSG_String &File); + bool Save (const CSG_String &File); + + + bool m_SIGNED, m_ENDIAN; + + int m_TYPE, m_WORDSIZE, m_TILE_X, m_TILE_Y, m_TILE_Z, m_TILE_Z_START, m_TILE_Z_END, m_CATEGORY_MIN, m_CATEGORY_MAX, m_TILE_BDR, m_ROW_ORDER; + + int m_ISWATER, m_ISLAKE, m_ISICE, m_ISURBAN, m_ISOILWATER; + + double m_DX, m_DY, m_KNOWN_X, m_KNOWN_Y, m_KNOWN_LAT, m_KNOWN_LON, m_STDLON, m_TRUELAT1, m_TRUELAT2, m_MISSING_VALUE, m_SCALE_FACTOR; + + CSG_String m_PROJECTION, m_UNITS, m_DESCRIPTION, m_MMINLU; + +}; + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +class CWRF_Import : public CSG_Module +{ +public: + CWRF_Import(void); + + virtual CSG_String Get_MenuPath (void) { return( _TL("R:Import") ); } + + +protected: + + virtual bool On_Execute (void); + + +private: + + CWRF_Index m_Index; + + + bool Load (const CSG_String &File); + +}; + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +class CWRF_Export : public CSG_Module_Grid +{ +public: + CWRF_Export(void); + + virtual CSG_String Get_MenuPath (void) { return( _TL("R:Export") ); } + + +protected: + + virtual int On_Parameter_Changed (CSG_Parameters *pParameters, CSG_Parameter *pParameter); + virtual int On_Parameters_Enable (CSG_Parameters *pParameters, CSG_Parameter *pParameter); + + virtual bool On_Execute (void); + + +private: + + CWRF_Index m_Index; + + + bool Save (const CSG_String &Directory, CSG_Parameter_Grid_List *pGrids); + +}; + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#endif // #ifndef HEADER_INCLUDED__wrf_Import_H diff -Nru saga-2.1.0+dfsg/src/modules/io/io_grid/xyz.cpp saga-2.1.4+dfsg/src/modules/io/io_grid/xyz.cpp --- saga-2.1.0+dfsg/src/modules/io/io_grid/xyz.cpp 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_grid/xyz.cpp 2014-11-13 08:32:20.000000000 +0000 @@ -0,0 +1,391 @@ +/********************************************************** + * Version $Id: xyz.cpp 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// Grid_IO // +// // +//-------------------------------------------------------// +// // +// XYZ.cpp // +// // +// Copyright (C) 2003 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Goettingen // +// Goldschmidtstr. 5 // +// 37077 Goettingen // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "xyz.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +CXYZ_Export::CXYZ_Export(void) +{ + //----------------------------------------------------- + // 1. Info... + + Set_Name (_TL("Export Grid to XYZ")); + + Set_Author (SG_T("O. Conrad (c) 2003")); + + Set_Description (_TW( + "Export grid to a table (text format), that contains for each grid cell " + "the x/y-coordinates and additionally data from selected grids.\n" + "Optionally, it is possible to skip NoData cells from the output. In this " + "case, the first input grid will perform like a mask.\n\n") + ); + + + //----------------------------------------------------- + // 2. Parameters... + + Parameters.Add_Grid_List( + NULL , "GRIDS" , _TL("Grids"), + _TL(""), + PARAMETER_INPUT + ); + + Parameters.Add_FilePath( + NULL , "FILENAME" , _TL("File Name"), + _TL(""), + CSG_String::Format( + SG_T("%s|*.xyz|%s|*.txt|%s|*.*"), + _TL("XYZ files (*.xyz)"), + _TL("Text files (*.txt)"), + _TL("All Files") + ), NULL, true + ); + + Parameters.Add_Value( + NULL , "CAPTION" , _TL("Write Field Names"), + _TL(""), + PARAMETER_TYPE_Bool, true + ); + + Parameters.Add_Value( + NULL , "EX_NODATA" , _TL("Exclude NoData Cells"), + _TL(""), + PARAMETER_TYPE_Bool, false + ); +} + + +//--------------------------------------------------------- +CXYZ_Export::~CXYZ_Export(void) +{} + + +//--------------------------------------------------------- +bool CXYZ_Export::On_Execute(void) +{ + bool bExNoData; + int x, y, i; + TSG_Point p; + CSG_File Stream; + CSG_String FileName; + CSG_Parameter_Grid_List *pGrids; + + pGrids = Parameters("GRIDS") ->asGridList(); + FileName = Parameters("FILENAME")->asString(); + bExNoData = Parameters("EX_NODATA")->asBool(); + + if( pGrids->Get_Count() > 0 && Stream.Open(FileName, SG_FILE_W, false) ) + { + if( Parameters("CAPTION")->asBool() ) + { + Stream.Printf(SG_T("\"X\"\t\"Y\"")); + + for(i=0; iGet_Count(); i++) + { + Stream.Printf(SG_T("\t\"%s\""), pGrids->asGrid(i)->Get_Name()); + } + + Stream.Printf(SG_T("\n")); + } + + for(y=0, p.y=Get_YMin(); yasGrid(0)->is_NoData(x, y)) ) + { + Stream.Printf(SG_T("%f\t%f"), p.x, p.y); + + for(i=0; iGet_Count(); i++) + { + Stream.Printf(SG_T("\t%f"), pGrids->asGrid(i)->asDouble(x, y)); + } + + Stream.Printf(SG_T("\n")); + } + } + } + + return( true ); + } + + return( false ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +CXYZ_Import::CXYZ_Import(void) +{ + //----------------------------------------------------- + // 1. Info... + + Set_Name (_TL("Import Grid from XYZ")); + + Set_Author (SG_T("O. Conrad (c) 2009")); + + Set_Description (_TW( + "Import grid from a table (text format), that contains for each grid cell " + "the x/y/z-coordinates and additional data from selected grids.\n" + )); + + + //----------------------------------------------------- + // 2. Parameters... + + Parameters.Add_Grid_Output( + NULL , "GRID" , _TL("Grid"), + _TL("") + ); + + Parameters.Add_Grid_Output( + NULL , "COUNT" , _TL("Count"), + _TL("") + ); + + Parameters.Add_FilePath( + NULL , "FILENAME" , _TL("File Name"), + _TL(""), + CSG_String::Format( + SG_T("%s|*.xyz|%s|*.txt|%s|*.*"), + _TL("XYZ files (*.xyz)"), + _TL("Text files (*.txt)"), + _TL("All Files") + ), NULL, false + ); + + Parameters.Add_Value( + NULL , "CAPTION" , _TL("Has Field Names"), + _TL(""), + PARAMETER_TYPE_Bool, true + ); + + Parameters.Add_Value( + NULL , "CELLSIZE" , _TL("Target Cellsize"), + _TL(""), + PARAMETER_TYPE_Double, 1.0, 0.0, true + ); + + Parameters.Add_Choice( + NULL , "SEPARATOR" , _TL("Separator"), + _TL(""), + CSG_String::Format(SG_T("%s|%s|,|;|"), + _TL("space"), + _TL("tabulator") + ), 1 + ); +} + +//--------------------------------------------------------- +bool CXYZ_Import::On_Execute(void) +{ + int nx, ny, nValues, fLength; + double x, y, z, xMin, yMin, xMax, yMax, Cellsize; + CSG_File Stream; + CSG_String FileName, sLine; + CSG_Grid *pGrid, *pCount; + + FileName = Parameters("FILENAME")->asString(); + Cellsize = Parameters("CELLSIZE")->asDouble(); + + switch( Parameters("SEPARATOR")->asInt() ) + { + case 0: m_Separator = SG_T(' '); break; + case 1: m_Separator = SG_T('\t'); break; + case 2: m_Separator = SG_T(','); break; + case 3: m_Separator = SG_T(';'); break; + } + + if( Cellsize > 0.0 && Stream.Open(FileName, SG_FILE_R, false) ) + { + if( Parameters("CAPTION")->asBool() ) + { + Stream.Read_Line(sLine); + } + + fLength = Stream.Length(); + nValues = 0; + xMin = xMax = 0; + yMin = yMax = 0; + + while( Read_Values(Stream, x, y, z) && Set_Progress(Stream.Tell(), fLength) ) + { + if( nValues == 0 ) + { + xMin = xMax = x; + yMin = yMax = y; + } + else + { + if( xMin > x ) xMin = x; else if( xMax < x ) xMax = x; + if( yMin > y ) yMin = y; else if( yMax < y ) yMax = y; + } + + nValues++; + } + + //------------------------------------------------- + if( Process_Get_Okay() && xMin < xMax && yMin < yMax ) + { + nx = 1 + (int)((xMax - xMin) / Cellsize); + ny = 1 + (int)((yMax - yMin) / Cellsize); + + Parameters("GRID" )->Set_Value(pGrid = SG_Create_Grid(SG_DATATYPE_Float, nx, ny, Cellsize, xMin, yMin)); + Parameters("COUNT")->Set_Value(pCount = SG_Create_Grid(SG_DATATYPE_Byte , nx, ny, Cellsize, xMin, yMin)); + + if( pGrid && pCount ) + { + pGrid ->Set_Name(FileName = SG_File_Get_Name(FileName, false)); + pCount ->Set_Name(CSG_String::Format(SG_T("%s [%s]"), FileName.c_str(), _TL("Count"))); + + Stream.Seek_Start(); + + if( Parameters("CAPTION")->asBool() ) + { + Stream.Read_Line(sLine); + } + + while( Read_Values(Stream, x, y, z) && Set_Progress(Stream.Tell(), fLength) ) + { + if( pGrid->Get_System().Get_World_to_Grid(nx, ny, x, y) ) + { + pGrid ->Add_Value(nx, ny, z); + pCount->Add_Value(nx, ny, 1.0); + } + } + + for(ny=0; nyGet_NY() && Set_Progress(ny, pGrid->Get_NY()); ny++) + { + for(nx=0; nxGet_NX(); nx++) + { + nValues = pCount->asInt(nx, ny); + + if( nValues == 0 ) + { + pGrid->Set_NoData(nx, ny); + } + else if( nValues > 1 ) + { + pGrid->Mul_Value(nx, ny, 1.0 / nValues); + } + } + } + + return( true ); + } + } + } + + return( false ); +} + +//--------------------------------------------------------- +inline bool CXYZ_Import::Read_Values(CSG_File &Stream, double &x, double &y, double &z) +{ + CSG_String sLine; + + if( Stream.Read_Line(sLine) ) + { + sLine.Trim(); + + if( sLine.asDouble(x) ) + { + sLine = sLine.AfterFirst(m_Separator); + + sLine.Trim(); + + if( sLine.asDouble(y) ) + { + sLine = sLine.AfterFirst(m_Separator); + + if( sLine.asDouble(z) ) + { + return( true ); + } + } + } + } + + return( false ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- diff -Nru saga-2.1.0+dfsg/src/modules/io/io_grid/xyz.h saga-2.1.4+dfsg/src/modules/io/io_grid/xyz.h --- saga-2.1.0+dfsg/src/modules/io/io_grid/xyz.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_grid/xyz.h 2014-11-13 08:32:20.000000000 +0000 @@ -0,0 +1,138 @@ +/********************************************************** + * Version $Id: xyz.h 1922 2014-01-09 10:28:46Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// Grid_IO // +// // +//-------------------------------------------------------// +// // +// XYZ.h // +// // +// Copyright (C) 2003 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Goettingen // +// Goldschmidtstr. 5 // +// 37077 Goettingen // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#ifndef HEADER_INCLUDED__XYZ_H +#define HEADER_INCLUDED__XYZ_H + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "MLB_Interface.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +class CXYZ_Export : public CSG_Module_Grid +{ +public: + CXYZ_Export(void); + virtual ~CXYZ_Export(void); + + virtual CSG_String Get_MenuPath (void) { return( _TL("R:Export") ); } + + +protected: + + virtual bool On_Execute (void); + +}; + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +class CXYZ_Import : public CSG_Module +{ +public: + CXYZ_Import(void); + + virtual CSG_String Get_MenuPath (void) { return( _TL("R:Import") ); } + + +protected: + + virtual bool On_Execute (void); + + +private: + + SG_Char m_Separator; + + + bool Read_Values (CSG_File &Stream, double &x, double &y, double &z); + +}; + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#endif // #ifndef HEADER_INCLUDED__XYZ_H diff -Nru saga-2.1.0+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/cmplxpack.c saga-2.1.4+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/cmplxpack.c --- saga-2.1.0+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/cmplxpack.c 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/cmplxpack.c 2014-11-13 08:32:19.000000000 +0000 @@ -0,0 +1,78 @@ +/********************************************************** + * Version $Id: cmplxpack.c 911 2011-02-14 16:38:15Z reklov_w $ + *********************************************************/ +#include "grib2.h" + +void cmplxpack(g2float *fld,g2int ndpts, g2int idrsnum,g2int *idrstmpl, + unsigned char *cpack, g2int *lcpack) +//$$$ SUBPROGRAM DOCUMENTATION BLOCK +// . . . . +// SUBPROGRAM: cmplxpack +// PRGMMR: Gilbert ORG: W/NP11 DATE: 2004-08-27 +// +// ABSTRACT: This subroutine packs up a data field using a complex +// packing algorithm as defined in the GRIB2 documention. It +// supports GRIB2 complex packing templates with or without +// spatial differences (i.e. DRTs 5.2 and 5.3). +// It also fills in GRIB2 Data Representation Template 5.2 or 5.3 +// with the appropriate values. +// +// PROGRAM HISTORY LOG: +// 2004-08-27 Gilbert +// +// USAGE: cmplxpack(g2float *fld,g2int ndpts, g2int idrsnum,g2int *idrstmpl, +// unsigned char *cpack, g2int *lcpack) +// INPUT ARGUMENT LIST: +// fld[] - Contains the data values to pack +// ndpts - The number of data values in array fld[] +// idrsnum - Data Representation Template number 5.N +// Must equal 2 or 3. +// idrstmpl - Contains the array of values for Data Representation +// Template 5.2 or 5.3 +// [0] = Reference value - ignored on input +// [1] = Binary Scale Factor +// [2] = Decimal Scale Factor +// . +// . +// [6] = Missing value management +// [7] = Primary missing value +// [8] = Secondary missing value +// . +// . +// [16] = Order of Spatial Differencing ( 1 or 2 ) +// . +// . +// +// OUTPUT ARGUMENT LIST: +// idrstmpl - Contains the array of values for Data Representation +// Template 5.3 +// [0] = Reference value - set by compack routine. +// [1] = Binary Scale Factor - unchanged from input +// [2] = Decimal Scale Factor - unchanged from input +// . +// . +// cpack - The packed data field (character*1 array) +// lcpack - length of packed field cpack[]. +// +// REMARKS: None +// +// ATTRIBUTES: +// LANGUAGE: C +// MACHINE: IBM SP +// +//$$$ +{ + + + if ( idrstmpl[6] == 0 ) { // No internal missing values + compack(fld,ndpts,idrsnum,idrstmpl,cpack,lcpack); + } + else if ( idrstmpl[6] == 1 || idrstmpl[6] == 2) { + misspack(fld,ndpts,idrsnum,idrstmpl,cpack,lcpack); + } + else { + printf("cmplxpack: Don:t recognize Missing value option."); + *lcpack=-1; + } + +} diff -Nru saga-2.1.0+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/compack.c saga-2.1.4+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/compack.c --- saga-2.1.0+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/compack.c 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/compack.c 2014-11-13 08:32:19.000000000 +0000 @@ -0,0 +1,419 @@ +/********************************************************** + * Version $Id: compack.c 911 2011-02-14 16:38:15Z reklov_w $ + *********************************************************/ +#include +#include +#include "grib2.h" + + +void compack(g2float *fld,g2int ndpts,g2int idrsnum,g2int *idrstmpl, + unsigned char *cpack,g2int *lcpack) +//$$$ SUBPROGRAM DOCUMENTATION BLOCK +// . . . . +// SUBPROGRAM: compack +// PRGMMR: Gilbert ORG: W/NP11 DATE: 2002-11-07 +// +// ABSTRACT: This subroutine packs up a data field using a complex +// packing algorithm as defined in the GRIB2 documention. It +// supports GRIB2 complex packing templates with or without +// spatial differences (i.e. DRTs 5.2 and 5.3). +// It also fills in GRIB2 Data Representation Template 5.2 or 5.3 +// with the appropriate values. +// +// PROGRAM HISTORY LOG: +// 2002-11-07 Gilbert +// +// USAGE: void compack(g2float *fld,g2int ndpts,g2int idrsnum, +// g2int *idrstmpl,unsigned char *cpack,g2int *lcpack) +// +// INPUT ARGUMENTS: +// fld[] - Contains the data values to pack +// ndpts - The number of data values in array fld[] +// idrsnum - Data Representation Template number 5.N +// Must equal 2 or 3. +// idrstmpl - Contains the array of values for Data Representation +// Template 5.2 or 5.3 +// [0] = Reference value - ignored on input +// [1] = Binary Scale Factor +// [2] = Decimal Scale Factor +// . +// . +// [6] = Missing value management +// [7] = Primary missing value +// [8] = Secondary missing value +// . +// . +// [16] = Order of Spatial Differencing ( 1 or 2 ) +// . +// . +// +// OUTPUT ARGUMENTS: +// idrstmpl - Contains the array of values for Data Representation +// Template 5.3 +// [0] = Reference value - set by compack routine. +// [1] = Binary Scale Factor - unchanged from input +// [2] = Decimal Scale Factor - unchanged from input +// . +// . +// cpack - The packed data field +// lcpack - length of packed field cpack. +// +// REMARKS: None +// +// ATTRIBUTES: +// LANGUAGE: C +// MACHINE: +// +//$$$ +{ + + static g2int zero=0; + g2int *ifld,*gref,*glen,*gwidth; + g2int *jmin, *jmax, *lbit; + g2int i,j,n,nbits,imin,imax,left; + g2int isd,itemp,ilmax,ngwidthref=0,nbitsgwidth=0; + g2int nglenref=0,nglenlast=0,iofst,ival1,ival2; + g2int minsd,nbitsd=0,maxorig,nbitorig,ngroups; + g2int lg,ng,igmax,iwmax,nbitsgref; + g2int glength,grpwidth,nbitsglen=0; + g2int kfildo, minpk, inc, maxgrps, ibit, jbit, kbit, novref, lbitref; + g2int missopt, miss1, miss2, ier; + g2float bscale,dscale,rmax,rmin,temp; + static g2int simple_alg = 0; + static g2float alog2=0.69314718; // ln(2.0) + static g2int one=1; + + bscale=int_power(2.0,-idrstmpl[1]); + dscale=int_power(10.0,idrstmpl[2]); +// +// Find max and min values in the data +// + rmax=fld[0]; + rmin=fld[0]; + for (j=1;j rmax) rmax=fld[j]; + if (fld[j] < rmin) rmin=fld[j]; + } + +// +// If max and min values are not equal, pack up field. +// If they are equal, we have a constant field, and the reference +// value (rmin) is the value for each point in the field and +// set nbits to 0. +// + if (rmin != rmax) { + iofst=0; + ifld=calloc(ndpts,sizeof(g2int)); + gref=calloc(ndpts,sizeof(g2int)); + gwidth=calloc(ndpts,sizeof(g2int)); + glen=calloc(ndpts,sizeof(g2int)); + // + // Scale original data + // + if (idrstmpl[1] == 0) { // No binary scaling + imin=(g2int)rint(rmin*dscale); + //imax=(g2int)rint(rmax*dscale); + rmin=(g2float)imin; + for (j=0;j0;j--) + ifld[j]=ifld[j]-ifld[j-1]; + ifld[0]=0; + } + else if (idrstmpl[16] == 2) { // second order + ival1=ifld[0]; + ival2=ifld[1]; + for (j=ndpts-1;j>1;j--) + ifld[j]=ifld[j]-(2*ifld[j-1])+ifld[j-2]; + ifld[0]=0; + ifld[1]=0; + } + // + // subtract min value from spatial diff field + // + isd=idrstmpl[16]; + minsd=ifld[isd]; + for (j=isd;jival1) maxorig=ival2; + temp=log((double)(maxorig+1))/alog2; + nbitorig=(g2int)ceil(temp)+1; + if (nbitorig > nbitsd) nbitsd=nbitorig; + // increase number of bits to even multiple of 8 ( octet ) + if ( (nbitsd%8) != 0) nbitsd=nbitsd+(8-(nbitsd%8)); + // + // Store extra spatial differencing info into the packed + // data section. + // + if (nbitsd != 0) { + // pack first original value + if (ival1 >= 0) { + sbit(cpack,&ival1,iofst,nbitsd); + iofst=iofst+nbitsd; + } + else { + sbit(cpack,&one,iofst,1); + iofst=iofst+1; + itemp=abs(ival1); + sbit(cpack,&itemp,iofst,nbitsd-1); + iofst=iofst+nbitsd-1; + } + if (idrstmpl[16] == 2) { + // pack second original value + if (ival2 >= 0) { + sbit(cpack,&ival2,iofst,nbitsd); + iofst=iofst+nbitsd; + } + else { + sbit(cpack,&one,iofst,1); + iofst=iofst+1; + itemp=abs(ival2); + sbit(cpack,&itemp,iofst,nbitsd-1); + iofst=iofst+nbitsd-1; + } + } + // pack overall min of spatial differences + if (minsd >= 0) { + sbit(cpack,&minsd,iofst,nbitsd); + iofst=iofst+nbitsd; + } + else { + sbit(cpack,&one,iofst,1); + iofst=iofst+1; + itemp=abs(minsd); + sbit(cpack,&itemp,iofst,nbitsd-1); + iofst=iofst+nbitsd-1; + } + } + //printf("SDp %ld %ld %ld %ld\n",ival1,ival2,minsd,nbitsd); + } // end of spatial diff section + // + // Determine Groups to be used. + // + if ( simple_alg == 1 ) { + // set group length to 10; calculate number of groups + // and length of last group + ngroups=ndpts/10; + for (j=0;j imax) imax=ifld[j]; + j++; + } + // calc num of bits needed to hold data + if ( gref[ng] != imax ) { + temp=log((double)(imax-gref[ng]+1))/alog2; + gwidth[ng]=(g2int)ceil(temp); + } + else + gwidth[ng]=0; + // Subtract min from data + j=n; + for (lg=0;lg igmax) igmax=gref[j]; + if (igmax != 0) { + temp=log((double)(igmax+1))/alog2; + nbitsgref=(g2int)ceil(temp); + sbits(cpack,gref,iofst,nbitsgref,0,ngroups); + itemp=nbitsgref*ngroups; + iofst=iofst+itemp; + // Pad last octet with Zeros, if necessary, + if ( (itemp%8) != 0) { + left=8-(itemp%8); + sbit(cpack,&zero,iofst,left); + iofst=iofst+left; + } + } + else + nbitsgref=0; + // + // Find max/min of the group widths and calc num of bits needed + // to pack each groups width value, then + // pack up group width values + // + iwmax=gwidth[0]; + ngwidthref=gwidth[0]; + for (j=1;j iwmax) iwmax=gwidth[j]; + if (gwidth[j] < ngwidthref) ngwidthref=gwidth[j]; + } + if (iwmax != ngwidthref) { + temp=log((double)(iwmax-ngwidthref+1))/alog2; + nbitsgwidth=(g2int)ceil(temp); + for (i=0;i ilmax) ilmax=glen[j]; + if (glen[j] < nglenref) nglenref=glen[j]; + } + nglenlast=glen[ngroups-1]; + if (ilmax != nglenref) { + temp=log((double)(ilmax-nglenref+1))/alog2; + nbitsglen=(g2int)ceil(temp); + for (i=0;i +#include +#include "grib2.h" + + +int comunpack(unsigned char *cpack,g2int lensec,g2int idrsnum,g2int *idrstmpl,g2int ndpts,g2float *fld) +////$$$ SUBPROGRAM DOCUMENTATION BLOCK +// . . . . +// SUBPROGRAM: comunpack +// PRGMMR: Gilbert ORG: W/NP11 DATE: 2002-10-29 +// +// ABSTRACT: This subroutine unpacks a data field that was packed using a +// complex packing algorithm as defined in the GRIB2 documention, +// using info from the GRIB2 Data Representation Template 5.2 or 5.3. +// Supports GRIB2 complex packing templates with or without +// spatial differences (i.e. DRTs 5.2 and 5.3). +// +// PROGRAM HISTORY LOG: +// 2002-10-29 Gilbert +// 2004-12-16 Gilbert - Added test ( provided by Arthur Taylor/MDL ) +// to verify that group widths and lengths are +// consistent with section length. +// +// USAGE: int comunpack(unsigned char *cpack,g2int lensec,g2int idrsnum, +// g2int *idrstmpl, g2int ndpts,g2float *fld) +// INPUT ARGUMENT LIST: +// cpack - pointer to the packed data field. +// lensec - length of section 7 (used for error checking). +// idrsnum - Data Representation Template number 5.N +// Must equal 2 or 3. +// idrstmpl - pointer to the array of values for Data Representation +// Template 5.2 or 5.3 +// ndpts - The number of data values to unpack +// +// OUTPUT ARGUMENT LIST: +// fld - Contains the unpacked data values. fld must be allocated +// with at least ndpts*sizeof(g2float) bytes before +// calling this routine. +// +// REMARKS: None +// +// ATTRIBUTES: +// LANGUAGE: C +// MACHINE: +// +//$$$// +{ + + g2int nbitsd=0,isign; + g2int j,iofst,ival1,ival2,minsd,itemp,l,k,n,non=0; + g2int *ifld,*ifldmiss=0; + g2int *gref,*gwidth,*glen; + g2int itype,ngroups,nbitsgref,nbitsgwidth,nbitsglen; + g2int msng1,msng2; + g2float ref,bscale,dscale,rmiss1,rmiss2; + g2int totBit, totLen; + + //printf('IDRSTMPL: ',(idrstmpl(j),j=1,16) + rdieee(idrstmpl+0,&ref,1); +// printf("SAGTref: %f\n",ref); + bscale = (g2float)int_power(2.0,idrstmpl[1]); + dscale = (g2float)int_power(10.0,-idrstmpl[2]); + nbitsgref = idrstmpl[3]; + itype = idrstmpl[4]; + ngroups = idrstmpl[9]; + nbitsgwidth = idrstmpl[11]; + nbitsglen = idrstmpl[15]; + if (idrsnum == 3) + nbitsd=idrstmpl[17]*8; + + // Constant field + + if (ngroups == 0) { + for (j=0;j lensec) { + return 1; + } +// +// For each group, unpack data values +// + if ( idrstmpl[6] == 0 ) { // no missing values + n=0; + for (j=0;j +#include +#include +#include "grib2.h" +#include "jasper/jasper.h" +#define JAS_1_700_2 + + + int dec_jpeg2000(char *injpc,g2int bufsize,g2int *outfld) +/*$$$ SUBPROGRAM DOCUMENTATION BLOCK +* . . . . +* SUBPROGRAM: dec_jpeg2000 Decodes JPEG2000 code stream +* PRGMMR: Gilbert ORG: W/NP11 DATE: 2002-12-02 +* +* ABSTRACT: This Function decodes a JPEG2000 code stream specified in the +* JPEG2000 Part-1 standard (i.e., ISO/IEC 15444-1) using JasPer +* Software version 1.500.4 (or 1.700.2) written by the University of British +* Columbia and Image Power Inc, and others. +* JasPer is available at http://www.ece.uvic.ca/~mdadams/jasper/. +* +* PROGRAM HISTORY LOG: +* 2002-12-02 Gilbert +* +* USAGE: int dec_jpeg2000(char *injpc,g2int bufsize,g2int *outfld) +* +* INPUT ARGUMENTS: +* injpc - Input JPEG2000 code stream. +* bufsize - Length (in bytes) of the input JPEG2000 code stream. +* +* OUTPUT ARGUMENTS: +* outfld - Output matrix of grayscale image values. +* +* RETURN VALUES : +* 0 = Successful decode +* -3 = Error decode jpeg2000 code stream. +* -5 = decoded image had multiple color components. +* Only grayscale is expected. +* +* REMARKS: +* +* Requires JasPer Software version 1.500.4 or 1.700.2 +* +* ATTRIBUTES: +* LANGUAGE: C +* MACHINE: IBM SP +* +*$$$*/ + +{ + int ier; + g2int i,j,k; + jas_image_t *image=0; + jas_stream_t *jpcstream; + jas_image_cmpt_t *pcmpt; + char *opts=0; + jas_matrix_t *data; + +// jas_init(); + + ier=0; +// +// Create jas_stream_t containing input JPEG200 codestream in memory. +// + + jpcstream=jas_stream_memopen(injpc,bufsize); + +// +// Decode JPEG200 codestream into jas_image_t structure. +// + image=jpc_decode(jpcstream,opts); + if ( image == 0 ) { + printf(" jpc_decode return = %d \n",ier); + return -3; + } + + pcmpt=image->cmpts_[0]; +/* + printf(" SAGOUT DECODE:\n"); + printf(" tlx %d \n",image->tlx_); + printf(" tly %d \n",image->tly_); + printf(" brx %d \n",image->brx_); + printf(" bry %d \n",image->bry_); + printf(" numcmpts %d \n",image->numcmpts_); + printf(" maxcmpts %d \n",image->maxcmpts_); +#ifdef JAS_1_500_4 + printf(" colormodel %d \n",image->colormodel_); +#endif +#ifdef JAS_1_700_2 + printf(" colorspace %d \n",image->clrspc_); +#endif + printf(" inmem %d \n",image->inmem_); + printf(" COMPONENT:\n"); + printf(" tlx %d \n",pcmpt->tlx_); + printf(" tly %d \n",pcmpt->tly_); + printf(" hstep %d \n",pcmpt->hstep_); + printf(" vstep %d \n",pcmpt->vstep_); + printf(" width %d \n",pcmpt->width_); + printf(" height %d \n",pcmpt->height_); + printf(" prec %d \n",pcmpt->prec_); + printf(" sgnd %d \n",pcmpt->sgnd_); + printf(" cps %d \n",pcmpt->cps_); +#ifdef JAS_1_700_2 + printf(" type %d \n",pcmpt->type_); +#endif +*/ + +// Expecting jpeg2000 image to be grayscale only. +// No color components. +// + if (image->numcmpts_ != 1 ) { + printf("dec_jpeg2000: Found color image. Grayscale expected.\n"); + return (-5); + } + +// +// Create a data matrix of grayscale image values decoded from +// the jpeg2000 codestream. +// + data=jas_matrix_create(jas_image_height(image), jas_image_width(image)); + jas_image_readcmpt(image,0,0,0,jas_image_width(image), + jas_image_height(image),data); +// +// Copy data matrix to output integer array. +// + k=0; + for (i=0;iheight_;i++) + for (j=0;jwidth_;j++) + outfld[k++]=data->rows_[i][j]; +// +// Clean up JasPer work structures. +// + jas_matrix_destroy(data); + ier=jas_stream_close(jpcstream); + jas_image_destroy(image); + + return 0; + +} +#endif /* USE_JPEG2000 */ diff -Nru saga-2.1.0+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/dec_png.c saga-2.1.4+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/dec_png.c --- saga-2.1.0+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/dec_png.c 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/dec_png.c 2014-11-13 08:32:19.000000000 +0000 @@ -0,0 +1,144 @@ +/********************************************************** + * Version $Id: dec_png.c 911 2011-02-14 16:38:15Z reklov_w $ + *********************************************************/ +#ifndef USE_PNG +#include "grib2.h" + int dec_png(unsigned char *pngbuf,g2int *width,g2int *height,char *cout) + { return( 0 ); } +#else /* USE_PNG */ + +#include +#include +#include +#include +#include "grib2.h" + + +struct png_stream { + unsigned char *stream_ptr; /* location to write PNG stream */ + g2int stream_len; /* number of bytes written */ +}; +typedef struct png_stream png_stream; + +void user_read_data(png_structp , png_bytep , png_uint_32 ); + +void user_read_data(png_structp png_ptr,png_bytep data, png_uint_32 length) +/* + Custom read function used so that libpng will read a PNG stream + from memory instead of a file on disk. +*/ +{ + char *ptr; + g2int offset; + png_stream *mem; + + mem=(png_stream *)png_get_io_ptr(png_ptr); + ptr=(void *)mem->stream_ptr; + offset=mem->stream_len; +/* printf("SAGrd %ld %ld %x\n",offset,length,ptr); */ + memcpy(data,ptr+offset,length); + mem->stream_len += length; +} + + + +int dec_png(unsigned char *pngbuf,g2int *width,g2int *height,char *cout) +{ + int interlace,color,compres,filter,bit_depth; + g2int j,k,n,bytes,clen; + png_structp png_ptr; + png_infop info_ptr,end_info; + png_bytepp row_pointers; + png_stream read_io_ptr; + +/* check if stream is a valid PNG format */ + + if ( png_sig_cmp(pngbuf,0,8) != 0) + return (-3); + +/* create and initialize png_structs */ + + png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, (png_voidp)NULL, + NULL, NULL); + if (!png_ptr) + return (-1); + + info_ptr = png_create_info_struct(png_ptr); + if (!info_ptr) + { + png_destroy_read_struct(&png_ptr,(png_infopp)NULL,(png_infopp)NULL); + return (-2); + } + + end_info = png_create_info_struct(png_ptr); + if (!end_info) + { + png_destroy_read_struct(&png_ptr,(png_infopp)info_ptr,(png_infopp)NULL); + return (-2); + } + +/* Set Error callback */ + + if (setjmp(png_jmpbuf(png_ptr))) + { + png_destroy_read_struct(&png_ptr, &info_ptr,&end_info); + return (-3); + } + +/* Initialize info for reading PNG stream from memory */ + + read_io_ptr.stream_ptr=(png_voidp)pngbuf; + read_io_ptr.stream_len=0; + +/* Set new custom read function */ + + png_set_read_fn(png_ptr,(voidp)&read_io_ptr,(png_rw_ptr)user_read_data); +/* png_init_io(png_ptr, fptr); */ + +/* Read and decode PNG stream */ + + png_read_png(png_ptr, info_ptr, PNG_TRANSFORM_IDENTITY, NULL); + +/* Get pointer to each row of image data */ + + row_pointers = png_get_rows(png_ptr, info_ptr); + +/* Get image info, such as size, depth, colortype, etc... */ + + /*printf("SAGT:png %d %d %d\n",info_ptr->width,info_ptr->height,info_ptr->bit_depth);*/ + (void)png_get_IHDR(png_ptr, info_ptr, (png_uint_32 *)width, (png_uint_32 *)height, + &bit_depth, &color, &interlace, &compres, &filter); + +/* Check if image was grayscale */ + +/* + if (color != PNG_COLOR_TYPE_GRAY ) { + fprintf(stderr,"dec_png: Grayscale image was expected. \n"); + } +*/ + if ( color == PNG_COLOR_TYPE_RGB ) { + bit_depth=24; + } + else if ( color == PNG_COLOR_TYPE_RGB_ALPHA ) { + bit_depth=32; + } +/* Copy image data to output string */ + + n=0; + bytes=bit_depth/8; + clen=(*width)*bytes; + for (j=0;j<*height;j++) { + for (k=0;k +#include "grib2.h" +#include "drstemplates.h" + +g2int getdrsindex(g2int number) +/*!$$$ SUBPROGRAM DOCUMENTATION BLOCK +! . . . . +! SUBPROGRAM: getdrsindex +! PRGMMR: Gilbert ORG: W/NP11 DATE: 2001-06-28 +! +! ABSTRACT: This function returns the index of specified Data +! Representation Template 5.NN (NN=number) in array templates. +! +! PROGRAM HISTORY LOG: +! 2001-06-28 Gilbert +! +! USAGE: index=getdrsindex(number) +! INPUT ARGUMENT LIST: +! number - NN, indicating the number of the Data Representation +! Template 5.NN that is being requested. +! +! RETURNS: Index of DRT 5.NN in array templates, if template exists. +! = -1, otherwise. +! +! REMARKS: None +! +! ATTRIBUTES: +! LANGUAGE: C +! MACHINE: IBM SP +! +!$$$*/ +{ + g2int j,getdrsindex=-1; + + for (j=0;jtype=5; + new->num=templatesdrs[index].template_num; + new->maplen=templatesdrs[index].mapdrslen; + new->needext=templatesdrs[index].needext; + new->map=(g2int *)templatesdrs[index].mapdrs; + new->extlen=0; + new->ext=0; //NULL + return(new); + } + else { + printf("getdrstemplate: DRS Template 5.%d not defined.\n",(int)number); + return(0); //NULL + } + + return(0); //NULL +} + +template *extdrstemplate(g2int number,g2int *list) +/*!$$$ SUBPROGRAM DOCUMENTATION BLOCK +! . . . . +! SUBPROGRAM: extdrstemplate +! PRGMMR: Gilbert ORG: W/NP11 DATE: 2000-05-11 +! +! ABSTRACT: This subroutine generates the remaining octet map for a +! given Data Representation Template, if required. Some Templates can +! vary depending on data values given in an earlier part of the +! Template, and it is necessary to know some of the earlier entry +! values to generate the full octet map of the Template. +! +! PROGRAM HISTORY LOG: +! 2000-05-11 Gilbert +! +! USAGE: new=extdrstemplate(number,list); +! INPUT ARGUMENT LIST: +! number - NN, indicating the number of the Data Representation +! Template 5.NN that is being requested. +! list() - The list of values for each entry in the +! the Data Representation Template 5.NN. +! +! RETURN VALUE: +! - Pointer to the returned template struct. +! Returns NULL pointer, if template not found. +! +! ATTRIBUTES: +! LANGUAGE: C +! MACHINE: IBM SP +! +!$$$*/ +{ + template *new; + g2int index,i; + + index=getdrsindex(number); + if (index == -1) return(0); + + new=getdrstemplate(number); + + if ( ! new->needext ) return(new); + + if ( number == 1 ) { + new->extlen=list[10]+list[12]; + new->ext=(g2int *)malloc(sizeof(g2int)*new->extlen); + for (i=0;iextlen;i++) { + new->ext[i]=4; + } + } + return(new); + +} + diff -Nru saga-2.1.0+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/drstemplates.h saga-2.1.4+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/drstemplates.h --- saga-2.1.0+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/drstemplates.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/drstemplates.h 2014-11-13 08:32:19.000000000 +0000 @@ -0,0 +1,72 @@ +/********************************************************** + * Version $Id: drstemplates.h 911 2011-02-14 16:38:15Z reklov_w $ + *********************************************************/ +#ifndef _drstemplates_H +#define _drstemplates_H +#include "grib2.h" + +// PRGMMR: Gilbert ORG: W/NP11 DATE: 2002-10-26 +// +// ABSTRACT: This Fortran Module contains info on all the available +// GRIB2 Data Representation Templates used in Section 5 (DRS). +// The information decribing each template is stored in the +// drstemplate structure defined below. +// +// Each Template has three parts: The number of entries in the template +// (mapdrslen); A map of the template (mapdrs), which contains the +// number of octets in which to pack each of the template values; and +// a logical value (needext) that indicates whether the Template needs +// to be extended. In some cases the number of entries in a template +// can vary depending upon values specified in the "static" part of +// the template. ( See Template 5.1 as an example ) +// +// NOTE: Array mapdrs contains the number of octets in which the +// corresponding template values will be stored. A negative value in +// mapdrs is used to indicate that the corresponding template entry can +// contain negative values. This information is used later when packing +// (or unpacking) the template data values. Negative data values in GRIB +// are stored with the left most bit set to one, and a negative number +// of octets value in mapdrs[] indicates that this possibility should +// be considered. The number of octets used to store the data value +// in this case would be the absolute value of the negative value in +// mapdrs[]. +// +// +/////////////////////////////////////////////////////////////////////// + + #define MAXDRSTEMP 9 // maximum number of templates + #define MAXDRSMAPLEN 200 // maximum template map length + + struct drstemplate + { + g2int template_num; + g2int mapdrslen; + g2int needext; + g2int mapdrs[MAXDRSMAPLEN]; + }; + + const struct drstemplate templatesdrs[MAXDRSTEMP] = { + // 5.0: Grid point data - Simple Packing + { 0, 5, 0, {4,-2,-2,1,1} }, + // 5.2: Grid point data - Complex Packing + { 2, 16, 0, {4,-2,-2,1,1,1,1,4,4,4,1,1,4,1,4,1} }, + // 5.3: Grid point data - Complex Packing and spatial differencing + { 3, 18, 0, {4,-2,-2,1,1,1,1,4,4,4,1,1,4,1,4,1,1,1} }, + // 5.50: Spectral Data - Simple Packing + { 50, 5, 0, {4,-2,-2,1,4} }, + // 5.51: Spherical Harmonics data - Complex packing + { 51, 10, 0, {4,-2,-2,1,-4,2,2,2,4,1} }, +// // 5.1: Matrix values at gridpoint - Simple packing +// { 1, 15, 1, {4,-2,-2,1,1,1,4,2,2,1,1,1,1,1,1} }, + // 5.40: Grid point data - JPEG2000 encoding + { 40, 7, 0, {4,-2,-2,1,1,1,1} }, + // 5.41: Grid point data - PNG encoding + { 41, 5, 0, {4,-2,-2,1,1} }, + // 5.40000: Grid point data - JPEG2000 encoding + { 40000, 7, 0, {4,-2,-2,1,1,1,1} }, + // 5.40010: Grid point data - PNG encoding + { 40010, 5, 0, {4,-2,-2,1,1} } + } ; + + +#endif /* _drstemplates_H */ diff -Nru saga-2.1.0+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/enc_jpeg2000.c saga-2.1.4+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/enc_jpeg2000.c --- saga-2.1.0+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/enc_jpeg2000.c 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/enc_jpeg2000.c 2014-11-13 08:32:19.000000000 +0000 @@ -0,0 +1,190 @@ +/********************************************************** + * Version $Id: enc_jpeg2000.c 911 2011-02-14 16:38:15Z reklov_w $ + *********************************************************/ +#ifndef USE_JPEG2000 +#include "grib2.h" + int enc_jpeg2000(unsigned char *cin,g2int width,g2int height,g2int nbits, + g2int ltype, g2int ratio, g2int retry, char *outjpc, + g2int jpclen) + { return( 0 ); } +#else /* USE_JPEG2000 */ + +#include +#include +#include "grib2.h" +#include "jasper/jasper.h" +#define JAS_1_700_2 + + +int enc_jpeg2000(unsigned char *cin,g2int width,g2int height,g2int nbits, + g2int ltype, g2int ratio, g2int retry, char *outjpc, + g2int jpclen) +/*$$$ SUBPROGRAM DOCUMENTATION BLOCK +* . . . . +* SUBPROGRAM: enc_jpeg2000 Encodes JPEG2000 code stream +* PRGMMR: Gilbert ORG: W/NP11 DATE: 2002-12-02 +* +* ABSTRACT: This Function encodes a grayscale image into a JPEG2000 code stream +* specified in the JPEG2000 Part-1 standard (i.e., ISO/IEC 15444-1) +* using JasPer Software version 1.500.4 (or 1.700.2 ) written by the +* University of British Columbia, Image Power Inc, and others. +* JasPer is available at http://www.ece.uvic.ca/~mdadams/jasper/. +* +* PROGRAM HISTORY LOG: +* 2002-12-02 Gilbert +* 2004-12-16 Gilbert - Added retry argument/option to allow option of +* increasing the maximum number of guard bits to the +* JPEG2000 algorithm. +* +* USAGE: int enc_jpeg2000(unsigned char *cin,g2int width,g2int height, +* g2int nbits, g2int ltype, g2int ratio, +* g2int retry, char *outjpc, g2int jpclen) +* +* INPUT ARGUMENTS: +* cin - Packed matrix of Grayscale image values to encode. +* width - width of image +* height - height of image +* nbits - depth (in bits) of image. i.e number of bits +* used to hold each data value +* ltype - indicator of lossless or lossy compression +* = 1, for lossy compression +* != 1, for lossless compression +* ratio - target compression ratio. (ratio:1) +* Used only when ltype == 1. +* retry - Pointer to option type. +* 1 = try increasing number of guard bits +* otherwise, no additional options +* jpclen - Number of bytes allocated for new JPEG2000 code stream in +* outjpc. +* +* INPUT ARGUMENTS: +* outjpc - Output encoded JPEG2000 code stream +* +* RETURN VALUES : +* > 0 = Length in bytes of encoded JPEG2000 code stream +* -3 = Error decode jpeg2000 code stream. +* -5 = decoded image had multiple color components. +* Only grayscale is expected. +* +* REMARKS: +* +* Requires JasPer Software version 1.500.4 or 1.700.2 +* +* ATTRIBUTES: +* LANGUAGE: C +* MACHINE: IBM SP +* +*$$$*/ +{ + int ier,rwcnt; + jas_image_t image; + jas_stream_t *jpcstream,*istream; + jas_image_cmpt_t cmpt,*pcmpt; +#define MAXOPTSSIZE 1024 + char opts[MAXOPTSSIZE]; + +/* + printf(" enc_jpeg2000:width %ld\n",width); + printf(" enc_jpeg2000:height %ld\n",height); + printf(" enc_jpeg2000:nbits %ld\n",nbits); + printf(" enc_jpeg2000:jpclen %ld\n",jpclen); +*/ +// jas_init(); + +// +// Set lossy compression options, if requested. +// + if ( ltype != 1 ) { + opts[0]=(char)0; + } + else { +#ifdef _SAGA_MSW + sprintf(opts,"mode=real\nrate=%f",1.0/(float)ratio); +#else + snprintf(opts,MAXOPTSSIZE,"mode=real\nrate=%f",1.0/(float)ratio); +#endif // _SAGA_MSW + } + if ( retry == 1 ) { // option to increase number of guard bits + strcat(opts,"\nnumgbits=4"); + } + //printf("SAGopts: %s\n",opts); + +// +// Initialize the JasPer image structure describing the grayscale +// image to encode into the JPEG2000 code stream. +// + image.tlx_=0; + image.tly_=0; +#ifdef JAS_1_500_4 + image.brx_=(uint_fast32_t)width; + image.bry_=(uint_fast32_t)height; +#endif +#ifdef JAS_1_700_2 + image.brx_=(jas_image_coord_t)width; + image.bry_=(jas_image_coord_t)height; +#endif + image.numcmpts_=1; + image.maxcmpts_=1; +#ifdef JAS_1_500_4 + image.colormodel_=JAS_IMAGE_CM_GRAY; /* grayscale Image */ +#endif +#ifdef JAS_1_700_2 + image.clrspc_=JAS_CLRSPC_SGRAY; /* grayscale Image */ + image.cmprof_=0; +#endif + image.inmem_=1; + + cmpt.tlx_=0; + cmpt.tly_=0; + cmpt.hstep_=1; + cmpt.vstep_=1; +#ifdef JAS_1_500_4 + cmpt.width_=(uint_fast32_t)width; + cmpt.height_=(uint_fast32_t)height; +#endif +#ifdef JAS_1_700_2 + cmpt.width_=(jas_image_coord_t)width; + cmpt.height_=(jas_image_coord_t)height; + cmpt.type_=JAS_IMAGE_CT_COLOR(JAS_CLRSPC_CHANIND_GRAY_Y); +#endif + cmpt.prec_=nbits; + cmpt.sgnd_=0; + cmpt.cps_=(nbits+7)/8; + + pcmpt=&cmpt; + image.cmpts_=&pcmpt; + +// +// Open a JasPer stream containing the input grayscale values +// + istream=jas_stream_memopen((char *)cin,height*width*cmpt.cps_); + cmpt.stream_=istream; + +// +// Open an output stream that will contain the encoded jpeg2000 +// code stream. +// + jpcstream=jas_stream_memopen(outjpc,(int)jpclen); + +// +// Encode image. +// + ier=jpc_encode(&image,jpcstream,opts); + if ( ier != 0 ) { + printf(" jpc_encode return = %d \n",ier); + return -3; + } +// +// Clean up JasPer work structures. +// + rwcnt=jpcstream->rwcnt_; + ier=jas_stream_close(istream); + ier=jas_stream_close(jpcstream); +// +// Return size of jpeg2000 code stream +// + return (rwcnt); + +} + +#endif /* USE_JPEG2000 */ diff -Nru saga-2.1.0+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/enc_png.c saga-2.1.4+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/enc_png.c --- saga-2.1.0+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/enc_png.c 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/enc_png.c 2014-11-13 08:32:19.000000000 +0000 @@ -0,0 +1,138 @@ +/********************************************************** + * Version $Id: enc_png.c 911 2011-02-14 16:38:15Z reklov_w $ + *********************************************************/ +#ifndef USE_PNG +#include "grib2.h" + int enc_png(char *data,g2int width,g2int height,g2int nbits,char *pngbuf) { return( 0 ); } +#else /* USE_PNG */ + +#include +#include +#include +#include +#include "grib2.h" + + +struct png_stream { + unsigned char *stream_ptr; /* location to write PNG stream */ + g2int stream_len; /* number of bytes written */ +}; +typedef struct png_stream png_stream; + +void user_write_data(png_structp ,png_bytep , png_uint_32 ); +void user_flush_data(png_structp ); + +void user_write_data(png_structp png_ptr,png_bytep data, png_uint_32 length) +/* + Custom write function used to that libpng will write + to memory location instead of a file on disk +*/ +{ + unsigned char *ptr; + g2int offset; + png_stream *mem; + + mem=(png_stream *)png_get_io_ptr(png_ptr); + ptr=mem->stream_ptr; + offset=mem->stream_len; +/* printf("SAGwr %ld %ld %x\n",offset,length,ptr); */ + /*for (j=offset,k=0;kstream_len += length; +} + + +void user_flush_data(png_structp png_ptr) +/* + Dummy Custom flush function +*/ +{ + int *do_nothing; + do_nothing=NULL; +} + + +int enc_png(char *data,g2int width,g2int height,g2int nbits,char *pngbuf) +{ + + int color_type; + g2int j,bytes,pnglen,bit_depth; + png_structp png_ptr; + png_infop info_ptr; +// png_bytep *row_pointers[height]; + png_bytep **row_pointers; + png_stream write_io_ptr; + +/* create and initialize png_structs */ + + png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, (png_voidp)NULL, + NULL, NULL); + if (!png_ptr) + return (-1); + + info_ptr = png_create_info_struct(png_ptr); + if (!info_ptr) + { + png_destroy_write_struct(&png_ptr,(png_infopp)NULL); + return (-2); + } + +/* Set Error callback */ + + if (setjmp(png_jmpbuf(png_ptr))) + { + png_destroy_write_struct(&png_ptr, &info_ptr); + return (-3); + } + +/* Initialize info for writing PNG stream to memory */ + + write_io_ptr.stream_ptr=(png_voidp)pngbuf; + write_io_ptr.stream_len=0; + +/* Set new custom write functions */ + + png_set_write_fn(png_ptr,(voidp)&write_io_ptr,(png_rw_ptr)user_write_data, + (png_flush_ptr)user_flush_data); +/* png_init_io(png_ptr, fptr); */ +/* png_set_compression_level(png_ptr, Z_BEST_COMPRESSION); */ + +/* Set the image size, colortype, filter type, etc... */ + +/* printf("SAGTsettingIHDR %d %d %d\n",width,height,bit_depth); */ + bit_depth=nbits; + color_type=PNG_COLOR_TYPE_GRAY; + if (nbits == 24 ) { + bit_depth=8; + color_type=PNG_COLOR_TYPE_RGB; + } + else if (nbits == 32 ) { + bit_depth=8; + color_type=PNG_COLOR_TYPE_RGB_ALPHA; + } + png_set_IHDR(png_ptr, info_ptr, width, height, + bit_depth, color_type, PNG_INTERLACE_NONE, + PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT); + +/* Put image data into the PNG info structure */ + + /*bytes=bit_depth/8;*/ + bytes=nbits/8; + row_pointers=malloc(height*sizeof(png_bytep)); + for (j=0;j +#include +#include "grib2.h" + +g2int getdim(unsigned char *,g2int *,g2int *,g2int *); +g2int getpoly(unsigned char *,g2int *,g2int *,g2int *); +void simpack(g2float *, g2int, g2int *, unsigned char *, g2int *); +void cmplxpack(g2float *, g2int, g2int, g2int *, unsigned char *, g2int *); +void specpack(g2float *,g2int,g2int,g2int,g2int,g2int *,unsigned char *, + g2int *); +#ifdef USE_PNG + void pngpack(g2float *,g2int,g2int,g2int *,unsigned char *,g2int *); +#endif /* USE_PNG */ +#ifdef USE_JPEG2000 + void jpcpack(g2float *,g2int,g2int,g2int *,unsigned char *,g2int *); +#endif /* USE_JPEG2000 */ + + +g2int g2_addfield(unsigned char *cgrib,g2int ipdsnum,g2int *ipdstmpl, + g2float *coordlist,g2int numcoord,g2int idrsnum,g2int *idrstmpl, + g2float *fld,g2int ngrdpts,g2int ibmap,g2int *bmap) +//$$$ SUBPROGRAM DOCUMENTATION BLOCK +// . . . . +// SUBPROGRAM: g2_addfield +// PRGMMR: Gilbert ORG: W/NP11 DATE: 2002-11-05 +// +// ABSTRACT: This routine packs up Sections 4 through 7 for a given field +// and adds them to a GRIB2 message. They are Product Definition Section, +// Data Representation Section, Bit-Map Section and Data Section, +// respectively. +// This routine is used with routines "g2_create", "g2_addlocal", +// "g2_addgrid", and "g2_gribend" to create a complete GRIB2 message. +// g2_create must be called first to initialize a new GRIB2 message. +// Also, routine g2_addgrid must be called after g2_create and +// before this routine to add the appropriate grid description to +// the GRIB2 message. Also, a call to g2_gribend is required to complete +// GRIB2 message after all fields have been added. +// +// PROGRAM HISTORY LOG: +// 2002-11-05 Gilbert +// 2002-12-23 Gilbert - Added complex spherical harmonic packing +// 2003-08-27 Gilbert - Added support for new templates using +// PNG and JPEG2000 algorithms/templates. +// 2004-11-29 Gilbert - JPEG2000 now allowed to use WMO Template no. 5.40 +// PNG now allowed to use WMO Template no. 5.41 +// - Added check to determine if packing algorithm failed. +// 2005-05-10 Gilbert - Imposed minimum size on cpack, used to hold encoded +// bit string. +// +// USAGE: int g2_addfield(unsigned char *cgrib,g2int ipdsnum,g2int *ipdstmpl, +// g2float *coordlist,g2int numcoord,g2int idrsnum,g2int *idrstmpl, +// g2float *fld,g2int ngrdpts,g2int ibmap,g2int *bmap) +// INPUT ARGUMENT LIST: +// cgrib - Char array that contains the GRIB2 message to which sections +// 4 through 7 should be added. +// ipdsnum - Product Definition Template Number ( see Code Table 4.0) +// ipdstmpl - Contains the data values for the specified Product Definition +// Template ( N=ipdsnum ). Each element of this integer +// array contains an entry (in the order specified) of Product +// Defintion Template 4.N +// coordlist- Array containg floating point values intended to document +// the vertical discretisation associated to model data +// on hybrid coordinate vertical levels. +// numcoord - number of values in array coordlist. +// idrsnum - Data Representation Template Number ( see Code Table 5.0 ) +// idrstmpl - Contains the data values for the specified Data Representation +// Template ( N=idrsnum ). Each element of this integer +// array contains an entry (in the order specified) of Data +// Representation Template 5.N +// Note that some values in this template (eg. reference +// values, number of bits, etc...) may be changed by the +// data packing algorithms. +// Use this to specify scaling factors and order of +// spatial differencing, if desired. +// fld[] - Array of data points to pack. +// ngrdpts - Number of data points in grid. +// i.e. size of fld and bmap. +// ibmap - Bitmap indicator ( see Code Table 6.0 ) +// 0 = bitmap applies and is included in Section 6. +// 1-253 = Predefined bitmap applies +// 254 = Previously defined bitmap applies to this field +// 255 = Bit map does not apply to this product. +// bmap[] - Integer array containing bitmap to be added. ( if ibmap=0 ) +// +// OUTPUT ARGUMENT LIST: +// cgrib - Character array to contain the updated GRIB2 message. +// Must be allocated large enough to store the entire +// GRIB2 message. +// +// RETURN VALUES: +// ierr - Return code. +// > 0 = Current size of updated GRIB2 message +// -1 = GRIB message was not initialized. Need to call +// routine g2_create first. +// -2 = GRIB message already complete. Cannot add new section. +// -3 = Sum of Section byte counts doesn't add to total byte count +// -4 = Previous Section was not 3 or 7. +// -5 = Could not find requested Product Definition Template. +// -6 = Section 3 (GDS) not previously defined in message +// -7 = Tried to use unsupported Data Representationi Template +// -8 = Specified use of a previously defined bitmap, but one +// does not exist in the GRIB message. +// -9 = GDT of one of 5.50 through 5.53 required to pack field +// using DRT 5.51. +// -10 = Error packing data field. +// +// REMARKS: Note that the Sections 4 through 7 can only follow +// Section 3 or Section 7 in a GRIB2 message. +// +// ATTRIBUTES: +// LANGUAGE: C +// MACHINE: +// +//$$$ +{ + g2int ierr; + static unsigned char G=0x47; // 'G' + static unsigned char R=0x52; // 'R' + static unsigned char I=0x49; // 'I' + static unsigned char B=0x42; // 'B' + static unsigned char s7=0x37; // '7' + + unsigned char *cpack; + static g2int zero=0,one=1,four=4,five=5,six=6,seven=7; + const g2int minsize=50000; + g2int iofst,ibeg,lencurr,len,nsize; + g2int ilen,isecnum,i,nbits,temp,left; + g2int ibmprev,j,lcpack,ioctet,newlen,ndpts; + g2int lensec4,lensec5,lensec6,lensec7; + g2int issec3,isprevbmap,lpos3=0,JJ,KK,MM; + g2int *coordieee; + g2int width,height,iscan,itemp; + g2float *pfld; + template *mappds,*mapdrs; + unsigned int allones=4294967295u; + + ierr=0; +// +// Check to see if beginning of GRIB message exists +// + if ( cgrib[0]!=G || cgrib[1]!=R || cgrib[2]!=I || cgrib[3]!=B ) { + printf("g2_addfield: GRIB not found in given message.\n"); + printf("g2_addfield: Call to routine g2_create required to initialize GRIB messge.\n"); + ierr=-1; + return(ierr); + } +// +// Get current length of GRIB message +// + gbit(cgrib,&lencurr,96,32); +// +// Check to see if GRIB message is already complete +// + if ( cgrib[lencurr-4]==s7 && cgrib[lencurr-3]==s7 && + cgrib[lencurr-2]==s7 && cgrib[lencurr-1]==s7 ) { + printf("g2_addfield: GRIB message already complete. Cannot add new section.\n"); + ierr=-2; + return(ierr); + } +// +// Loop through all current sections of the GRIB message to +// find the last section number. +// + issec3=0; + isprevbmap=0; + len=16; // length of Section 0 + for (;;) { + // Get number and length of next section + iofst=len*8; + gbit(cgrib,&ilen,iofst,32); + iofst=iofst+32; + gbit(cgrib,&isecnum,iofst,8); + iofst=iofst+8; + // Check if previous Section 3 exists + if (isecnum == 3) { + issec3=1; + lpos3=len; + } + // Check if a previous defined bitmap exists + if (isecnum == 6) { + gbit(cgrib,&ibmprev,iofst,8); + iofst=iofst+8; + if ((ibmprev >= 0) && (ibmprev <= 253)) isprevbmap=1; + } + len=len+ilen; + // Exit loop if last section reached + if ( len == lencurr ) break; + // If byte count for each section doesn't match current + // total length, then there is a problem. + if ( len > lencurr ) { + printf("g2_addfield: Section byte counts don''t add to total.\n"); + printf("g2_addfield: Sum of section byte counts = %ld\n",len); + printf("g2_addfield: Total byte count in Section 0 = %ld\n",lencurr); + ierr=-3; + return(ierr); + } + } +// +// Sections 4 through 7 can only be added after section 3 or 7. +// + if ( (isecnum != 3) && (isecnum != 7) ) { + printf("g2_addfield: Sections 4-7 can only be added after Section 3 or 7.\n"); + printf("g2_addfield: Section ',isecnum,' was the last found in given GRIB message.\n"); + ierr=-4; + return(ierr); +// +// Sections 4 through 7 can only be added if section 3 was previously defined. +// + } + else if ( ! issec3) { + printf("g2_addfield: Sections 4-7 can only be added if Section 3 was previously included.\n"); + printf("g2_addfield: Section 3 was not found in given GRIB message.\n"); + printf("g2_addfield: Call to routine addgrid required to specify Grid definition.\n"); + ierr=-6; + return(ierr); + } +// +// Add Section 4 - Product Definition Section +// + ibeg=lencurr*8; // Calculate offset for beginning of section 4 + iofst=ibeg+32; // leave space for length of section + sbit(cgrib,&four,iofst,8); // Store section number ( 4 ) + iofst=iofst+8; + sbit(cgrib,&numcoord,iofst,16); // Store num of coordinate values + iofst=iofst+16; + sbit(cgrib,&ipdsnum,iofst,16); // Store Prod Def Template num. + iofst=iofst+16; + // + // Get Product Definition Template + // + mappds=getpdstemplate(ipdsnum); + if (mappds == 0) { // undefined template + ierr=-5; + return(ierr); + } + // + // Extend the Product Definition Template, if necessary. + // The number of values in a specific template may vary + // depending on data specified in the "static" part of the + // template. + // + if ( mappds->needext ) { + free(mappds); + mappds=extpdstemplate(ipdsnum,ipdstmpl); + } + // + // Pack up each input value in array ipdstmpl into the + // the appropriate number of octets, which are specified in + // corresponding entries in array mappds. + // + for (i=0;imaplen;i++) { + nbits=abs(mappds->map[i])*8; + if ( (mappds->map[i] >= 0) || (ipdstmpl[i] >= 0) ) + sbit(cgrib,ipdstmpl+i,iofst,nbits); + else { + sbit(cgrib,&one,iofst,1); + temp=abs(ipdstmpl[i]); + sbit(cgrib,&temp,iofst+1,nbits-1); + } + iofst=iofst+nbits; + } + // Pack template extension, if appropriate + j=mappds->maplen; + if ( mappds->needext && (mappds->extlen > 0) ) { + for (i=0;iextlen;i++) { + nbits=abs(mappds->ext[i])*8; + if ( (mappds->ext[i] >= 0) || (ipdstmpl[j] >= 0) ) + sbit(cgrib,ipdstmpl+j,iofst,nbits); + else { + sbit(cgrib,&one,iofst,1); + temp=abs(ipdstmpl[j]); + sbit(cgrib,&temp,iofst+1,nbits-1); + } + iofst=iofst+nbits; + j++; + } + } + free(mappds); + // + // Add Optional list of vertical coordinate values + // after the Product Definition Template, if necessary. + // + if ( numcoord != 0 ) { + coordieee=(g2int *)calloc(numcoord,sizeof(g2int)); + mkieee(coordlist,coordieee,numcoord); + sbits(cgrib,coordieee,iofst,32,0,numcoord); + iofst=iofst+(32*numcoord); + free(coordieee); + } + // + // Calculate length of section 4 and store it in octets + // 1-4 of section 4. + // + lensec4=(iofst-ibeg)/8; + sbit(cgrib,&lensec4,ibeg,32); +// +// Pack Data using appropriate algorithm +// + // + // Get Data Representation Template + // + mapdrs=getdrstemplate(idrsnum); + if (mapdrs == 0) { + ierr=-5; + return(ierr); + } + // + // contract data field, removing data at invalid grid points, + // if bit-map is provided with field. + // + if ( ibmap == 0 || ibmap==254 ) { + pfld=(g2float *)malloc(ngrdpts*sizeof(g2float)); + ndpts=0; + for (j=0;jmaplen;i++) { + nbits=abs(mapdrs->map[i])*8; + if ( (mapdrs->map[i] >= 0) || (idrstmpl[i] >= 0) ) + sbit(cgrib,idrstmpl+i,iofst,nbits); + else { + sbit(cgrib,&one,iofst,1); + temp=abs(idrstmpl[i]); + sbit(cgrib,&temp,iofst+1,nbits-1); + } + iofst=iofst+nbits; + } + free(mapdrs); + // + // Calculate length of section 5 and store it in octets + // 1-4 of section 5. + // + lensec5=(iofst-ibeg)/8; + sbit(cgrib,&lensec5,ibeg,32); + +// +// Add Section 6 - Bit-Map Section +// + ibeg=iofst; // Calculate offset for beginning of section 6 + iofst=ibeg+32; // leave space for length of section + sbit(cgrib,&six,iofst,8); // Store section number ( 6 ) + iofst=iofst+8; + sbit(cgrib,&ibmap,iofst,8); // Store Bit Map indicator + iofst=iofst+8; + // + // Store bitmap, if supplied + // + if (ibmap == 0) { + sbits(cgrib,bmap,iofst,1,0,ngrdpts); // Store BitMap + iofst=iofst+ngrdpts; + } + // + // If specifying a previously defined bit-map, make sure + // one already exists in the current GRIB message. + // + if ((ibmap==254) && ( ! isprevbmap)) { + printf("g2_addfield: Requested previously defined bitmap,"); + printf(" but one does not exist in the current GRIB message.\n"); + ierr=-8; + return(ierr); + } + // + // Calculate length of section 6 and store it in octets + // 1-4 of section 6. Pad to end of octect, if necessary. + // + left=8-(iofst%8); + if (left != 8) { + sbit(cgrib,&zero,iofst,left); // Pad with zeros to fill Octet + iofst=iofst+left; + } + lensec6=(iofst-ibeg)/8; + sbit(cgrib,&lensec6,ibeg,32); + +// +// Add Section 7 - Data Section +// + ibeg=iofst; // Calculate offset for beginning of section 7 + iofst=ibeg+32; // leave space for length of section + sbit(cgrib,&seven,iofst,8); // Store section number ( 7 ) + iofst=iofst+8; + // Store Packed Binary Data values, if non-constant field + if (lcpack != 0) { + ioctet=iofst/8; + //cgrib(ioctet+1:ioctet+lcpack)=cpack(1:lcpack) + for (j=0;j +#include +#include "grib2.h" + + +g2int g2_addgrid(unsigned char *cgrib,g2int *igds,g2int *igdstmpl,g2int *ideflist,g2int idefnum) +//$$$ SUBPROGRAM DOCUMENTATION BLOCK +// . . . . +// SUBPROGRAM: g2_addgrid +// PRGMMR: Gilbert ORG: W/NP11 DATE: 2002-11-01 +// +// ABSTRACT: This routine packs up a Grid Definition Section (Section 3) +// and adds it to a GRIB2 message. It is used with routines "g2_create", +// "g2_addlocal", "g2_addfield", +// and "g2_gribend" to create a complete GRIB2 message. +// g2_create must be called first to initialize a new GRIB2 message. +// +// PROGRAM HISTORY LOG: +// 2002-11-01 Gilbert +// +// USAGE: int g2_addgrid(unsigned char *cgrib,g2int *igds,g2int *igdstmpl, +// g2int *ideflist,g2int idefnum) +// INPUT ARGUMENTS: +// cgrib - Char array that contains the GRIB2 message to which +// section should be added. +// igds - Contains information needed for GRIB Grid Definition Section 3 +// Must be dimensioned >= 5. +// igds[0]=Source of grid definition (see Code Table 3.0) +// igds[1]=Number of grid points in the defined grid. +// igds[2]=Number of octets needed for each +// additional grid points definition. +// Used to define number of +// points in each row ( or column ) for +// non-regular grids. +// = 0, if using regular grid. +// igds[3]=Interpretation of list for optional points +// definition. (Code Table 3.11) +// igds[4]=Grid Definition Template Number (Code Table 3.1) +// igdstmpl - Contains the data values for the specified Grid Definition +// Template ( NN=igds[4] ). Each element of this integer +// array contains an entry (in the order specified) of Grid +// Defintion Template 3.NN +// ideflist - (Used if igds[2] != 0) This array contains the +// number of grid points contained in each row ( or column ) +// idefnum - (Used if igds[2] != 0) The number of entries +// in array ideflist. i.e. number of rows ( or columns ) +// for which optional grid points are defined. +// +// OUTPUT ARGUMENTS: +// cgrib - Char array to contain the updated GRIB2 message. +// Must be allocated large enough to store the entire +// GRIB2 message. +// +// RETURN VALUES: +// ierr - Return code. +// > 0 = Current size of updated GRIB2 message +// -1 = GRIB message was not initialized. Need to call +// routine gribcreate first. +// -2 = GRIB message already complete. Cannot add new section. +// -3 = Sum of Section byte counts doesn't add to total byte count +// -4 = Previous Section was not 1, 2 or 7. +// -5 = Could not find requested Grid Definition Template. +// +// REMARKS: Note that the Grid Def Section ( Section 3 ) can only follow +// Section 1, 2 or Section 7 in a GRIB2 message. +// +// ATTRIBUTES: +// LANGUAGE: C +// MACHINE: +// +//$$$ +{ + + g2int ierr; + static unsigned char G=0x47; // 'G' + static unsigned char R=0x52; // 'R' + static unsigned char I=0x49; // 'I' + static unsigned char B=0x42; // 'B' + static unsigned char seven=0x37; // '7' + + static g2int one=1,three=3,miss=65535; + g2int lensec3,iofst,ibeg,lencurr,len; + g2int i,j,temp,ilen,isecnum,nbits; + template *mapgrid=0; + + ierr=0; +// +// Check to see if beginning of GRIB message exists +// + if ( cgrib[0]!=G || cgrib[1]!=R || cgrib[2]!=I || cgrib[3]!=B ) { + printf("g2_addgrid: GRIB not found in given message.\n"); + printf("g2_addgrid: Call to routine gribcreate required to initialize GRIB messge.\n"); + ierr=-1; + return(ierr); + } +// +// Get current length of GRIB message +// + gbit(cgrib,&lencurr,96,32); +// +// Check to see if GRIB message is already complete +// + if ( cgrib[lencurr-4]==seven && cgrib[lencurr-3]==seven && + cgrib[lencurr-2]==seven && cgrib[lencurr-1]==seven ) { + printf("g2_addgrid: GRIB message already complete. Cannot add new section.\n"); + ierr=-2; + return(ierr); + } +// +// Loop through all current sections of the GRIB message to +// find the last section number. +// + len=16; // length of Section 0 + for (;;) { + // Get section number and length of next section + iofst=len*8; + gbit(cgrib,&ilen,iofst,32); + iofst=iofst+32; + gbit(cgrib,&isecnum,iofst,8); + len=len+ilen; + // Exit loop if last section reached + if ( len == lencurr ) break; + // If byte count for each section doesn't match current + // total length, then there is a problem. + if ( len > lencurr ) { + printf("g2_addgrid: Section byte counts don''t add to total.\n"); + printf("g2_addgrid: Sum of section byte counts = %ld\n",len); + printf("g2_addgrid: Total byte count in Section 0 = %ld\n",lencurr); + ierr=-3; + return(ierr); + } + } +// +// Section 3 can only be added after sections 1, 2 and 7. +// + if ( (isecnum!=1) && (isecnum!=2) && (isecnum!=7) ) { + printf("g2_addgrid: Section 3 can only be added after Section 1, 2 or 7.\n"); + printf("g2_addgrid: Section ',isecnum,' was the last found in given GRIB message.\n"); + ierr=-4; + return(ierr); + } +// +// Add Section 3 - Grid Definition Section +// + ibeg=lencurr*8; // Calculate offset for beginning of section 3 + iofst=ibeg+32; // leave space for length of section + sbit(cgrib,&three,iofst,8); // Store section number ( 3 ) + iofst=iofst+8; + sbit(cgrib,igds+0,iofst,8); // Store source of Grid def. + iofst=iofst+8; + sbit(cgrib,igds+1,iofst,32); // Store number of data pts. + iofst=iofst+32; + sbit(cgrib,igds+2,iofst,8); // Store number of extra octets. + iofst=iofst+8; + sbit(cgrib,igds+3,iofst,8); // Store interp. of extra octets. + iofst=iofst+8; + // if Octet 6 is not equal to zero, Grid Definition Template may + // not be supplied. + if ( igds[0] == 0 ) + sbit(cgrib,igds+4,iofst,16); // Store Grid Def Template num. + else + sbit(cgrib,&miss,iofst,16); // Store missing value as Grid Def Template num. + iofst=iofst+16; + // + // Get Grid Definition Template + // + if (igds[0] == 0) { + mapgrid=getgridtemplate(igds[4]); + if (mapgrid == 0) { // undefined template + ierr=-5; + return(ierr); + } + // + // Extend the Grid Definition Template, if necessary. + // The number of values in a specific template may vary + // depending on data specified in the "static" part of the + // template. + // + if ( mapgrid->needext ) { + free(mapgrid); + mapgrid=extgridtemplate(igds[4],igdstmpl); + } + } + // + // Pack up each input value in array igdstmpl into the + // the appropriate number of octets, which are specified in + // corresponding entries in array mapgrid. + // + for (i=0;imaplen;i++) { + nbits=abs(mapgrid->map[i])*8; + if ( (mapgrid->map[i] >= 0) || (igdstmpl[i] >= 0) ) + sbit(cgrib,igdstmpl+i,iofst,nbits); + else { + sbit(cgrib,&one,iofst,1); + temp=abs(igdstmpl[i]); + sbit(cgrib,&temp,iofst+1,nbits-1); + } + iofst=iofst+nbits; + } + // Pack template extension, if appropriate + j=mapgrid->maplen; + if ( mapgrid->needext && (mapgrid->extlen > 0) ) { + for (i=0;iextlen;i++) { + nbits=abs(mapgrid->ext[i])*8; + if ( (mapgrid->ext[i] >= 0) || (igdstmpl[j] >= 0) ) + sbit(cgrib,igdstmpl+j,iofst,nbits); + else { + sbit(cgrib,&one,iofst,1); + temp=abs(igdstmpl[j]); + sbit(cgrib,&temp,iofst+1,nbits-1); + } + iofst=iofst+nbits; + j++; + } + } + free(mapgrid); + // + // If requested, + // Insert optional list of numbers defining number of points + // in each row or column. This is used for non regular + // grids. + // + if ( igds[2] != 0 ) { + nbits=igds[2]*8; + sbits(cgrib,ideflist,iofst,nbits,0,idefnum); + iofst=iofst+(nbits*idefnum); + } + // + // Calculate length of section 3 and store it in octets + // 1-4 of section 3. + // + lensec3=(iofst-ibeg)/8; + sbit(cgrib,&lensec3,ibeg,32); + +// +// Update current byte total of message in Section 0 +// + lencurr+=lensec3; + sbit(cgrib,&lencurr,96,32); + + return(lencurr); + +} diff -Nru saga-2.1.0+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/g2_addlocal.c saga-2.1.4+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/g2_addlocal.c --- saga-2.1.0+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/g2_addlocal.c 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/g2_addlocal.c 2014-11-13 08:32:19.000000000 +0000 @@ -0,0 +1,150 @@ +/********************************************************** + * Version $Id: g2_addlocal.c 911 2011-02-14 16:38:15Z reklov_w $ + *********************************************************/ +#include +#include "grib2.h" + +g2int g2_addlocal(unsigned char *cgrib,unsigned char *csec2,g2int lcsec2) +//$$$ SUBPROGRAM DOCUMENTATION BLOCK +// . . . . +// SUBPROGRAM: g2_addlocal +// PRGMMR: Gilbert ORG: W/NP11 DATE: 2002-11-01 +// +// ABSTRACT: This routine adds a Local Use Section (Section 2) to +// a GRIB2 message. It is used with routines "g2_create", +// "g2_addgrid", "g2_addfield", +// and "g2_gribend" to create a complete GRIB2 message. +// g2_create must be called first to initialize a new GRIB2 message. +// +// PROGRAM HISTORY LOG: +// 2002-11-01 Gilbert +// +// USAGE: int g2_addlocal(unsigned char *cgrib,unsigned char *csec2, +// g2int lcsec2) +// INPUT ARGUMENTS: +// cgrib - Char array that contains the GRIB2 message to which section +// 2 should be added. +// csec2 - Character array containing information to be added in +// Section 2. +// lcsec2 - Number of bytes of character array csec2 to be added to +// Section 2. +// +// OUTPUT ARGUMENT: +// cgrib - Char array to contain the updated GRIB2 message. +// Must be allocated large enough to store the entire +// GRIB2 message. +// +// RETURN VALUES: +// ierr - Return code. +// > 0 = Current size of updated GRIB2 message +// -1 = GRIB message was not initialized. Need to call +// routine gribcreate first. +// -2 = GRIB message already complete. Cannot add new section. +// -3 = Sum of Section byte counts doesn't add to total byte count +// -4 = Previous Section was not 1 or 7. +// +// REMARKS: Note that the Local Use Section ( Section 2 ) can only follow +// Section 1 or Section 7 in a GRIB2 message. +// +// ATTRIBUTES: +// LANGUAGE: C +// MACHINE: +// +//$$$ +{ + + g2int ierr; + static unsigned char G=0x47; // 'G' + static unsigned char R=0x52; // 'R' + static unsigned char I=0x49; // 'I' + static unsigned char B=0x42; // 'B' + static unsigned char seven=0x37; // '7' + + static g2int two=2; + g2int j,k,lensec2,iofst,ibeg,lencurr,ilen,len,istart; + g2int isecnum; + + ierr=0; +// +// Check to see if beginning of GRIB message exists +// + if ( cgrib[0]!=G || cgrib[1]!=R || cgrib[2]!=I || cgrib[3]!=B ) { + printf("g2_addlocal: GRIB not found in given message.\n"); + printf("g2_addlocal: Call to routine g2_create required to initialize GRIB messge.\n"); + ierr=-1; + return(ierr); + } +// +// Get current length of GRIB message +// + gbit(cgrib,&lencurr,96,32); +// +// Check to see if GRIB message is already complete +// + if ( cgrib[lencurr-4]==seven && cgrib[lencurr-3]==seven && + cgrib[lencurr-2]==seven && cgrib[lencurr-1]==seven ) { + printf("g2_addlocal: GRIB message already complete. Cannot add new section.\n"); + ierr=-2; + return(ierr); + } +// +// Loop through all current sections of the GRIB message to +// find the last section number. +// + len=16; // length of Section 0 + for (;;) { + // Get section number and length of next section + iofst=len*8; + gbit(cgrib,&ilen,iofst,32); + iofst=iofst+32; + gbit(cgrib,&isecnum,iofst,8); + len=len+ilen; + // Exit loop if last section reached + if ( len == lencurr ) break; + // If byte count for each section doesn't match current + // total length, then there is a problem. + if ( len > lencurr ) { + printf("g2_addlocal: Section byte counts don't add to total.\n"); + printf("g2_addlocal: Sum of section byte counts = %ld\n",len); + printf("g2_addlocal: Total byte count in Section 0 = %ld\n",lencurr); + ierr=-3; + return(ierr); + } + } +// +// Section 2 can only be added after sections 1 and 7. +// + if ( (isecnum!=1) && (isecnum!=7) ) { + printf("g2_addlocal: Section 2 can only be added after Section 1 or Section 7.\n"); + printf("g2_addlocal: Section %ld was the last found in given GRIB message.\n",isecnum); + ierr=-4; + return(ierr); + } +// +// Add Section 2 - Local Use Section +// + ibeg=lencurr*8; // Calculate offset for beginning of section 2 + iofst=ibeg+32; // leave space for length of section + sbit(cgrib,&two,iofst,8); // Store section number ( 2 ) + istart=lencurr+5; + //cgrib(istart+1:istart+lcsec2)=csec2(1:lcsec2) + k=0; + for (j=istart;j +#include "grib2.h" + +#define MAPSEC1LEN 13 + +g2int g2_create(unsigned char *cgrib,g2int *listsec0,g2int *listsec1) +//$$$ SUBPROGRAM DOCUMENTATION BLOCK +// . . . . +// SUBPROGRAM: g2_create +// PRGMMR: Gilbert ORG: W/NP11 DATE: 2002-10-31 +// +// ABSTRACT: This routine initializes a new GRIB2 message and packs +// GRIB2 sections 0 (Indicator Section) and 1 (Identification Section). +// This routine is used with routines "g2_addlocal", "g2_addgrid", +// "g2_addfield", and "g2_gribend" to create a complete GRIB2 message. +// g2_create must be called first to initialize a new GRIB2 message. +// Also, a call to g2_gribend is required to complete GRIB2 message +// after all fields have been added. +// +// PROGRAM HISTORY LOG: +// 2002-10-31 Gilbert +// +// USAGE: int g2_create(unsigned char *cgrib,g2int *listsec0,g2int *listsec1) +// INPUT ARGUMENTS: +// cgrib - Character array to contain the GRIB2 message +// listsec0 - Contains information needed for GRIB Indicator Section 0. +// Must be dimensioned >= 2. +// listsec0[0]=Discipline-GRIB Master Table Number +// (see Code Table 0.0) +// listsec0[1]=GRIB Edition Number (currently 2) +// listsec1 - Contains information needed for GRIB Identification Section 1. +// Must be dimensioned >= 13. +// listsec1[0]=Id of orginating centre (Common Code Table C-1) +// listsec1[1]=Id of orginating sub-centre (local table) +// listsec1[2]=GRIB Master Tables Version Number (Code Table 1.0) +// listsec1[3]=GRIB Local Tables Version Number (Code Table 1.1) +// listsec1[4]=Significance of Reference Time (Code Table 1.2) +// listsec1[5]=Reference Time - Year (4 digits) +// listsec1[6]=Reference Time - Month +// listsec1[7]=Reference Time - Day +// listsec1[8]=Reference Time - Hour +// listsec1[9]=Reference Time - Minute +// listsec1[10]=Reference Time - Second +// listsec1[11]=Production status of data (Code Table 1.3) +// listsec1[12]=Type of processed data (Code Table 1.4) +// +// OUTPUT ARGUMENTS: +// cgrib - Char array to contain the new GRIB2 message. +// Must be allocated large enough to store the entire +// GRIB2 message. +// +// RETURN VALUES: +// ierr - return code. +// > 0 = Current size of new GRIB2 message +// -1 = Tried to use for version other than GRIB Edition 2 +// +// REMARKS: This routine is intended for use with routines "g2_addlocal", +// "g2_addgrid", "g2_addfield", and "g2_gribend" to create a complete +// GRIB2 message. +// +// ATTRIBUTES: +// LANGUAGE: C +// MACHINE: +// +//$$$ +{ + + g2int ierr; + g2int zero=0,one=1; + g2int mapsec1len=MAPSEC1LEN; + g2int mapsec1[MAPSEC1LEN]={ 2,2,1,1,1,2,1,1,1,1,1,1,1 }; + g2int i,lensec0,lensec1,iofst,ibeg,nbits,len; + + ierr=0; +// +// Currently handles only GRIB Edition 2. +// + if (listsec0[1] != 2) { + printf("g2_create: can only code GRIB edition 2."); + ierr=-1; + return (ierr); + } +// +// Pack Section 0 - Indicator Section +// ( except for total length of GRIB message ) +// + cgrib[0]=0x47; // 'G' // Beginning of GRIB message + cgrib[1]=0x52; // 'R' + cgrib[2]=0x49; // 'I' + cgrib[3]=0x42; // 'B' + sbit(cgrib,&zero,32,16); // reserved for future use + sbit(cgrib,listsec0+0,48,8); // Discipline + sbit(cgrib,listsec0+1,56,8); // GRIB edition number + lensec0=16; // bytes (octets) +// +// Pack Section 1 - Identification Section +// + ibeg=lensec0*8; // Calculate offset for beginning of section 1 + iofst=ibeg+32; // leave space for length of section + sbit(cgrib,&one,iofst,8); // Store section number ( 1 ) + iofst=iofst+8; + // + // Pack up each input value in array listsec1 into the + // the appropriate number of octets, which are specified in + // corresponding entries in array mapsec1. + // + for (i=0;i +#include "grib2.h" + +void g2_free(gribfield *gfld) +//$$$ SUBPROGRAM DOCUMENTATION BLOCK +// . . . . +// SUBPROGRAM: g2_free +// PRGMMR: Gilbert ORG: W/NP11 DATE: 2002-10-28 +// +// ABSTRACT: This routine frees up memory that was allocated for +// struct gribfield. +// +// PROGRAM HISTORY LOG: +// 2002-10-28 Gilbert +// +// USAGE: g2_free(gribfield *gfld) +// ARGUMENT: +// gfld - pointer to gribfield structure (defined in include file grib2.h) +// returned from routine g2_getfld. +// +// REMARKS: This routine must be called to free up memory used by +// the decode routine, g2_getfld, when user no longer needs to +// reference this data. +// +// ATTRIBUTES: +// LANGUAGE: C +// MACHINE: +// +//$$$ +{ + + if (gfld->idsect != 0 ) free(gfld->idsect); + if (gfld->local != 0 ) free(gfld->local); + if (gfld->list_opt != 0 ) free(gfld->list_opt); + if (gfld->igdtmpl != 0 ) free(gfld->igdtmpl); + if (gfld->ipdtmpl != 0 ) free(gfld->ipdtmpl); + if (gfld->coord_list != 0 ) free(gfld->coord_list); + if (gfld->idrtmpl != 0 ) free(gfld->idrtmpl); + if (gfld->bmap != 0 ) free(gfld->bmap); + if (gfld->fld != 0 ) free(gfld->fld); + free(gfld); + + return; +} diff -Nru saga-2.1.0+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/g2_getfld.c saga-2.1.4+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/g2_getfld.c --- saga-2.1.0+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/g2_getfld.c 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/g2_getfld.c 2014-11-13 08:32:19.000000000 +0000 @@ -0,0 +1,553 @@ +/********************************************************** + * Version $Id: g2_getfld.c 911 2011-02-14 16:38:15Z reklov_w $ + *********************************************************/ +#include +#include +#include "grib2.h" + +g2int g2_unpack1(unsigned char *,g2int *,g2int **,g2int *); +g2int g2_unpack2(unsigned char *,g2int *,g2int *,unsigned char **); +g2int g2_unpack3(unsigned char *,g2int *,g2int **,g2int **, + g2int *,g2int **,g2int *); +g2int g2_unpack4(unsigned char *,g2int *,g2int *,g2int **, + g2int *,g2float **,g2int *); +g2int g2_unpack5(unsigned char *,g2int *,g2int *,g2int *, g2int **,g2int *); +g2int g2_unpack6(unsigned char *,g2int *,g2int ,g2int *, g2int **); +g2int g2_unpack7(unsigned char *,g2int *,g2int ,g2int *, + g2int ,g2int *,g2int ,g2float **); + +g2int g2_getfld(unsigned char *cgrib,g2int ifldnum,g2int unpack,g2int expand, + gribfield **gfld) +//$$$ SUBPROGRAM DOCUMENTATION BLOCK +// . . . . +// SUBPROGRAM: g2_getfld +// PRGMMR: Gilbert ORG: W/NP11 DATE: 2002-10-28 +// +// ABSTRACT: This subroutine returns all the metadata, template values, +// Bit-map ( if applicable ), and the unpacked data for a given data +// field. All of the information returned is stored in a gribfield +// structure, which is defined in file grib2.h. +// Users of this routine will need to include "grib2.h" in their source +// code that calls this routine. Each component of the gribfield +// struct is also described in the OUTPUT ARGUMENTS section below. +// +// Since there can be multiple data fields packed into a GRIB2 +// message, the calling routine indicates which field is being requested +// with the ifldnum argument. +// +// PROGRAM HISTORY LOG: +// 2002-10-28 Gilbert +// +// USAGE: #include "grib2.h" +// int g2_getfld(unsigned char *cgrib,g2int ifldnum,g2int unpack, +// g2int expand,gribfield **gfld) +// INPUT ARGUMENTS: +// cgrib - Character pointer to the GRIB2 message +// ifldnum - Specifies which field in the GRIB2 message to return. +// unpack - Boolean value indicating whether to unpack bitmap/data field +// 1 = unpack bitmap (if present) and data values +// 0 = do not unpack bitmap and data values +// expand - Boolean value indicating whether the data points should be +// expanded to the correspond grid, if a bit-map is present. +// 1 = if possible, expand data field to grid, inserting zero +// values at gridpoints that are bitmapped out. +// (SEE REMARKS2) +// 0 = do not expand data field, leaving it an array of +// consecutive data points for each "1" in the bitmap. +// This argument is ignored if unpack == 0 OR if the +// returned field does not contain a bit-map. +// +// OUTPUT ARGUMENT: +// gribfield gfld; - pointer to structure gribfield containing +// all decoded data for the data field. +// +// gfld->version = GRIB edition number ( currently 2 ) +// gfld->discipline = Message Discipline ( see Code Table 0.0 ) +// gfld->idsect = Contains the entries in the Identification +// Section ( Section 1 ) +// This element is a pointer to an array +// that holds the data. +// gfld->idsect[0] = Identification of originating Centre +// ( see Common Code Table C-1 ) +// 7 - US National Weather Service +// gfld->idsect[1] = Identification of originating Sub-centre +// gfld->idsect[2] = GRIB Master Tables Version Number +// ( see Code Table 1.0 ) +// 0 - Experimental +// 1 - Initial operational version number +// gfld->idsect[3] = GRIB Local Tables Version Number +// ( see Code Table 1.1 ) +// 0 - Local tables not used +// 1-254 - Number of local tables version used +// gfld->idsect[4] = Significance of Reference Time (Code Table 1.2) +// 0 - Analysis +// 1 - Start of forecast +// 2 - Verifying time of forecast +// 3 - Observation time +// gfld->idsect[5] = Year ( 4 digits ) +// gfld->idsect[6] = Month +// gfld->idsect[7) = Day +// gfld->idsect[8] = Hour +// gfld->idsect[9] = Minute +// gfld->idsect[10] = Second +// gfld->idsect[11] = Production status of processed data +// ( see Code Table 1.3 ) +// 0 - Operational products +// 1 - Operational test products +// 2 - Research products +// 3 - Re-analysis products +// gfld->idsect[12] = Type of processed data ( see Code Table 1.4 ) +// 0 - Analysis products +// 1 - Forecast products +// 2 - Analysis and forecast products +// 3 - Control forecast products +// 4 - Perturbed forecast products +// 5 - Control and perturbed forecast products +// 6 - Processed satellite observations +// 7 - Processed radar observations +// gfld->idsectlen = Number of elements in gfld->idsect[]. +// gfld->local = Pointer to character array containing contents +// of Local Section 2, if included +// gfld->locallen = length of array gfld->local[] +// gfld->ifldnum = field number within GRIB message +// gfld->griddef = Source of grid definition (see Code Table 3.0) +// 0 - Specified in Code table 3.1 +// 1 - Predetermined grid Defined by originating centre +// gfld->ngrdpts = Number of grid points in the defined grid. +// gfld->numoct_opt = Number of octets needed for each +// additional grid points definition. +// Used to define number of +// points in each row ( or column ) for +// non-regular grids. +// = 0, if using regular grid. +// gfld->interp_opt = Interpretation of list for optional points +// definition. (Code Table 3.11) +// gfld->igdtnum = Grid Definition Template Number (Code Table 3.1) +// gfld->igdtmpl = Contains the data values for the specified Grid +// Definition Template ( NN=gfld->igdtnum ). Each +// element of this integer array contains an entry (in +// the order specified) of Grid Defintion Template 3.NN +// This element is a pointer to an array +// that holds the data. +// gfld->igdtlen = Number of elements in gfld->igdtmpl[]. i.e. number of +// entries in Grid Defintion Template 3.NN +// ( NN=gfld->igdtnum ). +// gfld->list_opt = (Used if gfld->numoct_opt .ne. 0) This array +// contains the number of grid points contained in +// each row ( or column ). (part of Section 3) +// This element is a pointer to an array +// that holds the data. This pointer is nullified +// if gfld->numoct_opt=0. +// gfld->num_opt = (Used if gfld->numoct_opt .ne. 0) +// The number of entries +// in array ideflist. i.e. number of rows ( or columns ) +// for which optional grid points are defined. This value +// is set to zero, if gfld->numoct_opt=0. +// gfdl->ipdtnum = Product Definition Template Number(see Code Table 4.0) +// gfld->ipdtmpl = Contains the data values for the specified Product +// Definition Template ( N=gfdl->ipdtnum ). Each element +// of this integer array contains an entry (in the +// order specified) of Product Defintion Template 4.N. +// This element is a pointer to an array +// that holds the data. +// gfld->ipdtlen = Number of elements in gfld->ipdtmpl[]. i.e. number of +// entries in Product Defintion Template 4.N +// ( N=gfdl->ipdtnum ). +// gfld->coord_list = Real array containing floating point values +// intended to document the vertical discretisation +// associated to model data on hybrid coordinate +// vertical levels. (part of Section 4) +// This element is a pointer to an array +// that holds the data. +// gfld->num_coord = number of values in array gfld->coord_list[]. +// gfld->ndpts = Number of data points unpacked and returned. +// gfld->idrtnum = Data Representation Template Number +// ( see Code Table 5.0) +// gfld->idrtmpl = Contains the data values for the specified Data +// Representation Template ( N=gfld->idrtnum ). Each +// element of this integer array contains an entry +// (in the order specified) of Product Defintion +// Template 5.N. +// This element is a pointer to an array +// that holds the data. +// gfld->idrtlen = Number of elements in gfld->idrtmpl[]. i.e. number +// of entries in Data Representation Template 5.N +// ( N=gfld->idrtnum ). +// gfld->unpacked = logical value indicating whether the bitmap and +// data values were unpacked. If false, +// gfld->bmap and gfld->fld pointers are nullified. +// gfld->expanded = Logical value indicating whether the data field +// was expanded to the grid in the case where a +// bit-map is present. If true, the data points in +// gfld->fld match the grid points and zeros were +// inserted at grid points where data was bit-mapped +// out. If false, the data values in gfld->fld were +// not expanded to the grid and are just a consecutive +// array of data points corresponding to each value of +// "1" in gfld->bmap. +// gfld->ibmap = Bitmap indicator ( see Code Table 6.0 ) +// 0 = bitmap applies and is included in Section 6. +// 1-253 = Predefined bitmap applies +// 254 = Previously defined bitmap applies to this field +// 255 = Bit map does not apply to this product. +// gfld->bmap = integer array containing decoded bitmap, +// if gfld->ibmap=0 or gfld->ibap=254. Otherwise nullified +// This element is a pointer to an array +// that holds the data. +// gfld->fld = Array of gfld->ndpts unpacked data points. +// This element is a pointer to an array +// that holds the data. +// +// +// RETURN VALUES: +// ierr - Error return code. +// 0 = no error +// 1 = Beginning characters "GRIB" not found. +// 2 = GRIB message is not Edition 2. +// 3 = The data field request number was not positive. +// 4 = End string "7777" found, but not where expected. +// 6 = GRIB message did not contain the requested number of +// data fields. +// 7 = End string "7777" not found at end of message. +// 8 = Unrecognized Section encountered. +// 9 = Data Representation Template 5.NN not yet implemented. +// 15 = Error unpacking Section 1. +// 16 = Error unpacking Section 2. +// 10 = Error unpacking Section 3. +// 11 = Error unpacking Section 4. +// 12 = Error unpacking Section 5. +// 13 = Error unpacking Section 6. +// 14 = Error unpacking Section 7. +// 17 = Previous bitmap specified, yet none exists. +// +// REMARKS: Note that struct gribfield is allocated by this routine and it +// also contains pointers to many arrays of data that were allocated +// during decoding. Users are encouraged to free up this memory, +// when it is no longer needed, by an explicit call to routine g2_free. +// EXAMPLE: +// #include "grib2.h" +// gribfield *gfld; +// ret=g2_getfld(cgrib,1,1,1,&gfld); +// ... +// g2_free(gfld); +// +// Routine g2_info can be used to first determine +// how many data fields exist in a given GRIB message. +// +// REMARKS2: It may not always be possible to expand a bit-mapped data field. +// If a pre-defined bit-map is used and not included in the GRIB2 +// message itself, this routine would not have the necessary +// information to expand the data. In this case, gfld->expanded would +// would be set to 0 (false), regardless of the value of input +// argument expand. +// +// ATTRIBUTES: +// LANGUAGE: C +// MACHINE: +// +//$$$ +{ + + g2int have3,have4,have5,have6,have7,ierr,jerr; + g2int numfld,j,n,istart,iofst,ipos; + g2int disc,ver,lensec0,lengrib,lensec,isecnum; + g2int *igds; + g2int *bmpsave; + g2float *newfld; + gribfield *lgfld; + + have3=0; + have4=0; + have5=0; + have6=0; + have7=0; + ierr=0; + numfld=0; + + lgfld=(gribfield *)malloc(sizeof(gribfield)); + *gfld=lgfld; + + lgfld->locallen=0; + lgfld->idsect=0; + lgfld->local=0; + lgfld->list_opt=0; + lgfld->igdtmpl=0; + lgfld->ipdtmpl=0; + lgfld->idrtmpl=0; + lgfld->coord_list=0; + lgfld->bmap=0; + lgfld->fld=0; +// +// Check for valid request number +// + if (ifldnum <= 0) { + printf("g2_getfld: Request for field number must be positive.\n"); + ierr=3; + return(ierr); + } +// +// Check for beginning of GRIB message in the first 100 bytes +// + istart=-1; + for (j=0;j<100;j++) { + if (cgrib[j]=='G' && cgrib[j+1]=='R' &&cgrib[j+2]=='I' && + cgrib[j+3]=='B') { + istart=j; + break; + } + } + if (istart == -1) { + printf("g2_getfld: Beginning characters GRIB not found.\n"); + ierr=1; + return(ierr); + } +// +// Unpack Section 0 - Indicator Section +// + iofst=8*(istart+6); + gbit(cgrib,&disc,iofst,8); // Discipline + iofst=iofst+8; + gbit(cgrib,&ver,iofst,8); // GRIB edition number + iofst=iofst+8; + iofst=iofst+32; + gbit(cgrib,&lengrib,iofst,32); // Length of GRIB message + iofst=iofst+32; + lensec0=16; + ipos=istart+lensec0; +// +// Currently handles only GRIB Edition 2. +// + if (ver != 2) { + printf("g2_getfld: can only decode GRIB edition 2.\n"); + ierr=2; + return(ierr); + } +// +// Loop through the remaining sections keeping track of the +// length of each. Also keep the latest Grid Definition Section info. +// Unpack the requested field number. +// + for (;;) { + // Check to see if we are at end of GRIB message + if (cgrib[ipos]=='7' && cgrib[ipos+1]=='7' && cgrib[ipos+2]=='7' && + cgrib[ipos+3]=='7') { + ipos=ipos+4; + // If end of GRIB message not where expected, issue error + if (ipos != (istart+lengrib)) { + printf("g2_getfld: '7777' found, but not where expected.\n"); + ierr=4; + return(ierr); + } + break; + } + // Get length of Section and Section number + iofst=(ipos-1)*8; + iofst=ipos*8; + gbit(cgrib,&lensec,iofst,32); // Get Length of Section + iofst=iofst+32; + gbit(cgrib,&isecnum,iofst,8); // Get Section number + iofst=iofst+8; + //printf(" lensec= %ld secnum= %ld \n",lensec,isecnum); + // + // Check to see if section number is valid + // + if ( isecnum<1 || isecnum>7 ) { + printf("g2_getfld: Unrecognized Section Encountered=%ld\n",isecnum); + ierr=8; + return(ierr); + } + // + // If found Section 1, decode elements in Identification Section + // + if (isecnum == 1) { + iofst=iofst-40; // reset offset to beginning of section + jerr=g2_unpack1(cgrib,&iofst,&lgfld->idsect,&lgfld->idsectlen); + if (jerr !=0 ) { + ierr=15; + return(ierr); + } + } + // + // If found Section 2, Grab local section + // Save in case this is the latest one before the requested field. + // + if (isecnum == 2) { + iofst=iofst-40; // reset offset to beginning of section + if (lgfld->local!=0) free(lgfld->local); + jerr=g2_unpack2(cgrib,&iofst,&lgfld->locallen,&lgfld->local); + if (jerr != 0) { + ierr=16; + return(ierr); + } + } + // + // If found Section 3, unpack the GDS info using the + // appropriate template. Save in case this is the latest + // grid before the requested field. + // + if (isecnum == 3) { + iofst=iofst-40; // reset offset to beginning of section + if (lgfld->igdtmpl!=0) free(lgfld->igdtmpl); + if (lgfld->list_opt!=0) free(lgfld->list_opt); + jerr=g2_unpack3(cgrib,&iofst,&igds,&lgfld->igdtmpl, + &lgfld->igdtlen,&lgfld->list_opt,&lgfld->num_opt); + if (jerr == 0) { + have3=1; + lgfld->griddef=igds[0]; + lgfld->ngrdpts=igds[1]; + lgfld->numoct_opt=igds[2]; + lgfld->interp_opt=igds[3]; + lgfld->igdtnum=igds[4]; + } + else { + ierr=10; + return(ierr); + } + } + // + // If found Section 4, check to see if this field is the + // one requested. + // + if (isecnum == 4) { + numfld=numfld+1; + if (numfld == ifldnum) { + lgfld->discipline=disc; + lgfld->version=ver; + lgfld->ifldnum=ifldnum; + lgfld->unpacked=unpack; + lgfld->expanded=0; + iofst=iofst-40; // reset offset to beginning of section + jerr=g2_unpack4(cgrib,&iofst,&lgfld->ipdtnum, + &lgfld->ipdtmpl,&lgfld->ipdtlen,&lgfld->coord_list, + &lgfld->num_coord); + if (jerr == 0) + have4=1; + else { + ierr=11; + return(ierr); + } + } + } + // + // If found Section 5, check to see if this field is the + // one requested. + // + if (isecnum == 5 && numfld == ifldnum) { + iofst=iofst-40; // reset offset to beginning of section + jerr=g2_unpack5(cgrib,&iofst,&lgfld->ndpts,&lgfld->idrtnum, + &lgfld->idrtmpl,&lgfld->idrtlen); + if (jerr == 0) + have5=1; + else { + ierr=12; + return(ierr); + } + } + // + // If found Section 6, Unpack bitmap. + // Save in case this is the latest + // bitmap before the requested field. + // + if (isecnum == 6) { + if (unpack) { // unpack bitmap + iofst=iofst-40; // reset offset to beginning of section + bmpsave=lgfld->bmap; // save pointer to previous bitmap + jerr=g2_unpack6(cgrib,&iofst,lgfld->ngrdpts,&lgfld->ibmap, + &lgfld->bmap); + if (jerr == 0) { + have6=1; + if (lgfld->ibmap == 254) // use previously specified bitmap + if( bmpsave!=0 ) + lgfld->bmap=bmpsave; + else { + printf("g2_getfld: Prev bit-map specified, but none exist.\n"); + ierr=17; + return(ierr); + } + else // get rid of it + if( bmpsave!=0 ) free(bmpsave); + } + else { + ierr=13; + return(ierr); + } + } + else { // do not unpack bitmap + gbit(cgrib,&lgfld->ibmap,iofst,8); // Get BitMap Indicator + have6=1; + } + } + // + // If found Section 7, check to see if this field is the + // one requested. + // + if (isecnum==7 && numfld==ifldnum && unpack) { + iofst=iofst-40; // reset offset to beginning of section + jerr=g2_unpack7(cgrib,&iofst,lgfld->igdtnum,lgfld->igdtmpl, + lgfld->idrtnum,lgfld->idrtmpl,lgfld->ndpts, + &lgfld->fld); + if (jerr == 0) { + have7=1; + // If bitmap is used with this field, expand data field + // to grid, if possible. + if ( lgfld->ibmap != 255 && lgfld->bmap != 0 ) { + if ( expand == 1 ) { + n=0; + newfld=(g2float *)calloc(lgfld->ngrdpts,sizeof(g2float)); + for (j=0;jngrdpts;j++) { + if (lgfld->bmap[j]==1) newfld[j]=lgfld->fld[n++]; + } + free(lgfld->fld); + lgfld->fld=newfld; + lgfld->expanded=1; + } + else { + lgfld->expanded=0; + } + } + else { + lgfld->expanded=1; + } + } + else { + printf("g2_getfld: return from g2_unpack7 = %d \n",(int)jerr); + ierr=14; + return(ierr); + } + } + // + // Check to see if we read pass the end of the GRIB + // message and missed the terminator string '7777'. + // + ipos=ipos+lensec; // Update beginning of section pointer + if (ipos > (istart+lengrib)) { + printf("g2_getfld: '7777' not found at end of GRIB message.\n"); + ierr=7; + return(ierr); + } + // + // If unpacking requested, return when all sections have been + // processed + // + if (unpack && have3 && have4 && have5 && have6 && have7) + return(ierr); + // + // If unpacking is not requested, return when sections + // 3 through 6 have been processed + // + if ((! unpack) && have3 && have4 && have5 && have6) + return(ierr); + + } + +// +// If exited from above loop, the end of the GRIB message was reached +// before the requested field was found. +// + printf("g2_getfld: GRIB message contained %ld different fields.\n",numfld); + printf("g2_getfld: The request was for field %ld.\n",ifldnum); + ierr=6; + + return(ierr); + +} diff -Nru saga-2.1.0+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/g2_gribend.c saga-2.1.4+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/g2_gribend.c --- saga-2.1.0+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/g2_gribend.c 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/g2_gribend.c 2014-11-13 08:32:19.000000000 +0000 @@ -0,0 +1,125 @@ +/********************************************************** + * Version $Id: g2_gribend.c 911 2011-02-14 16:38:15Z reklov_w $ + *********************************************************/ +#include +#include "grib2.h" + +g2int g2_gribend(unsigned char *cgrib) +//$$$ SUBPROGRAM DOCUMENTATION BLOCK +// . . . . +// SUBPROGRAM: g2_gribend +// PRGMMR: Gilbert ORG: W/NP11 DATE: 2002-10-31 +// +// ABSTRACT: This routine finalizes a GRIB2 message after all grids +// and fields have been added. It adds the End Section ( "7777" ) +// to the end of the GRIB message and calculates the length and stores +// it in the appropriate place in Section 0. +// This routine is used with routines "g2_create", "g2_addlocal", +// "g2_addgrid", and "g2_addfield" to create a complete GRIB2 message. +// g2_create must be called first to initialize a new GRIB2 message. +// +// PROGRAM HISTORY LOG: +// 2002-10-31 Gilbert +// +// USAGE: int g2_gribend(unsigned char *cgrib) +// INPUT ARGUMENT: +// cgrib - Char array containing all the data sections added +// be previous calls to g2_create, g2_addlocal, g2_addgrid, +// and g2_addfield. +// +// OUTPUT ARGUMENTS: +// cgrib - Char array containing the finalized GRIB2 message +// +// RETURN VALUES: +// ierr - Return code. +// > 0 = Length of the final GRIB2 message in bytes. +// -1 = GRIB message was not initialized. Need to call +// routine g2_create first. +// -2 = GRIB message already complete. +// -3 = Sum of Section byte counts doesn't add to total byte count +// -4 = Previous Section was not 7. +// +// REMARKS: This routine is intended for use with routines "g2_create", +// "g2_addlocal", "g2_addgrid", and "g2_addfield" to create a complete +// GRIB2 message. +// +// ATTRIBUTES: +// LANGUAGE: C +// MACHINE: +// +//$$$ +{ + + g2int iofst,lencurr,len,ilen,isecnum; + g2int ierr,lengrib; + static unsigned char G=0x47; // 'G' + static unsigned char R=0x52; // 'R' + static unsigned char I=0x49; // 'I' + static unsigned char B=0x42; // 'B' + static unsigned char seven=0x37; // '7' + + ierr=0; +// +// Check to see if beginning of GRIB message exists +// + if ( cgrib[0]!=G || cgrib[1]!=R || cgrib[2]!=I || cgrib[3]!=B ) { + printf("g2_gribend: GRIB not found in given message.\n"); + ierr=-1; + return (ierr); + } +// +// Get current length of GRIB message +// + gbit(cgrib,&lencurr,96,32); +// +// Loop through all current sections of the GRIB message to +// find the last section number. +// + len=16; // Length of Section 0 + for (;;) { + // Get number and length of next section + iofst=len*8; + gbit(cgrib,&ilen,iofst,32); + iofst=iofst+32; + gbit(cgrib,&isecnum,iofst,8); + len=len+ilen; + // Exit loop if last section reached + if ( len == lencurr ) break; + // If byte count for each section doesn't match current + // total length, then there is a problem. + if ( len > lencurr ) { + printf("g2_gribend: Section byte counts don''t add to total.\n"); + printf("g2_gribend: Sum of section byte counts = %d\n",(int)len); + printf("g2_gribend: Total byte count in Section 0 = %d\n",(int)lencurr); + ierr=-3; + return (ierr); + } + } +// +// Can only add End Section (Section 8) after Section 7. +// + if ( isecnum != 7 ) { + printf("g2_gribend: Section 8 can only be added after Section 7.\n"); + printf("g2_gribend: Section %ld was the last found in given GRIB message.\n",isecnum); + ierr=-4; + return (ierr); + } +// +// Add Section 8 - End Section +// + //cgrib(lencurr+1:lencurr+4)=c7777 + cgrib[lencurr]=seven; + cgrib[lencurr+1]=seven; + cgrib[lencurr+2]=seven; + cgrib[lencurr+3]=seven; + +// +// Update current byte total of message in Section 0 +// + lengrib=lencurr+4; + sbit(cgrib,&lengrib,96,32); + + return (lengrib); + +} + diff -Nru saga-2.1.0+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/g2_info.c saga-2.1.4+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/g2_info.c --- saga-2.1.0+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/g2_info.c 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/g2_info.c 2014-11-13 08:32:19.000000000 +0000 @@ -0,0 +1,193 @@ +/********************************************************** + * Version $Id: g2_info.c 911 2011-02-14 16:38:15Z reklov_w $ + *********************************************************/ +#include +#include +#include "grib2.h" + +g2int g2_info(unsigned char *cgrib,g2int *listsec0,g2int *listsec1, + g2int *numfields,g2int *numlocal) +//$$$ SUBPROGRAM DOCUMENTATION BLOCK +// . . . . +// SUBPROGRAM: g2_info +// PRGMMR: Gilbert ORG: W/NP11 DATE: 2002-10-28 +// +// ABSTRACT: This subroutine searches through a GRIB2 message and +// returns the number of gridded fields found in the message and +// the number (and maximum size) of Local Use Sections. +// Also various checks are performed +// to see if the message is a valid GRIB2 message. +// +// PROGRAM HISTORY LOG: +// 2002-10-28 Gilbert +// +// USAGE: int g2_info(unsigned char *cgrib,g2int *listsec0,g2int *listsec1, +// g2int *numfields,g2int *numlocal) +// INPUT ARGUMENT: +// cgrib - Character pointer to the GRIB2 message +// +// OUTPUT ARGUMENTS: +// listsec0 - pointer to an array containing information decoded from +// GRIB Indicator Section 0. +// Must be allocated with >= 3 elements. +// listsec0[0]=Discipline-GRIB Master Table Number +// (see Code Table 0.0) +// listsec0[1]=GRIB Edition Number (currently 2) +// listsec0[2]=Length of GRIB message +// listsec1 - pointer to an array containing information read from GRIB +// Identification Section 1. +// Must be allocated with >= 13 elements. +// listsec1[0]=Id of orginating centre (Common Code Table C-1) +// listsec1[1]=Id of orginating sub-centre (local table) +// listsec1[2]=GRIB Master Tables Version Number (Code Table 1.0) +// listsec1[3]=GRIB Local Tables Version Number +// listsec1[4]=Significance of Reference Time (Code Table 1.1) +// listsec1[5]=Reference Time - Year (4 digits) +// listsec1[6]=Reference Time - Month +// listsec1[7]=Reference Time - Day +// listsec1[8]=Reference Time - Hour +// listsec1[9]=Reference Time - Minute +// listsec1[10]=Reference Time - Second +// listsec1[11]=Production status of data (Code Table 1.2) +// listsec1[12]=Type of processed data (Code Table 1.3) +// numfields- The number of gridded fields found in the GRIB message. +// That is, the number of occurences of Sections 4 - 7. +// numlocal - The number of Local Use Sections ( Section 2 ) found in +// the GRIB message. +// +// RETURN VALUES: +// ierr - Error return code. +// 0 = no error +// 1 = Beginning characters "GRIB" not found. +// 2 = GRIB message is not Edition 2. +// 3 = Could not find Section 1, where expected. +// 4 = End string "7777" found, but not where expected. +// 5 = End string "7777" not found at end of message. +// 6 = Invalid section number found. +// +// REMARKS: None +// +// ATTRIBUTES: +// LANGUAGE: C +// MACHINE: +// +//$$$ +{ + + g2int ierr,mapsec1len=13; + g2int mapsec1[13]={2,2,1,1,1,2,1,1,1,1,1,1,1}; + g2int i,j,istart,iofst,lengrib,lensec0,lensec1; + g2int ipos,isecnum,nbits,lensec; + + ierr=0; + *numlocal=0; + *numfields=0; +// +// Check for beginning of GRIB message in the first 100 bytes +// + istart=-1; + for (j=0;j<100;j++) { + if (cgrib[j]=='G' && cgrib[j+1]=='R' &&cgrib[j+2]=='I' && + cgrib[j+3]=='B') { + istart=j; + break; + } + } + if (istart == -1) { + printf("g2_info: Beginning characters GRIB not found."); + ierr=1; + return(ierr); + } +// +// Unpack Section 0 - Indicator Section +// + iofst=8*(istart+6); + gbit(cgrib,listsec0+0,iofst,8); // Discipline + iofst=iofst+8; + gbit(cgrib,listsec0+1,iofst,8); // GRIB edition number + iofst=iofst+8; + iofst=iofst+32; + gbit(cgrib,&lengrib,iofst,32); // Length of GRIB message + iofst=iofst+32; + listsec0[2]=lengrib; + lensec0=16; + ipos=istart+lensec0; +// +// Currently handles only GRIB Edition 2. +// + if (listsec0[1] != 2) { + printf("g2_info: can only decode GRIB edition 2."); + ierr=2; + return(ierr); + } +// +// Unpack Section 1 - Identification Section +// + gbit(cgrib,&lensec1,iofst,32); // Length of Section 1 + iofst=iofst+32; + gbit(cgrib,&isecnum,iofst,8); // Section number ( 1 ) + iofst=iofst+8; + if (isecnum != 1) { + printf("g2_info: Could not find section 1."); + ierr=3; + return(ierr); + } + // + // Unpack each input value in array listsec1 into the + // the appropriate number of octets, which are specified in + // corresponding entries in array mapsec1. + // + for (i=0;i (istart+lengrib)) { + printf("g2_info: '7777' not found at end of GRIB message.\n"); + ierr=5; + return(ierr); + } + if ( isecnum>=2 && isecnum<=7 ) { + if (isecnum == 2) // Local Section 2 + // increment counter for total number of local sections found + (*numlocal)++; + + else if (isecnum == 4) + // increment counter for total number of fields found + (*numfields)++; + } + else { + printf("g2_info: Invalid section number found in GRIB message: %ld\n" ,isecnum); + ierr=6; + return(ierr); + } + + } + + return(0); + +} diff -Nru saga-2.1.0+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/g2_miss.c saga-2.1.4+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/g2_miss.c --- saga-2.1.0+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/g2_miss.c 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/g2_miss.c 2014-11-13 08:32:19.000000000 +0000 @@ -0,0 +1,72 @@ +/********************************************************** + * Version $Id: g2_miss.c 911 2011-02-14 16:38:15Z reklov_w $ + *********************************************************/ +#include "grib2.h" + +void g2_miss( gribfield *gfld, float *rmiss, int *nmiss ) +//$$$ SUBPROGRAM DOCUMENTATION BLOCK +// . . . . +// SUBPROGRAM: g2_miss +// PRGMMR: Gilbert ORG: W/NP11 DATE: 2004-12-16 +// +// ABSTRACT: This routine checks the Data Representation Template to see if +// missing value management is used, and returns the missing value(s) +// in the data field. +// +// PROGRAM HISTORY LOG: +// 2004-12-16 Gilbert +// +// USAGE: g2_miss( gribfield *gfld, float *rmiss, int *nmiss ) +// +// INPUT ARGUMENT LIST: +// *gfld - pointer to gribfield structure (defined in include file +// grib2.h) +// +// OUTPUT ARGUMENT LIST: +// rmiss - List of the missing values used +// nmiss - NUmber of the missing values included in the field +// +// REMARKS: rmiss must be allocated in the calling program with enough space +// hold all the missing values. +// +// ATTRIBUTES: +// LANGUAGE: C +// MACHINE: IBM SP +// +//$$$ +{ + g2int itype; + + /* + * Missing value management currnetly only used in + * DRT's 5.2 and 5.3. + */ + if ( gfld->idrtnum != 2 && gfld->idrtnum != 3 ) { + *nmiss=0; + return; + } + + itype = gfld->idrtmpl[4]; + if ( gfld->idrtmpl[6] == 1 ) { + *nmiss=1; + if (itype == 0) + rdieee(gfld->idrtmpl+7,rmiss+0,1); + else + rmiss[0]=(float)gfld->idrtmpl[7]; + } + else if ( gfld->idrtmpl[6] == 2 ) { + *nmiss=2; + if (itype == 0) { + rdieee(gfld->idrtmpl+7,rmiss+0,1); + rdieee(gfld->idrtmpl+8,rmiss+1,1); + } + else { + rmiss[0]=(float)gfld->idrtmpl[7]; + rmiss[1]=(float)gfld->idrtmpl[8]; + } + } + else { + *nmiss=0; + } + +} diff -Nru saga-2.1.0+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/g2_unpack1.c saga-2.1.4+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/g2_unpack1.c --- saga-2.1.0+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/g2_unpack1.c 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/g2_unpack1.c 2014-11-13 08:32:19.000000000 +0000 @@ -0,0 +1,102 @@ +/********************************************************** + * Version $Id: g2_unpack1.c 911 2011-02-14 16:38:15Z reklov_w $ + *********************************************************/ +#include +#include +#include "grib2.h" + +g2int g2_unpack1(unsigned char *cgrib,g2int *iofst,g2int **ids,g2int *idslen) +/*//$$$ SUBPROGRAM DOCUMENTATION BLOCK +// . . . . +// SUBPROGRAM: g2_unpack1 +// PRGMMR: Gilbert ORG: W/NP11 DATE: 2002-10-29 +// +// ABSTRACT: This subroutine unpacks Section 1 (Identification Section) +// as defined in GRIB Edition 2. +// +// PROGRAM HISTORY LOG: +// 2002-10-29 Gilbert +// +// USAGE: int g2_unpack1(unsigned char *cgrib,g2int *iofst,g2int **ids, +// g2int *idslen) +// INPUT ARGUMENTS: +// cgrib - char array containing Section 1 of the GRIB2 message +// iofst - Bit offset for the beginning of Section 1 in cgrib. +// +// OUTPUT ARGUMENTS: +// iofst - Bit offset at the end of Section 1, returned. +// ids - address of pointer to integer array containing information +// read from Section 1, the Identification section. +// ids[0] = Identification of originating Centre +// ( see Common Code Table C-1 ) +// ids[1] = Identification of originating Sub-centre +// ids[2] = GRIB Master Tables Version Number +// ( see Code Table 1.0 ) +// ids[3] = GRIB Local Tables Version Number +// ( see Code Table 1.1 ) +// ids[4] = Significance of Reference Time (Code Table 1.2) +// ids[5] = Year ( 4 digits ) +// ids[6] = Month +// ids[7] = Day +// ids[8] = Hour +// ids[9] = Minute +// ids[10] = Second +// ids[11] = Production status of processed data +// ( see Code Table 1.3 ) +// ids[12] = Type of processed data ( see Code Table 1.4 ) +// idslen - Number of elements in ids[]. +// +// RETURN VALUES: +// ierr - Error return code. +// 0 = no error +// 2 = Array passed is not section 1 +// 6 = memory allocation error +// +// REMARKS: +// +// ATTRIBUTES: +// LANGUAGE: C +// MACHINE: +// +//$$$ +*/ +{ + + g2int i,lensec,nbits,ierr,isecnum; + g2int mapid[13]={2,2,1,1,1,2,1,1,1,1,1,1,1}; + + ierr=0; + *idslen=13; + *ids=0; + + gbit(cgrib,&lensec,*iofst,32); // Get Length of Section + *iofst=*iofst+32; + gbit(cgrib,&isecnum,*iofst,8); // Get Section Number + *iofst=*iofst+8; + + if ( isecnum != 1 ) { + ierr=2; + *idslen=13; + fprintf(stderr,"g2_unpack1: Not Section 1 data.\n"); + return(ierr); + } + + // + // Unpack each value into array ids from the + // the appropriate number of octets, which are specified in + // corresponding entries in array mapid. + // + *ids=(g2int *)calloc(*idslen,sizeof(g2int)); + if (*ids == 0) { + ierr=6; + return(ierr); + } + + for (i=0;i<*idslen;i++) { + nbits=mapid[i]*8; + gbit(cgrib,*ids+i,*iofst,nbits); + *iofst=*iofst+nbits; + } + + return(ierr); // End of Section 1 processing +} diff -Nru saga-2.1.0+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/g2_unpack2.c saga-2.1.4+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/g2_unpack2.c --- saga-2.1.0+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/g2_unpack2.c 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/g2_unpack2.c 2014-11-13 08:32:19.000000000 +0000 @@ -0,0 +1,82 @@ +/********************************************************** + * Version $Id: g2_unpack2.c 911 2011-02-14 16:38:15Z reklov_w $ + *********************************************************/ +#include +#include +#include "grib2.h" + +g2int g2_unpack2(unsigned char *cgrib,g2int *iofst,g2int *lencsec2,unsigned char **csec2) +////$$$ SUBPROGRAM DOCUMENTATION BLOCK +// . . . . +// SUBPROGRAM: g2_unpack2 +// PRGMMR: Gilbert ORG: W/NP11 DATE: 2002-10-31 +// +// ABSTRACT: This subroutine unpacks Section 2 (Local Use Section) +// as defined in GRIB Edition 2. +// +// PROGRAM HISTORY LOG: +// 2002-10-31 Gilbert +// +// USAGE: int g2_unpack2(unsigned char *cgrib,g2int *iofst,g2int *lencsec2, +// unsigned char **csec2) +// INPUT ARGUMENT LIST: +// cgrib - char array containing Section 2 of the GRIB2 message +// iofst - Bit offset for the beginning of Section 2 in cgrib. +// +// OUTPUT ARGUMENT LIST: +// iofst - Bit offset at the end of Section 2, returned. +// lencsec2 - Length (in octets) of Local Use data +// csec2 - Pointer to a char array containing local use data +// +// RETURN VALUES: +// ierr - Error return code. +// 0 = no error +// 2 = Array passed is not section 2 +// 6 = memory allocation error +// +// REMARKS: None +// +// ATTRIBUTES: +// LANGUAGE: C +// MACHINE: +// +//$$$// +{ + + g2int ierr,isecnum; + g2int lensec,ipos,j; + + ierr=0; + *lencsec2=0; + *csec2=0; // NULL + + gbit(cgrib,&lensec,*iofst,32); // Get Length of Section + *iofst=*iofst+32; + *lencsec2=lensec-5; + gbit(cgrib,&isecnum,*iofst,8); // Get Section Number + *iofst=*iofst+8; + ipos=(*iofst/8); + + if ( isecnum != 2 ) { + ierr=2; + *lencsec2=0; + fprintf(stderr,"g2_unpack2: Not Section 2 data.\n"); + return(ierr); + } + + *csec2=(unsigned char *)malloc(*lencsec2); + if (*csec2 == 0) { + ierr=6; + *lencsec2=0; + return(ierr); + } + + //printf(" SAGIPO %d \n",(int)ipos); + for (j=0;j<*lencsec2;j++) { + *(*csec2+j)=cgrib[ipos+j]; + } + *iofst=*iofst+(*lencsec2*8); + + return(ierr); // End of Section 2 processing + +} diff -Nru saga-2.1.0+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/g2_unpack3.c saga-2.1.4+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/g2_unpack3.c --- saga-2.1.0+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/g2_unpack3.c 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/g2_unpack3.c 2014-11-13 08:32:19.000000000 +0000 @@ -0,0 +1,216 @@ +/********************************************************** + * Version $Id: g2_unpack3.c 911 2011-02-14 16:38:15Z reklov_w $ + *********************************************************/ +#include +#include +#include "grib2.h" + + +g2int g2_unpack3(unsigned char *cgrib,g2int *iofst,g2int **igds,g2int **igdstmpl, + g2int *mapgridlen,g2int **ideflist,g2int *idefnum) +////$$$ SUBPROGRAM DOCUMENTATION BLOCK +// . . . . +// SUBPROGRAM: g2_unpack3 +// PRGMMR: Gilbert ORG: W/NP11 DATE: 2002-10-31 +// +// ABSTRACT: This routine unpacks Section 3 (Grid Definition Section) +// as defined in GRIB Edition 2. +// +// PROGRAM HISTORY LOG: +// 2002-10-31 Gilbert +// +// USAGE: int g2_unpack3(unsigned char *cgrib,g2int *iofst,g2int **igds, +// g2int **igdstmpl,g2int *mapgridlen, +// g2int **ideflist,g2int *idefnum) +// INPUT ARGUMENTS: +// cgrib - Char array ontaining Section 3 of the GRIB2 message +// iofst - Bit offset for the beginning of Section 3 in cgrib. +// +// OUTPUT ARGUMENTS: +// iofst - Bit offset at the end of Section 3, returned. +// igds - Contains information read from the appropriate GRIB Grid +// Definition Section 3 for the field being returned. +// igds[0]=Source of grid definition (see Code Table 3.0) +// igds[1]=Number of grid points in the defined grid. +// igds[2]=Number of octets needed for each +// additional grid points definition. +// Used to define number of +// points in each row ( or column ) for +// non-regular grids. +// = 0, if using regular grid. +// igds[3]=Interpretation of list for optional points +// definition. (Code Table 3.11) +// igds[4]=Grid Definition Template Number (Code Table 3.1) +// igdstmpl - Pointer to integer array containing the data values for +// the specified Grid Definition +// Template ( NN=igds[4] ). Each element of this integer +// array contains an entry (in the order specified) of Grid +// Defintion Template 3.NN +// mapgridlen- Number of elements in igdstmpl[]. i.e. number of entries +// in Grid Defintion Template 3.NN ( NN=igds[4] ). +// ideflist - (Used if igds[2] .ne. 0) Pointer to integer array containing +// the number of grid points contained in each row ( or column ). +// (part of Section 3) +// idefnum - (Used if igds[2] .ne. 0) The number of entries +// in array ideflist. i.e. number of rows ( or columns ) +// for which optional grid points are defined. +// ierr - Error return code. +// 0 = no error +// 2 = Not Section 3 +// 5 = "GRIB" message contains an undefined Grid Definition +// Template. +// 6 = memory allocation error +// +// REMARKS: +// +// ATTRIBUTES: +// LANGUAGE: C +// MACHINE: +// +//$$$ + +{ + g2int ierr,i,j,nbits,isecnum; + g2int lensec,ibyttem=0,isign,newlen; + g2int *ligds,*ligdstmpl=0,*lideflist=0; + template *mapgrid; + + ierr=0; + *igds=0; // NULL + *igdstmpl=0; // NULL + *ideflist=0; // NULL + + gbit(cgrib,&lensec,*iofst,32); // Get Length of Section + *iofst=*iofst+32; + gbit(cgrib,&isecnum,*iofst,8); // Get Section Number + *iofst=*iofst+8; + + if ( isecnum != 3 ) { + ierr=2; + *idefnum=0; + *mapgridlen=0; + // fprintf(stderr,"g2_unpack3: Not Section 3 data.\n"); + return(ierr); + } + + ligds=(g2int *)calloc(5,sizeof(g2int)); + *igds=ligds; + + gbit(cgrib,ligds+0,*iofst,8); // Get source of Grid def. + *iofst=*iofst+8; + gbit(cgrib,ligds+1,*iofst,32); // Get number of grid pts. + *iofst=*iofst+32; + gbit(cgrib,ligds+2,*iofst,8); // Get num octets for opt. list + *iofst=*iofst+8; + gbit(cgrib,ligds+3,*iofst,8); // Get interpret. for opt. list + *iofst=*iofst+8; + gbit(cgrib,ligds+4,*iofst,16); // Get Grid Def Template num. + *iofst=*iofst+16; + + if (ligds[4] != 65535) { + // Get Grid Definition Template + mapgrid=getgridtemplate(ligds[4]); + if (mapgrid == 0) { // undefined template + ierr=5; + return(ierr); + } + *mapgridlen=mapgrid->maplen; + // + // Unpack each value into array igdstmpl from the + // the appropriate number of octets, which are specified in + // corresponding entries in array mapgrid. + // + if (*mapgridlen > 0) { + ligdstmpl=0; + ligdstmpl=(g2int *)calloc(*mapgridlen,sizeof(g2int)); + if (ligdstmpl == 0) { + ierr=6; + *mapgridlen=0; + *igdstmpl=0; //NULL + if( mapgrid != 0 ) free(mapgrid); + return(ierr); + } + else { + *igdstmpl=ligdstmpl; + } + } + ibyttem=0; + for (i=0;i<*mapgridlen;i++) { + nbits=abs(mapgrid->map[i])*8; + if ( mapgrid->map[i] >= 0 ) { + gbit(cgrib,ligdstmpl+i,*iofst,nbits); + } + else { + gbit(cgrib,&isign,*iofst,1); + gbit(cgrib,ligdstmpl+i,*iofst+1,nbits-1); + if (isign == 1) ligdstmpl[i]=-1*ligdstmpl[i]; + } + *iofst=*iofst+nbits; + ibyttem=ibyttem+abs(mapgrid->map[i]); + } + // + // Check to see if the Grid Definition Template needs to be + // extended. + // The number of values in a specific template may vary + // depending on data specified in the "static" part of the + // template. + // + if ( mapgrid->needext == 1 ) { + free(mapgrid); + mapgrid=extgridtemplate(ligds[4],ligdstmpl); + // Unpack the rest of the Grid Definition Template + newlen=mapgrid->maplen+mapgrid->extlen; + ligdstmpl=(g2int *)realloc(ligdstmpl,newlen*sizeof(g2int)); + *igdstmpl=ligdstmpl; + j=0; + for (i=*mapgridlen;iext[j])*8; + if ( mapgrid->ext[j] >= 0 ) { + gbit(cgrib,ligdstmpl+i,*iofst,nbits); + } + else { + gbit(cgrib,&isign,*iofst,1); + gbit(cgrib,ligdstmpl+i,*iofst+1,nbits-1); + if (isign == 1) ligdstmpl[i]=-1*ligdstmpl[i]; + } + *iofst=*iofst+nbits; + ibyttem=ibyttem+abs(mapgrid->ext[j]); + j++; + } + *mapgridlen=newlen; + } + if( mapgrid->ext != 0 ) free(mapgrid->ext); + if( mapgrid != 0 ) free(mapgrid); + } + else { // No Grid Definition Template + *mapgridlen=0; + *igdstmpl=0; + } + // + // Unpack optional list of numbers defining number of points + // in each row or column, if included. This is used for non regular + // grids. + // + if ( ligds[2] != 0 ) { + nbits=ligds[2]*8; + *idefnum=(lensec-14-ibyttem)/ligds[2]; + if (*idefnum > 0) lideflist=(g2int *)calloc(*idefnum,sizeof(g2int)); + if (lideflist == 0) { + ierr=6; + *idefnum=0; + *ideflist=0; //NULL + return(ierr); + } + else { + *ideflist=lideflist; + } + gbits(cgrib,lideflist,*iofst,nbits,0,*idefnum); + *iofst=*iofst+(nbits*(*idefnum)); + } + else { + *idefnum=0; + *ideflist=0; // NULL + } + + return(ierr); // End of Section 3 processing +} diff -Nru saga-2.1.0+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/g2_unpack4.c saga-2.1.4+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/g2_unpack4.c --- saga-2.1.0+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/g2_unpack4.c 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/g2_unpack4.c 2014-11-13 08:32:19.000000000 +0000 @@ -0,0 +1,187 @@ +/********************************************************** + * Version $Id: g2_unpack4.c 911 2011-02-14 16:38:15Z reklov_w $ + *********************************************************/ +#include +#include +#include "grib2.h" + + +g2int g2_unpack4(unsigned char *cgrib,g2int *iofst,g2int *ipdsnum,g2int **ipdstmpl, + g2int *mappdslen,g2float **coordlist,g2int *numcoord) +////$$$ SUBPROGRAM DOCUMENTATION BLOCK +// . . . . +// SUBPROGRAM: g2_unpack4 +// PRGMMR: Gilbert ORG: W/NP11 DATE: 2002-10-31 +// +// ABSTRACT: This subroutine unpacks Section 4 (Product Definition Section) +// as defined in GRIB Edition 2. +// +// PROGRAM HISTORY LOG: +// 2002-10-31 Gilbert +// +// USAGE: int g2_unpack4(unsigned char *cgrib,g2int *iofst,g2int *ipdsnum, +// g2int **ipdstmpl,g2int *mappdslen, +// g2float **coordlist,g2int *numcoord) +// INPUT ARGUMENTS: +// cgrib - Char array containing Section 4 of the GRIB2 message +// iofst - Bit offset of the beginning of Section 4 in cgrib. +// +// OUTPUT ARGUMENTS: +// iofst - Bit offset of the end of Section 4, returned. +// ipdsnum - Product Definition Template Number ( see Code Table 4.0) +// ipdstmpl - Pointer to integer array containing the data values for +// the specified Product Definition +// Template ( N=ipdsnum ). Each element of this integer +// array contains an entry (in the order specified) of Product +// Defintion Template 4.N +// mappdslen- Number of elements in ipdstmpl[]. i.e. number of entries +// in Product Defintion Template 4.N ( N=ipdsnum ). +// coordlist- Pointer to real array containing floating point values +// intended to document +// the vertical discretisation associated to model data +// on hybrid coordinate vertical levels. (part of Section 4) +// numcoord - number of values in array coordlist. +// +// RETURN VALUES: +// ierr - Error return code. +// 0 = no error +// 2 = Not section 4 +// 5 = "GRIB" message contains an undefined Product Definition +// Template. +// 6 = memory allocation error +// +// REMARKS: +// +// ATTRIBUTES: +// LANGUAGE: C +// MACHINE: +// +//$$$// +{ + + g2int ierr,needext,i,j,nbits,isecnum; + g2int lensec,isign,newlen; + g2int *coordieee; + g2int *lipdstmpl=0; + g2float *lcoordlist; + template *mappds; + + ierr=0; + *ipdstmpl=0; // NULL + *coordlist=0; // NULL + + gbit(cgrib,&lensec,*iofst,32); // Get Length of Section + *iofst=*iofst+32; + gbit(cgrib,&isecnum,*iofst,8); // Get Section Number + *iofst=*iofst+8; + + if ( isecnum != 4 ) { + ierr=2; + *numcoord=0; + *mappdslen=0; + // fprintf(stderr,"g2_unpack4: Not Section 4 data.\n"); + return(ierr); + } + + gbit(cgrib,numcoord,*iofst,16); // Get num of coordinate values + *iofst=*iofst+16; + gbit(cgrib,ipdsnum,*iofst,16); // Get Prod. Def Template num. + *iofst=*iofst+16; + + // Get Product Definition Template + mappds=getpdstemplate(*ipdsnum); + if (mappds == 0) { // undefine template + ierr=5; + *mappdslen=0; + return(ierr); + } + *mappdslen=mappds->maplen; + needext=mappds->needext; + // + // Unpack each value into array ipdstmpl from the + // the appropriate number of octets, which are specified in + // corresponding entries in array mappds. + // + if (*mappdslen > 0) lipdstmpl=(g2int *)calloc(*mappdslen,sizeof(g2int)); + if (lipdstmpl == 0) { + ierr=6; + *mappdslen=0; + *ipdstmpl=0; //NULL + if ( mappds != 0 ) free(mappds); + return(ierr); + } + else { + *ipdstmpl=lipdstmpl; + } + for (i=0;imaplen;i++) { + nbits=abs(mappds->map[i])*8; + if ( mappds->map[i] >= 0 ) { + gbit(cgrib,lipdstmpl+i,*iofst,nbits); + } + else { + gbit(cgrib,&isign,*iofst,1); + gbit(cgrib,lipdstmpl+i,*iofst+1,nbits-1); + if (isign == 1) lipdstmpl[i]=-1*lipdstmpl[i]; + } + *iofst=*iofst+nbits; + } + // + // Check to see if the Product Definition Template needs to be + // extended. + // The number of values in a specific template may vary + // depending on data specified in the "static" part of the + // template. + // + if ( needext ==1 ) { + free(mappds); + mappds=extpdstemplate(*ipdsnum,lipdstmpl); + newlen=mappds->maplen+mappds->extlen; + lipdstmpl=(g2int *)realloc(lipdstmpl,newlen*sizeof(g2int)); + *ipdstmpl=lipdstmpl; + // Unpack the rest of the Product Definition Template + j=0; + for (i=*mappdslen;iext[j])*8; + if ( mappds->ext[j] >= 0 ) { + gbit(cgrib,lipdstmpl+i,*iofst,nbits); + } + else { + gbit(cgrib,&isign,*iofst,1); + gbit(cgrib,lipdstmpl+i,*iofst+1,nbits-1); + if (isign == 1) lipdstmpl[i]=-1*lipdstmpl[i]; + } + *iofst=*iofst+nbits; + j++; + } + *mappdslen=newlen; + } + if( mappds->ext != 0 ) free(mappds->ext); + if( mappds != 0 ) free(mappds); + // + // Get Optional list of vertical coordinate values + // after the Product Definition Template, if necessary. + // + *coordlist=0; // NULL + if ( *numcoord != 0 ) { + coordieee=(g2int *)calloc(*numcoord,sizeof(g2int)); + lcoordlist=(g2float *)calloc(*numcoord,sizeof(g2float)); + if (coordieee == 0 || lcoordlist == 0) { + ierr=6; + *numcoord=0; + *coordlist=0; // NULL + if( coordieee != 0 ) free(coordieee); + if( lcoordlist != 0 ) free(lcoordlist); + return(ierr); + } + else { + *coordlist=lcoordlist; + } + gbits(cgrib,coordieee,*iofst,32,0,*numcoord); + rdieee(coordieee,*coordlist,*numcoord); + free(coordieee); + *iofst=*iofst+(32*(*numcoord)); + } + + return(ierr); // End of Section 4 processing + +} diff -Nru saga-2.1.0+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/g2_unpack5.c saga-2.1.4+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/g2_unpack5.c --- saga-2.1.0+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/g2_unpack5.c 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/g2_unpack5.c 2014-11-13 08:32:19.000000000 +0000 @@ -0,0 +1,154 @@ +/********************************************************** + * Version $Id: g2_unpack5.c 911 2011-02-14 16:38:15Z reklov_w $ + *********************************************************/ +#include +#include +#include "grib2.h" + + +g2int g2_unpack5(unsigned char *cgrib,g2int *iofst,g2int *ndpts,g2int *idrsnum, + g2int **idrstmpl,g2int *mapdrslen) +////$$$ SUBPROGRAM DOCUMENTATION BLOCK +// . . . . +// SUBPROGRAM: g2_unpack5 +// PRGMMR: Gilbert ORG: W/NP11 DATE: 2002-10-31 +// +// ABSTRACT: This subroutine unpacks Section 5 (Data Representation Section) +// as defined in GRIB Edition 2. +// +// PROGRAM HISTORY LOG: +// 2002-10-31 Gilbert +// +// USAGE: int g2_unpack5(unsigned char *cgrib,g2int *iofst,g2int *ndpts, +// g2int *idrsnum,g2int **idrstmpl,g2int *mapdrslen) +// INPUT ARGUMENTS: +// cgrib - char array containing Section 5 of the GRIB2 message +// iofst - Bit offset for the beginning of Section 5 in cgrib. +// +// OUTPUT ARGUMENTS: +// iofst - Bit offset at the end of Section 5, returned. +// ndpts - Number of data points unpacked and returned. +// idrsnum - Data Representation Template Number ( see Code Table 5.0) +// idrstmpl - Pointer to an integer array containing the data values for +// the specified Data Representation +// Template ( N=idrsnum ). Each element of this integer +// array contains an entry (in the order specified) of Data +// Representation Template 5.N +// mapdrslen- Number of elements in idrstmpl[]. i.e. number of entries +// in Data Representation Template 5.N ( N=idrsnum ). +// +// RETURN VALUES: +// ierr - Error return code. +// 0 = no error +// 2 = Not Section 5 +// 6 = memory allocation error +// 7 = "GRIB" message contains an undefined Data +// Representation Template. +// +// REMARKS: None +// +// ATTRIBUTES: +// LANGUAGE: C +// MACHINE: +// +//$$$// +{ + g2int ierr,needext,i,j,nbits,isecnum; + g2int lensec,isign,newlen; + g2int *lidrstmpl=0; + template *mapdrs; + + ierr=0; + *idrstmpl=0; //NULL + + gbit(cgrib,&lensec,*iofst,32); // Get Length of Section + *iofst=*iofst+32; + gbit(cgrib,&isecnum,*iofst,8); // Get Section Number + *iofst=*iofst+8; + + if ( isecnum != 5 ) { + ierr=2; + *ndpts=0; + *mapdrslen=0; + // fprintf(stderr,"g2_unpack5: Not Section 5 data.\n"); + return(ierr); + } + + gbit(cgrib,ndpts,*iofst,32); // Get num of data points + *iofst=*iofst+32; + gbit(cgrib,idrsnum,*iofst,16); // Get Data Rep Template Num. + *iofst=*iofst+16; + + // Gen Data Representation Template + mapdrs=getdrstemplate(*idrsnum); + if (mapdrs == 0) { + ierr=7; + *mapdrslen=0; + return(ierr); + } + *mapdrslen=mapdrs->maplen; + needext=mapdrs->needext; + // + // Unpack each value into array ipdstmpl from the + // the appropriate number of octets, which are specified in + // corresponding entries in array mapdrs. + // + if (*mapdrslen > 0) lidrstmpl=(g2int *)calloc(*mapdrslen,sizeof(g2int)); + if (lidrstmpl == 0) { + ierr=6; + *mapdrslen=0; + *idrstmpl=0; //NULL + if ( mapdrs != 0 ) free(mapdrs); + return(ierr); + } + else { + *idrstmpl=lidrstmpl; + } + for (i=0;imaplen;i++) { + nbits=abs(mapdrs->map[i])*8; + if ( mapdrs->map[i] >= 0 ) { + gbit(cgrib,lidrstmpl+i,*iofst,nbits); + } + else { + gbit(cgrib,&isign,*iofst,1); + gbit(cgrib,lidrstmpl+i,*iofst+1,nbits-1); + if (isign == 1) lidrstmpl[i]=-1*lidrstmpl[i]; + } + *iofst=*iofst+nbits; + } + // + // Check to see if the Data Representation Template needs to be + // extended. + // The number of values in a specific template may vary + // depending on data specified in the "static" part of the + // template. + // + if ( needext == 1 ) { + free(mapdrs); + mapdrs=extdrstemplate(*idrsnum,lidrstmpl); + newlen=mapdrs->maplen+mapdrs->extlen; + lidrstmpl=(g2int *)realloc(lidrstmpl,newlen*sizeof(g2int)); + *idrstmpl=lidrstmpl; + // Unpack the rest of the Data Representation Template + j=0; + for (i=*mapdrslen;iext[j])*8; + if ( mapdrs->ext[j] >= 0 ) { + gbit(cgrib,lidrstmpl+i,*iofst,nbits); + } + else { + gbit(cgrib,&isign,*iofst,1); + gbit(cgrib,lidrstmpl+i,*iofst+1,nbits-1); + if (isign == 1) lidrstmpl[i]=-1*lidrstmpl[i]; + } + *iofst=*iofst+nbits; + j++; + } + *mapdrslen=newlen; + } + if( mapdrs->ext != 0 ) free(mapdrs->ext); + if( mapdrs != 0 ) free(mapdrs); + + return(ierr); // End of Section 5 processing + +} diff -Nru saga-2.1.0+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/g2_unpack6.c saga-2.1.4+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/g2_unpack6.c --- saga-2.1.0+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/g2_unpack6.c 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/g2_unpack6.c 2014-11-13 08:32:19.000000000 +0000 @@ -0,0 +1,100 @@ +/********************************************************** + * Version $Id: g2_unpack6.c 911 2011-02-14 16:38:15Z reklov_w $ + *********************************************************/ +#include +#include +#include "grib2.h" + +g2int g2_unpack6(unsigned char *cgrib,g2int *iofst,g2int ngpts,g2int *ibmap, + g2int **bmap) +//$$$ SUBPROGRAM DOCUMENTATION BLOCK +// . . . . +// SUBPROGRAM: g2_unpack6 +// PRGMMR: Gilbert ORG: W/NP11 DATE: 2002-10-31 +// +// ABSTRACT: This subroutine unpacks Section 6 (Bit-Map Section) +// as defined in GRIB Edition 2. +// +// PROGRAM HISTORY LOG: +// 2002-10-31 Gilbert +// +// USAGE: int g2_unpack6(unsigned char *cgrib,g2int *iofst,g2int ngpts, +// g2int *ibmap,g2int **bmap) +// INPUT ARGUMENTS: +// cgrib - char array containing Section 6 of the GRIB2 message +// iofst - Bit offset of the beginning of Section 6 in cgrib. +// ngpts - Number of grid points specified in the bit-map +// +// OUTPUT ARGUMENTS: +// iofst - Bit offset at the end of Section 6, returned. +// ibmap - Bitmap indicator ( see Code Table 6.0 ) +// 0 = bitmap applies and is included in Section 6. +// 1-253 = Predefined bitmap applies +// 254 = Previously defined bitmap applies to this field +// 255 = Bit map does not apply to this product. +// bmap - Pointer to an integer array containing decoded bitmap. +// ( if ibmap=0 ) +// +// RETURN VALUES: +// ierr - Error return code. +// 0 = no error +// 2 = Not Section 6 +// 4 = Unrecognized pre-defined bit-map. +// 6 = memory allocation error +// +// REMARKS: None +// +// ATTRIBUTES: +// LANGUAGE: C +// MACHINE: +// +//$$$// +{ + g2int j,ierr,isecnum; + g2int *lbmap=0; + g2int *intbmap; + + ierr=0; + *bmap=0; //NULL + + *iofst=*iofst+32; // skip Length of Section + gbit(cgrib,&isecnum,*iofst,8); // Get Section Number + *iofst=*iofst+8; + + if ( isecnum != 6 ) { + ierr=2; + fprintf(stderr,"g2_unpack6: Not Section 6 data.\n"); + return(ierr); + } + + gbit(cgrib,ibmap,*iofst,8); // Get bit-map indicator + *iofst=*iofst+8; + + if (*ibmap == 0) { // Unpack bitmap + if (ngpts > 0) lbmap=(g2int *)calloc(ngpts,sizeof(g2int)); + if (lbmap == 0) { + ierr=6; + return(ierr); + } + else { + *bmap=lbmap; + } + intbmap=(g2int *)calloc(ngpts,sizeof(g2int)); + gbits(cgrib,intbmap,*iofst,1,0,ngpts); + *iofst=*iofst+ngpts; + for (j=0;j +#include +#include +#include +#include "grib2.h" + +g2int simunpack(unsigned char *,g2int *, g2int,g2float *); +int comunpack(unsigned char *,g2int,g2int,g2int *,g2int,g2float *); +g2int specunpack(unsigned char *,g2int *,g2int,g2int,g2int, g2int, g2float *); +#ifdef USE_PNG + g2int pngunpack(unsigned char *,g2int,g2int *,g2int, g2float *); +#endif /* USE_PNG */ +#ifdef USE_JPEG2000 + g2int jpcunpack(unsigned char *,g2int,g2int *,g2int, g2float *); +#endif /* USE_JPEG2000 */ + +g2int g2_unpack7(unsigned char *cgrib,g2int *iofst,g2int igdsnum,g2int *igdstmpl, + g2int idrsnum,g2int *idrstmpl,g2int ndpts,g2float **fld) +//$$$ SUBPROGRAM DOCUMENTATION BLOCK +// . . . . +// SUBPROGRAM: g2_unpack7 +// PRGMMR: Gilbert ORG: W/NP11 DATE: 2002-10-31 +// +// ABSTRACT: This subroutine unpacks Section 7 (Data Section) +// as defined in GRIB Edition 2. +// +// PROGRAM HISTORY LOG: +// 2002-10-31 Gilbert +// 2002-12-20 Gilbert - Added GDT info to arguments +// and added 5.51 processing. +// 2003-08-29 Gilbert - Added support for new templates using +// PNG and JPEG2000 algorithms/templates. +// 2004-11-29 Gilbert - JPEG2000 now allowed to use WMO Template no. 5.40 +// PNG now allowed to use WMO Template no. 5.41 +// 2004-12-16 Taylor - Added check on comunpack return code. +// +// USAGE: int g2_unpack7(unsigned char *cgrib,g2int *iofst,g2int igdsnum, +// g2int *igdstmpl, g2int idrsnum, +// g2int *idrstmpl, g2int ndpts,g2float **fld) +// INPUT ARGUMENTS: +// cgrib - char array containing Section 7 of the GRIB2 message +// iofst - Bit offset of the beginning of Section 7 in cgrib. +// igdsnum - Grid Definition Template Number ( see Code Table 3.0) +// ( Only used for DRS Template 5.51 ) +// igdstmpl - Pointer to an integer array containing the data values for +// the specified Grid Definition +// Template ( N=igdsnum ). Each element of this integer +// array contains an entry (in the order specified) of Grid +// Definition Template 3.N +// ( Only used for DRS Template 5.51 ) +// idrsnum - Data Representation Template Number ( see Code Table 5.0) +// idrstmpl - Pointer to an integer array containing the data values for +// the specified Data Representation +// Template ( N=idrsnum ). Each element of this integer +// array contains an entry (in the order specified) of Data +// Representation Template 5.N +// ndpts - Number of data points unpacked and returned. +// +// OUTPUT ARGUMENTS: +// iofst - Bit offset at the end of Section 7, returned. +// fld - Pointer to a float array containing the unpacked data field. +// +// RETURN VALUES: +// ierr - Error return code. +// 0 = no error +// 2 = Not section 7 +// 4 = Unrecognized Data Representation Template +// 5 = need one of GDT 3.50 through 3.53 to decode DRT 5.51 +// 6 = memory allocation error +// 7 = corrupt section 7. +// +// REMARKS: None +// +// ATTRIBUTES: +// LANGUAGE: C +// MACHINE: +// +//$$$// +{ + g2int ierr,isecnum; + g2int ipos,lensec; + g2float *lfld; + + ierr=0; + *fld=0; //NULL + + gbit(cgrib,&lensec,*iofst,32); // Get Length of Section + *iofst=*iofst+32; + gbit(cgrib,&isecnum,*iofst,8); // Get Section Number + *iofst=*iofst+8; + + if ( isecnum != 7 ) { + ierr=2; + //fprintf(stderr,"g2_unpack7: Not Section 7 data.\n"); + return(ierr); + } + + ipos=(*iofst/8); + lfld=(g2float *)calloc(ndpts,sizeof(g2float)); + if (lfld == 0) { + ierr=6; + return(ierr); + } + else { + *fld=lfld; + } + + if (idrsnum == 0) + simunpack(cgrib+ipos,idrstmpl,ndpts,lfld); + else if (idrsnum == 2 || idrsnum == 3) { + if (comunpack(cgrib+ipos,lensec,idrsnum,idrstmpl,ndpts,lfld) != 0) { + return 7; + } + } + else if (idrsnum == 50) { // Spectral Simple + simunpack(cgrib+ipos,idrstmpl,ndpts-1,lfld+1); + rdieee(idrstmpl+4,lfld+0,1); + } + else if (idrsnum == 51) // Spectral complex + if ( igdsnum>=50 && igdsnum <=53 ) + specunpack(cgrib+ipos,idrstmpl,ndpts,igdstmpl[0],igdstmpl[2],igdstmpl[2],lfld); + else { + fprintf(stderr,"g2_unpack7: Cannot use GDT 3.%d to unpack Data Section 5.51.\n",(int)igdsnum); + ierr=5; + if ( lfld != 0 ) free(lfld); + *fld=0; //NULL + return(ierr); + } +#ifdef USE_JPEG2000 + else if (idrsnum == 40 || idrsnum == 40000) { + jpcunpack(cgrib+ipos,lensec-5,idrstmpl,ndpts,lfld); + } +#endif /* USE_JPEG2000 */ +#ifdef USE_PNG + else if (idrsnum == 41 || idrsnum == 40010) { + pngunpack(cgrib+ipos,lensec-5,idrstmpl,ndpts,lfld); + } +#endif /* USE_PNG */ + else { + fprintf(stderr,"g2_unpack7: Data Representation Template 5.%d not yet implemented.\n",(int)idrsnum); + ierr=4; + if ( lfld != 0 ) free(lfld); + *fld=0; //NULL + return(ierr); + } + + *iofst=*iofst+(8*lensec); + + return(ierr); // End of Section 7 processing + +} diff -Nru saga-2.1.0+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/gbits.c saga-2.1.4+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/gbits.c --- saga-2.1.0+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/gbits.c 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/gbits.c 2014-11-13 08:32:19.000000000 +0000 @@ -0,0 +1,127 @@ +/********************************************************** + * Version $Id: gbits.c 911 2011-02-14 16:38:15Z reklov_w $ + *********************************************************/ +#include "grib2.h" + +void gbit(unsigned char *in,g2int *iout,g2int iskip,g2int nbyte) +{ + gbits(in,iout,iskip,nbyte,(g2int)0,(g2int)1); +} + +void sbit(unsigned char *out,g2int *in,g2int iskip,g2int nbyte) +{ + sbits(out,in,iskip,nbyte,(g2int)0,(g2int)1); +} + + +void gbits(unsigned char *in,g2int *iout,g2int iskip,g2int nbyte,g2int nskip, + g2int n) +/* Get bits - unpack bits: Extract arbitrary size values from a +/ packed bit string, right justifying each value in the unpacked +/ iout array. +/ *in = pointer to character array input +/ *iout = pointer to unpacked array output +/ iskip = initial number of bits to skip +/ nbyte = number of bits to take +/ nskip = additional number of bits to skip on each iteration +/ n = number of iterations +/ v1.1 +*/ +{ + g2int i,tbit,bitcnt,ibit,itmp; + g2int nbit,index; + static g2int ones[]={1,3,7,15,31,63,127,255}; + +// nbit is the start position of the field in bits + nbit = iskip; + for (i=0;i>= (8-ibit-tbit); + index++; + bitcnt = bitcnt - tbit; + +// now transfer whole bytes + while (bitcnt >= 8) { + itmp = itmp<<8 | (int)*(in+index); + bitcnt = bitcnt - 8; + index++; + } + +// get data from last byte + if (bitcnt > 0) { + itmp = ( itmp << bitcnt ) | ( ((int)*(in+index) >> (8-bitcnt)) & ones[bitcnt-1] ); + } + + *(iout+i) = itmp; + } +} + + +void sbits(unsigned char *out,g2int *in,g2int iskip,g2int nbyte,g2int nskip, + g2int n) +/*C Store bits - pack bits: Put arbitrary size values into a +/ packed bit string, taking the low order bits from each value +/ in the unpacked array. +/ *iout = pointer to packed array output +/ *in = pointer to unpacked array input +/ iskip = initial number of bits to skip +/ nbyte = number of bits to pack +/ nskip = additional number of bits to skip on each iteration +/ n = number of iterations +/ v1.1 +*/ +{ + g2int i,bitcnt,tbit,ibit,itmp,imask,itmp2,itmp3; + g2int nbit,index; + static g2int ones[]={1,3,7,15,31,63,127,255}; + +// number bits from zero to ... +// nbit is the last bit of the field to be filled + + nbit = iskip + nbyte - 1; + for (i=0;i> tbit; + index--; + } + +// now byte aligned + +// do by bytes + while (bitcnt >= 8) { + out[index] = (unsigned char)(itmp & 255); + itmp = itmp >> 8; + bitcnt = bitcnt - 8; + index--; + } + +// do last byte + + if (bitcnt > 0) { + itmp2 = itmp & ones[bitcnt-1]; + itmp3 = (int)*(out+index) & (255-ones[bitcnt-1]); + out[index] = (unsigned char)(itmp2 | itmp3); + } + } + +} diff -Nru saga-2.1.0+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/getdim.c saga-2.1.4+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/getdim.c --- saga-2.1.0+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/getdim.c 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/getdim.c 2014-11-13 08:32:19.000000000 +0000 @@ -0,0 +1,130 @@ +/********************************************************** + * Version $Id: getdim.c 911 2011-02-14 16:38:15Z reklov_w $ + *********************************************************/ +#include +#include +#include "grib2.h" + +g2int g2_unpack3(unsigned char *,g2int *,g2int **,g2int **, + g2int *,g2int **,g2int *); + +g2int getdim(unsigned char *csec3,g2int *width,g2int *height,g2int *iscan) +//$$$ SUBPROGRAM DOCUMENTATION BLOCK +// . . . . +// SUBPROGRAM: getdim +// PRGMMR: Gilbert ORG: W/NP11 DATE: 2002-12-11 +// +// ABSTRACT: This subroutine returns the dimensions and scanning mode of +// a grid definition packed in GRIB2 Grid Definition Section 3 format. +// +// PROGRAM HISTORY LOG: +// 2002-12-11 Gilbert +// +// USAGE: int getdim(unsigned char *csec3,g2int *width, +// g2int *height, g2int *iscan) +// INPUT ARGUMENT LIST: +// csec3 - Character array that contains the packed GRIB2 GDS +// +// OUTPUT ARGUMENT LIST: +// width - x (or i) dimension of the grid. +// height - y (or j) dimension of the grid. +// iscan - Scanning mode ( see Code Table 3.4 ) +// +// REMARKS: Returns width and height set to zero, if grid template +// not recognized. +// +// ATTRIBUTES: +// LANGUAGE: C +// MACHINE: IBM SP +// +//$$$ +{ + + g2int *igdstmpl,*list_opt; + g2int *igds; + g2int iofst,igdtlen,num_opt,jerr; + + igdstmpl=0; + list_opt=0; + igds=0; + iofst=0; // set offset to beginning of section + jerr= g2_unpack3(csec3,&iofst,&igds,&igdstmpl, + &igdtlen,&list_opt,&num_opt); + if (jerr == 0) { + switch ( igds[4] ) // Template number + { + case 0: // Lat/Lon + case 1: + case 2: + case 3: + { + *width=igdstmpl[7]; + *height=igdstmpl[8]; + *iscan=igdstmpl[18]; + break; + } + case 10: // Mercator + { + *width=igdstmpl[7]; + *height=igdstmpl[8]; + *iscan=igdstmpl[15]; + break; + } + case 20: // Polar Stereographic + { + *width=igdstmpl[7]; + *height=igdstmpl[8]; + *iscan=igdstmpl[17]; + break; + } + case 30: // Lambert Conformal + { + *width=igdstmpl[7]; + *height=igdstmpl[8]; + *iscan=igdstmpl[17]; + break; + } + case 40: // Gaussian + case 41: + case 42: + case 43: + { + *width=igdstmpl[7]; + *height=igdstmpl[8]; + *iscan=igdstmpl[18]; + break; + } + case 90: // Space View/Orthographic + { + *width=igdstmpl[7]; + *height=igdstmpl[8]; + *iscan=igdstmpl[16]; + break; + } + case 110: // Equatorial Azimuthal + { + *width=igdstmpl[7]; + *height=igdstmpl[8]; + *iscan=igdstmpl[15]; + break; + } + default: + { + *width=0; + *height=0; + *iscan=0; + break; + } + } // end switch + } + else { + *width=0; + *height=0; + } + + if (igds != 0) free(igds); + if (igdstmpl != 0) free(igdstmpl); + if (list_opt != 0) free(list_opt); + + return 0; +} diff -Nru saga-2.1.0+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/getpoly.c saga-2.1.4+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/getpoly.c --- saga-2.1.0+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/getpoly.c 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/getpoly.c 2014-11-13 08:32:19.000000000 +0000 @@ -0,0 +1,83 @@ +/********************************************************** + * Version $Id: getpoly.c 911 2011-02-14 16:38:15Z reklov_w $ + *********************************************************/ +#include +#include +#include "grib2.h" + +g2int g2_unpack3(unsigned char *,g2int *,g2int **,g2int **, + g2int *,g2int **,g2int *); + +g2int getpoly(unsigned char *csec3,g2int *jj,g2int *kk,g2int *mm) +//$$$ SUBPROGRAM DOCUMENTATION BLOCK +// . . . . +// SUBPROGRAM: getpoly +// PRGMMR: Gilbert ORG: W/NP11 DATE: 2002-12-11 +// +// ABSTRACT: This subroutine returns the J, K, and M pentagonal resolution +// parameters specified in a GRIB Grid Definition Section used +// spherical harmonic coefficients using GDT 5.50 through 5.53 +// +// PROGRAM HISTORY LOG: +// 2002-12-11 Gilbert +// +// USAGE: int getpoly(unsigned char *csec3,g2int *jj,g2int *kk,g2int *mm) +// INPUT ARGUMENTS: +// csec3 - Character array that contains the packed GRIB2 GDS +// +// OUTPUT ARGUMENTS: +// JJ = J - pentagonal resolution parameter +// KK = K - pentagonal resolution parameter +// MM = M - pentagonal resolution parameter +// +// REMARKS: Returns JJ, KK, and MM set to zero, if grid template +// not recognized. +// +// ATTRIBUTES: +// LANGUAGE: C +// MACHINE: IBM SP +// +//$$$ +{ + + g2int *igdstmpl,*list_opt; + g2int *igds; + g2int iofst,igdtlen,num_opt,jerr; + + iofst=0; // set offset to beginning of section + jerr=g2_unpack3(csec3,&iofst,&igds,&igdstmpl, + &igdtlen,&list_opt,&num_opt); + if (jerr == 0) { + switch ( igds[4] ) // Template number + { + case 50: // Spherical harmonic coefficients + case 51: + case 52: + case 53: + { + *jj=igdstmpl[0]; + *kk=igdstmpl[1]; + *mm=igdstmpl[2]; + break; + } + default: + { + *jj=0; + *kk=0; + *mm=0; + break; + } + } // end switch + } + else { + *jj=0; + *kk=0; + *mm=0; + } + + if (igds != 0) free(igds); + if (igdstmpl != 0) free(igdstmpl); + if (list_opt != 0) free(list_opt); + + return 0; +} diff -Nru saga-2.1.0+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/grib2.h saga-2.1.4+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/grib2.h --- saga-2.1.0+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/grib2.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/grib2.h 2014-11-13 08:32:19.000000000 +0000 @@ -0,0 +1,254 @@ +/********************************************************** + * Version $Id: grib2.h 911 2011-02-14 16:38:15Z reklov_w $ + *********************************************************/ +#ifndef _grib2_H +#define _grib2_H +#include + +#ifdef _SAGA_MSW +extern double rint(double x); +#endif + +#define G2_VERSION "g2clib-1.0.4" +/* . . . . +// PRGMMR: Gilbert ORG: W/NP11 DATE: 2002-10-25 +// +// Each element of structure gribfield is defined as: +// +// gribfield gfld; +// +// gfld->version = GRIB edition number ( currently 2 ) +// gfld->discipline = Message Discipline ( see Code Table 0.0 ) +// gfld->idsect = Contains the entries in the Identification +// Section ( Section 1 ) +// This element is a pointer to an array +// that holds the data. +// gfld->idsect[0] = Identification of originating Centre +// ( see Common Code Table C-1 ) +// 7 - US National Weather Service +// gfld->idsect[1] = Identification of originating Sub-centre +// gfld->idsect[2] = GRIB Master Tables Version Number +// ( see Code Table 1.0 ) +// 0 - Experimental +// 1 - Initial operational version number +// gfld->idsect[3] = GRIB Local Tables Version Number +// ( see Code Table 1.1 ) +// 0 - Local tables not used +// 1-254 - Number of local tables version used +// gfld->idsect[4] = Significance of Reference Time (Code Table 1.2) +// 0 - Analysis +// 1 - Start of forecast +// 2 - Verifying time of forecast +// 3 - Observation time +// gfld->idsect[5] = Year ( 4 digits ) +// gfld->idsect[6] = Month +// gfld->idsect[7) = Day +// gfld->idsect[8] = Hour +// gfld->idsect[9] = Minute +// gfld->idsect[10] = Second +// gfld->idsect[11] = Production status of processed data +// ( see Code Table 1.3 ) +// 0 - Operational products +// 1 - Operational test products +// 2 - Research products +// 3 - Re-analysis products +// gfld->idsect[12] = Type of processed data ( see Code Table 1.4 ) +// 0 - Analysis products +// 1 - Forecast products +// 2 - Analysis and forecast products +// 3 - Control forecast products +// 4 - Perturbed forecast products +// 5 - Control and perturbed forecast products +// 6 - Processed satellite observations +// 7 - Processed radar observations +// gfld->idsectlen = Number of elements in gfld->idsect[]. +// gfld->local = Pointer to character array containing contents +// of Local Section 2, if included +// gfld->locallen = length of array gfld->local[] +// gfld->ifldnum = field number within GRIB message +// gfld->griddef = Source of grid definition (see Code Table 3.0) +// 0 - Specified in Code table 3.1 +// 1 - Predetermined grid Defined by originating centre +// gfld->ngrdpts = Number of grid points in the defined grid. +// gfld->numoct_opt = Number of octets needed for each +// additional grid points definition. +// Used to define number of +// points in each row ( or column ) for +// non-regular grids. +// = 0, if using regular grid. +// gfld->interp_opt = Interpretation of list for optional points +// definition. (Code Table 3.11) +// gfld->igdtnum = Grid Definition Template Number (Code Table 3.1) +// gfld->igdtmpl = Contains the data values for the specified Grid +// Definition Template ( NN=gfld->igdtnum ). Each +// element of this integer array contains an entry (in +// the order specified) of Grid Defintion Template 3.NN +// This element is a pointer to an array +// that holds the data. +// gfld->igdtlen = Number of elements in gfld->igdtmpl[]. i.e. number of +// entries in Grid Defintion Template 3.NN +// ( NN=gfld->igdtnum ). +// gfld->list_opt = (Used if gfld->numoct_opt .ne. 0) This array +// contains the number of grid points contained in +// each row ( or column ). (part of Section 3) +// This element is a pointer to an array +// that holds the data. This pointer is nullified +// if gfld->numoct_opt=0. +// gfld->num_opt = (Used if gfld->numoct_opt .ne. 0) The number of entries +// in array ideflist. i.e. number of rows ( or columns ) +// for which optional grid points are defined. This value +// is set to zero, if gfld->numoct_opt=0. +// gfdl->ipdtnum = Product Definition Template Number (see Code Table 4.0) +// gfld->ipdtmpl = Contains the data values for the specified Product +// Definition Template ( N=gfdl->ipdtnum ). Each element +// of this integer array contains an entry (in the +// order specified) of Product Defintion Template 4.N. +// This element is a pointer to an array +// that holds the data. +// gfld->ipdtlen = Number of elements in gfld->ipdtmpl[]. i.e. number of +// entries in Product Defintion Template 4.N +// ( N=gfdl->ipdtnum ). +// gfld->coord_list = Real array containing floating point values +// intended to document the vertical discretisation +// associated to model data on hybrid coordinate +// vertical levels. (part of Section 4) +// This element is a pointer to an array +// that holds the data. +// gfld->num_coord = number of values in array gfld->coord_list[]. +// gfld->ndpts = Number of data points unpacked and returned. +// gfld->idrtnum = Data Representation Template Number +// ( see Code Table 5.0) +// gfld->idrtmpl = Contains the data values for the specified Data +// Representation Template ( N=gfld->idrtnum ). Each +// element of this integer array contains an entry +// (in the order specified) of Product Defintion +// Template 5.N. +// This element is a pointer to an array +// that holds the data. +// gfld->idrtlen = Number of elements in gfld->idrtmpl[]. i.e. number +// of entries in Data Representation Template 5.N +// ( N=gfld->idrtnum ). +// gfld->unpacked = logical value indicating whether the bitmap and +// data values were unpacked. If false, +// gfld->bmap and gfld->fld pointers are nullified. +// gfld->expanded = Logical value indicating whether the data field +// was expanded to the grid in the case where a +// bit-map is present. If true, the data points in +// gfld->fld match the grid points and zeros were +// inserted at grid points where data was bit-mapped +// out. If false, the data values in gfld->fld were +// not expanded to the grid and are just a consecutive +// array of data points corresponding to each value of +// "1" in gfld->bmap. +// gfld->ibmap = Bitmap indicator ( see Code Table 6.0 ) +// 0 = bitmap applies and is included in Section 6. +// 1-253 = Predefined bitmap applies +// 254 = Previously defined bitmap applies to this field +// 255 = Bit map does not apply to this product. +// gfld->bmap = integer array containing decoded bitmap, +// if gfld->ibmap=0 or gfld->ibap=254. Otherwise nullified. +// This element is a pointer to an array +// that holds the data. +// gfld->fld = Array of gfld->ndpts unpacked data points. +// This element is a pointer to an array +// that holds the data. +*/ + +#ifdef __64BIT__ +typedef int g2int; +typedef unsigned int g2intu; +#else +typedef long g2int; +typedef unsigned long g2intu; +#endif +typedef float g2float; + +struct _template { + g2int type; /* 3=Grid Defintion Template. */ + /* 4=Product Defintion Template. */ + /* 5=Data Representation Template. */ + g2int num; /* template number. */ + g2int maplen; /* number of entries in the static part */ + /* of the template. */ + g2int *map; /* num of octets of each entry in the */ + /* static part of the template. */ + g2int needext; /* indicates whether or not the template needs */ + /* to be extended. */ + g2int extlen; /* number of entries in the template extension. */ + g2int *ext; /* num of octets of each entry in the extension */ + /* part of the template. */ +}; + +typedef struct _template _template; + +#define template _template + +struct gribfield { + g2int version,discipline; + g2int *idsect; + g2int idsectlen; + unsigned char *local; + g2int locallen; + g2int ifldnum; + g2int griddef,ngrdpts; + g2int numoct_opt,interp_opt,num_opt; + g2int *list_opt; + g2int igdtnum,igdtlen; + g2int *igdtmpl; + g2int ipdtnum,ipdtlen; + g2int *ipdtmpl; + g2int num_coord; + g2float *coord_list; + g2int ndpts,idrtnum,idrtlen; + g2int *idrtmpl; + g2int unpacked; + g2int expanded; + g2int ibmap; + g2int *bmap; + g2float *fld; +}; + +typedef struct gribfield gribfield; + + +/* Prototypes for unpacking API */ +void seekgb(FILE *,g2int ,g2int ,g2int *,g2int *); +g2int g2_info(unsigned char *,g2int *,g2int *,g2int *,g2int *); +g2int g2_getfld(unsigned char *,g2int ,g2int ,g2int ,gribfield **); +void g2_free(gribfield *); + +/* Prototypes for packing API */ +g2int g2_create(unsigned char *,g2int *,g2int *); +g2int g2_addlocal(unsigned char *,unsigned char *,g2int ); +g2int g2_addgrid(unsigned char *,g2int *,g2int *,g2int *,g2int ); +g2int g2_addfield(unsigned char *,g2int ,g2int *, + g2float *,g2int ,g2int ,g2int *, + g2float *,g2int ,g2int ,g2int *); +g2int g2_gribend(unsigned char *); + +/* Prototypes for supporting routines */ +extern double int_power(double, g2int ); +extern void mkieee(g2float *,g2int *,g2int); +void rdieee(g2int *,g2float *,g2int ); +extern _template *getpdstemplate(g2int); +extern _template *extpdstemplate(g2int,g2int *); +extern _template *getdrstemplate(g2int); +extern _template *extdrstemplate(g2int,g2int *); +extern _template *getgridtemplate(g2int); +extern _template *extgridtemplate(g2int,g2int *); +extern void simpack(g2float *,g2int,g2int *,unsigned char *,g2int *); +extern void compack(g2float *,g2int,g2int,g2int *,unsigned char *,g2int *); +void misspack(g2float *,g2int ,g2int ,g2int *, unsigned char *, g2int *); +void gbit(unsigned char *,g2int *,g2int ,g2int ); +void sbit(unsigned char *,g2int *,g2int ,g2int ); +void gbits(unsigned char *,g2int *,g2int ,g2int ,g2int ,g2int ); +void sbits(unsigned char *,g2int *,g2int ,g2int ,g2int ,g2int ); + +int pack_gp(g2int *, g2int *, g2int *, + g2int *, g2int *, g2int *, g2int *, g2int *, + g2int *, g2int *, g2int *, g2int *, + g2int *, g2int *, g2int *, g2int *, g2int *, + g2int *, g2int *, g2int *); + +#endif /* _grib2_H */ + diff -Nru saga-2.1.0+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/gridtemplates.c saga-2.1.4+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/gridtemplates.c --- saga-2.1.0+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/gridtemplates.c 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/gridtemplates.c 2014-11-13 08:32:19.000000000 +0000 @@ -0,0 +1,176 @@ +/********************************************************** + * Version $Id: gridtemplates.c 911 2011-02-14 16:38:15Z reklov_w $ + *********************************************************/ +#include +#include "grib2.h" +#include "gridtemplates.h" + +g2int getgridindex(g2int number) +/*!$$$ SUBPROGRAM DOCUMENTATION BLOCK +! . . . . +! SUBPROGRAM: getgridindex +! PRGMMR: Gilbert ORG: W/NP11 DATE: 2001-06-28 +! +! ABSTRACT: This function returns the index of specified Grid +! Definition Template 3.NN (NN=number) in array templates. +! +! PROGRAM HISTORY LOG: +! 2001-06-28 Gilbert +! +! USAGE: index=getgridindex(number) +! INPUT ARGUMENT LIST: +! number - NN, indicating the number of the Grid Definition +! Template 3.NN that is being requested. +! +! RETURNS: Index of GDT 3.NN in array templates, if template exists. +! = -1, otherwise. +! +! REMARKS: None +! +! ATTRIBUTES: +! LANGUAGE: C +! MACHINE: IBM SP +! +!$$$*/ +{ + g2int j,getgridindex=-1; + + for (j=0;jtype=3; + new->num=templatesgrid[index].template_num; + new->maplen=templatesgrid[index].mapgridlen; + new->needext=templatesgrid[index].needext; + new->map=(g2int *)templatesgrid[index].mapgrid; + new->extlen=0; + new->ext=0; //NULL + return(new); + } + else { + printf("getgridtemplate: GDT Template 3.%d not defined.\n",(int)number); + return(0); //NULL + } + + return(0); //NULL +} + + +template *extgridtemplate(g2int number,g2int *list) +/*!$$$ SUBPROGRAM DOCUMENTATION BLOCK +! . . . . +! SUBPROGRAM: extgridtemplate +! PRGMMR: Gilbert ORG: W/NP11 DATE: 2000-05-09 +! +! ABSTRACT: This subroutine generates the remaining octet map for a +! given Grid Definition Template, if required. Some Templates can +! vary depending on data values given in an earlier part of the +! Template, and it is necessary to know some of the earlier entry +! values to generate the full octet map of the Template. +! +! PROGRAM HISTORY LOG: +! 2000-05-09 Gilbert +! +! USAGE: CALL extgridtemplate(number,list) +! INPUT ARGUMENT LIST: +! number - NN, indicating the number of the Grid Definition +! Template 3.NN that is being requested. +! list() - The list of values for each entry in +! the Grid Definition Template. +! +! RETURN VALUE: +! - Pointer to the returned template struct. +! Returns NULL pointer, if template not found. +! +! ATTRIBUTES: +! LANGUAGE: C +! MACHINE: IBM SP +! +!$$$*/ +{ + template *new; + g2int index,i; + + index=getgridindex(number); + if (index == -1) return(0); + + new=getgridtemplate(number); + + if ( ! new->needext ) return(new); + + if ( number == 120 ) { + new->extlen=list[1]*2; + new->ext=(g2int *)malloc(sizeof(g2int)*new->extlen); + for (i=0;iextlen;i++) { + if ( i%2 == 0 ) { + new->ext[i]=2; + } + else { + new->ext[i]=-2; + } + } + } + else if ( number == 1000 ) { + new->extlen=list[19]; + new->ext=(g2int *)malloc(sizeof(g2int)*new->extlen); + for (i=0;iextlen;i++) { + new->ext[i]=4; + } + } + else if ( number == 1200 ) { + new->extlen=list[15]; + new->ext=(g2int *)malloc(sizeof(g2int)*new->extlen); + for (i=0;iextlen;i++) { + new->ext[i]=4; + } + } + + return(new); + +} diff -Nru saga-2.1.0+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/gridtemplates.h saga-2.1.4+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/gridtemplates.h --- saga-2.1.0+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/gridtemplates.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/gridtemplates.h 2014-11-13 08:32:19.000000000 +0000 @@ -0,0 +1,99 @@ +/********************************************************** + * Version $Id: gridtemplates.h 911 2011-02-14 16:38:15Z reklov_w $ + *********************************************************/ +#ifndef _gridtemplates_H +#define _gridtemplates_H +#include "grib2.h" + +// PRGMMR: Gilbert ORG: W/NP11 DATE: 2001-10-26 +// +// ABSTRACT: This Fortran Module contains info on all the available +// GRIB2 Grid Definition Templates used in Section 3 (GDS). +// The information decribing each template is stored in the +// gridtemplate structure defined below. +// +// Each Template has three parts: The number of entries in the template +// (mapgridlen); A map of the template (mapgrid), which contains the +// number of octets in which to pack each of the template values; and +// a logical value (needext) that indicates whether the Template needs +// to be extended. In some cases the number of entries in a template +// can vary depending upon values specified in the "static" part of +// the template. ( See Template 3.120 as an example ) +// +// NOTE: Array mapgrid contains the number of octets in which the +// corresponding template values will be stored. A negative value in +// mapgrid is used to indicate that the corresponding template entry can +// contain negative values. This information is used later when packing +// (or unpacking) the template data values. Negative data values in GRIB +// are stored with the left most bit set to one, and a negative number +// of octets value in mapgrid[] indicates that this possibility should +// be considered. The number of octets used to store the data value +// in this case would be the absolute value of the negative value in +// mapgrid[]. +// +// +//////////////////////////////////////////////////////////////////// + + #define MAXGRIDTEMP 23 // maximum number of templates + #define MAXGRIDMAPLEN 200 // maximum template map length + + struct gridtemplate + { + g2int template_num; + g2int mapgridlen; + g2int needext; + g2int mapgrid[MAXGRIDMAPLEN]; + }; + + const struct gridtemplate templatesgrid[MAXGRIDTEMP] = { + // 3.0: Lat/Lon grid + { 0, 19, 0, {1,1,4,1,4,1,4,4,4,4,4,-4,4,1,-4,4,4,4,1} }, + // 3.1: Rotated Lat/Lon grid + { 1, 22, 0, {1,1,4,1,4,1,4,4,4,4,4,-4,4,1,-4,4,4,4,1,-4,4,4} }, + // 3.2: Stretched Lat/Lon grid + { 2, 22, 0, {1,1,4,1,4,1,4,4,4,4,4,-4,4,1,-4,4,4,4,1,-4,4,-4} }, + // 3.3: Stretched & Rotated Lat/Lon grid + { 3, 25, 0, {1,1,4,1,4,1,4,4,4,4,4,-4,4,1,-4,4,4,4,1,-4,4,4,-4,4,-4} }, + // 3.10: Mercator + {10, 19, 0, {1,1,4,1,4,1,4,4,4,-4,4,1,-4,-4,4,1,4,4,4} }, + // 3.20: Polar Stereographic Projection + {20, 18, 0, {1,1,4,1,4,1,4,4,4,-4,4,1,-4,4,4,4,1,1} }, + // 3.30: Lambert Conformal + {30, 22, 0, {1,1,4,1,4,1,4,4,4,-4,4,1,-4,4,4,4,1,1,-4,-4,-4,4} }, + // 3.31: Albers equal area + {31, 22, 0, {1,1,4,1,4,1,4,4,4,-4,4,1,-4,4,4,4,1,1,-4,-4,-4,4} }, + // 3.40: Guassian Lat/Lon + {40, 19, 0, {1,1,4,1,4,1,4,4,4,4,4,-4,4,1,-4,4,4,4,1} }, + // 3.41: Rotated Gaussian Lat/Lon + {41, 22, 0, {1,1,4,1,4,1,4,4,4,4,4,-4,4,1,-4,4,4,4,1,-4,4,4} }, + // 3.42: Stretched Gaussian Lat/Lon + {42, 22, 0, {1,1,4,1,4,1,4,4,4,4,4,-4,4,1,-4,4,4,4,1,-4,4,-4} }, + // 3.43: Stretched and Rotated Gaussian Lat/Lon + {43, 25, 0, {1,1,4,1,4,1,4,4,4,4,4,-4,4,1,-4,4,4,4,1,-4,4,4,-4,4,-4} }, + // 3.50: Spherical Harmonic Coefficients + {50, 5, 0, {4,4,4,1,1} }, + // 3.51: Rotated Spherical Harmonic Coefficients + {51, 8, 0, {4,4,4,1,1,-4,4,4} }, + // 3.52: Stretched Spherical Harmonic Coefficients + {52, 8, 0, {4,4,4,1,1,-4,4,-4} }, + // 3.53: Stretched and Rotated Spherical Harmonic Coefficients + {53, 11, 0, {4,4,4,1,1,-4,4,4,-4,4,-4} }, + // 3.90: Space View Perspective or orthographic + {90, 21, 0, {1,1,4,1,4,1,4,4,4,-4,4,1,4,4,4,4,1,4,4,4,4} }, + // 3.100: Triangular grid based on an icosahedron + {100, 11, 0, {1,1,2,1,-4,4,4,1,1,1,4} }, + // 3.110: Equatorial Azimuthal equidistant + {110, 16, 0, {1,1,4,1,4,1,4,4,4,-4,4,1,4,4,1,1} }, + // 3.120: Azimuth-range projection + {120, 7, 1, {4,4,-4,4,4,4,1} }, + // 3.1000: Cross Section Grid + {1000, 20, 1, {1,1,4,1,4,1,4,4,4,4,-4,4,1,4,4,1,2,1,1,2} }, + // 3.1100: Hovmoller Diagram Grid + {1100, 28, 0, {1,1,4,1,4,1,4,4,4,4,-4,4,1,-4,4,1,4,1,-4,1,1,-4,2,1,1,1,1,1} }, + // 3.1200: Time Section Grid + {1200, 16, 1, {4,1,-4,1,1,-4,2,1,1,1,1,1,2,1,1,2} } + + } ; + + +#endif /* _gridtemplates_H */ diff -Nru saga-2.1.0+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/int_power.c saga-2.1.4+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/int_power.c --- saga-2.1.0+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/int_power.c 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/int_power.c 2014-11-13 08:32:19.000000000 +0000 @@ -0,0 +1,33 @@ +/********************************************************** + * Version $Id: int_power.c 911 2011-02-14 16:38:15Z reklov_w $ + *********************************************************/ +#include "grib2.h" +/* + * w. ebisuzaki + * + * return x**y + * + * + * input: double x + * int y + */ +double int_power(double x, g2int y) { + + double value; + + if (y < 0) { + y = -y; + x = 1.0 / x; + } + value = 1.0; + + while (y) { + if (y & 1) { + value *= x; + } + x = x * x; + y >>= 1; + } + return value; +} + diff -Nru saga-2.1.0+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/jpcpack.c saga-2.1.4+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/jpcpack.c --- saga-2.1.0+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/jpcpack.c 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/jpcpack.c 2014-11-13 08:32:19.000000000 +0000 @@ -0,0 +1,178 @@ +/********************************************************** + * Version $Id: jpcpack.c 911 2011-02-14 16:38:15Z reklov_w $ + *********************************************************/ +#include +#include +#include "grib2.h" + +int enc_jpeg2000(unsigned char *,g2int ,g2int ,g2int , + g2int , g2int, g2int , char *, g2int ); + +void jpcpack(g2float *fld,g2int width,g2int height,g2int *idrstmpl, + unsigned char *cpack,g2int *lcpack) +//$$$ SUBPROGRAM DOCUMENTATION BLOCK +// . . . . +// SUBPROGRAM: jpcpack +// PRGMMR: Gilbert ORG: W/NP11 DATE: 2003-08-17 +// +// ABSTRACT: This subroutine packs up a data field into a JPEG2000 code stream. +// After the data field is scaled, and the reference value is subtracted out, +// it is treated as a grayscale image and passed to a JPEG2000 encoder. +// It also fills in GRIB2 Data Representation Template 5.40 or 5.40000 with +// the appropriate values. +// +// PROGRAM HISTORY LOG: +// 2003-08-17 Gilbert +// 2004-11-92 Gilbert - Fixed bug encountered when packing a near constant +// field. +// 2004-07-19 Gilbert - Added check on whether the jpeg2000 encoding was +// successful. If not, try again with different encoder +// options. +// 2005-05-10 Gilbert - Imposed minimum size on cpack, used to hold encoded +// bit string. +// +// USAGE: jpcpack(g2float *fld,g2int width,g2int height,g2int *idrstmpl, +// unsigned char *cpack,g2int *lcpack); +// INPUT ARGUMENT LIST: +// fld[] - Contains the data values to pack +// width - number of points in the x direction +// height - number of points in the y direction +// idrstmpl - Contains the array of values for Data Representation +// Template 5.40 or 5.40000 +// [0] = Reference value - ignored on input +// [1] = Binary Scale Factor +// [2] = Decimal Scale Factor +// [3] = number of bits for each data value - ignored on input +// [4] = Original field type - currently ignored on input +// Data values assumed to be reals. +// [5] = 0 - use lossless compression +// = 1 - use lossy compression +// [6] = Desired compression ratio, if idrstmpl[5]=1. +// Set to 255, if idrstmpl[5]=0. +// lcpack - size of array cpack[] +// +// OUTPUT ARGUMENT LIST: +// idrstmpl - Contains the array of values for Data Representation +// Template 5.0 +// [0] = Reference value - set by jpcpack routine. +// [1] = Binary Scale Factor - unchanged from input +// [2] = Decimal Scale Factor - unchanged from input +// [3] = Number of bits containing each grayscale pixel value +// [4] = Original field type - currently set = 0 on output. +// Data values assumed to be reals. +// [5] = 0 - use lossless compression +// = 1 - use lossy compression +// [6] = Desired compression ratio, if idrstmpl[5]=1 +// cpack - The packed data field +// lcpack - length of packed field in cpack. +// +// REMARKS: None +// +// ATTRIBUTES: +// LANGUAGE: C +// MACHINE: IBM SP +// +//$$$ +{ + g2int *ifld; + static g2float alog2=0.69314718; // ln(2.0) + g2int j,nbits,imin,imax,maxdif; + g2int ndpts,nbytes,nsize,retry; + g2float bscale,dscale,rmax,rmin,temp; + unsigned char *ctemp; + + ifld=0; + ndpts=width*height; + bscale=int_power(2.0,-idrstmpl[1]); + dscale=int_power(10.0,idrstmpl[2]); +// +// Find max and min values in the data +// + rmax=fld[0]; + rmin=fld[0]; + for (j=1;j rmax) rmax=fld[j]; + if (fld[j] < rmin) rmin=fld[j]; + } + if (idrstmpl[1] == 0) + maxdif = (g2int) (rint(rmax*dscale) - rint(rmin*dscale)); + else + maxdif = (g2int)rint( (rmax-rmin)*dscale*bscale ); +// +// If max and min values are not equal, pack up field. +// If they are equal, we have a constant field, and the reference +// value (rmin) is the value for each point in the field and +// set nbits to 0. +// + if ( rmin != rmax && maxdif != 0 ) { + ifld=(g2int *)malloc(ndpts*sizeof(g2int)); + // + // Determine which algorithm to use based on user-supplied + // binary scale factor and number of bits. + // + if (idrstmpl[1] == 0) { + // + // No binary scaling and calculate minumum number of + // bits in which the data will fit. + // + imin=(g2int)rint(rmin*dscale); + imax=(g2int)rint(rmax*dscale); + maxdif=imax-imin; + temp=log((double)(maxdif+1))/alog2; + nbits=(g2int)ceil(temp); + rmin=(g2float)imin; + // scale data + for(j=0;j +#include +#include "grib2.h" + + int dec_jpeg2000(char *,g2int ,g2int *); + +g2int jpcunpack(unsigned char *cpack,g2int len,g2int *idrstmpl,g2int ndpts, + g2float *fld) +//$$$ SUBPROGRAM DOCUMENTATION BLOCK +// . . . . +// SUBPROGRAM: jpcunpack +// PRGMMR: Gilbert ORG: W/NP11 DATE: 2003-08-27 +// +// ABSTRACT: This subroutine unpacks a data field that was packed into a +// JPEG2000 code stream +// using info from the GRIB2 Data Representation Template 5.40 or 5.40000. +// +// PROGRAM HISTORY LOG: +// 2003-08-27 Gilbert +// +// USAGE: jpcunpack(unsigned char *cpack,g2int len,g2int *idrstmpl,g2int ndpts, +// g2float *fld) +// INPUT ARGUMENT LIST: +// cpack - The packed data field (character*1 array) +// len - length of packed field cpack(). +// idrstmpl - Pointer to array of values for Data Representation +// Template 5.40 or 5.40000 +// ndpts - The number of data values to unpack +// +// OUTPUT ARGUMENT LIST: +// fld[] - Contains the unpacked data values +// +// REMARKS: None +// +// ATTRIBUTES: +// LANGUAGE: C +// MACHINE: IBM SP +// +//$$$ +{ + + g2int *ifld; + g2int j,nbits,iret; + g2float ref,bscale,dscale; + + rdieee(idrstmpl+0,&ref,1); + bscale = int_power(2.0,idrstmpl[1]); + dscale = int_power(10.0,-idrstmpl[2]); + nbits = idrstmpl[3]; +// +// if nbits equals 0, we have a constant field where the reference value +// is the data value at each gridpoint +// + if (nbits != 0) { + + ifld=(g2int *)calloc(ndpts,sizeof(g2int)); + if ( ifld == 0 ) { + fprintf(stderr,"Could not allocate space in jpcunpack.\n Data field NOT upacked.\n"); + return(1); + } + iret=(g2int)dec_jpeg2000(cpack,len,ifld); + for (j=0;j +#include +#include "grib2.h" + +void misspack(g2float *fld,g2int ndpts,g2int idrsnum,g2int *idrstmpl, + unsigned char *cpack, g2int *lcpack) +//$$$ SUBPROGRAM DOCUMENTATION BLOCK +// . . . . +// SUBPROGRAM: misspack +// PRGMMR: Gilbert ORG: W/NP11 DATE: 2000-06-21 +// +// ABSTRACT: This subroutine packs up a data field using a complex +// packing algorithm as defined in the GRIB2 documention. It +// supports GRIB2 complex packing templates with or without +// spatial differences (i.e. DRTs 5.2 and 5.3). +// It also fills in GRIB2 Data Representation Template 5.2 or 5.3 +// with the appropriate values. +// This version assumes that Missing Value Management is being used and that +// 1 or 2 missing values appear in the data. +// +// PROGRAM HISTORY LOG: +// 2000-06-21 Gilbert +// +// USAGE: misspack(g2float *fld,g2int ndpts,g2int idrsnum,g2int *idrstmpl, +// unsigned char *cpack, g2int *lcpack) +// INPUT ARGUMENT LIST: +// fld[] - Contains the data values to pack +// ndpts - The number of data values in array fld[] +// idrsnum - Data Representation Template number 5.N +// Must equal 2 or 3. +// idrstmpl - Contains the array of values for Data Representation +// Template 5.2 or 5.3 +// [0] = Reference value - ignored on input +// [1] = Binary Scale Factor +// [2] = Decimal Scale Factor +// . +// . +// [6] = Missing value management +// [7] = Primary missing value +// [8] = Secondary missing value +// . +// . +// [16] = Order of Spatial Differencing ( 1 or 2 ) +// . +// . +// +// OUTPUT ARGUMENT LIST: +// idrstmpl - Contains the array of values for Data Representation +// Template 5.3 +// [0] = Reference value - set by misspack routine. +// [1] = Binary Scale Factor - unchanged from input +// [2] = Decimal Scale Factor - unchanged from input +// . +// . +// cpack - The packed data field (character*1 array) +// *lcpack - length of packed field cpack(). +// +// REMARKS: None +// +// ATTRIBUTES: +// LANGUAGE: C +// MACHINE: +// +//$$$ +{ + + g2int *ifld, *ifldmiss, *jfld; + g2int *jmin, *jmax, *lbit; + static g2int zero=0; + g2int *gref, *gwidth, *glen; + g2int glength, grpwidth; + g2int i, n, iofst, imin, ival1, ival2, isd, minsd, nbitsd; + g2int nbitsgref, left, iwmax, ngwidthref, nbitsgwidth, ilmax; + g2int nglenref, nglenlast, nbitsglen, ij; + g2int j, missopt, nonmiss, itemp, maxorig, nbitorig, miss1, miss2; + g2int ngroups, ng, num0, num1, num2; + g2int imax, lg, mtemp, ier, igmax; + g2int kfildo, minpk, inc, maxgrps, ibit, jbit, kbit, novref, lbitref; + g2float rmissp, rmisss, bscale, dscale, rmin, temp; + static g2int simple_alg = 0; + static g2float alog2=0.69314718; // ln(2.0) + static g2int one=1; + + bscale=int_power(2.0,-idrstmpl[1]); + dscale=int_power(10.0,idrstmpl[2]); + missopt=idrstmpl[6]; + if ( missopt != 1 && missopt != 2 ) { + printf("misspack: Unrecognized option.\n"); + *lcpack=-1; + return; + } + else { // Get missing values + rdieee(idrstmpl+7,&rmissp,1); + if (missopt == 2) rdieee(idrstmpl+8,&rmisss,1); + } +// +// Find min value of non-missing values in the data, +// AND set up missing value mapping of the field. +// + ifldmiss = calloc(ndpts,sizeof(g2int)); + rmin=1E+37; + if ( missopt == 1 ) { // Primary missing value only + for ( j=0; j0; j--) + jfld[j]=jfld[j]-jfld[j-1]; + jfld[0]=0; + } + else if (idrstmpl[16] == 2) { // second order + ival1=jfld[0]; + ival2=jfld[1]; + for ( j=nonmiss-1; j>1; j--) + jfld[j]=jfld[j]-(2*jfld[j-1])+jfld[j-2]; + jfld[0]=0; + jfld[1]=0; + } + // + // subtract min value from spatial diff field + // + isd=idrstmpl[16]; + minsd=jfld[isd]; + for ( j=isd; jival1) maxorig=ival2; + temp=log((double)(maxorig+1))/alog2; + nbitorig=(g2int)ceil(temp)+1; + if (nbitorig > nbitsd) nbitsd=nbitorig; + // increase number of bits to even multiple of 8 ( octet ) + if ( (nbitsd%8) != 0) nbitsd=nbitsd+(8-(nbitsd%8)); + // + // Store extra spatial differencing info into the packed + // data section. + // + if (nbitsd != 0) { + // pack first original value + if (ival1 >= 0) { + sbit(cpack,&ival1,iofst,nbitsd); + iofst=iofst+nbitsd; + } + else { + sbit(cpack,&one,iofst,1); + iofst=iofst+1; + itemp=abs(ival1); + sbit(cpack,&itemp,iofst,nbitsd-1); + iofst=iofst+nbitsd-1; + } + if (idrstmpl[16] == 2) { + // pack second original value + if (ival2 >= 0) { + sbit(cpack,&ival2,iofst,nbitsd); + iofst=iofst+nbitsd; + } + else { + sbit(cpack,&one,iofst,1); + iofst=iofst+1; + itemp=abs(ival2); + sbit(cpack,&itemp,iofst,nbitsd-1); + iofst=iofst+nbitsd-1; + } + } + // pack overall min of spatial differences + if (minsd >= 0) { + sbit(cpack,&minsd,iofst,nbitsd); + iofst=iofst+nbitsd; + } + else { + sbit(cpack,&one,iofst,1); + iofst=iofst+1; + itemp=abs(minsd); + sbit(cpack,&itemp,iofst,nbitsd-1); + iofst=iofst+nbitsd-1; + } + } + //print *,'SDp ',ival1,ival2,minsd,nbitsd + } // end of spatial diff section + // + // Expand non-missing data values to original grid. + // + miss1=jfld[0]; + for ( j=0; j imax) imax=ifld[j]; + } + j++; + } + if (missopt == 1) imax=imax+1; + if (missopt == 2) imax=imax+2; + // calc num of bits needed to hold data + if ( gref[ng] != imax ) { + temp=log((double)(imax-gref[ng]+1))/alog2; + gwidth[ng]=(g2int)ceil(temp); + } + else { + gwidth[ng]=0; + } + } + // Subtract min from data + j=n; + mtemp=(g2int)int_power(2.,gwidth[ng]); + for ( lg=0; lg igmax) igmax=gref[j]; + if (missopt == 1) igmax=igmax+1; + if (missopt == 2) igmax=igmax+2; + if (igmax != 0) { + temp=log((double)(igmax+1))/alog2; + nbitsgref=(g2int)ceil(temp); + // reset the ref values of any "missing only" groups. + mtemp=(g2int)int_power(2.,nbitsgref); + for ( j=0; j iwmax) iwmax=gwidth[j]; + if (gwidth[j] < ngwidthref) ngwidthref=gwidth[j]; + } + if (iwmax != ngwidthref) { + temp=log((double)(iwmax-ngwidthref+1))/alog2; + nbitsgwidth=(g2int)ceil(temp); + for ( i=0; i ilmax) ilmax=glen[j]; + if (glen[j] < nglenref) nglenref=glen[j]; + } + nglenlast=glen[ngroups-1]; + if (ilmax != nglenref) { + temp=log((double)(ilmax-nglenref+1))/alog2; + nbitsglen=(g2int)ceil(temp); + for ( i=0; i +#include +#include "grib2.h" + + +void mkieee(g2float *a,g2int *rieee,g2int num) +//$$$ SUBPROGRAM DOCUMENTATION BLOCK +// . . . . +// SUBPROGRAM: mkieee +// PRGMMR: Gilbert ORG: W/NP11 DATE: 2002-10-29 +// +// ABSTRACT: This subroutine stores a list of real values in +// 32-bit IEEE floating point format. +// +// PROGRAM HISTORY LOG: +// 2002-10-29 Gilbert +// +// USAGE: mkieee(g2float *a,g2int *rieee,g2int num); +// INPUT ARGUMENT LIST: +// a - Input array of floating point values. +// num - Number of floating point values to convert. +// +// OUTPUT ARGUMENT LIST: +// rieee - Output array of data values in 32-bit IEEE format +// stored in g2int integer array. rieee must be allocated +// with at least 4*num bytes of memory before calling this +// function. +// +// REMARKS: None +// +// ATTRIBUTES: +// LANGUAGE: C +// MACHINE: +// +//$$$ +{ + + g2int j,n,ieee,iexp,imant; + double alog2,atemp; + + static double two23,two126; + static g2int test=0; + //g2intu msk1=0x80000000; // 10000000000000000000000000000000 binary + //g2int msk2=0x7F800000; // 01111111100000000000000000000000 binary + //g2int msk3=0x007FFFFF; // 00000000011111111111111111111111 binary + + if ( test == 0 ) { + two23=(double)int_power(2.0,23); + two126=(double)int_power(2.0,126); + test=1; + } + + alog2=0.69314718; // ln(2.0) + + for (j=0;j= 1.0 ) { + n = 0; + while ( int_power(2.0,n+1) <= atemp ) { + n++; + } + } + else { + n = -1; + while ( int_power(2.0,n) > atemp ) { + n--; + } + } + //n=(g2int)floor(log(atemp)/alog2); + iexp=n+127; + if (n > 127) iexp=255; // overflow + if (n < -127) iexp=0; + //printf("exp %ld %ld \n",iexp,n); + // set exponent bits ( bits 30-23 ) + ieee = ieee | ( iexp << 23 ); +// +// Determine Mantissa +// + if (iexp != 255) { + if (iexp != 0) + atemp=(atemp/int_power(2.0,n))-1.0; + else + atemp=atemp*two126; + imant=(g2int)rint(atemp*two23); + } + else { + imant=0; + } + //printf("mant %ld %x \n",imant,imant); + // set mantissa bits ( bits 22-0 ) + ieee = ieee | imant; +// +// Transfer IEEE bit string to rieee array +// + rieee[j]=ieee; + + } + + return; + +} diff -Nru saga-2.1.0+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/pack_gp.c saga-2.1.4+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/pack_gp.c --- saga-2.1.0+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/pack_gp.c 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/pack_gp.c 2014-11-13 08:32:19.000000000 +0000 @@ -0,0 +1,1450 @@ +/********************************************************** + * Version $Id: pack_gp.c 911 2011-02-14 16:38:15Z reklov_w $ + *********************************************************/ +/* pack_gp.f -- translated by f2c (version 20031025). + You must link the resulting object file with libf2c: + on Microsoft Windows system, link with libf2c.lib; + on Linux or Unix systems, link with .../path/to/libf2c.a -lm + or, if you install libf2c.a in a standard place, with -lf2c -lm + -- in that order, at the end of the command line, as in + cc *.o -lf2c -lm + Source for libf2c is in /netlib/f2c/libf2c.zip, e.g., + + http://www.netlib.org/f2c/libf2c.zip +*/ + +/*#include "f2c.h"*/ +#include +#include "grib2.h" +typedef g2int integer; +typedef g2int logical; +#define TRUE_ (1) +#define FALSE_ (0) + +/* Subroutine */ int pack_gp(integer *kfildo, integer *ic, integer *nxy, + integer *is523, integer *minpk, integer *inc, integer *missp, integer + *misss, integer *jmin, integer *jmax, integer *lbit, integer *nov, + integer *ndg, integer *lx, integer *ibit, integer *jbit, integer * + kbit, integer *novref, integer *lbitref, integer *ier) +{ + /* Initialized data */ + + const integer mallow = 1073741825; /* MALLOW=2**30+1 */ + static integer ifeed = 12; + static integer ifirst = 0; + + /* System generated locals */ + integer i__1, i__2, i__3; + + /* Local variables */ + static integer j, k, l; + static logical adda; + static integer ired, kinc, mina, maxa, minb, maxb, minc, maxc, ibxx2[31]; + static char cfeed[1]; + static integer nenda, nendb, ibita, ibitb, minak, minbk, maxak, maxbk, + minck, maxck, nouta, lmiss, itest, nount; + extern /* Subroutine */ int reduce(integer *, integer *, integer *, + integer *, integer *, integer *, integer *, integer *, integer *, + integer *, integer *, integer *, integer *); + static integer ibitbs, mislla, misllb, misllc, iersav, lminpk, ktotal, + kounta, kountb, kstart, mstart, mintst, maxtst, + kounts, mintstk, maxtstk; + integer *misslx; + + +/* FEBRUARY 1994 GLAHN TDL MOS-2000 */ +/* JUNE 1995 GLAHN MODIFIED FOR LMISS ERROR. */ +/* JULY 1996 GLAHN ADDED MISSS */ +/* FEBRUARY 1997 GLAHN REMOVED 4 REDUNDANT TESTS FOR */ +/* MISSP.EQ.0; INSERTED A TEST TO BETTER */ +/* HANDLE A STRING OF 9999'S */ +/* FEBRUARY 1997 GLAHN ADDED LOOPS TO ELIMINATE TEST FOR */ +/* MISSS WHEN MISSS = 0 */ +/* MARCH 1997 GLAHN CORRECTED FOR SECONDARY MISSING VALUE */ +/* MARCH 1997 GLAHN CORRECTED FOR USE OF LOCAL VALUE */ +/* OF MINPK */ +/* MARCH 1997 GLAHN CORRECTED FOR SECONDARY MISSING VALUE */ +/* MARCH 1997 GLAHN CHANGED CALCULATING NUMBER OF BITS */ +/* THROUGH EXPONENTS TO AN ARRAY (IMPROVED */ +/* OVERALL PACKING PERFORMANCE BY ABOUT */ +/* 35 PERCENT!). ALLOWED 0 BITS FOR */ +/* PACKING JMIN( ), LBIT( ), AND NOV( ). */ +/* MAY 1997 GLAHN A NUMBER OF CHANGES FOR EFFICIENCY. */ +/* MOD FUNCTIONS ELIMINATED AND ONE */ +/* IFTHEN ADDED. JOUNT REMOVED. */ +/* RECOMPUTATION OF BITS NOT MADE UNLESS */ +/* NECESSARY AFTER MOVING POINTS FROM */ +/* ONE GROUP TO ANOTHER. NENDB ADJUSTED */ +/* TO ELIMINATE POSSIBILITY OF VERY */ +/* SMALL GROUP AT THE END. */ +/* ABOUT 8 PERCENT IMPROVEMENT IN */ +/* OVERALL PACKING. ISKIPA REMOVED; */ +/* THERE IS ALWAYS A GROUP B THAT CAN */ +/* BECOME GROUP A. CONTROL ON SIZE */ +/* OF GROUP B (STATEMENT BELOW 150) */ +/* ADDED. ADDED ADDA, AND USE */ +/* OF GE AND LE INSTEAD OF GT AND LT */ +/* IN LOOPS BETWEEN 150 AND 160. */ +/* IBITBS ADDED TO SHORTEN TRIPS */ +/* THROUGH LOOP. */ +/* MARCH 2000 GLAHN MODIFIED FOR GRIB2; CHANGED NAME FROM */ +/* PACKGP */ +/* JANUARY 2001 GLAHN COMMENTS; IER = 706 SUBSTITUTED FOR */ +/* STOPS; ADDED RETURN1; REMOVED STATEMENT */ +/* NUMBER 110; ADDED IER AND * RETURN */ +/* NOVEMBER 2001 GLAHN CHANGED SOME DIAGNOSTIC FORMATS TO */ +/* ALLOW PRINTING LARGER NUMBERS */ +/* NOVEMBER 2001 GLAHN ADDED MISSLX( ) TO PUT MAXIMUM VALUE */ +/* INTO JMIN( ) WHEN ALL VALUES MISSING */ +/* TO AGREE WITH GRIB STANDARD. */ +/* NOVEMBER 2001 GLAHN CHANGED TWO TESTS ON MISSP AND MISSS */ +/* EQ 0 TO TESTS ON IS523. HOWEVER, */ +/* MISSP AND MISSS CANNOT IN GENERAL BE */ +/* = 0. */ +/* NOVEMBER 2001 GLAHN ADDED CALL TO REDUCE; DEFINED ITEST */ +/* BEFORE LOOPS TO REDUCE COMPUTATION; */ +/* STARTED LARGE GROUP WHEN ALL SAME */ +/* VALUE */ +/* DECEMBER 2001 GLAHN MODIFIED AND ADDED A FEW COMMENTS */ +/* JANUARY 2002 GLAHN REMOVED LOOP BEFORE 150 TO DETERMINE */ +/* A GROUP OF ALL SAME VALUE */ +/* JANUARY 2002 GLAHN CHANGED MALLOW FROM 9999999 TO 2**30+1, */ +/* AND MADE IT A PARAMETER */ +/* MARCH 2002 GLAHN ADDED NON FATAL IER = 716, 717; */ +/* REMOVED NENDB=NXY ABOVE 150; */ +/* ADDED IERSAV=0; COMMENTS */ + +/* PURPOSE */ +/* DETERMINES GROUPS OF VARIABLE SIZE, BUT AT LEAST OF */ +/* SIZE MINPK, THE ASSOCIATED MAX (JMAX( )) AND MIN (JMIN( )), */ +/* THE NUMBER OF BITS NECESSARY TO HOLD THE VALUES IN EACH */ +/* GROUP (LBIT( )), THE NUMBER OF VALUES IN EACH GROUP */ +/* (NOV( )), THE NUMBER OF BITS NECESSARY TO PACK THE JMIN( ) */ +/* VALUES (IBIT), THE NUMBER OF BITS NECESSARY TO PACK THE */ +/* LBIT( ) VALUES (JBIT), AND THE NUMBER OF BITS NECESSARY */ +/* TO PACK THE NOV( ) VALUES (KBIT). THE ROUTINE IS DESIGNED */ +/* TO DETERMINE THE GROUPS SUCH THAT A SMALL NUMBER OF BITS */ +/* IS NECESSARY TO PACK THE DATA WITHOUT EXCESSIVE */ +/* COMPUTATIONS. IF ALL VALUES IN THE GROUP ARE ZERO, THE */ +/* NUMBER OF BITS TO USE IN PACKING IS DEFINED AS ZERO WHEN */ +/* THERE CAN BE NO MISSING VALUES; WHEN THERE CAN BE MISSING */ +/* VALUES, THE NUMBER OF BITS MUST BE AT LEAST 1 TO HAVE */ +/* THE CAPABILITY TO RECOGNIZE THE MISSING VALUE. HOWEVER, */ +/* IF ALL VALUES IN A GROUP ARE MISSING, THE NUMBER OF BITS */ +/* NEEDED IS 0, AND THE UNPACKER RECOGNIZES THIS. */ +/* ALL VARIABLES ARE INTEGER. EVEN THOUGH THE GROUPS ARE */ +/* INITIALLY OF SIZE MINPK OR LARGER, AN ADJUSTMENT BETWEEN */ +/* TWO GROUPS (THE LOOKBACK PROCEDURE) MAY MAKE A GROUP */ +/* SMALLER THAN MINPK. THE CONTROL ON GROUP SIZE IS THAT */ +/* THE SUM OF THE SIZES OF THE TWO CONSECUTIVE GROUPS, EACH OF */ +/* SIZE MINPK OR LARGER, IS NOT DECREASED. WHEN DETERMINING */ +/* THE NUMBER OF BITS NECESSARY FOR PACKING, THE LARGEST */ +/* VALUE THAT CAN BE ACCOMMODATED IN, SAY, MBITS, IS */ +/* 2**MBITS-1; THIS LARGEST VALUE (AND THE NEXT SMALLEST */ +/* VALUE) IS RESERVED FOR THE MISSING VALUE INDICATOR (ONLY) */ +/* WHEN IS523 NE 0. IF THE DIMENSION NDG */ +/* IS NOT LARGE ENOUGH TO HOLD ALL THE GROUPS, THE LOCAL VALUE */ +/* OF MINPK IS INCREASED BY 50 PERCENT. THIS IS REPEATED */ +/* UNTIL NDG WILL SUFFICE. A DIAGNOSTIC IS PRINTED WHENEVER */ +/* THIS HAPPENS, WHICH SHOULD BE VERY RARELY. IF IT HAPPENS */ +/* OFTEN, NDG IN SUBROUTINE PACK SHOULD BE INCREASED AND */ +/* A CORRESPONDING INCREASE IN SUBROUTINE UNPACK MADE. */ +/* CONSIDERABLE CODE IS PROVIDED SO THAT NO MORE CHECKING */ +/* FOR MISSING VALUES WITHIN LOOPS IS DONE THAN NECESSARY; */ +/* THE ADDED EFFICIENCY OF THIS IS RELATIVELY MINOR, */ +/* BUT DOES NO HARM. FOR GRIB2, THE REFERENCE VALUE FOR */ +/* THE LENGTH OF GROUPS IN NOV( ) AND FOR THE NUMBER OF */ +/* BITS NECESSARY TO PACK GROUP VALUES ARE DETERMINED, */ +/* AND SUBTRACTED BEFORE JBIT AND KBIT ARE DETERMINED. */ + +/* WHEN 1 OR MORE GROUPS ARE LARGE COMPARED TO THE OTHERS, */ +/* THE WIDTH OF ALL GROUPS MUST BE AS LARGE AS THE LARGEST. */ +/* A SUBROUTINE REDUCE BREAKS UP LARGE GROUPS INTO 2 OR */ +/* MORE TO REDUCE TOTAL BITS REQUIRED. IF REDUCE SHOULD */ +/* ABORT, PACK_GP WILL BE EXECUTED AGAIN WITHOUT THE CALL */ +/* TO REDUCE. */ + +/* DATA SET USE */ +/* KFILDO - UNIT NUMBER FOR OUTPUT (PRINT) FILE. (OUTPUT) */ + +/* VARIABLES IN CALL SEQUENCE */ +/* KFILDO = UNIT NUMBER FOR OUTPUT (PRINT) FILE. (INPUT) */ +/* IC( ) = ARRAY TO HOLD DATA FOR PACKING. THE VALUES */ +/* DO NOT HAVE TO BE POSITIVE AT THIS POINT, BUT */ +/* MUST BE IN THE RANGE -2**30 TO +2**30 (THE */ +/* THE VALUE OF MALLOW). THESE INTEGER VALUES */ +/* WILL BE RETAINED EXACTLY THROUGH PACKING AND */ +/* UNPACKING. (INPUT) */ +/* NXY = NUMBER OF VALUES IN IC( ). ALSO TREATED */ +/* AS ITS DIMENSION. (INPUT) */ +/* IS523 = missing value management */ +/* 0=data contains no missing values */ +/* 1=data contains Primary missing values */ +/* 2=data contains Primary and secondary missing values */ +/* (INPUT) */ +/* MINPK = THE MINIMUM SIZE OF EACH GROUP, EXCEPT POSSIBLY */ +/* THE LAST ONE. (INPUT) */ +/* INC = THE NUMBER OF VALUES TO ADD TO AN ALREADY */ +/* EXISTING GROUP IN DETERMINING WHETHER OR NOT */ +/* TO START A NEW GROUP. IDEALLY, THIS WOULD BE */ +/* 1, BUT EACH TIME INC VALUES ARE ATTEMPTED, THE */ +/* MAX AND MIN OF THE NEXT MINPK VALUES MUST BE */ +/* FOUND. THIS IS "A LOOP WITHIN A LOOP," AND */ +/* A SLIGHTLY LARGER VALUE MAY GIVE ABOUT AS GOOD */ +/* RESULTS WITH SLIGHTLY LESS COMPUTATIONAL TIME. */ +/* IF INC IS LE 0, 1 IS USED, AND A DIAGNOSTIC IS */ +/* OUTPUT. NOTE: IT IS EXPECTED THAT INC WILL */ +/* EQUAL 1. THE CODE USES INC PRIMARILY IN THE */ +/* LOOPS STARTING AT STATEMENT 180. IF INC */ +/* WERE 1, THERE WOULD NOT NEED TO BE LOOPS */ +/* AS SUCH. HOWEVER, KINC (THE LOCAL VALUE OF */ +/* INC) IS SET GE 1 WHEN NEAR THE END OF THE DATA */ +/* TO FORESTALL A VERY SMALL GROUP AT THE END. */ +/* (INPUT) */ +/* MISSP = WHEN MISSING POINTS CAN BE PRESENT IN THE DATA, */ +/* THEY WILL HAVE THE VALUE MISSP OR MISSS. */ +/* MISSP IS THE PRIMARY MISSING VALUE AND MISSS */ +/* IS THE SECONDARY MISSING VALUE . THESE MUST */ +/* NOT BE VALUES THAT WOULD OCCUR WITH SUBTRACTING */ +/* THE MINIMUM (REFERENCE) VALUE OR SCALING. */ +/* FOR EXAMPLE, MISSP = 0 WOULD NOT BE ADVISABLE. */ +/* (INPUT) */ +/* MISSS = SECONDARY MISSING VALUE INDICATOR (SEE MISSP). */ +/* (INPUT) */ +/* JMIN(J) = THE MINIMUM OF EACH GROUP (J=1,LX). (OUTPUT) */ +/* JMAX(J) = THE MAXIMUM OF EACH GROUP (J=1,LX). THIS IS */ +/* NOT REALLY NEEDED, BUT SINCE THE MAX OF EACH */ +/* GROUP MUST BE FOUND, SAVING IT HERE IS CHEAP */ +/* IN CASE THE USER WANTS IT. (OUTPUT) */ +/* LBIT(J) = THE NUMBER OF BITS NECESSARY TO PACK EACH GROUP */ +/* (J=1,LX). IT IS ASSUMED THE MINIMUM OF EACH */ +/* GROUP WILL BE REMOVED BEFORE PACKING, AND THE */ +/* VALUES TO PACK WILL, THEREFORE, ALL BE POSITIVE. */ +/* HOWEVER, IC( ) DOES NOT NECESSARILY CONTAIN */ +/* ALL POSITIVE VALUES. IF THE OVERALL MINIMUM */ +/* HAS BEEN REMOVED (THE USUAL CASE), THEN IC( ) */ +/* WILL CONTAIN ONLY POSITIVE VALUES. (OUTPUT) */ +/* NOV(J) = THE NUMBER OF VALUES IN EACH GROUP (J=1,LX). */ +/* (OUTPUT) */ +/* NDG = THE DIMENSION OF JMIN( ), JMAX( ), LBIT( ), AND */ +/* NOV( ). (INPUT) */ +/* LX = THE NUMBER OF GROUPS DETERMINED. (OUTPUT) */ +/* IBIT = THE NUMBER OF BITS NECESSARY TO PACK THE JMIN(J) */ +/* VALUES, J=1,LX. (OUTPUT) */ +/* JBIT = THE NUMBER OF BITS NECESSARY TO PACK THE LBIT(J) */ +/* VALUES, J=1,LX. (OUTPUT) */ +/* KBIT = THE NUMBER OF BITS NECESSARY TO PACK THE NOV(J) */ +/* VALUES, J=1,LX. (OUTPUT) */ +/* NOVREF = REFERENCE VALUE FOR NOV( ). (OUTPUT) */ +/* LBITREF = REFERENCE VALUE FOR LBIT( ). (OUTPUT) */ +/* IER = ERROR RETURN. */ +/* 706 = VALUE WILL NOT PACK IN 30 BITS--FATAL */ +/* 714 = ERROR IN REDUCE--NON-FATAL */ +/* 715 = NGP NOT LARGE ENOUGH IN REDUCE--NON-FATAL */ +/* 716 = MINPK INCEASED--NON-FATAL */ +/* 717 = INC SET = 1--NON-FATAL */ +/* (OUTPUT) */ +/* * = ALTERNATE RETURN WHEN IER NE 0 AND FATAL ERROR. */ + +/* INTERNAL VARIABLES */ +/* CFEED = CONTAINS THE CHARACTER REPRESENTATION */ +/* OF A PRINTER FORM FEED. */ +/* IFEED = CONTAINS THE INTEGER VALUE OF A PRINTER */ +/* FORM FEED. */ +/* KINC = WORKING COPY OF INC. MAY BE MODIFIED. */ +/* MINA = MINIMUM VALUE IN GROUP A. */ +/* MAXA = MAXIMUM VALUE IN GROUP A. */ +/* NENDA = THE PLACE IN IC( ) WHERE GROUP A ENDS. */ +/* KSTART = THE PLACE IN IC( ) WHERE GROUP A STARTS. */ +/* IBITA = NUMBER OF BITS NEEDED TO HOLD VALUES IN GROUP A. */ +/* MINB = MINIMUM VALUE IN GROUP B. */ +/* MAXB = MAXIMUM VALUE IN GROUP B. */ +/* NENDB = THE PLACE IN IC( ) WHERE GROUP B ENDS. */ +/* IBITB = NUMBER OF BITS NEEDED TO HOLD VALUES IN GROUP B. */ +/* MINC = MINIMUM VALUE IN GROUP C. */ +/* MAXC = MAXIMUM VALUE IN GROUP C. */ +/* KTOTAL = COUNT OF NUMBER OF VALUES IN IC( ) PROCESSED. */ +/* NOUNT = NUMBER OF VALUES ADDED TO GROUP A. */ +/* LMISS = 0 WHEN IS523 = 0. WHEN PACKING INTO A */ +/* SPECIFIC NUMBER OF BITS, SAY MBITS, */ +/* THE MAXIMUM VALUE THAT CAN BE HANDLED IS */ +/* 2**MBITS-1. WHEN IS523 = 1, INDICATING */ +/* PRIMARY MISSING VALUES, THIS MAXIMUM VALUE */ +/* IS RESERVED TO HOLD THE PRIMARY MISSING VALUE */ +/* INDICATOR AND LMISS = 1. WHEN IS523 = 2, */ +/* THE VALUE JUST BELOW THE MAXIMUM (I.E., */ +/* 2**MBITS-2) IS RESERVED TO HOLD THE SECONDARY */ +/* MISSING VALUE INDICATOR AND LMISS = 2. */ +/* LMINPK = LOCAL VALUE OF MINPK. THIS WILL BE ADJUSTED */ +/* UPWARD WHENEVER NDG IS NOT LARGE ENOUGH TO HOLD */ +/* ALL THE GROUPS. */ +/* MALLOW = THE LARGEST ALLOWABLE VALUE FOR PACKING. */ +/* MISLLA = SET TO 1 WHEN ALL VALUES IN GROUP A ARE MISSING. */ +/* THIS IS USED TO DISTINGUISH BETWEEN A REAL */ +/* MINIMUM WHEN ALL VALUES ARE NOT MISSING */ +/* AND A MINIMUM THAT HAS BEEN SET TO ZERO WHEN */ +/* ALL VALUES ARE MISSING. 0 OTHERWISE. */ +/* NOTE THAT THIS DOES NOT DISTINGUISH BETWEEN */ +/* PRIMARY AND SECONDARY MISSINGS WHEN SECONDARY */ +/* MISSINGS ARE PRESENT. THIS MEANS THAT */ +/* LBIT( ) WILL NOT BE ZERO WITH THE RESULTING */ +/* COMPRESSION EFFICIENCY WHEN SECONDARY MISSINGS */ +/* ARE PRESENT. ALSO NOTE THAT A CHECK HAS BEEN */ +/* MADE EARLIER TO DETERMINE THAT SECONDARY */ +/* MISSINGS ARE REALLY THERE. */ +/* MISLLB = SET TO 1 WHEN ALL VALUES IN GROUP B ARE MISSING. */ +/* THIS IS USED TO DISTINGUISH BETWEEN A REAL */ +/* MINIMUM WHEN ALL VALUES ARE NOT MISSING */ +/* AND A MINIMUM THAT HAS BEEN SET TO ZERO WHEN */ +/* ALL VALUES ARE MISSING. 0 OTHERWISE. */ +/* MISLLC = PERFORMS THE SAME FUNCTION FOR GROUP C THAT */ +/* MISLLA AND MISLLB DO FOR GROUPS B AND C, */ +/* RESPECTIVELY. */ +/* IBXX2(J) = AN ARRAY THAT WHEN THIS ROUTINE IS FIRST ENTERED */ +/* IS SET TO 2**J, J=0,30. IBXX2(30) = 2**30, WHICH */ +/* IS THE LARGEST VALUE PACKABLE, BECAUSE 2**31 */ +/* IS LARGER THAN THE INTEGER WORD SIZE. */ +/* IFIRST = SET BY DATA STATEMENT TO 0. CHANGED TO 1 ON */ +/* FIRST */ +/* ENTRY WHEN IBXX2( ) IS FILLED. */ +/* MINAK = KEEPS TRACK OF THE LOCATION IN IC( ) WHERE THE */ +/* MINIMUM VALUE IN GROUP A IS LOCATED. */ +/* MAXAK = DOES THE SAME AS MINAK, EXCEPT FOR THE MAXIMUM. */ +/* MINBK = THE SAME AS MINAK FOR GROUP B. */ +/* MAXBK = THE SAME AS MAXAK FOR GROUP B. */ +/* MINCK = THE SAME AS MINAK FOR GROUP C. */ +/* MAXCK = THE SAME AS MAXAK FOR GROUP C. */ +/* ADDA = KEEPS TRACK WHETHER OR NOT AN ATTEMPT TO ADD */ +/* POINTS TO GROUP A WAS MADE. IF SO, THEN ADDA */ +/* KEEPS FROM TRYING TO PUT ONE BACK INTO B. */ +/* (LOGICAL) */ +/* IBITBS = KEEPS CURRENT VALUE IF IBITB SO THAT LOOP */ +/* ENDING AT 166 DOESN'T HAVE TO START AT */ +/* IBITB = 0 EVERY TIME. */ +/* MISSLX(J) = MALLOW EXCEPT WHEN A GROUP IS ALL ONE VALUE (AND */ +/* LBIT(J) = 0) AND THAT VALUE IS MISSING. IN */ +/* THAT CASE, MISSLX(J) IS MISSP OR MISSS. THIS */ +/* GETS INSERTED INTO JMIN(J) LATER AS THE */ +/* MISSING INDICATOR; IT CAN'T BE PUT IN UNTIL */ +/* THE END, BECAUSE JMIN( ) IS USED TO CALCULATE */ +/* THE MAXIMUM NUMBER OF BITS (IBITS) NEEDED TO */ +/* PACK JMIN( ). */ +/* 1 2 3 4 5 6 7 X */ + +/* NON SYSTEM SUBROUTINES CALLED */ +/* NONE */ + + + +/* MISSLX( ) was AN AUTOMATIC ARRAY. */ + misslx = (integer *)calloc(*ndg,sizeof(integer)); + + + /* Parameter adjustments */ + --ic; + --nov; + --lbit; + --jmax; + --jmin; + + /* Function Body */ + + *ier = 0; + iersav = 0; +/* CALL TIMPR(KFILDO,KFILDO,'START PACK_GP ') */ + *(unsigned char *)cfeed = (char) ifeed; + + ired = 0; +/* IRED IS A FLAG. WHEN ZERO, REDUCE WILL BE CALLED. */ +/* IF REDUCE ABORTS, IRED = 1 AND IS NOT CALLED. IN */ +/* THIS CASE PACK_GP EXECUTES AGAIN EXCEPT FOR REDUCE. */ + + if (*inc <= 0) { + iersav = 717; +/* WRITE(KFILDO,101)INC */ +/* 101 FORMAT(/' ****INC ='I8,' NOT CORRECT IN PACK_GP. 1 IS USED.') */ + } + +/* THERE WILL BE A RESTART OF PACK_GP IF SUBROUTINE REDUCE */ +/* ABORTS. THIS SHOULD NOT HAPPEN, BUT IF IT DOES, PACK_GP */ +/* WILL COMPLETE WITHOUT SUBROUTINE REDUCE. A NON FATAL */ +/* DIAGNOSTIC RETURN IS PROVIDED. */ + +L102: + /*kinc = max(*inc,1);*/ + kinc = (*inc > 1) ? *inc : 1; + lminpk = *minpk; + +/* CALCULATE THE POWERS OF 2 THE FIRST TIME ENTERED. */ + + if (ifirst == 0) { + ifirst = 1; + ibxx2[0] = 1; + + for (j = 1; j <= 30; ++j) { + ibxx2[j] = ibxx2[j - 1] << 1; +/* L104: */ + } + + } + +/* THERE WILL BE A RESTART AT 105 IS NDG IS NOT LARGE ENOUGH. */ +/* A NON FATAL DIAGNOSTIC RETURN IS PROVIDED. */ + +L105: + kstart = 1; + ktotal = 0; + *lx = 0; + adda = FALSE_; + lmiss = 0; + if (*is523 == 1) { + lmiss = 1; + } + if (*is523 == 2) { + lmiss = 2; + } + +/* ************************************* */ + +/* THIS SECTION COMPUTES STATISTICS FOR GROUP A. GROUP A IS */ +/* A GROUP OF SIZE LMINPK. */ + +/* ************************************* */ + + ibita = 0; + mina = mallow; + maxa = -mallow; + minak = mallow; + maxak = -mallow; + +/* FIND THE MIN AND MAX OF GROUP A. THIS WILL INITIALLY BE OF */ +/* SIZE LMINPK (IF THERE ARE STILL LMINPK VALUES IN IC( )), BUT */ +/* WILL INCREASE IN SIZE IN INCREMENTS OF INC UNTIL A NEW */ +/* GROUP IS STARTED. THE DEFINITION OF GROUP A IS DONE HERE */ +/* ONLY ONCE (UPON INITIAL ENTRY), BECAUSE A GROUP B CAN ALWAYS */ +/* BECOME A NEW GROUP A AFTER A IS PACKED, EXCEPT IF LMINPK */ +/* HAS TO BE INCREASED BECAUSE NDG IS TOO SMALL. THEREFORE, */ +/* THE SEPARATE LOOPS FOR MISSING AND NON-MISSING HERE BUYS */ +/* ALMOST NOTHING. */ + +/* Computing MIN */ + i__1 = kstart + lminpk - 1; + /*nenda = min(i__1,*nxy);*/ + nenda = (i__1 < *nxy) ? i__1 : *nxy; + if (*nxy - nenda <= lminpk / 2) { + nenda = *nxy; + } +/* ABOVE STATEMENT GUARANTEES THE LAST GROUP IS GT LMINPK/2 BY */ +/* MAKING THE ACTUAL GROUP LARGER. IF A PROVISION LIKE THIS IS */ +/* NOT INCLUDED, THERE WILL MANY TIMES BE A VERY SMALL GROUP */ +/* AT THE END. USE SEPARATE LOOPS FOR MISSING AND NO MISSING */ +/* VALUES FOR EFFICIENCY. */ + +/* DETERMINE WHETHER THERE IS A LONG STRING OF THE SAME VALUE */ +/* UNLESS NENDA = NXY. THIS MAY ALLOW A LARGE GROUP A TO */ +/* START WITH, AS WITH MISSING VALUES. SEPARATE LOOPS FOR */ +/* MISSING OPTIONS. THIS SECTION IS ONLY EXECUTED ONCE, */ +/* IN DETERMINING THE FIRST GROUP. IT HELPS FOR AN ARRAY */ +/* OF MOSTLY MISSING VALUES OR OF ONE VALUE, SUCH AS */ +/* RADAR OR PRECIP DATA. */ + + if (nenda != *nxy && ic[kstart] == ic[kstart + 1]) { +/* NO NEED TO EXECUTE IF FIRST TWO VALUES ARE NOT EQUAL. */ + + if (*is523 == 0) { +/* THIS LOOP IS FOR NO MISSING VALUES. */ + + i__1 = *nxy; + for (k = kstart + 1; k <= i__1; ++k) { + + if (ic[k] != ic[kstart]) { +/* Computing MAX */ + i__2 = nenda, i__3 = k - 1; + /*nenda = max(i__2,i__3);*/ + nenda = (i__2 > i__3) ? i__2 : i__3; + goto L114; + } + +/* L111: */ + } + + nenda = *nxy; +/* FALL THROUGH THE LOOP MEANS ALL VALUES ARE THE SAME. */ + + } else if (*is523 == 1) { +/* THIS LOOP IS FOR PRIMARY MISSING VALUES ONLY. */ + + i__1 = *nxy; + for (k = kstart + 1; k <= i__1; ++k) { + + if (ic[k] != *missp) { + + if (ic[k] != ic[kstart]) { +/* Computing MAX */ + i__2 = nenda, i__3 = k - 1; + /*nenda = max(i__2,i__3);*/ + nenda = (i__2 > i__3) ? i__2 : i__3; + goto L114; + } + + } + +/* L112: */ + } + + nenda = *nxy; +/* FALL THROUGH THE LOOP MEANS ALL VALUES ARE THE SAME. */ + + } else { +/* THIS LOOP IS FOR PRIMARY AND SECONDARY MISSING VALUES. */ + + i__1 = *nxy; + for (k = kstart + 1; k <= i__1; ++k) { + + if (ic[k] != *missp && ic[k] != *misss) { + + if (ic[k] != ic[kstart]) { +/* Computing MAX */ + i__2 = nenda, i__3 = k - 1; + /*nenda = max(i__2,i__3);*/ + nenda = (i__2 > i__3) ? i__2 : i__3; + goto L114; + } + + } + +/* L113: */ + } + + nenda = *nxy; +/* FALL THROUGH THE LOOP MEANS ALL VALUES ARE THE SAME. */ + } + + } + +L114: + if (*is523 == 0) { + + i__1 = nenda; + for (k = kstart; k <= i__1; ++k) { + if (ic[k] < mina) { + mina = ic[k]; + minak = k; + } + if (ic[k] > maxa) { + maxa = ic[k]; + maxak = k; + } +/* L115: */ + } + + } else if (*is523 == 1) { + + i__1 = nenda; + for (k = kstart; k <= i__1; ++k) { + if (ic[k] == *missp) { + goto L117; + } + if (ic[k] < mina) { + mina = ic[k]; + minak = k; + } + if (ic[k] > maxa) { + maxa = ic[k]; + maxak = k; + } +L117: + ; + } + + } else { + + i__1 = nenda; + for (k = kstart; k <= i__1; ++k) { + if (ic[k] == *missp || ic[k] == *misss) { + goto L120; + } + if (ic[k] < mina) { + mina = ic[k]; + minak = k; + } + if (ic[k] > maxa) { + maxa = ic[k]; + maxak = k; + } +L120: + ; + } + + } + + kounta = nenda - kstart + 1; + +/* INCREMENT KTOTAL AND FIND THE BITS NEEDED TO PACK THE A GROUP. */ + + ktotal += kounta; + mislla = 0; + if (mina != mallow) { + goto L125; + } +/* ALL MISSING VALUES MUST BE ACCOMMODATED. */ + mina = 0; + maxa = 0; + mislla = 1; + ibitb = 0; + if (*is523 != 2) { + goto L130; + } +/* WHEN ALL VALUES ARE MISSING AND THERE ARE NO */ +/* SECONDARY MISSING VALUES, IBITA = 0. */ +/* OTHERWISE, IBITA MUST BE CALCULATED. */ + +L125: + itest = maxa - mina + lmiss; + + for (ibita = 0; ibita <= 30; ++ibita) { + if (itest < ibxx2[ibita]) { + goto L130; + } +/* *** THIS TEST IS THE SAME AS: */ +/* *** IF(MAXA-MINA.LT.IBXX2(IBITA)-LMISS)GO TO 130 */ +/* L126: */ + } + +/* WRITE(KFILDO,127)MAXA,MINA */ +/* 127 FORMAT(' ****ERROR IN PACK_GP. VALUE WILL NOT PACK IN 30 BITS.', */ +/* 1 ' MAXA ='I13,' MINA ='I13,'. ERROR AT 127.') */ + *ier = 706; + goto L900; + +L130: + +/* ***D WRITE(KFILDO,131)KOUNTA,KTOTAL,MINA,MAXA,IBITA,MISLLA */ +/* ***D131 FORMAT(' AT 130, KOUNTA ='I8,' KTOTAL ='I8,' MINA ='I8, */ +/* ***D 1 ' MAXA ='I8,' IBITA ='I3,' MISLLA ='I3) */ + +L133: + if (ktotal >= *nxy) { + goto L200; + } + +/* ************************************* */ + +/* THIS SECTION COMPUTES STATISTICS FOR GROUP B. GROUP B IS A */ +/* GROUP OF SIZE LMINPK IMMEDIATELY FOLLOWING GROUP A. */ + +/* ************************************* */ + +L140: + minb = mallow; + maxb = -mallow; + minbk = mallow; + maxbk = -mallow; + ibitbs = 0; + mstart = ktotal + 1; + +/* DETERMINE WHETHER THERE IS A LONG STRING OF THE SAME VALUE. */ +/* THIS WORKS WHEN THERE ARE NO MISSING VALUES. */ + + nendb = 1; + + if (mstart < *nxy) { + + if (*is523 == 0) { +/* THIS LOOP IS FOR NO MISSING VALUES. */ + + i__1 = *nxy; + for (k = mstart + 1; k <= i__1; ++k) { + + if (ic[k] != ic[mstart]) { + nendb = k - 1; + goto L150; + } + +/* L145: */ + } + + nendb = *nxy; +/* FALL THROUGH THE LOOP MEANS ALL REMAINING VALUES */ +/* ARE THE SAME. */ + } + + } + +L150: +/* Computing MAX */ +/* Computing MIN */ + i__3 = ktotal + lminpk; + /*i__1 = nendb, i__2 = min(i__3,*nxy);*/ + i__1 = nendb, i__2 = (i__3 < *nxy) ? i__3 : *nxy; + /*nendb = max(i__1,i__2);*/ + nendb = (i__1 > i__2) ? i__1 : i__2; +/* **** 150 NENDB=MIN(KTOTAL+LMINPK,NXY) */ + + if (*nxy - nendb <= lminpk / 2) { + nendb = *nxy; + } +/* ABOVE STATEMENT GUARANTEES THE LAST GROUP IS GT LMINPK/2 BY */ +/* MAKING THE ACTUAL GROUP LARGER. IF A PROVISION LIKE THIS IS */ +/* NOT INCLUDED, THERE WILL MANY TIMES BE A VERY SMALL GROUP */ +/* AT THE END. USE SEPARATE LOOPS FOR MISSING AND NO MISSING */ + +/* USE SEPARATE LOOPS FOR MISSING AND NO MISSING VALUES */ +/* FOR EFFICIENCY. */ + + if (*is523 == 0) { + + i__1 = nendb; + for (k = mstart; k <= i__1; ++k) { + if (ic[k] <= minb) { + minb = ic[k]; +/* NOTE LE, NOT LT. LT COULD BE USED BUT THEN A */ +/* RECOMPUTE OVER THE WHOLE GROUP WOULD BE NEEDED */ +/* MORE OFTEN. SAME REASONING FOR GE AND OTHER */ +/* LOOPS BELOW. */ + minbk = k; + } + if (ic[k] >= maxb) { + maxb = ic[k]; + maxbk = k; + } +/* L155: */ + } + + } else if (*is523 == 1) { + + i__1 = nendb; + for (k = mstart; k <= i__1; ++k) { + if (ic[k] == *missp) { + goto L157; + } + if (ic[k] <= minb) { + minb = ic[k]; + minbk = k; + } + if (ic[k] >= maxb) { + maxb = ic[k]; + maxbk = k; + } +L157: + ; + } + + } else { + + i__1 = nendb; + for (k = mstart; k <= i__1; ++k) { + if (ic[k] == *missp || ic[k] == *misss) { + goto L160; + } + if (ic[k] <= minb) { + minb = ic[k]; + minbk = k; + } + if (ic[k] >= maxb) { + maxb = ic[k]; + maxbk = k; + } +L160: + ; + } + + } + + kountb = nendb - ktotal; + misllb = 0; + if (minb != mallow) { + goto L165; + } +/* ALL MISSING VALUES MUST BE ACCOMMODATED. */ + minb = 0; + maxb = 0; + misllb = 1; + ibitb = 0; + + if (*is523 != 2) { + goto L170; + } +/* WHEN ALL VALUES ARE MISSING AND THERE ARE NO SECONDARY */ +/* MISSING VALUES, IBITB = 0. OTHERWISE, IBITB MUST BE */ +/* CALCULATED. */ + +L165: + for (ibitb = ibitbs; ibitb <= 30; ++ibitb) { + if (maxb - minb < ibxx2[ibitb] - lmiss) { + goto L170; + } +/* L166: */ + } + +/* WRITE(KFILDO,167)MAXB,MINB */ +/* 167 FORMAT(' ****ERROR IN PACK_GP. VALUE WILL NOT PACK IN 30 BITS.', */ +/* 1 ' MAXB ='I13,' MINB ='I13,'. ERROR AT 167.') */ + *ier = 706; + goto L900; + +/* COMPARE THE BITS NEEDED TO PACK GROUP B WITH THOSE NEEDED */ +/* TO PACK GROUP A. IF IBITB GE IBITA, TRY TO ADD TO GROUP A. */ +/* IF NOT, TRY TO ADD A'S POINTS TO B, UNLESS ADDITION TO A */ +/* HAS BEEN DONE. THIS LATTER IS CONTROLLED WITH ADDA. */ + +L170: + +/* ***D WRITE(KFILDO,171)KOUNTA,KTOTAL,MINA,MAXA,IBITA,MISLLA, */ +/* ***D 1 MINB,MAXB,IBITB,MISLLB */ +/* ***D171 FORMAT(' AT 171, KOUNTA ='I8,' KTOTAL ='I8,' MINA ='I8, */ +/* ***D 1 ' MAXA ='I8,' IBITA ='I3,' MISLLA ='I3, */ +/* ***D 2 ' MINB ='I8,' MAXB ='I8,' IBITB ='I3,' MISLLB ='I3) */ + + if (ibitb >= ibita) { + goto L180; + } + if (adda) { + goto L200; + } + +/* ************************************* */ + +/* GROUP B REQUIRES LESS BITS THAN GROUP A. PUT AS MANY OF A'S */ +/* POINTS INTO B AS POSSIBLE WITHOUT EXCEEDING THE NUMBER OF */ +/* BITS NECESSARY TO PACK GROUP B. */ + +/* ************************************* */ + + kounts = kounta; +/* KOUNTA REFERS TO THE PRESENT GROUP A. */ + mintst = minb; + maxtst = maxb; + mintstk = minbk; + maxtstk = maxbk; + +/* USE SEPARATE LOOPS FOR MISSING AND NO MISSING VALUES */ +/* FOR EFFICIENCY. */ + + if (*is523 == 0) { + + i__1 = kstart; + for (k = ktotal; k >= i__1; --k) { +/* START WITH THE END OF THE GROUP AND WORK BACKWARDS. */ + if (ic[k] < minb) { + mintst = ic[k]; + mintstk = k; + } else if (ic[k] > maxb) { + maxtst = ic[k]; + maxtstk = k; + } + if (maxtst - mintst >= ibxx2[ibitb]) { + goto L174; + } +/* NOTE THAT FOR THIS LOOP, LMISS = 0. */ + minb = mintst; + maxb = maxtst; + minbk = mintstk; + maxbk = maxtstk; + --kounta; +/* THERE IS ONE LESS POINT NOW IN A. */ +/* L1715: */ + } + + } else if (*is523 == 1) { + + i__1 = kstart; + for (k = ktotal; k >= i__1; --k) { +/* START WITH THE END OF THE GROUP AND WORK BACKWARDS. */ + if (ic[k] == *missp) { + goto L1718; + } + if (ic[k] < minb) { + mintst = ic[k]; + mintstk = k; + } else if (ic[k] > maxb) { + maxtst = ic[k]; + maxtstk = k; + } + if (maxtst - mintst >= ibxx2[ibitb] - lmiss) { + goto L174; + } +/* FOR THIS LOOP, LMISS = 1. */ + minb = mintst; + maxb = maxtst; + minbk = mintstk; + maxbk = maxtstk; + misllb = 0; +/* WHEN THE POINT IS NON MISSING, MISLLB SET = 0. */ +L1718: + --kounta; +/* THERE IS ONE LESS POINT NOW IN A. */ +/* L1719: */ + } + + } else { + + i__1 = kstart; + for (k = ktotal; k >= i__1; --k) { +/* START WITH THE END OF THE GROUP AND WORK BACKWARDS. */ + if (ic[k] == *missp || ic[k] == *misss) { + goto L1729; + } + if (ic[k] < minb) { + mintst = ic[k]; + mintstk = k; + } else if (ic[k] > maxb) { + maxtst = ic[k]; + maxtstk = k; + } + if (maxtst - mintst >= ibxx2[ibitb] - lmiss) { + goto L174; + } +/* FOR THIS LOOP, LMISS = 2. */ + minb = mintst; + maxb = maxtst; + minbk = mintstk; + maxbk = maxtstk; + misllb = 0; +/* WHEN THE POINT IS NON MISSING, MISLLB SET = 0. */ +L1729: + --kounta; +/* THERE IS ONE LESS POINT NOW IN A. */ +/* L173: */ + } + + } + +/* AT THIS POINT, KOUNTA CONTAINS THE NUMBER OF POINTS TO CLOSE */ +/* OUT GROUP A WITH. GROUP B NOW STARTS WITH KSTART+KOUNTA AND */ +/* ENDS WITH NENDB. MINB AND MAXB HAVE BEEN ADJUSTED AS */ +/* NECESSARY TO REFLECT GROUP B (EVEN THOUGH THE NUMBER OF BITS */ +/* NEEDED TO PACK GROUP B HAVE NOT INCREASED, THE END POINTS */ +/* OF THE RANGE MAY HAVE). */ + +L174: + if (kounta == kounts) { + goto L200; + } +/* ON TRANSFER, GROUP A WAS NOT CHANGED. CLOSE IT OUT. */ + +/* ONE OR MORE POINTS WERE TAKEN OUT OF A. RANGE AND IBITA */ +/* MAY HAVE TO BE RECOMPUTED; IBITA COULD BE LESS THAN */ +/* ORIGINALLY COMPUTED. IN FACT, GROUP A CAN NOW CONTAIN */ +/* ONLY ONE POINT AND BE PACKED WITH ZERO BITS */ +/* (UNLESS MISSS NE 0). */ + + nouta = kounts - kounta; + ktotal -= nouta; + kountb += nouta; + if (nenda - nouta > minak && nenda - nouta > maxak) { + goto L200; + } +/* WHEN THE ABOVE TEST IS MET, THE MIN AND MAX OF THE */ +/* CURRENT GROUP A WERE WITHIN THE OLD GROUP A, SO THE */ +/* RANGE AND IBITA DO NOT NEED TO BE RECOMPUTED. */ +/* NOTE THAT MINAK AND MAXAK ARE NO LONGER NEEDED. */ + ibita = 0; + mina = mallow; + maxa = -mallow; + +/* USE SEPARATE LOOPS FOR MISSING AND NO MISSING VALUES */ +/* FOR EFFICIENCY. */ + + if (*is523 == 0) { + + i__1 = nenda - nouta; + for (k = kstart; k <= i__1; ++k) { + if (ic[k] < mina) { + mina = ic[k]; + } + if (ic[k] > maxa) { + maxa = ic[k]; + } +/* L1742: */ + } + + } else if (*is523 == 1) { + + i__1 = nenda - nouta; + for (k = kstart; k <= i__1; ++k) { + if (ic[k] == *missp) { + goto L1744; + } + if (ic[k] < mina) { + mina = ic[k]; + } + if (ic[k] > maxa) { + maxa = ic[k]; + } +L1744: + ; + } + + } else { + + i__1 = nenda - nouta; + for (k = kstart; k <= i__1; ++k) { + if (ic[k] == *missp || ic[k] == *misss) { + goto L175; + } + if (ic[k] < mina) { + mina = ic[k]; + } + if (ic[k] > maxa) { + maxa = ic[k]; + } +L175: + ; + } + + } + + mislla = 0; + if (mina != mallow) { + goto L1750; + } +/* ALL MISSING VALUES MUST BE ACCOMMODATED. */ + mina = 0; + maxa = 0; + mislla = 1; + if (*is523 != 2) { + goto L177; + } +/* WHEN ALL VALUES ARE MISSING AND THERE ARE NO SECONDARY */ +/* MISSING VALUES IBITA = 0 AS ORIGINALLY SET. OTHERWISE, */ +/* IBITA MUST BE CALCULATED. */ + +L1750: + itest = maxa - mina + lmiss; + + for (ibita = 0; ibita <= 30; ++ibita) { + if (itest < ibxx2[ibita]) { + goto L177; + } +/* *** THIS TEST IS THE SAME AS: */ +/* *** IF(MAXA-MINA.LT.IBXX2(IBITA)-LMISS)GO TO 177 */ +/* L176: */ + } + +/* WRITE(KFILDO,1760)MAXA,MINA */ +/* 1760 FORMAT(' ****ERROR IN PACK_GP. VALUE WILL NOT PACK IN 30 BITS.', */ +/* 1 ' MAXA ='I13,' MINA ='I13,'. ERROR AT 1760.') */ + *ier = 706; + goto L900; + +L177: + goto L200; + +/* ************************************* */ + +/* AT THIS POINT, GROUP B REQUIRES AS MANY BITS TO PACK AS GROUPA. */ +/* THEREFORE, TRY TO ADD INC POINTS TO GROUP A WITHOUT INCREASING */ +/* IBITA. THIS AUGMENTED GROUP IS CALLED GROUP C. */ + +/* ************************************* */ + +L180: + if (mislla == 1) { + minc = mallow; + minck = mallow; + maxc = -mallow; + maxck = -mallow; + } else { + minc = mina; + maxc = maxa; + minck = minak; + maxck = minak; + } + + nount = 0; + if (*nxy - (ktotal + kinc) <= lminpk / 2) { + kinc = *nxy - ktotal; + } +/* ABOVE STATEMENT CONSTRAINS THE LAST GROUP TO BE NOT LESS THAN */ +/* LMINPK/2 IN SIZE. IF A PROVISION LIKE THIS IS NOT INCLUDED, */ +/* THERE WILL MANY TIMES BE A VERY SMALL GROUP AT THE END. */ + +/* USE SEPARATE LOOPS FOR MISSING AND NO MISSING VALUES */ +/* FOR EFFICIENCY. SINCE KINC IS USUALLY 1, USING SEPARATE */ +/* LOOPS HERE DOESN'T BUY MUCH. A MISSING VALUE WILL ALWAYS */ +/* TRANSFER BACK TO GROUP A. */ + + if (*is523 == 0) { + +/* Computing MIN */ + i__2 = ktotal + kinc; + /*i__1 = min(i__2,*nxy);*/ + i__1 = (i__2 < *nxy) ? i__2 : *nxy; + for (k = ktotal + 1; k <= i__1; ++k) { + if (ic[k] < minc) { + minc = ic[k]; + minck = k; + } + if (ic[k] > maxc) { + maxc = ic[k]; + maxck = k; + } + ++nount; +/* L185: */ + } + + } else if (*is523 == 1) { + +/* Computing MIN */ + i__2 = ktotal + kinc; + /*i__1 = min(i__2,*nxy);*/ + i__1 = (i__2 < *nxy) ? i__2 : *nxy; + for (k = ktotal + 1; k <= i__1; ++k) { + if (ic[k] == *missp) { + goto L186; + } + if (ic[k] < minc) { + minc = ic[k]; + minck = k; + } + if (ic[k] > maxc) { + maxc = ic[k]; + maxck = k; + } +L186: + ++nount; +/* L187: */ + } + + } else { + +/* Computing MIN */ + i__2 = ktotal + kinc; + /*i__1 = min(i__2,*nxy);*/ + i__1 = (i__2 < *nxy) ? i__2 : *nxy; + for (k = ktotal + 1; k <= i__1; ++k) { + if (ic[k] == *missp || ic[k] == *misss) { + goto L189; + } + if (ic[k] < minc) { + minc = ic[k]; + minck = k; + } + if (ic[k] > maxc) { + maxc = ic[k]; + maxck = k; + } +L189: + ++nount; +/* L190: */ + } + + } + +/* ***D WRITE(KFILDO,191)KOUNTA,KTOTAL,MINA,MAXA,IBITA,MISLLA, */ +/* ***D 1 MINC,MAXC,NOUNT,IC(KTOTAL),IC(KTOTAL+1) */ +/* ***D191 FORMAT(' AT 191, KOUNTA ='I8,' KTOTAL ='I8,' MINA ='I8, */ +/* ***D 1 ' MAXA ='I8,' IBITA ='I3,' MISLLA ='I3, */ +/* ***D 2 ' MINC ='I8,' MAXC ='I8, */ +/* ***D 3 ' NOUNT ='I5,' IC(KTOTAL) ='I9,' IC(KTOTAL+1) =',I9) */ + +/* IF THE NUMBER OF BITS NEEDED FOR GROUP C IS GT IBITA, */ +/* THEN THIS GROUP A IS A GROUP TO PACK. */ + + if (minc == mallow) { + minc = mina; + maxc = maxa; + minck = minak; + maxck = maxak; + misllc = 1; + goto L195; +/* WHEN THE NEW VALUE(S) ARE MISSING, THEY CAN ALWAYS */ +/* BE ADDED. */ + + } else { + misllc = 0; + } + + if (maxc - minc >= ibxx2[ibita] - lmiss) { + goto L200; + } + +/* THE BITS NECESSARY FOR GROUP C HAS NOT INCREASED FROM THE */ +/* BITS NECESSARY FOR GROUP A. ADD THIS POINT(S) TO GROUP A. */ +/* COMPUTE THE NEXT GROUP B, ETC., UNLESS ALL POINTS HAVE BEEN */ +/* USED. */ + +L195: + ktotal += nount; + kounta += nount; + mina = minc; + maxa = maxc; + minak = minck; + maxak = maxck; + mislla = misllc; + adda = TRUE_; + if (ktotal >= *nxy) { + goto L200; + } + + if (minbk > ktotal && maxbk > ktotal) { + mstart = nendb + 1; +/* THE MAX AND MIN OF GROUP B WERE NOT FROM THE POINTS */ +/* REMOVED, SO THE WHOLE GROUP DOES NOT HAVE TO BE LOOKED */ +/* AT TO DETERMINE THE NEW MAX AND MIN. RATHER START */ +/* JUST BEYOND THE OLD NENDB. */ + ibitbs = ibitb; + nendb = 1; + goto L150; + } else { + goto L140; + } + +/* ************************************* */ + +/* GROUP A IS TO BE PACKED. STORE VALUES IN JMIN( ), JMAX( ), */ +/* LBIT( ), AND NOV( ). */ + +/* ************************************* */ + +L200: + ++(*lx); + if (*lx <= *ndg) { + goto L205; + } + lminpk += lminpk / 2; +/* WRITE(KFILDO,201)NDG,LMINPK,LX */ +/* 201 FORMAT(' ****NDG ='I5,' NOT LARGE ENOUGH.', */ +/* 1 ' LMINPK IS INCREASED TO 'I3,' FOR THIS FIELD.'/ */ +/* 2 ' LX = 'I10) */ + iersav = 716; + goto L105; + +L205: + jmin[*lx] = mina; + jmax[*lx] = maxa; + lbit[*lx] = ibita; + nov[*lx] = kounta; + kstart = ktotal + 1; + + if (mislla == 0) { + misslx[*lx - 1] = mallow; + } else { + misslx[*lx - 1] = ic[ktotal]; +/* IC(KTOTAL) WAS THE LAST VALUE PROCESSED. IF MISLLA NE 0, */ +/* THIS MUST BE THE MISSING VALUE FOR THIS GROUP. */ + } + +/* ***D WRITE(KFILDO,206)MISLLA,IC(KTOTAL),KTOTAL,LX,JMIN(LX),JMAX(LX), */ +/* ***D 1 LBIT(LX),NOV(LX),MISSLX(LX) */ +/* ***D206 FORMAT(' AT 206, MISLLA ='I2,' IC(KTOTAL) ='I5,' KTOTAL ='I8, */ +/* ***D 1 ' LX ='I6,' JMIN(LX) ='I8,' JMAX(LX) ='I8, */ +/* ***D 2 ' LBIT(LX) ='I5,' NOV(LX) ='I8,' MISSLX(LX) =',I7) */ + + if (ktotal >= *nxy) { + goto L209; + } + +/* THE NEW GROUP A WILL BE THE PREVIOUS GROUP B. SET LIMITS, ETC. */ + + ibita = ibitb; + mina = minb; + maxa = maxb; + minak = minbk; + maxak = maxbk; + mislla = misllb; + nenda = nendb; + kounta = kountb; + ktotal += kounta; + adda = FALSE_; + goto L133; + +/* ************************************* */ + +/* CALCULATE IBIT, THE NUMBER OF BITS NEEDED TO HOLD THE GROUP */ +/* MINIMUM VALUES. */ + +/* ************************************* */ + +L209: + *ibit = 0; + + i__1 = *lx; + for (l = 1; l <= i__1; ++l) { +L210: + if (jmin[l] < ibxx2[*ibit]) { + goto L220; + } + ++(*ibit); + goto L210; +L220: + ; + } + +/* INSERT THE VALUE IN JMIN( ) TO BE USED FOR ALL MISSING */ +/* VALUES WHEN LBIT( ) = 0. WHEN SECONDARY MISSING */ +/* VALUES CAN BE PRESENT, LBIT(L) WILL NOT = 0. */ + + if (*is523 == 1) { + + i__1 = *lx; + for (l = 1; l <= i__1; ++l) { + + if (lbit[l] == 0) { + + if (misslx[l - 1] == *missp) { + jmin[l] = ibxx2[*ibit] - 1; + } + + } + +/* L226: */ + } + + } + +/* ************************************* */ + +/* CALCULATE JBIT, THE NUMBER OF BITS NEEDED TO HOLD THE BITS */ +/* NEEDED TO PACK THE VALUES IN THE GROUPS. BUT FIND AND */ +/* REMOVE THE REFERENCE VALUE FIRST. */ + +/* ************************************* */ + +/* WRITE(KFILDO,228)CFEED,LX */ +/* 228 FORMAT(A1,/' *****************************************' */ +/* 1 /' THE GROUP WIDTHS LBIT( ) FOR ',I8,' GROUPS' */ +/* 2 /' *****************************************') */ +/* WRITE(KFILDO,229) (LBIT(J),J=1,MIN(LX,100)) */ +/* 229 FORMAT(/' '20I6) */ + + *lbitref = lbit[1]; + + i__1 = *lx; + for (k = 1; k <= i__1; ++k) { + if (lbit[k] < *lbitref) { + *lbitref = lbit[k]; + } +/* L230: */ + } + + if (*lbitref != 0) { + + i__1 = *lx; + for (k = 1; k <= i__1; ++k) { + lbit[k] -= *lbitref; +/* L240: */ + } + + } + +/* WRITE(KFILDO,241)CFEED,LBITREF */ +/* 241 FORMAT(A1,/' *****************************************' */ +/* 1 /' THE GROUP WIDTHS LBIT( ) AFTER REMOVING REFERENCE ', */ +/* 2 I8, */ +/* 3 /' *****************************************') */ +/* WRITE(KFILDO,242) (LBIT(J),J=1,MIN(LX,100)) */ +/* 242 FORMAT(/' '20I6) */ + + *jbit = 0; + + i__1 = *lx; + for (k = 1; k <= i__1; ++k) { +L310: + if (lbit[k] < ibxx2[*jbit]) { + goto L320; + } + ++(*jbit); + goto L310; +L320: + ; + } + +/* ************************************* */ + +/* CALCULATE KBIT, THE NUMBER OF BITS NEEDED TO HOLD THE NUMBER */ +/* OF VALUES IN THE GROUPS. BUT FIND AND REMOVE THE */ +/* REFERENCE FIRST. */ + +/* ************************************* */ + +/* WRITE(KFILDO,321)CFEED,LX */ +/* 321 FORMAT(A1,/' *****************************************' */ +/* 1 /' THE GROUP SIZES NOV( ) FOR ',I8,' GROUPS' */ +/* 2 /' *****************************************') */ +/* WRITE(KFILDO,322) (NOV(J),J=1,MIN(LX,100)) */ +/* 322 FORMAT(/' '20I6) */ + + *novref = nov[1]; + + i__1 = *lx; + for (k = 1; k <= i__1; ++k) { + if (nov[k] < *novref) { + *novref = nov[k]; + } +/* L400: */ + } + + if (*novref > 0) { + + i__1 = *lx; + for (k = 1; k <= i__1; ++k) { + nov[k] -= *novref; +/* L405: */ + } + + } + +/* WRITE(KFILDO,406)CFEED,NOVREF */ +/* 406 FORMAT(A1,/' *****************************************' */ +/* 1 /' THE GROUP SIZES NOV( ) AFTER REMOVING REFERENCE ',I8, */ +/* 2 /' *****************************************') */ +/* WRITE(KFILDO,407) (NOV(J),J=1,MIN(LX,100)) */ +/* 407 FORMAT(/' '20I6) */ +/* WRITE(KFILDO,408)CFEED */ +/* 408 FORMAT(A1,/' *****************************************' */ +/* 1 /' THE GROUP REFERENCES JMIN( )' */ +/* 2 /' *****************************************') */ +/* WRITE(KFILDO,409) (JMIN(J),J=1,MIN(LX,100)) */ +/* 409 FORMAT(/' '20I6) */ + + *kbit = 0; + + i__1 = *lx; + for (k = 1; k <= i__1; ++k) { +L410: + if (nov[k] < ibxx2[*kbit]) { + goto L420; + } + ++(*kbit); + goto L410; +L420: + ; + } + +/* DETERMINE WHETHER THE GROUP SIZES SHOULD BE REDUCED */ +/* FOR SPACE EFFICIENCY. */ + + if (ired == 0) { + reduce(kfildo, &jmin[1], &jmax[1], &lbit[1], &nov[1], lx, ndg, ibit, + jbit, kbit, novref, ibxx2, ier); + + if (*ier == 714 || *ier == 715) { +/* REDUCE HAS ABORTED. REEXECUTE PACK_GP WITHOUT REDUCE. */ +/* PROVIDE FOR A NON FATAL RETURN FROM REDUCE. */ + iersav = *ier; + ired = 1; + *ier = 0; + goto L102; + } + + } + + if ( misslx != 0 ) { + free(misslx); + misslx=0; + } +/* CALL TIMPR(KFILDO,KFILDO,'END PACK_GP ') */ + if (iersav != 0) { + *ier = iersav; + return 0; + } + +/* 900 IF(IER.NE.0)RETURN1 */ + +L900: + if ( misslx != 0 ) free(misslx); + return 0; +} /* pack_gp__ */ + diff -Nru saga-2.1.0+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/pdstemplates.c saga-2.1.4+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/pdstemplates.c --- saga-2.1.0+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/pdstemplates.c 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/pdstemplates.c 2014-11-13 08:32:19.000000000 +0000 @@ -0,0 +1,271 @@ +/********************************************************** + * Version $Id: pdstemplates.c 911 2011-02-14 16:38:15Z reklov_w $ + *********************************************************/ +#include +#include "grib2.h" +#include "pdstemplates.h" + +g2int getpdsindex(g2int number) +///$$$ SUBPROGRAM DOCUMENTATION BLOCK +// . . . . +// SUBPROGRAM: getpdsindex +// PRGMMR: Gilbert ORG: W/NP11 DATE: 2001-06-28 +// +// ABSTRACT: This function returns the index of specified Product +// Definition Template 4.NN (NN=number) in array templates. +// +// PROGRAM HISTORY LOG: +// 2001-06-28 Gilbert +// +// USAGE: index=getpdsindex(number) +// INPUT ARGUMENT LIST: +// number - NN, indicating the number of the Product Definition +// Template 4.NN that is being requested. +// +// RETURNS: Index of PDT 4.NN in array templates, if template exists. +// = -1, otherwise. +// +// REMARKS: None +// +// ATTRIBUTES: +// LANGUAGE: C +// MACHINE: IBM SP +// +//$$$/ +{ + g2int j,getpdsindex=-1; + + for (j=0;jtype=4; + new->num=templatespds[index].template_num; + new->maplen=templatespds[index].mappdslen; + new->needext=templatespds[index].needext; + new->map=(g2int *)templatespds[index].mappds; + new->extlen=0; + new->ext=0; //NULL + return(new); + } + else { + printf("getpdstemplate: PDS Template 4.%d not defined.\n",(int)number); + return(0); //NULL + } + + return(0); //NULL +} + + +template *extpdstemplate(g2int number,g2int *list) +///$$$ SUBPROGRAM DOCUMENTATION BLOCK +// . . . . +// SUBPROGRAM: extpdstemplate +// PRGMMR: Gilbert ORG: W/NP11 DATE: 2000-05-11 +// +// ABSTRACT: This subroutine generates the remaining octet map for a +// given Product Definition Template, if required. Some Templates can +// vary depending on data values given in an earlier part of the +// Template, and it is necessary to know some of the earlier entry +// values to generate the full octet map of the Template. +// +// PROGRAM HISTORY LOG: +// 2000-05-11 Gilbert +// +// USAGE: CALL extpdstemplate(number,list) +// INPUT ARGUMENT LIST: +// number - NN, indicating the number of the Product Definition +// Template 4.NN that is being requested. +// list() - The list of values for each entry in the +// the Product Definition Template 4.NN. +// +// RETURN VALUE: +// - Pointer to the returned template struct. +// Returns NULL pointer, if template not found. +// +// ATTRIBUTES: +// LANGUAGE: C +// MACHINE: IBM SP +// +//$$$ +{ + template *new; + g2int index,i,j,k,l; + + index=getpdsindex(number); + if (index == -1) return(0); + + new=getpdstemplate(number); + + if ( ! new->needext ) return(new); + + if ( number == 3 ) { + new->extlen=list[26]; + new->ext=(g2int *)malloc(sizeof(g2int)*new->extlen); + for (i=0;iextlen;i++) { + new->ext[i]=1; + } + } + else if ( number == 4 ) { + new->extlen=list[25]; + new->ext=(g2int *)malloc(sizeof(g2int)*new->extlen); + for (i=0;iextlen;i++) { + new->ext[i]=1; + } + } + else if ( number == 8 ) { + if ( list[21] > 1 ) { + new->extlen=(list[21]-1)*6; + new->ext=(g2int *)malloc(sizeof(g2int)*new->extlen); + for (j=2;j<=list[21];j++) { + l=(j-2)*6; + for (k=0;k<6;k++) { + new->ext[l+k]=new->map[23+k]; + } + } + } + } + else if ( number == 9 ) { + if ( list[28] > 1 ) { + new->extlen=(list[28]-1)*6; + new->ext=(g2int *)malloc(sizeof(g2int)*new->extlen); + for (j=2;j<=list[28];j++) { + l=(j-2)*6; + for (k=0;k<6;k++) { + new->ext[l+k]=new->map[30+k]; + } + } + } + } + else if ( number == 10 ) { + if ( list[22] > 1 ) { + new->extlen=(list[22]-1)*6; + new->ext=(g2int *)malloc(sizeof(g2int)*new->extlen); + for (j=2;j<=list[22];j++) { + l=(j-2)*6; + for (k=0;k<6;k++) { + new->ext[l+k]=new->map[24+k]; + } + } + } + } + else if ( number == 11 ) { + if ( list[24] > 1 ) { + new->extlen=(list[24]-1)*6; + new->ext=(g2int *)malloc(sizeof(g2int)*new->extlen); + for (j=2;j<=list[24];j++) { + l=(j-2)*6; + for (k=0;k<6;k++) { + new->ext[l+k]=new->map[26+k]; + } + } + } + } + else if ( number == 12 ) { + if ( list[23] > 1 ) { + new->extlen=(list[23]-1)*6; + new->ext=(g2int *)malloc(sizeof(g2int)*new->extlen); + for (j=2;j<=list[23];j++) { + l=(j-2)*6; + for (k=0;k<6;k++) { + new->ext[l+k]=new->map[25+k]; + } + } + } + } + else if ( number == 13 ) { + new->extlen=((list[37]-1)*6)+list[26]; + new->ext=(g2int *)malloc(sizeof(g2int)*new->extlen); + if ( list[37] > 1 ) { + for (j=2;j<=list[37];j++) { + l=(j-2)*6; + for (k=0;k<6;k++) { + new->ext[l+k]=new->map[39+k]; + } + } + } + l=(list[37]-1)*6; + if ( l<0 ) l=0; + for (i=0;iext[l+i]=1; + } + } + else if ( number == 14 ) { + new->extlen=((list[36]-1)*6)+list[25]; + new->ext=(g2int *)malloc(sizeof(g2int)*new->extlen); + if ( list[36] > 1 ) { + for (j=2;j<=list[36];j++) { + l=(j-2)*6; + for (k=0;k<6;k++) { + new->ext[l+k]=new->map[38+k]; + } + } + } + l=(list[36]-1)*6; + if ( l<0 ) l=0; + for (i=0;iext[l+i]=1; + } + } + else if ( number == 30 ) { + new->extlen=list[4]*5; + new->ext=(g2int *)malloc(sizeof(g2int)*new->extlen); + for (i=0;iext[l]=2; + new->ext[l+1]=2; + new->ext[l+2]=1; + new->ext[l+3]=1; + new->ext[l+4]=4; + } + } + return(new); + +} + diff -Nru saga-2.1.0+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/pdstemplates.h saga-2.1.4+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/pdstemplates.h --- saga-2.1.0+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/pdstemplates.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/pdstemplates.h 2014-11-13 08:32:19.000000000 +0000 @@ -0,0 +1,121 @@ +/********************************************************** + * Version $Id: pdstemplates.h 911 2011-02-14 16:38:15Z reklov_w $ + *********************************************************/ +#ifndef _pdstemplates_H +#define _pdstemplates_H +#include "grib2.h" + +// PRGMMR: Gilbert ORG: W/NP11 DATE: 2002-10-26 +// +// ABSTRACT: This inculde file contains info on all the available +// GRIB2 Product Definition Templates used in Section 4 (PDS). +// The information decribing each template is stored in the +// pdstemplate structure defined below. +// +// Each Template has three parts: The number of entries in the template +// (mappdslen); A map of the template (mappds), which contains the +// number of octets in which to pack each of the template values; and +// a logical value (needext) that indicates whether the Template needs +// to be extended. In some cases the number of entries in a template +// can vary depending upon values specified in the "static" part of +// the template. ( See Template 4.3 as an example ) +// +// NOTE: Array mappds contains the number of octets in which the +// corresponding template values will be stored. A negative value in +// mappds is used to indicate that the corresponding template entry can +// contain negative values. This information is used later when packing +// (or unpacking) the template data values. Negative data values in GRIB +// are stored with the left most bit set to one, and a negative number +// of octets value in mappds[] indicates that this possibility should +// be considered. The number of octets used to store the data value +// in this case would be the absolute value of the negative value in +// mappds[]. +// +// 2005-12-08 Gilbert - Allow negative scale factors and limits for +// Templates 4.5 and 4.9 +// +//$$$ + + #define MAXPDSTEMP 23 // maximum number of templates + #define MAXPDSMAPLEN 200 // maximum template map length + + struct pdstemplate + { + g2int template_num; + g2int mappdslen; + g2int needext; + g2int mappds[MAXPDSMAPLEN]; + }; + + const struct pdstemplate templatespds[MAXPDSTEMP] = { + // 4.0: Analysis or Forecast at Horizontal Level/Layer + // at a point in time + {0,15,0, {1,1,1,1,1,2,1,1,4,1,-1,-4,1,-1,-4} }, + // 4.1: Individual Ensemble Forecast at Horizontal Level/Layer + // at a point in time + {1,18,0, {1,1,1,1,1,2,1,1,4,1,-1,-4,1,-1,-4,1,1,1} }, + // 4.2: Derived Fcst based on whole Ensemble at Horiz Level/Layer + // at a point in time + {2,17,0, {1,1,1,1,1,2,1,1,4,1,-1,-4,1,-1,-4,1,1} }, + // 4.3: Derived Fcst based on Ensemble cluster over rectangular + // area at Horiz Level/Layer at a point in time + {3,31,1, {1,1,1,1,1,2,1,1,4,1,-1,-4,1,-1,-4,1,1,1,1,1,1,1,-4,-4,4,4,1,-1,4,-1,4} }, + // 4.4: Derived Fcst based on Ensemble cluster over circular + // area at Horiz Level/Layer at a point in time + {4,30,1, {1,1,1,1,1,2,1,1,4,1,-1,-4,1,-1,-4,1,1,1,1,1,1,1,-4,4,4,1,-1,4,-1,4} }, + // 4.5: Probablility Forecast at Horiz Level/Layer + // at a point in time + {5,22,0, {1,1,1,1,1,2,1,1,4,1,-1,-4,1,-1,-4,1,1,1,-1,-4,-1,-4} }, + // 4.6: Percentile Forecast at Horiz Level/Layer + // at a point in time + {6,16,0, {1,1,1,1,1,2,1,1,4,1,-1,-4,1,-1,-4,1} }, + // 4.7: Analysis or Forecast Error at Horizontal Level/Layer + // at a point in time + {7,15,0, {1,1,1,1,1,2,1,1,4,1,-1,-4,1,-1,-4} }, + // 4.8: Ave/Accum/etc... at Horiz Level/Layer + // in a time interval + {8,29,1, {1,1,1,1,1,2,1,1,4,1,-1,-4,1,-1,-4,2,1,1,1,1,1,1,4,1,1,1,4,1,4} }, + // 4.9: Probablility Forecast at Horiz Level/Layer + // in a time interval + {9,36,1, {1,1,1,1,1,2,1,1,4,1,-1,-4,1,-1,-4,1,1,1,-1,-4,-1,-4,2,1,1,1,1,1,1,4,1,1,1,4,1,4} }, + // 4.10: Percentile Forecast at Horiz Level/Layer + // in a time interval + {10,30,1, {1,1,1,1,1,2,1,1,4,1,-1,-4,1,-1,-4,1,2,1,1,1,1,1,1,4,1,1,1,4,1,4} }, + // 4.11: Individual Ensemble Forecast at Horizontal Level/Layer + // in a time interval + {11,32,1, {1,1,1,1,1,2,1,1,4,1,-1,-4,1,-1,-4,1,1,1,2,1,1,1,1,1,1,4,1,1,1,4,1,4} }, + // 4.12: Derived Fcst based on whole Ensemble at Horiz Level/Layer + // in a time interval + {12,31,1, {1,1,1,1,1,2,1,1,4,1,-1,-4,1,-1,-4,1,1,2,1,1,1,1,1,1,4,1,1,1,4,1,4} }, + // 4.13: Derived Fcst based on Ensemble cluster over rectangular + // area at Horiz Level/Layer in a time interval + {13,45,1, {1,1,1,1,1,2,1,1,4,1,-1,-4,1,-1,-4,1,1,1,1,1,1,1,-4,-4,4,4,1,-1,4,-1,4,2,1,1,1,1,1,1,4,1,1,1,4,1,4} }, + // 4.14: Derived Fcst based on Ensemble cluster over circular + // area at Horiz Level/Layer in a time interval + {14,44,1, {1,1,1,1,1,2,1,1,4,1,-1,-4,1,-1,-4,1,1,1,1,1,1,1,-4,4,4,1,-1,4,-1,4,2,1,1,1,1,1,1,4,1,1,1,4,1,4} }, + // 4.20: Radar Product + {20,19,0, {1,1,1,1,1,-4,4,2,4,2,1,1,1,1,1,2,1,3,2} }, + // 4.30: Satellite Product + {30,5,1, {1,1,1,1,1} }, + // 4.254: CCITT IA5 Character String + {254,3,0, {1,1,4} }, + // 4.1000: Cross section of analysis or forecast + // at a point in time + {1000,9,0, {1,1,1,1,1,2,1,1,4} }, + // 4.1001: Cross section of Ave/Accum/etc... analysis or forecast + // in a time interval + {1001,16,0, {1,1,1,1,1,2,1,1,4,4,1,1,1,4,1,4} }, + // 4.1001: Cross section of Ave/Accum/etc... analysis or forecast + // over latitude or longitude + {1002,15,0, {1,1,1,1,1,2,1,1,4,1,1,1,4,4,2} }, + // 4.1100: Hovmoller-type grid w/ no averaging or other + // statistical processing + {1100,15,0, {1,1,1,1,1,2,1,1,4,1,-1,-4,1,-1,-4} }, + // 4.1100: Hovmoller-type grid with averaging or other + // statistical processing + {1101,22,0, {1,1,1,1,1,2,1,1,4,1,-1,-4,1,-1,-4,4,1,1,1,4,1,4} } + + } ; + + +#endif /* _pdstemplates_H */ diff -Nru saga-2.1.0+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/pngpack.c saga-2.1.4+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/pngpack.c --- saga-2.1.0+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/pngpack.c 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/pngpack.c 2014-11-13 08:32:19.000000000 +0000 @@ -0,0 +1,165 @@ +/********************************************************** + * Version $Id: pngpack.c 911 2011-02-14 16:38:15Z reklov_w $ + *********************************************************/ +#include +#include +#include "grib2.h" + +int enc_png(char *,g2int ,g2int ,g2int ,char *); + +void pngpack(g2float *fld,g2int width,g2int height,g2int *idrstmpl, + unsigned char *cpack,g2int *lcpack) +//$$$ SUBPROGRAM DOCUMENTATION BLOCK +// . . . . +// SUBPROGRAM: pngpack +// PRGMMR: Gilbert ORG: W/NP11 DATE: 2003-08-27 +// +// ABSTRACT: This subroutine packs up a data field into PNG image format. +// After the data field is scaled, and the reference value is subtracted out, +// it is treated as a grayscale image and passed to a PNG encoder. +// It also fills in GRIB2 Data Representation Template 5.41 or 5.40010 with +// the appropriate values. +// +// PROGRAM HISTORY LOG: +// 2003-08-27 Gilbert +// +// USAGE: pngpack(g2float *fld,g2int width,g2int height,g2int *idrstmpl, +// unsigned char *cpack,g2int *lcpack); +// INPUT ARGUMENT LIST: +// fld[] - Contains the data values to pack +// width - number of points in the x direction +// height - number of points in the y direction +// idrstmpl - Contains the array of values for Data Representation +// Template 5.41 or 5.40010 +// [0] = Reference value - ignored on input +// [1] = Binary Scale Factor +// [2] = Decimal Scale Factor +// [3] = number of bits for each data value - ignored on input +// [4] = Original field type - currently ignored on input +// Data values assumed to be reals. +// +// OUTPUT ARGUMENT LIST: +// idrstmpl - Contains the array of values for Data Representation +// Template 5.41 or 5.40010 +// [0] = Reference value - set by pngpack routine. +// [1] = Binary Scale Factor - unchanged from input +// [2] = Decimal Scale Factor - unchanged from input +// [3] = Number of bits containing each grayscale pixel value +// [4] = Original field type - currently set = 0 on output. +// Data values assumed to be reals. +// cpack - The packed data field +// lcpack - length of packed field cpack. +// +// REMARKS: None +// +// ATTRIBUTES: +// LANGUAGE: C +// MACHINE: IBM SP +// +//$$$ +{ + g2int *ifld; + static g2float alog2=0.69314718; // ln(2.0) + g2int j,nbits,imin,imax,maxdif; + g2int ndpts,nbytes; + g2float bscale,dscale,rmax,rmin,temp; + unsigned char *ctemp; + + ifld=0; + ndpts=width*height; + bscale=int_power(2.0,-idrstmpl[1]); + dscale=int_power(10.0,idrstmpl[2]); +// +// Find max and min values in the data +// + rmax=fld[0]; + rmin=fld[0]; + for (j=1;j rmax) rmax=fld[j]; + if (fld[j] < rmin) rmin=fld[j]; + } + maxdif = (g2int)rint( (rmax-rmin)*dscale*bscale ); +// +// If max and min values are not equal, pack up field. +// If they are equal, we have a constant field, and the reference +// value (rmin) is the value for each point in the field and +// set nbits to 0. +// + if (rmin != rmax && maxdif != 0 ) { + ifld=(g2int *)malloc(ndpts*sizeof(g2int)); + // + // Determine which algorithm to use based on user-supplied + // binary scale factor and number of bits. + // + if (idrstmpl[1] == 0) { + // + // No binary scaling and calculate minumum number of + // bits in which the data will fit. + // + imin=(g2int)rint(rmin*dscale); + imax=(g2int)rint(rmax*dscale); + maxdif=imax-imin; + temp=log((double)(maxdif+1))/alog2; + nbits=(g2int)ceil(temp); + rmin=(g2float)imin; + // scale data + for(j=0;j +#include +#include "grib2.h" + +int dec_png(unsigned char *,g2int *,g2int *,char *); + +g2int pngunpack(unsigned char *cpack,g2int len,g2int *idrstmpl,g2int ndpts, + g2float *fld) +//$$$ SUBPROGRAM DOCUMENTATION BLOCK +// . . . . +// SUBPROGRAM: pngunpack +// PRGMMR: Gilbert ORG: W/NP11 DATE: 2003-08-27 +// +// ABSTRACT: This subroutine unpacks a data field that was packed into a +// PNG image format +// using info from the GRIB2 Data Representation Template 5.41 or 5.40010. +// +// PROGRAM HISTORY LOG: +// 2003-08-27 Gilbert +// +// USAGE: pngunpack(unsigned char *cpack,g2int len,g2int *idrstmpl,g2int ndpts, +// g2float *fld) +// INPUT ARGUMENT LIST: +// cpack - The packed data field (character*1 array) +// len - length of packed field cpack(). +// idrstmpl - Pointer to array of values for Data Representation +// Template 5.41 or 5.40010 +// ndpts - The number of data values to unpack +// +// OUTPUT ARGUMENT LIST: +// fld[] - Contains the unpacked data values +// +// REMARKS: None +// +// ATTRIBUTES: +// LANGUAGE: C +// MACHINE: IBM SP +// +//$$$ +{ + + g2int *ifld; + g2int j,nbits,iret,width,height; + g2float ref,bscale,dscale; + unsigned char *ctemp; + + rdieee(idrstmpl+0,&ref,1); + bscale = int_power(2.0,idrstmpl[1]); + dscale = int_power(10.0,-idrstmpl[2]); + nbits = idrstmpl[3]; +// +// if nbits equals 0, we have a constant field where the reference value +// is the data value at each gridpoint +// + if (nbits != 0) { + + ifld=(g2int *)calloc(ndpts,sizeof(g2int)); + ctemp=(unsigned char *)calloc(ndpts*4,1); + if ( ifld == 0 || ctemp == 0) { + fprintf(stderr,"Could not allocate space in jpcunpack.\n Data field NOT upacked.\n"); + return(1); + } + iret=(g2int)dec_png(cpack,&width,&height,ctemp); + gbits(ctemp,ifld,0,nbits,0,ndpts); + for (j=0;j>31; + iexp=(rieee[j]&msk2)>>23; + imant=(rieee[j]&msk3); + //printf("SAGieee= %ld %ld %ld\n",isign,iexp,imant); + + sign=1.0; + if (isign == 1) sign=-1.0; + + if ( (iexp > 0) && (iexp < 255) ) { + temp=(g2float)int_power(2.0,(iexp-127)); + a[j]=sign*temp*(1.0+(two23*(g2float)imant)); + } + else if ( iexp == 0 ) { + if ( imant != 0 ) + a[j]=sign*two126*two23*(g2float)imant; + else + a[j]=sign*0.0; + + } + else if ( iexp == 255 ) + a[j]=sign*(1E+37); + + + } + +} diff -Nru saga-2.1.0+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/reduce.c saga-2.1.4+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/reduce.c --- saga-2.1.0+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/reduce.c 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/reduce.c 2014-11-13 08:32:19.000000000 +0000 @@ -0,0 +1,413 @@ +/********************************************************** + * Version $Id: reduce.c 911 2011-02-14 16:38:15Z reklov_w $ + *********************************************************/ +/* reduce.f -- translated by f2c (version 20031025). + You must link the resulting object file with libf2c: + on Microsoft Windows system, link with libf2c.lib; + on Linux or Unix systems, link with .../path/to/libf2c.a -lm + or, if you install libf2c.a in a standard place, with -lf2c -lm + -- in that order, at the end of the command line, as in + cc *.o -lf2c -lm + Source for libf2c is in /netlib/f2c/libf2c.zip, e.g., + + http://www.netlib.org/f2c/libf2c.zip +*/ + +/*#include "f2c.h"*/ +#include +#include "grib2.h" +typedef g2int integer; +typedef g2float real; + +/* Subroutine */ int reduce(integer *kfildo, integer *jmin, integer *jmax, + integer *lbit, integer *nov, integer *lx, integer *ndg, integer *ibit, + integer *jbit, integer *kbit, integer *novref, integer *ibxx2, + integer *ier) +{ + /* Initialized data */ + + static integer ifeed = 12; + + /* System generated locals */ + integer i__1, i__2; + + /* Local variables */ + static integer newboxtp, j, l, m, jj, lxn, left; + static real pimp; + static integer move, novl; + static char cfeed[1]; + static integer nboxj[31], lxnkp, iorigb, ibxx2m1, movmin, + ntotbt[31], ntotpr, newboxt; + integer *newbox, *newboxp; + + +/* NOVEMBER 2001 GLAHN TDL GRIB2 */ +/* MARCH 2002 GLAHN COMMENT IER = 715 */ +/* MARCH 2002 GLAHN MODIFIED TO ACCOMMODATE LX=1 ON ENTRY */ + +/* PURPOSE */ +/* DETERMINES WHETHER THE NUMBER OF GROUPS SHOULD BE */ +/* INCREASED IN ORDER TO REDUCE THE SIZE OF THE LARGE */ +/* GROUPS, AND TO MAKE THAT ADJUSTMENT. BY REDUCING THE */ +/* SIZE OF THE LARGE GROUPS, LESS BITS MAY BE NECESSARY */ +/* FOR PACKING THE GROUP SIZES AND ALL THE INFORMATION */ +/* ABOUT THE GROUPS. */ + +/* THE REFERENCE FOR NOV( ) WAS REMOVED IN THE CALLING */ +/* ROUTINE SO THAT KBIT COULD BE DETERMINED. THIS */ +/* FURNISHES A STARTING POINT FOR THE ITERATIONS IN REDUCE. */ +/* HOWEVER, THE REFERENCE MUST BE CONSIDERED. */ + +/* DATA SET USE */ +/* KFILDO - UNIT NUMBER FOR OUTPUT (PRINT) FILE. (OUTPUT) */ + +/* VARIABLES IN CALL SEQUENCE */ +/* KFILDO = UNIT NUMBER FOR OUTPUT (PRINT) FILE. (INPUT) */ +/* JMIN(J) = THE MINIMUM OF EACH GROUP (J=1,LX). IT IS */ +/* POSSIBLE AFTER SPLITTING THE GROUPS, JMIN( ) */ +/* WILL NOT BE THE MINIMUM OF THE NEW GROUP. */ +/* THIS DOESN'T MATTER; JMIN( ) IS REALLY THE */ +/* GROUP REFERENCE AND DOESN'T HAVE TO BE THE */ +/* SMALLEST VALUE. (INPUT/OUTPUT) */ +/* JMAX(J) = THE MAXIMUM OF EACH GROUP (J=1,LX). */ +/* (INPUT/OUTPUT) */ +/* LBIT(J) = THE NUMBER OF BITS NECESSARY TO PACK EACH GROUP */ +/* (J=1,LX). (INPUT/OUTPUT) */ +/* NOV(J) = THE NUMBER OF VALUES IN EACH GROUP (J=1,LX). */ +/* (INPUT/OUTPUT) */ +/* LX = THE NUMBER OF GROUPS. THIS WILL BE INCREASED */ +/* IF GROUPS ARE SPLIT. (INPUT/OUTPUT) */ +/* NDG = THE DIMENSION OF JMIN( ), JMAX( ), LBIT( ), AND */ +/* NOV( ). (INPUT) */ +/* IBIT = THE NUMBER OF BITS NECESSARY TO PACK THE JMIN(J) */ +/* VALUES, J=1,LX. (INPUT) */ +/* JBIT = THE NUMBER OF BITS NECESSARY TO PACK THE LBIT(J) */ +/* VALUES, J=1,LX. (INPUT) */ +/* KBIT = THE NUMBER OF BITS NECESSARY TO PACK THE NOV(J) */ +/* VALUES, J=1,LX. IF THE GROUPS ARE SPLIT, KBIT */ +/* IS REDUCED. (INPUT/OUTPUT) */ +/* NOVREF = REFERENCE VALUE FOR NOV( ). (INPUT) */ +/* IBXX2(J) = 2**J (J=0,30). (INPUT) */ +/* IER = ERROR RETURN. (OUTPUT) */ +/* 0 = GOOD RETURN. */ +/* 714 = PROBLEM IN ALGORITHM. REDUCE ABORTED. */ +/* 715 = NGP NOT LARGE ENOUGH. REDUCE ABORTED. */ +/* NTOTBT(J) = THE TOTAL BITS USED FOR THE PACKING BITS J */ +/* (J=1,30). (INTERNAL) */ +/* NBOXJ(J) = NEW BOXES NEEDED FOR THE PACKING BITS J */ +/* (J=1,30). (INTERNAL) */ +/* NEWBOX(L) = NUMBER OF NEW BOXES (GROUPS) FOR EACH ORIGINAL */ +/* GROUP (L=1,LX) FOR THE CURRENT J. (AUTOMATIC) */ +/* (INTERNAL) */ +/* NEWBOXP(L) = SAME AS NEWBOX( ) BUT FOR THE PREVIOUS J. */ +/* THIS ELIMINATES RECOMPUTATION. (AUTOMATIC) */ +/* (INTERNAL) */ +/* CFEED = CONTAINS THE CHARACTER REPRESENTATION */ +/* OF A PRINTER FORM FEED. (CHARACTER) (INTERNAL) */ +/* IFEED = CONTAINS THE INTEGER VALUE OF A PRINTER */ +/* FORM FEED. (INTERNAL) */ +/* IORIGB = THE ORIGINAL NUMBER OF BITS NECESSARY */ +/* FOR THE GROUP VALUES. (INTERNAL) */ +/* 1 2 3 4 5 6 7 X */ + +/* NON SYSTEM SUBROUTINES CALLED */ +/* NONE */ + + +/* NEWBOX( ) AND NEWBOXP( ) were AUTOMATIC ARRAYS. */ + newbox = (integer *)calloc(*ndg,sizeof(integer)); + newboxp = (integer *)calloc(*ndg,sizeof(integer)); + + /* Parameter adjustments */ + --nov; + --lbit; + --jmax; + --jmin; + + /* Function Body */ + + *ier = 0; + if (*lx == 1) { + goto L410; + } +/* IF THERE IS ONLY ONE GROUP, RETURN. */ + + *(unsigned char *)cfeed = (char) ifeed; + +/* INITIALIZE NUMBER OF NEW BOXES PER GROUP TO ZERO. */ + + i__1 = *lx; + for (l = 1; l <= i__1; ++l) { + newbox[l - 1] = 0; +/* L110: */ + } + +/* INITIALIZE NUMBER OF TOTAL NEW BOXES PER J TO ZERO. */ + + for (j = 1; j <= 31; ++j) { + ntotbt[j - 1] = 999999999; + nboxj[j - 1] = 0; +/* L112: */ + } + + iorigb = (*ibit + *jbit + *kbit) * *lx; +/* IBIT = BITS TO PACK THE JMIN( ). */ +/* JBIT = BITS TO PACK THE LBIT( ). */ +/* KBIT = BITS TO PACK THE NOV( ). */ +/* LX = NUMBER OF GROUPS. */ + ntotbt[*kbit - 1] = iorigb; +/* THIS IS THE VALUE OF TOTAL BITS FOR THE ORIGINAL LX */ +/* GROUPS, WHICH REQUIRES KBITS TO PACK THE GROUP */ +/* LENGHTS. SETTING THIS HERE MAKES ONE LESS LOOPS */ +/* NECESSARY BELOW. */ + +/* COMPUTE BITS NOW USED FOR THE PARAMETERS DEFINED. */ + +/* DETERMINE OTHER POSSIBILITES BY INCREASING LX AND DECREASING */ +/* NOV( ) WITH VALUES GREATER THAN THRESHOLDS. ASSUME A GROUP IS */ +/* SPLIT INTO 2 OR MORE GROUPS SO THAT KBIT IS REDUCED WITHOUT */ +/* CHANGING IBIT OR JBIT. */ + + jj = 0; + +/* Computing MIN */ + i__1 = 30, i__2 = *kbit - 1; + /*for (j = min(i__1,i__2); j >= 2; --j) {*/ + for (j = (i__1 < i__2) ? i__1 : i__2; j >= 2; --j) { +/* VALUES GE KBIT WILL NOT REQUIRE SPLITS. ONCE THE TOTAL */ +/* BITS START INCREASING WITH DECREASING J, STOP. ALSO, THE */ +/* NUMBER OF BITS REQUIRED IS KNOWN FOR KBITS = NTOTBT(KBIT). */ + + newboxt = 0; + + i__1 = *lx; + for (l = 1; l <= i__1; ++l) { + + if (nov[l] < ibxx2[j]) { + newbox[l - 1] = 0; +/* NO SPLITS OR NEW BOXES. */ + goto L190; + } else { + novl = nov[l]; + + m = (nov[l] - 1) / (ibxx2[j] - 1) + 1; +/* M IS FOUND BY SOLVING THE EQUATION BELOW FOR M: */ +/* (NOV(L)+M-1)/M LT IBXX2(J) */ +/* M GT (NOV(L)-1)/(IBXX2(J)-1) */ +/* SET M = (NOV(L)-1)/(IBXX2(J)-1)+1 */ +L130: + novl = (nov[l] + m - 1) / m; +/* THE +M-1 IS NECESSARY. FOR INSTANCE, 15 WILL FIT */ +/* INTO A BOX 4 BITS WIDE, BUT WON'T DIVIDE INTO */ +/* TWO BOXES 3 BITS WIDE EACH. */ + + if (novl < ibxx2[j]) { + goto L185; + } else { + ++m; +/* *** WRITE(KFILDO,135)L,NOV(L),NOVL,M,J,IBXX2(J) */ +/* *** 135 FORMAT(/' AT 135--L,NOV(L),NOVL,M,J,IBXX2(J)',6I10) */ + goto L130; + } + +/* THE ABOVE DO LOOP WILL NEVER COMPLETE. */ + } + +L185: + newbox[l - 1] = m - 1; + newboxt = newboxt + m - 1; +L190: + ; + } + + nboxj[j - 1] = newboxt; + ntotpr = ntotbt[j]; + ntotbt[j - 1] = (*ibit + *jbit) * (*lx + newboxt) + j * (*lx + + newboxt); + + if (ntotbt[j - 1] >= ntotpr) { + jj = j + 1; +/* THE PLUS IS USED BECAUSE J DECREASES PER ITERATION. */ + goto L250; + } else { + +/* SAVE THE TOTAL NEW BOXES AND NEWBOX( ) IN CASE THIS */ +/* IS THE J TO USE. */ + + newboxtp = newboxt; + + i__1 = *lx; + for (l = 1; l <= i__1; ++l) { + newboxp[l - 1] = newbox[l - 1]; +/* L195: */ + } + +/* WRITE(KFILDO,197)NEWBOXT,IBXX2(J) */ +/* 197 FORMAT(/' *****************************************' */ +/* 1 /' THE NUMBER OF NEWBOXES PER GROUP OF THE TOTAL', */ +/* 2 I10,' FOR GROUP MAXSIZE PLUS 1 ='I10 */ +/* 3 /' *****************************************') */ +/* WRITE(KFILDO,198) (NEWBOX(L),L=1,LX) */ +/* 198 FORMAT(/' '20I6/(' '20I6)) */ + } + +/* 205 WRITE(KFILDO,209)KBIT,IORIGB */ +/* 209 FORMAT(/' ORIGINAL BITS WITH KBIT OF',I5,' =',I10) */ +/* WRITE(KFILDO,210)(N,N=2,10),(IBXX2(N),N=2,10), */ +/* 1 (NTOTBT(N),N=2,10),(NBOXJ(N),N=2,10), */ +/* 2 (N,N=11,20),(IBXX2(N),N=11,20), */ +/* 3 (NTOTBT(N),N=11,20),(NBOXJ(N),N=11,20), */ +/* 4 (N,N=21,30),(IBXX2(N),N=11,20), */ +/* 5 (NTOTBT(N),N=21,30),(NBOXJ(N),N=21,30) */ +/* 210 FORMAT(/' THE TOTAL BYTES FOR MAXIMUM GROUP LENGTHS BY ROW'// */ +/* 1 ' J = THE NUMBER OF BITS PER GROUP LENGTH'/ */ +/* 2 ' IBXX2(J) = THE MAXIMUM GROUP LENGTH PLUS 1 FOR THIS J'/ */ +/* 3 ' NTOTBT(J) = THE TOTAL BITS FOR THIS J'/ */ +/* 4 ' NBOXJ(J) = THE NEW GROUPS FOR THIS J'/ */ +/* 5 4(/10X,9I10)/4(/10I10)/4(/10I10)) */ + +/* L200: */ + } + +L250: + pimp = (iorigb - ntotbt[jj - 1]) / (real) iorigb * 100.f; +/* WRITE(KFILDO,252)PIMP,KBIT,JJ */ +/* 252 FORMAT(/' PERCENT IMPROVEMENT =',F6.1, */ +/* 1 ' BY DECREASING GROUP LENGTHS FROM',I4,' TO',I4,' BITS') */ + if (pimp >= 2.f) { + +/* WRITE(KFILDO,255)CFEED,NEWBOXTP,IBXX2(JJ) */ +/* 255 FORMAT(A1,/' *****************************************' */ +/* 1 /' THE NUMBER OF NEWBOXES PER GROUP OF THE TOTAL', */ +/* 2 I10,' FOR GROUP MAXSIZE PLUS 1 ='I10 */ +/* 2 /' *****************************************') */ +/* WRITE(KFILDO,256) (NEWBOXP(L),L=1,LX) */ +/* 256 FORMAT(/' '20I6) */ + +/* ADJUST GROUP LENGTHS FOR MAXIMUM LENGTH OF JJ BITS. */ +/* THE MIN PER GROUP AND THE NUMBER OF BITS REQUIRED */ +/* PER GROUP ARE NOT CHANGED. THIS MAY MEAN THAT A */ +/* GROUP HAS A MIN (OR REFERENCE) THAT IS NOT ZERO. */ +/* THIS SHOULD NOT MATTER TO THE UNPACKER. */ + + lxnkp = *lx + newboxtp; +/* LXNKP = THE NEW NUMBER OF BOXES */ + + if (lxnkp > *ndg) { +/* DIMENSIONS NOT LARGE ENOUGH. PROBABLY AN ERROR */ +/* OF SOME SORT. ABORT. */ +/* WRITE(KFILDO,257)NDG,LXNPK */ +/* 1 2 3 4 5 6 7 X */ +/* 257 FORMAT(/' DIMENSIONS OF JMIN, ETC. IN REDUCE =',I8, */ +/* 1 ' NOT LARGE ENOUGH FOR THE EXPANDED NUMBER OF', */ +/* 2 ' GROUPS =',I8,'. ABORT REDUCE.') */ + *ier = 715; + goto L410; +/* AN ABORT CAUSES THE CALLING PROGRAM TO REEXECUTE */ +/* WITHOUT CALLING REDUCE. */ + } + + lxn = lxnkp; +/* LXN IS THE NUMBER OF THE BOX IN THE NEW SERIES BEING */ +/* FILLED. IT DECREASES PER ITERATION. */ + ibxx2m1 = ibxx2[jj] - 1; +/* IBXX2M1 IS THE MAXIMUM NUMBER OF VALUES PER GROUP. */ + + for (l = *lx; l >= 1; --l) { + +/* THE VALUES IS NOV( ) REPRESENT THOSE VALUES + NOVREF. */ +/* WHEN VALUES ARE MOVED TO ANOTHER BOX, EACH VALUE */ +/* MOVED TO A NEW BOX REPRESENTS THAT VALUE + NOVREF. */ +/* THIS HAS TO BE CONSIDERED IN MOVING VALUES. */ + + if (newboxp[l - 1] * (ibxx2m1 + *novref) + *novref > nov[l] + * + novref) { +/* IF THE ABOVE TEST IS MET, THEN MOVING IBXX2M1 VALUES */ +/* FOR ALL NEW BOXES WILL LEAVE A NEGATIVE NUMBER FOR */ +/* THE LAST BOX. NOT A TOLERABLE SITUATION. */ + movmin = (nov[l] - newboxp[l - 1] * *novref) / newboxp[l - 1]; + left = nov[l]; +/* LEFT = THE NUMBER OF VALUES TO MOVE FROM THE ORIGINAL */ +/* BOX TO EACH NEW BOX EXCEPT THE LAST. LEFT IS THE */ +/* NUMBER LEFT TO MOVE. */ + } else { + movmin = ibxx2m1; +/* MOVMIN VALUES CAN BE MOVED FOR EACH NEW BOX. */ + left = nov[l]; +/* LEFT IS THE NUMBER OF VALUES LEFT TO MOVE. */ + } + + if (newboxp[l - 1] > 0) { + if ((movmin + *novref) * newboxp[l - 1] + *novref <= nov[l] + + *novref && (movmin + *novref) * (newboxp[l - 1] + 1) + >= nov[l] + *novref) { + goto L288; + } else { +/* ***D WRITE(KFILDO,287)L,MOVMIN,NOVREF,NEWBOXP(L),NOV(L) */ +/* ***D287 FORMAT(/' AT 287 IN REDUCE--L,MOVMIN,NOVREF,', */ +/* ***D 1 'NEWBOXP(L),NOV(L)',5I12 */ +/* ***D 2 ' REDUCE ABORTED.') */ +/* WRITE(KFILDO,2870) */ +/* 2870 FORMAT(/' AN ERROR IN REDUCE ALGORITHM. ABORT REDUCE.') */ + *ier = 714; + goto L410; +/* AN ABORT CAUSES THE CALLING PROGRAM TO REEXECUTE */ +/* WITHOUT CALLING REDUCE. */ + } + + } + +L288: + i__1 = newboxp[l - 1] + 1; + for (j = 1; j <= i__1; ++j) { + /*move = min(movmin,left);*/ + move = (movmin < left) ? movmin : left; + jmin[lxn] = jmin[l]; + jmax[lxn] = jmax[l]; + lbit[lxn] = lbit[l]; + nov[lxn] = move; + --lxn; + left -= move + *novref; +/* THE MOVE OF MOVE VALUES REALLY REPRESENTS A MOVE OF */ +/* MOVE + NOVREF VALUES. */ +/* L290: */ + } + + if (left != -(*novref)) { +/* *** WRITE(KFILDO,292)L,LXN,MOVE,LXNKP,IBXX2(JJ),LEFT,NOV(L), */ +/* *** 1 MOVMIN */ +/* *** 292 FORMAT(' AT 292 IN REDUCE--L,LXN,MOVE,LXNKP,', */ +/* *** 1 'IBXX2(JJ),LEFT,NOV(L),MOVMIN'/8I12) */ + } + +/* L300: */ + } + + *lx = lxnkp; +/* LX IS NOW THE NEW NUMBER OF GROUPS. */ + *kbit = jj; +/* KBIT IS NOW THE NEW NUMBER OF BITS REQUIRED FOR PACKING */ +/* GROUP LENGHTS. */ + } + +/* WRITE(KFILDO,406)CFEED,LX */ +/* 406 FORMAT(A1,/' *****************************************' */ +/* 1 /' THE GROUP SIZES NOV( ) AFTER REDUCTION IN SIZE', */ +/* 2 ' FOR'I10,' GROUPS', */ +/* 3 /' *****************************************') */ +/* WRITE(KFILDO,407) (NOV(J),J=1,LX) */ +/* 407 FORMAT(/' '20I6) */ +/* WRITE(KFILDO,408)CFEED,LX */ +/* 408 FORMAT(A1,/' *****************************************' */ +/* 1 /' THE GROUP MINIMA JMIN( ) AFTER REDUCTION IN SIZE', */ +/* 2 ' FOR'I10,' GROUPS', */ +/* 3 /' *****************************************') */ +/* WRITE(KFILDO,409) (JMIN(J),J=1,LX) */ +/* 409 FORMAT(/' '20I6) */ + +L410: + if ( newbox != 0 ) free(newbox); + if ( newboxp != 0 ) free(newboxp); + return 0; +} /* reduce_ */ + diff -Nru saga-2.1.0+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/seekgb.c saga-2.1.4+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/seekgb.c --- saga-2.1.0+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/seekgb.c 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/seekgb.c 2014-11-13 08:32:19.000000000 +0000 @@ -0,0 +1,83 @@ +/********************************************************** + * Version $Id: seekgb.c 911 2011-02-14 16:38:15Z reklov_w $ + *********************************************************/ +#include +#include +#include "grib2.h" + +void seekgb(FILE *lugb,g2int iseek,g2int mseek,g2int *lskip,g2int *lgrib) +//$$$ SUBPROGRAM DOCUMENTATION BLOCK +// +// SUBPROGRAM: seekgb Searches a file for the next GRIB message. +// PRGMMR: Gilbert ORG: W/NP11 DATE: 2002-10-28 +// +// ABSTRACT: This subprogram searches a file for the next GRIB Message. +// The search is done starting at byte offset iseek of the file referenced +// by lugb for mseek bytes at a time. +// If found, the starting position and length of the message are returned +// in lskip and lgrib, respectively. +// The search is terminated when an EOF or I/O error is encountered. +// +// PROGRAM HISTORY LOG: +// 2002-10-28 GILBERT Modified from Iredell's skgb subroutine +// +// USAGE: seekgb(FILE *lugb,g2int iseek,g2int mseek,int *lskip,int *lgrib) +// INPUT ARGUMENTS: +// lugb - FILE pointer for the file to search. File must be +// opened before this routine is called. +// iseek - number of bytes in the file to skip before search +// mseek - number of bytes to search at a time +// OUTPUT ARGUMENTS: +// lskip - number of bytes to skip from the beggining of the file +// to where the GRIB message starts +// lgrib - number of bytes in message (set to 0, if no message found) +// +// ATTRIBUTES: +// LANGUAGE: C +// +//$$$ +{ + g2int ret; + g2int k,k4,ipos,nread,lim,start,vers,end,lengrib; + unsigned char *cbuf; + +// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + *lgrib=0; + cbuf=(unsigned char *)malloc(mseek); + nread=mseek; + ipos=iseek; + +// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +// LOOP UNTIL GRIB MESSAGE IS FOUND + + while (*lgrib==0 && nread==mseek) { + +// READ PARTIAL SECTION + + ret=fseek(lugb,ipos,SEEK_SET); + nread=fread(cbuf,sizeof(unsigned char),mseek,lugb); + lim=nread-8; + +// LOOK FOR 'GRIB...' IN PARTIAL SECTION + + for (k=0;k +#include +#include "grib2.h" + + +void simpack(g2float *fld,g2int ndpts,g2int *idrstmpl,unsigned char *cpack,g2int *lcpack) +//$$$ SUBPROGRAM DOCUMENTATION BLOCK +// . . . . +// SUBPROGRAM: simpack +// PRGMMR: Gilbert ORG: W/NP11 DATE: 2002-11-06 +// +// ABSTRACT: This subroutine packs up a data field using the simple +// packing algorithm as defined in the GRIB2 documention. It +// also fills in GRIB2 Data Representation Template 5.0 with the +// appropriate values. +// +// PROGRAM HISTORY LOG: +// 2002-11-06 Gilbert +// +// USAGE: CALL simpack(fld,ndpts,idrstmpl,cpack,lcpack) +// INPUT ARGUMENT LIST: +// fld[] - Contains the data values to pack +// ndpts - The number of data values in array fld[] +// idrstmpl - Contains the array of values for Data Representation +// Template 5.0 +// [0] = Reference value - ignored on input +// [1] = Binary Scale Factor +// [2] = Decimal Scale Factor +// [3] = Number of bits used to pack data, if value is +// > 0 and <= 31. +// If this input value is 0 or outside above range +// then the num of bits is calculated based on given +// data and scale factors. +// [4] = Original field type - currently ignored on input +// Data values assumed to be reals. +// +// OUTPUT ARGUMENT LIST: +// idrstmpl - Contains the array of values for Data Representation +// Template 5.0 +// [0] = Reference value - set by simpack routine. +// [1] = Binary Scale Factor - unchanged from input +// [2] = Decimal Scale Factor - unchanged from input +// [3] = Number of bits used to pack data, unchanged from +// input if value is between 0 and 31. +// If this input value is 0 or outside above range +// then the num of bits is calculated based on given +// data and scale factors. +// [4] = Original field type - currently set = 0 on output. +// Data values assumed to be reals. +// cpack - The packed data field +// lcpack - length of packed field starting at cpack. +// +// REMARKS: None +// +// ATTRIBUTES: +// LANGUAGE: C +// MACHINE: +// +//$$$ +{ + + static g2int zero=0; + g2int *ifld; + g2int j,nbits,imin,imax,maxdif,nbittot,left; + g2float bscale,dscale,rmax,rmin,temp; + double maxnum; + static g2float alog2=0.69314718; // ln(2.0) + + bscale=int_power(2.0,-idrstmpl[1]); + dscale=int_power(10.0,idrstmpl[2]); + if (idrstmpl[3] <= 0 || idrstmpl[3] > 31) + nbits=0; + else + nbits=idrstmpl[3]; +// +// Find max and min values in the data +// + rmax=fld[0]; + rmin=fld[0]; + for (j=1;j rmax) rmax=fld[j]; + if (fld[j] < rmin) rmin=fld[j]; + } + + ifld=calloc(ndpts,sizeof(g2int)); +// +// If max and min values are not equal, pack up field. +// If they are equal, we have a constant field, and the reference +// value (rmin) is the value for each point in the field and +// set nbits to 0. +// + if (rmin != rmax) { + // + // Determine which algorithm to use based on user-supplied + // binary scale factor and number of bits. + // + if (nbits==0 && idrstmpl[1]==0) { + // + // No binary scaling and calculate minumum number of + // bits in which the data will fit. + // + imin=(g2int)rint(rmin*dscale); + imax=(g2int)rint(rmax*dscale); + maxdif=imax-imin; + temp=log((double)(maxdif+1))/alog2; + nbits=(g2int)ceil(temp); + rmin=(g2float)imin; + // scale data + for(j=0;j +#include +#include "grib2.h" + + +g2int simunpack(unsigned char *cpack,g2int *idrstmpl,g2int ndpts,g2float *fld) +////$$$ SUBPROGRAM DOCUMENTATION BLOCK +// . . . . +// SUBPROGRAM: simunpack +// PRGMMR: Gilbert ORG: W/NP11 DATE: 2002-10-29 +// +// ABSTRACT: This subroutine unpacks a data field that was packed using a +// simple packing algorithm as defined in the GRIB2 documention, +// using info from the GRIB2 Data Representation Template 5.0. +// +// PROGRAM HISTORY LOG: +// 2002-10-29 Gilbert +// +// USAGE: int simunpack(unsigned char *cpack,g2int *idrstmpl,g2int ndpts, +// g2float *fld) +// INPUT ARGUMENT LIST: +// cpack - pointer to the packed data field. +// idrstmpl - pointer to the array of values for Data Representation +// Template 5.0 +// ndpts - The number of data values to unpack +// +// OUTPUT ARGUMENT LIST: +// fld - Contains the unpacked data values. fld must be allocated +// with at least ndpts*sizeof(g2float) bytes before +// calling this routine. +// +// REMARKS: None +// +// ATTRIBUTES: +// LANGUAGE: C +// MACHINE: +// +//$$$// +{ + + g2int *ifld; + g2int j,nbits,itype; + g2float ref,bscale,dscale; + + + rdieee(idrstmpl+0,&ref,1); + bscale = int_power(2.0,idrstmpl[1]); + dscale = int_power(10.0,-idrstmpl[2]); + nbits = idrstmpl[3]; + itype = idrstmpl[4]; + + ifld=(g2int *)calloc(ndpts,sizeof(g2int)); + if ( ifld == 0 ) { + fprintf(stderr,"Could not allocate space in simunpack.\n Data field NOT upacked.\n"); + return(1); + } + +// +// if nbits equals 0, we have a constant field where the reference value +// is the data value at each gridpoint +// + if (nbits != 0) { + gbits(cpack,ifld,0,nbits,0,ndpts); + for (j=0;j +#include +#include +#include "grib2.h" + + +void specpack(g2float *fld,g2int ndpts,g2int JJ,g2int KK,g2int MM, + g2int *idrstmpl,unsigned char *cpack,g2int *lcpack) +//$$$ SUBPROGRAM DOCUMENTATION BLOCK +// . . . . +// SUBPROGRAM: specpack +// PRGMMR: Gilbert ORG: W/NP11 DATE: 2002-12-19 +// +// ABSTRACT: This subroutine packs a spectral data field using the complex +// packing algorithm for spherical harmonic data as +// defined in the GRIB2 Data Representation Template 5.51. +// +// PROGRAM HISTORY LOG: +// 2002-12-19 Gilbert +// +// USAGE: void specpack(g2float *fld,g2int ndpts,g2int JJ,g2int KK,g2int MM, +// g2int *idrstmpl,insigned char *cpack,g2int *lcpack) +// INPUT ARGUMENT LIST: +// fld[] - Contains the packed data values +// ndpts - The number of data values to pack +// JJ - J - pentagonal resolution parameter +// KK - K - pentagonal resolution parameter +// MM - M - pentagonal resolution parameter +// idrstmpl - Contains the array of values for Data Representation +// Template 5.51 +// +// OUTPUT ARGUMENT LIST: +// cpack - The packed data field (character*1 array) +// lcpack - length of packed field cpack(). +// +// REMARKS: None +// +// ATTRIBUTES: +// LANGUAGE: C +// MACHINE: IBM SP +// +//$$$ +{ + + g2int *ifld,tmplsim[5]; + g2float bscale,dscale,*unpk,*tfld; + g2float *pscale,tscale; + g2int Js,Ks,Ms,Ts,Ns,inc,incu,incp,n,Nm,m,ipos; + + bscale = int_power(2.0,-idrstmpl[1]); + dscale = int_power(10.0,idrstmpl[2]); + Js=idrstmpl[5]; + Ks=idrstmpl[6]; + Ms=idrstmpl[7]; + Ts=idrstmpl[8]; + +// +// Calculate Laplacian scaling factors for each possible wave number. +// + pscale=(g2float *)malloc((JJ+MM)*sizeof(g2float)); + tscale=(g2float)idrstmpl[4]*1E-6; + for (n=Js;n<=JJ+MM;n++) + pscale[n]=pow((g2float)(n*(n+1)),tscale); +// +// Separate spectral coeffs into two lists; one to contain unpacked +// values within the sub-spectrum Js, Ks, Ms, and the other with values +// outside of the sub-spectrum to be packed. +// + tfld=(g2float *)malloc(ndpts*sizeof(g2float)); + unpk=(g2float *)malloc(ndpts*sizeof(g2float)); + ifld=(g2int *)malloc(ndpts*sizeof(g2int)); + inc=0; + incu=0; + incp=0; + for (m=0;m<=MM;m++) { + Nm=JJ; // triangular or trapezoidal + if ( KK == JJ+MM ) Nm=JJ+m; // rhombodial + Ns=Js; // triangular or trapezoidal + if ( Ks == Js+Ms ) Ns=Js+m; // rhombodial + for (n=m;n<=Nm;n++) { + if (n<=Ns && m<=Ms) { // save unpacked value + unpk[incu++]=fld[inc++]; // real part + unpk[incu++]=fld[inc++]; // imaginary part + } + else { // Save value to be packed and scale + // Laplacian scale factor + tfld[incp++]=fld[inc++]*pscale[n]; // real part + tfld[incp++]=fld[inc++]*pscale[n]; // imaginary part + } + } + } + + free(pscale); + + if (incu != Ts) { + printf("specpack: Incorrect number of unpacked values %d given:\n",(int)Ts); + printf("specpack: Resetting idrstmpl[8] to %d\n",(int)incu); + Ts=incu; + } +// +// Add unpacked values to the packed data array in 32-bit IEEE format +// + mkieee(unpk,(g2int *)cpack,Ts); + ipos=4*Ts; +// +// Scale and pack the rest of the coefficients +// + tmplsim[1]=idrstmpl[1]; + tmplsim[2]=idrstmpl[2]; + tmplsim[3]=idrstmpl[3]; + simpack(tfld,ndpts-Ts,tmplsim,cpack+ipos,lcpack); + *lcpack=(*lcpack)+ipos; +// +// Fill in Template 5.51 +// + idrstmpl[0]=tmplsim[0]; + idrstmpl[1]=tmplsim[1]; + idrstmpl[2]=tmplsim[2]; + idrstmpl[3]=tmplsim[3]; + idrstmpl[8]=Ts; + idrstmpl[9]=1; // Unpacked spectral data is 32-bit IEEE + + free(tfld); + free(unpk); + free(ifld); + + return; +} diff -Nru saga-2.1.0+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/specunpack.c saga-2.1.4+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/specunpack.c --- saga-2.1.0+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/specunpack.c 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_grid_grib2/g2clib-1.0.4/specunpack.c 2014-11-13 08:32:19.000000000 +0000 @@ -0,0 +1,118 @@ +/********************************************************** + * Version $Id: specunpack.c 911 2011-02-14 16:38:15Z reklov_w $ + *********************************************************/ +#include +#include +#include +#include "grib2.h" + + +g2int specunpack(unsigned char *cpack,g2int *idrstmpl,g2int ndpts,g2int JJ, + g2int KK, g2int MM, g2float *fld) +//$$$ SUBPROGRAM DOCUMENTATION BLOCK +// . . . . +// SUBPROGRAM: specunpack +// PRGMMR: Gilbert ORG: W/NP11 DATE: 2000-06-21 +// +// ABSTRACT: This subroutine unpacks a spectral data field that was packed +// using the complex packing algorithm for spherical harmonic data as +// defined in the GRIB2 documention, +// using info from the GRIB2 Data Representation Template 5.51. +// +// PROGRAM HISTORY LOG: +// 2000-06-21 Gilbert +// +// USAGE: int specunpack(unsigned char *cpack,g2int *idrstmpl, +// g2int ndpts,g2int JJ,g2int KK,g2int MM,g2float *fld) +// INPUT ARGUMENT LIST: +// cpack - pointer to the packed data field. +// idrstmpl - pointer to the array of values for Data Representation +// Template 5.51 +// ndpts - The number of data values to unpack (real and imaginary parts) +// JJ - J - pentagonal resolution parameter +// KK - K - pentagonal resolution parameter +// MM - M - pentagonal resolution parameter +// +// OUTPUT ARGUMENT LIST: +// fld() - Contains the unpacked data values. fld must be allocated +// with at least ndpts*sizeof(g2float) bytes before +// calling this routine. +// +// REMARKS: None +// +// ATTRIBUTES: +// LANGUAGE: C +// MACHINE: +// +//$$$ +{ + + g2int *ifld,j,iofst,nbits; + g2float ref,bscale,dscale,*unpk; + g2float *pscale,tscale; + g2int Js,Ks,Ms,Ts,Ns,Nm,n,m; + g2int inc,incu,incp; + + rdieee(idrstmpl+0,&ref,1); + bscale = int_power(2.0,idrstmpl[1]); + dscale = int_power(10.0,-idrstmpl[2]); + nbits = idrstmpl[3]; + Js=idrstmpl[5]; + Ks=idrstmpl[6]; + Ms=idrstmpl[7]; + Ts=idrstmpl[8]; + + if (idrstmpl[9] == 1) { // unpacked floats are 32-bit IEEE + + unpk=(g2float *)malloc(ndpts*sizeof(g2float)); + ifld=(g2int *)malloc(ndpts*sizeof(g2int)); + + gbits(cpack,ifld,0,32,0,Ts); + iofst=32*Ts; + rdieee(ifld,unpk,Ts); // read IEEE unpacked floats + gbits(cpack,ifld,iofst,nbits,0,ndpts-Ts); // unpack scaled data +// +// Calculate Laplacian scaling factors for each possible wave number. +// + pscale=(g2float *)malloc((JJ+MM+1)*sizeof(g2float)); + tscale=(g2float)idrstmpl[4]*1E-6; + for (n=Js;n<=JJ+MM;n++) + pscale[n]=pow((g2float)(n*(n+1)),-tscale); +// +// Assemble spectral coeffs back to original order. +// + inc=0; + incu=0; + incp=0; + for (m=0;m<=MM;m++) { + Nm=JJ; // triangular or trapezoidal + if ( KK == JJ+MM ) Nm=JJ+m; // rhombodial + Ns=Js; // triangular or trapezoidal + if ( Ks == Js+Ms ) Ns=Js+m; // rhombodial + for (n=m;n<=Nm;n++) { + if (n<=Ns && m<=Ms) { // grab unpacked value + fld[inc++]=unpk[incu++]; // real part + fld[inc++]=unpk[incu++]; // imaginary part + } + else { // Calc coeff from packed value + fld[inc++]=(((g2float)ifld[incp++]*bscale)+ref)* + dscale*pscale[n]; // real part + fld[inc++]=(((g2float)ifld[incp++]*bscale)+ref)* + dscale*pscale[n]; // imaginary part + } + } + } + + free(pscale); + free(unpk); + free(ifld); + + } + else { + printf("specunpack: Cannot handle 64 or 128-bit floats.\n"); + for (j=0;j +#include + +#ifdef _SAGA_LINUX +#include +#endif + +#ifdef _SAGA_MSW +double rint(double x) +{ + return( (int)(0.5 + x) ); +} +#endif + + +SGGrib2Import::SGGrib2Import(void) +{ + Set_Name (_TL("Import GRIB2 record")); + + Set_Author (_TL("Copyright (c) 2007 by Thomas Schorr")); + + Set_Description (_TW( + "Import a GRIB2 record." + "Under development." + )); + + Parameters.Add_Grid_Output( + NULL , "OUT_GRID" , _TL("Grid"), + _TL("") + ); + + Parameters.Add_FilePath( + NULL , "FILE" , _TL("File"), + _TL(""), + _TW( + "GRIdded Binary (GRIB) files|*.grib*;*.grb*|" + "GRIB2 files|*.grib2;*.grb2|" + "All Files|*.*" + ) + ); +} + +SGGrib2Import::~SGGrib2Import(void) +{} + + +bool SGGrib2Import::On_Execute(void) +{ + size_t num_bytes; + FILE *fp; + CSG_String FileName; + unsigned char *raw, *help; + struct stat st; + + FileName = Parameters("FILE") ->asString(); + gf = NULL; + + if ( stat( FileName.b_str(), &st ) == -1 ) + return false; + raw = ( unsigned char * ) malloc( st.st_size ); + if ( raw == NULL ) return false; + if( ( fp = fopen(FileName.b_str(), "rb")) != NULL ) { + num_bytes = 0; + help = raw; + while ( feof( fp ) == 0 && ferror( fp ) == 0 ) { + num_bytes = fread( help, sizeof( unsigned char ), 1024, fp ); + help += num_bytes; + } + fclose( fp ); + g2_getfld( raw, 1, 1, 1, &gf ); + switch ( gf->igdtnum ) { + case 0: + if ( ! handle_latlon() ) return false; + break; + case 20: + if ( ! handle_polar_stereographic() ) return false; + break; + default: + fprintf( stderr, "unhandled grid definition template no.: %d\n", gf->igdtnum ); + if ( ! handle_latlon() ) return false; + } + pGrid->Set_Name( SG_File_Get_Name(FileName, false) ); // no need to use wx!!! +// pGrid->Set_Name( wxFileName( wxString( FileName ) ).GetName() ); + Parameters( "OUT_GRID" )->Set_Value( pGrid ); + g2_free( gf ); + free( raw ); + return( true ); + } + return( false ); +} + +bool SGGrib2Import::handle_latlon( void ) { + int x, y, nx, ny; + double cellsize, xmin, ymin; + + if( gf->igdtmpl == NULL || gf->fld == NULL ) // possible if jpeg/png is not supported!? + return( false ); + + nx = ( int ) gf->igdtmpl[ 7 ]; + ny = ( int ) gf->igdtmpl[ 8 ]; + cellsize = ( double ) ( gf->igdtmpl[ 16 ] * 1e-6 ); + xmin = ( double ) ( gf->igdtmpl[ 12 ] * 1e-6 ) + cellsize / 2.0; + ymin = ( double ) ( gf->igdtmpl[ 11 ] * 1e-6 ) - 90.0 + cellsize / 2.0; +#ifdef DEBUG + fprintf( stderr, "%d %d %f %f %f\n", nx, ny, cellsize, xmin, ymin ); +#endif + + if ( ( nx == -1 ) || ( ny == -1 ) || + ( ( pGrid = SG_Create_Grid( SG_DATATYPE_Float, nx, ny, cellsize, xmin, ymin ) ) == NULL ) ) + return false; + for ( x = 0; x < nx; x++ ) { + for ( y = 0; y < ny; y ++ ) + pGrid->Set_Value( x, ny - y - 1, gf->fld[ y * nx + x ] ); + } + return true; +} + +bool SGGrib2Import::handle_polar_stereographic( void ) { + /* XXX fix me XXX*/ + int x, y, nx, ny; + double cellsize, xmin, ymin; + + nx = ( int ) gf->igdtmpl[ 7 ]; + ny = ( int ) gf->igdtmpl[ 8 ]; + cellsize = ( double ) ( gf->igdtmpl[ 14 ] * 1e-3 ); + xmin = ( double ) ( gf->igdtmpl[ 10 ] ); + ymin = ( double ) ( gf->igdtmpl[ 9 ] ); +#ifdef DEBUG + fprintf( stderr, "%d %d %f %f %f\n", nx, ny, cellsize, xmin, ymin ); +#endif + + if ( ( nx == -1 ) || ( ny == -1 ) || + ( ( pGrid = SG_Create_Grid( SG_DATATYPE_Float, nx, ny, cellsize, xmin, ymin ) ) == NULL ) ) + return false; + for ( x = 0; x < nx; x++ ) { + for ( y = 0; y < ny; y ++ ) + pGrid->Set_Value( x, y, gf->fld[ y * nx + x ] ); + } + return true; +} diff -Nru saga-2.1.0+dfsg/src/modules/io/io_grid_grib2/grib2_import.h saga-2.1.4+dfsg/src/modules/io/io_grid_grib2/grib2_import.h --- saga-2.1.0+dfsg/src/modules/io/io_grid_grib2/grib2_import.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_grid_grib2/grib2_import.h 2014-11-13 08:32:19.000000000 +0000 @@ -0,0 +1,40 @@ +/********************************************************** + * Version $Id: grib2_import.h 1246 2011-11-25 13:42:38Z oconrad $ + *********************************************************/ +/* + * Thomas Schorr 2007 + */ + +#ifndef HEADER_INCLUDED__grib2_import_H +#define HEADER_INCLUDED__grib2_import_H + + +#include "MLB_Interface.h" +extern "C" { +#include "g2clib-1.0.4/grib2.h" +} + + +class SGGrib2Import : public CSG_Module +{ +public: + SGGrib2Import(void); + virtual ~SGGrib2Import(void); + + virtual CSG_String Get_MenuPath (void) { return( _TL("R:Import") ); } + + +protected: + + virtual bool On_Execute (void); + + +private: + CSG_Grid *pGrid; + gribfield *gf; + bool handle_latlon( void ); + bool handle_polar_stereographic( void ); + +}; + +#endif // #ifndef HEADER_INCLUDED__grib2_import_H diff -Nru saga-2.1.0+dfsg/src/modules/io/io_grid_grib2/Makefile.am saga-2.1.4+dfsg/src/modules/io/io_grid_grib2/Makefile.am --- saga-2.1.0+dfsg/src/modules/io/io_grid_grib2/Makefile.am 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_grid_grib2/Makefile.am 2014-11-13 08:32:19.000000000 +0000 @@ -0,0 +1,70 @@ +# +# $Id: Makefile.am 1277 2011-12-22 15:48:59Z reklov_w $ +# +if DEBUG +DBGFLAGS = -g -DDEBUG +endif +if SAGA_UNICODE +UC_DEFS = -D_SAGA_UNICODE +endif +DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -DUSE_JPEG2000 -DUSE_PNG +CXX_INCS = -I$(top_srcdir)/src/saga_core $(LOCAL_INCS) +AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS) +#AM_LDFLAGS = -fPIC -shared -avoid-version -lpq -ljasper +AM_LDFLAGS = -fPIC -shared -avoid-version $(LOCAL_LIBS) -ljasper +pkglib_LTLIBRARIES = libio_grid_grib2.la +libio_grid_grib2_la_SOURCES =\ +./g2clib-1.0.4/cmplxpack.c\ +./g2clib-1.0.4/compack.c\ +./g2clib-1.0.4/comunpack.c\ +./g2clib-1.0.4/dec_jpeg2000.c\ +./g2clib-1.0.4/dec_png.c\ +./g2clib-1.0.4/drstemplates.c\ +./g2clib-1.0.4/enc_jpeg2000.c\ +./g2clib-1.0.4/enc_png.c\ +./g2clib-1.0.4/g2_addfield.c\ +./g2clib-1.0.4/g2_addgrid.c\ +./g2clib-1.0.4/g2_addlocal.c\ +./g2clib-1.0.4/g2_create.c\ +./g2clib-1.0.4/g2_free.c\ +./g2clib-1.0.4/g2_getfld.c\ +./g2clib-1.0.4/g2_gribend.c\ +./g2clib-1.0.4/g2_info.c\ +./g2clib-1.0.4/g2_miss.c\ +./g2clib-1.0.4/g2_unpack1.c\ +./g2clib-1.0.4/g2_unpack2.c\ +./g2clib-1.0.4/g2_unpack3.c\ +./g2clib-1.0.4/g2_unpack4.c\ +./g2clib-1.0.4/g2_unpack5.c\ +./g2clib-1.0.4/g2_unpack6.c\ +./g2clib-1.0.4/g2_unpack7.c\ +./g2clib-1.0.4/gbits.c\ +./g2clib-1.0.4/getdim.c\ +./g2clib-1.0.4/getpoly.c\ +./g2clib-1.0.4/gridtemplates.c\ +./g2clib-1.0.4/int_power.c\ +./g2clib-1.0.4/jpcpack.c\ +./g2clib-1.0.4/jpcunpack.c\ +./g2clib-1.0.4/misspack.c\ +./g2clib-1.0.4/mkieee.c\ +./g2clib-1.0.4/pack_gp.c\ +./g2clib-1.0.4/pdstemplates.c\ +./g2clib-1.0.4/pngpack.c\ +./g2clib-1.0.4/pngunpack.c\ +./g2clib-1.0.4/rdieee.c\ +./g2clib-1.0.4/reduce.c\ +./g2clib-1.0.4/seekgb.c\ +./g2clib-1.0.4/simpack.c\ +./g2clib-1.0.4/simunpack.c\ +./g2clib-1.0.4/specpack.c\ +./g2clib-1.0.4/specunpack.c\ +./g2clib-1.0.4/drstemplates.h\ +./g2clib-1.0.4/grib2.h\ +./g2clib-1.0.4/gridtemplates.h\ +./g2clib-1.0.4/pdstemplates.h\ +grib2_import.cpp\ +MLB_Interface.cpp\ +grib2_import.h\ +MLB_Interface.h + +libio_grid_grib2_la_LIBADD = $(top_srcdir)/src/saga_core/saga_api/libsaga_api.la diff -Nru saga-2.1.0+dfsg/src/modules/io/io_grid_grib2/Makefile.in saga-2.1.4+dfsg/src/modules/io/io_grid_grib2/Makefile.in --- saga-2.1.0+dfsg/src/modules/io/io_grid_grib2/Makefile.in 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_grid_grib2/Makefile.in 2014-11-13 08:33:33.000000000 +0000 @@ -0,0 +1,1131 @@ +# Makefile.in generated by automake 1.14.1 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +subdir = src/modules/io/io_grid_grib2 +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_postgresql.m4 \ + $(top_srcdir)/m4/ax_pkg_swig.m4 \ + $(top_srcdir)/m4/ax_python_devel.m4 \ + $(top_srcdir)/m4/ax_swig_enable_cxx.m4 \ + $(top_srcdir)/m4/ax_swig_python.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__installdirs = "$(DESTDIR)$(pkglibdir)" +LTLIBRARIES = $(pkglib_LTLIBRARIES) +libio_grid_grib2_la_DEPENDENCIES = \ + $(top_srcdir)/src/saga_core/saga_api/libsaga_api.la +am_libio_grid_grib2_la_OBJECTS = cmplxpack.lo compack.lo comunpack.lo \ + dec_jpeg2000.lo dec_png.lo drstemplates.lo enc_jpeg2000.lo \ + enc_png.lo g2_addfield.lo g2_addgrid.lo g2_addlocal.lo \ + g2_create.lo g2_free.lo g2_getfld.lo g2_gribend.lo g2_info.lo \ + g2_miss.lo g2_unpack1.lo g2_unpack2.lo g2_unpack3.lo \ + g2_unpack4.lo g2_unpack5.lo g2_unpack6.lo g2_unpack7.lo \ + gbits.lo getdim.lo getpoly.lo gridtemplates.lo int_power.lo \ + jpcpack.lo jpcunpack.lo misspack.lo mkieee.lo pack_gp.lo \ + pdstemplates.lo pngpack.lo pngunpack.lo rdieee.lo reduce.lo \ + seekgb.lo simpack.lo simunpack.lo specpack.lo specunpack.lo \ + grib2_import.lo MLB_Interface.lo +libio_grid_grib2_la_OBJECTS = $(am_libio_grid_grib2_la_OBJECTS) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) +depcomp = $(SHELL) $(top_srcdir)/depcomp +am__depfiles_maybe = depfiles +am__mv = mv -f +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = +CCLD = $(CC) +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = +CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = +CXXLD = $(CXX) +CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = +SOURCES = $(libio_grid_grib2_la_SOURCES) +DIST_SOURCES = $(libio_grid_grib2_la_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +AX_SWIG_PYTHON_CPPFLAGS = @AX_SWIG_PYTHON_CPPFLAGS@ +AX_SWIG_PYTHON_OPT = @AX_SWIG_PYTHON_OPT@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DISABLELIBHARU = @DISABLELIBHARU@ +DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +FGREP = @FGREP@ +GOMPFLAGS = @GOMPFLAGS@ +GREP = @GREP@ +HARU_LIB = @HARU_LIB@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LOCAL_INCS = @LOCAL_INCS@ +LOCAL_LIBS = @LOCAL_LIBS@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ +MKDIR_P = @MKDIR_P@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PG_CONFIG = @PG_CONFIG@ +POSTGRESQL_CFLAGS = @POSTGRESQL_CFLAGS@ +POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@ +POSTGRESQL_VERSION = @POSTGRESQL_VERSION@ +POW_LIB = @POW_LIB@ +PYTHON = @PYTHON@ +PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ +PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ +PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ +PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_PLATFORM = @PYTHON_PLATFORM@ +PYTHON_PREFIX = @PYTHON_PREFIX@ +PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ +PYTHON_VERSION = @PYTHON_VERSION@ +RANLIB = @RANLIB@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +SWIG = @SWIG@ +SWIG_LIB = @SWIG_LIB@ +VERSION = @VERSION@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +pkgpyexecdir = @pkgpyexecdir@ +pkgpythondir = @pkgpythondir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +pyexecdir = @pyexecdir@ +pythondir = @pythondir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ + +# +# $Id: Makefile.am 1277 2011-12-22 15:48:59Z reklov_w $ +# +@DEBUG_TRUE@DBGFLAGS = -g -DDEBUG +@SAGA_UNICODE_TRUE@UC_DEFS = -D_SAGA_UNICODE +DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -DUSE_JPEG2000 -DUSE_PNG +CXX_INCS = -I$(top_srcdir)/src/saga_core $(LOCAL_INCS) +AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS) +#AM_LDFLAGS = -fPIC -shared -avoid-version -lpq -ljasper +AM_LDFLAGS = -fPIC -shared -avoid-version $(LOCAL_LIBS) -ljasper +pkglib_LTLIBRARIES = libio_grid_grib2.la +libio_grid_grib2_la_SOURCES = \ +./g2clib-1.0.4/cmplxpack.c\ +./g2clib-1.0.4/compack.c\ +./g2clib-1.0.4/comunpack.c\ +./g2clib-1.0.4/dec_jpeg2000.c\ +./g2clib-1.0.4/dec_png.c\ +./g2clib-1.0.4/drstemplates.c\ +./g2clib-1.0.4/enc_jpeg2000.c\ +./g2clib-1.0.4/enc_png.c\ +./g2clib-1.0.4/g2_addfield.c\ +./g2clib-1.0.4/g2_addgrid.c\ +./g2clib-1.0.4/g2_addlocal.c\ +./g2clib-1.0.4/g2_create.c\ +./g2clib-1.0.4/g2_free.c\ +./g2clib-1.0.4/g2_getfld.c\ +./g2clib-1.0.4/g2_gribend.c\ +./g2clib-1.0.4/g2_info.c\ +./g2clib-1.0.4/g2_miss.c\ +./g2clib-1.0.4/g2_unpack1.c\ +./g2clib-1.0.4/g2_unpack2.c\ +./g2clib-1.0.4/g2_unpack3.c\ +./g2clib-1.0.4/g2_unpack4.c\ +./g2clib-1.0.4/g2_unpack5.c\ +./g2clib-1.0.4/g2_unpack6.c\ +./g2clib-1.0.4/g2_unpack7.c\ +./g2clib-1.0.4/gbits.c\ +./g2clib-1.0.4/getdim.c\ +./g2clib-1.0.4/getpoly.c\ +./g2clib-1.0.4/gridtemplates.c\ +./g2clib-1.0.4/int_power.c\ +./g2clib-1.0.4/jpcpack.c\ +./g2clib-1.0.4/jpcunpack.c\ +./g2clib-1.0.4/misspack.c\ +./g2clib-1.0.4/mkieee.c\ +./g2clib-1.0.4/pack_gp.c\ +./g2clib-1.0.4/pdstemplates.c\ +./g2clib-1.0.4/pngpack.c\ +./g2clib-1.0.4/pngunpack.c\ +./g2clib-1.0.4/rdieee.c\ +./g2clib-1.0.4/reduce.c\ +./g2clib-1.0.4/seekgb.c\ +./g2clib-1.0.4/simpack.c\ +./g2clib-1.0.4/simunpack.c\ +./g2clib-1.0.4/specpack.c\ +./g2clib-1.0.4/specunpack.c\ +./g2clib-1.0.4/drstemplates.h\ +./g2clib-1.0.4/grib2.h\ +./g2clib-1.0.4/gridtemplates.h\ +./g2clib-1.0.4/pdstemplates.h\ +grib2_import.cpp\ +MLB_Interface.cpp\ +grib2_import.h\ +MLB_Interface.h + +libio_grid_grib2_la_LIBADD = $(top_srcdir)/src/saga_core/saga_api/libsaga_api.la +all: all-am + +.SUFFIXES: +.SUFFIXES: .c .cpp .lo .o .obj +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/modules/io/io_grid_grib2/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign src/modules/io/io_grid_grib2/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): + +install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) + @$(NORMAL_INSTALL) + @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ + list2=; for p in $$list; do \ + if test -f $$p; then \ + list2="$$list2 $$p"; \ + else :; fi; \ + done; \ + test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \ + } + +uninstall-pkglibLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ + for p in $$list; do \ + $(am__strip_dir) \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$f"; \ + done + +clean-pkglibLTLIBRARIES: + -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES) + @list='$(pkglib_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + +libio_grid_grib2.la: $(libio_grid_grib2_la_OBJECTS) $(libio_grid_grib2_la_DEPENDENCIES) $(EXTRA_libio_grid_grib2_la_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) -rpath $(pkglibdir) $(libio_grid_grib2_la_OBJECTS) $(libio_grid_grib2_la_LIBADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MLB_Interface.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cmplxpack.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/compack.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/comunpack.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dec_jpeg2000.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dec_png.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/drstemplates.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/enc_jpeg2000.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/enc_png.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/g2_addfield.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/g2_addgrid.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/g2_addlocal.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/g2_create.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/g2_free.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/g2_getfld.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/g2_gribend.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/g2_info.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/g2_miss.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/g2_unpack1.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/g2_unpack2.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/g2_unpack3.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/g2_unpack4.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/g2_unpack5.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/g2_unpack6.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/g2_unpack7.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gbits.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getdim.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getpoly.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/grib2_import.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gridtemplates.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/int_power.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jpcpack.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jpcunpack.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/misspack.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mkieee.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pack_gp.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pdstemplates.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pngpack.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pngunpack.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rdieee.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/reduce.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seekgb.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/simpack.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/simunpack.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/specpack.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/specunpack.Plo@am__quote@ + +.c.o: +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< + +.c.obj: +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + +.c.lo: +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< + +cmplxpack.lo: ./g2clib-1.0.4/cmplxpack.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT cmplxpack.lo -MD -MP -MF $(DEPDIR)/cmplxpack.Tpo -c -o cmplxpack.lo `test -f './g2clib-1.0.4/cmplxpack.c' || echo '$(srcdir)/'`./g2clib-1.0.4/cmplxpack.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/cmplxpack.Tpo $(DEPDIR)/cmplxpack.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='./g2clib-1.0.4/cmplxpack.c' object='cmplxpack.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o cmplxpack.lo `test -f './g2clib-1.0.4/cmplxpack.c' || echo '$(srcdir)/'`./g2clib-1.0.4/cmplxpack.c + +compack.lo: ./g2clib-1.0.4/compack.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT compack.lo -MD -MP -MF $(DEPDIR)/compack.Tpo -c -o compack.lo `test -f './g2clib-1.0.4/compack.c' || echo '$(srcdir)/'`./g2clib-1.0.4/compack.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/compack.Tpo $(DEPDIR)/compack.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='./g2clib-1.0.4/compack.c' object='compack.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o compack.lo `test -f './g2clib-1.0.4/compack.c' || echo '$(srcdir)/'`./g2clib-1.0.4/compack.c + +comunpack.lo: ./g2clib-1.0.4/comunpack.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT comunpack.lo -MD -MP -MF $(DEPDIR)/comunpack.Tpo -c -o comunpack.lo `test -f './g2clib-1.0.4/comunpack.c' || echo '$(srcdir)/'`./g2clib-1.0.4/comunpack.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/comunpack.Tpo $(DEPDIR)/comunpack.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='./g2clib-1.0.4/comunpack.c' object='comunpack.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o comunpack.lo `test -f './g2clib-1.0.4/comunpack.c' || echo '$(srcdir)/'`./g2clib-1.0.4/comunpack.c + +dec_jpeg2000.lo: ./g2clib-1.0.4/dec_jpeg2000.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dec_jpeg2000.lo -MD -MP -MF $(DEPDIR)/dec_jpeg2000.Tpo -c -o dec_jpeg2000.lo `test -f './g2clib-1.0.4/dec_jpeg2000.c' || echo '$(srcdir)/'`./g2clib-1.0.4/dec_jpeg2000.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/dec_jpeg2000.Tpo $(DEPDIR)/dec_jpeg2000.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='./g2clib-1.0.4/dec_jpeg2000.c' object='dec_jpeg2000.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dec_jpeg2000.lo `test -f './g2clib-1.0.4/dec_jpeg2000.c' || echo '$(srcdir)/'`./g2clib-1.0.4/dec_jpeg2000.c + +dec_png.lo: ./g2clib-1.0.4/dec_png.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dec_png.lo -MD -MP -MF $(DEPDIR)/dec_png.Tpo -c -o dec_png.lo `test -f './g2clib-1.0.4/dec_png.c' || echo '$(srcdir)/'`./g2clib-1.0.4/dec_png.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/dec_png.Tpo $(DEPDIR)/dec_png.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='./g2clib-1.0.4/dec_png.c' object='dec_png.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dec_png.lo `test -f './g2clib-1.0.4/dec_png.c' || echo '$(srcdir)/'`./g2clib-1.0.4/dec_png.c + +drstemplates.lo: ./g2clib-1.0.4/drstemplates.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT drstemplates.lo -MD -MP -MF $(DEPDIR)/drstemplates.Tpo -c -o drstemplates.lo `test -f './g2clib-1.0.4/drstemplates.c' || echo '$(srcdir)/'`./g2clib-1.0.4/drstemplates.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/drstemplates.Tpo $(DEPDIR)/drstemplates.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='./g2clib-1.0.4/drstemplates.c' object='drstemplates.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o drstemplates.lo `test -f './g2clib-1.0.4/drstemplates.c' || echo '$(srcdir)/'`./g2clib-1.0.4/drstemplates.c + +enc_jpeg2000.lo: ./g2clib-1.0.4/enc_jpeg2000.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT enc_jpeg2000.lo -MD -MP -MF $(DEPDIR)/enc_jpeg2000.Tpo -c -o enc_jpeg2000.lo `test -f './g2clib-1.0.4/enc_jpeg2000.c' || echo '$(srcdir)/'`./g2clib-1.0.4/enc_jpeg2000.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/enc_jpeg2000.Tpo $(DEPDIR)/enc_jpeg2000.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='./g2clib-1.0.4/enc_jpeg2000.c' object='enc_jpeg2000.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o enc_jpeg2000.lo `test -f './g2clib-1.0.4/enc_jpeg2000.c' || echo '$(srcdir)/'`./g2clib-1.0.4/enc_jpeg2000.c + +enc_png.lo: ./g2clib-1.0.4/enc_png.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT enc_png.lo -MD -MP -MF $(DEPDIR)/enc_png.Tpo -c -o enc_png.lo `test -f './g2clib-1.0.4/enc_png.c' || echo '$(srcdir)/'`./g2clib-1.0.4/enc_png.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/enc_png.Tpo $(DEPDIR)/enc_png.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='./g2clib-1.0.4/enc_png.c' object='enc_png.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o enc_png.lo `test -f './g2clib-1.0.4/enc_png.c' || echo '$(srcdir)/'`./g2clib-1.0.4/enc_png.c + +g2_addfield.lo: ./g2clib-1.0.4/g2_addfield.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT g2_addfield.lo -MD -MP -MF $(DEPDIR)/g2_addfield.Tpo -c -o g2_addfield.lo `test -f './g2clib-1.0.4/g2_addfield.c' || echo '$(srcdir)/'`./g2clib-1.0.4/g2_addfield.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/g2_addfield.Tpo $(DEPDIR)/g2_addfield.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='./g2clib-1.0.4/g2_addfield.c' object='g2_addfield.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o g2_addfield.lo `test -f './g2clib-1.0.4/g2_addfield.c' || echo '$(srcdir)/'`./g2clib-1.0.4/g2_addfield.c + +g2_addgrid.lo: ./g2clib-1.0.4/g2_addgrid.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT g2_addgrid.lo -MD -MP -MF $(DEPDIR)/g2_addgrid.Tpo -c -o g2_addgrid.lo `test -f './g2clib-1.0.4/g2_addgrid.c' || echo '$(srcdir)/'`./g2clib-1.0.4/g2_addgrid.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/g2_addgrid.Tpo $(DEPDIR)/g2_addgrid.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='./g2clib-1.0.4/g2_addgrid.c' object='g2_addgrid.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o g2_addgrid.lo `test -f './g2clib-1.0.4/g2_addgrid.c' || echo '$(srcdir)/'`./g2clib-1.0.4/g2_addgrid.c + +g2_addlocal.lo: ./g2clib-1.0.4/g2_addlocal.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT g2_addlocal.lo -MD -MP -MF $(DEPDIR)/g2_addlocal.Tpo -c -o g2_addlocal.lo `test -f './g2clib-1.0.4/g2_addlocal.c' || echo '$(srcdir)/'`./g2clib-1.0.4/g2_addlocal.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/g2_addlocal.Tpo $(DEPDIR)/g2_addlocal.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='./g2clib-1.0.4/g2_addlocal.c' object='g2_addlocal.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o g2_addlocal.lo `test -f './g2clib-1.0.4/g2_addlocal.c' || echo '$(srcdir)/'`./g2clib-1.0.4/g2_addlocal.c + +g2_create.lo: ./g2clib-1.0.4/g2_create.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT g2_create.lo -MD -MP -MF $(DEPDIR)/g2_create.Tpo -c -o g2_create.lo `test -f './g2clib-1.0.4/g2_create.c' || echo '$(srcdir)/'`./g2clib-1.0.4/g2_create.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/g2_create.Tpo $(DEPDIR)/g2_create.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='./g2clib-1.0.4/g2_create.c' object='g2_create.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o g2_create.lo `test -f './g2clib-1.0.4/g2_create.c' || echo '$(srcdir)/'`./g2clib-1.0.4/g2_create.c + +g2_free.lo: ./g2clib-1.0.4/g2_free.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT g2_free.lo -MD -MP -MF $(DEPDIR)/g2_free.Tpo -c -o g2_free.lo `test -f './g2clib-1.0.4/g2_free.c' || echo '$(srcdir)/'`./g2clib-1.0.4/g2_free.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/g2_free.Tpo $(DEPDIR)/g2_free.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='./g2clib-1.0.4/g2_free.c' object='g2_free.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o g2_free.lo `test -f './g2clib-1.0.4/g2_free.c' || echo '$(srcdir)/'`./g2clib-1.0.4/g2_free.c + +g2_getfld.lo: ./g2clib-1.0.4/g2_getfld.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT g2_getfld.lo -MD -MP -MF $(DEPDIR)/g2_getfld.Tpo -c -o g2_getfld.lo `test -f './g2clib-1.0.4/g2_getfld.c' || echo '$(srcdir)/'`./g2clib-1.0.4/g2_getfld.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/g2_getfld.Tpo $(DEPDIR)/g2_getfld.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='./g2clib-1.0.4/g2_getfld.c' object='g2_getfld.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o g2_getfld.lo `test -f './g2clib-1.0.4/g2_getfld.c' || echo '$(srcdir)/'`./g2clib-1.0.4/g2_getfld.c + +g2_gribend.lo: ./g2clib-1.0.4/g2_gribend.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT g2_gribend.lo -MD -MP -MF $(DEPDIR)/g2_gribend.Tpo -c -o g2_gribend.lo `test -f './g2clib-1.0.4/g2_gribend.c' || echo '$(srcdir)/'`./g2clib-1.0.4/g2_gribend.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/g2_gribend.Tpo $(DEPDIR)/g2_gribend.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='./g2clib-1.0.4/g2_gribend.c' object='g2_gribend.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o g2_gribend.lo `test -f './g2clib-1.0.4/g2_gribend.c' || echo '$(srcdir)/'`./g2clib-1.0.4/g2_gribend.c + +g2_info.lo: ./g2clib-1.0.4/g2_info.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT g2_info.lo -MD -MP -MF $(DEPDIR)/g2_info.Tpo -c -o g2_info.lo `test -f './g2clib-1.0.4/g2_info.c' || echo '$(srcdir)/'`./g2clib-1.0.4/g2_info.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/g2_info.Tpo $(DEPDIR)/g2_info.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='./g2clib-1.0.4/g2_info.c' object='g2_info.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o g2_info.lo `test -f './g2clib-1.0.4/g2_info.c' || echo '$(srcdir)/'`./g2clib-1.0.4/g2_info.c + +g2_miss.lo: ./g2clib-1.0.4/g2_miss.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT g2_miss.lo -MD -MP -MF $(DEPDIR)/g2_miss.Tpo -c -o g2_miss.lo `test -f './g2clib-1.0.4/g2_miss.c' || echo '$(srcdir)/'`./g2clib-1.0.4/g2_miss.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/g2_miss.Tpo $(DEPDIR)/g2_miss.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='./g2clib-1.0.4/g2_miss.c' object='g2_miss.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o g2_miss.lo `test -f './g2clib-1.0.4/g2_miss.c' || echo '$(srcdir)/'`./g2clib-1.0.4/g2_miss.c + +g2_unpack1.lo: ./g2clib-1.0.4/g2_unpack1.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT g2_unpack1.lo -MD -MP -MF $(DEPDIR)/g2_unpack1.Tpo -c -o g2_unpack1.lo `test -f './g2clib-1.0.4/g2_unpack1.c' || echo '$(srcdir)/'`./g2clib-1.0.4/g2_unpack1.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/g2_unpack1.Tpo $(DEPDIR)/g2_unpack1.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='./g2clib-1.0.4/g2_unpack1.c' object='g2_unpack1.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o g2_unpack1.lo `test -f './g2clib-1.0.4/g2_unpack1.c' || echo '$(srcdir)/'`./g2clib-1.0.4/g2_unpack1.c + +g2_unpack2.lo: ./g2clib-1.0.4/g2_unpack2.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT g2_unpack2.lo -MD -MP -MF $(DEPDIR)/g2_unpack2.Tpo -c -o g2_unpack2.lo `test -f './g2clib-1.0.4/g2_unpack2.c' || echo '$(srcdir)/'`./g2clib-1.0.4/g2_unpack2.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/g2_unpack2.Tpo $(DEPDIR)/g2_unpack2.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='./g2clib-1.0.4/g2_unpack2.c' object='g2_unpack2.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o g2_unpack2.lo `test -f './g2clib-1.0.4/g2_unpack2.c' || echo '$(srcdir)/'`./g2clib-1.0.4/g2_unpack2.c + +g2_unpack3.lo: ./g2clib-1.0.4/g2_unpack3.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT g2_unpack3.lo -MD -MP -MF $(DEPDIR)/g2_unpack3.Tpo -c -o g2_unpack3.lo `test -f './g2clib-1.0.4/g2_unpack3.c' || echo '$(srcdir)/'`./g2clib-1.0.4/g2_unpack3.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/g2_unpack3.Tpo $(DEPDIR)/g2_unpack3.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='./g2clib-1.0.4/g2_unpack3.c' object='g2_unpack3.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o g2_unpack3.lo `test -f './g2clib-1.0.4/g2_unpack3.c' || echo '$(srcdir)/'`./g2clib-1.0.4/g2_unpack3.c + +g2_unpack4.lo: ./g2clib-1.0.4/g2_unpack4.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT g2_unpack4.lo -MD -MP -MF $(DEPDIR)/g2_unpack4.Tpo -c -o g2_unpack4.lo `test -f './g2clib-1.0.4/g2_unpack4.c' || echo '$(srcdir)/'`./g2clib-1.0.4/g2_unpack4.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/g2_unpack4.Tpo $(DEPDIR)/g2_unpack4.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='./g2clib-1.0.4/g2_unpack4.c' object='g2_unpack4.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o g2_unpack4.lo `test -f './g2clib-1.0.4/g2_unpack4.c' || echo '$(srcdir)/'`./g2clib-1.0.4/g2_unpack4.c + +g2_unpack5.lo: ./g2clib-1.0.4/g2_unpack5.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT g2_unpack5.lo -MD -MP -MF $(DEPDIR)/g2_unpack5.Tpo -c -o g2_unpack5.lo `test -f './g2clib-1.0.4/g2_unpack5.c' || echo '$(srcdir)/'`./g2clib-1.0.4/g2_unpack5.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/g2_unpack5.Tpo $(DEPDIR)/g2_unpack5.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='./g2clib-1.0.4/g2_unpack5.c' object='g2_unpack5.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o g2_unpack5.lo `test -f './g2clib-1.0.4/g2_unpack5.c' || echo '$(srcdir)/'`./g2clib-1.0.4/g2_unpack5.c + +g2_unpack6.lo: ./g2clib-1.0.4/g2_unpack6.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT g2_unpack6.lo -MD -MP -MF $(DEPDIR)/g2_unpack6.Tpo -c -o g2_unpack6.lo `test -f './g2clib-1.0.4/g2_unpack6.c' || echo '$(srcdir)/'`./g2clib-1.0.4/g2_unpack6.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/g2_unpack6.Tpo $(DEPDIR)/g2_unpack6.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='./g2clib-1.0.4/g2_unpack6.c' object='g2_unpack6.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o g2_unpack6.lo `test -f './g2clib-1.0.4/g2_unpack6.c' || echo '$(srcdir)/'`./g2clib-1.0.4/g2_unpack6.c + +g2_unpack7.lo: ./g2clib-1.0.4/g2_unpack7.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT g2_unpack7.lo -MD -MP -MF $(DEPDIR)/g2_unpack7.Tpo -c -o g2_unpack7.lo `test -f './g2clib-1.0.4/g2_unpack7.c' || echo '$(srcdir)/'`./g2clib-1.0.4/g2_unpack7.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/g2_unpack7.Tpo $(DEPDIR)/g2_unpack7.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='./g2clib-1.0.4/g2_unpack7.c' object='g2_unpack7.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o g2_unpack7.lo `test -f './g2clib-1.0.4/g2_unpack7.c' || echo '$(srcdir)/'`./g2clib-1.0.4/g2_unpack7.c + +gbits.lo: ./g2clib-1.0.4/gbits.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gbits.lo -MD -MP -MF $(DEPDIR)/gbits.Tpo -c -o gbits.lo `test -f './g2clib-1.0.4/gbits.c' || echo '$(srcdir)/'`./g2clib-1.0.4/gbits.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gbits.Tpo $(DEPDIR)/gbits.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='./g2clib-1.0.4/gbits.c' object='gbits.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gbits.lo `test -f './g2clib-1.0.4/gbits.c' || echo '$(srcdir)/'`./g2clib-1.0.4/gbits.c + +getdim.lo: ./g2clib-1.0.4/getdim.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT getdim.lo -MD -MP -MF $(DEPDIR)/getdim.Tpo -c -o getdim.lo `test -f './g2clib-1.0.4/getdim.c' || echo '$(srcdir)/'`./g2clib-1.0.4/getdim.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/getdim.Tpo $(DEPDIR)/getdim.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='./g2clib-1.0.4/getdim.c' object='getdim.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o getdim.lo `test -f './g2clib-1.0.4/getdim.c' || echo '$(srcdir)/'`./g2clib-1.0.4/getdim.c + +getpoly.lo: ./g2clib-1.0.4/getpoly.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT getpoly.lo -MD -MP -MF $(DEPDIR)/getpoly.Tpo -c -o getpoly.lo `test -f './g2clib-1.0.4/getpoly.c' || echo '$(srcdir)/'`./g2clib-1.0.4/getpoly.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/getpoly.Tpo $(DEPDIR)/getpoly.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='./g2clib-1.0.4/getpoly.c' object='getpoly.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o getpoly.lo `test -f './g2clib-1.0.4/getpoly.c' || echo '$(srcdir)/'`./g2clib-1.0.4/getpoly.c + +gridtemplates.lo: ./g2clib-1.0.4/gridtemplates.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gridtemplates.lo -MD -MP -MF $(DEPDIR)/gridtemplates.Tpo -c -o gridtemplates.lo `test -f './g2clib-1.0.4/gridtemplates.c' || echo '$(srcdir)/'`./g2clib-1.0.4/gridtemplates.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gridtemplates.Tpo $(DEPDIR)/gridtemplates.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='./g2clib-1.0.4/gridtemplates.c' object='gridtemplates.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gridtemplates.lo `test -f './g2clib-1.0.4/gridtemplates.c' || echo '$(srcdir)/'`./g2clib-1.0.4/gridtemplates.c + +int_power.lo: ./g2clib-1.0.4/int_power.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT int_power.lo -MD -MP -MF $(DEPDIR)/int_power.Tpo -c -o int_power.lo `test -f './g2clib-1.0.4/int_power.c' || echo '$(srcdir)/'`./g2clib-1.0.4/int_power.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/int_power.Tpo $(DEPDIR)/int_power.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='./g2clib-1.0.4/int_power.c' object='int_power.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o int_power.lo `test -f './g2clib-1.0.4/int_power.c' || echo '$(srcdir)/'`./g2clib-1.0.4/int_power.c + +jpcpack.lo: ./g2clib-1.0.4/jpcpack.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT jpcpack.lo -MD -MP -MF $(DEPDIR)/jpcpack.Tpo -c -o jpcpack.lo `test -f './g2clib-1.0.4/jpcpack.c' || echo '$(srcdir)/'`./g2clib-1.0.4/jpcpack.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/jpcpack.Tpo $(DEPDIR)/jpcpack.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='./g2clib-1.0.4/jpcpack.c' object='jpcpack.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o jpcpack.lo `test -f './g2clib-1.0.4/jpcpack.c' || echo '$(srcdir)/'`./g2clib-1.0.4/jpcpack.c + +jpcunpack.lo: ./g2clib-1.0.4/jpcunpack.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT jpcunpack.lo -MD -MP -MF $(DEPDIR)/jpcunpack.Tpo -c -o jpcunpack.lo `test -f './g2clib-1.0.4/jpcunpack.c' || echo '$(srcdir)/'`./g2clib-1.0.4/jpcunpack.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/jpcunpack.Tpo $(DEPDIR)/jpcunpack.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='./g2clib-1.0.4/jpcunpack.c' object='jpcunpack.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o jpcunpack.lo `test -f './g2clib-1.0.4/jpcunpack.c' || echo '$(srcdir)/'`./g2clib-1.0.4/jpcunpack.c + +misspack.lo: ./g2clib-1.0.4/misspack.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT misspack.lo -MD -MP -MF $(DEPDIR)/misspack.Tpo -c -o misspack.lo `test -f './g2clib-1.0.4/misspack.c' || echo '$(srcdir)/'`./g2clib-1.0.4/misspack.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/misspack.Tpo $(DEPDIR)/misspack.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='./g2clib-1.0.4/misspack.c' object='misspack.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o misspack.lo `test -f './g2clib-1.0.4/misspack.c' || echo '$(srcdir)/'`./g2clib-1.0.4/misspack.c + +mkieee.lo: ./g2clib-1.0.4/mkieee.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mkieee.lo -MD -MP -MF $(DEPDIR)/mkieee.Tpo -c -o mkieee.lo `test -f './g2clib-1.0.4/mkieee.c' || echo '$(srcdir)/'`./g2clib-1.0.4/mkieee.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/mkieee.Tpo $(DEPDIR)/mkieee.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='./g2clib-1.0.4/mkieee.c' object='mkieee.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mkieee.lo `test -f './g2clib-1.0.4/mkieee.c' || echo '$(srcdir)/'`./g2clib-1.0.4/mkieee.c + +pack_gp.lo: ./g2clib-1.0.4/pack_gp.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pack_gp.lo -MD -MP -MF $(DEPDIR)/pack_gp.Tpo -c -o pack_gp.lo `test -f './g2clib-1.0.4/pack_gp.c' || echo '$(srcdir)/'`./g2clib-1.0.4/pack_gp.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pack_gp.Tpo $(DEPDIR)/pack_gp.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='./g2clib-1.0.4/pack_gp.c' object='pack_gp.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pack_gp.lo `test -f './g2clib-1.0.4/pack_gp.c' || echo '$(srcdir)/'`./g2clib-1.0.4/pack_gp.c + +pdstemplates.lo: ./g2clib-1.0.4/pdstemplates.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pdstemplates.lo -MD -MP -MF $(DEPDIR)/pdstemplates.Tpo -c -o pdstemplates.lo `test -f './g2clib-1.0.4/pdstemplates.c' || echo '$(srcdir)/'`./g2clib-1.0.4/pdstemplates.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pdstemplates.Tpo $(DEPDIR)/pdstemplates.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='./g2clib-1.0.4/pdstemplates.c' object='pdstemplates.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pdstemplates.lo `test -f './g2clib-1.0.4/pdstemplates.c' || echo '$(srcdir)/'`./g2clib-1.0.4/pdstemplates.c + +pngpack.lo: ./g2clib-1.0.4/pngpack.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pngpack.lo -MD -MP -MF $(DEPDIR)/pngpack.Tpo -c -o pngpack.lo `test -f './g2clib-1.0.4/pngpack.c' || echo '$(srcdir)/'`./g2clib-1.0.4/pngpack.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pngpack.Tpo $(DEPDIR)/pngpack.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='./g2clib-1.0.4/pngpack.c' object='pngpack.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pngpack.lo `test -f './g2clib-1.0.4/pngpack.c' || echo '$(srcdir)/'`./g2clib-1.0.4/pngpack.c + +pngunpack.lo: ./g2clib-1.0.4/pngunpack.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pngunpack.lo -MD -MP -MF $(DEPDIR)/pngunpack.Tpo -c -o pngunpack.lo `test -f './g2clib-1.0.4/pngunpack.c' || echo '$(srcdir)/'`./g2clib-1.0.4/pngunpack.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pngunpack.Tpo $(DEPDIR)/pngunpack.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='./g2clib-1.0.4/pngunpack.c' object='pngunpack.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pngunpack.lo `test -f './g2clib-1.0.4/pngunpack.c' || echo '$(srcdir)/'`./g2clib-1.0.4/pngunpack.c + +rdieee.lo: ./g2clib-1.0.4/rdieee.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT rdieee.lo -MD -MP -MF $(DEPDIR)/rdieee.Tpo -c -o rdieee.lo `test -f './g2clib-1.0.4/rdieee.c' || echo '$(srcdir)/'`./g2clib-1.0.4/rdieee.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/rdieee.Tpo $(DEPDIR)/rdieee.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='./g2clib-1.0.4/rdieee.c' object='rdieee.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o rdieee.lo `test -f './g2clib-1.0.4/rdieee.c' || echo '$(srcdir)/'`./g2clib-1.0.4/rdieee.c + +reduce.lo: ./g2clib-1.0.4/reduce.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT reduce.lo -MD -MP -MF $(DEPDIR)/reduce.Tpo -c -o reduce.lo `test -f './g2clib-1.0.4/reduce.c' || echo '$(srcdir)/'`./g2clib-1.0.4/reduce.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/reduce.Tpo $(DEPDIR)/reduce.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='./g2clib-1.0.4/reduce.c' object='reduce.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o reduce.lo `test -f './g2clib-1.0.4/reduce.c' || echo '$(srcdir)/'`./g2clib-1.0.4/reduce.c + +seekgb.lo: ./g2clib-1.0.4/seekgb.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT seekgb.lo -MD -MP -MF $(DEPDIR)/seekgb.Tpo -c -o seekgb.lo `test -f './g2clib-1.0.4/seekgb.c' || echo '$(srcdir)/'`./g2clib-1.0.4/seekgb.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/seekgb.Tpo $(DEPDIR)/seekgb.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='./g2clib-1.0.4/seekgb.c' object='seekgb.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o seekgb.lo `test -f './g2clib-1.0.4/seekgb.c' || echo '$(srcdir)/'`./g2clib-1.0.4/seekgb.c + +simpack.lo: ./g2clib-1.0.4/simpack.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT simpack.lo -MD -MP -MF $(DEPDIR)/simpack.Tpo -c -o simpack.lo `test -f './g2clib-1.0.4/simpack.c' || echo '$(srcdir)/'`./g2clib-1.0.4/simpack.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/simpack.Tpo $(DEPDIR)/simpack.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='./g2clib-1.0.4/simpack.c' object='simpack.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o simpack.lo `test -f './g2clib-1.0.4/simpack.c' || echo '$(srcdir)/'`./g2clib-1.0.4/simpack.c + +simunpack.lo: ./g2clib-1.0.4/simunpack.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT simunpack.lo -MD -MP -MF $(DEPDIR)/simunpack.Tpo -c -o simunpack.lo `test -f './g2clib-1.0.4/simunpack.c' || echo '$(srcdir)/'`./g2clib-1.0.4/simunpack.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/simunpack.Tpo $(DEPDIR)/simunpack.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='./g2clib-1.0.4/simunpack.c' object='simunpack.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o simunpack.lo `test -f './g2clib-1.0.4/simunpack.c' || echo '$(srcdir)/'`./g2clib-1.0.4/simunpack.c + +specpack.lo: ./g2clib-1.0.4/specpack.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT specpack.lo -MD -MP -MF $(DEPDIR)/specpack.Tpo -c -o specpack.lo `test -f './g2clib-1.0.4/specpack.c' || echo '$(srcdir)/'`./g2clib-1.0.4/specpack.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/specpack.Tpo $(DEPDIR)/specpack.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='./g2clib-1.0.4/specpack.c' object='specpack.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o specpack.lo `test -f './g2clib-1.0.4/specpack.c' || echo '$(srcdir)/'`./g2clib-1.0.4/specpack.c + +specunpack.lo: ./g2clib-1.0.4/specunpack.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT specunpack.lo -MD -MP -MF $(DEPDIR)/specunpack.Tpo -c -o specunpack.lo `test -f './g2clib-1.0.4/specunpack.c' || echo '$(srcdir)/'`./g2clib-1.0.4/specunpack.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/specunpack.Tpo $(DEPDIR)/specunpack.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='./g2clib-1.0.4/specunpack.c' object='specunpack.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o specunpack.lo `test -f './g2clib-1.0.4/specunpack.c' || echo '$(srcdir)/'`./g2clib-1.0.4/specunpack.c + +.cpp.o: +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< + +.cpp.obj: +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + +.cpp.lo: +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + set x; \ + here=`pwd`; \ + $(am__define_uniq_tagged_files); \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ + fi +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ + test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(LTLIBRARIES) +installdirs: + for dir in "$(DESTDIR)$(pkglibdir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool clean-pkglibLTLIBRARIES \ + mostlyclean-am + +distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: install-pkglibLTLIBRARIES + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-pkglibLTLIBRARIES + +.MAKE: install-am install-strip + +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-pkglibLTLIBRARIES install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ + uninstall-pkglibLTLIBRARIES + + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nru saga-2.1.0+dfsg/src/modules/io/io_grid_grib2/MLB_Interface.cpp saga-2.1.4+dfsg/src/modules/io/io_grid_grib2/MLB_Interface.cpp --- saga-2.1.0+dfsg/src/modules/io/io_grid_grib2/MLB_Interface.cpp 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_grid_grib2/MLB_Interface.cpp 2014-11-13 08:32:19.000000000 +0000 @@ -0,0 +1,64 @@ +/********************************************************** + * Version $Id: MLB_Interface.cpp 1246 2011-11-25 13:42:38Z oconrad $ + *********************************************************/ +/* + * Thomas Schorr 2007 + */ + +#include "MLB_Interface.h" + +CSG_String Get_Info(int i) +{ + switch( i ) + { + case MLB_INFO_Name: default: + return( _TL("GRIB Files") ); + + case MLB_INFO_Category: + return( _TL("Import/Export") ); + + case MLB_INFO_Author: + return( _TL("Thomas Schorr (c) 2007") ); + + case MLB_INFO_Description: + return( _TW( + "Import and export of GRIdded Binary (GRIB) files using the " + "g2clib library of the National Center for Environmental Prediction (NCEP). " + "Find more information at " + "" + "http://www.nco.ncep.noaa.gov/" + )); + + case MLB_INFO_Version: + return( _TL("0.1") ); + + case MLB_INFO_Menu_Path: + return( _TL("File|Grid") ); + } +} + +#include "grib2_import.h" + +CSG_Module * Create_Module(int i) +{ + CSG_Module *pModule; + + switch( i ) + { + case 0: + pModule = new SGGrib2Import; + break; + + default: + pModule = NULL; + break; + } + + return( pModule ); +} + +//{{AFX_SAGA + + MLB_INTERFACE + +//}}AFX_SAGA diff -Nru saga-2.1.0+dfsg/src/modules/io/io_grid_grib2/MLB_Interface.h saga-2.1.4+dfsg/src/modules/io/io_grid_grib2/MLB_Interface.h --- saga-2.1.0+dfsg/src/modules/io/io_grid_grib2/MLB_Interface.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_grid_grib2/MLB_Interface.h 2014-11-13 08:32:19.000000000 +0000 @@ -0,0 +1,19 @@ +/********************************************************** + * Version $Id: MLB_Interface.h 911 2011-02-14 16:38:15Z reklov_w $ + *********************************************************/ +/* + * Thomas Schorr 2007 + */ + +#ifndef HEADER_INCLUDED__io_grid_grib2_H +#define HEADER_INCLUDED__io_grid_grib2_H + +#include + +#ifdef io_grid_grib2_EXPORTS + #define io_grid_grib2_EXPORT _SAGA_DLL_EXPORT +#else + #define io_grid_grib2_EXPORT _SAGA_DLL_IMPORT +#endif + +#endif // #ifndef HEADER_INCLUDED__io_grid_grib2_H diff -Nru saga-2.1.0+dfsg/src/modules/io/io_grid_image/grid_export.cpp saga-2.1.4+dfsg/src/modules/io/io_grid_image/grid_export.cpp --- saga-2.1.0+dfsg/src/modules/io/io_grid_image/grid_export.cpp 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_grid_image/grid_export.cpp 2014-11-13 08:32:20.000000000 +0000 @@ -0,0 +1,572 @@ +/********************************************************** + * Version $Id: grid_export.cpp 2321 2014-11-03 21:10:22Z johanvdw $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// image_io // +// // +//-------------------------------------------------------// +// // +// Grid_Export.cpp // +// // +// Copyright (C) 2005 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: SAGA User Group Association // +// Institute of Geography // +// University of Goettingen // +// Goldschmidtstr. 5 // +// 37077 Goettingen // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include +#include + +#include "grid_export.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +CGrid_Export::CGrid_Export(void) +{ + Set_Name (_TL("Export Image (bmp, jpg, pcx, png, tif)")); + + Set_Author (SG_T("O.Conrad (c) 2005")); + + Set_Description (_TW( + "The module allows to save a grid as image.\n\n" + "On the command line, in case a shade grid is specified, " + "it's minimum and maximum brightness values can be specified in " + "percent.\n") + ); + + Parameters.Add_Grid( + NULL , "GRID" , _TL("Grid"), + _TL(""), + PARAMETER_INPUT + ); + + Parameters.Add_Grid( + NULL , "SHADE" , _TL("Shade"), + _TL(""), + PARAMETER_INPUT_OPTIONAL + ); + + Parameters.Add_FilePath( + NULL , "FILE" , _TL("Image File"), + _TL(""), + CSG_String::Format(SG_T("%s|%s|%s|%s|%s|%s|%s|%s|%s|%s"), + _TL("Windows or OS/2 Bitmap (*.bmp)") , SG_T("*.bmp"), + _TL("JPEG - JFIF Compliant (*.jpg, *.jif, *.jpeg)") , SG_T("*.jpg;*.jif;*.jpeg"), + _TL("Zsoft Paintbrush (*.pcx)") , SG_T("*.pcx"), + _TL("Portable Network Graphics (*.png)") , SG_T("*.png"), + _TL("Tagged Image File Format (*.tif, *.tiff)") , SG_T("*.tif;*.tiff") + ), NULL, true + ); + + Parameters.Add_Value( + NULL , "FILE_KML" , _TL("Create KML File"), + _TL(""), + PARAMETER_TYPE_Bool, true + ); + + if( SG_UI_Get_Window_Main() ) + { + Parameters.Add_Choice( + NULL , "COLOURING" , _TL("Colouring"), + _TL(""), + CSG_String::Format(SG_T("%s|%s|%s|%s|%s|%s|"), + _TL("stretch to grid's standard deviation"), + _TL("stretch to grid's value range"), + _TL("stretch to specified value range"), + _TL("lookup table"), + _TL("rgb coded values"), + _TL("same as in graphical user interface") + ), 5 + ); + + Parameters.Add_Colors( + NULL , "COL_PALETTE" , _TL("Colours Palette"), + _TL("") + ); + } + else + { + Parameters.Add_Choice( + NULL , "COLOURING" , _TL("Colouring"), + _TL(""), + CSG_String::Format(SG_T("%s|%s|%s|%s|%s|"), + _TL("stretch to grid's standard deviation"), + _TL("stretch to grid's value range"), + _TL("stretch to specified value range"), + _TL("lookup table"), + _TL("rgb coded values") + ), 0 + ); + + Parameters.Add_Choice( + NULL , "COL_PALETTE" , _TL("Color Palette"), + _TL(""), + CSG_String::Format(SG_T("%s|%s|%s|%s|%s|%s|%s|%s|%s|%s|%s|%s|%s|%s|%s|%s|%s|%s|%s|%s|%s|%s|%s|%s|%s|%s|%s|"), + _TL("DEFAULT"), _TL("DEFAULT_BRIGHT"), _TL("BLACK_WHITE"), _TL("BLACK_RED"), + _TL("BLACK_GREEN"), _TL("BLACK_BLUE"), _TL("WHITE_RED"), _TL("WHITE_GREEN"), + _TL("WHITE_BLUE"), _TL("YELLOW_RED"), _TL("YELLOW_GREEN"), _TL("YELLOW_BLUE"), + _TL("RED_GREEN"), _TL("RED_BLUE"), _TL("GREEN_BLUE"), _TL("RED_GREY_BLUE"), + _TL("RED_GREY_GREEN"), _TL("GREEN_GREY_BLUE"), _TL("RED_GREEN_BLUE"), _TL("RED_BLUE_GREEN"), + _TL("GREEN_RED_BLUE"), _TL("RAINBOW"), _TL("NEON"), _TL("TOPOGRAPHY"), + _TL("ASPECT_1"), _TL("ASPECT_2"), _TL("ASPECT_3") + ), 0 + ); + + Parameters.Add_Value( + NULL , "COL_COUNT" , _TL("Number of Colors"), + _TL(""), + PARAMETER_TYPE_Int, 100 + ); + + Parameters.Add_Value( + NULL , "COL_REVERT" , _TL("Revert Palette"), + _TL(""), + PARAMETER_TYPE_Bool, false + ); + } + + Parameters.Add_Value( + NULL , "STDDEV" , _TL("Standard Deviation"), + _TL(""), + PARAMETER_TYPE_Double, 2.0, 0.0, true + ); + + Parameters.Add_Range( + NULL , "STRETCH" , _TL("Stretch to Value Range"), + _TL(""), + 0.0, 100.0 + ); + + Parameters.Add_Table( + NULL , "LUT" , _TL("Lookup Table"), + _TL(""), + PARAMETER_INPUT_OPTIONAL + ); + + if( !SG_UI_Get_Window_Main() ) + { + Parameters.Add_Range( + NULL , "SHADE_BRIGHT", _TL("Shade Brightness"), + _TL("Allows one to scale shade brightness [percent]"), + 0.0, 100.0, 0.0, true, 100.0, true + ); + } +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +int CGrid_Export::On_Parameters_Enable(CSG_Parameters *pParameters, CSG_Parameter *pParameter) +{ + if( !SG_STR_CMP(pParameter->Get_Identifier(), SG_T("COLOURING")) ) + { + pParameters->Get_Parameter("COL_PALETTE")->Set_Enabled(pParameter->asInt() <= 2); + pParameters->Get_Parameter("STDDEV" )->Set_Enabled(pParameter->asInt() == 0); + pParameters->Get_Parameter("STRETCH" )->Set_Enabled(pParameter->asInt() == 2); + pParameters->Get_Parameter("LUT" )->Set_Enabled(pParameter->asInt() == 3); + } + + return( 1 ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CGrid_Export::On_Execute(void) +{ + //----------------------------------------------------- + int y, iy, Method; + CSG_Grid *pGrid, *pShade, Grid, Shade; + + //----------------------------------------------------- + pGrid = Parameters("GRID" )->asGrid(); + pShade = Parameters("SHADE" )->asGrid(); + Method = Parameters("COLOURING")->asInt (); + + if( !pGrid ) + { + return( false ); + } + + //----------------------------------------------------- + if( Method == 5 ) // same as in graphical user interface + { + if( !SG_UI_DataObject_asImage(pGrid, &Grid) ) + { + Error_Set("could not retrieve colour coding from graphical user interface."); + + return( false ); + } + } + else + { + double zMin, zScale; + CSG_Colors Colors; + CSG_Table LUT; + + if( SG_UI_Get_Window_Main() ) + { + Colors.Assign(Parameters("COL_PALETTE")->asColors()); + } + else + { + Colors.Set_Palette( + Parameters("COL_PALETTE")->asInt (), + Parameters("COL_REVERT" )->asBool(), + Parameters("COL_COUNT" )->asInt () + ); + } + + switch( Method ) + { + case 0: // stretch to grid's standard deviation + zMin = pGrid->Get_Mean() - Parameters("STDDEV")->asDouble() * pGrid->Get_StdDev(); + zScale = Colors.Get_Count() / (2 * Parameters("STDDEV")->asDouble() * pGrid->Get_StdDev()); + break; + + case 1: // stretch to grid's value range + zMin = pGrid->Get_ZMin(); + zScale = Colors.Get_Count() / pGrid->Get_ZRange(); + break; + + case 2: // stretch to specified value range + zMin = Parameters("STRETCH")->asRange()->Get_LoVal(); + if( zMin >= (zScale = Parameters("STRETCH")->asRange()->Get_HiVal()) ) + { + Error_Set(_TL("invalid user specified value range.")); + + return( false ); + } + zScale = Colors.Get_Count() / (zScale - zMin); + break; + + case 3: // lookup table + if( !Parameters("LUT")->asTable() || Parameters("LUT")->asTable()->Get_Field_Count() < 5 ) + { + Error_Set(_TL("invalid lookup table.")); + + return( false ); + } + + LUT.Create(*Parameters("LUT")->asTable()); + break; + + case 4: // rgb coded values + break; + } + + //------------------------------------------------- + Grid.Create(*Get_System(), SG_DATATYPE_Int); + + for(y=0, iy=Get_NY()-1; yasDouble(x, y); + + if( Method == 3 ) // lookup table + { + int i, iColor = -1; + + for(i=0; iColor<0 && i= LUT[i][3] && z <= LUT[i][4] ) + { + Grid.Set_Value(x, iy, LUT[iColor = i].asInt(0)); + } + } + + if( iColor < 0 ) + { + Grid.Set_NoData(x, iy); + } + } + else if( pGrid->is_NoData(x, y) ) + { + Grid.Set_NoData(x, iy); + } + else if( Method == 4 ) // rgb coded values + { + Grid.Set_Value(x, iy, z); + } + else + { + int i = (int)(zScale * (z - zMin)); + + Grid.Set_Value(x, iy, Colors[i < 0 ? 0 : i >= Colors.Get_Count() ? Colors.Get_Count() - 1 : i]); + } + } + } + } + + //----------------------------------------------------- + if( !pShade || pShade->Get_ZRange() <= 0.0 ) + { + pShade = NULL; + } + else if( !SG_UI_DataObject_asImage(pShade, &Shade) ) + { + double dMinBright, dMaxBright; + + dMinBright = Parameters("SHADE_BRIGHT")->asRange()->Get_LoVal() / 100.0; + dMaxBright = Parameters("SHADE_BRIGHT")->asRange()->Get_HiVal() / 100.0; + + if( dMinBright >= dMaxBright ) + { + SG_UI_Msg_Add_Error(_TL("Minimum shade brightness must be lower than maximum shade brightness!")); + + return( false ); + } + + int nColors = 100; + CSG_Colors Colors(nColors, SG_COLORS_BLACK_WHITE, true); + + //------------------------------------------------- + Shade.Create(*Get_System(), SG_DATATYPE_Int); + + for(y=0, iy=Get_NY()-1; yis_NoData(x, y) ) + { + Shade.Set_NoData(x, iy); + } + else + { + Shade.Set_Value (x, iy, Colors[(int)(nColors * (dMaxBright - dMinBright) * (pShade->asDouble(x, y) - pShade->Get_ZMin()) / pShade->Get_ZRange() + dMinBright)]); + } + } + } + } + + //----------------------------------------------------- + wxImage Image(Get_NX(), Get_NY()); + + if( Grid.Get_NoData_Count() > 0 ) + { + Image.SetAlpha(); + } + + for(y=0; yasString()); + + if( !SG_File_Cmp_Extension(fName, SG_T("bmp")) + && !SG_File_Cmp_Extension(fName, SG_T("jpg")) + && !SG_File_Cmp_Extension(fName, SG_T("pcx")) + && !SG_File_Cmp_Extension(fName, SG_T("png")) + && !SG_File_Cmp_Extension(fName, SG_T("tif")) ) + { + fName = SG_File_Make_Path(NULL, fName, SG_T("png")); + } + + //----------------------------------------------------- + wxImageHandler *pImgHandler = NULL; + + if( !SG_UI_Get_Window_Main() ) + { + if( SG_File_Cmp_Extension(fName, SG_T("jpg")) ) + pImgHandler = new wxJPEGHandler; + else if( SG_File_Cmp_Extension(fName, SG_T("pcx")) ) + pImgHandler = new wxPCXHandler; + else if( SG_File_Cmp_Extension(fName, SG_T("tif")) ) + pImgHandler = new wxTIFFHandler; +#ifdef _SAGA_MSW + else if( SG_File_Cmp_Extension(fName, SG_T("bmp")) ) + pImgHandler = new wxBMPHandler; +#endif + else // if( SG_File_Cmp_Extension(fName, SG_T("png")) ) + pImgHandler = new wxPNGHandler; + + wxImage::AddHandler(pImgHandler); + } + + if( !Image.SaveFile(fName.c_str()) ) + { + Error_Set(CSG_String::Format(SG_T("%s [%s]"), _TL("could not save image file"), fName.c_str())); + + return( false ); + } + + pGrid->Get_Projection().Save(SG_File_Make_Path(NULL, fName, SG_T("prj")), SG_PROJ_FMT_WKT); + + //----------------------------------------------------- + CSG_File Stream; + + if( SG_File_Cmp_Extension(fName, SG_T("bmp")) ) Stream.Open(SG_File_Make_Path(NULL, fName, SG_T("bpw")), SG_FILE_W, false); + else if( SG_File_Cmp_Extension(fName, SG_T("jpg")) ) Stream.Open(SG_File_Make_Path(NULL, fName, SG_T("jgw")), SG_FILE_W, false); + else if( SG_File_Cmp_Extension(fName, SG_T("pcx")) ) Stream.Open(SG_File_Make_Path(NULL, fName, SG_T("pxw")), SG_FILE_W, false); + else if( SG_File_Cmp_Extension(fName, SG_T("png")) ) Stream.Open(SG_File_Make_Path(NULL, fName, SG_T("pgw")), SG_FILE_W, false); + else if( SG_File_Cmp_Extension(fName, SG_T("tif")) ) Stream.Open(SG_File_Make_Path(NULL, fName, SG_T("tfw")), SG_FILE_W, false); + + if( Stream.is_Open() ) + { + Stream.Printf(SG_T("%.10f\n%f\n%f\n%.10f\n%.10f\n%.10f\n"), + pGrid->Get_Cellsize(), + 0.0, 0.0, + -pGrid->Get_Cellsize(), + pGrid->Get_XMin(), + pGrid->Get_YMax() + ); + } + + //----------------------------------------------------- + if( Parameters("FILE_KML")->asBool() && Stream.Open(SG_File_Make_Path(NULL, fName, SG_T("kml")), SG_FILE_W, false) ) + { + Stream.Printf(SG_T("\n")); + Stream.Printf(SG_T("\n")); + Stream.Printf(SG_T(" \n")); + Stream.Printf(SG_T(" Raster exported from SAGA\n")); + Stream.Printf(SG_T(" System for Automated Geoscientific Analyses - www.saga-gis.org\n")); + Stream.Printf(SG_T(" \n")); + Stream.Printf(SG_T(" %s\n") , pGrid->Get_Name()); + Stream.Printf(SG_T(" %s\n") , pGrid->Get_Description()); + Stream.Printf(SG_T(" \n")); + Stream.Printf(SG_T(" %s\n") , SG_File_Get_Name(fName, true).c_str()); + Stream.Printf(SG_T(" \n")); + Stream.Printf(SG_T(" \n")); + Stream.Printf(SG_T(" %.10f\n") , pGrid->Get_YMax()); + Stream.Printf(SG_T(" %.10f\n") , pGrid->Get_YMin()); + Stream.Printf(SG_T(" %.10f\n") , pGrid->Get_XMax()); + Stream.Printf(SG_T(" %.10f\n") , pGrid->Get_XMin()); + Stream.Printf(SG_T(" 0.0\n")); + Stream.Printf(SG_T(" \n")); + Stream.Printf(SG_T(" \n")); + Stream.Printf(SG_T(" \n")); + Stream.Printf(SG_T("\n")); + } + + //----------------------------------------------------- + if( !SG_UI_Get_Window_Main() && pImgHandler != NULL) + { + wxImage::RemoveHandler(pImgHandler->GetName()); + } + + //----------------------------------------------------- + return( true ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- diff -Nru saga-2.1.0+dfsg/src/modules/io/io_grid_image/grid_export.h saga-2.1.4+dfsg/src/modules/io/io_grid_image/grid_export.h --- saga-2.1.0+dfsg/src/modules/io/io_grid_image/grid_export.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_grid_image/grid_export.h 2014-11-13 08:32:20.000000000 +0000 @@ -0,0 +1,113 @@ +/********************************************************** + * Version $Id: grid_export.h 2089 2014-04-04 12:37:27Z reklov_w $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// image_io // +// // +//-------------------------------------------------------// +// // +// Grid_Export.h // +// // +// Copyright (C) 2005 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: SAGA User Group Association // +// Institute of Geography // +// University of Goettingen // +// Goldschmidtstr. 5 // +// 37077 Goettingen // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#ifndef HEADER_INCLUDED__Grid_Export_H +#define HEADER_INCLUDED__Grid_Export_H + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "MLB_Interface.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +class io_grid_image_EXPORT CGrid_Export : public CSG_Module_Grid +{ +public: + CGrid_Export(void); + + virtual CSG_String Get_MenuPath (void) { return( _TL("R:Export") ); } + + +protected: + + virtual int On_Parameters_Enable (CSG_Parameters *pParameters, CSG_Parameter *pParameter); + + virtual bool On_Execute (void); + + +private: + + +}; + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#endif // #ifndef HEADER_INCLUDED__Grid_Export_H diff -Nru saga-2.1.0+dfsg/src/modules/io/io_grid_image/grid_import.cpp saga-2.1.4+dfsg/src/modules/io/io_grid_image/grid_import.cpp --- saga-2.1.0+dfsg/src/modules/io/io_grid_image/grid_import.cpp 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_grid_image/grid_import.cpp 2014-11-13 08:32:20.000000000 +0000 @@ -0,0 +1,433 @@ +/********************************************************** + * Version $Id: grid_import.cpp 2089 2014-04-04 12:37:27Z reklov_w $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// image_io // +// // +//-------------------------------------------------------// +// // +// Grid_Import.cpp // +// // +// Copyright (C) 2005 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: SAGA User Group Association // +// Institute of Geography // +// University of Goettingen // +// Goldschmidtstr. 5 // +// 37077 Goettingen // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include +#include + +#include "grid_import.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +CGrid_Import::CGrid_Import(void) +{ + //----------------------------------------------------- + Set_Name (_TL("Import Image (bmp, jpg, png, tif, gif, pnm, xpm)")); + + Set_Author (SG_T("(c) 2005 by O.Conrad")); + + Set_Description (_TW( + "Loads an image." + )); + + //----------------------------------------------------- + Parameters.Add_Grid_Output( + NULL , "OUT_GRID" , _TL("Image"), + _TL("") + ); + + Parameters.Add_Grid_Output( + NULL , "OUT_RED" , _TL("Image (Red Channel)"), + _TL("") + ); + + Parameters.Add_Grid_Output( + NULL , "OUT_GREEN" , _TL("Image (Green Channel)"), + _TL("") + ); + + Parameters.Add_Grid_Output( + NULL , "OUT_BLUE" , _TL("Image (Blue Channel)"), + _TL("") + ); + + //----------------------------------------------------- + Parameters.Add_FilePath( + NULL , "FILE" , _TL("Image File"), + _TL(""), + CSG_String::Format(SG_T("%s|%s|%s|%s|%s|%s|%s|%s|%s|%s|%s|%s|%s|%s|%s|%s"), + _TL("All Recognized File Types") , SG_T("*.bmp;*.ico;*.gif;*.jpg;*.jif;*.jpeg;*.pcx;*.png;*.pnm;*.tif;*.tiff;*.xpm"), + _TL("CompuServe Graphics Interchange (*.gif)") , SG_T("*.gif"), + _TL("JPEG - JFIF Compliant (*.jpg, *.jif, *.jpeg)") , SG_T("*.jpg;*.jif;*.jpeg"), + _TL("Portable Network Graphics (*.png)") , SG_T("*.png"), + _TL("Tagged Image File Format (*.tif, *.tiff)") , SG_T("*.tif;*.tiff"), + _TL("Windows or OS/2 Bitmap (*.bmp)") , SG_T("*.bmp"), + _TL("Zsoft Paintbrush (*.pcx)") , SG_T("*.pcx"), + _TL("All Files") , SG_T("*.*") + ) + ); + + Parameters.Add_Choice( + NULL , "METHOD" , _TL("Options"), + _TL(""), + CSG_String::Format(SG_T("%s|%s|%s|"), + _TL("Standard"), + _TL("Split Channels"), + _TL("Enforce True Color") + ), 2 + ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CGrid_Import::On_Execute(void) +{ + bool bTransform; + int x, y, yy, Method; + double ax, ay, dx, dy, rx, ry, xMin, yMin, Cellsize; + CSG_Colors Colors; + CSG_String fImage, fWorld, Name; + CSG_Grid *pImage; + CSG_File Stream; + wxImage Image; + wxImageHistogram Histogram; + + //----------------------------------------------------- + fImage = Parameters("FILE") ->asString(); + Method = Parameters("METHOD") ->asInt(); + + Name = SG_File_Get_Name(fImage, false); + + //----------------------------------------------------- + wxImageHandler *pImgHandler = NULL; + + if( !SG_UI_Get_Window_Main() ) + { + CSG_String fName = SG_File_Get_Name(fImage, true); + + if( SG_File_Cmp_Extension(fName, SG_T("jpg")) ) + pImgHandler = new wxJPEGHandler; + else if( SG_File_Cmp_Extension(fName, SG_T("pcx")) ) + pImgHandler = new wxPCXHandler; + else if( SG_File_Cmp_Extension(fName, SG_T("tif")) ) + pImgHandler = new wxTIFFHandler; + else if( SG_File_Cmp_Extension(fName, SG_T("gif")) ) + pImgHandler = new wxGIFHandler; + else if( SG_File_Cmp_Extension(fName, SG_T("pnm")) ) + pImgHandler = new wxPNMHandler; + else if( SG_File_Cmp_Extension(fName, SG_T("xpm")) ) + pImgHandler = new wxXPMHandler; +#ifdef _SAGA_MSW + else if( SG_File_Cmp_Extension(fName, SG_T("bmp")) ) + pImgHandler = new wxBMPHandler; +#endif + else // if( SG_File_Cmp_Extension(fName, SG_T("png")) ) + pImgHandler = new wxPNGHandler; + + wxImage::AddHandler(pImgHandler); + } + + if( !Image.LoadFile(fImage.c_str()) ) + { + return( false ); + } + + //----------------------------------------------------- + if( SG_File_Cmp_Extension(fImage, SG_T("bmp")) ) + { + fWorld = SG_File_Make_Path(NULL, fImage, SG_T("bpw")); + } + else if( SG_File_Cmp_Extension(fImage, SG_T("jpg")) ) + { + fWorld = SG_File_Make_Path(NULL, fImage, SG_T("jgw")); + } + else if( SG_File_Cmp_Extension(fImage, SG_T("png")) ) + { + fWorld = SG_File_Make_Path(NULL, fImage, SG_T("pgw")); + } + else if( SG_File_Cmp_Extension(fImage, SG_T("tif")) ) + { + fWorld = SG_File_Make_Path(NULL, fImage, SG_T("tfw")); + } + else + { + fWorld = SG_File_Make_Path(NULL, fImage, SG_T("world")); + } + + bTransform = false; + xMin = 0.0; + yMin = 0.0; + Cellsize = 1.0; + + if( Stream.Open(fWorld, SG_FILE_R, false) && fscanf(Stream.Get_Stream(), "%lf %lf %lf %lf %lf %lf ", &dx, &ry, &rx, &dy, &ax, &ay) == 6 ) + { + if( dx != -dy || rx != 0.0 || ry != 0.0 ) + { + bTransform = true; + } + else + { + xMin = ax; + yMin = ay + dy * (Image.GetHeight() - 1); + Cellsize = dx; + } + } + + + //----------------------------------------------------- + // color look-up table... + + if( Method == 0 && (yy = Image.ComputeHistogram(Histogram)) <= 256 ) + { + Colors.Set_Count(yy); + + for(wxImageHistogram::iterator i=Histogram.begin(); i!=Histogram.end(); ++i) + { + Colors.Set_Color(i->second.index, SG_GET_R(i->first), SG_GET_G(i->first), SG_GET_B(i->first)); + } + + pImage = SG_Create_Grid(yy <= 2 ? SG_DATATYPE_Bit : SG_DATATYPE_Byte, Image.GetWidth(), Image.GetHeight(), Cellsize, xMin, yMin); + + for(y=0; yGet_NY() && Set_Progress(y, pImage->Get_NY()); y++) + { + yy = bTransform ? y : pImage->Get_NY() - 1 - y; + + for(x=0; xGet_NX(); x++) + { + pImage->Set_Value(x, y, Histogram[SG_GET_RGB(Image.GetRed(x, yy), Image.GetGreen(x, yy), Image.GetBlue(x, yy))].index); + } + } + + if( bTransform ) + { + Set_Transformation(&pImage, ax, ay, dx, dy, rx, ry); + } + + pImage->Set_Name(Name); + pImage->Get_Projection().Load(SG_File_Make_Path(NULL, fImage, SG_T("prj"))); + Parameters("OUT_GRID")->Set_Value(pImage); + DataObject_Set_Colors(pImage, Colors); + DataObject_Update(pImage, 0, Colors.Get_Count() - 1); + } + + //----------------------------------------------------- + else // true color... + { + pImage = SG_Create_Grid(SG_DATATYPE_Int, Image.GetWidth(), Image.GetHeight(), Cellsize, xMin, yMin); + pImage ->Set_Name(Name); + + for(y=0; yGet_NY() && Set_Progress(y, pImage->Get_NY()); y++) + { + yy = bTransform ? y : pImage->Get_NY() - 1 - y; + + for(x=0; xGet_NX(); x++) + { + pImage->Set_Value(x, y, SG_GET_RGB(Image.GetRed(x, yy), Image.GetGreen(x, yy), Image.GetBlue(x, yy))); + } + } + + if( bTransform ) + { + Set_Transformation(&pImage, ax, ay, dx, dy, rx, ry); + } + + //------------------------------------------------- + if( Method != 1 ) // true color... + { + pImage->Get_Projection().Load(fImage, SG_PROJ_FMT_WKT); + pImage->Set_Name(Name); + pImage->Get_Projection().Load(SG_File_Make_Path(NULL, fImage, SG_T("prj"))); + Parameters("OUT_GRID")->Set_Value(pImage); + DataObject_Set_Colors(pImage, 100, SG_COLORS_BLACK_WHITE); + DataObject_Set_Parameter(pImage, "COLORS_TYPE", 6); // Color Classification Type: RGB + } + + //------------------------------------------------- + else // split channels... + { + CSG_Grid *pR, *pG, *pB; + + pR = SG_Create_Grid(pImage->Get_System(), SG_DATATYPE_Byte); + pG = SG_Create_Grid(pImage->Get_System(), SG_DATATYPE_Byte); + pB = SG_Create_Grid(pImage->Get_System(), SG_DATATYPE_Byte); + + for(y=0; yGet_NY() && Set_Progress(y, pImage->Get_NY()); y++) + { + for(x=0; xGet_NX(); x++) + { + pR->Set_Value(x, y, SG_GET_R(pImage->asInt(x, y))); + pG->Set_Value(x, y, SG_GET_G(pImage->asInt(x, y))); + pB->Set_Value(x, y, SG_GET_B(pImage->asInt(x, y))); + } + } + + pR->Get_Projection().Load(fImage, SG_PROJ_FMT_WKT); + pG->Get_Projection().Load(fImage, SG_PROJ_FMT_WKT); + pB->Get_Projection().Load(fImage, SG_PROJ_FMT_WKT); + + pR->Set_Name(CSG_String::Format(SG_T("%s [R]"), Name.c_str())); + pG->Set_Name(CSG_String::Format(SG_T("%s [G]"), Name.c_str())); + pB->Set_Name(CSG_String::Format(SG_T("%s [B]"), Name.c_str())); + + pR->Get_Projection().Load(SG_File_Make_Path(NULL, fImage, SG_T("prj"))); + pG->Get_Projection().Load(SG_File_Make_Path(NULL, fImage, SG_T("prj"))); + pB->Get_Projection().Load(SG_File_Make_Path(NULL, fImage, SG_T("prj"))); + + Parameters("OUT_RED") ->Set_Value(pR); + Parameters("OUT_GREEN") ->Set_Value(pG); + Parameters("OUT_BLUE") ->Set_Value(pB); + + DataObject_Set_Colors(pR, 100, SG_COLORS_BLACK_RED); + DataObject_Set_Colors(pG, 100, SG_COLORS_BLACK_GREEN); + DataObject_Set_Colors(pB, 100, SG_COLORS_BLACK_BLUE); + } + } + + //----------------------------------------------------- + if( !SG_UI_Get_Window_Main() && pImgHandler != NULL) + { + wxImage::RemoveHandler(pImgHandler->GetName()); + } + + //----------------------------------------------------- + return( true ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +void CGrid_Import::Set_Transformation(CSG_Grid **ppImage, double ax, double ay, double dx, double dy, double rx, double ry) +{ + int x, y; + double z; + TSG_Rect r; + CSG_Vector A(2), XSrc(2), XTgt(2); + CSG_Matrix D(2, 2), DInv; + CSG_Grid *pSource, *pTarget; + + //----------------------------------------------------- + pSource = *ppImage; + + A[0] = ax; A[1] = ay; + D[0][0] = dx; D[0][1] = rx; + D[1][0] = ry; D[1][1] = dy; + DInv = D.Get_Inverse(); + + //----------------------------------------------------- + XSrc[0] = pSource->Get_XMin(); XSrc[1] = pSource->Get_YMin(); XTgt = D * XSrc + A; + r.xMin = r.xMax = XTgt[0]; + r.yMin = r.yMax = XTgt[1]; + + XSrc[0] = pSource->Get_XMin(); XSrc[1] = pSource->Get_YMax(); XTgt = D * XSrc + A; + if( r.xMin > XTgt[0] ) r.xMin = XTgt[0]; else if( r.xMax < XTgt[0] ) r.xMax = XTgt[0]; + if( r.yMin > XTgt[1] ) r.yMin = XTgt[1]; else if( r.yMax < XTgt[1] ) r.yMax = XTgt[1]; + + XSrc[0] = pSource->Get_XMax(); XSrc[1] = pSource->Get_YMax(); XTgt = D * XSrc + A; + if( r.xMin > XTgt[0] ) r.xMin = XTgt[0]; else if( r.xMax < XTgt[0] ) r.xMax = XTgt[0]; + if( r.yMin > XTgt[1] ) r.yMin = XTgt[1]; else if( r.yMax < XTgt[1] ) r.yMax = XTgt[1]; + + XSrc[0] = pSource->Get_XMax(); XSrc[1] = pSource->Get_YMin(); XTgt = D * XSrc + A; + if( r.xMin > XTgt[0] ) r.xMin = XTgt[0]; else if( r.xMax < XTgt[0] ) r.xMax = XTgt[0]; + if( r.yMin > XTgt[1] ) r.yMin = XTgt[1]; else if( r.yMax < XTgt[1] ) r.yMax = XTgt[1]; + + z = fabs(dx) < fabs(dy) ? fabs(dx) : fabs(dy); // guess a suitable cellsize; could be improved... + x = 1 + (int)((r.xMax - r.xMin) / z); + y = 1 + (int)((r.yMax - r.yMin) / z); + + //----------------------------------------------------- + pTarget = *ppImage = SG_Create_Grid(pSource->Get_Type(), x, y, z, r.xMin, r.yMin); + + for(y=0, XTgt[1]=pTarget->Get_YMin(); yGet_NY() && Set_Progress(y, pTarget->Get_NY()); y++, XTgt[1]+=pTarget->Get_Cellsize()) + { + for(x=0, XTgt[0]=pTarget->Get_XMin(); xGet_NX(); x++, XTgt[0]+=pTarget->Get_Cellsize()) + { + XSrc = DInv * (XTgt - A); + + if( pSource->Get_Value(XSrc[0], XSrc[1], z, GRID_INTERPOLATION_NearestNeighbour, false, true) ) + { + pTarget->Set_Value(x, y, z); + } + else + { + pTarget->Set_NoData(x, y); + } + } + } + + delete(pSource); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- diff -Nru saga-2.1.0+dfsg/src/modules/io/io_grid_image/grid_import.h saga-2.1.4+dfsg/src/modules/io/io_grid_image/grid_import.h --- saga-2.1.0+dfsg/src/modules/io/io_grid_image/grid_import.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_grid_image/grid_import.h 2014-11-13 08:32:20.000000000 +0000 @@ -0,0 +1,113 @@ +/********************************************************** + * Version $Id: grid_import.h 2089 2014-04-04 12:37:27Z reklov_w $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// image_io // +// // +//-------------------------------------------------------// +// // +// Grid_Import.h // +// // +// Copyright (C) 2005 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: SAGA User Group Association // +// Institute of Geography // +// University of Goettingen // +// Goldschmidtstr. 5 // +// 37077 Goettingen // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#ifndef HEADER_INCLUDED__Grid_Import_H +#define HEADER_INCLUDED__Grid_Import_H + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "MLB_Interface.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +class io_grid_image_EXPORT CGrid_Import : public CSG_Module +{ +public: + CGrid_Import(void); + + virtual CSG_String Get_MenuPath (void) { return( _TL("R:Import") ); } + + +protected: + + virtual bool On_Execute (void); + + +private: + + void Set_Transformation (CSG_Grid **ppImage, double ax, double ay, double dx, double dy, double rx, double ry); + +}; + +#endif // #ifndef HEADER_INCLUDED__Grid_Import_H + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- diff -Nru saga-2.1.0+dfsg/src/modules/io/io_grid_image/grid_to_kml.cpp saga-2.1.4+dfsg/src/modules/io/io_grid_image/grid_to_kml.cpp --- saga-2.1.0+dfsg/src/modules/io/io_grid_image/grid_to_kml.cpp 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_grid_image/grid_to_kml.cpp 2014-11-13 08:32:20.000000000 +0000 @@ -0,0 +1,372 @@ +/********************************************************** + * Version $Id: grid_to_kml.cpp 2177 2014-06-30 13:45:37Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// io_grid_image // +// // +//-------------------------------------------------------// +// // +// grid_to_kml.cpp // +// // +// Copyright (C) 2014 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Hamburg // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "grid_to_kml.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +CGrid_to_KML::CGrid_to_KML(void) +{ + Set_Name (_TL("Export Grid to KML")); + + Set_Author ("O.Conrad (c) 2014"); + + Set_Description (_TW( + "Uses 'Export Image' tool to create the image file. Automatically projects raster to geographic " + "coordinate system, if its projection is known and not geographic. " + )); + + Parameters.Add_Grid( + NULL , "GRID" , _TL("Grid"), + _TL(""), + PARAMETER_INPUT + ); + + Parameters.Add_Grid( + NULL , "SHADE" , _TL("Shade"), + _TL(""), + PARAMETER_INPUT_OPTIONAL + ); + + Parameters.Add_FilePath( + NULL , "FILE" , _TL("Image File"), + _TL(""), + CSG_String::Format(SG_T("%s|%s|%s|%s|%s|%s|%s|%s|%s|%s"), + _TL("Windows or OS/2 Bitmap (*.bmp)") , SG_T("*.bmp"), + _TL("JPEG - JFIF Compliant (*.jpg, *.jif, *.jpeg)") , SG_T("*.jpg;*.jif;*.jpeg"), + _TL("Zsoft Paintbrush (*.pcx)") , SG_T("*.pcx"), + _TL("Portable Network Graphics (*.png)") , SG_T("*.png"), + _TL("Tagged Image File Format (*.tif, *.tiff)") , SG_T("*.tif;*.tiff") + ), NULL, true + ); + + if( SG_UI_Get_Window_Main() ) + { + Parameters.Add_Choice( + NULL , "COLOURING" , _TL("Colouring"), + _TL(""), + CSG_String::Format(SG_T("%s|%s|%s|%s|%s|%s|"), + _TL("stretch to grid's standard deviation"), + _TL("stretch to grid's value range"), + _TL("stretch to specified value range"), + _TL("lookup table"), + _TL("rgb coded values"), + _TL("same as in graphical user interface") + ), 5 + ); + + Parameters.Add_Colors( + NULL , "COL_PALETTE" , _TL("Colours Palette"), + _TL("") + ); + } + else + { + Parameters.Add_Choice( + NULL , "COLOURING" , _TL("Colouring"), + _TL(""), + CSG_String::Format(SG_T("%s|%s|%s|%s|%s|"), + _TL("stretch to grid's standard deviation"), + _TL("stretch to grid's value range"), + _TL("stretch to specified value range"), + _TL("lookup table"), + _TL("rgb coded values") + ), 0 + ); + + Parameters.Add_Choice( + NULL , "COL_PALETTE" , _TL("Color Palette"), + _TL(""), + CSG_String::Format(SG_T("%s|%s|%s|%s|%s|%s|%s|%s|%s|%s|%s|%s|%s|%s|%s|%s|%s|%s|%s|%s|%s|%s|%s|%s|%s|%s|%s|"), + _TL("DEFAULT"), _TL("DEFAULT_BRIGHT"), _TL("BLACK_WHITE"), _TL("BLACK_RED"), + _TL("BLACK_GREEN"), _TL("BLACK_BLUE"), _TL("WHITE_RED"), _TL("WHITE_GREEN"), + _TL("WHITE_BLUE"), _TL("YELLOW_RED"), _TL("YELLOW_GREEN"), _TL("YELLOW_BLUE"), + _TL("RED_GREEN"), _TL("RED_BLUE"), _TL("GREEN_BLUE"), _TL("RED_GREY_BLUE"), + _TL("RED_GREY_GREEN"), _TL("GREEN_GREY_BLUE"), _TL("RED_GREEN_BLUE"), _TL("RED_BLUE_GREEN"), + _TL("GREEN_RED_BLUE"), _TL("RAINBOW"), _TL("NEON"), _TL("TOPOGRAPHY"), + _TL("ASPECT_1"), _TL("ASPECT_2"), _TL("ASPECT_3") + ), 0 + ); + + Parameters.Add_Value( + NULL , "COL_COUNT" , _TL("Number of Colors"), + _TL(""), + PARAMETER_TYPE_Int, 100 + ); + + Parameters.Add_Value( + NULL , "COL_REVERT" , _TL("Revert Palette"), + _TL(""), + PARAMETER_TYPE_Bool, false + ); + } + + Parameters.Add_Value( + NULL , "STDDEV" , _TL("Standard Deviation"), + _TL(""), + PARAMETER_TYPE_Double, 2.0, 0.0, true + ); + + Parameters.Add_Range( + NULL , "STRETCH" , _TL("Stretch to Value Range"), + _TL(""), + 0.0, 100.0 + ); + + Parameters.Add_Table( + NULL , "LUT" , _TL("Lookup Table"), + _TL(""), + PARAMETER_INPUT_OPTIONAL + ); + + Parameters.Add_Value( + NULL , "INTERPOL" , _TL("Interpolation"), + _TL("interpolate values if projection is needed"), + PARAMETER_TYPE_Bool, true + ); + + if( !SG_UI_Get_Window_Main() ) + { + Parameters.Add_Range( + NULL , "SHADE_BRIGHT", _TL("Shade Brightness"), + _TL("Allows to scale shade brightness, [percent]"), + 0.0, 100.0, 0.0, true, 100.0, true + ); + } +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +int CGrid_to_KML::On_Parameters_Enable(CSG_Parameters *pParameters, CSG_Parameter *pParameter) +{ + if( !SG_STR_CMP(pParameter->Get_Identifier(), "COLOURING") ) + { + pParameters->Get_Parameter("COL_PALETTE")->Set_Enabled(pParameter->asInt() <= 2); + pParameters->Get_Parameter("STDDEV" )->Set_Enabled(pParameter->asInt() == 0); + pParameters->Get_Parameter("STRETCH" )->Set_Enabled(pParameter->asInt() == 2); + pParameters->Get_Parameter("LUT" )->Set_Enabled(pParameter->asInt() == 3); + } + + if( !SG_STR_CMP(pParameter->Get_Identifier(), "SHADE") && pParameters->Get_Parameter("SHADE_BRIGHT") ) + { + pParameters->Get_Parameter("SHADE_BRIGHT")->Set_Enabled(pParameter->asGrid() != NULL); + } + + if( !SG_STR_CMP(pParameter->Get_Identifier(), "GRID") ) + { + pParameters->Get_Parameter("INTERPOL")->Set_Enabled(pParameter->asGrid() + && pParameter->asGrid()->Get_Projection().Get_Type() == SG_PROJ_TYPE_CS_Projected + ); + } + + return( 1 ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CGrid_to_KML::On_Execute(void) +{ + //----------------------------------------------------- + bool bDelete = false; + + CSG_Parameters P; + CSG_Module *pModule; + + CSG_Grid Grid , *pGrid = Parameters("GRID" )->asGrid(), Image; + CSG_Grid Shade, *pShade = Parameters("SHADE")->asGrid(); + + //----------------------------------------------------- + int Method = Parameters("COLOURING")->asInt(); + + if( Method == 5 ) // same as in graphical user interface + { + if( !SG_UI_DataObject_asImage(pGrid, &Image) ) + { + Error_Set("could not retrieve colour coding from graphical user interface."); + + return( false ); + } + + Image.Flip(); + pGrid = &Image; + Method = 4; // rgb coded values + } + + //----------------------------------------------------- + if( pGrid->Get_Projection().Get_Type() == SG_PROJ_TYPE_CS_Undefined ) + { + Message_Add(_TL("layer uses undefined coordinate system, assuming geographic coordinates")); + } + else if( pGrid->Get_Projection().Get_Type() != SG_PROJ_TYPE_CS_Geographic ) + { + Message_Add(CSG_String::Format(SG_T("\n%s (%s: %s)\n"), _TL("re-projection to geographic coordinates"), _TL("original"), pGrid->Get_Projection().Get_Name().c_str()), false); + + if( (pModule = SG_Get_Module_Library_Manager().Get_Module(SG_T("pj_proj4"), 4)) == NULL ) // Coordinate Transformation (Grid) + { + return( false ); + } + + P.Assign(pModule->Get_Parameters()); + + pModule->Set_Manager(NULL); + + if( pModule->Get_Parameters()->Set_Parameter("CRS_PROJ4" , SG_T("+proj=longlat +ellps=WGS84 +datum=WGS84")) + && pModule->Get_Parameters()->Set_Parameter("INTERPOLATION", Parameters("INTERPOL")->asBool() ? 4 : 0) + && pModule->Get_Parameters()->Set_Parameter("SOURCE" , pGrid) + && pModule->Execute() ) + { + bDelete = true; + + pGrid = pModule->Get_Parameters("GET_USER")->Get_Parameter("GRID")->asGrid(); + + if( pShade + && pModule->Get_Parameters()->Set_Parameter("SOURCE", pShade) + && pModule->Execute() ) + { + pShade = pModule->Get_Parameters("GET_USER")->Get_Parameter("GRID")->asGrid(); + } + else + { + pShade = NULL; + } + } + + pModule->Get_Parameters()->Assign_Values(&P); + pModule->Set_Manager(P.Get_Manager()); + + if( !bDelete ) + { + Message_Add(CSG_String::Format(SG_T("\n%s: %s\n"), _TL("re-projection"), _TL("failed")), false); + + return( false ); + } + } + + //----------------------------------------------------- + if( (pModule = SG_Get_Module_Library_Manager().Get_Module(SG_T("io_grid_image"), 0)) == NULL ) // Export Image + { + return( false ); + } + + P.Assign(pModule->Get_Parameters()); + + pModule->Set_Manager(NULL); + + bool bResult = false; + + if( pModule->Get_Parameters()->Set_Parameter("GRID" , pGrid) + && pModule->Get_Parameters()->Set_Parameter("SHADE" , pShade) + && pModule->Get_Parameters()->Set_Parameter("FILE_KML" , true) + && pModule->Get_Parameters()->Set_Parameter("FILE" , Parameters("FILE")) + && pModule->Get_Parameters()->Set_Parameter("COLOURING" , Method) + && pModule->Get_Parameters()->Set_Parameter("COL_PALETTE" , Parameters("COL_PALETTE")) + && pModule->Get_Parameters()->Set_Parameter("STDDEV" , Parameters("STDDEV")) + && pModule->Get_Parameters()->Set_Parameter("STRETCH" , Parameters("STRETCH")) + && pModule->Get_Parameters()->Set_Parameter("LUT" , Parameters("LUT")) + && (SG_UI_Get_Window_Main() || pModule->Get_Parameters()->Set_Parameter("SHADE_BRIGHT", Parameters("SHADE_BRIGHT"))) + && pModule->Execute() ) + { + bResult = true; + } + + //----------------------------------------------------- + pModule->Get_Parameters()->Assign_Values(&P); + pModule->Set_Manager(P.Get_Manager()); + + if( bDelete ) + { + delete(pGrid); + + if( pShade ) + { + delete(pShade); + } + } + + return( bResult ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- diff -Nru saga-2.1.0+dfsg/src/modules/io/io_grid_image/grid_to_kml.h saga-2.1.4+dfsg/src/modules/io/io_grid_image/grid_to_kml.h --- saga-2.1.0+dfsg/src/modules/io/io_grid_image/grid_to_kml.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_grid_image/grid_to_kml.h 2014-11-13 08:32:20.000000000 +0000 @@ -0,0 +1,111 @@ +/********************************************************** + * Version $Id: grid_to_kml.h 2089 2014-04-04 12:37:27Z reklov_w $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// io_grid_image // +// // +//-------------------------------------------------------// +// // +// grid_to_kml.h // +// // +// Copyright (C) 2014 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Hamburg // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#ifndef HEADER_INCLUDED__grid_to_kml_H +#define HEADER_INCLUDED__grid_to_kml_H + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "MLB_Interface.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +class CGrid_to_KML : public CSG_Module_Grid +{ +public: + CGrid_to_KML(void); + + virtual CSG_String Get_MenuPath (void) { return( _TL("R:Export") ); } + + +protected: + + virtual int On_Parameters_Enable (CSG_Parameters *pParameters, CSG_Parameter *pParameter); + + virtual bool On_Execute (void); + + +private: + + +}; + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#endif // #ifndef HEADER_INCLUDED__grid_to_kml_H diff -Nru saga-2.1.0+dfsg/src/modules/io/io_grid_image/Makefile.am saga-2.1.4+dfsg/src/modules/io/io_grid_image/Makefile.am --- saga-2.1.0+dfsg/src/modules/io/io_grid_image/Makefile.am 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_grid_image/Makefile.am 2014-11-13 08:32:20.000000000 +0000 @@ -0,0 +1,27 @@ +if DEBUG +DBGFLAGS = -g -DDEBUG +endif +if SAGA_UNICODE +DEP_DEFS = -fPIC `wx-config --unicode=yes --static=no --cxxflags` -D_SAGA_UNICODE $(DBGFLAGS) +DEP_LFLG = -fPIC -shared `wx-config --unicode=yes --static=no --libs` +else +DEP_DEFS = -fPIC `wx-config --unicode=no --static=no --cxxflags` $(DBGFLAGS) +DEP_LFLG = -fPIC -shared `wx-config --unicode=no --static=no --libs` +endif +DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD +CXX_INCS = -I$(top_srcdir)/src/saga_core +AM_CXXFLAGS = $(CXX_INCS) $(DEF_SAGA) $(DEP_DEFS) $(DBGFLAGS) $(GOMPFLAGS) +AM_LDFLAGS = $(DEP_LFLG) -avoid-version +pkglib_LTLIBRARIES = libio_grid_image.la +libio_grid_image_la_SOURCES =\ +grid_export.cpp\ +grid_import.cpp\ +grid_to_kml.cpp\ +MLB_Interface.cpp\ +grid_export.h\ +grid_import.h\ +grid_to_kml.h\ +MLB_Interface.h + +libio_grid_image_la_LIBADD = $(top_srcdir)/src/saga_core/saga_api/libsaga_api.la + diff -Nru saga-2.1.0+dfsg/src/modules/io/io_grid_image/Makefile.in saga-2.1.4+dfsg/src/modules/io/io_grid_image/Makefile.in --- saga-2.1.0+dfsg/src/modules/io/io_grid_image/Makefile.in 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_grid_image/Makefile.in 2014-11-13 08:33:33.000000000 +0000 @@ -0,0 +1,705 @@ +# Makefile.in generated by automake 1.14.1 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +subdir = src/modules/io/io_grid_image +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_postgresql.m4 \ + $(top_srcdir)/m4/ax_pkg_swig.m4 \ + $(top_srcdir)/m4/ax_python_devel.m4 \ + $(top_srcdir)/m4/ax_swig_enable_cxx.m4 \ + $(top_srcdir)/m4/ax_swig_python.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__installdirs = "$(DESTDIR)$(pkglibdir)" +LTLIBRARIES = $(pkglib_LTLIBRARIES) +libio_grid_image_la_DEPENDENCIES = \ + $(top_srcdir)/src/saga_core/saga_api/libsaga_api.la +am_libio_grid_image_la_OBJECTS = grid_export.lo grid_import.lo \ + grid_to_kml.lo MLB_Interface.lo +libio_grid_image_la_OBJECTS = $(am_libio_grid_image_la_OBJECTS) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) +depcomp = $(SHELL) $(top_srcdir)/depcomp +am__depfiles_maybe = depfiles +am__mv = mv -f +CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = +CXXLD = $(CXX) +CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = +CCLD = $(CC) +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = +SOURCES = $(libio_grid_image_la_SOURCES) +DIST_SOURCES = $(libio_grid_image_la_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +AX_SWIG_PYTHON_CPPFLAGS = @AX_SWIG_PYTHON_CPPFLAGS@ +AX_SWIG_PYTHON_OPT = @AX_SWIG_PYTHON_OPT@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DISABLELIBHARU = @DISABLELIBHARU@ +DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +FGREP = @FGREP@ +GOMPFLAGS = @GOMPFLAGS@ +GREP = @GREP@ +HARU_LIB = @HARU_LIB@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LOCAL_INCS = @LOCAL_INCS@ +LOCAL_LIBS = @LOCAL_LIBS@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ +MKDIR_P = @MKDIR_P@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PG_CONFIG = @PG_CONFIG@ +POSTGRESQL_CFLAGS = @POSTGRESQL_CFLAGS@ +POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@ +POSTGRESQL_VERSION = @POSTGRESQL_VERSION@ +POW_LIB = @POW_LIB@ +PYTHON = @PYTHON@ +PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ +PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ +PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ +PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_PLATFORM = @PYTHON_PLATFORM@ +PYTHON_PREFIX = @PYTHON_PREFIX@ +PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ +PYTHON_VERSION = @PYTHON_VERSION@ +RANLIB = @RANLIB@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +SWIG = @SWIG@ +SWIG_LIB = @SWIG_LIB@ +VERSION = @VERSION@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +pkgpyexecdir = @pkgpyexecdir@ +pkgpythondir = @pkgpythondir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +pyexecdir = @pyexecdir@ +pythondir = @pythondir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +@DEBUG_TRUE@DBGFLAGS = -g -DDEBUG +@SAGA_UNICODE_FALSE@DEP_DEFS = -fPIC `wx-config --unicode=no --static=no --cxxflags` $(DBGFLAGS) +@SAGA_UNICODE_TRUE@DEP_DEFS = -fPIC `wx-config --unicode=yes --static=no --cxxflags` -D_SAGA_UNICODE $(DBGFLAGS) +@SAGA_UNICODE_FALSE@DEP_LFLG = -fPIC -shared `wx-config --unicode=no --static=no --libs` +@SAGA_UNICODE_TRUE@DEP_LFLG = -fPIC -shared `wx-config --unicode=yes --static=no --libs` +DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD +CXX_INCS = -I$(top_srcdir)/src/saga_core +AM_CXXFLAGS = $(CXX_INCS) $(DEF_SAGA) $(DEP_DEFS) $(DBGFLAGS) $(GOMPFLAGS) +AM_LDFLAGS = $(DEP_LFLG) -avoid-version +pkglib_LTLIBRARIES = libio_grid_image.la +libio_grid_image_la_SOURCES = \ +grid_export.cpp\ +grid_import.cpp\ +grid_to_kml.cpp\ +MLB_Interface.cpp\ +grid_export.h\ +grid_import.h\ +grid_to_kml.h\ +MLB_Interface.h + +libio_grid_image_la_LIBADD = $(top_srcdir)/src/saga_core/saga_api/libsaga_api.la +all: all-am + +.SUFFIXES: +.SUFFIXES: .cpp .lo .o .obj +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/modules/io/io_grid_image/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign src/modules/io/io_grid_image/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): + +install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) + @$(NORMAL_INSTALL) + @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ + list2=; for p in $$list; do \ + if test -f $$p; then \ + list2="$$list2 $$p"; \ + else :; fi; \ + done; \ + test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \ + } + +uninstall-pkglibLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ + for p in $$list; do \ + $(am__strip_dir) \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$f"; \ + done + +clean-pkglibLTLIBRARIES: + -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES) + @list='$(pkglib_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + +libio_grid_image.la: $(libio_grid_image_la_OBJECTS) $(libio_grid_image_la_DEPENDENCIES) $(EXTRA_libio_grid_image_la_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) -rpath $(pkglibdir) $(libio_grid_image_la_OBJECTS) $(libio_grid_image_la_LIBADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MLB_Interface.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/grid_export.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/grid_import.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/grid_to_kml.Plo@am__quote@ + +.cpp.o: +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< + +.cpp.obj: +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + +.cpp.lo: +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + set x; \ + here=`pwd`; \ + $(am__define_uniq_tagged_files); \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ + fi +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ + test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(LTLIBRARIES) +installdirs: + for dir in "$(DESTDIR)$(pkglibdir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool clean-pkglibLTLIBRARIES \ + mostlyclean-am + +distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: install-pkglibLTLIBRARIES + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-pkglibLTLIBRARIES + +.MAKE: install-am install-strip + +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-pkglibLTLIBRARIES install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ + uninstall-pkglibLTLIBRARIES + + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nru saga-2.1.0+dfsg/src/modules/io/io_grid_image/MLB_Interface.cpp saga-2.1.4+dfsg/src/modules/io/io_grid_image/MLB_Interface.cpp --- saga-2.1.0+dfsg/src/modules/io/io_grid_image/MLB_Interface.cpp 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_grid_image/MLB_Interface.cpp 2014-11-13 08:32:20.000000000 +0000 @@ -0,0 +1,132 @@ +/********************************************************** + * Version $Id: MLB_Interface.cpp 2281 2014-10-09 15:49:41Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// image_io // +// // +//-------------------------------------------------------// +// // +// MLB_Interface.cpp // +// // +// Copyright (C) 2005 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: SAGA User Group Association // +// Institute of Geography // +// University of Goettingen // +// Goldschmidtstr. 5 // +// 37077 Goettingen // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// The Module Link Library Interface // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +// 1. Include the appropriate SAGA-API header... + +#include "MLB_Interface.h" + + +//--------------------------------------------------------- +// 2. Place general module library informations here... + +CSG_String Get_Info(int i) +{ + switch( i ) + { + case MLB_INFO_Name: default: + return( _TL("Images") ); + + case MLB_INFO_Category: + return( _TL("Import/Export") ); + + case MLB_INFO_Author: + return( SG_T("O. Conrad (c) 2005") ); + + case MLB_INFO_Description: + return( _TL("Image Import/Export.") ); + + case MLB_INFO_Version: + return( SG_T("1.0") ); + + case MLB_INFO_Menu_Path: + return( _TL("File|Grid") ); + } +} + + +//--------------------------------------------------------- +// 3. Include the headers of your modules here... + +#include "grid_export.h" +#include "grid_import.h" +#include "grid_to_kml.h" + + +//--------------------------------------------------------- +// 4. Allow your modules to be created here... + +CSG_Module * Create_Module(int i) +{ + switch( i ) + { + case 0: return( new CGrid_Export ); + case 1: return( new CGrid_Import ); + case 2: return( new CGrid_to_KML ); + } + + return( NULL ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +//{{AFX_SAGA + + MLB_INTERFACE + +//}}AFX_SAGA diff -Nru saga-2.1.0+dfsg/src/modules/io/io_grid_image/MLB_Interface.h saga-2.1.4+dfsg/src/modules/io/io_grid_image/MLB_Interface.h --- saga-2.1.0+dfsg/src/modules/io/io_grid_image/MLB_Interface.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_grid_image/MLB_Interface.h 2014-11-13 08:32:20.000000000 +0000 @@ -0,0 +1,85 @@ +/********************************************************** + * Version $Id: MLB_Interface.h 2089 2014-04-04 12:37:27Z reklov_w $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// image_io // +// // +//-------------------------------------------------------// +// // +// MLB_Interface.h // +// // +// Copyright (C) 2005 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: SAGA User Group Association // +// Institute of Geography // +// University of Goettingen // +// Goldschmidtstr. 5 // +// 37077 Goettingen // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// Include the SAGA-API here // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#ifndef HEADER_INCLUDED__io_grid_image_H +#define HEADER_INCLUDED__io_grid_image_H + +//--------------------------------------------------------- +#include + +//--------------------------------------------------------- +#ifdef io_grid_image_EXPORTS + #define io_grid_image_EXPORT _SAGA_DLL_EXPORT +#else + #define io_grid_image_EXPORT _SAGA_DLL_IMPORT +#endif + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#endif // #ifndef HEADER_INCLUDED__io_grid_image_H diff -Nru saga-2.1.0+dfsg/src/modules/io/io_shapes/atlas_bna.cpp saga-2.1.4+dfsg/src/modules/io/io_shapes/atlas_bna.cpp --- saga-2.1.0+dfsg/src/modules/io/io_shapes/atlas_bna.cpp 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_shapes/atlas_bna.cpp 2014-11-13 08:32:19.000000000 +0000 @@ -0,0 +1,372 @@ +/********************************************************** + * Version $Id: atlas_bna.cpp 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// io_shapes // +// // +//-------------------------------------------------------// +// // +// Atlas_BNA.cpp // +// // +// Copyright (C) 2006 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Goettingen // +// Goldschmidtstr. 5 // +// 37077 Goettingen // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "atlas_bna.h" + + +/////////////////////////////////////////////////////////// +// // +// Import // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +CAtlas_BNA_Import::CAtlas_BNA_Import(void) +{ + //----------------------------------------------------- + // 1. Info... + + Set_Name (_TL("Import Atlas Boundary File")); + + Set_Author ("O.Conrad (c) 2006"); + + Set_Description (_TW( + "\n" + )); + + + //----------------------------------------------------- + // 2. Parameters... + + Parameters.Add_FilePath( + NULL , "FILE" , _TL("File"), + _TL(""), + CSG_String::Format(SG_T("%s|*.bna|%s|*.*"), + _TL("Atlas Boundary Files (*.bna)"), + _TL("All Files") + ) + ); +} + +//--------------------------------------------------------- +bool CAtlas_BNA_Import::On_Execute(void) +{ + bool bOk; + int iPoint, nPoints; + double x, y; + FILE *Stream; + CSG_String FileName, sLine, sName1, sName2; + CSG_Shape *pShape; + CSG_Shapes *pPoints, *pLines, *pPolygons; + + //----------------------------------------------------- + FileName = Parameters("FILE") ->asString(); + + //----------------------------------------------------- + if( (Stream = fopen(FileName.b_str(), "r")) != NULL ) + { + pPoints = SG_Create_Shapes(SHAPE_TYPE_Point , SG_File_Get_Name(FileName, false)); + pPoints ->Add_Field("NAME1" , SG_DATATYPE_String); + pPoints ->Add_Field("NAME2" , SG_DATATYPE_String); + + pLines = SG_Create_Shapes(SHAPE_TYPE_Line , SG_File_Get_Name(FileName, false)); + pLines ->Add_Field("NAME1" , SG_DATATYPE_String); + pLines ->Add_Field("NAME2" , SG_DATATYPE_String); + + pPolygons = SG_Create_Shapes(SHAPE_TYPE_Polygon, SG_File_Get_Name(FileName, false)); + pPolygons ->Add_Field("NAME1" , SG_DATATYPE_String); + pPolygons ->Add_Field("NAME2" , SG_DATATYPE_String); + + //------------------------------------------------- + bOk = true; + + while( bOk && SG_Read_Line(Stream, sLine) && Process_Get_Okay(true) ) + { + sName1 = sLine.AfterFirst('\"').BeforeFirst('\"'); + sName2 = sLine.BeforeLast('\"').AfterLast('\"'); + sLine = sLine.AfterLast('\"'); if( sLine.Find(',', true) >= 0 ) sLine = sLine.AfterLast(','); + + nPoints = sLine.asInt(); + + if( nPoints == 1 ) + { + pShape = pPoints ->Add_Shape(); + } + else if( nPoints < 0 ) + { + pShape = pLines ->Add_Shape(); + nPoints = -nPoints; + } + else if( nPoints > 2 ) + { + pShape = pPolygons ->Add_Shape(); + } + else + { + bOk = false; + } + + if( bOk ) + { + pShape->Set_Value(0, sName1); + pShape->Set_Value(1, sName2); + + for(iPoint=0; iPointAdd_Point(x, y); + } + } + } + } + + fclose(Stream); + + //------------------------------------------------- + bOk = false; + + if( pPoints->is_Valid() && pPoints->Get_Count() > 0 ) + { + bOk = true; + DataObject_Add(pPoints); + } + else + { + delete(pPoints); + } + + if( pLines->is_Valid() && pLines->Get_Count() > 0 ) + { + bOk = true; + DataObject_Add(pLines); + } + else + { + delete(pLines); + } + + if( pPolygons->is_Valid() && pPolygons->Get_Count() > 0 ) + { + bOk = true; + DataObject_Add(pPolygons); + } + else + { + delete(pPolygons); + } + + return( bOk ); + } + + //----------------------------------------------------- + return( false ); +} + + +/////////////////////////////////////////////////////////// +// // +// Export // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +CAtlas_BNA_Export::CAtlas_BNA_Export(void) +{ + //----------------------------------------------------- + // 1. Info... + + Set_Name (_TL("Export Atlas Boundary File")); + + Set_Author ("O.Conrad (c) 2006"); + + Set_Description (_TW( + "\n" + )); + + + //----------------------------------------------------- + // 2. Parameters... + + CSG_Parameter *pNode; + + pNode = Parameters.Add_Shapes( + NULL , "SHAPES" , _TL("Shapes"), + _TL(""), + PARAMETER_INPUT + ); + + Parameters.Add_Table_Field( + pNode , "PNAME" , _TL("Primary Name"), + _TL("") + ); + + Parameters.Add_Table_Field( + pNode , "SNAME" , _TL("Secondary Name"), + _TL("") + ); + + Parameters.Add_FilePath( + NULL , "FILE" , _TL("File"), + _TL(""), + CSG_String::Format(SG_T("%s|*.bna|%s|*.*"), + _TL("Atlas Boundary Files (*.bna)"), + _TL("All Files") + ), NULL, true + ); +} + +//--------------------------------------------------------- +bool CAtlas_BNA_Export::On_Execute(void) +{ + //----------------------------------------------------- + CSG_File Stream; + + if( !Stream.Open(Parameters("FILE")->asString(), SG_FILE_W) ) + { + return( false ); + } + + CSG_Shapes *pShapes = Parameters("SHAPES")->asShapes(); + + if( !pShapes->is_Valid() || pShapes->Get_Count() <= 0 ) + { + return( false ); + } + + //----------------------------------------------------- + int iName1 = Parameters("PNAME")->asInt(); + int iName2 = Parameters("SNAME")->asInt(); + + //----------------------------------------------------- + for(int iShape=0; iShapeGet_Count() && Set_Progress(iShape, pShapes->Get_Count()); iShape++) + { + CSG_Shape *pShape = pShapes->Get_Shape(iShape); + + switch( pShapes->Get_Type() ) + { + default: + break; + + //--------------------------------------------- + case SHAPE_TYPE_Point: + if( pShape->is_Valid() ) + { + Stream.Printf(SG_T("\"%s\",\"%s\",%d\n"), + pShape->asString(iName1), + pShape->asString(iName2), + 1 + ); + + TSG_Point p = pShape->Get_Point(0); + Stream.Printf(SG_T("%f,%f\n"), p.x, p.y); + } + break; + + //--------------------------------------------- + case SHAPE_TYPE_Line: + if( pShape->is_Valid() ) + { + for(int iPart=0; iPartGet_Part_Count(); iPart++) + { + Stream.Printf(SG_T("\"%s\",\"%s\",%d\n"), + pShape->asString(iName1), + pShape->asString(iName2), + pShape->Get_Point_Count(iPart) + ); + + for(int iPoint=0; iPointGet_Point_Count(iPart); iPoint++) + { + TSG_Point p = pShape->Get_Point(iPoint, iPart); + Stream.Printf(SG_T("%f,%f\n"), p.x, p.y); + } + } + } + break; + + //--------------------------------------------- + case SHAPE_TYPE_Polygon: + if( pShape->is_Valid() ) + { + Stream.Printf(SG_T("\"%s\",\"%s\",%d\n"), + pShape->asString(iName1), + pShape->asString(iName2), + pShape->Get_Point_Count() + ); + + for(int iPart=0; iPartGet_Part_Count(); iPart++) + { + for(int iPoint=0; iPointGet_Point_Count(iPart); iPoint++) + { + TSG_Point p = pShape->Get_Point(iPoint, iPart); + Stream.Printf(SG_T("%f,%f\n"), p.x, p.y); + } + } + } + break; + } + } + + //----------------------------------------------------- + return( true ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- diff -Nru saga-2.1.0+dfsg/src/modules/io/io_shapes/atlas_bna.h saga-2.1.4+dfsg/src/modules/io/io_shapes/atlas_bna.h --- saga-2.1.0+dfsg/src/modules/io/io_shapes/atlas_bna.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_shapes/atlas_bna.h 2014-11-13 08:32:19.000000000 +0000 @@ -0,0 +1,127 @@ +/********************************************************** + * Version $Id: atlas_bna.h 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// io_shapes // +// // +//-------------------------------------------------------// +// // +// Atlas_BNA.h // +// // +// Copyright (C) 2006 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Goettingen // +// Goldschmidtstr. 5 // +// 37077 Goettingen // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#ifndef HEADER_INCLUDED__Atlas_BNA_H +#define HEADER_INCLUDED__Atlas_BNA_H + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "MLB_Interface.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +class CAtlas_BNA_Import : public CSG_Module +{ +public: + CAtlas_BNA_Import(void); + + virtual CSG_String Get_MenuPath (void) { return( _TL("R:Import") ); } + + +protected: + + virtual bool On_Execute (void); + +}; + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +class CAtlas_BNA_Export : public CSG_Module +{ +public: + CAtlas_BNA_Export(void); + + virtual CSG_String Get_MenuPath (void) { return( _TL("R:Export") ); } + + +protected: + + virtual bool On_Execute (void); + +}; + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#endif // #ifndef HEADER_INCLUDED__Atlas_BNA_H diff -Nru saga-2.1.0+dfsg/src/modules/io/io_shapes/generate.cpp saga-2.1.4+dfsg/src/modules/io/io_shapes/generate.cpp --- saga-2.1.0+dfsg/src/modules/io/io_shapes/generate.cpp 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_shapes/generate.cpp 2014-11-13 08:32:19.000000000 +0000 @@ -0,0 +1,173 @@ +/********************************************************** + * Version $Id: generate.cpp 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// Shapes_IO // +// // +//-------------------------------------------------------// +// // +// Generate.cpp // +// // +// Copyright (C) 2003 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Goettingen // +// Goldschmidtstr. 5 // +// 37077 Goettingen // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "generate.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +CGenerate_Export::CGenerate_Export(void) +{ + Set_Name (_TL("Export Shapes to Generate")); + + Set_Author ("O.Conrad (c) 2003"); + + Set_Description (_TW( + "Export generate shapes format." + )); + + CSG_Parameter *pNode = Parameters.Add_Shapes( + NULL , "SHAPES" , _TL("Shapes"), + _TL(""), + PARAMETER_INPUT + ); + + Parameters.Add_Table_Field( + pNode , "FIELD" , _TL("Attribute"), + _TL("") + ); + + Parameters.Add_FilePath( + NULL , "FILE" , _TL("File"), + _TL("") + ); +} + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CGenerate_Export::On_Execute(void) +{ + //----------------------------------------------------- + CSG_File Stream; + + if( !Stream.Open(Parameters("FILE")->asString(), SG_FILE_W) ) + { + return( false ); + } + + CSG_Shapes *pShapes = Parameters("SHAPES")->asShapes(); + + if( !pShapes->is_Valid() || pShapes->Get_Count() <= 0 ) + { + return( false ); + } + + //----------------------------------------------------- + int iField = Parameters("FIELD")->asInt(); + + if( pShapes->Get_Field_Type(iField) == SG_DATATYPE_String ) + { + iField = -1; + } + + Stream.Printf(SG_T("EXP %s\nARC "), pShapes->Get_Name()); + + //----------------------------------------------------- + for(int iShape=0; iShapeGet_Count() && Set_Progress(iShape, pShapes->Get_Count()); iShape++) + { + CSG_Shape *pShape = pShapes->Get_Shape(iShape); + + for(int iPart=0; iPartGet_Part_Count(); iPart++) + { + if( iField < 0 ) // Value... + { + Stream.Printf(SG_T("%d "), iShape + 1); + } + else + { + Stream.Printf(SG_T("%lf "), pShape->asDouble(iField)); + } + + Stream.Printf(SG_T("1 2 3 4 5 ")); // dummy_I dummy_I dummy_I dummy_I dummy_I... + Stream.Printf(SG_T("%d "), pShape->Get_Point_Count(iPart)); // I_np... + + for(int iPoint=0; iPointGet_Point_Count(iPart); iPoint++) + { + TSG_Point p = pShape->Get_Point(iPoint, iPart); + + Stream.Printf(SG_T("%f %f "), p.x, p.y); + } + } + } + + //----------------------------------------------------- + return( true ); +} + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- diff -Nru saga-2.1.0+dfsg/src/modules/io/io_shapes/generate.h saga-2.1.4+dfsg/src/modules/io/io_shapes/generate.h --- saga-2.1.0+dfsg/src/modules/io/io_shapes/generate.h 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_shapes/generate.h 2014-11-13 08:32:19.000000000 +0000 @@ -0,0 +1,109 @@ +/********************************************************** + * Version $Id: generate.h 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// Shapes_IO // +// // +//-------------------------------------------------------// +// // +// Generate.h // +// // +// Copyright (C) 2003 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Goettingen // +// Goldschmidtstr. 5 // +// 37077 Goettingen // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#ifndef HEADER_INCLUDED__GENERATE_H +#define HEADER_INCLUDED__GENERATE_H + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "MLB_Interface.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +class CGenerate_Export : public CSG_Module +{ +public: + CGenerate_Export(void); + + virtual CSG_String Get_MenuPath(void) { return( _TL("R:Export") ); } + + +protected: + + virtual bool On_Execute(void); + +}; + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#endif // #ifndef HEADER_INCLUDED__GENERATE_H diff -Nru saga-2.1.0+dfsg/src/modules/io/io_shapes/gpx.cpp saga-2.1.4+dfsg/src/modules/io/io_shapes/gpx.cpp --- saga-2.1.0+dfsg/src/modules/io/io_shapes/gpx.cpp 1970-01-01 00:00:00.000000000 +0000 +++ saga-2.1.4+dfsg/src/modules/io/io_shapes/gpx.cpp 2014-11-13 08:32:19.000000000 +0000 @@ -0,0 +1,454 @@ +/********************************************************** + * Version $Id: gpx.cpp 1921 2014-01-09 10:24:11Z oconrad $ + *********************************************************/ + +/////////////////////////////////////////////////////////// +// // +// SAGA // +// // +// System for Automated Geoscientific Analyses // +// // +// Module Library: // +// io_shapes // +// // +//-------------------------------------------------------// +// // +// gpx.cpp // +// // +// Copyright (C) 2009 by // +// Olaf Conrad // +// // +//-------------------------------------------------------// +// // +// This file is part of 'SAGA - System for Automated // +// Geoscientific Analyses'. SAGA is free software; you // +// can redistribute it and/or modify it under the terms // +// of the GNU General Public License as published by the // +// Free Software Foundation; version 2 of the License. // +// // +// SAGA is distributed in the hope that it will be // +// useful, but WITHOUT ANY WARRANTY; without even the // +// implied warranty of MERCHANTABILITY or FITNESS FOR A // +// PARTICULAR PURPOSE. See the GNU General Public // +// License for more details. // +// // +// You should have received a copy of the GNU General // +// Public License along with this program; if not, // +// write to the Free Software Foundation, Inc., // +// 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, // +// USA. // +// // +//-------------------------------------------------------// +// // +// e-mail: oconrad@saga-gis.org // +// // +// contact: Olaf Conrad // +// Institute of Geography // +// University of Hamburg // +// Germany // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#include "gpx.h" + + +/////////////////////////////////////////////////////////// +// // +// // +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +CGPX_Import::CGPX_Import(void) +{ + Set_Name (_TL("Import GPX")); + + Set_Author (SG_T("O. Conrad (c) 2009")); + + Set_Description (_TW( + "Imports GPS data from GPS eXchange format GPX.\n" + "\n" + "References:\n" + "The GPS Exchange Format" + )); + + //----------------------------------------------------- + Parameters.Add_Shapes_List( + NULL , "SHAPES" , _TL("GPX Import"), + _TL(""), + PARAMETER_OUTPUT_OPTIONAL + ); + + Parameters.Add_FilePath( + NULL , "FILE" , _TL("File"), + _TL(""), + CSG_String::Format(SG_T("%s|%s|%s|%s"), + _TL("GPS Exchange Format (*.gpx)") , SG_T("*.gpx"), + _TL("All Files") , SG_T("*.*") + ), NULL, false + ); + + Parameters.Add_Value( + NULL , "TIME" , _TL("Time Stamp without date"), + _TL(""), + PARAMETER_TYPE_Bool, true + ); +} + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +bool CGPX_Import::On_Execute(void) +{ + CSG_Shapes *pWay; + CSG_MetaData GPX; + + //----------------------------------------------------- + m_Name = Parameters("FILE") ->asString(); + m_pShapes = Parameters("SHAPES") ->asShapesList(); + m_bTime = Parameters("TIME") ->asBool(); + + //----------------------------------------------------- + if( !GPX.Create(m_Name) || GPX.Get_Name().CmpNoCase(SG_T("gpx")) ) + { + return( false ); + } + + //----------------------------------------------------- + pWay = SG_Create_Shapes(SHAPE_TYPE_Point, m_Name); + + m_Name = SG_File_Get_Name(m_Name, false); + + m_pShapes->Del_Items(); + + //----------------------------------------------------- + for(int i=0; iGet_Name().CmpNoCase(SG_T("wpt")) == 0 ) + { + Add_Point(pChild, pWay); + } + else if( pChild->Get_Name().CmpNoCase(SG_T("rte")) == 0 ) + { + Add_Route(pChild); + } + else if( pChild->Get_Name().CmpNoCase(SG_T("trk")) == 0 ) + { + Add_Track(pChild); + } + } + + //----------------------------------------------------- + if( pWay->Get_Count() > 0 ) + { + m_pShapes->Add_Item(pWay); + } + else + { + delete(pWay); + } + + return( m_pShapes->Get_Count() > 0 ); +} + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#define GET_CONTENT(node, child, default) (node->Get_Child(SG_T(child)) ? node->Get_Child(SG_T(child))->Get_Content() : SG_T(default)) + +//--------------------------------------------------------- +bool CGPX_Import::Add_Route(CSG_MetaData *pRoute) +{ + // xsd:string + // xsd:string + // xsd:string + // xsd:string + // linkType + // xsd:nonNegativeInteger + // xsd:string + + CSG_String Name(GET_CONTENT(pRoute, "name", "Route")); + + CSG_Shapes *pPoints = SG_Create_Shapes(SHAPE_TYPE_Point, CSG_String::Format(SG_T("%s [%s]"), m_Name.c_str(), Name.c_str())); + + m_pShapes->Add_Item(pPoints); + + for(int i=0; iGet_Children_Count(); i++) + { + CSG_MetaData *pChild = pRoute->Get_Child(i); + + if( pChild->Get_Name().CmpNoCase(SG_T("rtept")) == 0 ) + { + Add_Point(pChild, pPoints); + } + } + + return( true ); +} + +//--------------------------------------------------------- +bool CGPX_Import::Add_Track(CSG_MetaData *pTrack) +{ + // xsd:string + // xsd:string + // xsd:string + // xsd:string + // linkType + // xsd:nonNegativeInteger + // xsd:string + + CSG_MetaData *pSegment = pTrack->Get_Child(SG_T("trkseg")); + + if( pSegment ) + { + CSG_String Name(GET_CONTENT(pTrack, "name", "Track Segment")); + + CSG_Shapes *pPoints = SG_Create_Shapes(SHAPE_TYPE_Point, CSG_String::Format(SG_T("%s [%s]"), m_Name.c_str(), Name.c_str())); + + m_pShapes->Add_Item(pPoints); + + for(int i=0; iGet_Children_Count(); i++) + { + CSG_MetaData *pChild = pSegment->Get_Child(i); + + if( pChild->Get_Name().CmpNoCase(SG_T("trkpt")) == 0 ) + { + Add_Point(pChild, pPoints); + } + } + + return( true ); + } + + return( false ); +} + + +/////////////////////////////////////////////////////////// +// // +/////////////////////////////////////////////////////////// + +//--------------------------------------------------------- +#define ADD_FIELD(key, type) if( pNode->Get_Child(SG_T(key)) ) { pPoints->Add_Field(SG_T(key), type); } + +inline bool CGPX_Import::Add_Fields(CSG_MetaData *pNode, CSG_Shapes *pPoints) +{ + if( pPoints->Get_Field_Count() == 0 ) + { + ADD_FIELD("ele" , SG_DATATYPE_Double); // xsd:decimal (Höhe) + ADD_FIELD("time" , SG_DATATYPE_String); //