Index: Makefile-static-Linux ================================================================== --- Makefile-static-Linux +++ Makefile-static-Linux @@ -66,13 +66,10 @@ /usr/local/lib/libspatialite.a \ /usr/lib/libproj.a \ /usr/lib/libgeos_c.a \ /usr/lib/libgeos.a \ /usr/local/lib/libfreexl.a \ - /usr/local/lib/libreadosm.a \ - /usr/lib/libexpat.a \ - /usr/lib/libz.a \ -lstdc++ -lm -lpthread -ldl strip --strip-all ./static_bin/spatialite_osm_net ./static_bin/spatialite_osm_map: spatialite_osm_map.o $(CC) spatialite_osm_map.o -o ./static_bin/spatialite_osm_map \ @@ -79,13 +76,11 @@ /usr/local/lib/libspatialite.a \ /usr/lib/libproj.a \ /usr/lib/libgeos_c.a \ /usr/lib/libgeos.a \ /usr/local/lib/libfreexl.a \ - /usr/local/lib/libreadosm.a \ /usr/lib/libexpat.a \ - /usr/lib/libz.a \ -lstdc++ -lm -lpthread -ldl strip --strip-all ./static_bin/spatialite_osm_map ./static_bin/spatialite_gml: spatialite_gml.o $(CC) spatialite_gml.o -o ./static_bin/spatialite_gml \ @@ -103,13 +98,11 @@ /usr/local/lib/libspatialite.a \ /usr/lib/libproj.a \ /usr/lib/libgeos_c.a \ /usr/lib/libgeos.a \ /usr/local/lib/libfreexl.a \ - /usr/local/lib/libreadosm.a \ /usr/lib/libexpat.a \ - /usr/lib/libz.a \ -lstdc++ -lm -lpthread -ldl strip --strip-all ./static_bin/spatialite_osm_raw ./static_bin/spatialite_osm_filter: spatialite_osm_filter.o $(CC) spatialite_osm_filter.o -o ./static_bin/spatialite_osm_filter \ Index: Makefile-static-MacOsX ================================================================== --- Makefile-static-MacOsX +++ Makefile-static-MacOsX @@ -75,16 +75,12 @@ $(CC) spatialite_osm_net.o -o ./static_bin/spatialite_osm_net \ /usr/local/lib/libspatialite.a \ /opt/local/lib/libproj.a \ /opt/local/lib/libgeos_c.a \ /opt/local/lib/libgeos.a \ - /usr/local/lib/libfreexl.a \ - /usr/local/lib/libreadosm.a \ /opt/local/lib/libiconv.a \ /opt/local/lib/libcharset.a \ - /opt/local/lib/libexpat.a \ - /opt/local/lib/libz.a \ -lstdc++ -lm -lpthread -ldl strip ./static_bin/spatialite_osm_net ./static_bin/spatialite_osm_map: spatialite_osm_map.o $(CC) spatialite_osm_map.o -o ./static_bin/spatialite_osm_map \ @@ -91,15 +87,13 @@ /usr/local/lib/libspatialite.a \ /opt/local/lib/libproj.a \ /opt/local/lib/libgeos_c.a \ /opt/local/lib/libgeos.a \ /usr/local/lib/libfreexl.a \ - /usr/local/lib/libreadosm.a \ /opt/local/lib/libiconv.a \ /opt/local/lib/libcharset.a \ /opt/local/lib/libexpat.a \ - /opt/local/lib/libz.a \ -lstdc++ -lm -lpthread -ldl strip ./static_bin/spatialite_osm_map ./static_bin/spatialite_gml: spatialite_gml.o $(CC) spatialite_gml.o -o ./static_bin/spatialite_gml \ @@ -119,15 +113,13 @@ /usr/local/lib/libspatialite.a \ /opt/local/lib/libproj.a \ /opt/local/lib/libgeos_c.a \ /opt/local/lib/libgeos.a \ /usr/local/lib/libfreexl.a \ - /usr/local/lib/libreadosm.a \ /opt/local/lib/libiconv.a \ /opt/local/lib/libcharset.a \ /opt/local/lib/libexpat.a \ - /opt/local/lib/libz.a \ -lstdc++ -lm -lpthread -ldl strip ./static_bin/spatialite_osm_raw ./static_bin/spatialite_osm_filter: spatialite_osm_filter.o $(CC) spatialite_osm_filter.o -o ./static_bin/spatialite_osm_filter \ Index: Makefile-static-MinGW ================================================================== --- Makefile-static-MinGW +++ Makefile-static-MinGW @@ -78,14 +78,11 @@ /usr/local/lib/libsqlite3.a \ /usr/local/lib/libproj.a \ /usr/local/lib/libgeos_c.a \ /usr/local/lib/libgeos.a \ /usr/local/lib/libfreexl.a \ - /usr/local/lib/libreadosm.a \ /usr/local/lib/libiconv.a \ - /usr/local/lib/libexpat.a \ - /usr/local/lib/libz.a \ -lm -static-libstdc++ -static-libgcc strip --strip-all ./static_bin/spatialite_osm_net.exe ./static_bin/spatialite_osm_map.exe: spatialite_osm_map.o $(GG) spatialite_osm_map.o -o ./static_bin/spatialite_osm_map.exe \ @@ -94,13 +91,11 @@ /usr/local/lib/libproj.a \ /usr/local/lib/libgeos_c.a \ /usr/local/lib/libgeos.a \ /usr/local/lib/libiconv.a \ /usr/local/lib/libfreexl.a \ - /usr/local/lib/libreadosm.a \ /usr/local/lib/libexpat.a \ - /usr/local/lib/libz.a \ -lm -static-libstdc++ -static-libgcc strip --strip-all ./static_bin/spatialite_osm_map.exe ./static_bin/spatialite_gml.exe: spatialite_gml.o $(GG) spatialite_gml.o -o ./static_bin/spatialite_gml.exe \ @@ -121,14 +116,12 @@ /usr/local/lib/libsqlite3.a \ /usr/local/lib/libproj.a \ /usr/local/lib/libgeos_c.a \ /usr/local/lib/libgeos.a \ /usr/local/lib/libfreexl.a \ - /usr/local/lib/libreadosm.a \ /usr/local/lib/libiconv.a \ /usr/local/lib/libexpat.a \ - /usr/local/lib/libz.a \ -lm -static-libstdc++ -static-libgcc strip --strip-all ./static_bin/spatialite_osm_raw.exe ./static_bin/spatialite_osm_filter.exe: spatialite_osm_filter.o $(GG) spatialite_osm_filter.o -o ./static_bin/spatialite_osm_filter.exe \ Index: Makefile.am ================================================================== --- Makefile.am +++ Makefile.am @@ -24,15 +24,15 @@ spatialite_osm_raw_SOURCES = spatialite_osm_raw.c spatialite_osm_filter_SOURCES = spatialite_osm_filter.c spatialite_gml_SOURCES = spatialite_gml.c spatialite_osm_map_LDADD = @LIBSPATIALITE_LIBS@ \ - @LIBFREEXL_LIBS@ @LIBREADOSM_LIBS@ + @LIBFREEXL_LIBS@ \ + -lexpat spatialite_osm_raw_LDADD = @LIBSPATIALITE_LIBS@ \ - @LIBFREEXL_LIBS@ @LIBREADOSM_LIBS@ -spatialite_osm_net_LDADD = @LIBSPATIALITE_LIBS@ \ - @LIBFREEXL_LIBS@ @LIBREADOSM_LIBS@ + @LIBFREEXL_LIBS@ \ + -lexpat spatialite_gml_LDADD = @LIBSPATIALITE_LIBS@ \ @LIBFREEXL_LIBS@ \ -lexpat spatialite_LDADD = @LIBSPATIALITE_LIBS@ \ @LIBFREEXL_LIBS@ \ Index: Makefile.in ================================================================== --- Makefile.in +++ Makefile.in @@ -43,11 +43,14 @@ 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 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(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) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno config.status.lineno mkinstalldirs = $(install_sh) -d @@ -81,10 +84,11 @@ am_spatialite_osm_map_OBJECTS = spatialite_osm_map.$(OBJEXT) spatialite_osm_map_OBJECTS = $(am_spatialite_osm_map_OBJECTS) spatialite_osm_map_DEPENDENCIES = am_spatialite_osm_net_OBJECTS = spatialite_osm_net.$(OBJEXT) spatialite_osm_net_OBJECTS = $(am_spatialite_osm_net_OBJECTS) +spatialite_osm_net_LDADD = $(LDADD) spatialite_osm_net_DEPENDENCIES = am_spatialite_osm_raw_OBJECTS = spatialite_osm_raw.$(OBJEXT) spatialite_osm_raw_OBJECTS = $(am_spatialite_osm_raw_OBJECTS) spatialite_osm_raw_DEPENDENCIES = am_spatialite_tool_OBJECTS = spatialite_tool.$(OBJEXT) @@ -168,12 +172,10 @@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBFREEXL_CFLAGS = @LIBFREEXL_CFLAGS@ LIBFREEXL_LIBS = @LIBFREEXL_LIBS@ LIBOBJS = @LIBOBJS@ -LIBREADOSM_CFLAGS = @LIBREADOSM_CFLAGS@ -LIBREADOSM_LIBS = @LIBREADOSM_LIBS@ LIBS = @LIBS@ LIBSPATIALITE_CFLAGS = @LIBSPATIALITE_CFLAGS@ LIBSPATIALITE_LIBS = @LIBSPATIALITE_LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ @@ -271,17 +273,16 @@ spatialite_osm_map_SOURCES = spatialite_osm_map.c spatialite_osm_raw_SOURCES = spatialite_osm_raw.c spatialite_osm_filter_SOURCES = spatialite_osm_filter.c spatialite_gml_SOURCES = spatialite_gml.c spatialite_osm_map_LDADD = @LIBSPATIALITE_LIBS@ \ - @LIBFREEXL_LIBS@ @LIBREADOSM_LIBS@ + @LIBFREEXL_LIBS@ \ + -lexpat spatialite_osm_raw_LDADD = @LIBSPATIALITE_LIBS@ \ - @LIBFREEXL_LIBS@ @LIBREADOSM_LIBS@ - -spatialite_osm_net_LDADD = @LIBSPATIALITE_LIBS@ \ - @LIBFREEXL_LIBS@ @LIBREADOSM_LIBS@ + @LIBFREEXL_LIBS@ \ + -lexpat spatialite_gml_LDADD = @LIBSPATIALITE_LIBS@ \ @LIBFREEXL_LIBS@ \ -lexpat @@ -307,19 +308,19 @@ @: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \ - $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \ + echo ' cd $(srcdir) && $(AUTOMAKE) --gnu'; \ + $(am__cd) $(srcdir) && $(AUTOMAKE) --gnu \ && exit 0; \ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign Makefile + $(AUTOMAKE) --gnu Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ echo ' $(SHELL) ./config.status'; \ Index: aclocal.m4 ================================================================== --- aclocal.m4 +++ aclocal.m4 @@ -17,8441 +17,10 @@ [m4_warning([this file was generated for autoconf 2.68. 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'.])]) -# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- -# -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -# Inc. -# Written by Gordon Matzigkeit, 1996 -# -# 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. - -m4_define([_LT_COPYING], [dnl -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -# Inc. -# Written by Gordon Matzigkeit, 1996 -# -# This file is part of GNU Libtool. -# -# GNU Libtool is free software; 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. -# -# As a special exception to the GNU General Public License, -# if you distribute this file as part of a program or library that -# is built using GNU Libtool, you may include this file under the -# same distribution terms that you use for the rest of that program. -# -# GNU Libtool is distributed in the hope that 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 GNU Libtool; see the file COPYING. If not, a copy -# can be downloaded from http://www.gnu.org/licenses/gpl.html, or -# obtained by writing to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -]) - -# serial 57 LT_INIT - - -# LT_PREREQ(VERSION) -# ------------------ -# Complain and exit if this libtool version is less that VERSION. -m4_defun([LT_PREREQ], -[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1, - [m4_default([$3], - [m4_fatal([Libtool version $1 or higher is required], - 63)])], - [$2])]) - - -# _LT_CHECK_BUILDDIR -# ------------------ -# Complain if the absolute build directory name contains unusual characters -m4_defun([_LT_CHECK_BUILDDIR], -[case `pwd` in - *\ * | *\ *) - AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;; -esac -]) - - -# LT_INIT([OPTIONS]) -# ------------------ -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 -m4_require([_LT_CHECK_BUILDDIR])dnl - -dnl Autoconf doesn't catch unexpanded LT_ macros by default: -m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl -m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl -dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4 -dnl unless we require an AC_DEFUNed macro: -AC_REQUIRE([LTOPTIONS_VERSION])dnl -AC_REQUIRE([LTSUGAR_VERSION])dnl -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]) - -# This can be used to rebuild libtool when needed -LIBTOOL_DEPS="$ltmain" - -# Always use our own libtool. -LIBTOOL='$(SHELL) $(top_builddir)/libtool' -AC_SUBST(LIBTOOL)dnl - -_LT_SETUP - -# Only expand once: -m4_define([LT_INIT]) -])# LT_INIT - -# Old names: -AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT]) -AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_PROG_LIBTOOL], []) -dnl AC_DEFUN([AM_PROG_LIBTOOL], []) - - -# _LT_CC_BASENAME(CC) -# ------------------- -# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. -m4_defun([_LT_CC_BASENAME], -[for cc_temp in $1""; do - case $cc_temp in - compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; - distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` -]) - - -# _LT_FILEUTILS_DEFAULTS -# ---------------------- -# It is okay to use these file commands and assume they have been set -# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'. -m4_defun([_LT_FILEUTILS_DEFAULTS], -[: ${CP="cp -f"} -: ${MV="mv -f"} -: ${RM="rm -f"} -])# _LT_FILEUTILS_DEFAULTS - - -# _LT_SETUP -# --------- -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([], [host_alias], [0], [The host system])dnl -_LT_DECL([], [host], [0])dnl -_LT_DECL([], [host_os], [0])dnl -dnl -_LT_DECL([], [build_alias], [0], [The build system])dnl -_LT_DECL([], [build], [0])dnl -_LT_DECL([], [build_os], [0])dnl -dnl -AC_REQUIRE([AC_PROG_CC])dnl -AC_REQUIRE([LT_PATH_LD])dnl -AC_REQUIRE([LT_PATH_NM])dnl -dnl -AC_REQUIRE([AC_PROG_LN_S])dnl -test -z "$LN_S" && LN_S="ln -s" -_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl -dnl -AC_REQUIRE([LT_CMD_MAX_LEN])dnl -_LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl -_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 -# commands through without removal of \ escapes INIT. -if test -n "\${ZSH_VERSION+set}" ; then - setopt NO_GLOB_SUBST -fi -]) -if test -n "${ZSH_VERSION+set}" ; then - setopt NO_GLOB_SUBST -fi - -_LT_CHECK_OBJDIR - -m4_require([_LT_TAG_COMPILER])dnl - -case $host_os in -aix3*) - # AIX sometimes has problems with the GCC collect2 program. For some - # reason, if we set the COLLECT_NAMES environment variable, the problems - # vanish in a puff of smoke. - if test "X${COLLECT_NAMES+set}" != Xset; then - COLLECT_NAMES= - export COLLECT_NAMES - fi - ;; -esac - -# Global variables: -ofile=libtool -can_build_shared=yes - -# All known linkers require a `.a' archive for static linking (except MSVC, -# which needs '.lib'). -libext=a - -with_gnu_ld="$lt_cv_prog_gnu_ld" - -old_CC="$CC" -old_CFLAGS="$CFLAGS" - -# Set sane defaults for various variables -test -z "$CC" && CC=cc -test -z "$LTCC" && LTCC=$CC -test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS -test -z "$LD" && LD=ld -test -z "$ac_objext" && ac_objext=o - -_LT_CC_BASENAME([$compiler]) - -# Only perform the check for file, if the check method requires it -test -z "$MAGIC_CMD" && MAGIC_CMD=file -case $deplibs_check_method in -file_magic*) - if test "$file_magic_cmd" = '$MAGIC_CMD'; then - _LT_PATH_MAGIC - fi - ;; -esac - -# Use C for the default configuration in the libtool script -LT_SUPPORTED_TAG([CC]) -_LT_LANG_C_CONFIG -_LT_LANG_DEFAULT_CONFIG -_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' -# now that we use AC_CONFIG_COMMANDS to generate libtool. Notably, -# `config.status' has no value for ac_aux_dir unless we are using Automake, -# so we pass a copy along to make sure it has a sensible value anyway. -m4_defun([_LT_PROG_LTMAIN], -[m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl -_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir']) -ltmain="$ac_aux_dir/ltmain.sh" -])# _LT_PROG_LTMAIN - - - -# So that we can recreate a full libtool script including additional -# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS -# in macros and then make a single call at the end using the `libtool' -# label. - - -# _LT_CONFIG_LIBTOOL_INIT([INIT-COMMANDS]) -# ---------------------------------------- -# Register INIT-COMMANDS to be passed to AC_CONFIG_COMMANDS later. -m4_define([_LT_CONFIG_LIBTOOL_INIT], -[m4_ifval([$1], - [m4_append([_LT_OUTPUT_LIBTOOL_INIT], - [$1 -])])]) - -# Initialize. -m4_define([_LT_OUTPUT_LIBTOOL_INIT]) - - -# _LT_CONFIG_LIBTOOL([COMMANDS]) -# ------------------------------ -# Register COMMANDS to be passed to AC_CONFIG_COMMANDS later. -m4_define([_LT_CONFIG_LIBTOOL], -[m4_ifval([$1], - [m4_append([_LT_OUTPUT_LIBTOOL_COMMANDS], - [$1 -])])]) - -# Initialize. -m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS]) - - -# _LT_CONFIG_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS]) -# ----------------------------------------------------- -m4_defun([_LT_CONFIG_SAVE_COMMANDS], -[_LT_CONFIG_LIBTOOL([$1]) -_LT_CONFIG_LIBTOOL_INIT([$2]) -]) - - -# _LT_FORMAT_COMMENT([COMMENT]) -# ----------------------------- -# Add leading comment marks to the start of each line, and a trailing -# full-stop to the whole comment if one is not present already. -m4_define([_LT_FORMAT_COMMENT], -[m4_ifval([$1], [ -m4_bpatsubst([m4_bpatsubst([$1], [^ *], [# ])], - [['`$\]], [\\\&])]m4_bmatch([$1], [[!?.]$], [], [.]) -)]) - - - - - -# _LT_DECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION], [IS-TAGGED?]) -# ------------------------------------------------------------------- -# CONFIGNAME is the name given to the value in the libtool script. -# VARNAME is the (base) name used in the configure script. -# VALUE may be 0, 1 or 2 for a computed quote escaped value based on -# VARNAME. Any other value will be used directly. -m4_define([_LT_DECL], -[lt_if_append_uniq([lt_decl_varnames], [$2], [, ], - [lt_dict_add_subkey([lt_decl_dict], [$2], [libtool_name], - [m4_ifval([$1], [$1], [$2])]) - lt_dict_add_subkey([lt_decl_dict], [$2], [value], [$3]) - m4_ifval([$4], - [lt_dict_add_subkey([lt_decl_dict], [$2], [description], [$4])]) - lt_dict_add_subkey([lt_decl_dict], [$2], - [tagged?], [m4_ifval([$5], [yes], [no])])]) -]) - - -# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION]) -# -------------------------------------------------------- -m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])]) - - -# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...]) -# ------------------------------------------------ -m4_define([lt_decl_tag_varnames], -[_lt_decl_filter([tagged?], [yes], $@)]) - - -# _lt_decl_filter(SUBKEY, VALUE, [SEPARATOR], [VARNAME1..]) -# --------------------------------------------------------- -m4_define([_lt_decl_filter], -[m4_case([$#], - [0], [m4_fatal([$0: too few arguments: $#])], - [1], [m4_fatal([$0: too few arguments: $#: $1])], - [2], [lt_dict_filter([lt_decl_dict], [$1], [$2], [], lt_decl_varnames)], - [3], [lt_dict_filter([lt_decl_dict], [$1], [$2], [$3], lt_decl_varnames)], - [lt_dict_filter([lt_decl_dict], $@)])[]dnl -]) - - -# lt_decl_quote_varnames([SEPARATOR], [VARNAME1...]) -# -------------------------------------------------- -m4_define([lt_decl_quote_varnames], -[_lt_decl_filter([value], [1], $@)]) - - -# lt_decl_dquote_varnames([SEPARATOR], [VARNAME1...]) -# --------------------------------------------------- -m4_define([lt_decl_dquote_varnames], -[_lt_decl_filter([value], [2], $@)]) - - -# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...]) -# --------------------------------------------------- -m4_define([lt_decl_varnames_tagged], -[m4_assert([$# <= 2])dnl -_$0(m4_quote(m4_default([$1], [[, ]])), - m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]), - m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))]) -m4_define([_lt_decl_varnames_tagged], -[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])]) - - -# lt_decl_all_varnames([SEPARATOR], [VARNAME1...]) -# ------------------------------------------------ -m4_define([lt_decl_all_varnames], -[_$0(m4_quote(m4_default([$1], [[, ]])), - m4_if([$2], [], - m4_quote(lt_decl_varnames), - m4_quote(m4_shift($@))))[]dnl -]) -m4_define([_lt_decl_all_varnames], -[lt_join($@, lt_decl_varnames_tagged([$1], - lt_decl_tag_varnames([[, ]], m4_shift($@))))dnl -]) - - -# _LT_CONFIG_STATUS_DECLARE([VARNAME]) -# ------------------------------------ -# Quote a variable value, and forward it to `config.status' so that its -# 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 "$][$1" | $SED "$delay_single_quote_subst"`']) - - -# _LT_CONFIG_STATUS_DECLARATIONS -# ------------------------------ -# We delimit libtool config variables with single quotes, so when -# we write them to config.status, we have to be sure to quote all -# embedded single quotes properly. In configure, this macro expands -# each variable declared with _LT_DECL (and _LT_TAGDECL) into: -# -# ='`$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)])])]) - - -# _LT_LIBTOOL_TAGS -# ---------------- -# Output comment and list of tags supported by the script -m4_defun([_LT_LIBTOOL_TAGS], -[_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl -available_tags="_LT_TAGS"dnl -]) - - -# _LT_LIBTOOL_DECLARE(VARNAME, [TAG]) -# ----------------------------------- -# Extract the dictionary values for VARNAME (optionally with TAG) and -# expand to a commented shell variable setting: -# -# # Some comment about what VAR is for. -# visible_name=$lt_internal_name -m4_define([_LT_LIBTOOL_DECLARE], -[_LT_FORMAT_COMMENT(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], - [description])))[]dnl -m4_pushdef([_libtool_name], - m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [libtool_name])))[]dnl -m4_case(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [value])), - [0], [_libtool_name=[$]$1], - [1], [_libtool_name=$lt_[]$1], - [2], [_libtool_name=$lt_[]$1], - [_libtool_name=lt_dict_fetch([lt_decl_dict], [$1], [value])])[]dnl -m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl -]) - - -# _LT_LIBTOOL_CONFIG_VARS -# ----------------------- -# Produce commented declarations of non-tagged libtool config variables -# suitable for insertion in the LIBTOOL CONFIG section of the `libtool' -# script. Tagged libtool config variables (even for the LIBTOOL CONFIG -# section) are produced by _LT_LIBTOOL_TAG_VARS. -m4_defun([_LT_LIBTOOL_CONFIG_VARS], -[m4_foreach([_lt_var], - m4_quote(_lt_decl_filter([tagged?], [no], [], lt_decl_varnames)), - [m4_n([_LT_LIBTOOL_DECLARE(_lt_var)])])]) - - -# _LT_LIBTOOL_TAG_VARS(TAG) -# ------------------------- -m4_define([_LT_LIBTOOL_TAG_VARS], -[m4_foreach([_lt_var], m4_quote(lt_decl_tag_varnames), - [m4_n([_LT_LIBTOOL_DECLARE(_lt_var, [$1])])])]) - - -# _LT_TAGVAR(VARNAME, [TAGNAME]) -# ------------------------------ -m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])]) - - -# _LT_CONFIG_COMMANDS -# ------------------- -# Send accumulated output to $CONFIG_STATUS. Thanks to the lists of -# variables for single and double quote escaping we saved from calls -# to _LT_DECL, we can put quote escaped variables declarations -# into `config.status', and then the shell code to quote escape them in -# for loops in `config.status'. Finally, any additional code accumulated -# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded. -m4_defun([_LT_CONFIG_COMMANDS], -[AC_PROVIDE_IFELSE([LT_OUTPUT], - dnl If the libtool generation code has been placed in $CONFIG_LT, - dnl instead of duplicating it all over again into config.status, - dnl then we will have config.status run $CONFIG_LT later, so it - dnl needs to know what name is stored there: - [AC_CONFIG_COMMANDS([libtool], - [$SHELL $CONFIG_LT || AS_EXIT(1)], [CONFIG_LT='$CONFIG_LT'])], - dnl If the libtool generation code is destined for config.status, - dnl expand the accumulated commands and init code now: - [AC_CONFIG_COMMANDS([libtool], - [_LT_OUTPUT_LIBTOOL_COMMANDS], [_LT_OUTPUT_LIBTOOL_COMMANDS_INIT])]) -])#_LT_CONFIG_COMMANDS - - -# Initialize. -m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS_INIT], -[ - -# 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 - -sed_quote_subst='$sed_quote_subst' -double_quote_subst='$double_quote_subst' -delay_variable_subst='$delay_variable_subst' -_LT_CONFIG_STATUS_DECLARATIONS -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 \\\\""\\\\\$\$var"\\\\"\` in - *[[\\\\\\\`\\"\\\$]]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" - ;; - *) - eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" - ;; - esac -done - -# Double-quote double-evaled strings. -for var in lt_decl_all_varnames([[ \ -]], lt_decl_dquote_varnames); do - case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in - *[[\\\\\\\`\\"\\\$]]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" - ;; - *) - eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" - ;; - esac -done - -_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 -# --------- -# This macro allows early generation of the libtool script (before -# AC_OUTPUT is called), incase it is used in configure for compilation -# tests. -AC_DEFUN([LT_OUTPUT], -[: ${CONFIG_LT=./config.lt} -AC_MSG_NOTICE([creating $CONFIG_LT]) -_LT_GENERATED_FILE_INIT(["$CONFIG_LT"], -[# Run this file to recreate a libtool stub with the current configuration.]) - -cat >>"$CONFIG_LT" <<\_LTEOF -lt_cl_silent=false -exec AS_MESSAGE_LOG_FD>>config.log -{ - echo - AS_BOX([Running $as_me.]) -} >&AS_MESSAGE_LOG_FD - -lt_cl_help="\ -\`$as_me' creates a local libtool stub from the current configuration, -for use in further configure time tests before the real libtool is -generated. - -Usage: $[0] [[OPTIONS]] - - -h, --help print this help, then exit - -V, --version print version number, then exit - -q, --quiet do not print progress messages - -d, --debug don't remove temporary files - -Report bugs to ." - -lt_cl_version="\ -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) 2010 Free Software Foundation, Inc. -This config.lt script is free software; the Free Software Foundation -gives unlimited permision to copy, distribute and modify it." - -while test $[#] != 0 -do - case $[1] in - --version | --v* | -V ) - echo "$lt_cl_version"; exit 0 ;; - --help | --h* | -h ) - echo "$lt_cl_help"; exit 0 ;; - --debug | --d* | -d ) - debug=: ;; - --quiet | --q* | --silent | --s* | -q ) - lt_cl_silent=: ;; - - -*) AC_MSG_ERROR([unrecognized option: $[1] -Try \`$[0] --help' for more information.]) ;; - - *) AC_MSG_ERROR([unrecognized argument: $[1] -Try \`$[0] --help' for more information.]) ;; - esac - shift -done - -if $lt_cl_silent; then - exec AS_MESSAGE_FD>/dev/null -fi -_LTEOF - -cat >>"$CONFIG_LT" <<_LTEOF -_LT_OUTPUT_LIBTOOL_COMMANDS_INIT -_LTEOF - -cat >>"$CONFIG_LT" <<\_LTEOF -AC_MSG_NOTICE([creating $ofile]) -_LT_OUTPUT_LIBTOOL_COMMANDS -AS_EXIT(0) -_LTEOF -chmod +x "$CONFIG_LT" - -# configure is writing to config.log, but config.lt does its own redirection, -# 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. -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 - - -# _LT_CONFIG(TAG) -# --------------- -# If TAG is the built-in tag, create an initial libtool script with a -# default configuration from the untagged config vars. Otherwise add code -# to config.status for appending the configuration named by TAG from the -# matching tagged config vars. -m4_defun([_LT_CONFIG], -[m4_require([_LT_FILEUTILS_DEFAULTS])dnl -_LT_CONFIG_SAVE_COMMANDS([ - m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl - m4_if(_LT_TAG, [C], [ - # See if we are running on zsh, and set the options which allow our - # commands through without removal of \ escapes. - if test -n "${ZSH_VERSION+set}" ; then - setopt NO_GLOB_SUBST - fi - - cfgfile="${ofile}T" - trap "$RM \"$cfgfile\"; exit 1" 1 2 15 - $RM "$cfgfile" - - cat <<_LT_EOF >> "$cfgfile" -#! $SHELL - -# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. -# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION -# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: -# NOTE: Changes made to this file will be lost: look at ltmain.sh. -# -_LT_COPYING -_LT_LIBTOOL_TAGS - -# ### BEGIN LIBTOOL CONFIG -_LT_LIBTOOL_CONFIG_VARS -_LT_LIBTOOL_TAG_VARS -# ### END LIBTOOL CONFIG - -_LT_EOF - - case $host_os in - aix3*) - cat <<\_LT_EOF >> "$cfgfile" -# AIX sometimes has problems with the GCC collect2 program. For some -# reason, if we set the COLLECT_NAMES environment variable, the problems -# vanish in a puff of smoke. -if test "X${COLLECT_NAMES+set}" != Xset; then - COLLECT_NAMES= - export COLLECT_NAMES -fi -_LT_EOF - ;; - esac - - _LT_PROG_LTMAIN - - # We use sed instead of cat because bash on DJGPP gets confused if - # 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 '$q' "$ltmain" >> "$cfgfile" \ - || (rm -f "$cfgfile"; exit 1) - - _LT_PROG_REPLACE_SHELLFNS - - mv -f "$cfgfile" "$ofile" || - (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") - chmod +x "$ofile" -], -[cat <<_LT_EOF >> "$ofile" - -dnl Unfortunately we have to use $1 here, since _LT_TAG is not expanded -dnl in a comment (ie after a #). -# ### BEGIN LIBTOOL TAG CONFIG: $1 -_LT_LIBTOOL_TAG_VARS(_LT_TAG) -# ### END LIBTOOL TAG CONFIG: $1 -_LT_EOF -])dnl /m4_if -], -[m4_if([$1], [], [ - PACKAGE='$PACKAGE' - VERSION='$VERSION' - TIMESTAMP='$TIMESTAMP' - RM='$RM' - ofile='$ofile'], []) -])dnl /_LT_CONFIG_SAVE_COMMANDS -])# _LT_CONFIG - - -# LT_SUPPORTED_TAG(TAG) -# --------------------- -# Trace this macro to discover what tags are supported by the libtool -# --tag option, using: -# autoconf --trace 'LT_SUPPORTED_TAG:$1' -AC_DEFUN([LT_SUPPORTED_TAG], []) - - -# C support is built-in for now -m4_define([_LT_LANG_C_enabled], []) -m4_define([_LT_TAGS], []) - - -# LT_LANG(LANG) -# ------------- -# Enable libtool support for the given language if not already enabled. -AC_DEFUN([LT_LANG], -[AC_BEFORE([$0], [LT_OUTPUT])dnl -m4_case([$1], - [C], [_LT_LANG(C)], - [C++], [_LT_LANG(CXX)], - [Java], [_LT_LANG(GCJ)], - [Fortran 77], [_LT_LANG(F77)], - [Fortran], [_LT_LANG(FC)], - [Windows Resource], [_LT_LANG(RC)], - [m4_ifdef([_LT_LANG_]$1[_CONFIG], - [_LT_LANG($1)], - [m4_fatal([$0: unsupported language: "$1"])])])dnl -])# LT_LANG - - -# _LT_LANG(LANGNAME) -# ------------------ -m4_defun([_LT_LANG], -[m4_ifdef([_LT_LANG_]$1[_enabled], [], - [LT_SUPPORTED_TAG([$1])dnl - m4_append([_LT_TAGS], [$1 ])dnl - m4_define([_LT_LANG_]$1[_enabled], [])dnl - _LT_LANG_$1_CONFIG($1)])dnl -])# _LT_LANG - - -# _LT_LANG_DEFAULT_CONFIG -# ----------------------- -m4_defun([_LT_LANG_DEFAULT_CONFIG], -[AC_PROVIDE_IFELSE([AC_PROG_CXX], - [LT_LANG(CXX)], - [m4_define([AC_PROG_CXX], defn([AC_PROG_CXX])[LT_LANG(CXX)])]) - -AC_PROVIDE_IFELSE([AC_PROG_F77], - [LT_LANG(F77)], - [m4_define([AC_PROG_F77], defn([AC_PROG_F77])[LT_LANG(F77)])]) - -AC_PROVIDE_IFELSE([AC_PROG_FC], - [LT_LANG(FC)], - [m4_define([AC_PROG_FC], defn([AC_PROG_FC])[LT_LANG(FC)])]) - -dnl The call to [A][M_PROG_GCJ] is quoted like that to stop aclocal -dnl pulling things in needlessly. -AC_PROVIDE_IFELSE([AC_PROG_GCJ], - [LT_LANG(GCJ)], - [AC_PROVIDE_IFELSE([A][M_PROG_GCJ], - [LT_LANG(GCJ)], - [AC_PROVIDE_IFELSE([LT_PROG_GCJ], - [LT_LANG(GCJ)], - [m4_ifdef([AC_PROG_GCJ], - [m4_define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[LT_LANG(GCJ)])]) - m4_ifdef([A][M_PROG_GCJ], - [m4_define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[LT_LANG(GCJ)])]) - m4_ifdef([LT_PROG_GCJ], - [m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])]) - -AC_PROVIDE_IFELSE([LT_PROG_RC], - [LT_LANG(RC)], - [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])]) -])# _LT_LANG_DEFAULT_CONFIG - -# Obsolete macros: -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 -# ---------------- -m4_defun([_LT_TAG_COMPILER], -[AC_REQUIRE([AC_PROG_CC])dnl - -_LT_DECL([LTCC], [CC], [1], [A C compiler])dnl -_LT_DECL([LTCFLAGS], [CFLAGS], [1], [LTCC compiler flags])dnl -_LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl -_LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl - -# 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 -])# _LT_TAG_COMPILER - - -# _LT_COMPILER_BOILERPLATE -# ------------------------ -# Check for compiler boilerplate output or warnings with -# the simple compiler test code. -m4_defun([_LT_COMPILER_BOILERPLATE], -[m4_require([_LT_DECL_SED])dnl -ac_outfile=conftest.$ac_objext -echo "$lt_simple_compile_test_code" >conftest.$ac_ext -eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_compiler_boilerplate=`cat conftest.err` -$RM conftest* -])# _LT_COMPILER_BOILERPLATE - - -# _LT_LINKER_BOILERPLATE -# ---------------------- -# Check for linker boilerplate output or warnings with -# the simple link test code. -m4_defun([_LT_LINKER_BOILERPLATE], -[m4_require([_LT_DECL_SED])dnl -ac_outfile=conftest.$ac_objext -echo "$lt_simple_link_test_code" >conftest.$ac_ext -eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_linker_boilerplate=`cat conftest.err` -$RM -r conftest* -])# _LT_LINKER_BOILERPLATE - -# _LT_REQUIRED_DARWIN_CHECKS -# ------------------------- -m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[ - case $host_os in - rhapsody* | darwin*) - AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:]) - AC_CHECK_TOOL([NMEDIT], [nmedit], [:]) - AC_CHECK_TOOL([LIPO], [lipo], [:]) - AC_CHECK_TOOL([OTOOL], [otool], [:]) - AC_CHECK_TOOL([OTOOL64], [otool64], [:]) - _LT_DECL([], [DSYMUTIL], [1], - [Tool to manipulate archived DWARF debug symbol files on Mac OS X]) - _LT_DECL([], [NMEDIT], [1], - [Tool to change global to local symbols on Mac OS X]) - _LT_DECL([], [LIPO], [1], - [Tool to manipulate fat objects and archives on Mac OS X]) - _LT_DECL([], [OTOOL], [1], - [ldd/readelf like tool for Mach-O binaries on Mac OS X]) - _LT_DECL([], [OTOOL64], [1], - [ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4]) - - AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod], - [lt_cv_apple_cc_single_mod=no - if test -z "${LT_MULTI_MODULE}"; then - # By default we will add the -single_module flag. You can override - # by either setting the environment variable LT_MULTI_MODULE - # non-empty at configure time, or by adding -multi_module to the - # link flags. - rm -rf libconftest.dylib* - echo "int foo(void){return 1;}" > conftest.c - echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ --dynamiclib -Wl,-single_module conftest.c" >&AS_MESSAGE_LOG_FD - $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 - lt_cv_apple_cc_single_mod=yes - else - cat conftest.err >&AS_MESSAGE_LOG_FD - fi - 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 - save_LDFLAGS=$LDFLAGS - echo "_main" > conftest.sym - LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" - AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], - [lt_cv_ld_exported_symbols_list=yes], - [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 -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; 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' ;; - 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 -]) - - -# _LT_DARWIN_LINKER_FEATURES -# -------------------------- -# Checks for linker and compiler features on darwin -m4_defun([_LT_DARWIN_LINKER_FEATURES], -[ - m4_require([_LT_REQUIRED_DARWIN_CHECKS]) - _LT_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_TAGVAR(hardcode_direct, $1)=no - _LT_TAGVAR(hardcode_automatic, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported - 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\"`' - 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 - ifort*) _lt_dar_can_shared=yes ;; - *) _lt_dar_can_shared=$GCC ;; - esac - if test "$_lt_dar_can_shared" = "yes"; then - 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}" - _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" - m4_if([$1], [CXX], -[ if test "$lt_cv_apple_cc_single_mod" != "yes"; then - _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" - _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" - fi -],[]) - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi -]) - -# _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 -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], -[m4_divert_text([M4SH-INIT], [$1 -])])# _LT_SHELL_INIT - - - -# _LT_PROG_ECHO_BACKSLASH -# ----------------------- -# 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], -[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 - # 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*) AC_MSG_RESULT([printf]) ;; - print*) AC_MSG_RESULT([print -r]) ;; - *) AC_MSG_RESULT([cat]) ;; -esac - -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" )])]) - -_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts]) -_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], -[AC_ARG_ENABLE([libtool-lock], - [AS_HELP_STRING([--disable-libtool-lock], - [avoid locking (might break parallel builds)])]) -test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes - -# Some flags need to be propagated to the compiler or linker for good -# libtool support. -case $host in -ia64-*-hpux*) - # 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.$ac_objext` in - *ELF-32*) - HPUX_IA64_MODE="32" - ;; - *ELF-64*) - HPUX_IA64_MODE="64" - ;; - esac - fi - rm -rf conftest* - ;; -*-*-irix6*) - # Find out which ABI we are using. - 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 - *32-bit*) - LD="${LD-ld} -melf32bsmip" - ;; - *N32*) - LD="${LD-ld} -melf32bmipn32" - ;; - *64-bit*) - LD="${LD-ld} -melf64bmip" - ;; - esac - else - case `/usr/bin/file conftest.$ac_objext` in - *32-bit*) - LD="${LD-ld} -32" - ;; - *N32*) - LD="${LD-ld} -n32" - ;; - *64-bit*) - LD="${LD-ld} -64" - ;; - esac - fi - fi - rm -rf conftest* - ;; - -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 AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.o` in - *32-bit*) - case $host in - x86_64-*kfreebsd*-gnu) - LD="${LD-ld} -m elf_i386_fbsd" - ;; - x86_64-*linux*) - LD="${LD-ld} -m elf_i386" - ;; - ppc64-*linux*|powerpc64-*linux*) - LD="${LD-ld} -m elf32ppclinux" - ;; - s390x-*linux*) - LD="${LD-ld} -m elf_s390" - ;; - sparc64-*linux*) - LD="${LD-ld} -m elf32_sparc" - ;; - esac - ;; - *64-bit*) - case $host in - x86_64-*kfreebsd*-gnu) - LD="${LD-ld} -m elf_x86_64_fbsd" - ;; - x86_64-*linux*) - LD="${LD-ld} -m elf_x86_64" - ;; - ppc*-*linux*|powerpc*-*linux*) - LD="${LD-ld} -m elf64ppc" - ;; - s390*-*linux*|s390*-*tpf*) - LD="${LD-ld} -m elf64_s390" - ;; - sparc*-*linux*) - LD="${LD-ld} -m elf64_sparc" - ;; - esac - ;; - esac - fi - rm -rf conftest* - ;; - -*-*-sco3.2v5*) - # On SCO OpenServer 5, we need -belf to get full-featured binaries. - SAVE_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -belf" - AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf, - [AC_LANG_PUSH(C) - AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no]) - AC_LANG_POP]) - 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*) - # 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" ;; - *) - if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then - LD="${LD-ld} -64" - fi - ;; - esac - ;; - esac - fi - rm -rf conftest* - ;; -esac - -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], -[_LT_PROG_AR - -AC_CHECK_TOOL(STRIP, strip, :) -test -z "$STRIP" && STRIP=: -_LT_DECL([], [STRIP], [1], [A symbol stripping program]) - -AC_CHECK_TOOL(RANLIB, ranlib, :) -test -z "$RANLIB" && RANLIB=: -_LT_DECL([], [RANLIB], [1], - [Commands used to install an old-style archive]) - -# Determine commands to create old-style static archives. -old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' -old_postinstall_cmds='chmod 644 $oldlib' -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 \$oldlib" - ;; - esac - old_archive_cmds="$old_archive_cmds~\$RANLIB \$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 - - -# _LT_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, -# [OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE]) -# ---------------------------------------------------------------- -# Check whether the given compiler option works -AC_DEFUN([_LT_COMPILER_OPTION], -[m4_require([_LT_FILEUTILS_DEFAULTS])dnl -m4_require([_LT_DECL_SED])dnl -AC_CACHE_CHECK([$1], [$2], - [$2=no - m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4]) - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="$3" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - # The option is referenced via a variable to avoid confusing sed. - lt_compile=`echo "$ac_compile" | $SED \ - -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:$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:$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 "$_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 - fi - fi - $RM conftest* -]) - -if test x"[$]$2" = xyes; then - m4_if([$5], , :, [$5]) -else - m4_if([$6], , :, [$6]) -fi -])# _LT_COMPILER_OPTION - -# Old name: -AU_ALIAS([AC_LIBTOOL_COMPILER_OPTION], [_LT_COMPILER_OPTION]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], []) - - -# _LT_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, -# [ACTION-SUCCESS], [ACTION-FAILURE]) -# ---------------------------------------------------- -# Check whether the given linker option works -AC_DEFUN([_LT_LINKER_OPTION], -[m4_require([_LT_FILEUTILS_DEFAULTS])dnl -m4_require([_LT_DECL_SED])dnl -AC_CACHE_CHECK([$1], [$2], - [$2=no - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS $3" - 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>&AS_MESSAGE_LOG_FD - $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 - fi - else - $2=yes - fi - fi - $RM -r conftest* - LDFLAGS="$save_LDFLAGS" -]) - -if test x"[$]$2" = xyes; then - m4_if([$4], , :, [$4]) -else - m4_if([$5], , :, [$5]) -fi -])# _LT_LINKER_OPTION - -# Old name: -AU_ALIAS([AC_LIBTOOL_LINKER_OPTION], [_LT_LINKER_OPTION]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], []) - - -# LT_CMD_MAX_LEN -#--------------- -AC_DEFUN([LT_CMD_MAX_LEN], -[AC_REQUIRE([AC_CANONICAL_HOST])dnl -# find the maximum length of command line arguments -AC_MSG_CHECKING([the maximum length of command line arguments]) -AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl - i=0 - teststring="ABCD" - - case $build_os in - msdosdjgpp*) - # On DJGPP, this test can blow up pretty badly due to problems in libc - # (any single argument exceeding 2000 bytes causes a buffer overrun - # during glob expansion). Even if it were fixed, the result of this - # check would be larger than it should be. - lt_cv_sys_max_cmd_len=12288; # 12K is about right - ;; - - gnu*) - # Under GNU Hurd, this test is not required because there is - # no limit to the length of command line arguments. - # Libtool will interpret -1 as no limit whatsoever - lt_cv_sys_max_cmd_len=-1; - ;; - - cygwin* | mingw* | cegcc*) - # On Win9x/ME, this test blows up -- it succeeds, but takes - # about 5 minutes as the teststring grows exponentially. - # Worse, since 9x/ME are not pre-emptively multitasking, - # you end up with a "frozen" computer, even though with patience - # the test eventually succeeds (with a max line length of 256k). - # Instead, let's just punt: use the minimum linelength reported by - # all of the supported platforms: 8192 (on NT/2K/XP). - 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. - lt_cv_sys_max_cmd_len=8192; - ;; - - netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) - # This has been around since 386BSD, at least. Likely further. - if test -x /sbin/sysctl; then - lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` - elif test -x /usr/sbin/sysctl; then - lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` - else - lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs - fi - # And add a safety zone - 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` - ;; - - interix*) - # We know the value 262144 and hardcode it with a safety zone (like BSD) - lt_cv_sys_max_cmd_len=196608 - ;; - - 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 - # nice to cause kernel panics so lets avoid the loop below. - # First set a reasonable default. - lt_cv_sys_max_cmd_len=16384 - # - if test -x /sbin/sysconfig; then - case `/sbin/sysconfig -q proc exec_disable_arg_limit` in - *1*) lt_cv_sys_max_cmd_len=-1 ;; - esac - fi - ;; - sco3.2v5*) - lt_cv_sys_max_cmd_len=102400 - ;; - sysv5* | sco5v6* | sysv4.2uw2*) - kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` - if test -n "$kargmax"; then - lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'` - else - lt_cv_sys_max_cmd_len=32768 - fi - ;; - *) - lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` - if test -n "$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 - # Make teststring a little bigger before we do anything with it. - # a 1K string should be a reasonable start. - for i in 1 2 3 4 5 6 7 8 ; do - teststring=$teststring$teststring - done - SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} - # 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"`func_fallback_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` - teststring=$teststring$teststring - done - # Only check the string length outside the loop. - lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1` - teststring= - # Add a significant safety factor because C++ compilers can tack on - # massive amounts of additional arguments before passing them to the - # linker. It appears as though 1/2 is a usable value. - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` - fi - ;; - esac -]) -if test -n $lt_cv_sys_max_cmd_len ; then - AC_MSG_RESULT($lt_cv_sys_max_cmd_len) -else - AC_MSG_RESULT(none) -fi -max_cmd_len=$lt_cv_sys_max_cmd_len -_LT_DECL([], [max_cmd_len], [0], - [What is the maximum length of a command?]) -])# LT_CMD_MAX_LEN - -# Old name: -AU_ALIAS([AC_LIBTOOL_SYS_MAX_CMD_LEN], [LT_CMD_MAX_LEN]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], []) - - -# _LT_HEADER_DLFCN -# ---------------- -m4_defun([_LT_HEADER_DLFCN], -[AC_CHECK_HEADERS([dlfcn.h], [], [], [AC_INCLUDES_DEFAULT])dnl -])# _LT_HEADER_DLFCN - - -# _LT_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE, -# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING) -# ---------------------------------------------------------------- -m4_defun([_LT_TRY_DLOPEN_SELF], -[m4_require([_LT_HEADER_DLFCN])dnl -if test "$cross_compiling" = yes; then : - [$4] -else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF -[#line $LINENO "configure" -#include "confdefs.h" - -#if HAVE_DLFCN_H -#include -#endif - -#include - -#ifdef RTLD_GLOBAL -# define LT_DLGLOBAL RTLD_GLOBAL -#else -# ifdef DL_GLOBAL -# define LT_DLGLOBAL DL_GLOBAL -# else -# define LT_DLGLOBAL 0 -# endif -#endif - -/* We may have to define LT_DLLAZY_OR_NOW in the command line if we - find out it does not work in some platform. */ -#ifndef LT_DLLAZY_OR_NOW -# ifdef RTLD_LAZY -# define LT_DLLAZY_OR_NOW RTLD_LAZY -# else -# ifdef DL_LAZY -# define LT_DLLAZY_OR_NOW DL_LAZY -# else -# ifdef RTLD_NOW -# define LT_DLLAZY_OR_NOW RTLD_NOW -# else -# ifdef DL_NOW -# define LT_DLLAZY_OR_NOW DL_NOW -# else -# define LT_DLLAZY_OR_NOW 0 -# endif -# endif -# endif -# endif -#endif - -/* 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); - int status = $lt_dlunknown; - - if (self) - { - if (dlsym (self,"fnord")) status = $lt_dlno_uscore; - else - { - if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; - else puts (dlerror ()); - } - /* dlclose (self); */ - } - else - puts (dlerror ()); - - return status; -}] -_LT_EOF - if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then - (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null - lt_status=$? - case x$lt_status in - x$lt_dlno_uscore) $1 ;; - x$lt_dlneed_uscore) $2 ;; - x$lt_dlunknown|x*) $3 ;; - esac - else : - # compilation failed - $3 - fi -fi -rm -fr conftest* -])# _LT_TRY_DLOPEN_SELF - - -# LT_SYS_DLOPEN_SELF -# ------------------ -AC_DEFUN([LT_SYS_DLOPEN_SELF], -[m4_require([_LT_HEADER_DLFCN])dnl -if test "x$enable_dlopen" != xyes; then - enable_dlopen=unknown - enable_dlopen_self=unknown - enable_dlopen_self_static=unknown -else - lt_cv_dlopen=no - lt_cv_dlopen_libs= - - case $host_os in - beos*) - lt_cv_dlopen="load_add_on" - lt_cv_dlopen_libs= - lt_cv_dlopen_self=yes - ;; - - mingw* | pw32* | cegcc*) - lt_cv_dlopen="LoadLibrary" - lt_cv_dlopen_libs= - ;; - - cygwin*) - lt_cv_dlopen="dlopen" - lt_cv_dlopen_libs= - ;; - - darwin*) - # if libdl is installed we need to link against it - AC_CHECK_LIB([dl], [dlopen], - [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[ - lt_cv_dlopen="dyld" - lt_cv_dlopen_libs= - lt_cv_dlopen_self=yes - ]) - ;; - - *) - AC_CHECK_FUNC([shl_load], - [lt_cv_dlopen="shl_load"], - [AC_CHECK_LIB([dld], [shl_load], - [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"], - [AC_CHECK_FUNC([dlopen], - [lt_cv_dlopen="dlopen"], - [AC_CHECK_LIB([dl], [dlopen], - [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"], - [AC_CHECK_LIB([svld], [dlopen], - [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], - [AC_CHECK_LIB([dld], [dld_link], - [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"]) - ]) - ]) - ]) - ]) - ]) - ;; - esac - - if test "x$lt_cv_dlopen" != xno; then - enable_dlopen=yes - else - enable_dlopen=no - fi - - case $lt_cv_dlopen in - dlopen) - save_CPPFLAGS="$CPPFLAGS" - test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" - - save_LDFLAGS="$LDFLAGS" - wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" - - save_LIBS="$LIBS" - LIBS="$lt_cv_dlopen_libs $LIBS" - - AC_CACHE_CHECK([whether a program can dlopen itself], - lt_cv_dlopen_self, [dnl - _LT_TRY_DLOPEN_SELF( - lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes, - lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross) - ]) - - if test "x$lt_cv_dlopen_self" = xyes; then - wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" - AC_CACHE_CHECK([whether a statically linked program can dlopen itself], - lt_cv_dlopen_self_static, [dnl - _LT_TRY_DLOPEN_SELF( - lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes, - lt_cv_dlopen_self_static=no, lt_cv_dlopen_self_static=cross) - ]) - fi - - CPPFLAGS="$save_CPPFLAGS" - LDFLAGS="$save_LDFLAGS" - LIBS="$save_LIBS" - ;; - esac - - case $lt_cv_dlopen_self in - yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; - *) enable_dlopen_self=unknown ;; - esac - - case $lt_cv_dlopen_self_static in - yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; - *) enable_dlopen_self_static=unknown ;; - esac -fi -_LT_DECL([dlopen_support], [enable_dlopen], [0], - [Whether dlopen is supported]) -_LT_DECL([dlopen_self], [enable_dlopen_self], [0], - [Whether dlopen of programs is supported]) -_LT_DECL([dlopen_self_static], [enable_dlopen_self_static], [0], - [Whether dlopen of statically linked programs is supported]) -])# LT_SYS_DLOPEN_SELF - -# Old name: -AU_ALIAS([AC_LIBTOOL_DLOPEN_SELF], [LT_SYS_DLOPEN_SELF]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], []) - - -# _LT_COMPILER_C_O([TAGNAME]) -# --------------------------- -# Check to see if options -c and -o are simultaneously supported by compiler. -# This macro does not hard code the compiler like AC_PROG_CC_C_O. -m4_defun([_LT_COMPILER_C_O], -[m4_require([_LT_DECL_SED])dnl -m4_require([_LT_FILEUTILS_DEFAULTS])dnl -m4_require([_LT_TAG_COMPILER])dnl -AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext], - [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)], - [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no - $RM -r conftest 2>/dev/null - mkdir conftest - cd conftest - mkdir out - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - lt_compiler_flag="-o out/conftest2.$ac_objext" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - lt_compile=`echo "$ac_compile" | $SED \ - -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:$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:$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 "$_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 - fi - fi - chmod u+w . 2>&AS_MESSAGE_LOG_FD - $RM conftest* - # SGI C++ compiler will create directory out/ii_files/ for - # template instantiation - test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files - $RM out/* && rmdir out - cd .. - $RM -r conftest - $RM conftest* -]) -_LT_TAGDECL([compiler_c_o], [lt_cv_prog_compiler_c_o], [1], - [Does compiler simultaneously support -c and -o options?]) -])# _LT_COMPILER_C_O - - -# _LT_COMPILER_FILE_LOCKS([TAGNAME]) -# ---------------------------------- -# Check to see if we can do hard links to lock some files if needed -m4_defun([_LT_COMPILER_FILE_LOCKS], -[m4_require([_LT_ENABLE_LOCK])dnl -m4_require([_LT_FILEUTILS_DEFAULTS])dnl -_LT_COMPILER_C_O([$1]) - -hard_links="nottested" -if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then - # do not overwrite the value of need_locks provided by the user - AC_MSG_CHECKING([if we can lock with hard links]) - hard_links=yes - $RM conftest* - ln conftest.a conftest.b 2>/dev/null && hard_links=no - touch conftest.a - ln conftest.a conftest.b 2>&5 || hard_links=no - ln conftest.a conftest.b 2>/dev/null && hard_links=no - AC_MSG_RESULT([$hard_links]) - if test "$hard_links" = no; then - AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe]) - need_locks=warn - fi -else - need_locks=no -fi -_LT_DECL([], [need_locks], [1], [Must we lock files when doing compilation?]) -])# _LT_COMPILER_FILE_LOCKS - - -# _LT_CHECK_OBJDIR -# ---------------- -m4_defun([_LT_CHECK_OBJDIR], -[AC_CACHE_CHECK([for objdir], [lt_cv_objdir], -[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]) -objdir=$lt_cv_objdir -_LT_DECL([], [objdir], [0], - [The name of the directory that contains temporary libtool files])dnl -m4_pattern_allow([LT_OBJDIR])dnl -AC_DEFINE_UNQUOTED(LT_OBJDIR, "$lt_cv_objdir/", - [Define to the sub-directory in which libtool stores uninstalled libraries.]) -])# _LT_CHECK_OBJDIR - - -# _LT_LINKER_HARDCODE_LIBPATH([TAGNAME]) -# -------------------------------------- -# Check hardcoding attributes. -m4_defun([_LT_LINKER_HARDCODE_LIBPATH], -[AC_MSG_CHECKING([how to hardcode library paths into programs]) -_LT_TAGVAR(hardcode_action, $1)= -if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" || - test -n "$_LT_TAGVAR(runpath_var, $1)" || - test "X$_LT_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then - - # We can hardcode non-existent directories. - if test "$_LT_TAGVAR(hardcode_direct, $1)" != 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, $1)" != no && - test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; then - # Linking always hardcodes the temporary library directory. - _LT_TAGVAR(hardcode_action, $1)=relink - else - # We can link without hardcoding, and we can hardcode nonexisting dirs. - _LT_TAGVAR(hardcode_action, $1)=immediate - fi -else - # We cannot hardcode anything, or else we can only hardcode existing - # directories. - _LT_TAGVAR(hardcode_action, $1)=unsupported -fi -AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)]) - -if test "$_LT_TAGVAR(hardcode_action, $1)" = relink || - test "$_LT_TAGVAR(inherit_rpath, $1)" = 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 -_LT_TAGDECL([], [hardcode_action], [0], - [How to hardcode a shared library path into an executable]) -])# _LT_LINKER_HARDCODE_LIBPATH - - -# _LT_CMD_STRIPLIB -# ---------------- -m4_defun([_LT_CMD_STRIPLIB], -[m4_require([_LT_DECL_EGREP]) -striplib= -old_striplib= -AC_MSG_CHECKING([whether stripping libraries is possible]) -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" - AC_MSG_RESULT([yes]) -else -# FIXME - insert some real tests, host_os isn't really good enough - case $host_os in - darwin*) - if test -n "$STRIP" ; then - striplib="$STRIP -x" - old_striplib="$STRIP -S" - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) - fi - ;; - *) - AC_MSG_RESULT([no]) - ;; - esac -fi -_LT_DECL([], [old_striplib], [1], [Commands to strip libraries]) -_LT_DECL([], [striplib], [1]) -])# _LT_CMD_STRIPLIB - - -# _LT_SYS_DYNAMIC_LINKER([TAG]) -# ----------------------------- -# PORTME Fill in your ld.so characteristics -m4_defun([_LT_SYS_DYNAMIC_LINKER], -[AC_REQUIRE([AC_CANONICAL_HOST])dnl -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], - [], [ -if test "$GCC" = yes; then - case $host_os in - darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; - *) lt_awk_arg="/^libraries:/" ;; - esac - 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 '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= - lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` - for lt_sys_path in $lt_search_path_spec; do - if test -d "$lt_sys_path/$lt_multi_os_dir"; then - lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" - else - test -d "$lt_sys_path" && \ - 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 ' -BEGIN {RS=" "; FS="/|\n";} { - lt_foo=""; - lt_count=0; - for (lt_i = NF; lt_i > 0; lt_i--) { - if ($lt_i != "" && $lt_i != ".") { - if ($lt_i == "..") { - lt_count++; - } else { - if (lt_count == 0) { - lt_foo="/" $lt_i lt_foo; - } else { - lt_count--; - } - } - } - } - if (lt_foo != "") { lt_freq[[lt_foo]]++; } - if (lt_freq[[lt_foo]] == 1) { print lt_foo; } -}'` - # 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]) -library_names_spec= -libname_spec='lib$name' -soname_spec= -shrext_cmds=".so" -postinstall_cmds= -postuninstall_cmds= -finish_cmds= -finish_eval= -shlibpath_var= -shlibpath_overrides_runpath=unknown -version_type=none -dynamic_linker="$host_os ld.so" -sys_lib_dlsearch_path_spec="/lib /usr/lib" -need_lib_prefix=unknown -hardcode_into_libs=no - -# when you set need_version to no, make sure it does not cause -set_version -# flags to be left without arguments -need_version=unknown - -case $host_os in -aix3*) - version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' - shlibpath_var=LIBPATH - - # AIX 3 has no versioning support, so we append a major version to the name. - soname_spec='${libname}${release}${shared_ext}$major' - ;; - -aix[[4-9]]*) - version_type=linux - need_lib_prefix=no - need_version=no - hardcode_into_libs=yes - if test "$host_cpu" = ia64; then - # AIX 5 supports IA64 - library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - else - # With GCC up to 2.95.x, collect2 would create an import file - # for dependence libraries. The import file would start with - # the line `#! .'. This would cause the generated library to - # depend on `.', always an invalid library. This was fixed in - # development snapshots of GCC prior to 3.0. - case $host_os in - aix4 | aix4.[[01]] | aix4.[[01]].*) - if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' - echo ' yes ' - echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then - : - else - can_build_shared=no - fi - ;; - esac - # AIX (on Power*) has no versioning support, so currently we can not hardcode correct - # soname into executable. Probably we can add versioning support to - # collect2, so additional links can be useful in future. - if test "$aix_use_runtimelinking" = yes; then - # If using run time linking (on AIX 4.2 or later) use lib.so - # instead of lib.a to let people know that these are not - # typical AIX shared libraries. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - else - # We preserve .a as extension for shared libraries through AIX4.2 - # and later when we are not doing run time linking. - library_names_spec='${libname}${release}.a $libname.a' - soname_spec='${libname}${release}${shared_ext}$major' - fi - shlibpath_var=LIBPATH - fi - ;; - -amigaos*) - case $host_cpu in - powerpc) - # Since July 2007 AmigaOS4 officially supports .so libraries. - # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - ;; - 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=`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 - ;; - -beos*) - library_names_spec='${libname}${shared_ext}' - dynamic_linker="$host_os ld.so" - shlibpath_var=LIBRARY_PATH - ;; - -bsdi[[45]]*) - version_type=linux - 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 $libdir' - shlibpath_var=LD_LIBRARY_PATH - sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" - sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" - # the default ld.so.conf also contains /usr/contrib/lib and - # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow - # libtool to hard-code these into programs - ;; - -cygwin* | mingw* | pw32* | cegcc*) - version_type=windows - shrext_cmds=".dll" - need_version=no - need_lib_prefix=no - - 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}`~ - 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~ - chmod a+x \$dldir/$dlname~ - if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then - eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; - fi' - postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ - dlpath=$dir/\$dldll~ - $RM \$dlpath' - shlibpath_overrides_runpath=yes - - case $host_os in - 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}' -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}' - ;; - 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 - # FIXME: first we should search . and the directory the executable is in - shlibpath_var=PATH - ;; - -darwin* | rhapsody*) - dynamic_linker="$host_os dyld" - version_type=darwin - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext' - soname_spec='${libname}${release}${major}$shared_ext' - shlibpath_overrides_runpath=yes - shlibpath_var=DYLD_LIBRARY_PATH - shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' -m4_if([$1], [],[ - sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"]) - sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' - ;; - -dgux*) - 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 - ;; - -freebsd1*) - dynamic_linker=no - ;; - -freebsd* | dragonfly*) - # DragonFly does not have aout. When/if they implement a new - # versioning mechanism, adjust this. - if test -x /usr/bin/objformat; then - objformat=`/usr/bin/objformat` - else - case $host_os in - freebsd[[123]]*) objformat=aout ;; - *) objformat=elf ;; - esac - fi - version_type=freebsd-$objformat - case $version_type in - freebsd-elf*) - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - need_version=no - need_lib_prefix=no - ;; - freebsd-*) - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' - need_version=yes - ;; - esac - shlibpath_var=LD_LIBRARY_PATH - case $host_os in - freebsd2*) - shlibpath_overrides_runpath=yes - ;; - freebsd3.[[01]]* | freebsdelf3.[[01]]*) - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \ - freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1) - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - *) # from 4.6 on, and DragonFly - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - esac - ;; - -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 - hardcode_into_libs=yes - ;; - -haiku*) - version_type=linux - 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=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 - ;; - -hpux9* | hpux10* | hpux11*) - # Give a soname corresponding to the major version so that dld.sl refuses to - # link against other versions. - version_type=sunos - need_lib_prefix=no - need_version=no - case $host_cpu in - ia64*) - shrext_cmds='.so' - hardcode_into_libs=yes - dynamic_linker="$host_os dld.so" - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - if test "X$HPUX_IA64_MODE" = X32; then - sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" - else - sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" - fi - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; - hppa*64*) - shrext_cmds='.sl' - hardcode_into_libs=yes - dynamic_linker="$host_os dld.sl" - shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH - shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; - *) - shrext_cmds='.sl' - dynamic_linker="$host_os dld.sl" - shlibpath_var=SHLIB_PATH - shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - ;; - esac - # 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 - 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' - dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - -irix5* | irix6* | nonstopux*) - case $host_os in - nonstopux*) version_type=nonstopux ;; - *) - if test "$lt_cv_prog_gnu_ld" = yes; then - version_type=linux - else - version_type=irix - fi ;; - esac - 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}${release}${shared_ext} $libname${shared_ext}' - case $host_os in - irix5* | 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 | kopensolaris*-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 - 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;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 -AC_MSG_RESULT([$dynamic_linker]) -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 - -_LT_DECL([], [variables_saved_for_relink], [1], - [Variables whose values should be saved in libtool wrapper scripts and - restored at link time]) -_LT_DECL([], [need_lib_prefix], [0], - [Do we need the "lib" prefix for modules?]) -_LT_DECL([], [need_version], [0], [Do we need a version for libraries?]) -_LT_DECL([], [version_type], [0], [Library versioning type]) -_LT_DECL([], [runpath_var], [0], [Shared library runtime path variable]) -_LT_DECL([], [shlibpath_var], [0],[Shared library path variable]) -_LT_DECL([], [shlibpath_overrides_runpath], [0], - [Is shlibpath searched before the hard-coded library search path?]) -_LT_DECL([], [libname_spec], [1], [Format of library name prefix]) -_LT_DECL([], [library_names_spec], [1], - [[List of archive names. First name is the real one, the rest are links. - 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], - [Command to use after uninstallation of a shared archive]) -_LT_DECL([], [finish_cmds], [2], - [Commands used to finish a libtool library installation in a directory]) -_LT_DECL([], [finish_eval], [1], - [[As "finish_cmds", except a single script fragment to be evaled but - not shown]]) -_LT_DECL([], [hardcode_into_libs], [0], - [Whether we should hardcode library paths into libraries]) -_LT_DECL([], [sys_lib_search_path_spec], [2], - [Compile-time system search path for libraries]) -_LT_DECL([], [sys_lib_dlsearch_path_spec], [2], - [Run-time system search path for libraries]) -])# _LT_SYS_DYNAMIC_LINKER - - -# _LT_PATH_TOOL_PREFIX(TOOL) -# -------------------------- -# find a file program which can recognize shared library -AC_DEFUN([_LT_PATH_TOOL_PREFIX], -[m4_require([_LT_DECL_EGREP])dnl -AC_MSG_CHECKING([for $1]) -AC_CACHE_VAL(lt_cv_path_MAGIC_CMD, -[case $MAGIC_CMD in -[[\\/*] | ?:[\\/]*]) - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. - ;; -*) - lt_save_MAGIC_CMD="$MAGIC_CMD" - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR -dnl $ac_dummy forces splitting on constant user-supplied paths. -dnl POSIX.2 word splitting is done only on the output of word expansions, -dnl not every word. This closes a longstanding sh security hole. - ac_dummy="m4_if([$2], , $PATH, [$2])" - for ac_dir in $ac_dummy; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$1; then - lt_cv_path_MAGIC_CMD="$ac_dir/$1" - if test -n "$file_magic_test_file"; then - case $deplibs_check_method in - "file_magic "*) - file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` - MAGIC_CMD="$lt_cv_path_MAGIC_CMD" - if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | - $EGREP "$file_magic_regex" > /dev/null; then - : - else - cat <<_LT_EOF 1>&2 - -*** Warning: the command libtool uses to detect shared libraries, -*** $file_magic_cmd, produces output that libtool cannot recognize. -*** The result is that libtool may fail to recognize shared libraries -*** as such. This will affect the creation of libtool libraries that -*** depend on shared libraries, but programs linked with such libtool -*** libraries will work regardless of this problem. Nevertheless, you -*** may want to report the problem to your system manager and/or to -*** bug-libtool@gnu.org - -_LT_EOF - fi ;; - esac - fi - break - fi - done - IFS="$lt_save_ifs" - MAGIC_CMD="$lt_save_MAGIC_CMD" - ;; -esac]) -MAGIC_CMD="$lt_cv_path_MAGIC_CMD" -if test -n "$MAGIC_CMD"; then - AC_MSG_RESULT($MAGIC_CMD) -else - AC_MSG_RESULT(no) -fi -_LT_DECL([], [MAGIC_CMD], [0], - [Used to examine libraries when file_magic_cmd begins with "file"])dnl -])# _LT_PATH_TOOL_PREFIX - -# Old name: -AU_ALIAS([AC_PATH_TOOL_PREFIX], [_LT_PATH_TOOL_PREFIX]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_PATH_TOOL_PREFIX], []) - - -# _LT_PATH_MAGIC -# -------------- -# find a file program which can recognize a shared library -m4_defun([_LT_PATH_MAGIC], -[_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH) -if test -z "$lt_cv_path_MAGIC_CMD"; then - if test -n "$ac_tool_prefix"; then - _LT_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH) - else - MAGIC_CMD=: - fi -fi -])# _LT_PATH_MAGIC - - -# LT_PATH_LD -# ---------- -# find the pathname to the GNU or non-GNU linker -AC_DEFUN([LT_PATH_LD], -[AC_REQUIRE([AC_PROG_CC])dnl -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], - [assume the C compiler uses GNU ld @<:@default=no@:>@])], - [test "$withval" = no || with_gnu_ld=yes], - [with_gnu_ld=no])dnl - -ac_prog=ld -if test "$GCC" = yes; then - # Check if gcc -print-prog-name=ld gives a path. - AC_MSG_CHECKING([for ld used by $CC]) - case $host in - *-*-mingw*) - # gcc leaves a trailing carriage return which upsets mingw - ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; - *) - ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; - esac - case $ac_prog in - # Accept absolute paths. - [[\\/]]* | ?:[[\\/]]*) - re_direlt='/[[^/]][[^/]]*/\.\./' - # Canonicalize the pathname of ld - ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'` - while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do - ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` - done - test -z "$LD" && LD="$ac_prog" - ;; - "") - # If it fails, then pretend we aren't using GCC. - ac_prog=ld - ;; - *) - # If it is relative, then search for the first ld in PATH. - with_gnu_ld=unknown - ;; - esac -elif test "$with_gnu_ld" = yes; then - AC_MSG_CHECKING([for GNU ld]) -else - AC_MSG_CHECKING([for non-GNU ld]) -fi -AC_CACHE_VAL(lt_cv_path_LD, -[if test -z "$LD"; then - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for ac_dir in $PATH; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then - lt_cv_path_LD="$ac_dir/$ac_prog" - # Check to see if the program is GNU ld. I'd rather use --version, - # but apparently some variants of GNU ld only accept -v. - # Break only if it was the GNU/non-GNU ld that we prefer. - case `"$lt_cv_path_LD" -v 2>&1 &1 /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 - # 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*) - # 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' - ;; - -darwin* | rhapsody*) - lt_cv_deplibs_check_method=pass_all - ;; - -freebsd* | dragonfly*) - if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then - case $host_cpu in - i*86 ) - # Not sure whether the presence of OpenBSD here was a mistake. - # Let's accept both of them until this is cleared up. - lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library' - lt_cv_file_magic_cmd=/usr/bin/file - lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` - ;; - esac - else - lt_cv_deplibs_check_method=pass_all - fi - ;; - -gnu*) - lt_cv_deplibs_check_method=pass_all - ;; - -haiku*) - lt_cv_deplibs_check_method=pass_all - ;; - -hpux10.20* | hpux11*) - lt_cv_file_magic_cmd=/usr/bin/file - case $host_cpu in - ia64*) - lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64' - 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])(-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_file_magic_test_file=/usr/lib/libc.sl - ;; - esac - ;; - -interix[[3-9]]*) - # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$' - ;; - -irix5* | irix6* | nonstopux*) - case $LD in - *-32|*"-32 ") libmagic=32-bit;; - *-n32|*"-n32 ") libmagic=N32;; - *-64|*"-64 ") libmagic=64-bit;; - *) libmagic=never-match;; - esac - lt_cv_deplibs_check_method=pass_all - ;; - -# This must be Linux ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) - lt_cv_deplibs_check_method=pass_all - ;; - -netbsd*) - 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 - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$' - fi - ;; - -newos6*) - lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)' - lt_cv_file_magic_cmd=/usr/bin/file - lt_cv_file_magic_test_file=/usr/lib/libnls.so - ;; - -*nto* | *qnx*) - lt_cv_deplibs_check_method=pass_all - ;; - -openbsd*) - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$' - else - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' - fi - ;; - -osf3* | osf4* | osf5*) - lt_cv_deplibs_check_method=pass_all - ;; - -rdos*) - lt_cv_deplibs_check_method=pass_all - ;; - -solaris*) - lt_cv_deplibs_check_method=pass_all - ;; - -sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - lt_cv_deplibs_check_method=pass_all - ;; - -sysv4 | sysv4.3*) - case $host_vendor in - motorola) - lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]' - lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*` - ;; - ncr) - lt_cv_deplibs_check_method=pass_all - ;; - sequent) - lt_cv_file_magic_cmd='/bin/file' - lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' - ;; - sni) - lt_cv_file_magic_cmd='/bin/file' - lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib" - lt_cv_file_magic_test_file=/lib/libc.so - ;; - siemens) - lt_cv_deplibs_check_method=pass_all - ;; - pc) - lt_cv_deplibs_check_method=pass_all - ;; - esac - ;; - -tpf*) - lt_cv_deplibs_check_method=pass_all - ;; -esac -]) - -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"]) -_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 - - -# LT_PATH_NM -# ---------- -# find the pathname to a BSD- or MS-compatible name lister -AC_DEFUN([LT_PATH_NM], -[AC_REQUIRE([AC_PROG_CC])dnl -AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM, -[if test -n "$NM"; then - # Let the user override the test. - lt_cv_path_NM="$NM" -else - lt_nm_to_check="${ac_tool_prefix}nm" - if test -n "$ac_tool_prefix" && test "$build" = "$host"; then - lt_nm_to_check="$lt_nm_to_check nm" - fi - for lt_tmp_nm in $lt_nm_to_check; do - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - tmp_nm="$ac_dir/$lt_tmp_nm" - if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then - # Check to see if the nm accepts a BSD-compat flag. - # Adding the `sed 1q' prevents false positives on HP-UX, which says: - # nm: unknown option "B" ignored - # Tru64's nm complains that /dev/null is an invalid object file - case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in - */dev/null* | *'Invalid file or object type'*) - lt_cv_path_NM="$tmp_nm -B" - break - ;; - *) - case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in - */dev/null*) - lt_cv_path_NM="$tmp_nm -p" - break - ;; - *) - lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but - continue # so that we can try to find one that supports BSD flags - ;; - esac - ;; - esac - fi - done - IFS="$lt_save_ifs" - done - : ${lt_cv_path_NM=no} -fi]) -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 "$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" - fi -fi -test -z "$NM" && NM=nm -AC_SUBST([NM]) -_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:$LINENO: $ac_compile\"" >&AS_MESSAGE_LOG_FD) - (eval "$ac_compile" 2>conftest.err) - cat conftest.err >&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:$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" - fi - rm -f conftest*]) -])# LT_PATH_NM - -# Old names: -AU_ALIAS([AM_PROG_NM], [LT_PATH_NM]) -AU_ALIAS([AC_PROG_NM], [LT_PATH_NM]) -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 -# -------- -# check for math library -AC_DEFUN([LT_LIB_M], -[AC_REQUIRE([AC_CANONICAL_HOST])dnl -LIBM= -case $host in -*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*) - # These system don't have libm, or don't need it - ;; -*-ncr-sysv4.3*) - AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw") - AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm") - ;; -*) - AC_CHECK_LIB(m, cos, LIBM="-lm") - ;; -esac -AC_SUBST([LIBM]) -])# LT_LIB_M - -# Old name: -AU_ALIAS([AC_CHECK_LIBM], [LT_LIB_M]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_CHECK_LIBM], []) - - -# _LT_COMPILER_NO_RTTI([TAGNAME]) -# ------------------------------- -m4_defun([_LT_COMPILER_NO_RTTI], -[m4_require([_LT_TAG_COMPILER])dnl - -_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= - -if test "$GCC" = yes; then - 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, - [-fno-rtti -fno-exceptions], [], - [_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"]) -fi -_LT_TAGDECL([no_builtin_flag], [lt_prog_compiler_no_builtin_flag], [1], - [Compiler flag to turn off builtin functions]) -])# _LT_COMPILER_NO_RTTI - - -# _LT_CMD_GLOBAL_SYMBOLS -# ---------------------- -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 -m4_require([_LT_DECL_EGREP])dnl -m4_require([_LT_TAG_COMPILER])dnl - -# Check for command to grab the raw symbol name followed by C symbol from nm. -AC_MSG_CHECKING([command to parse $NM output from $compiler object]) -AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe], -[ -# These are sane defaults that work on at least a few old systems. -# [They come from Ultrix. What could be older than Ultrix?!! ;)] - -# Character class describing NM global symbol codes. -symcode='[[BCDEGRST]]' - -# Regexp to match symbols that can be accessed directly from C. -sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)' - -# Define system-specific variables. -case $host_os in -aix*) - symcode='[[BCDT]]' - ;; -cygwin* | mingw* | pw32* | cegcc*) - symcode='[[ABCDGISTW]]' - ;; -hpux*) - if test "$host_cpu" = ia64; then - symcode='[[ABCDEGRST]]' - fi - ;; -irix* | nonstopux*) - symcode='[[BCDEGRST]]' - ;; -osf*) - symcode='[[BCDEGQRST]]' - ;; -solaris*) - symcode='[[BDRT]]' - ;; -sco3.2v5*) - symcode='[[DT]]' - ;; -sysv4.2uw2*) - symcode='[[DT]]' - ;; -sysv5* | sco5v6* | unixware* | OpenUNIX*) - symcode='[[ABDT]]' - ;; -sysv4) - symcode='[[DFNSTU]]' - ;; -esac - -# If we're using GNU nm, then use its standard symbol codes. -case `$NM -V 2>&1` in -*GNU* | *'with BFD'*) - symcode='[[ABCDGIRSTW]]' ;; -esac - -# Transform an extracted symbol line into a proper C declaration. -# Some systems (esp. on ia64) link data and code symbols differently, -# so use this general approach. -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'" - -# Handle CRLF in mingw tool chain -opt_cr= -case $build_os in -mingw*) - opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp - ;; -esac - -# Try without a prefix underscore, then with it. -for ac_symprfx in "" "_"; do - - # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol. - symxfrm="\\1 $ac_symprfx\\2 \\2" - - # Write the raw and C identifiers. - if test "$lt_cv_nm_interface" = "MS dumpbin"; then - # Fake it for dumpbin and say T for any non-static function - # and D for any global variable. - # Also find C++ and __fastcall symbols from MSVC++, - # which start with @ or ?. - lt_cv_sys_global_symbol_pipe="$AWK ['"\ -" {last_section=section; section=\$ 3};"\ -" /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ -" \$ 0!~/External *\|/{next};"\ -" / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ -" {if(hide[section]) next};"\ -" {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\ -" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\ -" s[1]~/^[@?]/{print s[1], s[1]; next};"\ -" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\ -" ' prfx=^$ac_symprfx]" - 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 - - rm -f conftest* - cat > conftest.$ac_ext <<_LT_EOF -#ifdef __cplusplus -extern "C" { -#endif -char nm_test_var; -void nm_test_func(void); -void nm_test_func(void){} -#ifdef __cplusplus -} -#endif -int main(){nm_test_var='a';nm_test_func();return(0);} -_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 - # Try sorting and uniquifying the output. - if sort "$nlist" | uniq > "$nlist"T; then - mv -f "$nlist"T "$nlist" - else - rm -f "$nlist"T - fi - - # Make sure that we snagged all the symbols we need. - 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 - -_LT_EOF - # Now generate the symbol file. - eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext' - - cat <<_LT_EOF >> conftest.$ac_ext - -/* The mapping between symbol names and symbols. */ -LT@&t@_DLSYM_CONST struct { - const char *name; - void *address; -} -lt__PROGRAM__LTX_preloaded_symbols[[]] = -{ - { "@PROGRAM@", (void *) 0 }, -_LT_EOF - $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext - cat <<\_LT_EOF >> conftest.$ac_ext - {0, (void *) 0} -}; - -/* This works around a problem in FreeBSD linker */ -#ifdef FREEBSD_WORKAROUND -static const void *lt_preloaded_setup() { - return lt__PROGRAM__LTX_preloaded_symbols; -} -#endif - -#ifdef __cplusplus -} -#endif -_LT_EOF - # Now try linking the two files. - mv conftest.$ac_objext conftstm.$ac_objext - 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_globsym_save_LIBS - CFLAGS=$lt_globsym_save_CFLAGS - else - echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD - fi - else - echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD - fi - else - echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD - fi - else - echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD - cat conftest.$ac_ext >&5 - fi - rm -rf conftest* conftst* - - # Do not use the global_symbol_pipe unless it works. - if test "$pipe_works" = yes; then - break - else - lt_cv_sys_global_symbol_pipe= - fi -done -]) -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 - AC_MSG_RESULT(failed) -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], - [Transform the output of nm in a proper C declaration]) -_LT_DECL([global_symbol_to_c_name_address], - [lt_cv_sys_global_symbol_to_c_name_address], [1], - [Transform the output of nm in a C name address pair]) -_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 - - -# _LT_COMPILER_PIC([TAGNAME]) -# --------------------------- -m4_defun([_LT_COMPILER_PIC], -[m4_require([_LT_TAG_COMPILER])dnl -_LT_TAGVAR(lt_prog_compiler_wl, $1)= -_LT_TAGVAR(lt_prog_compiler_pic, $1)= -_LT_TAGVAR(lt_prog_compiler_static, $1)= - -m4_if([$1], [CXX], [ - # C++ specific cases for pic, static, wl, etc. - if test "$GXX" = yes; then - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' - - case $host_os in - aix*) - # All AIX code is PIC. - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - fi - ;; - - amigaos*) - case $host_cpu in - powerpc) - # see comment about AmigaOS4 .so support - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - m68k) - # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' - ;; - esac - ;; - - beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; - 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). - # Although the cygwin gcc ignores -fPIC, still need this for old-style - # (--disable-auto-import) libraries - m4_if([$1], [GCJ], [], - [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) - ;; - darwin* | rhapsody*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' - ;; - *djgpp*) - # 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. - ;; - sysv4*MP*) - if test -d /usr/nec; then - _LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic - fi - ;; - 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 - # sets the default TLS model and affects inlining. - case $host_cpu in - hppa*64*) - ;; - *) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - esac - ;; - *qnx* | *nto*) - # QNX uses GNU C++, but need to define -shared option too, otherwise - # it will coredump. - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' - ;; - *) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - esac - else - case $host_os in - aix[[4-9]]*) - # All AIX code is PIC. - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - else - _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' - fi - ;; - chorus*) - case $cc_basename in - cxch68*) - # Green Hills C++ Compiler - # _LT_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a" - ;; - 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++*) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - ;; - ghcx*) - # Green Hills C++ Compiler - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - ;; - *) - ;; - esac - ;; - freebsd* | dragonfly*) - # FreeBSD uses GNU C++ - ;; - hpux9* | hpux10* | hpux11*) - case $cc_basename in - CC*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' - if test "$host_cpu" != ia64; then - _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' - fi - ;; - aCC*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' - case $host_cpu in - hppa*64*|ia64*) - # +Z the default - ;; - *) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' - ;; - esac - ;; - *) - ;; - esac - ;; - interix*) - # This is c89, which is MS Visual C++ (no shared libs) - # Anyone wants to do a port? - ;; - irix5* | irix6* | nonstopux*) - case $cc_basename in - CC*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - # CC pic flag -KPIC is the default. - ;; - *) - ;; - esac - ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) - case $cc_basename in - KCC*) - # KAI C++ Compiler - _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - ecpc* ) - # old Intel C++ for x86_64 which still supported -KPIC. - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' - ;; - icpc* ) - # Intel C++, used to be incompatible with GCC. - # ICC 10 doesn't accept -KPIC any more. - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' - ;; - pgCC* | pgcpp*) - # Portland Group C++ compiler - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - cxx*) - # Compaq C++ - # Make sure the PIC flag is empty. It appears that all Alpha - # Linux and Compaq Tru64 Unix objects are PIC. - _LT_TAGVAR(lt_prog_compiler_pic, $1)= - _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - 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' - ;; - *) - case `$CC -V 2>&1 | sed 5q` in - *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)='-Qoption ld ' - ;; - esac - ;; - esac - ;; - lynxos*) - ;; - m88k*) - ;; - mvs*) - case $cc_basename in - cxx*) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall' - ;; - *) - ;; - esac - ;; - netbsd*) - ;; - *qnx* | *nto*) - # QNX uses GNU C++, but need to define -shared option too, otherwise - # it will coredump. - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' - ;; - osf3* | osf4* | osf5*) - case $cc_basename in - KCC*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' - ;; - RCC*) - # Rational C++ 2.4.1 - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - ;; - cxx*) - # Digital/Compaq C++ - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - # Make sure the PIC flag is empty. It appears that all Alpha - # Linux and Compaq Tru64 Unix objects are PIC. - _LT_TAGVAR(lt_prog_compiler_pic, $1)= - _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - *) - ;; - esac - ;; - psos*) - ;; - solaris*) - case $cc_basename in - 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' - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' - ;; - gcx*) - # Green Hills C++ Compiler - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' - ;; - *) - ;; - esac - ;; - sunos4*) - case $cc_basename in - CC*) - # Sun C++ 4.x - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - lcc*) - # Lucid - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - ;; - *) - ;; - esac - ;; - sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) - case $cc_basename in - CC*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - esac - ;; - tandem*) - case $cc_basename in - NCC*) - # NonStop-UX NCC 3.20 - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - ;; - *) - ;; - esac - ;; - vxworks*) - ;; - *) - _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no - ;; - esac - fi -], -[ - if test "$GCC" = yes; then - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' - - case $host_os in - aix*) - # All AIX code is PIC. - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - fi - ;; - - amigaos*) - case $host_cpu in - powerpc) - # see comment about AmigaOS4 .so support - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - m68k) - # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' - ;; - esac - ;; - - beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; - - mingw* | cygwin* | pw32* | os2* | 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). - # Although the cygwin gcc ignores -fPIC, still need this for old-style - # (--disable-auto-import) libraries - m4_if([$1], [GCJ], [], - [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) - ;; - - darwin* | rhapsody*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - _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 - # sets the default TLS model and affects inlining. - case $host_cpu in - hppa*64*) - # +Z the default - ;; - *) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - esac - ;; - - interix[[3-9]]*) - # Interix 3.x gcc -fpic/-fPIC options generate broken code. - # Instead, we relocate shared libraries at runtime. - ;; - - msdosdjgpp*) - # Just because we use GCC doesn't mean we suddenly get shared libraries - # on systems that don't support them. - _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no - enable_shared=no - ;; - - *nto* | *qnx*) - # QNX uses GNU C++, but need to define -shared option too, otherwise - # it will coredump. - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' - ;; - - sysv4*MP*) - if test -d /usr/nec; then - _LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic - fi - ;; - - *) - _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 ' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Xcompiler -fPIC' - ;; - esac - else - # PORTME Check for flag to pass linker flags through the system compiler. - case $host_os in - aix*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - else - _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' - fi - ;; - - mingw* | cygwin* | pw32* | os2* | 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']) - ;; - - hpux9* | hpux10* | hpux11*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but - # not for PA HP-UX. - case $host_cpu in - hppa*64*|ia64*) - # +Z the default - ;; - *) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' - ;; - esac - # Is there a better lt_prog_compiler_static that works with the bundled CC? - _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' - ;; - - irix5* | irix6* | nonstopux*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - # PIC (with -KPIC) is the default. - _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - - linux* | k*bsd*-gnu | kopensolaris*-gnu) - case $cc_basename in - # old Intel for x86_64 which still supported -KPIC. - ecc*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' - ;; - # icc used to be incompatible with GCC. - # ICC 10 doesn't accept -KPIC any more. - icc* | ifort*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' - ;; - # Lahey Fortran 8.1. - lf95*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared' - _LT_TAGVAR(lt_prog_compiler_static, $1)='--static' - ;; - 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,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - ccc*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - # All Alpha code is PIC. - _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - 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\ F* | *Sun*Fortran*) - # 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\ 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,' - ;; - esac - ;; - esac - ;; - - newsos6) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - - *nto* | *qnx*) - # QNX uses GNU C++, but need to define -shared option too, otherwise - # it will coredump. - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' - ;; - - osf3* | osf4* | osf5*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - # All OSF/1 code is PIC. - _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - - rdos*) - _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - - solaris*) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - case $cc_basename in - f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; - *) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; - esac - ;; - - sunos4*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - - sysv4 | sysv4.2uw2* | sysv4.3*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - - sysv4*MP*) - if test -d /usr/nec ;then - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - fi - ;; - - sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - - unicos*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no - ;; - - uts4*) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - - *) - _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no - ;; - esac - fi -]) -case $host_os in - # For platforms which do not support PIC, -DPIC is meaningless: - *djgpp*) - _LT_TAGVAR(lt_prog_compiler_pic, $1)= - ;; - *) - _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_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. -# -if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then - _LT_COMPILER_OPTION([if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, $1) works], - [_LT_TAGVAR(lt_cv_prog_compiler_pic_works, $1)], - [$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])], [], - [case $_LT_TAGVAR(lt_prog_compiler_pic, $1) in - "" | " "*) ;; - *) _LT_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_TAGVAR(lt_prog_compiler_pic, $1)" ;; - esac], - [_LT_TAGVAR(lt_prog_compiler_pic, $1)= - _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no]) -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. -# -wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_TAGVAR(lt_prog_compiler_static, $1)\" -_LT_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], - _LT_TAGVAR(lt_cv_prog_compiler_static_works, $1), - $lt_tmp_static_flag, - [], - [_LT_TAGVAR(lt_prog_compiler_static, $1)=]) -_LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1], - [Compiler flag to prevent dynamic linking]) -])# _LT_COMPILER_PIC - - -# _LT_LINKER_SHLIBS([TAGNAME]) -# ---------------------------- -# See if the linker supports building shared libraries. -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 -m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl -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") || (\$ 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*) - case $cc_basename in - cl*) ;; - *) - _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 - ;; - *) - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - ;; - esac -], [ - runpath_var= - _LT_TAGVAR(allow_undefined_flag, $1)= - _LT_TAGVAR(always_export_symbols, $1)=no - _LT_TAGVAR(archive_cmds, $1)= - _LT_TAGVAR(archive_expsym_cmds, $1)= - _LT_TAGVAR(compiler_needs_object, $1)=no - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no - _LT_TAGVAR(export_dynamic_flag_spec, $1)= - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - _LT_TAGVAR(hardcode_automatic, $1)=no - _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 - _LT_TAGVAR(inherit_rpath, $1)=no - _LT_TAGVAR(link_all_deplibs, $1)=unknown - _LT_TAGVAR(module_cmds, $1)= - _LT_TAGVAR(module_expsym_cmds, $1)= - _LT_TAGVAR(old_archive_from_new_cmds, $1)= - _LT_TAGVAR(old_archive_from_expsyms_cmds, $1)= - _LT_TAGVAR(thread_safe_flag_spec, $1)= - _LT_TAGVAR(whole_archive_flag_spec, $1)= - # include_expsyms should be a list of space-separated symbols to be *always* - # included in the symbol list - _LT_TAGVAR(include_expsyms, $1)= - # exclude_expsyms can be an extended regexp of symbols to exclude - # it will be wrapped by ` (' and `)$', so one must not match beginning or - # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', - # as well as any symbol that contains `d'. - _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] - # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out - # platforms (ab)use it in PIC code, but their linkers get confused if - # the symbol is explicitly referenced. Since portable code cannot - # rely on this symbol name, it's probably fine to never include it in - # preloaded symbol tables. - # Exclude shared library initialization/finalization symbols. -dnl Note also adjust exclude_expsyms for C++ above. - extract_expsyms_cmds= - - case $host_os in - cygwin* | mingw* | pw32* | cegcc*) - # FIXME: the MSVC++ port hasn't been tested in a loooong time - # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. - if test "$GCC" != yes; then - with_gnu_ld=no - fi - ;; - interix*) - # we just hope/assume this is gcc and not c89 (= MSVC++) - with_gnu_ld=yes - ;; - openbsd*) - with_gnu_ld=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}' - - # Set some defaults for GNU ld with shared library support. These - # are reset later if shared libraries are not supported. Putting them - # here allows them to be overridden if necessary. - runpath_var=LD_RUN_PATH - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - # ancient GNU ld didn't support --whole-archive et. al. - if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then - _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - else - _LT_TAGVAR(whole_archive_flag_spec, $1)= - 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 ... - *\ 2.11.*) ;; # other 2.11 versions - *) supports_anon_versioning=yes ;; - esac - - # See if GNU ld supports shared libraries. - case $host_os in - aix[[3-9]]*) - # On AIX/PPC, the GNU linker is very broken - if test "$host_cpu" != ia64; then - _LT_TAGVAR(ld_shlibs, $1)=no - cat <<_LT_EOF 1>&2 - -*** 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 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 - ;; - - amigaos*) - case $host_cpu in - powerpc) - # see comment about AmigaOS4 .so support - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='' - ;; - m68k) - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(hardcode_minus_L, $1)=yes - ;; - esac - ;; - - beos*) - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - # Joseph Beckenbach says some releases of gcc - # support --undefined. This deserves some investigation. FIXME - _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - - 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(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/;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' - # 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 $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - else - _LT_TAGVAR(ld_shlibs, $1)=no - 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 - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. - # Instead, shared libraries are loaded at an image base (0x10000000 by - # default) and relocated if they conflict, which is a slow very memory - # consuming and fragmenting process. To avoid this, we pick a random, - # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link - # time. Moving up from 0x10000000 also allows more sbrk(2) space. - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - _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 | kopensolaris*-gnu) - tmp_diet=no - if test "$host_os" = linux-dietlibc; then - case $cc_basename in - diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn) - esac - fi - if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ - && test "$tmp_diet" = no - then - 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; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' - tmp_addflag=' $pic_flag' - ;; - 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' ;; - efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 - tmp_addflag=' -i_dynamic -nofor_main' ;; - ifc* | ifort*) # Intel Fortran compiler - tmp_addflag=' -nofor_main' ;; - lf95*) # Lahey Fortran 8.1 - _LT_TAGVAR(whole_archive_flag_spec, $1)= - tmp_sharedflag='--shared' ;; - 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; 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 - tmp_sharedflag='-G' ;; - esac - _LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$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~ - $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' - fi - - case $cc_basename in - 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 $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 $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' - fi - ;; - esac - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - - netbsd*) - 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 $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 - ;; - - solaris*) - if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then - _LT_TAGVAR(ld_shlibs, $1)=no - cat <<_LT_EOF 1>&2 - -*** Warning: The releases 2.8.* of the GNU linker cannot reliably -*** create shared libraries on Solaris systems. Therefore, libtool -*** is disabling shared libraries support. We urge you to upgrade GNU -*** binutils to release 2.9.1 or newer. Another option is to modify -*** your PATH or compiler configuration so that the native linker is -*** used, and then restart. - -_LT_EOF - elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _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 - ;; - - sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) - case `$LD -v 2>&1` in - *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) - _LT_TAGVAR(ld_shlibs, $1)=no - cat <<_LT_EOF 1>&2 - -*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not -*** reliably create shared libraries on SCO systems. Therefore, libtool -*** is disabling shared libraries support. We urge you to upgrade GNU -*** binutils to release 2.16.91.0.3 or newer. Another option is to modify -*** your PATH or compiler configuration so that the native linker is -*** used, and then restart. - -_LT_EOF - ;; - *) - # For security reasons, it is highly recommended that you always - # use absolute paths for naming shared libraries, and exclude the - # DT_RUNPATH tag from executables and libraries. But doing so - # requires that you compile everything twice, which is a pain. - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _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' - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - esac - ;; - - sunos4*) - _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' - wlarc= - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - *) - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _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 - ;; - esac - - if test "$_LT_TAGVAR(ld_shlibs, $1)" = no; then - runpath_var= - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= - _LT_TAGVAR(export_dynamic_flag_spec, $1)= - _LT_TAGVAR(whole_archive_flag_spec, $1)= - fi - else - # PORTME fill in a description of your system's linker (not GNU ld) - case $host_os in - aix3*) - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_TAGVAR(always_export_symbols, $1)=yes - _LT_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' - # Note: this linker hardcodes the directories in LIBPATH if there - # are no directories specified by -L. - _LT_TAGVAR(hardcode_minus_L, $1)=yes - if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then - # Neither direct hardcoding nor static linking is supported with a - # broken collect2. - _LT_TAGVAR(hardcode_direct, $1)=unsupported - fi - ;; - - aix[[4-9]]*) - if test "$host_cpu" = ia64; then - # On IA64, the linker does run time linking by default, so we don't - # have to do anything special. - aix_use_runtimelinking=no - exp_sym_flag='-Bexport' - no_entry_flag="" - 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") || (\$ 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 - aix_use_runtimelinking=no - - # Test if we are trying to use run time linking or normal - # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. - case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) - for ld_flag in $LDFLAGS; do - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then - aix_use_runtimelinking=yes - break - fi - done - ;; - esac - - exp_sym_flag='-bexport' - no_entry_flag='-bnoentry' - fi - - # When large executables or shared objects are built, AIX ld can - # have problems creating the table of contents. If linking a library - # or program results in "error TOC overflow" add -mminimal-toc to - # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not - # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. - - _LT_TAGVAR(archive_cmds, $1)='' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - _LT_TAGVAR(hardcode_libdir_separator, $1)=':' - _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(file_list_spec, $1)='${wl}-f,' - - if test "$GCC" = yes; then - case $host_os in aix4.[[012]]|aix4.[[012]].*) - # We only want to do this on AIX 4.2 and lower, the check - # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` - if test -f "$collect2name" && - strings "$collect2name" | $GREP resolve_lib_name >/dev/null - then - # We have reworked collect2 - : - else - # We have old collect2 - _LT_TAGVAR(hardcode_direct, $1)=unsupported - # It fails to find uninstalled libraries when the uninstalled - # path is not listed in the libpath. Setting hardcode_minus_L - # to unsupported forces relinking - _LT_TAGVAR(hardcode_minus_L, $1)=yes - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)= - fi - ;; - esac - shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' - fi - else - # not using gcc - if test "$host_cpu" = ia64; then - # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release - # chokes on -Wl,-G. The following line is correct: - shared_flag='-G' - else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='${wl}-G' - else - shared_flag='${wl}-bM:SRE' - fi - fi - fi - - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall' - # It seems that -bexpall does not export symbols beginning with - # underscore (_), so it is better to generate a list of symbols to export. - _LT_TAGVAR(always_export_symbols, $1)=yes - if test "$aix_use_runtimelinking" = yes; then - # Warning - without using the other runtime loading flags (-brtl), - # -berok will link without error, but may produce a broken library. - _LT_TAGVAR(allow_undefined_flag, $1)='-berok' - # Determine the default libpath from the value encoded in an - # empty executable. - _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 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' - _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs" - _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" - else - # Determine the default libpath from the value encoded in an - # empty executable. - _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' - 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' - fi - fi - ;; - - amigaos*) - case $host_cpu in - powerpc) - # see comment about AmigaOS4 .so support - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='' - ;; - m68k) - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(hardcode_minus_L, $1)=yes - ;; - esac - ;; - - bsdi[[45]]*) - _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic - ;; - - cygwin* | mingw* | pw32* | cegcc*) - # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. - 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(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*) - _LT_DARWIN_LINKER_FEATURES($1) - ;; - - dgux*) - _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _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 - # extra space). - freebsd2.2*) - _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - # Unfortunately, older versions of FreeBSD 2 do not have this feature. - 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 - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly*) - _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 - ;; - - hpux9*) - if test "$GCC" = yes; then - _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 - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_TAGVAR(hardcode_direct, $1)=yes - - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - _LT_TAGVAR(hardcode_minus_L, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - ;; - - hpux10*) - 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 - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - _LT_TAGVAR(hardcode_minus_L, $1)=yes - fi - ;; - - hpux11*) - 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 $pic_flag ${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}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - else - case $host_cpu in - hppa*64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -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 - if test "$with_gnu_ld" = no; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - - case $host_cpu in - hppa*64*|ia64*) - _LT_TAGVAR(hardcode_direct, $1)=no - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - *) - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - _LT_TAGVAR(hardcode_minus_L, $1)=yes - ;; - esac - fi - ;; - - irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then - _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. - # 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" && 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' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_TAGVAR(inherit_rpath, $1)=yes - _LT_TAGVAR(link_all_deplibs, $1)=yes - ;; - - netbsd*) - 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 - _LT_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF - fi - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - newsos6) - _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - *nto* | *qnx*) - ;; - - openbsd*) - if test -f /usr/libexec/ld.so; then - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - else - case $host_os in - openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*) - _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - ;; - *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - ;; - esac - fi - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - - os2*) - _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(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" && 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" && 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' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - ;; - - 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} $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" && 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 "-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' - fi - _LT_TAGVAR(archive_cmds_need_lc, $1)='no' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - ;; - - solaris*) - _LT_TAGVAR(no_undefined_flag, $1)=' -z defs' - if test "$GCC" = yes; then - wlarc='${wl}' - _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 $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"*) - wlarc='' - _LT_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' - ;; - *) - wlarc='${wl}' - _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h $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 -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' - ;; - esac - fi - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - case $host_os in - solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; - *) - # The compiler driver will combine and reorder linker options, - # but understands `-z linker_flag'. GCC discards it without `$wl', - # but is careful enough not to reorder. - # Supported since Solaris 2.6 (maybe 2.5.1?) - if test "$GCC" = yes; then - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' - else - _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' - fi - ;; - esac - _LT_TAGVAR(link_all_deplibs, $1)=yes - ;; - - sunos4*) - if test "x$host_vendor" = xsequent; then - # Use $CC to link under sequent, because it throws in some extra .o - # files that make .init and .fini sections work. - _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' - else - _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' - fi - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_minus_L, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - sysv4) - case $host_vendor in - sni) - _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_direct, $1)=yes # is this really true??? - ;; - siemens) - ## LD is ld it makes a PLAMLIB - ## CC just makes a GrossModule. - _LT_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs' - _LT_TAGVAR(hardcode_direct, $1)=no - ;; - motorola) - _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie - ;; - esac - runpath_var='LD_RUN_PATH' - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - sysv4.3*) - _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport' - ;; - - sysv4*MP*) - if test -d /usr/nec; then - _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - runpath_var=LD_RUN_PATH - hardcode_runpath_var=yes - _LT_TAGVAR(ld_shlibs, $1)=yes - fi - ;; - - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) - _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' - _LT_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - runpath_var='LD_RUN_PATH' - - if test "$GCC" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - else - _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' - fi - ;; - - sysv5* | sco3.2v5* | sco5v6*) - # Note: We can NOT use -z defs as we might desire, because we do not - # link with -lc, and that would cause any symbols used from libc to - # always be unresolved, which means just about no library would - # ever link correctly. If we're not using GNU ld we use -z text - # though, which does catch some bad symbols but isn't as heavy-handed - # as -z defs. - _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' - _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' - _LT_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=':' - _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' - runpath_var='LD_RUN_PATH' - - if test "$GCC" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - else - _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' - fi - ;; - - uts4*) - _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - *) - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - esac - - if test x$host_vendor = xsni; then - case $host in - sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Blargedynsym' - ;; - esac - fi - fi -]) -AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)]) -test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no - -_LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld - -_LT_DECL([], [libext], [0], [Old archive suffix (normally "a")])dnl -_LT_DECL([], [shrext_cmds], [1], [Shared library suffix (normally ".so")])dnl -_LT_DECL([], [extract_expsyms_cmds], [2], - [The commands to extract the exported symbol list from a shared archive]) - -# -# Do we need to explicitly link libc? -# -case "x$_LT_TAGVAR(archive_cmds_need_lc, $1)" in -x|xyes) - # Assume -lc should be added - _LT_TAGVAR(archive_cmds_need_lc, $1)=yes - - if test "$enable_shared" = yes && test "$GCC" = yes; then - case $_LT_TAGVAR(archive_cmds, $1) in - *'~'*) - # FIXME: we may have to deal with multi-command sequences. - ;; - '$CC '*) - # 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_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 - ;; -esac - -_LT_TAGDECL([build_libtool_need_lc], [archive_cmds_need_lc], [0], - [Whether or not to add -lc for building shared libraries]) -_LT_TAGDECL([allow_libtool_libs_with_static_runtimes], - [enable_shared_with_static_runtimes], [0], - [Whether or not to disallow shared libs when runtime libs are static]) -_LT_TAGDECL([], [export_dynamic_flag_spec], [1], - [Compiler flag to allow reflexive dlopens]) -_LT_TAGDECL([], [whole_archive_flag_spec], [1], - [Compiler flag to generate shared objects directly from archives]) -_LT_TAGDECL([], [compiler_needs_object], [1], - [Whether the compiler copes with passing no objects directly]) -_LT_TAGDECL([], [old_archive_from_new_cmds], [2], - [Create an old-style archive from a shared archive]) -_LT_TAGDECL([], [old_archive_from_expsyms_cmds], [2], - [Create a temporary old-style archive to link instead of a shared archive]) -_LT_TAGDECL([], [archive_cmds], [2], [Commands used to build a shared archive]) -_LT_TAGDECL([], [archive_expsym_cmds], [2]) -_LT_TAGDECL([], [module_cmds], [2], - [Commands used to build a loadable module if different from building - a shared archive.]) -_LT_TAGDECL([], [module_expsym_cmds], [2]) -_LT_TAGDECL([], [with_gnu_ld], [1], - [Whether we are building with GNU ld or not]) -_LT_TAGDECL([], [allow_undefined_flag], [1], - [Flag that allows shared libraries with undefined symbols to be built]) -_LT_TAGDECL([], [no_undefined_flag], [1], - [Flag that enforces no undefined symbols]) -_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], - [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes - DIR into the resulting binary]) -_LT_TAGDECL([], [hardcode_direct_absolute], [0], - [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes - DIR into the resulting binary and the resulting library dependency is - "absolute", i.e impossible to change by setting ${shlibpath_var} if the - library is relocated]) -_LT_TAGDECL([], [hardcode_minus_L], [0], - [Set to "yes" if using the -LDIR flag during linking hardcodes DIR - into the resulting binary]) -_LT_TAGDECL([], [hardcode_shlibpath_var], [0], - [Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR - into the resulting binary]) -_LT_TAGDECL([], [hardcode_automatic], [0], - [Set to "yes" if building a shared library automatically hardcodes DIR - into the library and all subsequent libraries and executables linked - against it]) -_LT_TAGDECL([], [inherit_rpath], [0], - [Set to yes if linker adds runtime paths of dependent libraries - to runtime path list]) -_LT_TAGDECL([], [link_all_deplibs], [0], - [Whether libtool must link a program against all its dependency libraries]) -_LT_TAGDECL([], [always_export_symbols], [0], - [Set to "yes" if exported symbols are required]) -_LT_TAGDECL([], [export_symbols_cmds], [2], - [The commands to list exported symbols]) -_LT_TAGDECL([], [exclude_expsyms], [1], - [Symbols that should not be listed in the preloaded symbols]) -_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 -dnl _LT_TAGDECL([], [thread_safe_flag_spec], [1], -dnl [Compiler flag to generate thread safe objects]) -])# _LT_LINKER_SHLIBS - - -# _LT_LANG_C_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_C_CONFIG], -[m4_require([_LT_DECL_EGREP])dnl -lt_save_CC="$CC" -AC_LANG_PUSH(C) - -# Source file extension for C test sources. -ac_ext=c - -# Object file extension for compiled C test sources. -objext=o -_LT_TAGVAR(objext, $1)=$objext - -# 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(){return(0);}' - -_LT_TAG_COMPILER -# Save the default compiler, since it gets overwritten when the other -# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP. -compiler_DEFAULT=$CC - -# save warnings/boilerplate of simple test code -_LT_COMPILER_BOILERPLATE -_LT_LINKER_BOILERPLATE - -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_SYS_DYNAMIC_LINKER($1) - _LT_LINKER_HARDCODE_LIBPATH($1) - LT_SYS_DLOPEN_SELF - _LT_CMD_STRIPLIB - - # Report which library types will actually be built - AC_MSG_CHECKING([if libtool supports shared libraries]) - AC_MSG_RESULT([$can_build_shared]) - - AC_MSG_CHECKING([whether to build shared libraries]) - test "$can_build_shared" = "no" && enable_shared=no - - # On AIX, shared libraries and static libraries use the same namespace, and - # are all built from PIC. - case $host_os in - aix3*) - test "$enable_shared" = yes && enable_static=no - if test -n "$RANLIB"; then - archive_cmds="$archive_cmds~\$RANLIB \$lib" - postinstall_cmds='$RANLIB $lib' - fi - ;; - - aix[[4-9]]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no - fi - ;; - esac - AC_MSG_RESULT([$enable_shared]) - - AC_MSG_CHECKING([whether to build static libraries]) - # Make sure either enable_shared or enable_static is yes. - test "$enable_shared" = yes || enable_static=yes - AC_MSG_RESULT([$enable_static]) - - _LT_CONFIG($1) -fi -AC_LANG_POP -CC="$lt_save_CC" -])# _LT_LANG_C_CONFIG - - -# _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], -[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 -_LT_TAGVAR(allow_undefined_flag, $1)= -_LT_TAGVAR(always_export_symbols, $1)=no -_LT_TAGVAR(archive_expsym_cmds, $1)= -_LT_TAGVAR(compiler_needs_object, $1)=no -_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 -_LT_TAGVAR(hardcode_automatic, $1)=no -_LT_TAGVAR(inherit_rpath, $1)=no -_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 - -# Source file extension for C++ test sources. -ac_ext=cpp - -# Object file extension for compiled C++ test sources. -objext=o -_LT_TAGVAR(objext, $1)=$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. - _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_LD=$LD - lt_save_GCC=$GCC - GCC=$GXX - lt_save_with_gnu_ld=$with_gnu_ld - lt_save_path_LD=$lt_cv_path_LD - if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then - lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx - else - $as_unset lt_cv_prog_gnu_ld - fi - if test -n "${lt_cv_path_LDCXX+set}"; then - lt_cv_path_LD=$lt_cv_path_LDCXX - else - $as_unset lt_cv_path_LD - fi - test -z "${LDCXX+set}" || LD=$LDCXX - CC=${CXX-"c++"} - CFLAGS=$CXXFLAGS - compiler=$CC - _LT_TAGVAR(compiler, $1)=$CC - _LT_CC_BASENAME([$compiler]) - - if test -n "$compiler"; then - # We don't want -fno-exception when compiling C++ code, so set the - # no_builtin_flag separately - if test "$GXX" = yes; then - _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' - else - _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= - fi - - if test "$GXX" = yes; then - # Set up default GNU C++ configuration - - LT_PATH_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 - _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' - - # If archive_cmds runs LD, not CC, wlarc should be empty - # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to - # investigate it a little bit more. (MM) - wlarc='${wl}' - - # ancient GNU ld didn't support --whole-archive et. al. - if eval "`$CC -print-prog-name=ld` --help 2>&1" | - $GREP 'no-whole-archive' > /dev/null; then - _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - else - _LT_TAGVAR(whole_archive_flag_spec, $1)= - fi - else - with_gnu_ld=no - wlarc= - - # A generic and very simple default shared library creation - # command for GNU C++ for the case where it uses the native - # linker, instead of GNU ld. If possible, this setting should - # overridden to take advantage of the native linker features on - # the platform it is being used on. - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $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 -v "^Configured with:" | $GREP "\-L"' - - else - GXX=no - with_gnu_ld=no - wlarc= - fi - - # PORTME: fill in a description of your system's C++ link characteristics - AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) - _LT_TAGVAR(ld_shlibs, $1)=yes - case $host_os in - aix3*) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - aix[[4-9]]*) - if test "$host_cpu" = ia64; then - # On IA64, the linker does run time linking by default, so we don't - # have to do anything special. - aix_use_runtimelinking=no - exp_sym_flag='-Bexport' - no_entry_flag="" - else - aix_use_runtimelinking=no - - # Test if we are trying to use run time linking or normal - # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. - case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) - for ld_flag in $LDFLAGS; do - case $ld_flag in - *-brtl*) - aix_use_runtimelinking=yes - break - ;; - esac - done - ;; - esac - - exp_sym_flag='-bexport' - no_entry_flag='-bnoentry' - fi - - # When large executables or shared objects are built, AIX ld can - # have problems creating the table of contents. If linking a library - # or program results in "error TOC overflow" add -mminimal-toc to - # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not - # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. - - _LT_TAGVAR(archive_cmds, $1)='' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - _LT_TAGVAR(hardcode_libdir_separator, $1)=':' - _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(file_list_spec, $1)='${wl}-f,' - - if test "$GXX" = yes; then - case $host_os in aix4.[[012]]|aix4.[[012]].*) - # We only want to do this on AIX 4.2 and lower, the check - # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` - if test -f "$collect2name" && - strings "$collect2name" | $GREP resolve_lib_name >/dev/null - then - # We have reworked collect2 - : - else - # We have old collect2 - _LT_TAGVAR(hardcode_direct, $1)=unsupported - # It fails to find uninstalled libraries when the uninstalled - # path is not listed in the libpath. Setting hardcode_minus_L - # to unsupported forces relinking - _LT_TAGVAR(hardcode_minus_L, $1)=yes - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)= - fi - esac - shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' - fi - else - # not using gcc - if test "$host_cpu" = ia64; then - # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release - # chokes on -Wl,-G. The following line is correct: - shared_flag='-G' - else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='${wl}-G' - else - shared_flag='${wl}-bM:SRE' - fi - fi - fi - - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall' - # It seems that -bexpall does not export symbols beginning with - # underscore (_), so it is better to generate a list of symbols to - # export. - _LT_TAGVAR(always_export_symbols, $1)=yes - if test "$aix_use_runtimelinking" = yes; then - # Warning - without using the other runtime loading flags (-brtl), - # -berok will link without error, but may produce a broken library. - _LT_TAGVAR(allow_undefined_flag, $1)='-berok' - # Determine the default libpath from the value encoded in an empty - # executable. - _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 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' - _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs" - _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" - else - # Determine the default libpath from the value encoded in an - # empty executable. - _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' - 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' - fi - fi - ;; - - beos*) - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - # Joseph Beckenbach says some releases of gcc - # support --undefined. This deserves some investigation. FIXME - _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - - chorus*) - case $cc_basename in - *) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - esac - ;; - - cygwin* | mingw* | pw32* | cegcc*) - 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) - ;; - - dgux*) - case $cc_basename in - ec++*) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - ghcx*) - # Green Hills C++ Compiler - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - *) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - esac - ;; - - freebsd[[12]]*) - # C++ shared libraries reported to be fairly broken before - # switch to ELF - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - - freebsd-elf*) - _LT_TAGVAR(archive_cmds_need_lc, $1)=no - ;; - - freebsd* | dragonfly*) - # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF - # conventions - _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*) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, - # but as the default - # location of the library. - - case $cc_basename in - CC*) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - aCC*) - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b ${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' - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # 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; func_echo_all "$list"' - ;; - *) - if test "$GXX" = yes; then - _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 - fi - ;; - esac - ;; - - hpux10*|hpux11*) - if test $with_gnu_ld = no; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - - case $host_cpu in - hppa*64*|ia64*) - ;; - *) - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - ;; - esac - fi - case $host_cpu in - hppa*64*|ia64*) - _LT_TAGVAR(hardcode_direct, $1)=no - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - *) - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, - # but as the default - # location of the library. - ;; - esac - - case $cc_basename in - CC*) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - aCC*) - case $host_cpu in - hppa*64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - ia64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - *) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - esac - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # 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; func_echo_all "$list"' - ;; - *) - if test "$GXX" = yes; then - if test $with_gnu_ld = no; then - case $host_cpu in - hppa*64*) - _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 $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 $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - esac - fi - else - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - esac - ;; - - interix[[3-9]]*) - _LT_TAGVAR(hardcode_direct, $1)=no - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. - # Instead, shared libraries are loaded at an image base (0x10000000 by - # default) and relocated if they conflict, which is a slow very memory - # consuming and fragmenting process. To avoid this, we pick a random, - # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link - # time. Moving up from 0x10000000 also allows more sbrk(2) space. - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - _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' - ;; - irix5* | irix6*) - 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" && 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 - # necessary to make sure instantiated templates are included - # in the archive. - _LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs' - ;; - *) - if test "$GXX" = yes; then - if test "$with_gnu_ld" = no; then - _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 $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 - ;; - esac - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_TAGVAR(inherit_rpath, $1)=yes - ;; - - linux* | k*bsd*-gnu | kopensolaris*-gnu) - case $cc_basename in - KCC*) - # Kuck and Associates, Inc. (KAI) C++ Compiler - - # KCC will only create a shared library if the output file - # ends with ".so" (or ".sl" for HP-UX), so rename the library - # to its proper name (with version) after linking. - _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # 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; func_echo_all "$list"' - - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - - # Archives containing C++ object files must be created using - # "CC -Bstatic", where "CC" is the KAI C++ compiler. - _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' - ;; - icpc* | ecpc* ) - # Intel C++ - with_gnu_ld=yes - # version 8.0 and above of icpc choke on multiply defined symbols - # if we add $predep_objects and $postdep_objects, however 7.1 and - # earlier do not add the objects themselves. - case `$CC -V 2>&1` in - *"Version 7."*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - ;; - *) # Version 8.0 or newer - tmp_idyn= - case $host_cpu in - ia64*) tmp_idyn=' -i_dynamic';; - esac - _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - ;; - esac - _LT_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' - ;; - pgCC* | pgcpp*) - # Portland Group C++ compiler - case `$CC -V` in - *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 | 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 | 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 | 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 | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' - ;; - *) # 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' - ;; - esac - - _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; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' - ;; - cxx*) - # Compaq C++ - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' - - runpath_var=LD_RUN_PATH - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # 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=`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* | 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' - _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$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~ - $CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' - fi - ;; - *) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C++ 5.9 - _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' - _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; 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='func_echo_all' - - # Archives containing C++ object files must be created using - # "CC -xar", where "CC" is the Sun C++ compiler. This is - # necessary to make sure instantiated templates are included - # in the archive. - _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' - ;; - esac - ;; - esac - ;; - - lynxos*) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - - m88k*) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - - mvs*) - case $cc_basename in - cxx*) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - *) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - esac - ;; - - netbsd*) - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' - wlarc= - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - fi - # Workaround some broken pre-1.5 toolchains - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' - ;; - - *nto* | *qnx*) - _LT_TAGVAR(ld_shlibs, $1)=yes - ;; - - openbsd2*) - # C++ shared libraries are fairly broken - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - - openbsd*) - if test -f /usr/libexec/ld.so; then - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' - _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=func_echo_all - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - - osf3* | osf4* | osf5*) - case $cc_basename in - KCC*) - # Kuck and Associates, Inc. (KAI) C++ Compiler - - # KCC will only create a shared library if the output file - # ends with ".so" (or ".sl" for HP-UX), so rename the library - # to its proper name (with version) after linking. - _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' - - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - - # Archives containing C++ object files must be created using - # the KAI C++ compiler. - case $host in - osf3*) _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ;; - *) _LT_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' ;; - esac - ;; - RCC*) - # Rational C++ 2.4.1 - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - cxx*) - 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" && 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" && 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 "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~ - $RM $lib.exp' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' - ;; - esac - - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # 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=`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" && 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 $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 - - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - - # 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 -v "^Configured with:" | $GREP "\-L"' - - else - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - esac - ;; - - psos*) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - - sunos4*) - case $cc_basename in - CC*) - # Sun C++ 4.x - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - lcc*) - # Lucid - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - *) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - esac - ;; - - solaris*) - case $cc_basename in - 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' - _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)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' - - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - case $host_os in - solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; - *) - # The compiler driver will combine and reorder linker options, - # but understands `-z linker_flag'. - # Supported since Solaris 2.6 (maybe 2.5.1?) - _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' - ;; - esac - _LT_TAGVAR(link_all_deplibs, $1)=yes - - 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 - # necessary to make sure instantiated templates are included - # in the archive. - _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' - ;; - gcx*) - # Green Hills C++ Compiler - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' - - # The C++ compiler must be used to create the archive. - _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs' - ;; - *) - # GNU C++ compiler with Solaris linker - 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 $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 $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 -v "^Configured with:" | $GREP "\-L"' - else - # g++ 2.7 appears to require `-G' NOT `-shared' on this - # platform. - _LT_TAGVAR(archive_cmds, $1)='$CC -G -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 -G -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 -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' - case $host_os in - solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; - *) - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' - ;; - esac - fi - ;; - esac - ;; - - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) - _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' - _LT_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - runpath_var='LD_RUN_PATH' - - case $cc_basename in - 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(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - ;; - - sysv5* | sco3.2v5* | sco5v6*) - # Note: We can NOT use -z defs as we might desire, because we do not - # link with -lc, and that would cause any symbols used from libc to - # always be unresolved, which means just about no library would - # ever link correctly. If we're not using GNU ld we use -z text - # though, which does catch some bad symbols but isn't as heavy-handed - # as -z defs. - _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' - _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' - _LT_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=':' - _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' - runpath_var='LD_RUN_PATH' - - case $cc_basename in - 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' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - ;; - - tandem*) - case $cc_basename in - NCC*) - # NonStop-UX NCC 3.20 - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - *) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - esac - ;; - - vxworks*) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - - *) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - esac - - AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)]) - test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no - - _LT_TAGVAR(GCC, $1)="$GXX" - _LT_TAGVAR(LD, $1)="$LD" - - ## 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... - _LT_SYS_HIDDEN_LIBDEPS($1) - _LT_COMPILER_PIC($1) - _LT_COMPILER_C_O($1) - _LT_COMPILER_FILE_LOCKS($1) - _LT_LINKER_SHLIBS($1) - _LT_SYS_DYNAMIC_LINKER($1) - _LT_LINKER_HARDCODE_LIBPATH($1) - - _LT_CONFIG($1) - fi # test -n "$compiler" - - 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 - -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 -# compiler output when linking a shared library. -# Parse the compiler output and extract the necessary -# 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)= -_LT_TAGVAR(predeps, $1)= -_LT_TAGVAR(postdeps, $1)= -_LT_TAGVAR(compiler_lib_search_path, $1)= - -dnl we can't use the lt_simple_compile_test_code here, -dnl because it contains code intended for an executable, -dnl not a library. It's possible we should let each -dnl tag define a new lt_????_link_test_code variable, -dnl but it's only used here... -m4_if([$1], [], [cat > conftest.$ac_ext <<_LT_EOF -int a; -void foo (void) { a = 0; } -_LT_EOF -], [$1], [CXX], [cat > conftest.$ac_ext <<_LT_EOF -class Foo -{ -public: - Foo (void) { a = 0; } -private: - int a; -}; -_LT_EOF -], [$1], [F77], [cat > conftest.$ac_ext <<_LT_EOF - subroutine foo - implicit none - integer*4 a - a=0 - return - end -_LT_EOF -], [$1], [FC], [cat > conftest.$ac_ext <<_LT_EOF - subroutine foo - implicit none - integer a - a=0 - return - end -_LT_EOF -], [$1], [GCJ], [cat > conftest.$ac_ext <<_LT_EOF -public class foo { - private int a; - public void bar (void) { - a = 0; - } -}; -_LT_EOF -]) - -_lt_libdeps_save_CFLAGS=$CFLAGS -case "$CC $CFLAGS " in #( -*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; -*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; -esac - -dnl Parse the compiler output and extract the necessary -dnl objects, libraries and library flags. -if AC_TRY_EVAL(ac_compile); then - # Parse the compiler output and extract the necessary - # objects, libraries and library flags. - - # Sentinel used to keep track of whether or not we are before - # the conftest object file. - pre_test_object_deps_done=no - - for p in `eval "$output_verbose_link_cmd"`; do - case ${prev}${p} in - - -L* | -R* | -l*) - # Some compilers place space between "-{L,R}" and the path. - # Remove the space. - if test $p = "-L" || - test $p = "-R"; then - prev=$p - continue - 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 ${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. - if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then - _LT_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}" - else - _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}" - fi - ;; - # The "-l" case would never come before the object being - # linked, so don't bother handling this case. - esac - else - if test -z "$_LT_TAGVAR(postdeps, $1)"; then - _LT_TAGVAR(postdeps, $1)="${prev}${p}" - else - _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. - if test "$p" = "conftest.$objext"; then - pre_test_object_deps_done=yes - continue - fi - - if test "$pre_test_object_deps_done" = no; then - if test -z "$_LT_TAGVAR(predep_objects, $1)"; then - _LT_TAGVAR(predep_objects, $1)="$p" - else - _LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p" - fi - else - if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then - _LT_TAGVAR(postdep_objects, $1)="$p" - else - _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p" - fi - fi - ;; - - *) ;; # Ignore the rest. - - esac - done - - # Clean up. - rm -f a.out a.exe -else - echo "libtool.m4: error: problem compiling $1 test program" -fi - -$RM -f confest.$objext -CFLAGS=$_lt_libdeps_save_CFLAGS - -# PORTME: override above test on systems where it is broken -m4_if([$1], [CXX], -[case $host_os in -interix[[3-9]]*) - # Interix 3.5 installs completely hosed .la files for C++, so rather than - # hack all around it, let's just trust "g++" to DTRT. - _LT_TAGVAR(predep_objects,$1)= - _LT_TAGVAR(postdep_objects,$1)= - _LT_TAGVAR(postdeps,$1)= - ;; - -linux*) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C++ 5.9 - - # The more standards-conforming stlport4 library is - # incompatible with the Cstd library. Avoid specifying - # it if it's in CXXFLAGS. Ignore libCrun as - # -library=stlport4 depends on it. - case " $CXX $CXXFLAGS " in - *" -library=stlport4 "*) - solaris_use_stlport4=yes - ;; - esac - - if test "$solaris_use_stlport4" != yes; then - _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' - fi - ;; - esac - ;; - -solaris*) - case $cc_basename in - 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 - # -library=stlport4 depends on it. - case " $CXX $CXXFLAGS " in - *" -library=stlport4 "*) - solaris_use_stlport4=yes - ;; - esac - - # Adding this requires a known-good setup of shared libraries for - # Sun compiler versions before 5.6, else PIC objects from an old - # archive will be linked into the output, leading to subtle bugs. - if test "$solaris_use_stlport4" != yes; then - _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' - fi - ;; - esac - ;; -esac -]) - -case " $_LT_TAGVAR(postdeps, $1) " in -*" -lc "*) _LT_TAGVAR(archive_cmds_need_lc, $1)=no ;; -esac - _LT_TAGVAR(compiler_lib_search_dirs, $1)= -if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then - _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'` -fi -_LT_TAGDECL([], [compiler_lib_search_dirs], [1], - [The directories searched by this compiler when creating a shared library]) -_LT_TAGDECL([], [predep_objects], [1], - [Dependencies to place before and after the objects being linked to - create a shared library]) -_LT_TAGDECL([], [postdep_objects], [1]) -_LT_TAGDECL([], [predeps], [1]) -_LT_TAGDECL([], [postdeps], [1]) -_LT_TAGDECL([], [compiler_lib_search_path], [1], - [The library search path used internally by the compiler when linking - a shared library]) -])# _LT_SYS_HIDDEN_LIBDEPS - - -# _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_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)= -_LT_TAGVAR(always_export_symbols, $1)=no -_LT_TAGVAR(archive_expsym_cmds, $1)= -_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 -_LT_TAGVAR(inherit_rpath, $1)=no -_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 - -# Source file extension for f77 test sources. -ac_ext=f - -# Object file extension for compiled f77 test sources. -objext=o -_LT_TAGVAR(objext, $1)=$objext - -# No sense in running all these tests if we already determined that -# the F77 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_disable_F77" != yes; then - # Code to be used in simple compile tests - lt_simple_compile_test_code="\ - subroutine t - return - end -" - - # Code to be used in simple link tests - lt_simple_link_test_code="\ - program t - end -" - - # 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_GCC=$GCC - lt_save_CFLAGS=$CFLAGS - CC=${F77-"f77"} - CFLAGS=$FFLAGS - compiler=$CC - _LT_TAGVAR(compiler, $1)=$CC - _LT_CC_BASENAME([$compiler]) - GCC=$G77 - if test -n "$compiler"; then - AC_MSG_CHECKING([if libtool supports shared libraries]) - AC_MSG_RESULT([$can_build_shared]) - - AC_MSG_CHECKING([whether to build shared libraries]) - test "$can_build_shared" = "no" && enable_shared=no - - # On AIX, shared libraries and static libraries use the same namespace, and - # are all built from PIC. - case $host_os in - aix3*) - test "$enable_shared" = yes && enable_static=no - if test -n "$RANLIB"; then - archive_cmds="$archive_cmds~\$RANLIB \$lib" - postinstall_cmds='$RANLIB $lib' - fi - ;; - aix[[4-9]]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no - fi - ;; - esac - AC_MSG_RESULT([$enable_shared]) - - AC_MSG_CHECKING([whether to build static libraries]) - # Make sure either enable_shared or enable_static is yes. - test "$enable_shared" = yes || enable_static=yes - AC_MSG_RESULT([$enable_static]) - - _LT_TAGVAR(GCC, $1)="$G77" - _LT_TAGVAR(LD, $1)="$LD" - - ## 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... - _LT_COMPILER_PIC($1) - _LT_COMPILER_C_O($1) - _LT_COMPILER_FILE_LOCKS($1) - _LT_LINKER_SHLIBS($1) - _LT_SYS_DYNAMIC_LINKER($1) - _LT_LINKER_HARDCODE_LIBPATH($1) - - _LT_CONFIG($1) - fi # test -n "$compiler" - - 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_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_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)= -_LT_TAGVAR(always_export_symbols, $1)=no -_LT_TAGVAR(archive_expsym_cmds, $1)= -_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 -_LT_TAGVAR(inherit_rpath, $1)=no -_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 - -# Source file extension for fc test sources. -ac_ext=${ac_fc_srcext-f} - -# Object file extension for compiled fc test sources. -objext=o -_LT_TAGVAR(objext, $1)=$objext - -# No sense in running all these tests if we already determined that -# the FC 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_disable_FC" != yes; then - # Code to be used in simple compile tests - lt_simple_compile_test_code="\ - subroutine t - return - end -" - - # Code to be used in simple link tests - lt_simple_link_test_code="\ - program t - end -" - - # 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_GCC=$GCC - lt_save_CFLAGS=$CFLAGS - CC=${FC-"f95"} - CFLAGS=$FCFLAGS - compiler=$CC - GCC=$ac_cv_fc_compiler_gnu - - _LT_TAGVAR(compiler, $1)=$CC - _LT_CC_BASENAME([$compiler]) - - if test -n "$compiler"; then - AC_MSG_CHECKING([if libtool supports shared libraries]) - AC_MSG_RESULT([$can_build_shared]) - - AC_MSG_CHECKING([whether to build shared libraries]) - test "$can_build_shared" = "no" && enable_shared=no - - # On AIX, shared libraries and static libraries use the same namespace, and - # are all built from PIC. - case $host_os in - aix3*) - test "$enable_shared" = yes && enable_static=no - if test -n "$RANLIB"; then - archive_cmds="$archive_cmds~\$RANLIB \$lib" - postinstall_cmds='$RANLIB $lib' - fi - ;; - aix[[4-9]]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no - fi - ;; - esac - AC_MSG_RESULT([$enable_shared]) - - AC_MSG_CHECKING([whether to build static libraries]) - # Make sure either enable_shared or enable_static is yes. - test "$enable_shared" = yes || enable_static=yes - AC_MSG_RESULT([$enable_static]) - - _LT_TAGVAR(GCC, $1)="$ac_cv_fc_compiler_gnu" - _LT_TAGVAR(LD, $1)="$LD" - - ## 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... - _LT_SYS_HIDDEN_LIBDEPS($1) - _LT_COMPILER_PIC($1) - _LT_COMPILER_C_O($1) - _LT_COMPILER_FILE_LOCKS($1) - _LT_LINKER_SHLIBS($1) - _LT_SYS_DYNAMIC_LINKER($1) - _LT_LINKER_HARDCODE_LIBPATH($1) - - _LT_CONFIG($1) - fi # test -n "$compiler" - - GCC=$lt_save_GCC - CC=$lt_save_CC - CFLAGS=$lt_save_CFLAGS -fi # test "$_lt_disable_FC" != yes - -AC_LANG_POP -])# _LT_LANG_FC_CONFIG - - -# _LT_LANG_GCJ_CONFIG([TAG]) -# -------------------------- -# Ensure that the configuration variables for the GNU Java Compiler compiler -# are suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to `libtool'. -m4_defun([_LT_LANG_GCJ_CONFIG], -[AC_REQUIRE([LT_PROG_GCJ])dnl -AC_LANG_SAVE - -# Source file extension for Java test sources. -ac_ext=java - -# Object file extension for compiled Java test sources. -objext=o -_LT_TAGVAR(objext, $1)=$objext - -# Code to be used in simple compile tests -lt_simple_compile_test_code="class foo {}" - -# Code to be used in simple link tests -lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }' - -# 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=${GCJ-"gcj"} -CFLAGS=$GCJFLAGS -compiler=$CC -_LT_TAGVAR(compiler, $1)=$CC -_LT_TAGVAR(LD, $1)="$LD" -_LT_CC_BASENAME([$compiler]) - -# GCJ 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 - -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_GCJ_CONFIG - - -# _LT_LANG_RC_CONFIG([TAG]) -# ------------------------- -# Ensure that the configuration variables for the Windows resource compiler -# are suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to `libtool'. -m4_defun([_LT_LANG_RC_CONFIG], -[AC_REQUIRE([LT_PROG_RC])dnl -AC_LANG_SAVE - -# Source file extension for RC test sources. -ac_ext=rc - -# Object file extension for compiled RC test sources. -objext=o -_LT_TAGVAR(objext, $1)=$objext - -# Code to be used in simple compile tests -lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }' - -# Code to be used in simple link tests -lt_simple_link_test_code="$lt_simple_compile_test_code" - -# 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= -CC=${RC-"windres"} -CFLAGS= -compiler=$CC -_LT_TAGVAR(compiler, $1)=$CC -_LT_CC_BASENAME([$compiler]) -_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes - -if test -n "$compiler"; then - : - _LT_CONFIG($1) -fi - -GCC=$lt_save_GCC -AC_LANG_RESTORE -CC=$lt_save_CC -CFLAGS=$lt_save_CFLAGS -])# _LT_LANG_RC_CONFIG - - -# LT_PROG_GCJ -# ----------- -AC_DEFUN([LT_PROG_GCJ], -[m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ], - [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ], - [AC_CHECK_TOOL(GCJ, gcj,) - test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2" - AC_SUBST(GCJFLAGS)])])[]dnl -]) - -# Old name: -AU_ALIAS([LT_AC_PROG_GCJ], [LT_PROG_GCJ]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([LT_AC_PROG_GCJ], []) - - -# LT_PROG_RC -# ---------- -AC_DEFUN([LT_PROG_RC], -[AC_CHECK_TOOL(RC, windres,) -]) - -# Old name: -AU_ALIAS([LT_AC_PROG_RC], [LT_PROG_RC]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([LT_AC_PROG_RC], []) - - -# _LT_DECL_EGREP -# -------------- -# If we don't have a new enough Autoconf to choose the best grep -# available, choose the one first in the user's PATH. -m4_defun([_LT_DECL_EGREP], -[AC_REQUIRE([AC_PROG_EGREP])dnl -AC_REQUIRE([AC_PROG_FGREP])dnl -test -z "$GREP" && GREP=grep -_LT_DECL([], [GREP], [1], [A grep program that handles long lines]) -_LT_DECL([], [EGREP], [1], [An ERE matcher]) -_LT_DECL([], [FGREP], [1], [A literal string matcher]) -dnl Non-bleeding-edge autoconf doesn't subst GREP, so do it here too -AC_SUBST([GREP]) -]) - - -# _LT_DECL_OBJDUMP -# -------------- -# If we don't have a new enough Autoconf to choose the best objdump -# available, choose the one first in the user's PATH. -m4_defun([_LT_DECL_OBJDUMP], -[AC_CHECK_TOOL(OBJDUMP, objdump, false) -test -z "$OBJDUMP" && OBJDUMP=objdump -_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 -# ------------ -# Check for a fully-functional sed program, that truncates -# as few characters as possible. Prefer GNU sed if found. -m4_defun([_LT_DECL_SED], -[AC_PROG_SED -test -z "$SED" && SED=sed -Xsed="$SED -e 1s/^X//" -_LT_DECL([], [SED], [1], [A sed program that does not truncate output]) -_LT_DECL([], [Xsed], ["\$SED -e 1s/^X//"], - [Sed that helps us avoid accidentally triggering echo(1) options like -n]) -])# _LT_DECL_SED - -m4_ifndef([AC_PROG_SED], [ -# NOTE: This macro has been submitted for inclusion into # -# GNU Autoconf as AC_PROG_SED. When it is available in # -# a released version of Autoconf we should remove this # -# macro and use it instead. # - -m4_defun([AC_PROG_SED], -[AC_MSG_CHECKING([for a sed that does not truncate output]) -AC_CACHE_VAL(lt_cv_path_SED, -[# Loop through the user's path and test for sed and gsed. -# Then use that list of sed's as ones to test for truncation. -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for lt_ac_prog in sed gsed; do - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then - lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext" - fi - done - done -done -IFS=$as_save_IFS -lt_ac_max=0 -lt_ac_count=0 -# Add /usr/xpg4/bin/sed as it is typically found on Solaris -# along with /bin/sed that truncates output. -for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do - test ! -f $lt_ac_sed && continue - cat /dev/null > conftest.in - lt_ac_count=0 - echo $ECHO_N "0123456789$ECHO_C" >conftest.in - # Check for GNU sed and select it if it is found. - if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then - lt_cv_path_SED=$lt_ac_sed - break - fi - while true; do - cat conftest.in conftest.in >conftest.tmp - mv conftest.tmp conftest.in - cp conftest.in conftest.nl - echo >>conftest.nl - $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break - cmp -s conftest.out conftest.nl || break - # 10000 chars as input seems more than enough - test $lt_ac_count -gt 10 && break - lt_ac_count=`expr $lt_ac_count + 1` - if test $lt_ac_count -gt $lt_ac_max; then - lt_ac_max=$lt_ac_count - lt_cv_path_SED=$lt_ac_sed - fi - done -done -]) -SED=$lt_cv_path_SED -AC_SUBST([SED]) -AC_MSG_RESULT([$SED]) -])#AC_PROG_SED -])#m4_ifndef - -# Old name: -AU_ALIAS([LT_AC_PROG_SED], [AC_PROG_SED]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([LT_AC_PROG_SED], []) - - -# _LT_CHECK_SHELL_FEATURES -# ------------------------ -# Find out whether the shell is Bourne or XSI compatible, -# or has some other useful features. -m4_defun([_LT_CHECK_SHELL_FEATURES], -[AC_MSG_CHECKING([whether the shell understands some XSI constructs]) -# Try some XSI features -xsi_shell=no -( _lt_dummy="a/b/c" - 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 -AC_MSG_RESULT([$xsi_shell]) -_LT_CONFIG_LIBTOOL_INIT([xsi_shell='$xsi_shell']) - -AC_MSG_CHECKING([whether the shell understands "+="]) -lt_shell_append=no -( foo=bar; set foo baz; eval "$[1]+=\$[2]" && test "$foo" = barbaz ) \ - >/dev/null 2>&1 \ - && lt_shell_append=yes -AC_MSG_RESULT([$lt_shell_append]) -_LT_CONFIG_LIBTOOL_INIT([lt_shell_append='$lt_shell_append']) - -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then - lt_unset=unset -else - lt_unset=false -fi -_LT_DECL([], [lt_unset], [0], [whether the shell understands "unset"])dnl - -# test EBCDIC or ASCII -case `echo X|tr X '\101'` in - A) # ASCII based system - # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr - lt_SP2NL='tr \040 \012' - lt_NL2SP='tr \015\012 \040\040' - ;; - *) # EBCDIC based system - lt_SP2NL='tr \100 \n' - lt_NL2SP='tr \r\n \100\100' - ;; -esac -_LT_DECL([SP2NL], [lt_SP2NL], [1], [turn spaces into newlines])dnl -_LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl -])# _LT_CHECK_SHELL_FEATURES - - -# _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=: -]) - - -# _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##*/}"]) - - _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_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl - func_split_long_opt_name=${1%%=*} - func_split_long_opt_arg=${1#*=}]) - - _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"}]) - - _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl - case ${1} in - *.lo) func_lo2o_result=${1%.lo}.${objext} ;; - *) func_lo2o_result=${1} ;; - esac]) - - _LT_PROG_FUNCTION_REPLACE([func_xform], [ func_xform_result=${1%.*}.lo]) - - _LT_PROG_FUNCTION_REPLACE([func_arith], [ func_arith_result=$(( $[*] ))]) - - _LT_PROG_FUNCTION_REPLACE([func_len], [ func_len_result=${#1}]) -fi - -if test x"$lt_shell_append" = xyes; then - _LT_PROG_FUNCTION_REPLACE([func_append], [ eval "${1}+=\\${2}"]) - - _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"]) - - # 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 - AC_MSG_WARN([Unable to substitute extended shell functions in $ofile]) -fi -]) - -# _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 - ;; - *-*-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 -]) -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 - -# Helper functions for option handling. -*- Autoconf -*- -# -# 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 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])]) - - -# _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME) -# ------------------------------------------ -m4_define([_LT_MANGLE_OPTION], -[[_LT_OPTION_]m4_bpatsubst($1__$2, [[^a-zA-Z0-9_]], [_])]) - - -# _LT_SET_OPTION(MACRO-NAME, OPTION-NAME) -# --------------------------------------- -# Set option OPTION-NAME for macro MACRO-NAME, and if there is a -# matching handler defined, dispatch to it. Other OPTION-NAMEs are -# saved as a flag. -m4_define([_LT_SET_OPTION], -[m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl -m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]), - _LT_MANGLE_DEFUN([$1], [$2]), - [m4_warning([Unknown $1 option `$2'])])[]dnl -]) - - -# _LT_IF_OPTION(MACRO-NAME, OPTION-NAME, IF-SET, [IF-NOT-SET]) -# ------------------------------------------------------------ -# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. -m4_define([_LT_IF_OPTION], -[m4_ifdef(_LT_MANGLE_OPTION([$1], [$2]), [$3], [$4])]) - - -# _LT_UNLESS_OPTIONS(MACRO-NAME, OPTION-LIST, IF-NOT-SET) -# ------------------------------------------------------- -# Execute IF-NOT-SET unless all options in OPTION-LIST for MACRO-NAME -# are set. -m4_define([_LT_UNLESS_OPTIONS], -[m4_foreach([_LT_Option], m4_split(m4_normalize([$2])), - [m4_ifdef(_LT_MANGLE_OPTION([$1], _LT_Option), - [m4_define([$0_found])])])[]dnl -m4_ifdef([$0_found], [m4_undefine([$0_found])], [$3 -])[]dnl -]) - - -# _LT_SET_OPTIONS(MACRO-NAME, OPTION-LIST) -# ---------------------------------------- -# OPTION-LIST is a space-separated list of Libtool options associated -# with MACRO-NAME. If any OPTION has a matching handler declared with -# LT_OPTION_DEFINE, dispatch to that macro; otherwise complain about -# the unknown option and exit. -m4_defun([_LT_SET_OPTIONS], -[# Set options -m4_foreach([_LT_Option], m4_split(m4_normalize([$2])), - [_LT_SET_OPTION([$1], _LT_Option)]) - -m4_if([$1],[LT_INIT],[ - dnl - dnl Simply set some default values (i.e off) if boolean options were not - dnl specified: - _LT_UNLESS_OPTIONS([LT_INIT], [dlopen], [enable_dlopen=no - ]) - _LT_UNLESS_OPTIONS([LT_INIT], [win32-dll], [enable_win32_dll=no - ]) - dnl - dnl If no reference was made to various pairs of opposing options, then - dnl we run the default mode handler for the pair. For example, if neither - dnl `shared' nor `disable-shared' was passed, we enable building of shared - dnl archives by default: - _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED]) - _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC]) - _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC]) - _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install], - [_LT_ENABLE_FAST_INSTALL]) - ]) -])# _LT_SET_OPTIONS - - - -# _LT_MANGLE_DEFUN(MACRO-NAME, OPTION-NAME) -# ----------------------------------------- -m4_define([_LT_MANGLE_DEFUN], -[[_LT_OPTION_DEFUN_]m4_bpatsubst(m4_toupper([$1__$2]), [[^A-Z0-9_]], [_])]) - - -# LT_OPTION_DEFINE(MACRO-NAME, OPTION-NAME, CODE) -# ----------------------------------------------- -m4_define([LT_OPTION_DEFINE], -[m4_define(_LT_MANGLE_DEFUN([$1], [$2]), [$3])[]dnl -])# LT_OPTION_DEFINE - - -# dlopen -# ------ -LT_OPTION_DEFINE([LT_INIT], [dlopen], [enable_dlopen=yes -]) - -AU_DEFUN([AC_LIBTOOL_DLOPEN], -[_LT_SET_OPTION([LT_INIT], [dlopen]) -AC_DIAGNOSE([obsolete], -[$0: Remove this warning and the call to _LT_SET_OPTION when you -put the `dlopen' option into LT_INIT's first parameter.]) -]) - -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LIBTOOL_DLOPEN], []) - - -# win32-dll -# --------- -# Declare package support for building win32 dll's. -LT_OPTION_DEFINE([LT_INIT], [win32-dll], -[enable_win32_dll=yes - -case $host in -*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*) - AC_CHECK_TOOL(AS, as, false) - AC_CHECK_TOOL(DLLTOOL, dlltool, false) - AC_CHECK_TOOL(OBJDUMP, objdump, false) - ;; -esac - -test -z "$AS" && AS=as -_LT_DECL([], [AS], [1], [Assembler program])dnl - -test -z "$DLLTOOL" && DLLTOOL=dlltool -_LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl - -test -z "$OBJDUMP" && OBJDUMP=objdump -_LT_DECL([], [OBJDUMP], [1], [Object dumper program])dnl -])# win32-dll - -AU_DEFUN([AC_LIBTOOL_WIN32_DLL], -[AC_REQUIRE([AC_CANONICAL_HOST])dnl -_LT_SET_OPTION([LT_INIT], [win32-dll]) -AC_DIAGNOSE([obsolete], -[$0: Remove this warning and the call to _LT_SET_OPTION when you -put the `win32-dll' option into LT_INIT's first parameter.]) -]) - -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], []) - - -# _LT_ENABLE_SHARED([DEFAULT]) -# ---------------------------- -# implement the --enable-shared flag, and supports the `shared' and -# `disable-shared' LT_INIT options. -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. -m4_define([_LT_ENABLE_SHARED], -[m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl -AC_ARG_ENABLE([shared], - [AS_HELP_STRING([--enable-shared@<:@=PKGS@:>@], - [build shared libraries @<:@default=]_LT_ENABLE_SHARED_DEFAULT[@:>@])], - [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], - [enable_shared=]_LT_ENABLE_SHARED_DEFAULT) - - _LT_DECL([build_libtool_libs], [enable_shared], [0], - [Whether or not to build shared libraries]) -])# _LT_ENABLE_SHARED - -LT_OPTION_DEFINE([LT_INIT], [shared], [_LT_ENABLE_SHARED([yes])]) -LT_OPTION_DEFINE([LT_INIT], [disable-shared], [_LT_ENABLE_SHARED([no])]) - -# Old names: -AC_DEFUN([AC_ENABLE_SHARED], -[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared]) -]) - -AC_DEFUN([AC_DISABLE_SHARED], -[_LT_SET_OPTION([LT_INIT], [disable-shared]) -]) - -AU_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)]) -AU_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)]) - -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AM_ENABLE_SHARED], []) -dnl AC_DEFUN([AM_DISABLE_SHARED], []) - - - -# _LT_ENABLE_STATIC([DEFAULT]) -# ---------------------------- -# implement the --enable-static flag, and support the `static' and -# `disable-static' LT_INIT options. -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. -m4_define([_LT_ENABLE_STATIC], -[m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl -AC_ARG_ENABLE([static], - [AS_HELP_STRING([--enable-static@<:@=PKGS@:>@], - [build static libraries @<:@default=]_LT_ENABLE_STATIC_DEFAULT[@:>@])], - [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], - [enable_static=]_LT_ENABLE_STATIC_DEFAULT) - - _LT_DECL([build_old_libs], [enable_static], [0], - [Whether or not to build static libraries]) -])# _LT_ENABLE_STATIC - -LT_OPTION_DEFINE([LT_INIT], [static], [_LT_ENABLE_STATIC([yes])]) -LT_OPTION_DEFINE([LT_INIT], [disable-static], [_LT_ENABLE_STATIC([no])]) - -# Old names: -AC_DEFUN([AC_ENABLE_STATIC], -[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static]) -]) - -AC_DEFUN([AC_DISABLE_STATIC], -[_LT_SET_OPTION([LT_INIT], [disable-static]) -]) - -AU_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)]) -AU_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)]) - -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AM_ENABLE_STATIC], []) -dnl AC_DEFUN([AM_DISABLE_STATIC], []) - - - -# _LT_ENABLE_FAST_INSTALL([DEFAULT]) -# ---------------------------------- -# implement the --enable-fast-install flag, and support the `fast-install' -# and `disable-fast-install' LT_INIT options. -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. -m4_define([_LT_ENABLE_FAST_INSTALL], -[m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl -AC_ARG_ENABLE([fast-install], - [AS_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@], - [optimize for fast installation @<:@default=]_LT_ENABLE_FAST_INSTALL_DEFAULT[@:>@])], - [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], - [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT) - -_LT_DECL([fast_install], [enable_fast_install], [0], - [Whether or not to optimize for fast installation])dnl -])# _LT_ENABLE_FAST_INSTALL - -LT_OPTION_DEFINE([LT_INIT], [fast-install], [_LT_ENABLE_FAST_INSTALL([yes])]) -LT_OPTION_DEFINE([LT_INIT], [disable-fast-install], [_LT_ENABLE_FAST_INSTALL([no])]) - -# Old names: -AU_DEFUN([AC_ENABLE_FAST_INSTALL], -[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install]) -AC_DIAGNOSE([obsolete], -[$0: Remove this warning and the call to _LT_SET_OPTION when you put -the `fast-install' option into LT_INIT's first parameter.]) -]) - -AU_DEFUN([AC_DISABLE_FAST_INSTALL], -[_LT_SET_OPTION([LT_INIT], [disable-fast-install]) -AC_DIAGNOSE([obsolete], -[$0: Remove this warning and the call to _LT_SET_OPTION when you put -the `disable-fast-install' option into LT_INIT's first parameter.]) -]) - -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], []) -dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], []) - - -# _LT_WITH_PIC([MODE]) -# -------------------- -# implement the --with-pic flag, and support the `pic-only' and `no-pic' -# LT_INIT options. -# 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], - [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], - [pic_mode="$withval"], - [pic_mode=default]) - -test -z "$pic_mode" && pic_mode=m4_default([$1], [default]) - -_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl -])# _LT_WITH_PIC - -LT_OPTION_DEFINE([LT_INIT], [pic-only], [_LT_WITH_PIC([yes])]) -LT_OPTION_DEFINE([LT_INIT], [no-pic], [_LT_WITH_PIC([no])]) - -# Old name: -AU_DEFUN([AC_LIBTOOL_PICMODE], -[_LT_SET_OPTION([LT_INIT], [pic-only]) -AC_DIAGNOSE([obsolete], -[$0: Remove this warning and the call to _LT_SET_OPTION when you -put the `pic-only' option into LT_INIT's first parameter.]) -]) - -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LIBTOOL_PICMODE], []) - - -m4_define([_LTDL_MODE], []) -LT_OPTION_DEFINE([LTDL_INIT], [nonrecursive], - [m4_define([_LTDL_MODE], [nonrecursive])]) -LT_OPTION_DEFINE([LTDL_INIT], [recursive], - [m4_define([_LTDL_MODE], [recursive])]) -LT_OPTION_DEFINE([LTDL_INIT], [subproject], - [m4_define([_LTDL_MODE], [subproject])]) - -m4_define([_LTDL_TYPE], []) -LT_OPTION_DEFINE([LTDL_INIT], [installable], - [m4_define([_LTDL_TYPE], [installable])]) -LT_OPTION_DEFINE([LTDL_INIT], [convenience], - [m4_define([_LTDL_TYPE], [convenience])]) - -# ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*- -# -# Copyright (C) 2004, 2005, 2007, 2008 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 ltsugar.m4 - -# This is to help aclocal find these macros, as it can't see m4_define. -AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])]) - - -# lt_join(SEP, ARG1, [ARG2...]) -# ----------------------------- -# Produce ARG1SEPARG2...SEPARGn, omitting [] arguments and their -# associated separator. -# Needed until we can rely on m4_join from Autoconf 2.62, since all earlier -# versions in m4sugar had bugs. -m4_define([lt_join], -[m4_if([$#], [1], [], - [$#], [2], [[$2]], - [m4_if([$2], [], [], [[$2]_])$0([$1], m4_shift(m4_shift($@)))])]) -m4_define([_lt_join], -[m4_if([$#$2], [2], [], - [m4_if([$2], [], [], [[$1$2]])$0([$1], m4_shift(m4_shift($@)))])]) - - -# lt_car(LIST) -# lt_cdr(LIST) -# ------------ -# Manipulate m4 lists. -# These macros are necessary as long as will still need to support -# Autoconf-2.59 which quotes differently. -m4_define([lt_car], [[$1]]) -m4_define([lt_cdr], -[m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])], - [$#], 1, [], - [m4_dquote(m4_shift($@))])]) -m4_define([lt_unquote], $1) - - -# lt_append(MACRO-NAME, STRING, [SEPARATOR]) -# ------------------------------------------ -# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'. -# Note that neither SEPARATOR nor STRING are expanded; they are appended -# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked). -# No SEPARATOR is output if MACRO-NAME was previously undefined (different -# than defined and empty). -# -# This macro is needed until we can rely on Autoconf 2.62, since earlier -# versions of m4sugar mistakenly expanded SEPARATOR but not STRING. -m4_define([lt_append], -[m4_define([$1], - m4_ifdef([$1], [m4_defn([$1])[$3]])[$2])]) - - - -# lt_combine(SEP, PREFIX-LIST, INFIX, SUFFIX1, [SUFFIX2...]) -# ---------------------------------------------------------- -# Produce a SEP delimited list of all paired combinations of elements of -# PREFIX-LIST with SUFFIX1 through SUFFIXn. Each element of the list -# has the form PREFIXmINFIXSUFFIXn. -# Needed until we can rely on m4_combine added in Autoconf 2.62. -m4_define([lt_combine], -[m4_if(m4_eval([$# > 3]), [1], - [m4_pushdef([_Lt_sep], [m4_define([_Lt_sep], m4_defn([lt_car]))])]]dnl -[[m4_foreach([_Lt_prefix], [$2], - [m4_foreach([_Lt_suffix], - ]m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@)))))[, - [_Lt_sep([$1])[]m4_defn([_Lt_prefix])[$3]m4_defn([_Lt_suffix])])])])]) - - -# lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ]) -# ----------------------------------------------------------------------- -# Iff MACRO-NAME does not yet contain VARNAME, then append it (delimited -# by SEPARATOR if supplied) and expand UNIQ, else NOT-UNIQ. -m4_define([lt_if_append_uniq], -[m4_ifdef([$1], - [m4_if(m4_index([$3]m4_defn([$1])[$3], [$3$2$3]), [-1], - [lt_append([$1], [$2], [$3])$4], - [$5])], - [lt_append([$1], [$2], [$3])$4])]) - - -# lt_dict_add(DICT, KEY, VALUE) -# ----------------------------- -m4_define([lt_dict_add], -[m4_define([$1($2)], [$3])]) - - -# lt_dict_add_subkey(DICT, KEY, SUBKEY, VALUE) -# -------------------------------------------- -m4_define([lt_dict_add_subkey], -[m4_define([$1($2:$3)], [$4])]) - - -# lt_dict_fetch(DICT, KEY, [SUBKEY]) -# ---------------------------------- -m4_define([lt_dict_fetch], -[m4_ifval([$3], - m4_ifdef([$1($2:$3)], [m4_defn([$1($2:$3)])]), - m4_ifdef([$1($2)], [m4_defn([$1($2)])]))]) - - -# lt_if_dict_fetch(DICT, KEY, [SUBKEY], VALUE, IF-TRUE, [IF-FALSE]) -# ----------------------------------------------------------------- -m4_define([lt_if_dict_fetch], -[m4_if(lt_dict_fetch([$1], [$2], [$3]), [$4], - [$5], - [$6])]) - - -# lt_dict_filter(DICT, [SUBKEY], VALUE, [SEPARATOR], KEY, [...]) -# -------------------------------------------------------------- -m4_define([lt_dict_filter], -[m4_if([$5], [], [], - [lt_join(m4_quote(m4_default([$4], [[, ]])), - lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car([m4_shiftn(4, $@)]), - [lt_if_dict_fetch([$1], _Lt_key, [$2], [$3], [_Lt_key ])])))))])[]dnl -]) - -# ltversion.m4 -- version numbers -*- Autoconf -*- -# -# Copyright (C) 2004 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. - -# @configure_input@ - -# serial 3293 ltversion.m4 -# This file is part of GNU Libtool - -m4_define([LT_PACKAGE_VERSION], [2.4]) -m4_define([LT_PACKAGE_REVISION], [1.3293]) - -AC_DEFUN([LTVERSION_VERSION], -[macro_version='2.4' -macro_revision='1.3293' -_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) -_LT_DECL(, macro_revision, 0) -]) - -# lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*- -# -# 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 5 lt~obsolete.m4 - -# These exist entirely to fool aclocal when bootstrapping libtool. -# -# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN) -# which have later been changed to m4_define as they aren't part of the -# exported API, or moved to Autoconf or Automake where they belong. -# -# The trouble is, aclocal is a bit thick. It'll see the old AC_DEFUN -# in /usr/share/aclocal/libtool.m4 and remember it, then when it sees us -# using a macro with the same name in our local m4/libtool.m4 it'll -# pull the old libtool.m4 in (it doesn't see our shiny new m4_define -# and doesn't know about Autoconf macros at all.) -# -# So we provide this file, which has a silly filename so it's always -# included after everything else. This provides aclocal with the -# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything -# because those macros already exist, or will be overwritten later. -# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. -# -# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here. -# Yes, that means every name once taken will need to remain here until -# we give up compatibility with versions before 1.7, at which point -# we need to keep only those names which we still refer to. - -# This is to help aclocal find these macros, as it can't see m4_define. -AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])]) - -m4_ifndef([AC_LIBTOOL_LINKER_OPTION], [AC_DEFUN([AC_LIBTOOL_LINKER_OPTION])]) -m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP])]) -m4_ifndef([_LT_AC_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])]) -m4_ifndef([_LT_AC_SHELL_INIT], [AC_DEFUN([_LT_AC_SHELL_INIT])]) -m4_ifndef([_LT_AC_SYS_LIBPATH_AIX], [AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX])]) -m4_ifndef([_LT_PROG_LTMAIN], [AC_DEFUN([_LT_PROG_LTMAIN])]) -m4_ifndef([_LT_AC_TAGVAR], [AC_DEFUN([_LT_AC_TAGVAR])]) -m4_ifndef([AC_LTDL_ENABLE_INSTALL], [AC_DEFUN([AC_LTDL_ENABLE_INSTALL])]) -m4_ifndef([AC_LTDL_PREOPEN], [AC_DEFUN([AC_LTDL_PREOPEN])]) -m4_ifndef([_LT_AC_SYS_COMPILER], [AC_DEFUN([_LT_AC_SYS_COMPILER])]) -m4_ifndef([_LT_AC_LOCK], [AC_DEFUN([_LT_AC_LOCK])]) -m4_ifndef([AC_LIBTOOL_SYS_OLD_ARCHIVE], [AC_DEFUN([AC_LIBTOOL_SYS_OLD_ARCHIVE])]) -m4_ifndef([_LT_AC_TRY_DLOPEN_SELF], [AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF])]) -m4_ifndef([AC_LIBTOOL_PROG_CC_C_O], [AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O])]) -m4_ifndef([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], [AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS])]) -m4_ifndef([AC_LIBTOOL_OBJDIR], [AC_DEFUN([AC_LIBTOOL_OBJDIR])]) -m4_ifndef([AC_LTDL_OBJDIR], [AC_DEFUN([AC_LTDL_OBJDIR])]) -m4_ifndef([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], [AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH])]) -m4_ifndef([AC_LIBTOOL_SYS_LIB_STRIP], [AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP])]) -m4_ifndef([AC_PATH_MAGIC], [AC_DEFUN([AC_PATH_MAGIC])]) -m4_ifndef([AC_PROG_LD_GNU], [AC_DEFUN([AC_PROG_LD_GNU])]) -m4_ifndef([AC_PROG_LD_RELOAD_FLAG], [AC_DEFUN([AC_PROG_LD_RELOAD_FLAG])]) -m4_ifndef([AC_DEPLIBS_CHECK_METHOD], [AC_DEFUN([AC_DEPLIBS_CHECK_METHOD])]) -m4_ifndef([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI])]) -m4_ifndef([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], [AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])]) -m4_ifndef([AC_LIBTOOL_PROG_COMPILER_PIC], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC])]) -m4_ifndef([AC_LIBTOOL_PROG_LD_SHLIBS], [AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS])]) -m4_ifndef([AC_LIBTOOL_POSTDEP_PREDEP], [AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP])]) -m4_ifndef([LT_AC_PROG_EGREP], [AC_DEFUN([LT_AC_PROG_EGREP])]) -m4_ifndef([LT_AC_PROG_SED], [AC_DEFUN([LT_AC_PROG_SED])]) -m4_ifndef([_LT_CC_BASENAME], [AC_DEFUN([_LT_CC_BASENAME])]) -m4_ifndef([_LT_COMPILER_BOILERPLATE], [AC_DEFUN([_LT_COMPILER_BOILERPLATE])]) -m4_ifndef([_LT_LINKER_BOILERPLATE], [AC_DEFUN([_LT_LINKER_BOILERPLATE])]) -m4_ifndef([_AC_PROG_LIBTOOL], [AC_DEFUN([_AC_PROG_LIBTOOL])]) -m4_ifndef([AC_LIBTOOL_SETUP], [AC_DEFUN([AC_LIBTOOL_SETUP])]) -m4_ifndef([_LT_AC_CHECK_DLFCN], [AC_DEFUN([_LT_AC_CHECK_DLFCN])]) -m4_ifndef([AC_LIBTOOL_SYS_DYNAMIC_LINKER], [AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER])]) -m4_ifndef([_LT_AC_TAGCONFIG], [AC_DEFUN([_LT_AC_TAGCONFIG])]) -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_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])]) -m4_ifndef([_LT_AC_LANG_CXX_CONFIG], [AC_DEFUN([_LT_AC_LANG_CXX_CONFIG])]) -m4_ifndef([AC_LIBTOOL_LANG_F77_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG])]) -m4_ifndef([_LT_AC_LANG_F77_CONFIG], [AC_DEFUN([_LT_AC_LANG_F77_CONFIG])]) -m4_ifndef([AC_LIBTOOL_LANG_GCJ_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG])]) -m4_ifndef([_LT_AC_LANG_GCJ_CONFIG], [AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG])]) -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])]) - # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- # serial 1 (pkg-config-0.24) # # Copyright © 2004 Scott James Remnant . # @@ -9588,5 +1157,10 @@ AC_MSG_RESULT([$am_cv_prog_tar_$1])]) AC_SUBST([am__tar]) AC_SUBST([am__untar]) ]) # _AM_PROG_TAR +m4_include([m4/libtool.m4]) +m4_include([m4/ltoptions.m4]) +m4_include([m4/ltsugar.m4]) +m4_include([m4/ltversion.m4]) +m4_include([m4/lt~obsolete.m4]) Index: config.h ================================================================== --- config.h +++ config.h @@ -1,10 +1,13 @@ /* config.h. Generated from config.h.in by configure. */ /* config.h.in. Generated from configure.ac by autoheader. */ /* Define to 1 if you have the header file. */ #define HAVE_DLFCN_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_EXPAT_H 1 /* Define to 1 if you have the header file. */ #define HAVE_FCNTL_H 1 /* Define to 1 if you have the `fdatasync' function. */ @@ -124,20 +127,20 @@ /* Define to the full name of this package. */ #define PACKAGE_NAME "spatialite-tools" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "spatialite-tools 3.1.0" +#define PACKAGE_STRING "spatialite-tools 3.0.1" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "spatialite-tools" /* Define to the home page for this package. */ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "3.1.0" +#define PACKAGE_VERSION "3.0.1" /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 /* Define to 1 if you can safely include both and . */ @@ -145,11 +148,11 @@ /* Define to 1 if your declares `struct tm'. */ /* #undef TM_IN_SYS_TIME */ /* Version number of package */ -#define VERSION "3.1.0" +#define VERSION "3.0.1" /* Define to empty if `const' does not conform to ANSI C. */ /* #undef const */ /* Define to `long int' if does not define. */ Index: config.h.in ================================================================== --- config.h.in +++ config.h.in @@ -1,9 +1,12 @@ /* config.h.in. Generated from configure.ac by autoheader. */ /* Define to 1 if you have the header file. */ #undef HAVE_DLFCN_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_EXPAT_H /* Define to 1 if you have the header file. */ #undef HAVE_FCNTL_H /* Define to 1 if you have the `fdatasync' function. */ Index: configure ================================================================== --- configure +++ configure @@ -1,8 +1,8 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for spatialite-tools 3.1.0. +# Generated by GNU Autoconf 2.68 for spatialite-tools 3.0.1. # # Report bugs to . # # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -568,12 +568,12 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='spatialite-tools' PACKAGE_TARNAME='spatialite-tools' -PACKAGE_VERSION='3.1.0' -PACKAGE_STRING='spatialite-tools 3.1.0' +PACKAGE_VERSION='3.0.1' +PACKAGE_STRING='spatialite-tools 3.0.1' PACKAGE_BUGREPORT='a.furieri@lqt.it' PACKAGE_URL='' # Factoring default headers for most tests. ac_includes_default="\ @@ -612,12 +612,10 @@ #endif" ac_subst_vars='am__EXEEXT_FALSE am__EXEEXT_TRUE LTLIBOBJS -LIBREADOSM_CFLAGS -LIBREADOSM_LIBS LIBFREEXL_LIBS LIBFREEXL_CFLAGS LIBSPATIALITE_LIBS LIBSPATIALITE_CFLAGS PKG_CONFIG_LIBDIR @@ -778,13 +776,11 @@ PKG_CONFIG_PATH PKG_CONFIG_LIBDIR LIBSPATIALITE_CFLAGS LIBSPATIALITE_LIBS LIBFREEXL_CFLAGS -LIBFREEXL_LIBS -LIBREADOSM_CFLAGS -LIBREADOSM_LIBS' +LIBFREEXL_LIBS' # Initialize some variables set by options. ac_init_help= ac_init_version=false @@ -1323,11 +1319,11 @@ # if test "$ac_init_help" = "long"; then # 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 spatialite-tools 3.1.0 to adapt to many kinds of systems. +\`configure' configures spatialite-tools 3.0.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... To assign environment variables (e.g., CC, CFLAGS...), specify them as VAR=VALUE. See below for descriptions of some of the useful variables. @@ -1394,11 +1390,11 @@ _ACEOF fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of spatialite-tools 3.1.0:";; + short | recursive ) echo "Configuration of spatialite-tools 3.0.1:";; esac cat <<\_ACEOF Optional Features: --disable-option-checking ignore unrecognized --enable/--with options @@ -1448,14 +1444,10 @@ linker flags for LIBSPATIALITE, overriding pkg-config LIBFREEXL_CFLAGS C compiler flags for LIBFREEXL, overriding pkg-config LIBFREEXL_LIBS linker flags for LIBFREEXL, overriding pkg-config - LIBREADOSM_CFLAGS - C compiler flags for LIBREADOSM, overriding pkg-config - LIBREADOSM_LIBS - linker flags for LIBREADOSM, overriding pkg-config Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. Report bugs to . @@ -1519,11 +1511,11 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -spatialite-tools configure 3.1.0 +spatialite-tools configure 3.0.1 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. @@ -2063,11 +2055,11 @@ } # 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 spatialite-tools $as_me 3.1.0, which was +It was created by spatialite-tools $as_me 3.0.1, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ _ACEOF @@ -2886,11 +2878,11 @@ fi # Define the identity of the package. PACKAGE='spatialite-tools' - VERSION='3.1.0' + VERSION='3.0.1' cat >>confdefs.h <<_ACEOF #define PACKAGE "$PACKAGE" _ACEOF @@ -4495,10 +4487,24 @@ _ACEOF else as_fn_error $? "cannot find unistd.h, bailing out" "$LINENO" 5 fi + +done + +for ac_header in expat.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "expat.h" "ac_cv_header_expat_h" "$ac_includes_default" +if test "x$ac_cv_header_expat_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_EXPAT_H 1 +_ACEOF + +else + as_fn_error $? "cannot find expat.h, bailing out" "$LINENO" 5 +fi done # Checks for programs. @@ -9619,10 +9625,14 @@ eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_linker_boilerplate=`cat conftest.err` $RM -r conftest* +## 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_prog_compiler_no_builtin_flag= if test "$GCC" = yes; then @@ -17563,80 +17573,10 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } fi - -pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBREADOSM" >&5 -$as_echo_n "checking for LIBREADOSM... " >&6; } - -if test -n "$LIBREADOSM_CFLAGS"; then - pkg_cv_LIBREADOSM_CFLAGS="$LIBREADOSM_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"readosm\""; } >&5 - ($PKG_CONFIG --exists --print-errors "readosm") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_LIBREADOSM_CFLAGS=`$PKG_CONFIG --cflags "readosm" 2>/dev/null` -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi -if test -n "$LIBREADOSM_LIBS"; then - pkg_cv_LIBREADOSM_LIBS="$LIBREADOSM_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"readosm\""; } >&5 - ($PKG_CONFIG --exists --print-errors "readosm") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_LIBREADOSM_LIBS=`$PKG_CONFIG --libs "readosm" 2>/dev/null` -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi - - - -if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - LIBREADOSM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "readosm" 2>&1` - else - LIBREADOSM_PKG_ERRORS=`$PKG_CONFIG --print-errors "readosm" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$LIBREADOSM_PKG_ERRORS" >&5 - - as_fn_error $? "'libreadosm' is required but it doesn't seem to be installed on this system." "$LINENO" 5 -elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - as_fn_error $? "'libreadosm' is required but it doesn't seem to be installed on this system." "$LINENO" 5 -else - LIBREADOSM_CFLAGS=$pkg_cv_LIBREADOSM_CFLAGS - LIBREADOSM_LIBS=$pkg_cv_LIBREADOSM_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - -fi - cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure @@ -18181,11 +18121,11 @@ 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 spatialite-tools $as_me 3.1.0, which was +This file was extended by spatialite-tools $as_me 3.0.1, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS CONFIG_LINKS = $CONFIG_LINKS @@ -18247,11 +18187,11 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -spatialite-tools config.status 3.1.0 +spatialite-tools config.status 3.0.1 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" Copyright (C) 2010 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation Index: configure.ac ================================================================== --- configure.ac +++ configure.ac @@ -1,10 +1,10 @@ # -*- Autoconf -*- # Process this file with autoconf to produce a configure script. AC_PREREQ(2.61) -AC_INIT(spatialite-tools, 3.1.0, a.furieri@lqt.it) +AC_INIT(spatialite-tools, 3.0.1, a.furieri@lqt.it) AC_LANG(C) AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE AM_MAINTAINER_MODE @@ -21,10 +21,11 @@ AC_CHECK_HEADERS(inttypes.h,, [AC_MSG_ERROR([cannot find inttypes.h, bailing out])]) AC_CHECK_HEADERS(stddef.h,, [AC_MSG_ERROR([cannot find stddef.h, bailing out])]) AC_CHECK_HEADERS(stdint.h,, [AC_MSG_ERROR([cannot find stdint.h, bailing out])]) AC_CHECK_HEADERS(sys/time.h,, [AC_MSG_ERROR([cannot find sys/time.h, bailing out])]) AC_CHECK_HEADERS(unistd.h,, [AC_MSG_ERROR([cannot find unistd.h, bailing out])]) +AC_CHECK_HEADERS(expat.h,, [AC_MSG_ERROR([cannot find expat.h, bailing out])]) # Checks for programs. AC_PROG_CXX AC_PROG_CC AC_PROG_CPP @@ -117,10 +118,8 @@ PKG_CHECK_MODULES([LIBSPATIALITE], [spatialite], , AC_MSG_ERROR(['libspatialite' is required but it doesn't seem to be installed on this system.])) AC_SUBST(LIBSPATIALITE_CFLAGS) AC_SUBST(LIBSPATIALITE_LIBS) PKG_CHECK_MODULES([LIBFREEXL], [freexl], , AC_MSG_ERROR(['libfreexl' is required but it doesn't seem to be installed on this system.])) AC_SUBST(LIBFREEXL_CFLAGS) -AC_SUBST(LIBREADOSM_LIBS)PKG_CHECK_MODULES([LIBREADOSM], [readosm], , AC_MSG_ERROR(['libreadosm' is required but it doesn't seem to be installed on this system.])) -AC_SUBST(LIBREADOSM_CFLAGS) -AC_SUBST(LIBREADOSM_LIBS) +AC_SUBST(LIBFREEXL_LIBS) AC_OUTPUT Index: makefile.vc ================================================================== --- makefile.vc +++ makefile.vc @@ -90,13 +90,11 @@ -outputresource:$(SPATIALITE_GML_EXE);1 $(SPATIALITE_OSM_RAW_EXE): spatialite_osm_raw.obj cl spatialite_osm_raw.obj C:\OSGeo4W\lib\proj_i.lib \ C:\OSGeo4W\lib\iconv.lib \ - C:\OSGeo4W\lib\libreadosm.lib \ C:\OSGeo4W\lib\libexpat.lib \ - C:\OSGeo4W\lib\libz.lib \ C:\OSGeo4W\lib\spatialite_i.lib if exist $(SPATIALITE_OSM_RAW_EXE).manifest mt -manifest \ $(SPATIALITE_OSM_RAW_EXE).manifest \ -outputresource:$(SPATIALITE_OSM_RAW_EXE);1 Index: spatialite_osm_filter.c ================================================================== --- spatialite_osm_filter.c +++ spatialite_osm_filter.c @@ -1563,20 +1563,18 @@ fprintf (stderr, "-h or --help print this help message\n"); fprintf (stderr, "-o or --osm-path pathname the OSM-XML [output] file path\n"); fprintf (stderr, - "-w or --wkt-mask-path pathname path of text file [WKT mask]\n"); + "-w or --wkt-mask-path pathname path of text file [WKT mask]\n"); fprintf (stderr, "-d or --db-path pathname the SpatiaLite DB path\n\n"); fprintf (stderr, "you can specify the following options as well\n"); fprintf (stderr, "-cs or --cache-size num DB cache size (how many pages)\n"); fprintf (stderr, "-m or --in-memory using IN-MEMORY database\n"); - fprintf (stderr, - "-jo or --journal-off unsafe [but faster] mode\n"); } int main (int argc, char *argv[]) { @@ -1587,17 +1585,14 @@ const char *osm_path = NULL; const char *wkt_path = NULL; const char *db_path = NULL; int in_memory = 0; int cache_size = 0; - int journal_off = 0; int error = 0; void *mask = NULL; int mask_len = 0; FILE *out = NULL; - char *sql_err = NULL; - int ret; for (i = 1; i < argc; i++) { /* parsing the invocation arguments */ if (next_arg != ARG_NONE) @@ -1666,25 +1661,13 @@ { in_memory = 1; next_arg = ARG_NONE; continue; } - if (strcasecmp (argv[i], "--in-memory") == 0) + if (strcasecmp (argv[i], "-in-memory") == 0) { in_memory = 1; - next_arg = ARG_NONE; - continue; - } - if (strcasecmp (argv[i], "-jo") == 0) - { - journal_off = 1; - next_arg = ARG_NONE; - continue; - } - if (strcasecmp (argv[i], "--journal-off") == 0) - { - journal_off = 1; next_arg = ARG_NONE; continue; } fprintf (stderr, "unknown argument: %s\n", argv[i]); error = 1; @@ -1736,10 +1719,11 @@ if (in_memory) { /* loading the DB in-memory */ sqlite3 *mem_db_handle; sqlite3_backup *backup; + int ret; ret = sqlite3_open_v2 (":memory:", &mem_db_handle, SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE, NULL); if (ret != SQLITE_OK) @@ -1771,45 +1755,36 @@ out = fopen (osm_path, "wb"); if (out == NULL) goto stop; - if (journal_off) - { - /* disabling the journal: unsafe but faster */ - ret = - sqlite3_exec (handle, "PRAGMA journal_mode = OFF", NULL, NULL, - &sql_err); - if (ret != SQLITE_OK) - { - fprintf (stderr, "PRAGMA journal_mode=OFF error: %s\n", - sql_err); - sqlite3_free (sql_err); - goto stop; - } - } - + fprintf (stderr, "Evvai reset\n"); /* resetting filtered nodes, ways and relations */ if (!reset_filtered (handle)) goto stop; + fprintf (stderr, "Evvai nodes\n"); /* identifying filtered nodes */ if (!filter_nodes (handle, mask, mask_len)) goto stop; + fprintf (stderr, "Evvai rel-rels\n"); /* identifying relations depending on other relations */ if (!filter_rel_relations (handle)) goto stop; + fprintf (stderr, "Evvai way-rels\n"); /* identifying ways depending on relations */ if (!filter_way_relations (handle)) goto stop; + fprintf (stderr, "Evvai node-rels\n"); /* identifying nodes depending on relations */ if (!filter_node_relations (handle)) goto stop; + fprintf (stderr, "Evvai node-ways\n"); /* identifying nodes depending on ways */ if (!filter_node_ways (handle)) goto stop; /* writing the OSM header */ Index: spatialite_osm_map.c ================================================================== --- spatialite_osm_map.c +++ spatialite_osm_map.c @@ -31,10 +31,12 @@ #include #include #include #include + +#include #include "config.h" #ifdef SPATIALITE_AMALGAMATION #include @@ -42,17 +44,35 @@ #include #endif #include #include -#include #define ARG_NONE 0 #define ARG_OSM_PATH 1 #define ARG_DB_PATH 2 #define ARG_CACHE_SIZE 3 +#define MAX_TAG 16 + +#if defined(_WIN32) && !defined(__MINGW32__) +#define strcasecmp _stricmp +#endif /* not WIN32 */ + +#if defined(_WIN32) +#define atol_64 _atoi64 +#else +#define atol_64 atoll +#endif + +#define BUFFSIZE 8192 + +#define CURRENT_TAG_UNKNOWN 0 +#define CURRENT_TAG_IS_NODE 1 +#define CURRENT_TAG_IS_WAY 2 +#define CURRENT_TAG_IS_RELATION 3 + struct aux_params { /* an auxiliary struct used for XML parsing */ sqlite3 *db_handle; sqlite3_stmt *ins_tmp_nodes_stmt; @@ -59,10 +79,11 @@ sqlite3_stmt *ins_tmp_ways_stmt; sqlite3_stmt *ins_generic_point_stmt; sqlite3_stmt *ins_addresses_stmt; sqlite3_stmt *ins_generic_linestring_stmt; sqlite3_stmt *ins_generic_polygon_stmt; + int current_tag; }; struct layers { const char *name; @@ -141,32 +162,61 @@ { "parking", 0, 0, 0, NULL, NULL, NULL}, { NULL, 0, 0, 0, NULL, NULL, NULL},}; -struct node_refs +struct tag { - int count; - sqlite3_int64 *id; - char *found; + char *k; + char *v; + struct tag *next; +}; + +struct node +{ + sqlite3_int64 id; + double lat; + double lon; + struct tag *first; + struct tag *last; +} glob_node; + +struct nd +{ + sqlite3_int64 ref; + char found; + struct nd *next; }; -struct way_refs +struct way { - int count; - sqlite3_int64 *id; - char *found; + sqlite3_int64 id; + struct nd *first_nd; + struct nd *last_nd; + struct tag *first; + struct tag *last; +} glob_way; + +struct member +{ + sqlite3_int64 ref; + int is_node; + int is_way; + char found; + char *role; + gaiaGeomCollPtr geom; + struct member *next; }; -struct ring_refs +struct relation { - int count; - sqlite3_int64 *id; - gaiaGeomCollPtr *geom; - char *outer; - char *found; -}; + sqlite3_int64 id; + struct member *first_member; + struct member *last_member; + struct tag *first; + struct tag *last; +} glob_relation; static void create_point_table (struct aux_params *params, struct layers *layer) { int ret; @@ -308,22 +358,61 @@ return; } layer->ins_polygon_stmt = stmt; } -static int +static void +free_tag (struct tag *p) +{ + if (p->k) + free (p->k); + if (p->v) + free (p->v); + free (p); +} + +static void +free_member (struct member *p) +{ + if (p->role) + free (p->role); + free (p); +} + +static void +start_node (struct aux_params *params, const char **attr) +{ + int i; + glob_node.id = -1; + glob_node.lat = DBL_MAX; + glob_node.lon = DBL_MAX; + glob_node.first = NULL; + glob_node.last = NULL; + for (i = 0; attr[i]; i += 2) + { + if (strcmp (attr[i], "id") == 0) + glob_node.id = atol_64 (attr[i + 1]); + if (strcmp (attr[i], "lat") == 0) + glob_node.lat = atof (attr[i + 1]); + if (strcmp (attr[i], "lon") == 0) + glob_node.lon = atof (attr[i + 1]); + } + params->current_tag = CURRENT_TAG_IS_NODE; +} + +static void point_layer_insert (struct aux_params *params, const char *layer_name, - const readosm_node * node, const char *sub_type, - const char *name) + sqlite3_int64 id, double lat, double lon, + const char *sub_type, const char *name) { struct layers *layer; int i = 0; while (1) { layer = &(base_layers[i++]); if (layer->name == NULL) - return 1; + return; if (strcmp (layer->name, layer_name) == 0) { if (layer->ok_point == 0) { layer->ok_point = 1; @@ -334,15 +423,14 @@ int ret; unsigned char *blob; int blob_size; gaiaGeomCollPtr geom = gaiaAllocGeomColl (); geom->Srid = 4326; - gaiaAddPointToGeomColl (geom, node->longitude, - node->latitude); + gaiaAddPointToGeomColl (geom, lon, lat); sqlite3_reset (layer->ins_point_stmt); sqlite3_clear_bindings (layer->ins_point_stmt); - sqlite3_bind_int64 (layer->ins_point_stmt, 1, node->id); + sqlite3_bind_int64 (layer->ins_point_stmt, 1, id); if (sub_type == NULL) sqlite3_bind_null (layer->ins_point_stmt, 2); else sqlite3_bind_text (layer->ins_point_stmt, 2, sub_type, strlen (sub_type), @@ -356,38 +444,36 @@ gaiaFreeGeomColl (geom); sqlite3_bind_blob (layer->ins_point_stmt, 4, blob, blob_size, free); ret = sqlite3_step (layer->ins_point_stmt); if (ret == SQLITE_DONE || ret == SQLITE_ROW) - return 1; + return; fprintf (stderr, "sqlite3_step() error: INS_POINT %s\n", layer_name); sqlite3_finalize (layer->ins_point_stmt); layer->ins_point_stmt = NULL; - return 0; } - return 1; + return; } } - return 1; } -static int -point_generic_insert (struct aux_params *params, const readosm_node * node, - const char *name) +static void +point_generic_insert (struct aux_params *params, sqlite3_int64 id, double lat, + double lon, const char *name) { if (params->ins_generic_point_stmt) { int ret; unsigned char *blob; int blob_size; gaiaGeomCollPtr geom = gaiaAllocGeomColl (); geom->Srid = 4326; - gaiaAddPointToGeomColl (geom, node->longitude, node->latitude); + gaiaAddPointToGeomColl (geom, lon, lat); sqlite3_reset (params->ins_generic_point_stmt); sqlite3_clear_bindings (params->ins_generic_point_stmt); - sqlite3_bind_int64 (params->ins_generic_point_stmt, 1, node->id); + sqlite3_bind_int64 (params->ins_generic_point_stmt, 1, id); if (name == NULL) sqlite3_bind_null (params->ins_generic_point_stmt, 2); else sqlite3_bind_text (params->ins_generic_point_stmt, 2, name, strlen (name), SQLITE_STATIC); @@ -395,36 +481,35 @@ gaiaFreeGeomColl (geom); sqlite3_bind_blob (params->ins_generic_point_stmt, 3, blob, blob_size, free); ret = sqlite3_step (params->ins_generic_point_stmt); if (ret == SQLITE_DONE || ret == SQLITE_ROW) - return 1; + return; fprintf (stderr, "sqlite3_step() error: INS_GENERIC_POINT\n"); sqlite3_finalize (params->ins_generic_point_stmt); params->ins_generic_point_stmt = NULL; - return 0; } - return 1; } -static int -address_insert (struct aux_params *params, const readosm_node * node, - const char *country, const char *city, const char *postcode, - const char *street, const char *housename, - const char *housenumber) +static void +address_insert (struct aux_params *params, sqlite3_int64 id, double lat, + double lon, const char *country, const char *city, + const char *postcode, + const char *street, + const char *housename, const char *housenumber) { if (params->ins_addresses_stmt) { int ret; unsigned char *blob; int blob_size; gaiaGeomCollPtr geom = gaiaAllocGeomColl (); geom->Srid = 4326; - gaiaAddPointToGeomColl (geom, node->longitude, node->latitude); + gaiaAddPointToGeomColl (geom, lon, lat); sqlite3_reset (params->ins_addresses_stmt); sqlite3_clear_bindings (params->ins_addresses_stmt); - sqlite3_bind_int64 (params->ins_addresses_stmt, 1, node->id); + sqlite3_bind_int64 (params->ins_addresses_stmt, 1, id); if (country == NULL) sqlite3_bind_null (params->ins_addresses_stmt, 2); else sqlite3_bind_text (params->ins_addresses_stmt, 2, country, strlen (country), SQLITE_STATIC); @@ -457,186 +542,153 @@ gaiaFreeGeomColl (geom); sqlite3_bind_blob (params->ins_addresses_stmt, 8, blob, blob_size, free); ret = sqlite3_step (params->ins_addresses_stmt); if (ret == SQLITE_DONE || ret == SQLITE_ROW) - return 1; + return; fprintf (stderr, "sqlite3_step() error: INS_ADDRESSES\n"); sqlite3_finalize (params->ins_addresses_stmt); params->ins_addresses_stmt = NULL; - return 0; } - return 1; } -static int -tmp_nodes_insert (struct aux_params *params, const readosm_node * node) +static void +eval_node (struct aux_params *params) { - int ret; - if (params->ins_tmp_nodes_stmt == NULL) - return 1; - sqlite3_reset (params->ins_tmp_nodes_stmt); - sqlite3_clear_bindings (params->ins_tmp_nodes_stmt); - sqlite3_bind_int64 (params->ins_tmp_nodes_stmt, 1, node->id); - sqlite3_bind_double (params->ins_tmp_nodes_stmt, 2, node->latitude); - sqlite3_bind_double (params->ins_tmp_nodes_stmt, 3, node->longitude); - ret = sqlite3_step (params->ins_tmp_nodes_stmt); - if (ret == SQLITE_DONE || ret == SQLITE_ROW) - return 1; - fprintf (stderr, "sqlite3_step() error: INS_TMP_NODES\n"); - sqlite3_finalize (params->ins_tmp_nodes_stmt); - params->ins_tmp_nodes_stmt = NULL; - return 0; -} - -static int -consume_node (const void *user_data, const readosm_node * node) -{ -/* processing an OSM Node (ReadOSM callback function) */ - struct aux_params *params = (struct aux_params *) user_data; - const readosm_tag *p_tag; - int i_tag; + struct tag *p_tag; const char *p; - int i_lyr = 0; - int ret; + int i = 0; const char *layer_name = NULL; - const char *sub_type = NULL; - const char *name = NULL; - const char *country = NULL; - const char *city = NULL; - const char *postcode = NULL; - const char *street = NULL; - const char *housename = NULL; - const char *housenumber = NULL; - - if (!tmp_nodes_insert (params, node)) - return READOSM_ABORT; - + char *sub_type = NULL; + char *name = NULL; + char *country = NULL; + char *city = NULL; + char *postcode = NULL; + char *street = NULL; + char *housename = NULL; + char *housenumber = NULL; + if (glob_node.first == NULL) + return; while (1) { - p = base_layers[i_lyr++].name; + p = base_layers[i++].name; if (!p) break; - for (i_tag = 0; i_tag < node->tag_count; i_tag++) + p_tag = glob_node.first; + while (p_tag) { - p_tag = node->tags + i_tag; - if (strcmp (p_tag->key, p) == 0) + if (strcmp (p_tag->k, p) == 0) { layer_name = p; - sub_type = p_tag->value; + sub_type = p_tag->v; } - if (strcmp (p_tag->key, "name") == 0) - name = p_tag->value; + if (strcmp (p_tag->k, "name") == 0) + name = p_tag->v; + p_tag = p_tag->next; } if (layer_name) break; } - if (layer_name) { - ret = point_layer_insert (params, layer_name, node, sub_type, name); - if (ret) - return READOSM_OK; - return READOSM_ABORT; + point_layer_insert (params, layer_name, glob_node.id, glob_node.lat, + glob_node.lon, sub_type, name); + return; } else if (name != NULL) { - ret = point_generic_insert (params, node, name); - if (ret) - return READOSM_OK; - return READOSM_ABORT; + point_generic_insert (params, glob_node.id, glob_node.lat, + glob_node.lon, name); + return; } /* may be an house address */ - for (i_tag = 0; i_tag < node->tag_count; i_tag++) + p_tag = glob_node.first; + while (p_tag) { - p_tag = node->tags + i_tag; - if (strcmp (p_tag->key, "addr:country") == 0) - country = p_tag->value; - if (strcmp (p_tag->key, "addr:city") == 0) - city = p_tag->value; - if (strcmp (p_tag->key, "addr:postcode") == 0) - postcode = p_tag->value; - if (strcmp (p_tag->key, "addr:street") == 0) - street = p_tag->value; - if (strcmp (p_tag->key, "addr:housename") == 0) - housename = p_tag->value; - if (strcmp (p_tag->key, "addr:housenumber") == 0) - housenumber = p_tag->value; + if (strcmp (p_tag->k, "addr:country") == 0) + country = p_tag->v; + if (strcmp (p_tag->k, "addr:city") == 0) + city = p_tag->v; + if (strcmp (p_tag->k, "addr:postcode") == 0) + postcode = p_tag->v; + if (strcmp (p_tag->k, "addr:street") == 0) + street = p_tag->v; + if (strcmp (p_tag->k, "addr:housename") == 0) + housename = p_tag->v; + if (strcmp (p_tag->k, "addr:housenumber") == 0) + housenumber = p_tag->v; + p_tag = p_tag->next; } if (country || city || postcode || street || housename || housenumber) - { - ret = address_insert (params, node, country, city, postcode, street, - housename, housenumber); - if (ret) - return READOSM_OK; - return READOSM_ABORT; - } - return READOSM_OK; -} - -static struct node_refs * -create_node_refs (const readosm_way * way) -{ -/* creating and initializing the node_refs helper struct */ - int i_ref; - struct node_refs *refs = malloc (sizeof (struct node_refs)); - if (refs == NULL) - return NULL; - refs->count = way->node_ref_count; - refs->id = malloc (sizeof (sqlite3_int64) * refs->count); - if (refs->id == NULL) - { - free (refs); - return NULL; - } - refs->found = malloc (refs->count); - if (refs->found == NULL) - { - free (refs->id); - free (refs); - return NULL; - } - for (i_ref = 0; i_ref < way->node_ref_count; i_ref++) - { - *(refs->id + i_ref) = *(way->node_refs + i_ref); - *(refs->found + i_ref) = 'N'; - } - return refs; -} - -static void -update_node_refs (struct node_refs *nodes, gaiaLinestringPtr ln, - sqlite3_int64 id, double lat, double lon) -{ -/* updating the node_refs helper struct */ - int i_ref; - for (i_ref = 0; i_ref < nodes->count; i_ref++) - { - if (*(nodes->id + i_ref) == id) - { - *(nodes->found + i_ref) = 'Y'; - gaiaSetPoint (ln->Coords, i_ref, lon, lat); - } - } -} - -static void -destroy_node_refs (struct node_refs *nodes) -{ -/* destroying the node_refs helper struct */ - if (nodes == NULL) + address_insert (params, glob_node.id, glob_node.lat, glob_node.lon, + country, city, postcode, street, housename, + housenumber); +} + +static void +tmp_nodes_insert (struct aux_params *params, sqlite3_int64 id, double lat, + double lon) +{ + int ret; + if (params->ins_tmp_nodes_stmt == NULL) + return; + sqlite3_reset (params->ins_tmp_nodes_stmt); + sqlite3_clear_bindings (params->ins_tmp_nodes_stmt); + sqlite3_bind_int64 (params->ins_tmp_nodes_stmt, 1, id); + sqlite3_bind_double (params->ins_tmp_nodes_stmt, 2, lat); + sqlite3_bind_double (params->ins_tmp_nodes_stmt, 3, lon); + ret = sqlite3_step (params->ins_tmp_nodes_stmt); + if (ret == SQLITE_DONE || ret == SQLITE_ROW) return; - if (nodes->id != NULL) - free (nodes->id); - if (nodes->found != NULL) - free (nodes->found); - free (nodes); + fprintf (stderr, "sqlite3_step() error: INS_TMP_NODES\n"); + sqlite3_finalize (params->ins_tmp_nodes_stmt); + params->ins_tmp_nodes_stmt = NULL; +} + +static void +end_node (struct aux_params *params) +{ + struct tag *p_tag; + struct tag *p_tag2; + + tmp_nodes_insert (params, glob_node.id, glob_node.lat, glob_node.lon); + eval_node (params); + p_tag = glob_node.first; + while (p_tag) + { + p_tag2 = p_tag->next; + free_tag (p_tag); + p_tag = p_tag2; + } + glob_node.id = -1; + glob_node.lat = DBL_MAX; + glob_node.lon = DBL_MAX; + glob_node.first = NULL; + glob_node.last = NULL; + params->current_tag = CURRENT_TAG_UNKNOWN; +} + +static void +start_way (struct aux_params *params, const char **attr) +{ + int i; + glob_way.id = -1; + glob_way.first_nd = NULL; + glob_way.last_nd = NULL; + glob_way.first = NULL; + glob_way.last = NULL; + for (i = 0; attr[i]; i += 2) + { + if (strcmp (attr[i], "id") == 0) + glob_way.id = atol_64 (attr[i + 1]); + } + params->current_tag = CURRENT_TAG_IS_WAY; } static gaiaGeomCollPtr -build_linestring (sqlite3 * db_handle, const readosm_way * way) +build_linestring (sqlite3 * db_handle) { gaiaGeomCollPtr geom; gaiaLinestringPtr ln; int points = 0; int tbd; @@ -649,19 +701,18 @@ char sql[8192]; sqlite3_stmt *stmt; sqlite3_int64 id; double lat; double lon; - int i_ref; - struct node_refs *refs = NULL; - - points = way->node_ref_count; + struct nd *p_nd = glob_way.first_nd; + while (p_nd) + { + points++; + p_nd = p_nd->next; + } if (!points) return NULL; - refs = create_node_refs (way); - if (refs == NULL) - return NULL; geom = gaiaAllocGeomColl (); geom->Srid = 4326; ln = gaiaAddLinestringToGeomColl (geom, points); tbd = points; while (tbd > 0) @@ -693,19 +744,26 @@ return NULL; } sqlite3_reset (stmt); sqlite3_clear_bindings (stmt); ind = 1; - for (i_ref = 0; i_ref < refs->count; i_ref++) + count = 0; + p_nd = glob_way.first_nd; + while (p_nd) { - if (i_ref < base) - continue; - if (i_ref >= (base + how_many)) + if (count < base) + { + count++; + p_nd = p_nd->next; + continue; + } + if (count >= (base + how_many)) break; - sqlite3_bind_int64 (stmt, ind, *(refs->id + i_ref)); + sqlite3_bind_int64 (stmt, ind, p_nd->ref); ind++; count++; + p_nd = p_nd->next; } while (1) { /* scrolling the result set */ ret = sqlite3_step (stmt); @@ -718,11 +776,22 @@ { /* ok, we've just fetched a valid row */ id = sqlite3_column_int64 (stmt, 0); lat = sqlite3_column_double (stmt, 1); lon = sqlite3_column_double (stmt, 2); - update_node_refs (refs, ln, id, lat, lon); + p_nd = glob_way.first_nd; + count = 0; + while (p_nd) + { + if (p_nd->ref == id) + { + p_nd->found = 1; + gaiaSetPoint (ln->Coords, count, lon, lat); + } + count++; + p_nd = p_nd->next; + } } else { /* some unexpected error occurred */ fprintf (stderr, "sqlite3_step() error: %s\n", @@ -735,31 +804,30 @@ tbd -= how_many; base += how_many; } /* final checkout */ - for (i_ref = 0; i_ref < refs->count; i_ref++) + p_nd = glob_way.first_nd; + while (p_nd) { - if (*(refs->found + i_ref) == 'N') + if (p_nd->found == 0) { #if defined(_WIN32) || defined(__MINGW32__) /* CAVEAT - M$ runtime doesn't supports %lld for 64 bits */ - fprintf (stderr, "UNRESOLVED-NODE %I64d\n", - *(refs->id + i_ref)); + fprintf (stderr, "UNRESOLVED-NODE %I64d\n", p_nd->ref); #else - fprintf (stderr, "UNRESOLVED-NODE %lld\n", *(refs->id + i_ref)); + fprintf (stderr, "UNRESOLVED-NODE %lld\n", p_nd->ref); #endif gaiaFreeGeomColl (geom); - destroy_node_refs (refs); return NULL; } + p_nd = p_nd->next; } - destroy_node_refs (refs); return geom; } -static int +static void line_layer_insert (struct aux_params *params, const char *layer_name, sqlite3_int64 id, unsigned char *blob, int blob_size, const char *sub_type, const char *name) { struct layers *layer; @@ -766,11 +834,11 @@ int i = 0; while (1) { layer = &(base_layers[i++]); if (layer->name == NULL) - return 1; + return; if (strcmp (layer->name, layer_name) == 0) { if (layer->ok_linestring == 0) { layer->ok_linestring = 1; @@ -796,25 +864,23 @@ SQLITE_STATIC); sqlite3_bind_blob (layer->ins_linestring_stmt, 4, blob, blob_size, SQLITE_STATIC); ret = sqlite3_step (layer->ins_linestring_stmt); if (ret == SQLITE_DONE || ret == SQLITE_ROW) - return 1; + return; fprintf (stderr, "sqlite3_step() error: INS_LINESTRING %s\n", layer_name); sqlite3_finalize (layer->ins_linestring_stmt); layer->ins_linestring_stmt = NULL; - return 0; } - return 1; + return; } } - return 1; } -static int +static void polygon_layer_insert (struct aux_params *params, const char *layer_name, sqlite3_int64 id, unsigned char *blob, int blob_size, const char *sub_type, const char *name) { struct layers *layer; @@ -821,11 +887,11 @@ int i = 0; while (1) { layer = &(base_layers[i++]); if (layer->name == NULL) - return 1; + return; if (strcmp (layer->name, layer_name) == 0) { if (layer->ok_polygon == 0) { layer->ok_polygon = 1; @@ -850,25 +916,23 @@ strlen (name), SQLITE_STATIC); sqlite3_bind_blob (layer->ins_polygon_stmt, 4, blob, blob_size, SQLITE_STATIC); ret = sqlite3_step (layer->ins_polygon_stmt); if (ret == SQLITE_DONE || ret == SQLITE_ROW) - return 1; + return; fprintf (stderr, "sqlite3_step() error: INS_POLYGON %s\n", layer_name); sqlite3_finalize (layer->ins_polygon_stmt); layer->ins_polygon_stmt = NULL; - return 0; } - return 1; + return; } } - return 1; } -static int +static void line_generic_insert (struct aux_params *params, sqlite3_int64 id, unsigned char *blob, int blob_size, const char *name) { if (params->ins_generic_linestring_stmt) { @@ -883,20 +947,18 @@ strlen (name), SQLITE_STATIC); sqlite3_bind_blob (params->ins_generic_linestring_stmt, 3, blob, blob_size, SQLITE_STATIC); ret = sqlite3_step (params->ins_generic_linestring_stmt); if (ret == SQLITE_DONE || ret == SQLITE_ROW) - return 1; + return; fprintf (stderr, "sqlite3_step() error: INS_GENERIC_LINESTRING\n"); sqlite3_finalize (params->ins_generic_linestring_stmt); params->ins_generic_linestring_stmt = NULL; - return 0; } - return 1; } -static int +static void polygon_generic_insert (struct aux_params *params, sqlite3_int64 id, unsigned char *blob, int blob_size, const char *name) { if (params->ins_generic_polygon_stmt) { @@ -911,118 +973,112 @@ strlen (name), SQLITE_STATIC); sqlite3_bind_blob (params->ins_generic_polygon_stmt, 3, blob, blob_size, SQLITE_STATIC); ret = sqlite3_step (params->ins_generic_polygon_stmt); if (ret == SQLITE_DONE || ret == SQLITE_ROW) - return 1; + return; fprintf (stderr, "sqlite3_step() error: INS_GENERIC_POLYGON\n"); sqlite3_finalize (params->ins_generic_polygon_stmt); params->ins_generic_polygon_stmt = NULL; - return 0; } - return 1; } -static int +static void tmp_ways_insert (struct aux_params *params, sqlite3_int64 id, int area, unsigned char *blob, int blob_size) { int ret; if (params->ins_tmp_ways_stmt == NULL) - return 1; + return; sqlite3_reset (params->ins_tmp_ways_stmt); sqlite3_clear_bindings (params->ins_tmp_ways_stmt); sqlite3_bind_int64 (params->ins_tmp_ways_stmt, 1, id); sqlite3_bind_int (params->ins_tmp_ways_stmt, 2, area); sqlite3_bind_blob (params->ins_tmp_ways_stmt, 3, blob, blob_size, SQLITE_STATIC); ret = sqlite3_step (params->ins_tmp_ways_stmt); if (ret == SQLITE_DONE || ret == SQLITE_ROW) - return 1; + return; fprintf (stderr, "sqlite3_step() error: INS_TMP_WAYS\n"); sqlite3_finalize (params->ins_tmp_ways_stmt); params->ins_tmp_ways_stmt = NULL; - return 0; } -static int -eval_way (struct aux_params *params, const readosm_way * way, int area, - unsigned char *blob, int blob_size) +static void +eval_way (struct aux_params *params, int area, unsigned char *blob, + int blob_size) { - int i_tag; - const readosm_tag *p_tag; + struct tag *p_tag; const char *p; int i = 0; const char *layer_name = NULL; - const char *sub_type = NULL; - const char *name = NULL; - int ret; - if (way->tag_count == 0) - return 1; + char *sub_type = NULL; + char *name = NULL; + if (glob_way.first == NULL) + return; while (1) { p = base_layers[i++].name; if (!p) break; - for (i_tag = 0; i_tag < way->tag_count; i_tag++) + p_tag = glob_way.first; + while (p_tag) { - p_tag = way->tags + i_tag; - if (strcmp (p_tag->key, p) == 0) + if (strcmp (p_tag->k, p) == 0) { layer_name = p; - sub_type = p_tag->value; + sub_type = p_tag->v; } - if (strcmp (p_tag->key, "name") == 0) - name = p_tag->value; + if (strcmp (p_tag->k, "name") == 0) + name = p_tag->v; + p_tag = p_tag->next; } if (layer_name) break; } if (layer_name) { if (area) - ret = polygon_layer_insert (params, layer_name, way->id, blob, - blob_size, sub_type, name); + polygon_layer_insert (params, layer_name, glob_way.id, blob, + blob_size, sub_type, name); else - ret = line_layer_insert (params, layer_name, way->id, blob, - blob_size, sub_type, name); - return ret; + line_layer_insert (params, layer_name, glob_way.id, blob, + blob_size, sub_type, name); + return; } else if (name != NULL) { if (area) - ret = polygon_generic_insert (params, way->id, blob, blob_size, - name); + polygon_generic_insert (params, glob_way.id, blob, blob_size, + name); else - ret = - line_generic_insert (params, way->id, blob, blob_size, name); - return ret; + line_generic_insert (params, glob_way.id, blob, blob_size, name); + return; } - return 1; } static int -is_areal_layer (const readosm_way * way) +is_areal_layer () { - int i_tag; - const readosm_tag *p_tag; + struct tag *p_tag; const char *p; - const char *layer_name = NULL; int i = 0; - if (way->tag_count == 0) - return 0; + const char *layer_name = NULL; + if (glob_way.first == NULL) + return; while (1) { p = base_layers[i++].name; if (!p) break; - for (i_tag = 0; i_tag < way->tag_count; i_tag++) + p_tag = glob_way.first; + while (p_tag) { - p_tag = way->tags + i_tag; - if (strcmp (p_tag->key, p) == 0) + if (strcmp (p_tag->k, p) == 0) layer_name = p; + p_tag = p_tag->next; } if (layer_name) break; } if (layer_name) @@ -1092,174 +1148,232 @@ } gaiaFreeGeomColl (old); return geom; } -static int -consume_way (const void *user_data, const readosm_way * way) +static void +end_way (struct aux_params *params) { -/* processing an OSM Way (ReadOSM callback function) */ - struct aux_params *params = (struct aux_params *) user_data; - const readosm_tag *p_tag; - int i_tag; + struct tag *p_tag; + struct tag *p_tag2; + struct nd *p_nd; + struct nd *p_nd2; unsigned char *blob; int blob_size; int area = 0; - int ret; - gaiaGeomCollPtr geom = build_linestring (params->db_handle, way); + gaiaGeomCollPtr geom = build_linestring (params->db_handle); if (geom) { geom->DeclaredType = GAIA_MULTILINESTRING; gaiaToSpatiaLiteBlobWkb (geom, &blob, &blob_size); - if (!tmp_ways_insert (params, way->id, area, blob, blob_size)) - return READOSM_ABORT; + tmp_ways_insert (params, glob_way.id, area, blob, blob_size); area = 0; - for (i_tag = 0; i_tag < way->tag_count; i_tag++) + p_tag = glob_way.first; + while (p_tag) { - p_tag = way->tags + i_tag; - if (strcmp (p_tag->key, "area") == 0 - && strcmp (p_tag->value, "yes") == 0) + if (strcmp (p_tag->k, "area") == 0 + && strcmp (p_tag->v, "yes") == 0) area = 1; + p_tag = p_tag->next; } /* attempting to recover undeclared areas */ - if (is_areal_layer (way) && is_closed (geom)) + if (is_areal_layer () && is_closed (geom)) area = 1; if (area) { free (blob); geom = convert_to_polygon (geom); gaiaToSpatiaLiteBlobWkb (geom, &blob, &blob_size); } gaiaFreeGeomColl (geom); - ret = eval_way (params, way, area, blob, blob_size); + eval_way (params, area, blob, blob_size); free (blob); - if (ret) - return READOSM_OK; - return READOSM_ABORT; - } - return READOSM_OK; -} - -static struct way_refs * -create_way_refs (const readosm_relation * relation) -{ -/* creating and initializing the way_refs helper struct */ - int i_member; - const readosm_member *p_member; - struct way_refs *refs = NULL; - int count = 0; - - for (i_member = 0; i_member < relation->member_count; i_member++) - { - p_member = relation->members + i_member; - if (p_member->member_type == READOSM_MEMBER_WAY) - count++; - } - if (!count) - return NULL; - refs = malloc (sizeof (struct way_refs)); - if (refs == NULL) - return NULL; - refs->count = count; - refs->id = malloc (sizeof (sqlite3_int64) * refs->count); - if (refs->id == NULL) - { - free (refs); - return NULL; - } - refs->found = malloc (refs->count); - if (refs->found == NULL) - { - free (refs->id); - free (refs); - return NULL; - } - count = 0; - for (i_member = 0; i_member < relation->member_count; i_member++) - { - p_member = relation->members + i_member; - if (p_member->member_type == READOSM_MEMBER_WAY) - { - *(refs->id + count) = p_member->id; - *(refs->found + count) = 'N'; - count++; - } - } - return refs; -} - -static void -update_way_refs (struct way_refs *ways, sqlite3_int64 id, gaiaGeomCollPtr geom, - gaiaGeomCollPtr org_geom) -{ -/* updating the way_refs helper struct */ - int i_ref; - gaiaLinestringPtr ln1; - for (i_ref = 0; i_ref < ways->count; i_ref++) - { - if (*(ways->id + i_ref) == id) - { - *(ways->found + i_ref) = 'Y'; - ln1 = org_geom->FirstLinestring; - while (ln1) - { - int iv; - gaiaLinestringPtr ln2 = - gaiaAddLinestringToGeomColl (geom, ln1->Points); - for (iv = 0; iv < ln1->Points; iv++) - { - double x; - double y; - gaiaGetPoint (ln1->Coords, iv, &x, &y); - gaiaSetPoint (ln2->Coords, iv, x, y); - } - ln1 = ln1->Next; - } - } - } -} - -static void -destroy_way_refs (struct way_refs *ways) -{ -/* destroying the way_refs helper struct */ - if (ways == NULL) - return; - if (ways->id != NULL) - free (ways->id); - if (ways->found != NULL) - free (ways->found); - free (ways); + } + p_tag = glob_way.first; + while (p_tag) + { + p_tag2 = p_tag->next; + free_tag (p_tag); + p_tag = p_tag2; + } + p_nd = glob_way.first_nd; + while (p_nd) + { + p_nd2 = p_nd->next; + free (p_nd); + p_nd = p_nd2; + } + glob_way.id = -1; + glob_way.first_nd = NULL; + glob_way.last_nd = NULL; + glob_way.first = NULL; + glob_way.last = NULL; + params->current_tag = CURRENT_TAG_UNKNOWN; +} + +static void +start_nd (const char **attr) +{ + struct nd *p_nd = malloc (sizeof (struct nd)); + int i; + p_nd->ref = -1; + p_nd->found = 0; + p_nd->next = NULL; + for (i = 0; attr[i]; i += 2) + { + if (strcmp (attr[i], "ref") == 0) + p_nd->ref = atol_64 (attr[i + 1]); + } + if (glob_way.first_nd == NULL) + glob_way.first_nd = p_nd; + if (glob_way.last_nd != NULL) + glob_way.last_nd->next = p_nd; + glob_way.last_nd = p_nd; +} + +static void +start_xtag (struct aux_params *params, const char **attr) +{ + struct tag *p_tag = malloc (sizeof (struct tag)); + int i; + int len; + p_tag->k = NULL; + p_tag->v = NULL; + p_tag->next = NULL; + for (i = 0; attr[i]; i += 2) + { + if (strcmp (attr[i], "k") == 0) + { + len = strlen (attr[i + 1]); + p_tag->k = malloc (len + 1); + strcpy (p_tag->k, attr[i + 1]); + } + if (strcmp (attr[i], "v") == 0) + { + len = strlen (attr[i + 1]); + p_tag->v = malloc (len + 1); + strcpy (p_tag->v, attr[i + 1]); + } + } + if (params->current_tag == CURRENT_TAG_IS_NODE) + { + if (glob_node.first == NULL) + glob_node.first = p_tag; + if (glob_node.last != NULL) + glob_node.last->next = p_tag; + glob_node.last = p_tag; + } + if (params->current_tag == CURRENT_TAG_IS_WAY) + { + if (glob_way.first == NULL) + glob_way.first = p_tag; + if (glob_way.last != NULL) + glob_way.last->next = p_tag; + glob_way.last = p_tag; + } + if (params->current_tag == CURRENT_TAG_IS_RELATION) + { + if (glob_relation.first == NULL) + glob_relation.first = p_tag; + if (glob_relation.last != NULL) + glob_relation.last->next = p_tag; + glob_relation.last = p_tag; + } +} + +static void +start_member (const char **attr) +{ + struct member *p_member = malloc (sizeof (struct member)); + int i; + int len; + p_member->ref = -1; + p_member->is_node = 0; + p_member->is_way = 0; + p_member->found = 0; + p_member->role = NULL; + p_member->next = NULL; + for (i = 0; attr[i]; i += 2) + { + if (strcmp (attr[i], "type") == 0) + { + if (strcmp (attr[i + 1], "node") == 0) + { + p_member->is_node = 1; + p_member->is_way = 0; + } + else if (strcmp (attr[i + 1], "way") == 0) + { + p_member->is_node = 0; + p_member->is_way = 1; + } + else + { + p_member->is_node = 0; + p_member->is_way = 0; + } + } + if (strcmp (attr[i], "ref") == 0) + p_member->ref = atol_64 (attr[i + 1]); + if (strcmp (attr[i], "role") == 0) + { + len = strlen (attr[i + 1]); + p_member->role = malloc (len + 1); + strcpy (p_member->role, attr[i + 1]); + } + } + if (glob_relation.first_member == NULL) + glob_relation.first_member = p_member; + if (glob_relation.last_member != NULL) + glob_relation.last_member->next = p_member; + glob_relation.last_member = p_member; +} + +static void +start_relation (struct aux_params *params, const char **attr) +{ + int i; + glob_relation.id = -1; + glob_relation.first_member = NULL; + glob_relation.last_member = NULL; + glob_relation.first = NULL; + glob_relation.last = NULL; + for (i = 0; attr[i]; i += 2) + { + if (strcmp (attr[i], "id") == 0) + glob_relation.id = atol_64 (attr[i + 1]); + } + params->current_tag = CURRENT_TAG_IS_RELATION; } static gaiaGeomCollPtr -build_multilinestring (sqlite3 * db_handle, const readosm_relation * relation) +build_multilinestring (sqlite3 * db_handle) { gaiaGeomCollPtr geom; int lines = 0; int tbd; int block = 128; int base = 0; int how_many; int ind; int ret; + int count; char sql[8192]; sqlite3_stmt *stmt; sqlite3_int64 id; const unsigned char *blob = NULL; int blob_size; gaiaGeomCollPtr org_geom; - static struct way_refs *refs = NULL; - int i_member; - - refs = create_way_refs (relation); - if (refs == NULL) - return NULL; - lines = refs->count; + struct member *p_member = glob_relation.first_member; + while (p_member) + { + lines++; + p_member = p_member->next; + } if (!lines) return NULL; geom = gaiaAllocGeomColl (); geom->Srid = 4326; geom->DeclaredType = GAIA_MULTILINESTRING; @@ -1266,11 +1380,11 @@ tbd = lines; while (tbd > 0) { /* / fetching ways - / requesting max 128 ways at each time + / requesting max 128 points at each time */ if (tbd < block) how_many = tbd; else how_many = block; @@ -1293,18 +1407,26 @@ return NULL; } sqlite3_reset (stmt); sqlite3_clear_bindings (stmt); ind = 1; - for (i_member = 0; i_member < refs->count; i_member++) + count = 0; + p_member = glob_relation.first_member; + while (p_member) { - if (i_member < base) - continue; - if (i_member >= (base + how_many)) + if (count < base) + { + count++; + p_member = p_member->next; + continue; + } + if (count >= (base + how_many)) break; - sqlite3_bind_int64 (stmt, ind, *(refs->id + i_member)); + sqlite3_bind_int64 (stmt, ind, p_member->ref); ind++; + count++; + p_member = p_member->next; } while (1) { /* scrolling the result set */ ret = sqlite3_step (stmt); @@ -1321,11 +1443,41 @@ blob_size = sqlite3_column_bytes (stmt, 1); org_geom = gaiaFromSpatiaLiteBlobWkb (blob, blob_size); if (org_geom) { - update_way_refs (refs, id, geom, org_geom); + p_member = glob_relation.first_member; + count = 0; + while (p_member) + { + if (p_member->ref == id) + { + gaiaLinestringPtr ln1; + p_member->found = 1; + ln1 = org_geom->FirstLinestring; + while (ln1) + { + int iv; + gaiaLinestringPtr ln2 = + gaiaAddLinestringToGeomColl + (geom, ln1->Points); + for (iv = 0; iv < ln2->Points; + iv++) + { + double x; + double y; + gaiaGetPoint (ln1->Coords, + iv, &x, &y); + gaiaSetPoint (ln2->Coords, + iv, x, y); + } + ln1 = ln1->Next; + } + } + count++; + p_member = p_member->next; + } gaiaFreeGeomColl (org_geom); } } else { @@ -1340,33 +1492,32 @@ tbd -= how_many; base += how_many; } /* final checkout */ - for (ind = 0; ind < refs->count; ind++) + p_member = glob_relation.first_member; + while (p_member) { - if (*(refs->found + ind) == 'N') + if (p_member->found == 0) { #if defined(_WIN32) || defined(__MINGW32__) /* CAVEAT - M$ runtime doesn't supports %lld for 64 bits */ - fprintf (stderr, "UNRESOLVED-WAY %I64d\n", *(refs->id + ind)); + fprintf (stderr, "UNRESOLVED-WAY %I64d\n", p_member->ref); #else - fprintf (stderr, "UNRESOLVED-WAY %lld\n", *(refs->id + ind)); + fprintf (stderr, "UNRESOLVED-WAY %lld\n", p_member->ref); #endif gaiaFreeGeomColl (geom); - destroy_way_refs (refs); return NULL; } + p_member = p_member->next; } - destroy_way_refs (refs); return geom; } -static int +static void multiline_layer_insert (struct aux_params *params, const char *layer_name, - const char *sub_type, const readosm_relation * relation, - const char *name) + const char *sub_type, const char *name) { gaiaGeomCollPtr geom; unsigned char *blob = NULL; int blob_size; struct layers *layer; @@ -1373,19 +1524,19 @@ int i = 0; while (1) { layer = &(base_layers[i++]); if (layer->name == NULL) - return 1; + return; if (strcmp (layer->name, layer_name) == 0) { if (layer->ok_linestring == 0) { layer->ok_linestring = 1; create_linestring_table (params, layer); } - geom = build_multilinestring (params->db_handle, relation); + geom = build_multilinestring (params->db_handle); if (geom) { gaiaToSpatiaLiteBlobWkb (geom, &blob, &blob_size); gaiaFreeGeomColl (geom); } @@ -1393,11 +1544,11 @@ { int ret; sqlite3_reset (layer->ins_linestring_stmt); sqlite3_clear_bindings (layer->ins_linestring_stmt); sqlite3_bind_int64 (layer->ins_linestring_stmt, 1, - relation->id); + glob_relation.id); if (sub_type == NULL) sqlite3_bind_null (layer->ins_linestring_stmt, 2); else sqlite3_bind_text (layer->ins_linestring_stmt, 2, sub_type, strlen (sub_type), @@ -1410,163 +1561,27 @@ SQLITE_STATIC); sqlite3_bind_blob (layer->ins_linestring_stmt, 4, blob, blob_size, free); ret = sqlite3_step (layer->ins_linestring_stmt); if (ret == SQLITE_DONE || ret == SQLITE_ROW) - return 1; + return; fprintf (stderr, "sqlite3_step() error: INS_MULTILINESTRING %s\n", layer_name); sqlite3_finalize (layer->ins_linestring_stmt); layer->ins_linestring_stmt = NULL; - return 0; } - return 1; - } - } - return 1; -} - -static struct ring_refs * -create_ring_refs (const readosm_relation * relation) -{ -/* creating and initializing the ring_refs helper struct */ - int i_member; - const readosm_member *p_member; - struct ring_refs *refs = NULL; - int count = 0; - - for (i_member = 0; i_member < relation->member_count; i_member++) - { - p_member = relation->members + i_member; - if (p_member->member_type == READOSM_MEMBER_WAY) - { - if (p_member->role) - { - if (strcmp (p_member->role, "inner") == 0 - || strcmp (p_member->role, "outer") == 0) - count++; - } - } - } - if (!count) - return NULL; - refs = malloc (sizeof (struct ring_refs)); - if (refs == NULL) - return NULL; - refs->count = count; - refs->id = malloc (sizeof (sqlite3_int64) * refs->count); - if (refs->id == NULL) - { - free (refs); - return NULL; - } - refs->found = malloc (refs->count); - if (refs->found == NULL) - { - free (refs->id); - free (refs); - return NULL; - } - refs->geom = malloc (sizeof (gaiaGeomCollPtr) * refs->count); - if (refs->geom == NULL) - { - free (refs->id); - free (refs->found); - free (refs); - return NULL; - } - refs->outer = malloc (refs->count); - if (refs->outer == NULL) - { - free (refs->id); - free (refs->found); - free (refs->geom); - free (refs); - return NULL; - } - memset (refs->outer, 'N', refs->count); - memset (refs->found, 'N', refs->count); - count = 0; - for (i_member = 0; i_member < relation->member_count; i_member++) - { - p_member = relation->members + i_member; - if (p_member->member_type == READOSM_MEMBER_WAY) - { - int is_outer = 0; - int ok = 0; - if (p_member->role) - { - if (strcmp (p_member->role, "inner") == 0) - ok = 1; - if (strcmp (p_member->role, "outer") == 0) - { - is_outer = 1; - ok = 1; - } - } - if (!ok) - continue; - *(refs->id + count) = p_member->id; - *(refs->geom + count) = NULL; - if (is_outer) - *(refs->outer + count) = 'Y'; - count++; - } - } - return refs; -} - -static void -update_ring_refs (struct ring_refs *rings, sqlite3_int64 id, - gaiaGeomCollPtr geom) -{ -/* updating the ring_refs helper struct */ - int i_ref; - for (i_ref = 0; i_ref < rings->count; i_ref++) - { - if (*(rings->id + i_ref) == id) - { - *(rings->found + i_ref) = 'Y'; - *(rings->geom + i_ref) = geom; - } - } -} - -static void -destroy_ring_refs (struct ring_refs *rings) -{ -/* destroying the ring_refs helper struct */ - int i; - gaiaGeomCollPtr g; - - if (rings == NULL) - return; - if (rings->id != NULL) - free (rings->id); - if (rings->found != NULL) - free (rings->found); - if (rings->outer != NULL) - free (rings->outer); - if (rings->geom != NULL) - { - for (i = 0; i < rings->count; i++) - { - g = *(rings->geom + i); - if (g) - gaiaFreeGeomColl (g); - } - free (rings->geom); - } - free (rings); + return; + } + } } static gaiaGeomCollPtr -build_multipolygon (sqlite3 * db_handle, const readosm_relation * relation) +build_multipolygon (sqlite3 * db_handle) { gaiaGeomCollPtr geom; - gaiaPolygonPtr pg = NULL; + gaiaPolygonPtr pg2 = NULL; int rings = 0; int interiors = 0; int exteriors = 0; int ext_pts; int ib = 0; @@ -1574,43 +1589,37 @@ int block = 128; int base = 0; int how_many; int ind; int ret; + int count; char sql[8192]; sqlite3_stmt *stmt; sqlite3_int64 id; const unsigned char *blob = NULL; int blob_size; gaiaGeomCollPtr org_geom; - int i_member; - const readosm_member *p_member; - struct ring_refs *refs = NULL; - - for (i_member = 0; i_member < relation->member_count; i_member++) + struct member *p_member = glob_relation.first_member; + while (p_member) { - p_member = relation->members + i_member; - if (p_member->member_type == READOSM_MEMBER_WAY) + rings++; + if (p_member->role) { - rings++; - if (p_member->role) - { - if (strcmp (p_member->role, "inner") == 0) - interiors++; - if (strcmp (p_member->role, "outer") == 0) - exteriors++; - } + if (strcmp (p_member->role, "inner") == 0) + interiors++; + if (strcmp (p_member->role, "outer") == 0) + exteriors++; } + p_member = p_member->next; } if (!rings) return NULL; if (exteriors != 1) return NULL; if (interiors + 1 != rings) return NULL; - refs = create_ring_refs (relation); geom = gaiaAllocGeomColl (); geom->Srid = 4326; geom->DeclaredType = GAIA_MULTIPOLYGON; tbd = rings; while (tbd > 0) @@ -1642,19 +1651,26 @@ return NULL; } sqlite3_reset (stmt); sqlite3_clear_bindings (stmt); ind = 1; - - for (i_member = 0; i_member < refs->count; i_member++) + count = 0; + p_member = glob_relation.first_member; + while (p_member) { - if (i_member < base) - continue; - if (i_member >= (base + how_many)) + if (count < base) + { + count++; + p_member = p_member->next; + continue; + } + if (count >= (base + how_many)) break; - sqlite3_bind_int64 (stmt, ind, *(refs->id + i_member)); + sqlite3_bind_int64 (stmt, ind, p_member->ref); ind++; + count++; + p_member = p_member->next; } while (1) { /* scrolling the result set */ ret = sqlite3_step (stmt); @@ -1669,11 +1685,21 @@ id = sqlite3_column_int64 (stmt, 0); blob = sqlite3_column_blob (stmt, 2); blob_size = sqlite3_column_bytes (stmt, 2); org_geom = gaiaFromSpatiaLiteBlobWkb (blob, blob_size); if (org_geom) - update_ring_refs (refs, id, org_geom); + { + while (p_member) + { + if (p_member->ref == id) + { + p_member->geom = org_geom; + p_member->found = 1; + } + p_member = p_member->next; + } + } } else { /* some unexpected error occurred */ fprintf (stderr, "sqlite3_step() error: %s\n", @@ -1687,76 +1713,79 @@ base += how_many; } /* final checkout */ ext_pts = 0; - for (i_member = 0; i_member < refs->count; i_member++) + p_member = glob_relation.first_member; + while (p_member) { - if (*(refs->found + i_member) == 'N') + if (p_member->found == 0) { - id = *(refs->id + i_member); #if defined(_WIN32) || defined(__MINGW32__) /* CAVEAT - M$ runtime doesn't supports %lld for 64 bits */ - fprintf (stderr, "UNRESOLVED-WAY %I64d\n", id); + fprintf (stderr, "UNRESOLVED-WAY %I64d\n", p_member->ref); #else - fprintf (stderr, "UNRESOLVED-WAY %lld\n", id); + fprintf (stderr, "UNRESOLVED-WAY %lld\n", p_member->ref); #endif gaiaFreeGeomColl (geom); - destroy_ring_refs (refs); return NULL; } - if (*(refs->outer + i_member) == 'Y') + if (strcmp (p_member->role, "outer") == 0) { - gaiaGeomCollPtr g = *(refs->geom + i_member); - if (g) + if (p_member->geom) { - if (g->FirstLinestring) - ext_pts = g->FirstLinestring->Points; + if (p_member->geom->FirstPolygon) + ext_pts = + p_member->geom->FirstPolygon->Exterior->Points; } } + p_member = p_member->next; } if (!ext_pts) { #if defined(_WIN32) || defined(__MINGW32__) /* CAVEAT - M$ runtime doesn't supports %lld for 64 bits */ - fprintf (stderr, "ILLEGAL MULTIPOLYGON %I64d\n", id); + fprintf (stderr, "ILLEGAL MULTIPOLYGON %I64d\n", p_member->ref); #else - fprintf (stderr, "ILLEGAL MULTIPOLYGON %lld\n", id); + fprintf (stderr, "ILLEGAL MULTIPOLYGON %lld\n", p_member->ref); #endif gaiaFreeGeomColl (geom); - destroy_ring_refs (refs); return NULL; } - pg = gaiaAddPolygonToGeomColl (geom, ext_pts, interiors); - for (i_member = 0; i_member < refs->count; i_member++) - { - gaiaLinestringPtr ln; - int iv; - gaiaRingPtr rng; - org_geom = *(refs->geom + i_member); - ln = org_geom->FirstLinestring; - if (*(refs->outer + i_member) == 'Y') - rng = pg->Exterior; - else - rng = gaiaAddInteriorRing (pg, ib++, ln->Points); - for (iv = 0; iv < ln->Points; iv++) - { - double x; - double y; - gaiaGetPoint (ln->Coords, iv, &x, &y); - gaiaSetPoint (rng->Coords, iv, x, y); - } - } - destroy_ring_refs (refs); + pg2 = gaiaAddPolygonToGeomColl (geom, ext_pts, interiors); + p_member = glob_relation.first_member; + while (p_member) + { + gaiaPolygonPtr pg1; + pg1 = org_geom->FirstPolygon; + while (pg1) + { + int iv; + gaiaRingPtr rng1 = pg1->Exterior; + gaiaRingPtr rng2; + if (strcmp (p_member->role, "outer") == 0) + rng2 = pg2->Exterior; + else + rng2 = pg2->Interiors + ib++; + for (iv = 0; iv < rng2->Points; iv++) + { + double x; + double y; + gaiaGetPoint (rng1->Coords, iv, &x, &y); + gaiaSetPoint (rng2->Coords, iv, x, y); + } + pg1 = pg1->Next; + } + p_member = p_member->next; + } return geom; } -static int +static void multipolygon_layer_insert (struct aux_params *params, const char *layer_name, - const char *sub_type, - const readosm_relation * relation, const char *name) + const char *sub_type, const char *name) { gaiaGeomCollPtr geom; unsigned char *blob = NULL; int blob_size; struct layers *layer; @@ -1763,19 +1792,19 @@ int i = 0; while (1) { layer = &(base_layers[i++]); if (layer->name == NULL) - return 1; + return; if (strcmp (layer->name, layer_name) == 0) { if (layer->ok_polygon == 0) { layer->ok_polygon = 1; create_polygon_table (params, layer); } - geom = build_multipolygon (params->db_handle, relation); + geom = build_multipolygon (params->db_handle); if (geom) { gaiaToSpatiaLiteBlobWkb (geom, &blob, &blob_size); gaiaFreeGeomColl (geom); } @@ -1783,11 +1812,11 @@ { int ret; sqlite3_reset (layer->ins_polygon_stmt); sqlite3_clear_bindings (layer->ins_polygon_stmt); sqlite3_bind_int64 (layer->ins_polygon_stmt, 1, - relation->id); + glob_relation.id); if (sub_type == NULL) sqlite3_bind_null (layer->ins_polygon_stmt, 2); else sqlite3_bind_text (layer->ins_polygon_stmt, 2, sub_type, strlen (sub_type), @@ -1799,32 +1828,29 @@ strlen (name), SQLITE_STATIC); sqlite3_bind_blob (layer->ins_polygon_stmt, 4, blob, blob_size, SQLITE_STATIC); ret = sqlite3_step (layer->ins_polygon_stmt); if (ret == SQLITE_DONE || ret == SQLITE_ROW) - return 1; + return; fprintf (stderr, "sqlite3_step() error: INS_MULTIPOLYGON %s\n", layer_name); sqlite3_finalize (layer->ins_polygon_stmt); layer->ins_polygon_stmt = NULL; - return 0; } - return 1; + return; } } - return 1; } -static int -multiline_generic_insert (struct aux_params *params, - const readosm_relation * relation, const char *name) +static void +multiline_generic_insert (struct aux_params *params, const char *name) { gaiaGeomCollPtr geom; unsigned char *blob = NULL; int blob_size; - geom = build_multilinestring (params->db_handle, relation); + geom = build_multilinestring (params->db_handle); if (geom) { gaiaToSpatiaLiteBlobWkb (geom, &blob, &blob_size); gaiaFreeGeomColl (geom); } @@ -1832,39 +1858,35 @@ { int ret; sqlite3_reset (params->ins_generic_linestring_stmt); sqlite3_clear_bindings (params->ins_generic_linestring_stmt); sqlite3_bind_int64 (params->ins_generic_linestring_stmt, 1, - relation->id); + glob_relation.id); if (name == NULL) sqlite3_bind_null (params->ins_generic_linestring_stmt, 2); else sqlite3_bind_text (params->ins_generic_linestring_stmt, 2, name, strlen (name), SQLITE_STATIC); sqlite3_bind_blob (params->ins_generic_linestring_stmt, 3, blob, blob_size, SQLITE_STATIC); ret = sqlite3_step (params->ins_generic_linestring_stmt); if (ret == SQLITE_DONE || ret == SQLITE_ROW) - return 1; + return; fprintf (stderr, "sqlite3_step() error: INS_GENERIC_MULTILINESTRING\n"); sqlite3_finalize (params->ins_generic_linestring_stmt); params->ins_generic_linestring_stmt = NULL; - return 0; } - return 1; } -static int -multipolygon_generic_insert (struct aux_params *params, - const readosm_relation * relation, - const char *name) +static void +multipolygon_generic_insert (struct aux_params *params, const char *name) { gaiaGeomCollPtr geom; unsigned char *blob = NULL; int blob_size; - geom = build_multipolygon (params->db_handle, relation); + geom = build_multipolygon (params->db_handle); if (geom) { gaiaToSpatiaLiteBlobWkb (geom, &blob, &blob_size); gaiaFreeGeomColl (geom); } @@ -1872,92 +1894,138 @@ { int ret; sqlite3_reset (params->ins_generic_polygon_stmt); sqlite3_clear_bindings (params->ins_generic_polygon_stmt); sqlite3_bind_int64 (params->ins_generic_polygon_stmt, 1, - relation->id); + glob_relation.id); if (name == NULL) sqlite3_bind_null (params->ins_generic_polygon_stmt, 2); else sqlite3_bind_text (params->ins_generic_polygon_stmt, 2, name, strlen (name), SQLITE_STATIC); sqlite3_bind_blob (params->ins_generic_polygon_stmt, 3, blob, blob_size, SQLITE_STATIC); ret = sqlite3_step (params->ins_generic_polygon_stmt); if (ret == SQLITE_DONE || ret == SQLITE_ROW) - return 1; + return; fprintf (stderr, "sqlite3_step() error: INS_GENERIC_MULTIPOLYGON\n"); sqlite3_finalize (params->ins_generic_polygon_stmt); params->ins_generic_polygon_stmt = NULL; - return 0; } - return 1; } -static int -consume_relation (const void *user_data, const readosm_relation * relation) +static void +eval_relation (struct aux_params *params) { -/* processing an OSM Relation (ReadOSM callback function) */ - struct aux_params *params = (struct aux_params *) user_data; - const readosm_tag *p_tag; + struct tag *p_tag; const char *p; - int i_tag = 0; - int i_lyr = 0; - int ret; + int i = 0; const char *layer_name = NULL; - const char *sub_type = NULL; - const char *name = NULL; + char *sub_type = NULL; + char *name = NULL; int multipolygon = 0; - + if (glob_relation.first == NULL) + return; while (1) { - p = base_layers[i_lyr++].name; + p = base_layers[i++].name; if (!p) break; - for (i_tag = 0; i_tag < relation->tag_count; i_tag++) + p_tag = glob_relation.first; + while (p_tag) { - p_tag = relation->tags + i_tag; - if (strcmp (p_tag->key, p) == 0) + if (strcmp (p_tag->k, p) == 0) { layer_name = p; - sub_type = p_tag->value; + sub_type = p_tag->v; } - if (strcmp (p_tag->key, "name") == 0) - name = p_tag->value; - if (strcmp (p_tag->key, "type") == 0 - && strcmp (p_tag->value, "multipolygon") == 0) + if (strcmp (p_tag->k, "name") == 0) + name = p_tag->v; + if (strcmp (p_tag->k, "type") == 0 + && strcmp (p_tag->v, "multipolygon") == 0) multipolygon = 1; + p_tag = p_tag->next; } if (layer_name) break; } - if (layer_name) { if (multipolygon) - ret = - multipolygon_layer_insert (params, layer_name, sub_type, - relation, name); + multipolygon_layer_insert (params, layer_name, sub_type, name); else - ret = - multiline_layer_insert (params, layer_name, sub_type, - relation, name); - if (ret) - return READOSM_OK; - return READOSM_ABORT; + multiline_layer_insert (params, layer_name, sub_type, name); + return; } else if (name != NULL) { if (multipolygon) - ret = multipolygon_generic_insert (params, relation, name); + multipolygon_generic_insert (params, name); else - ret = multiline_generic_insert (params, relation, name); - if (ret) - return READOSM_OK; - return READOSM_ABORT; + multiline_generic_insert (params, name); + return; } - return READOSM_OK; +} + +static void +end_relation (struct aux_params *params) +{ + struct tag *p_tag; + struct tag *p_tag2; + struct member *p_member; + struct member *p_member2; + eval_relation (params); + p_tag = glob_relation.first; + while (p_tag) + { + p_tag2 = p_tag->next; + free_tag (p_tag); + p_tag = p_tag2; + } + p_member = glob_relation.first_member; + while (p_member) + { + p_member2 = p_member->next; + free_member (p_member); + p_member = p_member2; + } + glob_relation.id = -1; + glob_relation.first_member = NULL; + glob_relation.last_member = NULL; + glob_relation.first = NULL; + glob_relation.last = NULL; + params->current_tag = CURRENT_TAG_UNKNOWN; +} + +static void +start_tag (void *data, const char *el, const char **attr) +{ + struct aux_params *params = (struct aux_params *) data; + if (strcmp (el, "node") == 0) + start_node (params, attr); + if (strcmp (el, "tag") == 0) + start_xtag (params, attr); + if (strcmp (el, "way") == 0) + start_way (params, attr); + if (strcmp (el, "nd") == 0) + start_nd (attr); + if (strcmp (el, "relation") == 0) + start_relation (params, attr); + if (strcmp (el, "member") == 0) + start_member (attr); +} + +static void +end_tag (void *data, const char *el) +{ + struct aux_params *params = (struct aux_params *) data; + if (strcmp (el, "node") == 0) + end_node (params); + if (strcmp (el, "way") == 0) + end_way (params); + if (strcmp (el, "relation") == 0) + end_relation (params); } static void db_vacuum (sqlite3 * db_handle) { @@ -2314,11 +2382,11 @@ return; } } static void -create_sql_stmts (struct aux_params *params, int journal_off) +create_sql_stmts (struct aux_params *params) { sqlite3_stmt *ins_tmp_nodes_stmt; sqlite3_stmt *ins_tmp_ways_stmt; sqlite3_stmt *ins_generic_point_stmt; sqlite3_stmt *ins_addresses_stmt; @@ -2326,25 +2394,10 @@ sqlite3_stmt *ins_generic_polygon_stmt; char sql[1024]; int ret; char *sql_err = NULL; - if (journal_off) - { - /* disabling the journal: unsafe but faster */ - ret = - sqlite3_exec (params->db_handle, "PRAGMA journal_mode = OFF", - NULL, NULL, &sql_err); - if (ret != SQLITE_OK) - { - fprintf (stderr, "PRAGMA journal_mode=OFF error: %s\n", - sql_err); - sqlite3_free (sql_err); - return; - } - } - /* the complete operation is handled as an unique SQL Transaction */ ret = sqlite3_exec (params->db_handle, "BEGIN", NULL, NULL, &sql_err); if (ret != SQLITE_OK) { fprintf (stderr, "BEGIN TRANSACTION error: %s\n", sql_err); @@ -2530,24 +2583,18 @@ "==============================================================\n"); fprintf (stderr, "-h or --help print this help message\n"); fprintf (stderr, "-o or --osm-path pathname the OSM-XML file path\n"); fprintf (stderr, - " both OSM-XML (*.osm) and OSM-ProtoBuf\n"); - fprintf (stderr, - " (*.osm.pbf) are indifferenctly supported.\n\n"); - fprintf (stderr, "-d or --db-path pathname the SpatiaLite DB path\n\n"); fprintf (stderr, "you can specify the following options as well\n"); fprintf (stderr, "-cs or --cache-size num DB cache size (how many pages)\n"); fprintf (stderr, "-m or --in-memory using IN-MEMORY database\n"); fprintf (stderr, "-n or --no-spatial-index suppress R*Trees generation\n"); - fprintf (stderr, - "-jo or --journal-off unsafe [but faster] mode\n"); } int main (int argc, char *argv[]) { @@ -2557,25 +2604,30 @@ int next_arg = ARG_NONE; const char *osm_path = NULL; const char *db_path = NULL; int in_memory = 0; int cache_size = 0; - int journal_off = 0; int spatial_index = 1; int error = 0; + char Buff[BUFFSIZE]; + int done = 0; + int len; + XML_Parser parser; struct aux_params params; - const void *osm_handle; + FILE *xml_file; + int last_line_no = 0; + int curr_line_no = 0; /* initializing the aux-struct */ params.db_handle = NULL; params.ins_tmp_nodes_stmt = NULL; params.ins_tmp_ways_stmt = NULL; params.ins_generic_point_stmt = NULL; params.ins_addresses_stmt = NULL; params.ins_generic_linestring_stmt = NULL; params.ins_generic_polygon_stmt = NULL; - + params.current_tag = CURRENT_TAG_UNKNOWN; for (i = 1; i < argc; i++) { /* parsing the invocation arguments */ if (next_arg != ARG_NONE) @@ -2631,25 +2683,13 @@ { in_memory = 1; next_arg = ARG_NONE; continue; } - if (strcasecmp (argv[i], "--in-memory") == 0) + if (strcasecmp (argv[i], "-in-memory") == 0) { in_memory = 1; - next_arg = ARG_NONE; - continue; - } - if (strcasecmp (argv[i], "-jo") == 0) - { - journal_off = 1; - next_arg = ARG_NONE; - continue; - } - if (strcasecmp (argv[i], "--journal-off") == 0) - { - journal_off = 1; next_arg = ARG_NONE; continue; } if (strcasecmp (argv[i], "-n") == 0) { @@ -2734,32 +2774,58 @@ printf ("\nusing IN-MEMORY database\n"); } params.db_handle = handle; /* creating SQL prepared statements */ - create_sql_stmts (¶ms, journal_off); + create_sql_stmts (¶ms); -/* parsing the input OSM-file */ - if (readosm_open (osm_path, &osm_handle) != READOSM_OK) +/* XML parsing */ + xml_file = fopen (osm_path, "rb"); + if (!xml_file) { fprintf (stderr, "cannot open %s\n", osm_path); - finalize_sql_stmts (¶ms); sqlite3_close (handle); - readosm_close (osm_handle); + return -1; + } + parser = XML_ParserCreate (NULL); + if (!parser) + { + fprintf (stderr, "Couldn't allocate memory for parser\n"); + sqlite3_close (handle); return -1; } - if (readosm_parse - (osm_handle, ¶ms, consume_node, consume_way, - consume_relation) != READOSM_OK) + XML_SetUserData (parser, ¶ms); + XML_SetElementHandler (parser, start_tag, end_tag); + while (!done) { - fprintf (stderr, "unrecoverable error while parsing %s\n", osm_path); - finalize_sql_stmts (¶ms); - sqlite3_close (handle); - readosm_close (osm_handle); - return -1; + len = fread (Buff, 1, BUFFSIZE, xml_file); + if (ferror (xml_file)) + { + fprintf (stderr, "XML Read error\n"); + sqlite3_close (handle); + return -1; + } + done = feof (xml_file); + if (!XML_Parse (parser, Buff, len, done)) + { + fprintf (stderr, "Parse error at line %d:\n%s\n", + (int) XML_GetCurrentLineNumber (parser), + XML_ErrorString (XML_GetErrorCode (parser))); + sqlite3_close (handle); + return -1; + } + curr_line_no = (int) XML_GetCurrentLineNumber (parser); + if ((curr_line_no - last_line_no) > 1000) + { + last_line_no = curr_line_no; + printf ("Parsing XML line: %d\r", curr_line_no); + fflush (stdout); + } } - readosm_close (osm_handle); + XML_ParserFree (parser); + fclose (xml_file); + printf (" \r"); /* finalizing SQL prepared statements */ finalize_sql_stmts (¶ms); /* dropping the OSM_TMP_xx tables */ Index: spatialite_osm_net.c ================================================================== --- spatialite_osm_net.c +++ spatialite_osm_net.c @@ -41,1287 +41,2004 @@ #include #endif #include #include -#include #define ARG_NONE 0 #define ARG_OSM_PATH 1 #define ARG_DB_PATH 2 #define ARG_TABLE 3 #define ARG_CACHE_SIZE 4 -#define ARG_TEMPLATE_PATH 5 - -#define NODE_STRAT_NONE 0 -#define NODE_STRAT_ALL 1 -#define NODE_STRAT_ENDS 2 -#define ONEWAY_STRAT_NONE 0 -#define ONEWAY_STRAT_FULL 1 -#define ONEWAY_STRAT_NO_ROUND 2 -#define ONEWAY_STRAT_NO_MOTOR 3 -#define ONEWAY_STRAT_NO_BOTH 4 - -struct aux_speed -{ -/* an auxiliary struct for Speeds */ - char *class_name; - double speed; - struct aux_speed *next; + +#define MAX_TAG 16 + +#if defined(_WIN32) && !defined(__MINGW32__) +#define strcasecmp _stricmp +#endif /* not WIN32 */ + +#if defined(_WIN32) +#define atol_64 _atoi64 +#else +#define atol_64 atoll +#endif + +struct dup_node_id +{ + sqlite3_int64 id; + struct dup_node_id *next; +}; + +struct dup_node +{ + double lon; + double lat; + int refcount; + struct dup_node_id *first; + struct dup_node_id *last; + struct dup_node *next; +}; + +struct kv +{ + char *k; + char *v; + struct kv *next; +}; + +struct node_ref +{ + sqlite3_int64 id; + sqlite3_int64 alias; + double lat; + double lon; + int refcount; + int ignore; + struct node_ref *next; +}; + +struct arc +{ + sqlite3_int64 from; + sqlite3_int64 to; + gaiaDynamicLinePtr dyn; + gaiaGeomCollPtr geom; + double length; + double cost; + struct arc *next; }; -struct aux_class +struct way { -/* an auxiliary struct for road Classes */ - char *class_name; - char *sub_class; - struct aux_class *next; + sqlite3_int64 id; + char *class; + char *name; + int oneway; + int reverse; + struct node_ref *first; + struct node_ref *last; + struct kv *first_kv; + struct kv *last_kv; + struct arc *first_arc; + struct arc *last_arc; }; -struct aux_params +struct check_tag { -/* an auxiliary struct used for OSM parsing */ - sqlite3 *db_handle; - const char *table; - int noding_strategy; - int oneway_strategy; - struct aux_speed *first_speed; - struct aux_speed *last_speed; - double default_speed; - struct aux_class *first_include; - struct aux_class *last_include; - struct aux_class *first_ignore; - struct aux_class *last_ignore; - sqlite3_stmt *ins_tmp_nodes_stmt; - sqlite3_stmt *upd_tmp_nodes_stmt; - sqlite3_stmt *rd_tmp_nodes_stmt; - sqlite3_stmt *ins_arcs_stmt; + char buf[MAX_TAG + 1]; + int pos; + int max; }; static void -save_current_line (gaiaGeomCollPtr geom, gaiaDynamicLinePtr dyn) -{ -/* inserting a GraphArc from a splitted Way */ - gaiaPointPtr pt; - gaiaLinestringPtr ln; - int iv; - int points = 0; - - pt = dyn->First; - while (pt) - { - /* counting how many points are there */ - points++; - pt = pt->Next; - } - if (points < 2) - return; - ln = gaiaAddLinestringToGeomColl (geom, points); - iv = 0; - pt = dyn->First; - while (pt) - { - gaiaSetPoint (ln->Coords, iv, pt->X, pt->Y); - iv++; - pt = pt->Next; - } -} - -static gaiaGeomCollPtr -build_linestrings (struct aux_params *params, const readosm_way * way) -{ -/* building the Arcs of the Graph [may be, splitting a Way in more Arcs] */ - int i_ref; - int ret; - gaiaGeomCollPtr geom; - gaiaDynamicLinePtr dyn = gaiaAllocDynamicLine (); - gaiaPointPtr pt; - - geom = gaiaAllocGeomColl (); - geom->Srid = 4326; - - for (i_ref = 0; i_ref < way->node_ref_count; i_ref++) - { - /* fetching point coords */ - sqlite3_int64 id = *(way->node_refs + i_ref); - double x; - double y; - int ref_count; - - sqlite3_reset (params->rd_tmp_nodes_stmt); - sqlite3_clear_bindings (params->rd_tmp_nodes_stmt); - sqlite3_bind_int64 (params->rd_tmp_nodes_stmt, 1, id); - +init_tag (struct check_tag *tag, int max) +{ + tag->pos = 0; + tag->max = max; + memset (tag->buf, '\0', MAX_TAG + 1); +} + +static void +update_tag (struct check_tag *tag, const char c) +{ +/* updating the tag control struct */ + int i; + if (tag->pos == (tag->max - 1)) + { + for (i = 0; i < tag->max; i++) + { + /* rotating the buffer */ + *(tag->buf + i) = *(tag->buf + i + 1); + } + *(tag->buf + tag->pos) = c; + return; + } + *(tag->buf + tag->pos) = c; + tag->pos++; +} + +static int +parse_node_id (const char *buf, sqlite3_int64 * id) +{ +/* parsing */ + char value[128]; + char *out = value; + const char *p = buf; + struct check_tag tag; + init_tag (&tag, 4); + while (*p != '\0') + { + update_tag (&tag, *p); + p++; + if (strncmp (tag.buf, "id=\"", 4) == 0) + { + while (*p != '\"') + { + *out++ = *p++; + } + *out = '\0'; + *id = atol_64 (value); + return 1; + } + } + return 0; +} + +static int +parse_node_lat (const char *buf, double *lat) +{ +/* parsing */ + char value[128]; + char *out = value; + const char *p = buf; + struct check_tag tag; + init_tag (&tag, 5); + while (*p != '\0') + { + update_tag (&tag, *p); + p++; + if (strncmp (tag.buf, "lat=\"", 5) == 0) + { + while (*p != '\"') + { + *out++ = *p++; + } + *out = '\0'; + *lat = atof (value); + return 1; + } + } + return 0; +} + +static int +parse_node_lon (const char *buf, double *lon) +{ +/* parsing */ + char value[128]; + char *out = value; + const char *p = buf; + struct check_tag tag; + init_tag (&tag, 5); + while (*p != '\0') + { + update_tag (&tag, *p); + p++; + if (strncmp (tag.buf, "lon=\"", 5) == 0) + { + while (*p != '\"') + { + *out++ = *p++; + } + *out = '\0'; + *lon = atof (value); + return 1; + } + } + return 0; +} + +static int +parse_node_tag (const char *buf, sqlite3_int64 * id, double *lat, double *lon) +{ +/* parsing a tag */ + if (!parse_node_id (buf, id)) + return 0; + if (!parse_node_lat (buf, lat)) + return 0; + if (!parse_node_lon (buf, lon)) + return 0; + return 1; +} + +static int +insert_node (sqlite3 * handle, sqlite3_stmt * stmt, sqlite3_int64 id, + double lat, double lon) +{ +/* inserting a temporary node into the DB */ + int ret; + sqlite3_reset (stmt); + sqlite3_clear_bindings (stmt); + sqlite3_bind_int64 (stmt, 1, id); + sqlite3_bind_int64 (stmt, 2, id); + sqlite3_bind_double (stmt, 3, lat); + sqlite3_bind_double (stmt, 4, lon); + sqlite3_bind_int (stmt, 5, 0); + ret = sqlite3_step (stmt); + if (ret == SQLITE_DONE || ret == SQLITE_ROW) + return 1; + fprintf (stderr, "sqlite3_step() error: %s\n", sqlite3_errmsg (handle)); + sqlite3_finalize (stmt); + return 0; +} + +static int +parse_nodes (FILE * xml, sqlite3 * handle) +{ +/* parsing tags from XML file */ + sqlite3_stmt *stmt; + int ret; + char *sql_err = NULL; + sqlite3_int64 id; + double lat; + double lon; + int opened; + int count = 0; + int node = 0; + int c; + int last_c; + char value[65536]; + char *p; + struct check_tag tag; + init_tag (&tag, 6); + +/* the complete operation is handled as an unique SQL Transaction */ + ret = sqlite3_exec (handle, "BEGIN", NULL, NULL, &sql_err); + if (ret != SQLITE_OK) + { + fprintf (stderr, "BEGIN TRANSACTION error: %s\n", sql_err); + sqlite3_free (sql_err); + return -1; + } +/* preparing the SQL statement */ + strcpy (value, + "INSERT INTO osm_tmp_nodes (id, alias, lat, lon, refcount) "); + strcat (value, "VALUES (?, ?, ?, ?, ?)"); + ret = sqlite3_prepare_v2 (handle, value, strlen (value), &stmt, NULL); + if (ret != SQLITE_OK) + { + fprintf (stderr, "SQL error: %s\n%s\n", value, + sqlite3_errmsg (handle)); + return -1; + } + + while ((c = getc (xml)) != EOF) + { + if (node) + { + /* we are inside a tag */ + *p++ = c; + if (c == '<') + opened++; + if (!opened && c == '>' && last_c == '/') + { + /* closing a tag */ + *p = '\0'; + if (!parse_node_tag (value, &id, &lat, &lon)) + { + fprintf (stderr, "ERROR: invalid \n"); + return -1; + } + else + { + if (!insert_node (handle, stmt, id, lat, lon)) + return -1; + count++; + } + node = 0; + continue; + } + last_c = c; + } + update_tag (&tag, c); + if (strncmp (tag.buf, " tag */ + node = 1; + last_c = '\0'; + opened = 0; + strcpy (value, " tag */ + *p = '\0'; + if (!parse_node_tag (value, &id, &lat, &lon)) + { + fprintf (stderr, "ERROR: invalid \n"); + return -1; + } + else + { + if (!insert_node (handle, stmt, id, lat, lon)) + return -1; + count++; + } + node = 0; + continue; + } + } +/* finalizing the INSERT INTO prepared statement */ + sqlite3_finalize (stmt); + +/* committing the still pending SQL Transaction */ + ret = sqlite3_exec (handle, "COMMIT", NULL, NULL, &sql_err); + if (ret != SQLITE_OK) + { + fprintf (stderr, "COMMIT TRANSACTION error: %s\n", sql_err); + sqlite3_free (sql_err); + return -1; + } + return count; +} + +static int +disambiguate_nodes (sqlite3 * handle) +{ +/* disambiguating duplicate NODEs */ + int ret; + sqlite3_stmt *stmt; + sqlite3_int64 id; + int refcount; + double lon; + double lat; + char sql[8192]; + int count = 0; + struct dup_node *first = NULL; + struct dup_node *last = NULL; + struct dup_node *p; + struct dup_node *pn; + struct dup_node_id *pid; + struct dup_node_id *pidn; + char *sql_err = NULL; +/* creating an index */ + strcpy (sql, "CREATE INDEX latlon ON osm_tmp_nodes (lat, lon)"); + ret = sqlite3_exec (handle, sql, NULL, NULL, &sql_err); + if (ret != SQLITE_OK) + { + fprintf (stderr, "CREATE INDEX latlon: %s\n", sql_err); + sqlite3_free (sql_err); + return -1; + } +/* identifying the duplicate nodes by coords */ + strcpy (sql, "SELECT lat, lon, Sum(refcount) FROM osm_tmp_nodes "); + strcat (sql, "WHERE refcount > 0 GROUP BY lat, lon "); + strcat (sql, "HAVING count(*) > 1"); + ret = sqlite3_prepare_v2 (handle, sql, strlen (sql), &stmt, NULL); + if (ret != SQLITE_OK) + { + fprintf (stderr, "SQL error: %s\n%s\n", sql, sqlite3_errmsg (handle)); + return -1; + } + while (1) + { /* scrolling the result set */ - ret = sqlite3_step (params->rd_tmp_nodes_stmt); + ret = sqlite3_step (stmt); if (ret == SQLITE_DONE) { - /* empty resultset - no coords !!! */ -#if defined(_WIN32) || defined(__MINGW32__) - /* CAVEAT - M$ runtime doesn't supports %lld for 64 bits */ - fprintf (stderr, "UNRESOLVED-NODE %I64d\n", id); -#else - fprintf (stderr, "UNRESOLVED-NODE %lld\n", id); -#endif - gaiaFreeDynamicLine (dyn); - gaiaFreeGeomColl (geom); - return NULL; + /* there are no more rows to fetch - we can stop looping */ + break; } - else if (ret == SQLITE_ROW) + if (ret == SQLITE_ROW) { /* ok, we've just fetched a valid row */ - x = sqlite3_column_double (params->rd_tmp_nodes_stmt, 0); - y = sqlite3_column_double (params->rd_tmp_nodes_stmt, 1); - ref_count = sqlite3_column_int (params->rd_tmp_nodes_stmt, 2); - - pt = dyn->Last; - if (pt) - { - if (pt->X == x && pt->Y == y) - { - /* skipping any repeated point */ - continue; - } - } - - /* appending the point to the current line anyway */ - gaiaAppendPointToDynamicLine (dyn, x, y); - if (params->noding_strategy != NODE_STRAT_NONE) - { - /* attempting to renode the Graph */ - int limit = 1; - if (params->noding_strategy == NODE_STRAT_ENDS) - { - /* renoding each Way terminal point */ - limit = 0; - } - if ((ref_count > limit) - && (i_ref > 0 && i_ref < (way->node_ref_count - 1))) - { - /* found an internal Node: saving the current line */ - save_current_line (geom, dyn); - /* starting a further line */ - gaiaFreeDynamicLine (dyn); - dyn = gaiaAllocDynamicLine (); - /* inserting the current point in the new line */ - gaiaAppendPointToDynamicLine (dyn, x, y); - } - } + lat = sqlite3_column_double (stmt, 0); + lon = sqlite3_column_double (stmt, 1); + refcount = sqlite3_column_int (stmt, 2); + p = malloc (sizeof (struct dup_node)); + p->lat = lat; + p->lon = lon; + p->refcount = refcount; + p->first = NULL; + p->last = NULL; + p->next = NULL; + if (!first) + first = p; + if (last) + last->next = p; + last = p; } else { /* some unexpected error occurred */ fprintf (stderr, "sqlite3_step() error: %s\n", - sqlite3_errmsg (params->db_handle)); - sqlite3_finalize (params->rd_tmp_nodes_stmt); - gaiaFreeGeomColl (geom); - gaiaFreeDynamicLine (dyn); - return NULL; - } - } -/* saving the last line */ - save_current_line (geom, dyn); - gaiaFreeDynamicLine (dyn); - - if (geom->FirstLinestring == NULL) - { - /* invalid geometry: no lines */ - gaiaFreeGeomColl (geom); - return NULL; - } - return geom; + sqlite3_errmsg (handle)); + sqlite3_finalize (stmt); + return -1; + } + } + sqlite3_finalize (stmt); +/* retrieving the dup-nodes IDs */ + p = first; + while (p) + { + strcpy (sql, "SELECT id FROM osm_tmp_nodes "); + strcat (sql, "WHERE lat = ? AND lon = ?"); + ret = sqlite3_prepare_v2 (handle, sql, strlen (sql), &stmt, NULL); + if (ret != SQLITE_OK) + { + fprintf (stderr, "SQL error: %s\n%s\n", sql, + sqlite3_errmsg (handle)); + return -1; + } + sqlite3_reset (stmt); + sqlite3_clear_bindings (stmt); + sqlite3_bind_double (stmt, 1, p->lat); + sqlite3_bind_double (stmt, 2, p->lon); + while (1) + { + /* scrolling the result set */ + ret = sqlite3_step (stmt); + if (ret == SQLITE_DONE) + { + /* there are no more rows to fetch - we can stop looping */ + break; + } + if (ret == SQLITE_ROW) + { + /* ok, we've just fetched a valid row */ + id = sqlite3_column_int64 (stmt, 0); + pid = malloc (sizeof (struct dup_node_id)); + pid->id = id; + pid->next = NULL; + if (p->first == NULL) + p->first = pid; + if (p->last != NULL) + p->last->next = pid; + p->last = pid; + } + else + { + /* some unexpected error occurred */ + fprintf (stderr, "sqlite3_step() error: %s\n", + sqlite3_errmsg (handle)); + sqlite3_finalize (stmt); + return -1; + } + } + sqlite3_finalize (stmt); + p = p->next; + } + +/* the complete operation is handled as an unique SQL Transaction */ + ret = sqlite3_exec (handle, "BEGIN", NULL, NULL, &sql_err); + if (ret != SQLITE_OK) + { + fprintf (stderr, "BEGIN TRANSACTION error: %s\n", sql_err); + sqlite3_free (sql_err); + return -1; + } +/* preparing the SQL statement */ + strcpy (sql, "UPDATE osm_tmp_nodes SET alias = ?, refcount = ? "); + strcat (sql, "WHERE id = ?"); + ret = sqlite3_prepare_v2 (handle, sql, strlen (sql), &stmt, NULL); + if (ret != SQLITE_OK) + { + fprintf (stderr, "SQL error: %s\n%s\n", sql, sqlite3_errmsg (handle)); + return -1; + } + + p = first; + while (p) + { + pid = p->first; + while (pid) + { + if (pid == p->first) + { + /* fixing the master node */ + sqlite3_reset (stmt); + sqlite3_clear_bindings (stmt); + sqlite3_bind_int64 (stmt, 1, pid->id); + sqlite3_bind_int (stmt, 2, p->refcount); + sqlite3_bind_int64 (stmt, 3, pid->id); + ret = sqlite3_step (stmt); + if (ret == SQLITE_DONE || ret == SQLITE_ROW) + count++; + else + { + fprintf (stderr, "sqlite3_step() error: %s\n", + sqlite3_errmsg (handle)); + sqlite3_finalize (stmt); + return -1; + } + } + else + { + /* disambiguating the node */ + sqlite3_reset (stmt); + sqlite3_clear_bindings (stmt); + sqlite3_bind_int64 (stmt, 1, p->first->id); + sqlite3_bind_int (stmt, 2, p->refcount); + sqlite3_bind_int64 (stmt, 3, pid->id); + ret = sqlite3_step (stmt); + if (ret == SQLITE_DONE || ret == SQLITE_ROW) + count++; + else + { + fprintf (stderr, "sqlite3_step() error: %s\n", + sqlite3_errmsg (handle)); + sqlite3_finalize (stmt); + return -1; + } + } + pid = pid->next; + } + p = p->next; + } +/* finalizing the INSERT INTO prepared statement */ + sqlite3_finalize (stmt); + +/* committing the still pending SQL Transaction */ + ret = sqlite3_exec (handle, "COMMIT", NULL, NULL, &sql_err); + if (ret != SQLITE_OK) + { + fprintf (stderr, "COMMIT TRANSACTION error: %s\n", sql_err); + sqlite3_free (sql_err); + return -1; + } + +/* freeing the dup-nodes list */ + p = first; + while (p) + { + pn = p->next; + pid = p->first; + while (pid) + { + pidn = pid->next; + free (pid); + pid = pidn; + } + free (p); + p = pn; + } + return count; +} + +static int +parse_way_id (const char *buf, sqlite3_int64 * id) +{ +/* parsing */ + char value[128]; + char *out = value; + const char *p = buf; + struct check_tag tag; + init_tag (&tag, 4); + while (*p != '\0') + { + update_tag (&tag, *p); + p++; + if (strncmp (tag.buf, "id=\"", 4) == 0) + { + while (*p != '\"') + { + *out++ = *p++; + } + *out = '\0'; + *id = atol_64 (value); + return 1; + } + } + return 0; +} + +static int +parse_nd_id (const char *buf, sqlite3_int64 * id) +{ +/* parsing */ + char value[128]; + char *out = value; + const char *p = buf; + struct check_tag tag; + init_tag (&tag, 5); + while (*p != '\0') + { + update_tag (&tag, *p); + p++; + if (strncmp (tag.buf, "ref=\"", 5) == 0) + { + while (*p != '\"') + { + *out++ = *p++; + } + *out = '\0'; + *id = atol_64 (value); + return 1; + } + } + return 0; +} + +static int +parse_tag_k (const char *buf, char *k) +{ +/* parsing */ + char value[128]; + char *out = value; + const char *p = buf; + struct check_tag tag; + init_tag (&tag, 3); + while (*p != '\0') + { + update_tag (&tag, *p); + p++; + if (strncmp (tag.buf, "k=\"", 3) == 0) + { + while (*p != '\"') + { + *out++ = *p++; + } + *out = '\0'; + strcpy (k, value); + return 1; + } + } + return 0; +} + +static void +from_xml_string (const char *xml, char *clean) +{ +/* cleans XML markers */ + char marker[16]; + char *pm; + int is_marker = 0; + const char *in = xml; + char *out = clean; + while (*in != '\0') + { + if (is_marker) + { + if (*in == ';') + { + /* closing an XML marker */ + in++; + is_marker = 0; + *pm = '\0'; + if (strcmp (marker, "&") == 0) + *out++ = '&'; + if (strcmp (marker, "<") == 0) + *out++ = '<'; + if (strcmp (marker, ">") == 0) + *out++ = '>'; + if (strcmp (marker, """) == 0) + *out++ = '"'; + if (strcmp (marker, "&apos") == 0) + *out++ = '\''; + } + else + *pm++ = *in++; + continue; + } + if (*in == '&') + { + /* found an XML marker */ + in++; + is_marker = 1; + pm = marker; + *pm++ = '&'; + continue; + } + *out++ = *in++; + } + *out = '\0'; +} + +static int +parse_tag_v (const char *buf, char *v) +{ +/* parsing */ + char value[8192]; + char *out = value; + const char *p = buf; + struct check_tag tag; + init_tag (&tag, 3); + while (*p != '\0') + { + update_tag (&tag, *p); + p++; + if (strncmp (tag.buf, "v=\"", 3) == 0) + { + while (*p != '\"') + { + *out++ = *p++; + } + *out = '\0'; + from_xml_string (value, v); + return 1; + } + } + return 0; +} + +static int +parse_tag_kv (const char *buf, char *k, char *v) +{ +/* parsing a tag */ + if (!parse_tag_k (buf, k)) + return 0; + if (!parse_tag_v (buf, v)) + return 0; + return 1; +} + +static int +parse_way_tag (const char *buf, struct way *xway) +{ +/* parsing a tag */ + int nd = 0; + int tg = 0; + const char *in; + char value[65536]; + char k[8192]; + char v[8192]; + char *p; + char c; + int opened; + int last_c; + sqlite3_int64 id; + struct check_tag tag; + if (!parse_way_id (buf, &(xway->id))) + return 0; +/* parsing the list */ + in = buf; + init_tag (&tag, 4); + while (*in != '\0') + { + c = *in++; + if (nd) + { + /* we are inside a tag */ + *p++ = c; + if (c == '<') + opened++; + if (!opened && c == '>' && last_c == '/') + { + /* closing a tag */ + *p = '\0'; + if (!parse_nd_id (value, &id)) + { + fprintf (stderr, "ERROR: invalid \n"); + return 0; + } + else + { + struct node_ref *node = + malloc (sizeof (struct node_ref)); + node->id = id; + node->ignore = 1; + node->next = NULL; + if (xway->first == NULL) + xway->first = node; + if (xway->last != NULL) + xway->last->next = node; + xway->last = node; + } + nd = 0; + continue; + } + last_c = c; + } + update_tag (&tag, c); + if (strncmp (tag.buf, " tag */ + nd = 1; + last_c = '\0'; + opened = 0; + strcpy (value, " list */ + in = buf; + init_tag (&tag, 5); + while (*in != '\0') + { + c = *in++; + if (tg) + { + /* we are inside a tag */ + *p++ = c; + if (c == '<') + opened++; + if (!opened && c == '>' && last_c == '/') + { + /* closing a tag */ + *p = '\0'; + if (!parse_tag_kv (value, k, v)) + { + fprintf (stderr, "ERROR: invalid \n"); + return 0; + } + else + { + struct kv *key_value = malloc (sizeof (struct kv)); + key_value->k = malloc (strlen (k) + 1); + strcpy (key_value->k, k); + key_value->v = malloc (strlen (v) + 1); + strcpy (key_value->v, v); + key_value->next = NULL; + if (xway->first_kv == NULL) + xway->first_kv = key_value; + if (xway->last_kv != NULL) + xway->last_kv->next = key_value; + xway->last_kv = key_value; + } + tg = 0; + continue; + } + last_c = c; + } + update_tag (&tag, c); + if (strncmp (tag.buf, " tag */ + tg = 1; + last_c = '\0'; + opened = 0; + strcpy (value, "first; + while (p) + { + pn = p->next; + free (p); + p = pn; + } + xway->first = NULL; + xway->last = NULL; + pkv = xway->first_kv; + while (pkv) + { + pkvn = pkv->next; + free (pkv->k); + free (pkv->v); + free (pkv); + pkv = pkvn; + } + xway->first_kv = NULL; + xway->last_kv = NULL; + pa = xway->first_arc; + while (pa) + { + pan = pa->next; + if (pa->dyn) + gaiaFreeDynamicLine (pa->dyn); + if (pa->geom) + gaiaFreeGeomColl (pa->geom); + free (pa); + pa = pan; + } + xway->first_arc = NULL; + xway->last_arc = NULL; + if (xway->class) + free (xway->class); + xway->class = NULL; + if (xway->name) + free (xway->name); + xway->name = NULL; +} + +static void +set_way_name (struct way *xway) +{ +/* trying to fetch the road name */ + struct kv *pkv; + pkv = xway->first_kv; + while (pkv) + { + if (strcmp (pkv->k, "name") == 0) + { + if (xway->name) + free (xway->name); + xway->name = malloc (strlen (pkv->v) + 1); + strcpy (xway->name, pkv->v); + return; + } + if (strcmp (pkv->k, "ref") == 0) + { + if (xway->name == NULL) + { + xway->name = malloc (strlen (pkv->v) + 1); + strcpy (xway->name, pkv->v); + return; + } + } + pkv = pkv->next; + } } static int -arcs_insert (struct aux_params *params, sqlite3_int64 id, const char *class, - const char *name, int oneway, unsigned char *blob, int blob_size) -{ -/* Inserts an Arc into the Graph */ - int ret; - if (params->ins_arcs_stmt == NULL) - return 1; - sqlite3_reset (params->ins_arcs_stmt); - sqlite3_clear_bindings (params->ins_arcs_stmt); - sqlite3_bind_int64 (params->ins_arcs_stmt, 1, id); - sqlite3_bind_text (params->ins_arcs_stmt, 2, class, strlen (class), - SQLITE_STATIC); - sqlite3_bind_text (params->ins_arcs_stmt, 3, name, strlen (name), - SQLITE_STATIC); - if (oneway > 0) - { - sqlite3_bind_int (params->ins_arcs_stmt, 4, 1); - sqlite3_bind_int (params->ins_arcs_stmt, 5, 0); - } - else if (oneway < 0) - { - sqlite3_bind_int (params->ins_arcs_stmt, 4, 0); - sqlite3_bind_int (params->ins_arcs_stmt, 5, 1); - } - else - { - sqlite3_bind_int (params->ins_arcs_stmt, 4, 1); - sqlite3_bind_int (params->ins_arcs_stmt, 5, 1); - } - sqlite3_bind_blob (params->ins_arcs_stmt, 6, blob, blob_size, free); - ret = sqlite3_step (params->ins_arcs_stmt); - - if (ret == SQLITE_DONE || ret == SQLITE_ROW) - return 1; - fprintf (stderr, "sqlite3_step() error: INS_ARCS\n"); - sqlite3_finalize (params->ins_arcs_stmt); - params->ins_arcs_stmt = NULL; +is_valid_way (const char *key, const char *class, int railways) +{ +/* checks if this one is an valid road to be included into the network */ + if (strcmp (key, "highway") == 0 && !railways) + { + if (strcmp (class, "pedestrian") == 0) + return 0; + if (strcmp (class, "track") == 0) + return 0; + if (strcmp (class, "services") == 0) + return 0; + if (strcmp (class, "bus_guideway") == 0) + return 0; + if (strcmp (class, "path") == 0) + return 0; + if (strcmp (class, "cycleway") == 0) + return 0; + if (strcmp (class, "footway") == 0) + return 0; + if (strcmp (class, "bridleway") == 0) + return 0; + if (strcmp (class, "byway") == 0) + return 0; + if (strcmp (class, "steps") == 0) + return 0; + return 1; + } + if (strcmp (key, "railway") == 0 && railways) + { + return 1; + } return 0; } + +static void +set_oneway (struct way *xway) +{ +/* setting up the oneway markers */ + struct kv *pkv; + xway->oneway = 0; + xway->reverse = 0; + pkv = xway->first_kv; + while (pkv) + { + if (strcmp (pkv->k, "oneway") == 0) + { + if (strcmp (pkv->v, "yes") == 0 || strcmp (pkv->v, "yes") == 0 + || strcmp (pkv->v, "1") == 0) + { + xway->oneway = 1; + xway->reverse = 0; + } + if (strcmp (pkv->v, "-1") == 0) + { + xway->oneway = 1; + xway->reverse = 1; + } + } + pkv = pkv->next; + } +} static int -find_include_class (struct aux_params *params, const char *class, - const char *sub_class) +check_way (struct way *xway, int railways) { -/* testing if this Way belongs to some class to be Included */ - struct aux_class *pc = params->first_include; - while (pc) +/* checks if is interesting to build the road network */ + struct kv *pkv; + pkv = xway->first_kv; + while (pkv) { - if (strcmp (pc->class_name, class) == 0) + if (is_valid_way (pkv->k, pkv->v, railways)) { - if (pc->sub_class == NULL) - return 1; - if (strcmp (pc->sub_class, sub_class) == 0) - return 1; + xway->class = malloc (strlen (pkv->v) + 1); + strcpy (xway->class, pkv->v); + set_way_name (xway); + set_oneway (xway); + return 1; } - pc = pc->next; + pkv = pkv->next; } return 0; } -static int -find_ignore_class (struct aux_params *params, const char *class, - const char *sub_class) +static sqlite3_int64 +find_node (struct way *xway, double lon, double lat) { -/* testing if this Way belongs to some class to be Ignored */ - struct aux_class *pc = params->first_ignore; - while (pc) +/* finding a node by coords */ + struct node_ref *p = xway->first; + while (p) { - if (strcmp (pc->class_name, class) == 0) + if (p->ignore == 0) { - if (strcmp (pc->sub_class, sub_class) == 0) - return 1; + if (p->lon == lon && p->lat == lat) + return p->alias; } - pc = pc->next; + p = p->next; } return 0; } -static int -consume_way_1 (const void *user_data, const readosm_way * way) -{ -/* processing an OSM Way - Pass#1 (ReadOSM callback function) */ - struct aux_params *params = (struct aux_params *) user_data; - const readosm_tag *p_tag; - int i_tag; - int i_ref; - int ret; - sqlite3_int64 id; - int include = 0; - int ignore = 0; - - if (params->noding_strategy == NODE_STRAT_NONE) - { - /* renoding the graph isn't required, we can skip all this */ - return READOSM_OK; - } - - for (i_tag = 0; i_tag < way->tag_count; i_tag++) - { - p_tag = way->tags + i_tag; - if (find_include_class (params, p_tag->key, p_tag->value)) - include = 1; - if (find_ignore_class (params, p_tag->key, p_tag->value)) - ignore = 1; - } - if (!include || ignore) - return READOSM_OK; - - for (i_ref = 0; i_ref < way->node_ref_count; i_ref++) - { - if (params->noding_strategy == NODE_STRAT_ENDS) - { - /* checking only the Way extreme points */ - if (i_ref == 0 || i_ref == (way->node_ref_count - 1)) - ; - else - continue; - } - id = *(way->node_refs + i_ref); - sqlite3_reset (params->upd_tmp_nodes_stmt); - sqlite3_clear_bindings (params->upd_tmp_nodes_stmt); - sqlite3_bind_int64 (params->upd_tmp_nodes_stmt, 1, id); - ret = sqlite3_step (params->upd_tmp_nodes_stmt); - if (ret == SQLITE_DONE || ret == SQLITE_ROW) - ; - else - { - fprintf (stderr, "sqlite3_step() error: %s\n", - sqlite3_errmsg (params->db_handle)); - sqlite3_finalize (params->upd_tmp_nodes_stmt); - return READOSM_ABORT; - } - } - - return READOSM_OK; +static double +compute_time (const char *class, double length) +{ +/* computing traval time */ + double speed = 30.0; /* speed, in Km/h */ + double msec; + if (strcmp (class, "motorway") == 0 || strcmp (class, "trunk") == 0) + speed = 110; + if (strcmp (class, "primary") == 0) + speed = 90; + if (strcmp (class, "secondary") == 0) + speed = 70; + if (strcmp (class, "tertiary") == 0) + speed = 50; + msec = speed * 1000.0 / 3600.0; /* transforming speed in m/sec */ + return length / msec; } static int -consume_way_2 (const void *user_data, const readosm_way * way) -{ -/* processing an OSM Way - Pass#2 (ReadOSM callback function) */ - struct aux_params *params = (struct aux_params *) user_data; - const readosm_tag *p_tag; - int i_tag; - unsigned char *blob; - int blob_size; - const char *class = NULL; - const char *name = "*** Unknown ****"; - int oneway = 0; - int ret; - int include = 0; - int ignore = 0; - gaiaGeomCollPtr geom; - - for (i_tag = 0; i_tag < way->tag_count; i_tag++) - { - p_tag = way->tags + i_tag; - if (find_include_class (params, p_tag->key, p_tag->value)) - { - include = 1; - class = p_tag->value; - } - if (find_ignore_class (params, p_tag->key, p_tag->value)) - ignore = 1; - } - if (!include || ignore) - return READOSM_OK; - - for (i_tag = 0; i_tag < way->tag_count; i_tag++) - { - /* retrieving the road name */ - p_tag = way->tags + i_tag; - if (strcmp (p_tag->key, "name") == 0) - { - name = p_tag->value; - break; - } - } - - if (params->oneway_strategy != ONEWAY_STRAT_NONE) - { - /* checking for Oneeays */ - for (i_tag = 0; i_tag < way->tag_count; i_tag++) - { - /* checking for one-ways */ - p_tag = way->tags + i_tag; - if (strcmp (p_tag->key, "oneway") == 0) - { - if (strcmp (p_tag->value, "yes") == 0 - || strcmp (p_tag->value, "true") == 0 - || strcmp (p_tag->value, "1") == 0) - oneway = 1; - if (strcmp (p_tag->value, "-1") == 0 - || strcmp (p_tag->value, "reverse") == 0) - oneway = -1; - } - if (params->oneway_strategy != ONEWAY_STRAT_NO_BOTH - && params->oneway_strategy != ONEWAY_STRAT_NO_ROUND) - { - /* testing for junction:roundabout */ - if (strcmp (p_tag->key, "junction") == 0) - { - if (strcmp (p_tag->value, "roundabout") == 0) - oneway = 1; - } - } - if (params->oneway_strategy != ONEWAY_STRAT_NO_BOTH - && params->oneway_strategy != ONEWAY_STRAT_NO_MOTOR) - { - /* testing for highway_motorway or highway_motorway_link */ - if (strcmp (p_tag->key, "highway") == 0) - { - if (strcmp (p_tag->value, "motorway") == 0 - || strcmp (p_tag->value, "motorway_link") == 0) - oneway = 1; - } - } - } - } - - geom = build_linestrings (params, way); - if (geom) - { - gaiaLinestringPtr ln = geom->FirstLinestring; - while (ln) - { - /* inserting any splitted Arc */ - gaiaGeomCollPtr g; - gaiaLinestringPtr ln2; - int iv; - if (gaiaIsClosed (ln)) - { - ln = ln->Next; +build_geometry (sqlite3 * handle, struct way *xway) +{ +/* building geometry representing an ARC */ + int ret; + sqlite3_stmt *stmt; + sqlite3_int64 id; + sqlite3_int64 alias; + int refcount; + double lon; + double lat; + char sql[8192]; + int ind; + int points = 0; + int tbd; + int count; + int base = 0; + int block = 128; + int how_many; + struct node_ref *p; + struct node_ref *prev; + struct arc *pa; + gaiaLinestringPtr line; + double a; + double b; + double rf; + p = xway->first; + while (p) + { + points++; + p = p->next; + } + if (points < 2) + { + /* discarding stupid degenerated lines - oh yes, there are lots of them !!! */ + return -1; + } + tbd = points; + while (tbd > 0) + { + /* + / fetching node coords + / requesting max 128 points at each time + */ + if (tbd < block) + how_many = tbd; + else + how_many = block; + strcpy (sql, + "SELECT id, alias, lat, lon, refcount FROM osm_tmp_nodes "); + strcat (sql, "WHERE id IN ("); + for (ind = 0; ind < how_many; ind++) + { + if (ind == 0) + strcat (sql, "?"); + else + strcat (sql, ",?"); + } + strcat (sql, ")"); + ret = sqlite3_prepare_v2 (handle, sql, strlen (sql), &stmt, NULL); + if (ret != SQLITE_OK) + { + fprintf (stderr, "SQL error: %s\n%s\n", sql, + sqlite3_errmsg (handle)); + return 0; + } + sqlite3_reset (stmt); + sqlite3_clear_bindings (stmt); + ind = 1; + count = 0; + p = xway->first; + while (p) + { + if (count < base) + { + count++; + p = p->next; continue; } - /* building a new Geometry - simple line */ - g = gaiaAllocGeomColl (); - g->Srid = 4326; - ln2 = gaiaAddLinestringToGeomColl (g, ln->Points); - for (iv = 0; iv < ln->Points; iv++) + if (count >= (base + how_many)) + break; + sqlite3_bind_int64 (stmt, ind, p->id); + ind++; + count++; + p = p->next; + } + while (1) + { + /* scrolling the result set */ + ret = sqlite3_step (stmt); + if (ret == SQLITE_DONE) + { + /* there are no more rows to fetch - we can stop looping */ + break; + } + if (ret == SQLITE_ROW) + { + /* ok, we've just fetched a valid row */ + id = sqlite3_column_int64 (stmt, 0); + alias = sqlite3_column_int64 (stmt, 1); + lat = sqlite3_column_double (stmt, 2); + lon = sqlite3_column_double (stmt, 3); + refcount = sqlite3_column_int (stmt, 4); + p = xway->first; + while (p) + { + if (p->id == id) + { + p->lat = lat; + p->lon = lon; + p->alias = alias; + p->refcount = refcount; + p->ignore = 0; + } + p = p->next; + } + } + else + { + /* some unexpected error occurred */ + fprintf (stderr, "sqlite3_step() error: %s\n", + sqlite3_errmsg (handle)); + sqlite3_finalize (stmt); + return 0; + } + } + sqlite3_finalize (stmt); + tbd -= how_many; + base += how_many; + } + prev = NULL; + p = xway->first; + while (p) + { + /* marking repeated points as invalid */ + if (p->ignore) + { + p = p->next; + continue; + } + if (prev) + { + if (p->lon == prev->lon && p->lat == prev->lat) + p->ignore = 1; + } + prev = p; + p = p->next; + } + points = 0; + p = xway->first; + while (p) + { + if (p->ignore == 0) + points++; + p = p->next; + } + if (points < 2) + { + /* discarding stupid degenerated lines - oh yes, there are lots of them !!! */ + return -1; + } +/* creating a new ARC */ + pa = malloc (sizeof (struct arc)); + pa->geom = NULL; + pa->next = NULL; + xway->first_arc = pa; + xway->last_arc = pa; + pa->dyn = gaiaAllocDynamicLine (); + p = xway->first; + while (p) + { + /* setting up dynamic lines */ + if (p->ignore) + { + /* skipping invalid points */ + p = p->next; + continue; + } + if (pa->dyn->First == NULL) + pa->from = p->alias; + gaiaAppendPointToDynamicLine (pa->dyn, p->lon, p->lat); + pa->to = p->alias; + if (p != xway->first && p != xway->last) + { + if (p->refcount > 1) + { + /* found a graph NODE: creating a new ARC */ + pa = malloc (sizeof (struct arc)); + pa->geom = NULL; + pa->next = NULL; + xway->last_arc->next = pa; + xway->last_arc = pa; + pa->from = p->alias; + pa->to = p->alias; + pa->dyn = gaiaAllocDynamicLine (); + gaiaAppendPointToDynamicLine (pa->dyn, p->lon, p->lat); + } + } + p = p->next; + } + pa = xway->first_arc; + while (pa) + { + /* splitting self-closed arcs [rings] */ + if (pa->dyn->First == NULL) + { + /* skipping empty lines */ + pa = pa->next; + continue; + } + if (pa->dyn->First == pa->dyn->Last) + { + /* skipping one-point-only lines */ + pa = pa->next; + continue; + } + if (pa->dyn->First->X == pa->dyn->Last->X + && pa->dyn->First->Y == pa->dyn->Last->Y) + { + /* found a self-closure */ + gaiaDynamicLinePtr saved = pa->dyn; + struct arc *pbis; + gaiaPointPtr pt; + int limit; + sqlite3_int64 node_id; + points = 0; + pt = saved->First; + while (pt) + { + /* counting how many points are there */ + points++; + pt = pt->Next; + } + limit = points / 2; + /* appending a new arc */ + pbis = malloc (sizeof (struct arc)); + pbis->geom = NULL; + pbis->next = NULL; + xway->last_arc->next = pbis; + xway->last_arc = pbis; + pbis->to = pa->to; + pbis->dyn = gaiaAllocDynamicLine (); + pa->dyn = gaiaAllocDynamicLine (); + ind = 0; + pt = saved->First; + while (pt) { - /* copying line's points */ - double x; - double y; - gaiaGetPoint (ln->Coords, iv, &x, &y); - gaiaSetPoint (ln2->Coords, iv, x, y); + /* appending points */ + if (ind < limit) + gaiaAppendPointToDynamicLine (pa->dyn, pt->X, pt->Y); + else if (ind == limit) + { + gaiaAppendPointToDynamicLine (pa->dyn, pt->X, + pt->Y); + gaiaAppendPointToDynamicLine (pbis->dyn, pt->X, + pt->Y); + node_id = find_node (xway, pt->X, pt->Y); + } + else + gaiaAppendPointToDynamicLine (pbis->dyn, pt->X, + pt->Y); + ind++; + pt = pt->Next; } - gaiaToSpatiaLiteBlobWkb (g, &blob, &blob_size); - ret = - arcs_insert (params, way->id, class, name, oneway, blob, - blob_size); - gaiaFreeGeomColl (g); - if (!ret) - return READOSM_ABORT; - ln = ln->Next; - } - gaiaFreeGeomColl (geom); - } - return READOSM_OK; + /* adjusting the node */ + pa->to = node_id; + pbis->from = node_id; + gaiaFreeDynamicLine (saved); + } + pa = pa->next; + } + gaiaEllipseParams ("WGS84", &a, &b, &rf); + pa = xway->first_arc; + while (pa) + { + /* setting up geometries */ + gaiaPointPtr pt; + if (pa->dyn->First == NULL) + { + /* skipping empty lines */ + pa = pa->next; + continue; + } + if (pa->dyn->First == pa->dyn->Last) + { + /* skipping one-point-only lines */ + pa = pa->next; + continue; + } + points = 0; + pt = pa->dyn->First; + while (pt) + { + /* counting how many points are there */ + points++; + pt = pt->Next; + } + pa->geom = gaiaAllocGeomColl (); + pa->geom->Srid = 4326; + line = gaiaAddLinestringToGeomColl (pa->geom, points); + ind = 0; + pt = pa->dyn->First; + while (pt) + { + /* setting up linestring coords */ + gaiaSetPoint (line->Coords, ind, pt->X, pt->Y); + ind++; + pt = pt->Next; + } + gaiaFreeDynamicLine (pa->dyn); + pa->dyn = NULL; + pa->length = + gaiaGreatCircleTotalLength (a, b, + pa->geom->FirstLinestring-> + DimensionModel, + pa->geom->FirstLinestring->Coords, + pa->geom->FirstLinestring->Points); + pa->cost = compute_time (xway->class, pa->length); + pa = pa->next; + } + return 1; } static int -tmp_nodes_insert (struct aux_params *params, const readosm_node * node) +insert_arc_bidir (sqlite3 * handle, sqlite3_stmt * stmt, struct way *xway, + struct arc *xarc) { -/* inserts a node into the corresponding temporary table */ +/* inserting a bidirectional ARC [OSM road] into the DB */ int ret; - if (params->ins_tmp_nodes_stmt == NULL) - return 1; - sqlite3_reset (params->ins_tmp_nodes_stmt); - sqlite3_clear_bindings (params->ins_tmp_nodes_stmt); - sqlite3_bind_int64 (params->ins_tmp_nodes_stmt, 1, node->id); - sqlite3_bind_double (params->ins_tmp_nodes_stmt, 2, node->latitude); - sqlite3_bind_double (params->ins_tmp_nodes_stmt, 3, node->longitude); - ret = sqlite3_step (params->ins_tmp_nodes_stmt); + unsigned char *blob; + int blob_size; + const char *unknown = "unknown"; + sqlite3_reset (stmt); + sqlite3_clear_bindings (stmt); + sqlite3_bind_int64 (stmt, 1, xway->id); + sqlite3_bind_text (stmt, 2, xway->class, strlen (xway->class), + SQLITE_STATIC); + sqlite3_bind_int64 (stmt, 3, xarc->from); + sqlite3_bind_int64 (stmt, 4, xarc->to); + if (xway->name) + sqlite3_bind_text (stmt, 5, xway->name, strlen (xway->name), + SQLITE_STATIC); + else + sqlite3_bind_text (stmt, 5, unknown, strlen (unknown), SQLITE_STATIC); + if (xway->oneway) + { + /* oneway arc */ + if (xway->reverse) + { + /* reverse */ + sqlite3_bind_int (stmt, 6, 0); + sqlite3_bind_int (stmt, 7, 1); + } + else + { + /* conformant */ + sqlite3_bind_int (stmt, 6, 1); + sqlite3_bind_int (stmt, 7, 0); + } + } + else + { + /* bidirectional arc */ + sqlite3_bind_int (stmt, 6, 1); + sqlite3_bind_int (stmt, 7, 1); + } + sqlite3_bind_double (stmt, 8, xarc->length); + sqlite3_bind_double (stmt, 9, xarc->cost); + gaiaToSpatiaLiteBlobWkb (xarc->geom, &blob, &blob_size); + sqlite3_bind_blob (stmt, 10, blob, blob_size, free); + ret = sqlite3_step (stmt); if (ret == SQLITE_DONE || ret == SQLITE_ROW) return 1; - fprintf (stderr, "sqlite3_step() error: INS_TMP_NODES\n"); - sqlite3_finalize (params->ins_tmp_nodes_stmt); - params->ins_tmp_nodes_stmt = NULL; + fprintf (stderr, "sqlite3_step() error: %s\n", sqlite3_errmsg (handle)); + sqlite3_finalize (stmt); return 0; } static int -consume_node (const void *user_data, const readosm_node * node) -{ -/* processing an OSM Node (ReadOSM callback function) */ - struct aux_params *params = (struct aux_params *) user_data; - - if (!tmp_nodes_insert (params, node)) - return READOSM_ABORT; - return READOSM_OK; +insert_arc_unidir (sqlite3 * handle, sqlite3_stmt * stmt, struct way *xway, + struct arc *xarc) +{ +/* inserting an unidirectional ARC [OSM road] into the DB */ + int ret; + unsigned char *blob; + int blob_size; + const char *unknown = "unknown"; + int straight = 0; + int reverse = 0; + int count = 0; + if (xway->oneway) + { + /* oneway arc */ + if (xway->reverse) + { + /* reverse */ + reverse = 1; + } + else + { + /* conformant */ + straight = 1; + } + } + else + { + /* bidirectional arc */ + straight = 1; + reverse = 1; + } + if (straight) + { + /* inserting to FromTo arc */ + sqlite3_reset (stmt); + sqlite3_clear_bindings (stmt); + sqlite3_bind_int64 (stmt, 1, xway->id); + sqlite3_bind_text (stmt, 2, xway->class, strlen (xway->class), + SQLITE_STATIC); + sqlite3_bind_int64 (stmt, 3, xarc->from); + sqlite3_bind_int64 (stmt, 4, xarc->to); + if (xway->name) + sqlite3_bind_text (stmt, 5, xway->name, strlen (xway->name), + SQLITE_STATIC); + else + sqlite3_bind_text (stmt, 5, unknown, strlen (unknown), + SQLITE_STATIC); + sqlite3_bind_double (stmt, 6, xarc->length); + sqlite3_bind_double (stmt, 7, xarc->cost); + gaiaToSpatiaLiteBlobWkb (xarc->geom, &blob, &blob_size); + sqlite3_bind_blob (stmt, 8, blob, blob_size, free); + ret = sqlite3_step (stmt); + if (ret == SQLITE_DONE || ret == SQLITE_ROW) + count++; + else + { + fprintf (stderr, "sqlite3_step() error: %s\n", + sqlite3_errmsg (handle)); + sqlite3_finalize (stmt); + return 0; + } + } + if (reverse) + { + /* inserting to ToFrom arc */ + gaiaLinestringPtr ln1; + gaiaLinestringPtr ln2; + int iv; + int iv2; + double x; + double y; + sqlite3_reset (stmt); + sqlite3_clear_bindings (stmt); + sqlite3_bind_int64 (stmt, 1, xway->id); + sqlite3_bind_text (stmt, 2, xway->class, strlen (xway->class), + SQLITE_STATIC); + sqlite3_bind_int64 (stmt, 3, xarc->to); + sqlite3_bind_int64 (stmt, 4, xarc->from); + if (xway->name) + sqlite3_bind_text (stmt, 5, xway->name, strlen (xway->name), + SQLITE_STATIC); + else + sqlite3_bind_text (stmt, 5, unknown, strlen (unknown), + SQLITE_STATIC); + /* reversing the linestring */ + ln1 = xarc->geom->FirstLinestring; + ln2 = gaiaAllocLinestring (ln1->Points); + xarc->geom->FirstLinestring = ln2; + iv2 = 0; + for (iv = ln1->Points - 1; iv >= 0; iv--) + { + gaiaGetPoint (ln1->Coords, iv, &x, &y); + gaiaSetPoint (ln2->Coords, iv2, x, y); + iv2++; + } + gaiaFreeLinestring (ln1); + sqlite3_bind_double (stmt, 6, xarc->length); + sqlite3_bind_double (stmt, 7, xarc->cost); + gaiaToSpatiaLiteBlobWkb (xarc->geom, &blob, &blob_size); + sqlite3_bind_blob (stmt, 8, blob, blob_size, free); + ret = sqlite3_step (stmt); + if (ret == SQLITE_DONE || ret == SQLITE_ROW) + count++; + else + { + fprintf (stderr, "sqlite3_step() error: %s\n", + sqlite3_errmsg (handle)); + sqlite3_finalize (stmt); + return 0; + } + } + return count; } static int -populate_graph_nodes (sqlite3 * handle, const char *table) +parse_ways_pass_2 (FILE * xml, sqlite3 * handle, const char *table, + int double_arcs, char *value, int railways) { +/* parsing tags from XML file - Step II */ + sqlite3_stmt *stmt; int ret; char *sql_err = NULL; - char sql[8192]; - char sql2[1024]; - sqlite3_stmt *query_stmt = NULL; - sqlite3_stmt *update_stmt = NULL; - -/* populating GRAPH_NODES */ - strcpy (sql, "INSERT OR IGNORE INTO graph_nodes (lon, lat) "); - strcat (sql, "SELECT ST_X(ST_StartPoint(Geometry)), "); - strcat (sql, "ST_Y(ST_StartPoint(Geometry)) "); - sprintf (sql2, "FROM \"%s\" ", table); - strcat (sql, sql2); - strcat (sql, "UNION "); - strcat (sql, "SELECT ST_X(ST_EndPoint(Geometry)), "); - strcat (sql, "ST_Y(ST_EndPoint(Geometry)) "); - sprintf (sql2, "FROM \"%s\"", table); - strcat (sql, sql2); - - ret = sqlite3_exec (handle, sql, NULL, NULL, &sql_err); - if (ret != SQLITE_OK) - { - fprintf (stderr, "GraphNodes SQL error: %s\n", sql_err); - sqlite3_free (sql_err); - return 0; - } - -/* setting OSM-IDs to graph-nodes */ -/* the complete operation is handled as a unique SQL Transaction */ + struct way xway; + int way = 0; + int count = 0; + int c; + char *p; + struct check_tag tag; + struct arc *xarc; + init_tag (&tag, 5); + xway.first = NULL; + xway.last = NULL; + xway.first_kv = NULL; + xway.last_kv = NULL; + xway.first_arc = NULL; + xway.last_arc = NULL; + xway.class = NULL; + xway.name = NULL; + +/* the complete operation is handled as an unique SQL Transaction */ ret = sqlite3_exec (handle, "BEGIN", NULL, NULL, &sql_err); if (ret != SQLITE_OK) { fprintf (stderr, "BEGIN TRANSACTION error: %s\n", sql_err); sqlite3_free (sql_err); - return 0; - } - - strcpy (sql, "SELECT n.ROWID, t.id FROM osm_tmp_nodes AS t "); - strcat (sql, "JOIN graph_nodes AS n ON (t.lon = n.lon AND t.lat = n.lat)"); - ret = sqlite3_prepare_v2 (handle, sql, strlen (sql), &query_stmt, NULL); - if (ret != SQLITE_OK) - { - fprintf (stderr, "SQL error: %s\n%s\n", sql, sqlite3_errmsg (handle)); - goto error; - } - - strcpy (sql, "UPDATE graph_nodes SET osm_id = ? "); - strcat (sql, "WHERE ROWID = ?"); - ret = sqlite3_prepare_v2 (handle, sql, strlen (sql), &update_stmt, NULL); - if (ret != SQLITE_OK) - { - fprintf (stderr, "SQL error: %s\n%s\n", sql, sqlite3_errmsg (handle)); - goto error; - } - - while (1) - { - ret = sqlite3_step (query_stmt); - if (ret == SQLITE_DONE) - break; - if (ret == SQLITE_ROW) - { - sqlite3_int64 id = sqlite3_column_int64 (query_stmt, 0); - sqlite3_int64 osm_id = sqlite3_column_int64 (query_stmt, 1); - - /* udating the GraphNote */ - sqlite3_reset (update_stmt); - sqlite3_clear_bindings (update_stmt); - sqlite3_bind_int64 (update_stmt, 1, osm_id); - sqlite3_bind_int64 (update_stmt, 2, id); - ret = sqlite3_step (update_stmt); - if (ret == SQLITE_DONE || ret == SQLITE_ROW) - ; + return -1; + } + +/* preparing the SQL statement */ + if (double_arcs) + { + /* unidirectional arcs */ + sprintf (value, "INSERT OR IGNORE INTO \"%s\" ", table); + strcat (value, "(id, osm_id, class, node_from, node_to, name, "); + strcat (value, "length, cost, geometry) VALUES "); + strcat (value, "(NULL, ?, ?, ?, ?, ?, ?, ?, ?)"); + } + else + { + /* bidirectional arcs */ + sprintf (value, "INSERT OR IGNORE INTO \"%s\" ", table); + strcat (value, "(id, osm_id, class, node_from, node_to, name, "); + strcat (value, + "oneway_fromto, oneway_tofrom, length, cost, geometry) "); + strcat (value, "VALUES (NULL, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)"); + } + ret = sqlite3_prepare_v2 (handle, value, strlen (value), &stmt, NULL); + if (ret != SQLITE_OK) + { + fprintf (stderr, "SQL error: %s\n%s\n", value, + sqlite3_errmsg (handle)); + return -1; + } + + while ((c = getc (xml)) != EOF) + { + if (way) + { + /* we are inside a tag */ + *p++ = c; + } + update_tag (&tag, c); + if (strncmp (tag.buf, " tag */ + way = 1; + strcpy (value, " tag */ + *p = '\0'; + if (!parse_way_tag (value, &xway)) + { + clean_way (&xway); + fprintf (stderr, "ERROR: invalid \n"); + sqlite3_finalize (stmt); + return -1; + } else { - printf ("sqlite3_step() error: %s\n", - sqlite3_errmsg (handle)); - goto error; + if (check_way (&xway, railways)) + { + ret = build_geometry (handle, &xway); + if (ret == 0) + { + fprintf (stderr, + "ERROR: invalid geometry \n"); + clean_way (&xway); + sqlite3_finalize (stmt); + return -1; + } + else if (ret < 0) + ; + else + { + xarc = xway.first_arc; + while (xarc) + { + if (xarc->geom == NULL) + { + /* skipping empty geometries */ + xarc = xarc->next; + continue; + } + if (double_arcs) + ret = + insert_arc_unidir (handle, stmt, + &xway, xarc); + else + ret = + insert_arc_bidir (handle, stmt, + &xway, xarc); + if (!ret) + { + clean_way (&xway); + sqlite3_finalize (stmt); + return -1; + } + count += ret; + xarc = xarc->next; + } + } + } + clean_way (&xway); } - } - else - { - printf ("sqlite3_step() error: %s\n", sqlite3_errmsg (handle)); - goto error; + way = 0; + continue; } } - - if (query_stmt != NULL) - sqlite3_finalize (query_stmt); - if (update_stmt != NULL) - sqlite3_finalize (update_stmt); +/* finalizing the INSERT INTO prepared statement */ + sqlite3_finalize (stmt); /* committing the still pending SQL Transaction */ ret = sqlite3_exec (handle, "COMMIT", NULL, NULL, &sql_err); if (ret != SQLITE_OK) { fprintf (stderr, "COMMIT TRANSACTION error: %s\n", sql_err); sqlite3_free (sql_err); - } - return 1; - - error: - if (query_stmt != NULL) - sqlite3_finalize (query_stmt); - if (update_stmt != NULL) - sqlite3_finalize (update_stmt); - - ret = sqlite3_exec (handle, "ROLLBACK", NULL, NULL, &sql_err); - if (ret != SQLITE_OK) - { - fprintf (stderr, "ROLLBACK TRANSACTION error: %s\n", sql_err); - sqlite3_free (sql_err); - } + return -1; + } + return count; +} + +static int +pre_check_way (struct way *xway, int railways) +{ +/* checks if is interesting to build the road network */ + struct kv *pkv; + pkv = xway->first_kv; + while (pkv) + { + if (is_valid_way (pkv->k, pkv->v, railways)) + return 1; + pkv = pkv->next; + } + return 0; +} + +static int +update_node (sqlite3 * handle, sqlite3_stmt * stmt, sqlite3_int64 id) +{ +/* updating the node reference count */ + int ret; + sqlite3_reset (stmt); + sqlite3_clear_bindings (stmt); + sqlite3_bind_int64 (stmt, 1, id); + ret = sqlite3_step (stmt); + if (ret == SQLITE_DONE || ret == SQLITE_ROW) + return 1; + fprintf (stderr, "sqlite3_step() error: %s\n", sqlite3_errmsg (handle)); + sqlite3_finalize (stmt); return 0; } static int -set_node_ids (sqlite3 * handle, const char *table) +mark_nodes (sqlite3 * handle, sqlite3_stmt * stmt_upd, struct way *xway) +{ +/* examining the node-reference list representing an ARC */ + int ret; + sqlite3_stmt *stmt; + sqlite3_int64 id; + double lon; + double lat; + char sql[8192]; + int ind; + int points = 0; + int tbd; + int count; + int base = 0; + int block = 128; + int how_many; + struct node_ref *p; + p = xway->first; + while (p) + { + points++; + p = p->next; + } + tbd = points; + while (tbd > 0) + { + /* requesting max 128 points at each time */ + if (tbd < block) + how_many = tbd; + else + how_many = block; + strcpy (sql, "SELECT id, lat, lon FROM osm_tmp_nodes "); + strcat (sql, "WHERE id IN ("); + for (ind = 0; ind < how_many; ind++) + { + if (ind == 0) + strcat (sql, "?"); + else + strcat (sql, ",?"); + } + strcat (sql, ")"); + ret = sqlite3_prepare_v2 (handle, sql, strlen (sql), &stmt, NULL); + if (ret != SQLITE_OK) + { + fprintf (stderr, "SQL error: %s\n%s\n", sql, + sqlite3_errmsg (handle)); + return 0; + } + sqlite3_reset (stmt); + sqlite3_clear_bindings (stmt); + ind = 1; + count = 0; + p = xway->first; + while (p) + { + if (count < base) + { + count++; + p = p->next; + continue; + } + if (count >= (base + how_many)) + break; + sqlite3_bind_int64 (stmt, ind, p->id); + ind++; + count++; + p = p->next; + } + while (1) + { + /* scrolling the result set */ + ret = sqlite3_step (stmt); + if (ret == SQLITE_DONE) + { + /* there are no more rows to fetch - we can stop looping */ + break; + } + if (ret == SQLITE_ROW) + { + /* ok, we've just fetched a valid row */ + id = sqlite3_column_int (stmt, 0); + lat = sqlite3_column_double (stmt, 1); + lon = sqlite3_column_double (stmt, 2); + p = xway->first; + while (p) + { + if (p->id == id) + { + p->lat = lat; + p->lon = lon; + p->ignore = 0; + } + p = p->next; + } + } + else + { + /* some unexpected error occurred */ + fprintf (stderr, "sqlite3_step() error: %s\n", + sqlite3_errmsg (handle)); + sqlite3_finalize (stmt); + return 0; + } + } + sqlite3_finalize (stmt); + tbd -= how_many; + base += how_many; + } + p = xway->first; + while (p) + { + /* updating nodes ref-count */ + if (p->ignore == 0) + update_node (handle, stmt_upd, p->id); + p = p->next; + } + return 1; +} + +static int +parse_ways_pass_1 (FILE * xml, sqlite3 * handle, char *value, int railways) { -/* assigning IDs to Nodes of the Graph */ +/* parsing tags from XML file - Pass I */ + sqlite3_stmt *stmt; int ret; char *sql_err = NULL; - char sql[8192]; - char sql2[1024]; - sqlite3_stmt *query_stmt = NULL; - sqlite3_stmt *update_stmt = NULL; + struct way xway; + int way = 0; + int count = 0; + int c; + char *p; + struct check_tag tag; + init_tag (&tag, 5); + xway.first = NULL; + xway.last = NULL; + xway.first_kv = NULL; + xway.last_kv = NULL; + xway.first_arc = NULL; + xway.last_arc = NULL; + xway.class = NULL; + xway.name = NULL; -/* the complete operation is handled as a unique SQL Transaction */ +/* the complete operation is handled as an unique SQL Transaction */ ret = sqlite3_exec (handle, "BEGIN", NULL, NULL, &sql_err); if (ret != SQLITE_OK) { fprintf (stderr, "BEGIN TRANSACTION error: %s\n", sql_err); sqlite3_free (sql_err); - return 0; - } - -/* querying NodeIds */ - strcpy (sql, "SELECT w.id, n1.ROWID, n2.ROWID "); - sprintf (sql2, "FROM \"%s\" AS w, ", table); - strcat (sql, sql2); - strcat (sql, "graph_nodes AS n1, graph_nodes AS n2 "); - strcat (sql, "WHERE n1.lon = ST_X(ST_StartPoint(w.Geometry)) "); - strcat (sql, "AND n1.lat = ST_Y(ST_StartPoint(w.Geometry)) "); - strcat (sql, "AND n2.lon = ST_X(ST_EndPoint(w.Geometry)) "); - strcat (sql, "AND n2.lat = ST_Y(ST_EndPoint(w.Geometry))"); - ret = sqlite3_prepare_v2 (handle, sql, strlen (sql), &query_stmt, NULL); - if (ret != SQLITE_OK) - { - fprintf (stderr, "SQL error: %s\n%s\n", sql, sqlite3_errmsg (handle)); - goto error; - } - -/* updating Arcs */ - sprintf (sql, "UPDATE \"%s\" SET node_from = ?, node_to = ? ", table); - strcat (sql, "WHERE id = ?"); - ret = sqlite3_prepare_v2 (handle, sql, strlen (sql), &update_stmt, NULL); - if (ret != SQLITE_OK) - { - fprintf (stderr, "SQL error: %s\n%s\n", sql, sqlite3_errmsg (handle)); - goto error; - } - - while (1) - { - ret = sqlite3_step (query_stmt); - if (ret == SQLITE_DONE) - break; - if (ret == SQLITE_ROW) - { - sqlite3_int64 id = sqlite3_column_int64 (query_stmt, 0); - sqlite3_int64 node_from = sqlite3_column_int64 (query_stmt, 1); - sqlite3_int64 node_to = sqlite3_column_int64 (query_stmt, 2); - - /* udating the Arc */ - sqlite3_reset (update_stmt); - sqlite3_clear_bindings (update_stmt); - sqlite3_bind_int64 (update_stmt, 1, node_from); - sqlite3_bind_int64 (update_stmt, 2, node_to); - sqlite3_bind_int64 (update_stmt, 3, id); - ret = sqlite3_step (update_stmt); - if (ret == SQLITE_DONE || ret == SQLITE_ROW) - ; + return -1; + } +/* preparing the SQL statement */ + strcpy (value, "UPDATE osm_tmp_nodes SET refcount = refcount + 1 "); + strcat (value, "WHERE id = ?"); + ret = sqlite3_prepare_v2 (handle, value, strlen (value), &stmt, NULL); + if (ret != SQLITE_OK) + { + fprintf (stderr, "SQL error: %s\n%s\n", value, + sqlite3_errmsg (handle)); + return -1; + } + + while ((c = getc (xml)) != EOF) + { + if (way) + { + /* we are inside a tag */ + *p++ = c; + } + update_tag (&tag, c); + if (strncmp (tag.buf, " tag */ + way = 1; + strcpy (value, " tag */ + *p = '\0'; + if (!parse_way_tag (value, &xway)) + { + clean_way (&xway); + fprintf (stderr, "ERROR: invalid \n"); + return -1; + } else { - printf ("sqlite3_step() error: %s\n", - sqlite3_errmsg (handle)); - goto error; + if (pre_check_way (&xway, railways)) + { + if (!mark_nodes (handle, stmt, &xway)) + { + fprintf (stderr, + "ERROR: invalid node-reference list: \n"); + clean_way (&xway); + return -1; + } + count++; + } + clean_way (&xway); } - } - else - { - printf ("sqlite3_step() error: %s\n", sqlite3_errmsg (handle)); - goto error; + way = 0; + continue; } } - - if (query_stmt != NULL) - sqlite3_finalize (query_stmt); - if (update_stmt != NULL) - sqlite3_finalize (update_stmt); +/* finalizing the INSERT INTO prepared statement */ + sqlite3_finalize (stmt); /* committing the still pending SQL Transaction */ ret = sqlite3_exec (handle, "COMMIT", NULL, NULL, &sql_err); if (ret != SQLITE_OK) { fprintf (stderr, "COMMIT TRANSACTION error: %s\n", sql_err); sqlite3_free (sql_err); + return -1; } - return 1; + return count; +} - error: - if (query_stmt != NULL) - sqlite3_finalize (query_stmt); - if (update_stmt != NULL) - sqlite3_finalize (update_stmt); - - ret = sqlite3_exec (handle, "ROLLBACK", NULL, NULL, &sql_err); +static void +db_cleanup (sqlite3 * handle) +{ + int ret; + char *sql_err = NULL; +/* dropping the OSM_TMP_NODES table */ + printf ("\nDropping temporary table 'osm_tmp_nodes' ... wait please ...\n"); + ret = + sqlite3_exec (handle, "DROP TABLE osm_tmp_nodes", NULL, NULL, &sql_err); if (ret != SQLITE_OK) { - fprintf (stderr, "ROLLBACK TRANSACTION error: %s\n", sql_err); + fprintf (stderr, "'DROP TABLE osm_tmp_nodes' error: %s\n", sql_err); sqlite3_free (sql_err); + return; } - return 0; -} - -static double -compute_cost (struct aux_params *params, const char *class, double length) -{ -/* computing the travel time [cost] */ - double speed = params->default_speed; /* speed, in Km/h */ - double msec; - - if (class != NULL) - { - struct aux_speed *ps = params->first_speed; - while (ps) - { - if (strcmp (ps->class_name, class) == 0) - { - speed = ps->speed; - break; - } - ps = ps->next; - } - } - - msec = speed * 1000.0 / 3600.0; /* transforming speed in m/sec */ - return length / msec; -} - -static int -set_lengths_costs (struct aux_params *params, const char *table) -{ -/* assigning lengths and costs to each Arc of the Graph */ - int ret; - char *sql_err = NULL; - char sql[8192]; - char sql2[1024]; - sqlite3_stmt *query_stmt = NULL; - sqlite3_stmt *update_stmt = NULL; - -/* the complete operation is handled as a unique SQL Transaction */ - ret = sqlite3_exec (params->db_handle, "BEGIN", NULL, NULL, &sql_err); + printf ("\tDropped table 'osm_tmp_nodes'\n"); +/* dropping the 'from_to' index */ + printf ("\nDropping index 'from_to' ... wait please ...\n"); + ret = sqlite3_exec (handle, "DROP INDEX from_to", NULL, NULL, &sql_err); if (ret != SQLITE_OK) { - fprintf (stderr, "BEGIN TRANSACTION error: %s\n", sql_err); + fprintf (stderr, "'DROP INDEX from_to' error: %s\n", sql_err); sqlite3_free (sql_err); - return 0; - } - -/* querying Arcs */ - strcpy (sql, "SELECT id, class, GreatCircleLength(Geometry) "); - sprintf (sql2, "FROM \"%s\"", table); - strcat (sql, sql2); - ret = sqlite3_prepare_v2 (params->db_handle, sql, strlen (sql), - &query_stmt, NULL); - if (ret != SQLITE_OK) - { - fprintf (stderr, "SQL error: %s\n%s\n", sql, - sqlite3_errmsg (params->db_handle)); - goto error; - } - -/* updating Arcs */ - sprintf (sql, "UPDATE \"%s\" SET length = ?, cost = ? ", table); - strcat (sql, "WHERE id = ?"); - ret = sqlite3_prepare_v2 (params->db_handle, sql, strlen (sql), - &update_stmt, NULL); - if (ret != SQLITE_OK) - { - fprintf (stderr, "SQL error: %s\n%s\n", sql, - sqlite3_errmsg (params->db_handle)); - goto error; - } - - while (1) - { - ret = sqlite3_step (query_stmt); - if (ret == SQLITE_DONE) - break; - if (ret == SQLITE_ROW) - { - sqlite3_int64 id = sqlite3_column_int64 (query_stmt, 0); - const char *class = - (const char *) sqlite3_column_text (query_stmt, 1); - double length = sqlite3_column_double (query_stmt, 2); - double cost = compute_cost (params, class, length); - - /* udating the Arc */ - sqlite3_reset (update_stmt); - sqlite3_clear_bindings (update_stmt); - sqlite3_bind_double (update_stmt, 1, length); - sqlite3_bind_double (update_stmt, 2, cost); - sqlite3_bind_int64 (update_stmt, 3, id); - ret = sqlite3_step (update_stmt); - if (ret == SQLITE_DONE || ret == SQLITE_ROW) - ; - else - { - printf ("sqlite3_step() error: %s\n", - sqlite3_errmsg (params->db_handle)); - goto error; - } - } - else - { - printf ("sqlite3_step() error: %s\n", - sqlite3_errmsg (params->db_handle)); - goto error; - } - } - - if (query_stmt != NULL) - sqlite3_finalize (query_stmt); - if (update_stmt != NULL) - sqlite3_finalize (update_stmt); - -/* committing the still pending SQL Transaction */ - ret = sqlite3_exec (params->db_handle, "COMMIT", NULL, NULL, &sql_err); - if (ret != SQLITE_OK) - { - fprintf (stderr, "COMMIT TRANSACTION error: %s\n", sql_err); - sqlite3_free (sql_err); - } - return 1; - - error: - if (query_stmt != NULL) - sqlite3_finalize (query_stmt); - if (update_stmt != NULL) - sqlite3_finalize (update_stmt); - - ret = sqlite3_exec (params->db_handle, "ROLLBACK", NULL, NULL, &sql_err); - if (ret != SQLITE_OK) - { - fprintf (stderr, "ROLLBACK TRANSACTION error: %s\n", sql_err); - sqlite3_free (sql_err); - } - return 0; -} - -static int -create_qualified_nodes (struct aux_params *params, const char *table) -{ -/* creating and feeding the helper table representing Nodes of the Graph */ - int ret; - char *sql_err = NULL; - char sql[8192]; - char sql2[1024]; - sqlite3_stmt *query_stmt = NULL; - sqlite3_stmt *insert_stmt = NULL; - sqlite3_stmt *update_stmt = NULL; - char *err_msg = NULL; - - printf ("\nCreating helper table '%s_nodes' ... wait please ...\n", table); - sprintf (sql, "CREATE TABLE \"%s_nodes\" (\n", table); - strcat (sql, "node_id INTEGER NOT NULL PRIMARY KEY,\n"); - strcat (sql, "osm_id INTEGER,\n"); - strcat (sql, "cardinality INTEGER NOT NULL)\n"); - ret = sqlite3_exec (params->db_handle, sql, NULL, NULL, &err_msg); - if (ret != SQLITE_OK) - { - fprintf (stderr, "CREATE TABLE '%s_nodes' error: %s\n", table, - err_msg); - sqlite3_free (err_msg); - sqlite3_close (params->db_handle); - return 0; - } - - sprintf (sql, "SELECT AddGeometryColumn('%s_nodes', 'geometry', ", table); - strcat (sql, " 4326, 'POINT', 'XY')"); - ret = sqlite3_exec (params->db_handle, sql, NULL, NULL, &err_msg); - if (ret != SQLITE_OK) - { - fprintf (stderr, "AddGeometryColumn() error: %s\n", err_msg); - sqlite3_free (err_msg); - sqlite3_close (params->db_handle); - return 0; - } - -/* the complete operation is handled as a unique SQL Transaction */ - ret = sqlite3_exec (params->db_handle, "BEGIN", NULL, NULL, &sql_err); - if (ret != SQLITE_OK) - { - fprintf (stderr, "BEGIN TRANSACTION error: %s\n", sql_err); - sqlite3_free (sql_err); - return 0; - } - -/* querying Arcs */ - strcpy (sql, "SELECT node_from, ST_StartPoint(Geometry), "); - strcat (sql, "node_to, ST_EndPoint(Geometry) "); - sprintf (sql2, "FROM \"%s\"", table); - strcat (sql, sql2); - ret = sqlite3_prepare_v2 (params->db_handle, sql, strlen (sql), - &query_stmt, NULL); - if (ret != SQLITE_OK) - { - fprintf (stderr, "SQL error: %s\n%s\n", sql, - sqlite3_errmsg (params->db_handle)); - goto error; - } - -/* Inserting Nodes */ - sprintf (sql, - "INSERT OR IGNORE INTO \"%s_nodes\" (node_id, cardinality, geometry) ", - table); - strcat (sql, "VALUES (?, 0, ?)"); - ret = sqlite3_prepare_v2 (params->db_handle, sql, strlen (sql), - &insert_stmt, NULL); - if (ret != SQLITE_OK) - { - fprintf (stderr, "SQL error: %s\n%s\n", sql, - sqlite3_errmsg (params->db_handle)); - goto error; - } - - while (1) - { - ret = sqlite3_step (query_stmt); - if (ret == SQLITE_DONE) - break; - if (ret == SQLITE_ROW) - { - sqlite3_int64 id1 = sqlite3_column_int64 (query_stmt, 0); - const void *blob1 = sqlite3_column_blob (query_stmt, 1); - int len1 = sqlite3_column_bytes (query_stmt, 1); - sqlite3_int64 id2 = sqlite3_column_int64 (query_stmt, 2); - const void *blob2 = sqlite3_column_blob (query_stmt, 3); - int len2 = sqlite3_column_bytes (query_stmt, 3); - - /* inserting the Node (from) */ - sqlite3_reset (insert_stmt); - sqlite3_clear_bindings (insert_stmt); - sqlite3_bind_int64 (insert_stmt, 1, id1); - sqlite3_bind_blob (insert_stmt, 2, blob1, len1, SQLITE_STATIC); - ret = sqlite3_step (insert_stmt); - if (ret == SQLITE_DONE || ret == SQLITE_ROW) - ; - else - { - printf ("sqlite3_step() error: %s\n", - sqlite3_errmsg (params->db_handle)); - goto error; - } - - /* inserting the Node (to) */ - sqlite3_reset (insert_stmt); - sqlite3_clear_bindings (insert_stmt); - sqlite3_bind_int64 (insert_stmt, 1, id2); - sqlite3_bind_blob (insert_stmt, 2, blob2, len2, SQLITE_STATIC); - ret = sqlite3_step (insert_stmt); - if (ret == SQLITE_DONE || ret == SQLITE_ROW) - ; - else - { - printf ("sqlite3_step() error: %s\n", - sqlite3_errmsg (params->db_handle)); - goto error; - } - } - else - { - printf ("sqlite3_step() error: %s\n", - sqlite3_errmsg (params->db_handle)); - goto error; - } - } - - if (query_stmt != NULL) - sqlite3_finalize (query_stmt); - if (insert_stmt != NULL) - sqlite3_finalize (insert_stmt); - -/* committing the still pending SQL Transaction */ - ret = sqlite3_exec (params->db_handle, "COMMIT", NULL, NULL, &sql_err); - if (ret != SQLITE_OK) - { - fprintf (stderr, "COMMIT TRANSACTION error: %s\n", sql_err); - sqlite3_free (sql_err); - } -/* re-opening a Transaction */ - ret = sqlite3_exec (params->db_handle, "BEGIN", NULL, NULL, &sql_err); - if (ret != SQLITE_OK) - { - fprintf (stderr, "BEGIN TRANSACTION error: %s\n", sql_err); - sqlite3_free (sql_err); - return 0; - } - -/* re-querying Arcs */ - strcpy (sql, "SELECT node_from, node_to "); - sprintf (sql2, "FROM \"%s\"", table); - strcat (sql, sql2); - ret = sqlite3_prepare_v2 (params->db_handle, sql, strlen (sql), - &query_stmt, NULL); - if (ret != SQLITE_OK) - { - fprintf (stderr, "SQL error: %s\n%s\n", sql, - sqlite3_errmsg (params->db_handle)); - goto error; - } - -/* Updating Nodes */ - sprintf (sql, "UPDATE \"%s_nodes\" SET cardinality = (cardinality + 1) ", - table); - strcat (sql, "WHERE node_id = ?"); - ret = sqlite3_prepare_v2 (params->db_handle, sql, strlen (sql), - &update_stmt, NULL); - if (ret != SQLITE_OK) - { - fprintf (stderr, "SQL error: %s\n%s\n", sql, - sqlite3_errmsg (params->db_handle)); - goto error; - } - - while (1) - { - ret = sqlite3_step (query_stmt); - if (ret == SQLITE_DONE) - break; - if (ret == SQLITE_ROW) - { - sqlite3_int64 id1 = sqlite3_column_int64 (query_stmt, 0); - sqlite3_int64 id2 = sqlite3_column_int64 (query_stmt, 1); - - /* udating the Node (from) */ - sqlite3_reset (update_stmt); - sqlite3_clear_bindings (update_stmt); - sqlite3_bind_double (update_stmt, 1, id1); - ret = sqlite3_step (update_stmt); - if (ret == SQLITE_DONE || ret == SQLITE_ROW) - ; - else - { - printf ("sqlite3_step() error: %s\n", - sqlite3_errmsg (params->db_handle)); - goto error; - } - - /* udating the Node (to) */ - sqlite3_reset (update_stmt); - sqlite3_clear_bindings (update_stmt); - sqlite3_bind_double (update_stmt, 1, id2); - ret = sqlite3_step (update_stmt); - if (ret == SQLITE_DONE || ret == SQLITE_ROW) - ; - else - { - printf ("sqlite3_step() error: %s\n", - sqlite3_errmsg (params->db_handle)); - goto error; - } - } - else - { - printf ("sqlite3_step() error: %s\n", - sqlite3_errmsg (params->db_handle)); - goto error; - } - } - - if (query_stmt != NULL) - sqlite3_finalize (query_stmt); - if (update_stmt != NULL) - sqlite3_finalize (update_stmt); - -/* committing the still pending SQL Transaction */ - ret = sqlite3_exec (params->db_handle, "COMMIT", NULL, NULL, &sql_err); - if (ret != SQLITE_OK) - { - fprintf (stderr, "COMMIT TRANSACTION error: %s\n", sql_err); - sqlite3_free (sql_err); - } -/* re-opening a Transaction */ - ret = sqlite3_exec (params->db_handle, "BEGIN", NULL, NULL, &sql_err); - if (ret != SQLITE_OK) - { - fprintf (stderr, "BEGIN TRANSACTION error: %s\n", sql_err); - sqlite3_free (sql_err); - return 0; - } - -/* querying Nodes */ - strcpy (sql, "SELECT n.node_id, t.osm_id "); - sprintf (sql2, "FROM \"%s_nodes\" AS n ", table); - strcat (sql, sql2); - strcat (sql, "JOIN graph_nodes AS t ON ("); - strcat (sql, "ST_X(n.Geometry) = t.lon AND "); - strcat (sql, "ST_Y(n.Geometry) = t.lat)"); - ret = sqlite3_prepare_v2 (params->db_handle, sql, strlen (sql), - &query_stmt, NULL); - if (ret != SQLITE_OK) - { - fprintf (stderr, "SQL error: %s\n%s\n", sql, - sqlite3_errmsg (params->db_handle)); - goto error; - } - -/* Updating Nodes */ - sprintf (sql, "UPDATE \"%s_nodes\" SET osm_id = ? ", table); - strcat (sql, "WHERE node_id = ?"); - ret = sqlite3_prepare_v2 (params->db_handle, sql, strlen (sql), - &update_stmt, NULL); - if (ret != SQLITE_OK) - { - fprintf (stderr, "SQL error: %s\n%s\n", sql, - sqlite3_errmsg (params->db_handle)); - goto error; - } - - while (1) - { - ret = sqlite3_step (query_stmt); - if (ret == SQLITE_DONE) - break; - if (ret == SQLITE_ROW) - { - sqlite3_int64 id = sqlite3_column_int64 (query_stmt, 0); - sqlite3_int64 osm_id = sqlite3_column_int64 (query_stmt, 1); - - /* udating the Node OSM-ID */ - sqlite3_reset (update_stmt); - sqlite3_clear_bindings (update_stmt); - sqlite3_bind_int64 (update_stmt, 1, osm_id); - sqlite3_bind_int64 (update_stmt, 2, id); - ret = sqlite3_step (update_stmt); - if (ret == SQLITE_DONE || ret == SQLITE_ROW) - ; - else - { - printf ("sqlite3_step() error: %s\n", - sqlite3_errmsg (params->db_handle)); - goto error; - } - } - else - { - printf ("sqlite3_step() error: %s\n", - sqlite3_errmsg (params->db_handle)); - goto error; - } - } -/* committing the still pending SQL Transaction */ - ret = sqlite3_exec (params->db_handle, "COMMIT", NULL, NULL, &sql_err); - if (ret != SQLITE_OK) - { - fprintf (stderr, "COMMIT TRANSACTION error: %s\n", sql_err); - sqlite3_free (sql_err); - } - printf ("\tHelper table '%s_nodes' succesfully created\n", table); - return 1; - - error: - if (query_stmt != NULL) - sqlite3_finalize (query_stmt); - if (insert_stmt != NULL) - sqlite3_finalize (insert_stmt); - if (update_stmt != NULL) - sqlite3_finalize (update_stmt); - - ret = sqlite3_exec (params->db_handle, "ROLLBACK", NULL, NULL, &sql_err); - if (ret != SQLITE_OK) - { - fprintf (stderr, "ROLLBACK TRANSACTION error: %s\n", sql_err); - sqlite3_free (sql_err); - } - return 0; + return; + } + printf ("\tDropped index 'from_to'\n"); } static void -finalize_sql_stmts (struct aux_params *params) +db_vacuum (sqlite3 * handle) { -/* memory cleanup - prepared statements */ int ret; char *sql_err = NULL; - - if (params->ins_tmp_nodes_stmt != NULL) - sqlite3_finalize (params->ins_tmp_nodes_stmt); - if (params->upd_tmp_nodes_stmt != NULL) - sqlite3_finalize (params->upd_tmp_nodes_stmt); - if (params->rd_tmp_nodes_stmt != NULL) - sqlite3_finalize (params->rd_tmp_nodes_stmt); - if (params->ins_arcs_stmt != NULL) - sqlite3_finalize (params->ins_arcs_stmt); - -/* committing the still pending SQL Transaction */ - ret = sqlite3_exec (params->db_handle, "COMMIT", NULL, NULL, &sql_err); +/* VACUUMing the DB */ + printf ("\nVACUUMing the DB ... wait please ...\n"); + ret = sqlite3_exec (handle, "VACUUM", NULL, NULL, &sql_err); if (ret != SQLITE_OK) { - fprintf (stderr, "COMMIT TRANSACTION error: %s\n", sql_err); + fprintf (stderr, "VACUUM error: %s\n", sql_err); sqlite3_free (sql_err); return; } -} - -static void -create_sql_stmts (struct aux_params *params) -{ -/* creating prepared SQL statements */ - sqlite3_stmt *ins_tmp_nodes_stmt; - sqlite3_stmt *upd_tmp_nodes_stmt; - sqlite3_stmt *rd_tmp_nodes_stmt; - sqlite3_stmt *ins_arcs_stmt; - char sql[1024]; - int ret; - char *sql_err = NULL; - -/* the complete operation is handled as a unique SQL Transaction */ - ret = sqlite3_exec (params->db_handle, "BEGIN", NULL, NULL, &sql_err); - if (ret != SQLITE_OK) - { - fprintf (stderr, "BEGIN TRANSACTION error: %s\n", sql_err); - sqlite3_free (sql_err); - return; - } - strcpy (sql, "INSERT INTO osm_tmp_nodes (id, lat, lon, ref_count) "); - strcat (sql, "VALUES (?, ?, ?, 0)"); - ret = - sqlite3_prepare_v2 (params->db_handle, sql, strlen (sql), - &ins_tmp_nodes_stmt, NULL); - if (ret != SQLITE_OK) - { - fprintf (stderr, "SQL error: %s\n%s\n", sql, - sqlite3_errmsg (params->db_handle)); - finalize_sql_stmts (params); - return; - } - strcpy (sql, "UPDATE osm_tmp_nodes SET ref_count = (ref_count + 1) "); - strcat (sql, "WHERE id = ?"); - ret = - sqlite3_prepare_v2 (params->db_handle, sql, strlen (sql), - &upd_tmp_nodes_stmt, NULL); - if (ret != SQLITE_OK) - { - fprintf (stderr, "SQL error: %s\n%s\n", sql, - sqlite3_errmsg (params->db_handle)); - finalize_sql_stmts (params); - return; - } - strcpy (sql, "SELECT lon, lat, ref_count FROM osm_tmp_nodes "); - strcat (sql, "WHERE id = ?"); - ret = - sqlite3_prepare_v2 (params->db_handle, sql, strlen (sql), - &rd_tmp_nodes_stmt, NULL); - if (ret != SQLITE_OK) - { - fprintf (stderr, "SQL error: %s\n%s\n", sql, - sqlite3_errmsg (params->db_handle)); - finalize_sql_stmts (params); - return; - } - sprintf (sql, "INSERT INTO \"%s\" ", params->table); - strcat (sql, "(id, osm_id, node_from, node_to, class, "); - strcat (sql, - "name, oneway_fromto, oneway_tofrom, length, cost, geometry) "); - strcat (sql, "VALUES (NULL, ?, -1, -1, ?, ?, ?, ?, -1, -1, ?)"); - ret = - sqlite3_prepare_v2 (params->db_handle, sql, strlen (sql), - &ins_arcs_stmt, NULL); - if (ret != SQLITE_OK) - { - fprintf (stderr, "SQL error: %s\n%s\n", sql, - sqlite3_errmsg (params->db_handle)); - finalize_sql_stmts (params); - return; - } - - params->ins_tmp_nodes_stmt = ins_tmp_nodes_stmt; - params->upd_tmp_nodes_stmt = upd_tmp_nodes_stmt; - params->rd_tmp_nodes_stmt = rd_tmp_nodes_stmt; - params->ins_arcs_stmt = ins_arcs_stmt; + printf ("\tAll done: OSM graph was succesfully loaded\n"); } static void spatialite_autocreate (sqlite3 * db) { @@ -1477,32 +2194,19 @@ goto unknown; /* creating the OSM related tables */ strcpy (sql, "CREATE TABLE osm_tmp_nodes (\n"); strcat (sql, "id INTEGER NOT NULL PRIMARY KEY,\n"); + strcat (sql, "alias INTEGER NOT NULL,\n"); strcat (sql, "lat DOUBLE NOT NULL,\n"); strcat (sql, "lon DOUBLE NOT NULL,\n"); - strcat (sql, "ref_count INTEGER NOT NULL)\n"); + strcat (sql, "refcount INTEGER NOT NULL)\n"); ret = sqlite3_exec (handle, sql, NULL, NULL, &err_msg); if (ret != SQLITE_OK) { fprintf (stderr, "CREATE TABLE 'osm_tmp_nodes' error: %s\n", err_msg); sqlite3_free (err_msg); - sqlite3_close (handle); - return NULL; - } -/* creating the GRAPH temporary nodes */ - strcpy (sql, "CREATE TABLE graph_nodes (\n"); - strcat (sql, "lon DOUBLE NOT NULL,\n"); - strcat (sql, "lat DOUBLE NOT NULL,\n"); - strcat (sql, "osm_id INTEGER,\n"); - strcat (sql, "CONSTRAINT pk_nodes PRIMARY KEY (lon, lat))\n"); - ret = sqlite3_exec (handle, sql, NULL, NULL, &err_msg); - if (ret != SQLITE_OK) - { - fprintf (stderr, "CREATE TABLE 'graph_nodes' error: %s\n", err_msg); - sqlite3_free (err_msg); sqlite3_close (handle); return NULL; } if (double_arcs) @@ -1550,10 +2254,22 @@ fprintf (stderr, "AddGeometryColumn() error: %s\n", err_msg); sqlite3_free (err_msg); sqlite3_close (handle); return NULL; } + + sprintf (sql, + "CREATE UNIQUE INDEX from_to ON \"%s\" (node_from, node_to, length, cost)", + table); + ret = sqlite3_exec (handle, sql, NULL, NULL, &err_msg); + if (ret != SQLITE_OK) + { + fprintf (stderr, "CREATE INDEX 'from_to' error: %s\n", err_msg); + sqlite3_free (err_msg); + sqlite3_close (handle); + return NULL; + } return handle; unknown: if (handle) @@ -1563,536 +2279,67 @@ fprintf (stderr, "Please, run the 'spatialite-init' SQL script \n"); fprintf (stderr, "in order to initialize Spatial Metadata\n\n"); return NULL; } -static void -db_cleanup (sqlite3 * handle) +static int +check_osm_xml (FILE * xml) { - int ret; - char *sql_err = NULL; -/* dropping the OSM_TMP_NODES table */ - printf ("\nDropping temporary table 'osm_tmp_nodes' ... wait please ...\n"); - ret = - sqlite3_exec (handle, "DROP TABLE osm_tmp_nodes", NULL, NULL, &sql_err); - if (ret != SQLITE_OK) - { - fprintf (stderr, "'DROP TABLE osm_tmp_nodes' error: %s\n", sql_err); - sqlite3_free (sql_err); - return; - } - printf ("\tDropped table 'osm_tmp_nodes'\n"); -/* dropping the GRAPH_NODES table */ - printf ("\nDropping temporary table 'graph_nodes' ... wait please ...\n"); - ret = sqlite3_exec (handle, "DROP TABLE graph_nodes", NULL, NULL, &sql_err); - if (ret != SQLITE_OK) - { - fprintf (stderr, "'DROP TABLE graph_nodes' error: %s\n", sql_err); - sqlite3_free (sql_err); - return; - } - printf ("\tDropped table 'graph_nodes'\n"); -} - -static void -db_vacuum (sqlite3 * handle) -{ - int ret; - char *sql_err = NULL; -/* VACUUMing the DB */ - printf ("\nVACUUMing the DB ... wait please ...\n"); - ret = sqlite3_exec (handle, "VACUUM", NULL, NULL, &sql_err); - if (ret != SQLITE_OK) - { - fprintf (stderr, "VACUUM error: %s\n", sql_err); - sqlite3_free (sql_err); - return; - } - printf ("\tAll done: OSM graph was succesfully loaded\n"); -} - -static int -parse_kv (char *line, const char **k, const char **v) -{ -/* splitting two tokens separated by a colon ':' */ - int i; - int cnt = 0; - int pos = -1; - int len = strlen (line); - for (i = 0; i < len; i++) - { - if (line[i] == ':') - { - /* delimiter found */ - cnt++; - pos = i; - } - } - if (cnt != 1) - { - /* illegal string */ - return 0; - } - line[pos] = '\0'; - *k = line; - *v = line + pos + 1; - return 1; -} - -static void -free_params (struct aux_params *params) -{ -/* memory cleanup - aux params linked lists */ - struct aux_speed *ps; - struct aux_speed *ps_n; - struct aux_class *pc; - struct aux_class *pc_n; - ps = params->first_speed; - while (ps) - { - ps_n = ps->next; - free (ps->class_name); - free (ps); - ps = ps_n; - } - params->first_speed = NULL; - params->last_speed = NULL; - pc = params->first_include; - while (pc) - { - pc_n = pc->next; - free (pc->class_name); - if (pc->sub_class != NULL) - free (pc->sub_class); - free (pc); - pc = pc_n; - } - params->first_include = NULL; - params->last_include = NULL; - pc = params->first_ignore; - while (pc) - { - pc_n = pc->next; - free (pc->class_name); - if (pc->sub_class != NULL) - free (pc->sub_class); - free (pc); - pc = pc_n; - } - params->first_ignore = NULL; - params->last_ignore = NULL; -} - -static void -add_speed_class (struct aux_params *params, const char *class, double speed) -{ -/* inserting a class speed into the linked list */ - int len = strlen (class); - struct aux_speed *p = malloc (sizeof (struct aux_speed)); - p->class_name = malloc (len + 1); - strcpy (p->class_name, class); - p->speed = speed; - p->next = NULL; - if (params->first_speed == NULL) - params->first_speed = p; - if (params->last_speed != NULL) - params->last_speed->next = p; - params->last_speed = p; -} - -static void -add_include_class (struct aux_params *params, const char *class, - const char *sub_class) -{ -/* inserting an Include class into the linked list */ - int len1 = strlen (class); - int len2 = strlen (sub_class); - struct aux_class *p = malloc (sizeof (struct aux_class)); - p->class_name = malloc (len1 + 1); - strcpy (p->class_name, class); - if (len2 == 0) - p->sub_class = NULL; - else - { - p->sub_class = malloc (len2 + 1); - strcpy (p->sub_class, sub_class); - } - p->next = NULL; - if (params->first_include == NULL) - params->first_include = p; - if (params->last_include != NULL) - params->last_include->next = p; - params->last_include = p; -} - -static void -add_ignore_class (struct aux_params *params, const char *class, - const char *sub_class) -{ -/* inserting an Ignore class into the linked list */ - int len1 = strlen (class); - int len2 = strlen (sub_class); - struct aux_class *p = malloc (sizeof (struct aux_class)); - p->class_name = malloc (len1 + 1); - strcpy (p->class_name, class); - p->sub_class = malloc (len2 + 1); - strcpy (p->sub_class, sub_class); - p->next = NULL; - if (params->first_ignore == NULL) - params->first_ignore = p; - if (params->last_ignore != NULL) - params->last_ignore->next = p; - params->last_ignore = p; -} - -static int -parse_template_line (struct aux_params *params, const char *line) -{ -/* parsing a template line */ - char clean[8192]; - char *out = clean; - const char *in = line; - int i; - - *out = '\0'; - while (1) - { - if (*in == '\0' || *in == '#') - { - *out = '\0'; - break; - } - *out++ = *in++; - } - for (i = (int) strlen (clean) - 1; i >= 0; i--) - { - /* cleaning any tralining space/tab */ - if (clean[i] == ' ' || clean[i] == '\t') - clean[i] = '\0'; - else +/* check if the file contains OSM XML */ + int xml_open = 0; + int xml_close = 0; + int osm_open = 0; + int osm_close = 0; + int ok_xml = 0; + int ok_osm = 0; + char tag[512]; + char *p; + int c; + int count = 0; + while ((c = getc (xml)) != EOF) + { + count++; + if (count > 512) break; - } - if (*clean == '\0') - return 1; /* ignoring empty lines */ - if (strncmp (clean, "NodingStrategy:", 15) == 0) - { - if (strcmp (clean + 15, "way-ends") == 0) - { - params->noding_strategy = NODE_STRAT_ENDS; - return 1; - } - else if (strcmp (clean + 15, "none") == 0) - { - params->noding_strategy = NODE_STRAT_NONE; - return 1; - } - else if (strcmp (clean + 15, "all") == 0) - { - params->noding_strategy = NODE_STRAT_ALL; - return 1; - } - else - return 0; - } - else if (strncmp (clean, "OnewayStrategy:", 15) == 0) - { - if (strcmp (clean + 15, "full") == 0) - { - params->oneway_strategy = ONEWAY_STRAT_FULL; - return 1; - } - else if (strcmp (clean + 15, "none") == 0) - { - params->oneway_strategy = ONEWAY_STRAT_NONE; - return 1; - } - else if (strcmp (clean + 15, "ignore-roundabout") == 0) - { - params->oneway_strategy = ONEWAY_STRAT_NO_ROUND; - return 1; - } - else if (strcmp (clean + 15, "ignore-motorway") == 0) - { - params->oneway_strategy = ONEWAY_STRAT_NO_MOTOR; - return 1; - } - else if (strcmp (clean + 15, "ignore-both-roundabout-and-motorway") == - 0) - { - params->oneway_strategy = ONEWAY_STRAT_NO_BOTH; - return 1; - } - else - return 0; - } - else if (strncmp (clean, "ClassInclude:", 13) == 0) - { - const char *k; - const char *v; - if (parse_kv (clean + 13, &k, &v)) - { - if (strlen (k) > 0) - add_include_class (params, k, v); - return 1; - } - else - return 0; - } - else if (strncmp (clean, "ClassIgnore:", 12) == 0) - { - const char *k; - const char *v; - if (parse_kv (clean + 12, &k, &v)) - { - if (strlen (k) > 0 && strlen (v) > 0) - add_ignore_class (params, k, v); - return 1; - } - else - return 0; - } - else if (strncmp (clean, "SpeedClass:", 11) == 0) - { - const char *k; - const char *v; - if (parse_kv (clean + 11, &k, &v)) - { - if (*k == '\0') - params->default_speed = atof (v); - else - add_speed_class (params, k, atof (v)); - return 1; - } - else - return 0; - } -/* some illegal expression found */ - return 0; -} - -static int -parse_template (struct aux_params *params, const char *template_path) -{ -/* parsing a template-file */ - char line[8192]; - char *p = line; - int c; - int lineno = 0; - FILE *in = fopen (template_path, "rb"); - if (in == NULL) - { - fprintf (stderr, "Unable to open template-file \"%s\"\n", - template_path); - return 0; - } - - while ((c = getc (in)) != EOF) - { - - if (c == '\r') - continue; - if (c == '\n') - { + if (!xml_open && c == '<') + { + xml_open = 1; + p = tag; + *p = '\0'; + continue; + } + if (!osm_open && c == '<') + { + osm_open = 1; + p = tag; + *p = '\0'; + continue; + } + if (!xml_close && c == '>') + { + xml_close = 1; + *p = '\0'; + if (strncmp (tag, "?xml", 4) == 0) + ok_xml = 1; + continue; + } + if (!osm_close && c == '>') + { + osm_close = 1; *p = '\0'; - lineno++; - if (!parse_template_line (params, line)) - { - fprintf (stderr, - "Template-file \"%s\"\nParsing error on line %d\n\n", - template_path, lineno); - free_params (params); - return 0; - } - p = line; - continue; - } - *p++ = c; - } - - fclose (in); - return 1; -} - -static int -print_template (const char *template_path, int railways) -{ -/* printing a default template-file */ - FILE *out = fopen (template_path, "w"); - if (out == NULL) - { - fprintf (stderr, "Unable to create template-file \"%s\"\n", - template_path); - return 0; - } - - fprintf (out, - "###############################################################\n"); - fprintf (out, "#\n"); - fprintf (out, "# the '#' char represents a comment marker:\n"); - fprintf (out, "# any text until the next new-line (NL) char will\n"); - fprintf (out, "# be ignored at all.\n"); - fprintf (out, "#\n\n"); - - fprintf (out, - "###############################################################\n"); - fprintf (out, "#\n"); - fprintf (out, "# NodingStrategy section\n"); - fprintf (out, "#\n"); - fprintf (out, "# - NodingStrategy:way-ends\n"); - fprintf (out, - "# any Way end-point (both extremities) is assumed to represent\n"); - fprintf (out, "# a Node into the Graph [network] to be built.\n"); - fprintf (out, "# - NodingStrategy:none\n"); - fprintf (out, - "# any Way is assumed to directly represent an Arc into the Graph\n"); - fprintf (out, - "# [network] to be built. No attempt to split and renode the\n"); - fprintf (out, "# Graph's Arcs will be performed.\n"); - fprintf (out, "# - NodingStrategy:all\n"); - fprintf (out, - "# any Way point is assumed to represent a Node into the Graph\n"); - fprintf (out, - "# [network] to be built, if it's shared by two or more Ways.\n"); - fprintf (out, "#\n\n"); - if (railways) - { - fprintf (out, "NodingStrategy:all # default value for Railway\n"); - fprintf (out, "# NodingStrategy:none\n"); - fprintf (out, "# NodingStrategy:way-ends\n\n\n"); - } - else - { - fprintf (out, "NodingStrategy:way-ends # default value\n"); - fprintf (out, "# NodingStrategy:none\n"); - fprintf (out, "# NodingStrategy:all\n\n\n"); - } - - fprintf (out, - "###############################################################\n"); - fprintf (out, "#\n"); - fprintf (out, "# OnewayStrategy section\n"); - fprintf (out, "#\n"); - fprintf (out, "# - OnewayStrategy:full\n"); - fprintf (out, - "# the following OSM tags will be assumed to identify oneways:\n"); - fprintf (out, - "# * oneway:1, oneway:true or oneway:yes [oneway, normal direction]\n"); - fprintf (out, - "# * oneway:-1 or oneway:reverse [oneway, reverse direction]\n"); - fprintf (out, - "# * junction:roundabout, highway:motorway or highway:motorway_link\n"); - fprintf (out, "# * [implicit oneway, normal direction]\n"); - fprintf (out, "# - OnewayStrategy:none\n"); - fprintf (out, - "# all Arcs will be assumed to be bidirectional (no oneway at all).\n"); - fprintf (out, "# - OnewayStrategy:ignore-roundabout\n"); - fprintf (out, - "# any junction:roundabout tag will not be assumed to mark an oneway.\n"); - fprintf (out, "# - OnewayStrategy:ignore-motorway\n"); - fprintf (out, - "# any highway:motorway or highway:motorway_link tag will not be \n"); - fprintf (out, "# assumed to mark an oneway.\n"); - fprintf (out, "# - OnewayStrategy:ignore-both-roundabout-and-motorway\n"); - fprintf (out, - "# any junction:roundabout, highway:motorway or highway:motorway_link\n"); - fprintf (out, "# tag will not be assumed to mark an oneway.\n"); - fprintf (out, "#\n\n"); - if (railways) - { - fprintf (out, "OnewayStrategy:none # default value for Railways\n"); - fprintf (out, "# OnewayStrategy:full\n"); - fprintf (out, "# OnewayStrategy:ignore-roundabout\n"); - fprintf (out, "# OnewayStrategy:ignore-motorway\n"); - fprintf (out, - "# OnewayStrategy:ignore-both-roundabout-and-motorway\n\n\n"); - } - else - { - fprintf (out, "OnewayStrategy:full # default value\n"); - fprintf (out, "# OnewayStrategy:none\n"); - fprintf (out, "# OnewayStrategy:ignore-roundabout\n"); - fprintf (out, "# OnewayStrategy:ignore-motorway\n"); - fprintf (out, - "# OnewayStrategy:ignore-both-roundabout-and-motorway\n\n\n"); - } - - fprintf (out, - "###############################################################\n"); - fprintf (out, "#\n"); - fprintf (out, "# ClassInclude section\n"); - fprintf (out, "#\n"); - fprintf (out, "# - tokens are delimited by colons ':'\n"); - fprintf (out, - "# - the second and third tokens represents a Class-name tag\n"); - fprintf (out, - "# identifying the Arcs of the Graph: i.e. any Way exposing\n"); - fprintf (out, "# this tag will be processed.\n"); - fprintf (out, - "# - special case: suppressing the third token selects any\n"); - fprintf (out, "# generic main-class tag to be processed\n"); - fprintf (out, "#\n\n"); - if (railways) - fprintf (out, - "ClassInclude:railway:rail # default value for Railways\n\n\n"); - else - fprintf (out, - "ClassInclude:highway: # default value (all kind of highway)\n\n\n"); - - fprintf (out, - "###############################################################\n"); - fprintf (out, "#\n"); - fprintf (out, "# ClassIgnore section\n"); - fprintf (out, "#\n"); - fprintf (out, "# - tokens are delimited by colons ':'\n"); - fprintf (out, - "# - the second and third tokens represents a Class-name tag\n"); - fprintf (out, "# identifying Ways to be completely ignored.\n"); - fprintf (out, "#\n\n"); - if (railways) - fprintf (out, "# none for Railways\n\n\n"); - else - { - fprintf (out, "ClassIgnore:highway:pedestrian\n"); - fprintf (out, "ClassIgnore:highway:track\n"); - fprintf (out, "ClassIgnore:highway:services\n"); - fprintf (out, "ClassIgnore:highway:bus_guideway\n"); - fprintf (out, "ClassIgnore:highway:path\n"); - fprintf (out, "ClassIgnore:highway:cycleway\n"); - fprintf (out, "ClassIgnore:highway:footway\n"); - fprintf (out, "ClassIgnore:highway:byway\n"); - fprintf (out, "ClassIgnore:highway:steps\n\n\n"); - } - - fprintf (out, - "###############################################################\n"); - fprintf (out, "#\n"); - fprintf (out, "# SpeedClass section\n"); - fprintf (out, "#\n"); - fprintf (out, "# - tokens are delimited by colons ':'\n"); - fprintf (out, "# - the second token represents the Road Class-name\n"); - fprintf (out, "# [no name, i.e. '::' identifies the defaul value\n"); - fprintf (out, "# to be applied when no specific class match is found]\n"); - fprintf (out, "# - the third token represents the corresponding speed\n"); - fprintf (out, "# [expressed in Km/h]\n"); - fprintf (out, "#\n\n"); - if (railways) - fprintf (out, "SpeedClass:rail:60.0\n\n\n"); - else - { - fprintf (out, "SpeedClass::30.0 # default value\n"); - fprintf (out, "SpeedClass:motorway:110.0\n"); - fprintf (out, "SpeedClass:trunk:110.0\n"); - fprintf (out, "SpeedClass:primary:90.0\n"); - fprintf (out, "SpeedClass:secondary:70.0\n"); - fprintf (out, "SpeedClass:tertiary:50.0\n"); - fprintf (out, "# SpeedClass:yet_anotherclass_1:1.0\n"); - fprintf (out, "# SpeedClass:yet_anotherclass_2:2.0\n"); - fprintf (out, "# SpeedClass:yet_anotherclass_3:3.0\n\n\n"); - } - - fclose (out); - return 1; + if (strncmp (tag, "osm", 3) == 0) + ok_osm = 1; + continue; + } + if (xml_open && !xml_close) + *p++ = c; + if (osm_open && !osm_close) + *p++ = c; + } + if (ok_xml && ok_osm) + return 1; + return 0; } static void do_help () { @@ -2102,14 +2349,10 @@ "==============================================================\n"); fprintf (stderr, "-h or --help print this help message\n"); fprintf (stderr, "-o or --osm-path pathname the OSM-XML file path\n"); fprintf (stderr, - " both OSM-XML (*.osm) and OSM-ProtoBuf\n"); - fprintf (stderr, - " (*.osm.pbf) are indifferenctly supported.\n\n"); - fprintf (stderr, "-d or --db-path pathname the SpatiaLite DB path\n"); fprintf (stderr, "-T or --table table_name the db table to be feeded\n\n"); fprintf (stderr, "you can specify the following options as well\n"); fprintf (stderr, @@ -2120,15 +2363,10 @@ fprintf (stderr, "--roads extract roads [default]\n"); fprintf (stderr, "--railways extract railways\n"); fprintf (stderr, " [mutually exclusive]\n\n"); - fprintf (stderr, "template-file specific options:\n"); - fprintf (stderr, - "-ot or --out-template path creates a default template-file\n"); - fprintf (stderr, - "-tf or --template-file path using a template-file\n\n"); } int main (int argc, char *argv[]) { @@ -2140,34 +2378,16 @@ const char *table = NULL; int in_memory = 0; int cache_size = 0; int double_arcs = 0; int railways = 0; - int out_template = 0; - int use_template = 0; - const char *template_path = NULL; int error = 0; sqlite3 *handle; - struct aux_params params; - const void *osm_handle; - -/* initializing the aux-struct */ - params.db_handle = NULL; - params.ins_tmp_nodes_stmt = NULL; - params.upd_tmp_nodes_stmt = NULL; - params.rd_tmp_nodes_stmt = NULL; - params.ins_arcs_stmt = NULL; - params.noding_strategy = NODE_STRAT_ENDS; - params.oneway_strategy = ONEWAY_STRAT_FULL; - params.default_speed = 30.0; - params.first_speed = NULL; - params.last_speed = NULL; - params.first_include = NULL; - params.last_include = NULL; - params.first_ignore = NULL; - params.last_ignore = NULL; - + FILE *xml; + int nodes; + int ways; + char *big_buffer; for (i = 1; i < argc; i++) { /* parsing the invocation arguments */ if (next_arg != ARG_NONE) { @@ -2180,13 +2400,10 @@ db_path = argv[i]; break; case ARG_TABLE: table = argv[i]; break; - case ARG_TEMPLATE_PATH: - template_path = argv[i]; - break; case ARG_CACHE_SIZE: cache_size = atoi (argv[i]); break; }; next_arg = ARG_NONE; @@ -2232,38 +2449,10 @@ || strcmp (argv[i], "-cs") == 0) { next_arg = ARG_CACHE_SIZE; continue; } - if (strcmp (argv[i], "-ot") == 0) - { - out_template = 1; - use_template = 0; - next_arg = ARG_TEMPLATE_PATH; - continue; - } - if (strcasecmp (argv[i], "--out-template") == 0) - { - out_template = 1; - use_template = 0; - next_arg = ARG_TEMPLATE_PATH; - continue; - } - if (strcmp (argv[i], "-tf") == 0) - { - out_template = 0; - use_template = 1; - next_arg = ARG_TEMPLATE_PATH; - continue; - } - if (strcasecmp (argv[i], "--template-file") == 0) - { - out_template = 0; - use_template = 1; - next_arg = ARG_TEMPLATE_PATH; - continue; - } if (strcasecmp (argv[i], "-m") == 0) { in_memory = 1; next_arg = ARG_NONE; continue; @@ -2305,24 +2494,10 @@ { do_help (); return -1; } /* checking the arguments */ - if (out_template) - { - /* if out-template is set this one the unique option to be honored */ - if (!template_path) - { - fprintf (stderr, - "did you forget setting the --out-template path argument ?\n"); - error = 1; - } - if (print_template (template_path, railways)) - printf ("template-file \"%s\" succesfully created\n\n", - template_path); - return 0; - } if (!osm_path) { fprintf (stderr, "did you forget setting the --osm-path argument ?\n"); error = 1; @@ -2335,48 +2510,37 @@ if (!table) { fprintf (stderr, "did you forget setting the --table argument ?\n"); error = 1; } - if (railways) - { - /* Railways default settings */ - params.noding_strategy = NODE_STRAT_ALL; - params.oneway_strategy = ONEWAY_STRAT_NONE; - params.default_speed = 60.0; - } - if (use_template) - { - /* use-template is set */ - if (!template_path) - { - fprintf (stderr, - "did you forget setting the --template-file path argument ?\n"); - error = 1; - } - if (parse_template (¶ms, template_path)) - printf ("template-file \"%s\" succesfully acquired\n\n", - template_path); - else - return -1; - } if (error) { do_help (); - free_params (¶ms); + return -1; + } +/* opening the OSM-XML file */ + xml = fopen (osm_path, "rb"); + if (!xml) + { + fprintf (stderr, "cannot open %s\n", osm_path); + return -1; + } +/* checking if really is OSM XML */ + if (!check_osm_xml (xml)) + { + fprintf (stderr, "'%s' doesn't seems to contain OSM XML !!!\n", + osm_path); return -1; } - +/* repositioning XML from beginning */ + rewind (xml); /* opening the DB */ if (in_memory) cache_size = 0; handle = open_db (db_path, table, double_arcs, cache_size); if (!handle) - { - free_params (¶ms); - return -1; - } + return -1; if (in_memory) { /* loading the DB in-memory */ sqlite3 *mem_handle; sqlite3_backup *backup; @@ -2388,20 +2552,18 @@ if (ret != SQLITE_OK) { fprintf (stderr, "cannot open 'MEMORY-DB': %s\n", sqlite3_errmsg (mem_handle)); sqlite3_close (mem_handle); - free_params (¶ms); return -1; } backup = sqlite3_backup_init (mem_handle, "main", handle, "main"); if (!backup) { fprintf (stderr, "cannot load 'MEMORY-DB'\n"); sqlite3_close (handle); sqlite3_close (mem_handle); - free_params (¶ms); return -1; } while (1) { ret = sqlite3_backup_step (backup, 1024); @@ -2411,136 +2573,70 @@ ret = sqlite3_backup_finish (backup); sqlite3_close (handle); handle = mem_handle; printf ("\nusing IN-MEMORY database\n"); } - params.db_handle = handle; - params.table = table; - if (use_template == 0) +/* extracting tags form XML file */ + printf ("\nLoading OSM nodes ... wait please ...\n"); + nodes = parse_nodes (xml, handle); + if (nodes < 0) + { + fclose (xml); + sqlite3_close (handle); + fprintf (stderr, "Sorry, I'm quitting ... UNRECOVERABLE ERROR\n"); + return 1; + } + printf ("\tLoaded %d OSM nodes\n", nodes); +/* repositioning XML from beginning */ + rewind (xml); +/* extracting tags form XML file - Pass I */ + printf ("\nVerifying OSM ways ... wait please ...\n"); + big_buffer = malloc (4 * 1024 * 1024); + ways = parse_ways_pass_1 (xml, handle, big_buffer, railways); + free (big_buffer); + if (ways < 0) + { + fclose (xml); + sqlite3_close (handle); + fprintf (stderr, "Sorry, I'm quitting ... UNRECOVERABLE ERROR\n"); + return 1; + } + printf ("\tVerified %d OSM ways\n", ways); +/* disambiguating nodes - oh yes, there lots of stupid duplicates using different IDs !!! */ + printf ("\nDisambiguating OSM nodes ... wait please ...\n"); + nodes = disambiguate_nodes (handle); + if (nodes < 0) { - /* not using template: setting default params */ - if (railways == 1) - add_include_class (¶ms, "railway", "rail"); - else - add_include_class (¶ms, "highway", ""); - if (railways == 0) - { - /* setting default Road Ignore classes */ - add_ignore_class (¶ms, "highway", "pedestrian"); - add_ignore_class (¶ms, "highway", "track"); - add_ignore_class (¶ms, "highway", "services"); - add_ignore_class (¶ms, "highway", "bus_guideway"); - add_ignore_class (¶ms, "highway", "path"); - add_ignore_class (¶ms, "highway", "cycleway"); - add_ignore_class (¶ms, "highway", "footway"); - add_ignore_class (¶ms, "highway", "bridleway"); - add_ignore_class (¶ms, "highway", "byway"); - add_ignore_class (¶ms, "highway", "steps"); - } - if (railways == 0) - { - /* setting default Road Speeds */ - add_speed_class (¶ms, "motorway", 110.0); - add_speed_class (¶ms, "trunk", 110.0); - add_speed_class (¶ms, "primary", 90.0); - add_speed_class (¶ms, "secondary", 70.0); - add_speed_class (¶ms, "tertiary", 50.0); - } + fclose (xml); + sqlite3_close (handle); + fprintf (stderr, "Sorry, I'm quitting ... UNRECOVERABLE ERROR\n"); + return 1; } - -/* creating SQL prepared statements */ - create_sql_stmts (¶ms); + if (nodes == 0) + printf ("\tNo duplicate OSM nodes found - fine ...\n"); + else + printf ("\tFound %d duplicate OSM nodes - fixed !!!\n", nodes); +/* repositioning XML from beginning */ + rewind (xml); +/* extracting tags form XML file - Pass II */ + printf ("\nLoading network ARCs ... wait please ...\n"); + big_buffer = malloc (4 * 1024 * 1024); + ways = + parse_ways_pass_2 (xml, handle, table, double_arcs, big_buffer, + railways); - printf ("\nParsing input: Pass 1 [Nodes and Ways] ...\n"); -/* parsing the input OSM-file [Pass 1] */ - if (readosm_open (osm_path, &osm_handle) != READOSM_OK) + if (ways < 0) { - fprintf (stderr, "cannot open %s\n", osm_path); - finalize_sql_stmts (¶ms); + fclose (xml); sqlite3_close (handle); - readosm_close (osm_handle); - free_params (¶ms); - return -1; - } - if (readosm_parse (osm_handle, ¶ms, consume_node, consume_way_1, NULL) - != READOSM_OK) - { - fprintf (stderr, "unrecoverable error while parsing %s\n", osm_path); - finalize_sql_stmts (¶ms); - sqlite3_close (handle); - readosm_close (osm_handle); - free_params (¶ms); - return -1; + fprintf (stderr, "Sorry, I'm quitting ... UNRECOVERABLE ERROR\n"); + return 1; } - readosm_close (osm_handle); - - printf ("Parsing input: Pass 2 [Arcs of the Graph] ...\n"); -/* parsing the input OSM-file [Pass 2] */ - if (readosm_open (osm_path, &osm_handle) != READOSM_OK) - { - fprintf (stderr, "cannot open %s\n", osm_path); - finalize_sql_stmts (¶ms); - sqlite3_close (handle); - readosm_close (osm_handle); - free_params (¶ms); - return -1; - } - if (readosm_parse (osm_handle, ¶ms, NULL, consume_way_2, NULL) != - READOSM_OK) - { - fprintf (stderr, "unrecoverable error while parsing %s\n", osm_path); - finalize_sql_stmts (¶ms); - sqlite3_close (handle); - readosm_close (osm_handle); - free_params (¶ms); - return -1; - } - readosm_close (osm_handle); - -/* finalizing SQL prepared statements */ - finalize_sql_stmts (¶ms); - -/* populating the GRAPH_NODES table */ - if (!populate_graph_nodes (handle, table)) - { - fprintf (stderr, - "unrecoverable error while extracting GRAPH_NODES\n"); - sqlite3_close (handle); - goto quit; - } - -/* assigning NodeIds to Arcs */ - if (!set_node_ids (handle, table)) - { - fprintf (stderr, - "unrecoverable error while assignign NODE-IDs to Arcs\n"); - sqlite3_close (handle); - goto quit; - } - -/* computing Length and Cost for each Arc */ - if (!set_lengths_costs (¶ms, table)) - { - fprintf (stderr, - "unrecoverable error while assignign Length and Cost to Arcs\n"); - sqlite3_close (handle); - goto quit; - } - -/* extracting qualified Nodes */ - if (!create_qualified_nodes (¶ms, table)) - { - fprintf (stderr, - "unrecoverable error while extracting qualified Nodes\n"); - sqlite3_close (handle); - goto quit; - } - - quit: -/* dropping the temporary tables */ + printf ("\tLoaded %d network ARCs\n", ways); + fclose (xml); +/* dropping the OSM_TMP_NODES table */ db_cleanup (handle); - if (in_memory) { /* exporting the in-memory DB to filesystem */ sqlite3 *disk_handle; sqlite3_backup *backup; @@ -2553,20 +2649,18 @@ if (ret != SQLITE_OK) { fprintf (stderr, "cannot open '%s': %s\n", db_path, sqlite3_errmsg (disk_handle)); sqlite3_close (disk_handle); - free_params (¶ms); return -1; } backup = sqlite3_backup_init (disk_handle, "main", handle, "main"); if (!backup) { fprintf (stderr, "Backup failure: 'MEMORY-DB' wasn't saved\n"); sqlite3_close (handle); sqlite3_close (disk_handle); - free_params (¶ms); return -1; } while (1) { ret = sqlite3_backup_step (backup, 1024); @@ -2579,8 +2673,7 @@ printf ("\tIN_MEMORY database succesfully exported\n"); } /* VACUUMing */ db_vacuum (handle); sqlite3_close (handle); - free_params (¶ms); return 0; } Index: spatialite_osm_raw.c ================================================================== --- spatialite_osm_raw.c +++ spatialite_osm_raw.c @@ -1,9 +1,9 @@ /* / spatialite_osm_raw / -/ a tool loading "raw" OSM maps into a SpatiaLite DB +/ a tool loading "raw" OSM-XML maps into a SpatiaLite DB / / version 1.0, 2010 September 13 / / Author: Sandro Furieri a.furieri@lqt.it / @@ -31,10 +31,12 @@ #include #include #include #include + +#include #include "config.h" #ifdef SPATIALITE_AMALGAMATION #include @@ -42,17 +44,35 @@ #include #endif #include #include -#include #define ARG_NONE 0 #define ARG_OSM_PATH 1 #define ARG_DB_PATH 2 #define ARG_CACHE_SIZE 3 +#define MAX_TAG 16 + +#if defined(_WIN32) && !defined(__MINGW32__) +#define strcasecmp _stricmp +#endif /* not WIN32 */ + +#if defined(_WIN32) +#define atol_64 _atoi64 +#else +#define atol_64 atoll +#endif + +#define BUFFSIZE 8192 + +#define CURRENT_TAG_UNKNOWN 0 +#define CURRENT_TAG_IS_NODE 1 +#define CURRENT_TAG_IS_WAY 2 +#define CURRENT_TAG_IS_RELATION 3 + struct aux_params { /* an auxiliary struct used for XML parsing */ sqlite3 *db_handle; sqlite3_stmt *ins_nodes_stmt; @@ -69,336 +89,759 @@ int wr_way_tags; int wr_way_refs; int wr_relations; int wr_rel_tags; int wr_rel_refs; + int current_tag; +}; + +struct tag +{ + char *k; + char *v; + struct tag *next; +}; + +struct node +{ + sqlite3_int64 id; + sqlite3_int64 version; + char *timestamp; + sqlite3_int64 uid; + char *user; + sqlite3_int64 changeset; + double lat; + double lon; + struct tag *first; + struct tag *last; +} glob_node; + +struct node_ref +{ + sqlite3_int64 node_id; + char *role; + struct node_ref *next; +}; + +struct way +{ + sqlite3_int64 id; + sqlite3_int64 version; + char *timestamp; + sqlite3_int64 uid; + char *user; + sqlite3_int64 changeset; + struct tag *first; + struct tag *last; + struct node_ref *first_node; + struct node_ref *last_node; +} glob_way; + +struct multi_ref +{ + sqlite3_int64 id; + char type; + char *role; + struct multi_ref *next; }; -static int -insert_node (struct aux_params *params, const readosm_node * node) +struct relation +{ + sqlite3_int64 id; + sqlite3_int64 version; + char *timestamp; + sqlite3_int64 uid; + char *user; + sqlite3_int64 changeset; + struct tag *first; + struct tag *last; + struct multi_ref *first_rel; + struct multi_ref *last_rel; +} glob_relation; + +static void +insert_node (struct aux_params *params) { int ret; unsigned char *blob; int blob_size; - int i_tag; - const readosm_tag *p_tag; - gaiaGeomCollPtr geom = NULL; - if (node->longitude != READOSM_UNDEFINED - && node->latitude != READOSM_UNDEFINED) - { - geom = gaiaAllocGeomColl (); - geom->Srid = 4326; - gaiaAddPointToGeomColl (geom, node->longitude, node->latitude); - } + int sub = 0; + struct tag *p_tag; + gaiaGeomCollPtr geom = gaiaAllocGeomColl (); + geom->Srid = 4326; + gaiaAddPointToGeomColl (geom, glob_node.lon, glob_node.lat); sqlite3_reset (params->ins_nodes_stmt); sqlite3_clear_bindings (params->ins_nodes_stmt); - sqlite3_bind_int64 (params->ins_nodes_stmt, 1, node->id); - if (node->version == READOSM_UNDEFINED) - sqlite3_bind_null (params->ins_nodes_stmt, 2); - else - sqlite3_bind_int64 (params->ins_nodes_stmt, 2, node->version); - if (node->timestamp == NULL) + sqlite3_bind_int64 (params->ins_nodes_stmt, 1, glob_node.id); + sqlite3_bind_int64 (params->ins_nodes_stmt, 2, glob_node.version); + if (glob_node.timestamp == NULL) sqlite3_bind_null (params->ins_nodes_stmt, 3); else - sqlite3_bind_text (params->ins_nodes_stmt, 3, node->timestamp, - strlen (node->timestamp), SQLITE_STATIC); - if (node->uid == READOSM_UNDEFINED) - sqlite3_bind_null (params->ins_nodes_stmt, 4); - else - sqlite3_bind_int64 (params->ins_nodes_stmt, 4, node->uid); - if (node->user == NULL) + sqlite3_bind_text (params->ins_nodes_stmt, 3, glob_node.timestamp, + strlen (glob_node.timestamp), SQLITE_STATIC); + sqlite3_bind_int64 (params->ins_nodes_stmt, 4, glob_node.uid); + if (glob_node.user == NULL) sqlite3_bind_null (params->ins_nodes_stmt, 5); else - sqlite3_bind_text (params->ins_nodes_stmt, 5, node->user, - strlen (node->user), SQLITE_STATIC); - if (node->changeset == READOSM_UNDEFINED) - sqlite3_bind_null (params->ins_nodes_stmt, 6); - else - sqlite3_bind_int64 (params->ins_nodes_stmt, 6, node->changeset); - if (!geom) - sqlite3_bind_null (params->ins_nodes_stmt, 7); - else - { - gaiaToSpatiaLiteBlobWkb (geom, &blob, &blob_size); - gaiaFreeGeomColl (geom); - sqlite3_bind_blob (params->ins_nodes_stmt, 7, blob, blob_size, free); - } + sqlite3_bind_text (params->ins_nodes_stmt, 5, glob_node.user, + strlen (glob_node.user), SQLITE_STATIC); + sqlite3_bind_int64 (params->ins_nodes_stmt, 6, glob_node.changeset); + gaiaToSpatiaLiteBlobWkb (geom, &blob, &blob_size); + gaiaFreeGeomColl (geom); + sqlite3_bind_blob (params->ins_nodes_stmt, 7, blob, blob_size, free); ret = sqlite3_step (params->ins_nodes_stmt); if (ret == SQLITE_DONE || ret == SQLITE_ROW) ; else { fprintf (stderr, "sqlite3_step() error: INSERT INTO osm_nodes\n"); - return 0; + return; } params->wr_nodes += 1; - for (i_tag = 0; i_tag < node->tag_count; i_tag++) + p_tag = glob_node.first; + while (p_tag) { - p_tag = node->tags + i_tag; sqlite3_reset (params->ins_node_tags_stmt); sqlite3_clear_bindings (params->ins_node_tags_stmt); - sqlite3_bind_int64 (params->ins_node_tags_stmt, 1, node->id); - sqlite3_bind_int (params->ins_node_tags_stmt, 2, i_tag); - if (p_tag->key == NULL) + sqlite3_bind_int64 (params->ins_node_tags_stmt, 1, glob_node.id); + sqlite3_bind_int (params->ins_node_tags_stmt, 2, sub); + sub++; + if (p_tag->k == NULL) sqlite3_bind_null (params->ins_node_tags_stmt, 3); else - sqlite3_bind_text (params->ins_node_tags_stmt, 3, p_tag->key, - strlen (p_tag->key), SQLITE_STATIC); - if (p_tag->value == NULL) + sqlite3_bind_text (params->ins_node_tags_stmt, 3, p_tag->k, + strlen (p_tag->k), SQLITE_STATIC); + if (p_tag->k == NULL) sqlite3_bind_null (params->ins_node_tags_stmt, 4); else - sqlite3_bind_text (params->ins_node_tags_stmt, 4, p_tag->value, - strlen (p_tag->value), SQLITE_STATIC); + sqlite3_bind_text (params->ins_node_tags_stmt, 4, p_tag->v, + strlen (p_tag->v), SQLITE_STATIC); ret = sqlite3_step (params->ins_node_tags_stmt); if (ret == SQLITE_DONE || ret == SQLITE_ROW) ; else { fprintf (stderr, "sqlite3_step() error: INSERT INTO osm_node_tags\n"); - return 0; + return; } params->wr_node_tags += 1; + p_tag = p_tag->next; } - return 1; } -static int -insert_way (struct aux_params *params, const readosm_way * way) +static void +insert_way (struct aux_params *params) { int ret; - int i_tag; - int i_ref; - const readosm_tag *p_tag; + int sub = 0; + struct tag *p_tag; + struct node_ref *nr; sqlite3_reset (params->ins_ways_stmt); sqlite3_clear_bindings (params->ins_ways_stmt); - sqlite3_bind_int64 (params->ins_ways_stmt, 1, way->id); - if (way->version == READOSM_UNDEFINED) - sqlite3_bind_null (params->ins_ways_stmt, 2); - else - sqlite3_bind_int64 (params->ins_ways_stmt, 2, way->version); - if (way->timestamp == NULL) + sqlite3_bind_int64 (params->ins_ways_stmt, 1, glob_way.id); + sqlite3_bind_int64 (params->ins_ways_stmt, 2, glob_way.version); + if (glob_way.timestamp == NULL) sqlite3_bind_null (params->ins_ways_stmt, 3); else - sqlite3_bind_text (params->ins_ways_stmt, 3, way->timestamp, - strlen (way->timestamp), SQLITE_STATIC); - if (way->uid == READOSM_UNDEFINED) - sqlite3_bind_null (params->ins_ways_stmt, 4); - else - sqlite3_bind_int64 (params->ins_ways_stmt, 4, way->uid); - if (way->user == NULL) + sqlite3_bind_text (params->ins_ways_stmt, 3, glob_way.timestamp, + strlen (glob_way.timestamp), SQLITE_STATIC); + sqlite3_bind_int64 (params->ins_ways_stmt, 4, glob_way.uid); + if (glob_way.user == NULL) sqlite3_bind_null (params->ins_ways_stmt, 5); else - sqlite3_bind_text (params->ins_ways_stmt, 5, way->user, - strlen (way->user), SQLITE_STATIC); - if (way->changeset == READOSM_UNDEFINED) - sqlite3_bind_null (params->ins_ways_stmt, 6); - else - sqlite3_bind_int64 (params->ins_ways_stmt, 6, way->changeset); + sqlite3_bind_text (params->ins_ways_stmt, 5, glob_way.user, + strlen (glob_way.user), SQLITE_STATIC); + sqlite3_bind_int64 (params->ins_ways_stmt, 6, glob_way.changeset); ret = sqlite3_step (params->ins_ways_stmt); if (ret == SQLITE_DONE || ret == SQLITE_ROW) ; else { fprintf (stderr, "sqlite3_step() error: INSERT INTO osm_ways\n"); - return 0; + return; } params->wr_ways += 1; - for (i_tag = 0; i_tag < way->tag_count; i_tag++) + p_tag = glob_way.first; + while (p_tag) { - p_tag = way->tags + i_tag; sqlite3_reset (params->ins_way_tags_stmt); sqlite3_clear_bindings (params->ins_way_tags_stmt); - sqlite3_bind_int64 (params->ins_way_tags_stmt, 1, way->id); - sqlite3_bind_int (params->ins_way_tags_stmt, 2, i_tag); - if (p_tag->key == NULL) + sqlite3_bind_int64 (params->ins_way_tags_stmt, 1, glob_way.id); + sqlite3_bind_int (params->ins_way_tags_stmt, 2, sub); + sub++; + if (p_tag->k == NULL) sqlite3_bind_null (params->ins_way_tags_stmt, 3); else - sqlite3_bind_text (params->ins_way_tags_stmt, 3, p_tag->key, - strlen (p_tag->key), SQLITE_STATIC); - if (p_tag->value == NULL) + sqlite3_bind_text (params->ins_way_tags_stmt, 3, p_tag->k, + strlen (p_tag->k), SQLITE_STATIC); + if (p_tag->v == NULL) sqlite3_bind_null (params->ins_way_tags_stmt, 4); else - sqlite3_bind_text (params->ins_way_tags_stmt, 4, p_tag->value, - strlen (p_tag->value), SQLITE_STATIC); + sqlite3_bind_text (params->ins_way_tags_stmt, 4, p_tag->v, + strlen (p_tag->v), SQLITE_STATIC); ret = sqlite3_step (params->ins_way_tags_stmt); if (ret == SQLITE_DONE || ret == SQLITE_ROW) ; else { fprintf (stderr, "sqlite3_step() error: INSERT INTO osm_way_tags\n"); - return 0; + return; } params->wr_way_tags += 1; + p_tag = p_tag->next; } - for (i_ref = 0; i_ref < way->node_ref_count; i_ref++) + sub = 0; + nr = glob_way.first_node; + while (nr) { - sqlite3_int64 node_id = *(way->node_refs + i_ref); sqlite3_reset (params->ins_way_refs_stmt); sqlite3_clear_bindings (params->ins_way_refs_stmt); - sqlite3_bind_int64 (params->ins_way_refs_stmt, 1, way->id); - sqlite3_bind_int (params->ins_way_refs_stmt, 2, i_ref); - sqlite3_bind_int64 (params->ins_way_refs_stmt, 3, node_id); + sqlite3_bind_int64 (params->ins_way_refs_stmt, 1, glob_way.id); + sqlite3_bind_int (params->ins_way_refs_stmt, 2, sub); + sub++; + sqlite3_bind_int64 (params->ins_way_refs_stmt, 3, nr->node_id); ret = sqlite3_step (params->ins_way_refs_stmt); if (ret == SQLITE_DONE || ret == SQLITE_ROW) ; else { fprintf (stderr, "sqlite3_step() error: INSERT INTO osm_way_refs\n"); - return 0; + return; } params->wr_way_refs += 1; + nr = nr->next; } - return 1; } -static int -insert_relation (struct aux_params *params, const readosm_relation * relation) +static void +insert_relation (struct aux_params *params) { int ret; - int i_tag; - int i_member; - const readosm_tag *p_tag; - const readosm_member *p_member; + int sub = 0; + struct tag *p_tag; + struct multi_ref *mr; sqlite3_reset (params->ins_relations_stmt); sqlite3_clear_bindings (params->ins_relations_stmt); - sqlite3_bind_int64 (params->ins_relations_stmt, 1, relation->id); - if (relation->version == READOSM_UNDEFINED) - sqlite3_bind_null (params->ins_relations_stmt, 2); - else - sqlite3_bind_int64 (params->ins_relations_stmt, 2, relation->version); - if (relation->timestamp == NULL) + sqlite3_bind_int64 (params->ins_relations_stmt, 1, glob_relation.id); + sqlite3_bind_int64 (params->ins_relations_stmt, 2, glob_relation.version); + if (glob_relation.timestamp == NULL) sqlite3_bind_null (params->ins_relations_stmt, 3); else - sqlite3_bind_text (params->ins_relations_stmt, 3, relation->timestamp, - strlen (relation->timestamp), SQLITE_STATIC); - if (relation->uid == READOSM_UNDEFINED) - sqlite3_bind_null (params->ins_relations_stmt, 4); - else - sqlite3_bind_int64 (params->ins_relations_stmt, 4, relation->uid); - if (relation->user == NULL) + sqlite3_bind_text (params->ins_relations_stmt, 3, + glob_relation.timestamp, + strlen (glob_relation.timestamp), SQLITE_STATIC); + sqlite3_bind_int64 (params->ins_relations_stmt, 4, glob_relation.uid); + if (glob_relation.user == NULL) sqlite3_bind_null (params->ins_relations_stmt, 5); else - sqlite3_bind_text (params->ins_relations_stmt, 5, relation->user, - strlen (relation->user), SQLITE_STATIC); - if (relation->changeset == READOSM_UNDEFINED) - sqlite3_bind_null (params->ins_relations_stmt, 6); - else - sqlite3_bind_int64 (params->ins_relations_stmt, 6, relation->changeset); + sqlite3_bind_text (params->ins_relations_stmt, 5, glob_relation.user, + strlen (glob_relation.user), SQLITE_STATIC); + sqlite3_bind_int64 (params->ins_relations_stmt, 6, glob_relation.changeset); ret = sqlite3_step (params->ins_relations_stmt); if (ret == SQLITE_DONE || ret == SQLITE_ROW) ; else { fprintf (stderr, "sqlite3_step() error: INSERT INTO osm_relations\n"); - return 0; + return; } params->wr_relations += 1; - for (i_tag = 0; i_tag < relation->tag_count; i_tag++) + p_tag = glob_relation.first; + while (p_tag) { - p_tag = relation->tags + i_tag; sqlite3_reset (params->ins_relation_tags_stmt); sqlite3_clear_bindings (params->ins_relation_tags_stmt); - sqlite3_bind_int64 (params->ins_relation_tags_stmt, 1, relation->id); - sqlite3_bind_int (params->ins_relation_tags_stmt, 2, i_tag); - if (p_tag->key == NULL) + sqlite3_bind_int64 (params->ins_relation_tags_stmt, 1, + glob_relation.id); + sqlite3_bind_int (params->ins_relation_tags_stmt, 2, sub); + sub++; + if (p_tag->k == NULL) sqlite3_bind_null (params->ins_relation_tags_stmt, 3); else - sqlite3_bind_text (params->ins_relation_tags_stmt, 3, p_tag->key, - strlen (p_tag->key), SQLITE_STATIC); - if (p_tag->value == NULL) + sqlite3_bind_text (params->ins_relation_tags_stmt, 3, p_tag->k, + strlen (p_tag->k), SQLITE_STATIC); + if (p_tag->v == NULL) sqlite3_bind_null (params->ins_relation_tags_stmt, 4); else - sqlite3_bind_text (params->ins_relation_tags_stmt, 4, - p_tag->value, strlen (p_tag->value), - SQLITE_STATIC); + sqlite3_bind_text (params->ins_relation_tags_stmt, 4, p_tag->v, + strlen (p_tag->v), SQLITE_STATIC); ret = sqlite3_step (params->ins_relation_tags_stmt); if (ret == SQLITE_DONE || ret == SQLITE_ROW) ; else { fprintf (stderr, "sqlite3_step() error: INSERT INTO osm_relation_tags\n"); - return 0; + return; } params->wr_rel_tags += 1; + p_tag = p_tag->next; } - for (i_member = 0; i_member < relation->member_count; i_member++) + sub = 0; + mr = glob_relation.first_rel; + while (mr) { - p_member = relation->members + i_member; sqlite3_reset (params->ins_relation_refs_stmt); sqlite3_clear_bindings (params->ins_relation_refs_stmt); - sqlite3_bind_int64 (params->ins_relation_refs_stmt, 1, relation->id); - sqlite3_bind_int (params->ins_relation_refs_stmt, 2, i_member); - if (p_member->member_type == READOSM_MEMBER_NODE) + sqlite3_bind_int64 (params->ins_relation_refs_stmt, 1, + glob_relation.id); + sqlite3_bind_int (params->ins_relation_refs_stmt, 2, sub); + sub++; + if (mr->type == 'N') sqlite3_bind_text (params->ins_relation_refs_stmt, 3, "N", 1, SQLITE_STATIC); - else if (p_member->member_type == READOSM_MEMBER_WAY) + else if (mr->type == 'W') sqlite3_bind_text (params->ins_relation_refs_stmt, 3, "W", 1, SQLITE_STATIC); - else if (p_member->member_type == READOSM_MEMBER_RELATION) + else if (mr->type == 'R') sqlite3_bind_text (params->ins_relation_refs_stmt, 3, "R", 1, SQLITE_STATIC); else sqlite3_bind_text (params->ins_relation_refs_stmt, 3, "?", 1, SQLITE_STATIC); - sqlite3_bind_int64 (params->ins_relation_refs_stmt, 4, p_member->id); - if (p_member->role == NULL) + sqlite3_bind_int64 (params->ins_relation_refs_stmt, 4, mr->id); + if (mr->role == NULL) sqlite3_bind_null (params->ins_relation_refs_stmt, 5); else sqlite3_bind_text (params->ins_relation_refs_stmt, 5, - p_member->role, strlen (p_member->role), - SQLITE_STATIC); + mr->role, strlen (mr->role), SQLITE_STATIC); ret = sqlite3_step (params->ins_relation_refs_stmt); if (ret == SQLITE_DONE || ret == SQLITE_ROW) ; else { fprintf (stderr, "sqlite3_step() error: INSERT INTO osm_relation_refs\n"); - return 0; + return; } params->wr_rel_refs += 1; - } - return 1; + mr = mr->next; + } +} + +static void +clean_node () +{ +/* cleaning the current node */ + struct tag *pt; + struct tag *ptn; + if (glob_node.timestamp) + free (glob_node.timestamp); + if (glob_node.user) + free (glob_node.user); + pt = glob_node.first; + while (pt) + { + ptn = pt->next; + if (pt->k) + free (pt->k); + if (pt->v) + free (pt->v); + free (pt); + pt = ptn; + } + glob_node.timestamp = NULL; + glob_node.user = NULL; + glob_node.first = NULL; + glob_node.last = NULL; +} + +static void +clean_way () +{ +/* cleaning the current way */ + struct tag *pt; + struct tag *ptn; + struct node_ref *nr; + struct node_ref *nrn; + if (glob_way.timestamp) + free (glob_way.timestamp); + if (glob_way.user) + free (glob_way.user); + pt = glob_way.first; + while (pt) + { + ptn = pt->next; + if (pt->k) + free (pt->k); + if (pt->v) + free (pt->v); + free (pt); + pt = ptn; + } + nr = glob_way.first_node; + while (nr) + { + nrn = nr->next; + free (nr); + nr = nrn; + } + glob_way.timestamp = NULL; + glob_way.user = NULL; + glob_way.first = NULL; + glob_way.last = NULL; + glob_way.first_node = NULL; + glob_way.last_node = NULL; +} + +static void +clean_relation () +{ +/* cleaning the current relation */ + struct tag *pt; + struct tag *ptn; + struct multi_ref *mr; + struct multi_ref *mrn; + if (glob_relation.timestamp) + free (glob_relation.timestamp); + if (glob_relation.user) + free (glob_relation.user); + pt = glob_relation.first; + while (pt) + { + ptn = pt->next; + if (pt->k) + free (pt->k); + if (pt->v) + free (pt->v); + free (pt); + pt = ptn; + } + mr = glob_relation.first_rel; + while (mr) + { + mrn = mr->next; + if (mr->role) + free (mr->role); + free (mr); + mr = mrn; + } + glob_relation.timestamp = NULL; + glob_relation.user = NULL; + glob_relation.first = NULL; + glob_relation.last = NULL; + glob_relation.first_rel = NULL; + glob_relation.last_rel = NULL; +} + +static void +start_node (struct aux_params *params, const char **attr) +{ + int i; + int len; + for (i = 0; attr[i]; i += 2) + { + if (strcmp (attr[i], "id") == 0) + glob_node.id = atol_64 (attr[i + 1]); + if (strcmp (attr[i], "version") == 0) + glob_node.version = atol_64 (attr[i + 1]); + if (strcmp (attr[i], "timestamp") == 0) + { + if (glob_node.timestamp) + free (glob_node.timestamp); + len = strlen (attr[i + 1]); + glob_node.timestamp = malloc (len + 1); + strcpy (glob_node.timestamp, attr[i + 1]); + } + if (strcmp (attr[i], "uid") == 0) + glob_node.uid = atol_64 (attr[i + 1]); + if (strcmp (attr[i], "user") == 0) + { + if (glob_node.user) + free (glob_node.user); + len = strlen (attr[i + 1]); + glob_node.user = malloc (len + 1); + strcpy (glob_node.user, attr[i + 1]); + } + if (strcmp (attr[i], "changeset") == 0) + glob_node.changeset = atol_64 (attr[i + 1]); + if (strcmp (attr[i], "lat") == 0) + glob_node.lat = atof (attr[i + 1]); + if (strcmp (attr[i], "lon") == 0) + glob_node.lon = atof (attr[i + 1]); + } + params->current_tag = CURRENT_TAG_IS_NODE; +} + +static void +end_node (struct aux_params *params) +{ + insert_node (params); + clean_node (); + params->current_tag = CURRENT_TAG_UNKNOWN; +} + +static void +start_way (struct aux_params *params, const char **attr) +{ + int i; + int len; + for (i = 0; attr[i]; i += 2) + { + if (strcmp (attr[i], "id") == 0) + glob_way.id = atol_64 (attr[i + 1]); + if (strcmp (attr[i], "version") == 0) + glob_way.version = atol_64 (attr[i + 1]); + if (strcmp (attr[i], "timestamp") == 0) + { + if (glob_way.timestamp) + free (glob_way.timestamp); + len = strlen (attr[i + 1]); + glob_way.timestamp = malloc (len + 1); + strcpy (glob_way.timestamp, attr[i + 1]); + } + if (strcmp (attr[i], "uid") == 0) + glob_way.uid = atol_64 (attr[i + 1]); + if (strcmp (attr[i], "user") == 0) + { + if (glob_way.user) + free (glob_way.user); + len = strlen (attr[i + 1]); + glob_way.user = malloc (len + 1); + strcpy (glob_way.user, attr[i + 1]); + } + if (strcmp (attr[i], "changeset") == 0) + glob_way.changeset = atol_64 (attr[i + 1]); + } + params->current_tag = CURRENT_TAG_IS_WAY; +} + +static void +end_way (struct aux_params *params) +{ + insert_way (params); + clean_way (); + params->current_tag = CURRENT_TAG_UNKNOWN; +} + +static void +start_relation (struct aux_params *params, const char **attr) +{ + int i; + int len; + for (i = 0; attr[i]; i += 2) + { + if (strcmp (attr[i], "id") == 0) + glob_relation.id = atol_64 (attr[i + 1]); + if (strcmp (attr[i], "version") == 0) + glob_relation.version = atol_64 (attr[i + 1]); + if (strcmp (attr[i], "timestamp") == 0) + { + if (glob_relation.timestamp) + free (glob_relation.timestamp); + len = strlen (attr[i + 1]); + glob_relation.timestamp = malloc (len + 1); + strcpy (glob_relation.timestamp, attr[i + 1]); + } + if (strcmp (attr[i], "uid") == 0) + glob_relation.uid = atol_64 (attr[i + 1]); + if (strcmp (attr[i], "user") == 0) + { + if (glob_relation.user) + free (glob_relation.user); + len = strlen (attr[i + 1]); + glob_relation.user = malloc (len + 1); + strcpy (glob_relation.user, attr[i + 1]); + } + if (strcmp (attr[i], "changeset") == 0) + glob_relation.changeset = atol_64 (attr[i + 1]); + } + params->current_tag = CURRENT_TAG_IS_RELATION; +} + +static void +end_relation (struct aux_params *params) +{ + insert_relation (params); + clean_relation (); + params->current_tag = CURRENT_TAG_UNKNOWN; +} + +static void +start_xtag (struct aux_params *params, const char **attr) +{ + int i; + int len; + const char *k = NULL; + const char *v = NULL; + struct tag *p_tag; + for (i = 0; attr[i]; i += 2) + { + if (strcmp (attr[i], "k") == 0) + k = attr[i + 1]; + if (strcmp (attr[i], "v") == 0) + v = attr[i + 1]; + } + +/* appending a new tag to the current item */ + if (params->current_tag == CURRENT_TAG_IS_NODE) + { + p_tag = malloc (sizeof (struct tag)); + if (glob_node.first == NULL) + glob_node.first = p_tag; + if (glob_node.last != NULL) + glob_node.last->next = p_tag; + glob_node.last = p_tag; + p_tag->next = NULL; + len = strlen (k); + p_tag->k = malloc (len + 1); + strcpy (p_tag->k, k); + len = strlen (v); + p_tag->v = malloc (len + 1); + strcpy (p_tag->v, v); + } + if (params->current_tag == CURRENT_TAG_IS_WAY) + { + p_tag = malloc (sizeof (struct tag)); + if (glob_way.first == NULL) + glob_way.first = p_tag; + if (glob_way.last != NULL) + glob_way.last->next = p_tag; + glob_way.last = p_tag; + p_tag->next = NULL; + len = strlen (k); + p_tag->k = malloc (len + 1); + strcpy (p_tag->k, k); + len = strlen (v); + p_tag->v = malloc (len + 1); + strcpy (p_tag->v, v); + } + if (params->current_tag == CURRENT_TAG_IS_RELATION) + { + p_tag = malloc (sizeof (struct tag)); + if (glob_relation.first == NULL) + glob_relation.first = p_tag; + if (glob_relation.last != NULL) + glob_relation.last->next = p_tag; + glob_relation.last = p_tag; + p_tag->next = NULL; + len = strlen (k); + p_tag->k = malloc (len + 1); + strcpy (p_tag->k, k); + len = strlen (v); + p_tag->v = malloc (len + 1); + strcpy (p_tag->v, v); + } +} + +static void +start_nd (struct aux_params *params, const char **attr) +{ + int i; + sqlite3_int64 node_id; + struct node_ref *nr; + for (i = 0; attr[i]; i += 2) + { + if (strcmp (attr[i], "ref") == 0) + node_id = atol_64 (attr[i + 1]); + } +/* appending a new node-ref-id to the current item */ + if (params->current_tag == CURRENT_TAG_IS_WAY) + { + nr = malloc (sizeof (struct node_ref)); + if (glob_way.first_node == NULL) + glob_way.first_node = nr; + if (glob_way.last_node != NULL) + glob_way.last_node->next = nr; + glob_way.last_node = nr; + nr->next = NULL; + nr->node_id = node_id; + } } -static int -consume_node (const void *user_data, const readosm_node * node) +static void +start_member (struct aux_params *params, const char **attr) { -/* processing an OSM Node (ReadOSM callback function) */ - struct aux_params *params = (struct aux_params *) user_data; - if (!insert_node (params, node)) - return READOSM_ABORT; - return READOSM_OK; + int i; + sqlite3_int64 id; + const char *role = NULL; + int len; + int is_way = 0; + int is_node = 0; + int is_rel = 0; + struct multi_ref *mr; + for (i = 0; attr[i]; i += 2) + { + if (strcmp (attr[i], "type") == 0) + { + if (strcmp (attr[i + 1], "way") == 0) + is_way = 1; + if (strcmp (attr[i + 1], "node") == 0) + is_node = 1; + if (strcmp (attr[i + 1], "relation") == 0) + is_rel = 1; + } + if (strcmp (attr[i], "ref") == 0) + id = atol_64 (attr[i + 1]); + if (strcmp (attr[i], "role") == 0) + role = attr[i + 1]; + } + + if (params->current_tag == CURRENT_TAG_IS_RELATION) + { + /* appending a new relation-ref-id to the current item */ + mr = malloc (sizeof (struct multi_ref)); + if (glob_relation.first_rel == NULL) + glob_relation.first_rel = mr; + if (glob_relation.last_rel != NULL) + glob_relation.last_rel->next = mr; + glob_relation.last_rel = mr; + mr->next = NULL; + mr->type = '?'; + if (is_node) + mr->type = 'N'; + if (is_way) + mr->type = 'W'; + if (is_rel) + mr->type = 'R'; + mr->id = id; + mr->role = NULL; + if (role) + { + len = strlen (role); + mr->role = malloc (len + 1); + strcpy (mr->role, role); + } + } } -static int -consume_way (const void *user_data, const readosm_way * way) +static void +start_tag (void *data, const char *el, const char **attr) { -/* processing an OSM Way (ReadOSM callback function) */ - struct aux_params *params = (struct aux_params *) user_data; - if (!insert_way (params, way)) - return READOSM_ABORT; - return READOSM_OK; + struct aux_params *params = (struct aux_params *) data; + if (strcmp (el, "node") == 0) + start_node (params, attr); + if (strcmp (el, "way") == 0) + start_way (params, attr); + if (strcmp (el, "relation") == 0) + start_relation (params, attr); + if (strcmp (el, "tag") == 0) + start_xtag (params, attr); + if (strcmp (el, "nd") == 0) + start_nd (params, attr); + if (strcmp (el, "member") == 0) + start_member (params, attr); } -static int -consume_relation (const void *user_data, const readosm_relation * relation) +static void +end_tag (void *data, const char *el) { -/* processing an OSM Relation (ReadOSM callback function) */ - struct aux_params *params = (struct aux_params *) user_data; - if (!insert_relation (params, relation)) - return READOSM_ABORT; - return READOSM_OK; + struct aux_params *params = (struct aux_params *) data; + if (strcmp (el, "node") == 0) + end_node (params); + if (strcmp (el, "way") == 0) + end_way (params); + if (strcmp (el, "relation") == 0) + end_relation (params); } static void finalize_sql_stmts (struct aux_params *params) { @@ -431,11 +874,11 @@ return; } } static void -create_sql_stmts (struct aux_params *params, int journal_off) +create_sql_stmts (struct aux_params *params) { sqlite3_stmt *ins_nodes_stmt; sqlite3_stmt *ins_node_tags_stmt; sqlite3_stmt *ins_ways_stmt; sqlite3_stmt *ins_way_tags_stmt; @@ -445,25 +888,10 @@ sqlite3_stmt *ins_relation_refs_stmt; char sql[1024]; int ret; char *sql_err = NULL; - if (journal_off) - { - /* disabling the journal: unsafe but faster */ - ret = - sqlite3_exec (params->db_handle, "PRAGMA journal_mode = OFF", - NULL, NULL, &sql_err); - if (ret != SQLITE_OK) - { - fprintf (stderr, "PRAGMA journal_mode=OFF error: %s\n", - sql_err); - sqlite3_free (sql_err); - return; - } - } - /* the complete operation is handled as an unique SQL Transaction */ ret = sqlite3_exec (params->db_handle, "BEGIN", NULL, NULL, &sql_err); if (ret != SQLITE_OK) { fprintf (stderr, "BEGIN TRANSACTION error: %s\n", sql_err); @@ -737,15 +1165,15 @@ goto unknown; /* creating the OSM "raw" nodes */ strcpy (sql, "CREATE TABLE osm_nodes (\n"); strcat (sql, "node_id INTEGER NOT NULL PRIMARY KEY,\n"); - strcat (sql, "version INTEGER,\n"); + strcat (sql, "version INTEGER NOT NULL,\n"); strcat (sql, "timestamp TEXT,\n"); - strcat (sql, "uid INTEGER,\n"); + strcat (sql, "uid INTEGER NOT NULL,\n"); strcat (sql, "user TEXT,\n"); - strcat (sql, "changeset INTEGER,\n"); + strcat (sql, "changeset INTEGER NOT NULL,\n"); strcat (sql, "filtered INTEGER NOT NULL)\n"); ret = sqlite3_exec (db_handle, sql, NULL, NULL, &err_msg); if (ret != SQLITE_OK) { fprintf (stderr, "CREATE TABLE 'osm_nodes' error: %s\n", err_msg); @@ -781,15 +1209,15 @@ return; } /* creating the OSM "raw" ways */ strcpy (sql, "CREATE TABLE osm_ways (\n"); strcat (sql, "way_id INTEGER NOT NULL PRIMARY KEY,\n"); - strcat (sql, "version INTEGER,\n"); + strcat (sql, "version INTEGER NOT NULL,\n"); strcat (sql, "timestamp TEXT,\n"); - strcat (sql, "uid INTEGER,\n"); + strcat (sql, "uid INTEGER NOT NULL,\n"); strcat (sql, "user TEXT,\n"); - strcat (sql, "changeset INTEGER,\n"); + strcat (sql, "changeset INTEGER NOT NULL,\n"); strcat (sql, "filtered INTEGER NOT NULL)\n"); ret = sqlite3_exec (db_handle, sql, NULL, NULL, &err_msg); if (ret != SQLITE_OK) { fprintf (stderr, "CREATE TABLE 'osm_ways' error: %s\n", err_msg); @@ -842,15 +1270,15 @@ return; } /* creating the OSM "raw" relations */ strcpy (sql, "CREATE TABLE osm_relations (\n"); strcat (sql, "rel_id INTEGER NOT NULL PRIMARY KEY,\n"); - strcat (sql, "version INTEGER,\n"); + strcat (sql, "version INTEGER NOT NULL,\n"); strcat (sql, "timestamp TEXT,\n"); - strcat (sql, "uid INTEGER,\n"); + strcat (sql, "uid INTEGER NOT NULL,\n"); strcat (sql, "user TEXT,\n"); - strcat (sql, "changeset INTEGER,\n"); + strcat (sql, "changeset INTEGER NOT NULL,\n"); strcat (sql, "filtered INTEGER NOT NULL)\n"); ret = sqlite3_exec (db_handle, sql, NULL, NULL, &err_msg); if (ret != SQLITE_OK) { fprintf (stderr, "CREATE TABLE 'osm_relations' error: %s\n", err_msg); @@ -927,24 +1355,18 @@ fprintf (stderr, "\n\nusage: spatialite_osm_raw ARGLIST\n"); fprintf (stderr, "==============================================================\n"); fprintf (stderr, "-h or --help print this help message\n"); - fprintf (stderr, "-o or --osm-path pathname the OSM-file path\n"); - fprintf (stderr, - " both OSM-XML (*.osm) and OSM-ProtoBuf\n"); - fprintf (stderr, - " (*.osm.pbf) are indifferenctly supported.\n\n"); + fprintf (stderr, "-o or --osm-path pathname the OSM-XML file path\n"); fprintf (stderr, "-d or --db-path pathname the SpatiaLite DB path\n\n"); fprintf (stderr, "you can specify the following options as well\n"); fprintf (stderr, "-cs or --cache-size num DB cache size (how many pages)\n"); fprintf (stderr, "-m or --in-memory using IN-MEMORY database\n"); - fprintf (stderr, - "-jo or --journal-off unsafe [but faster] mode\n"); } int main (int argc, char *argv[]) { @@ -954,14 +1376,17 @@ int next_arg = ARG_NONE; const char *osm_path = NULL; const char *db_path = NULL; int in_memory = 0; int cache_size = 0; - int journal_off = 0; int error = 0; + char Buff[BUFFSIZE]; + int done = 0; + int len; + XML_Parser parser; struct aux_params params; - const void *osm_handle; + FILE *xml_file; /* initializing the aux-structs */ params.db_handle = NULL; params.ins_nodes_stmt = NULL; params.ins_node_tags_stmt = NULL; @@ -977,10 +1402,30 @@ params.wr_way_tags = 0; params.wr_way_refs = 0; params.wr_relations = 0; params.wr_rel_tags = 0; params.wr_rel_refs = 0; + params.current_tag = CURRENT_TAG_UNKNOWN; + + glob_node.timestamp = NULL; + glob_node.user = NULL; + glob_node.first = NULL; + glob_node.last = NULL; + + glob_way.timestamp = NULL; + glob_way.user = NULL; + glob_way.first = NULL; + glob_way.last = NULL; + glob_way.first_node = NULL; + glob_way.last_node = NULL; + + glob_relation.timestamp = NULL; + glob_relation.user = NULL; + glob_relation.first = NULL; + glob_relation.last = NULL; + glob_relation.first_rel = NULL; + glob_relation.last_rel = NULL; for (i = 1; i < argc; i++) { /* parsing the invocation arguments */ if (next_arg != ARG_NONE) @@ -1036,25 +1481,13 @@ { in_memory = 1; next_arg = ARG_NONE; continue; } - if (strcasecmp (argv[i], "--in-memory") == 0) + if (strcasecmp (argv[i], "-in-memory") == 0) { in_memory = 1; - next_arg = ARG_NONE; - continue; - } - if (strcasecmp (argv[i], "-jo") == 0) - { - journal_off = 1; - next_arg = ARG_NONE; - continue; - } - if (strcasecmp (argv[i], "--journal-off") == 0) - { - journal_off = 1; next_arg = ARG_NONE; continue; } fprintf (stderr, "unknown argument: %s\n", argv[i]); error = 1; @@ -1088,10 +1521,11 @@ if (in_memory) cache_size = 0; open_db (db_path, &handle, cache_size); if (!handle) return -1; + params.db_handle = handle; if (in_memory) { /* loading the DB in-memory */ sqlite3 *mem_db_handle; sqlite3_backup *backup; @@ -1124,35 +1558,52 @@ ret = sqlite3_backup_finish (backup); sqlite3_close (handle); handle = mem_db_handle; printf ("\nusing IN-MEMORY database\n"); } - params.db_handle = handle; /* creating SQL prepared statements */ - create_sql_stmts (¶ms, journal_off); + create_sql_stmts (¶ms); -/* parsing the input OSM-file */ - if (readosm_open (osm_path, &osm_handle) != READOSM_OK) +/* XML parsing */ + xml_file = fopen (osm_path, "rb"); + if (!xml_file) { fprintf (stderr, "cannot open %s\n", osm_path); - finalize_sql_stmts (¶ms); sqlite3_close (handle); - readosm_close (osm_handle); + return -1; + } + parser = XML_ParserCreate (NULL); + if (!parser) + { + fprintf (stderr, "Couldn't allocate memory for parser\n"); + sqlite3_close (handle); return -1; } - if (readosm_parse - (osm_handle, ¶ms, consume_node, consume_way, - consume_relation) != READOSM_OK) + XML_SetUserData (parser, ¶ms); + XML_SetElementHandler (parser, start_tag, end_tag); + while (!done) { - fprintf (stderr, "unrecoverable error while parsing %s\n", osm_path); - finalize_sql_stmts (¶ms); - sqlite3_close (handle); - readosm_close (osm_handle); - return -1; + len = fread (Buff, 1, BUFFSIZE, xml_file); + if (ferror (xml_file)) + { + fprintf (stderr, "XML Read error\n"); + sqlite3_close (handle); + return -1; + } + done = feof (xml_file); + if (!XML_Parse (parser, Buff, len, done)) + { + fprintf (stderr, "Parse error at line %d:\n%s\n", + (int) XML_GetCurrentLineNumber (parser), + XML_ErrorString (XML_GetErrorCode (parser))); + sqlite3_close (handle); + return -1; + } } - readosm_close (osm_handle); + XML_ParserFree (parser); + fclose (xml_file); /* finalizing SQL prepared statements */ finalize_sql_stmts (¶ms); /* printing out statistics */